Added amulets of teleportation

Easymode lifes are now garnted at levels 1, 2, 3, 5, 7, 10, 14, 18, 24, 30, 40 instead of every five levels


git-svn-id: http://svn.net-core.org/repos/t-engine4@1282 51575b47-30f0-44d4-a5cc-537603b46e54

game/modules/tome/class/Object.lua

@@ -129,6 +129,8 @@ function _M:descAttribute(attr)
 		return ("worth %0.2f"):format(self.money_value / 10)
 	elseif attr == "USE_TALENT" then
 		return self:getTalentFromId(self.use_talent.id).name:lower()
+	elseif attr == "DIGSPEED" then
+		return ("dig speed %d turns"):format(self.digspeed)
 	end
 end
 

game/modules/tome/class/Player.lua

@@ -72,6 +72,8 @@ function _M:init(t, no_default)
 	t.rank = t.rank or 3
 	t.old_life = 0
 
+	t.easy_mode_lifes = 1
+
 	mod.class.Actor.init(self, t, no_default)
 	engine.interface.PlayerHotkeys.init(self, t)
 	mod.class.interface.PlayerLore.init(self, t)
@@ -353,7 +355,18 @@ function _M:levelup()
 	if self.level == 40 then world:gainAchievement("LEVEL_40", self) end
 	if self.level == 50 then world:gainAchievement("LEVEL_50", self) end
 
-	if game.difficulty == game.DIFFICULTY_EASY and self.level % 5 == 0 then
+	if game.difficulty == game.DIFFICULTY_EASY and (
+		self.level == 2 or
+		self.level == 3 or
+		self.level == 5 or
+		self.level == 7 or
+		self.level == 10 or
+		self.level == 14 or
+		self.level == 18 or
+		self.level == 24 or
+		self.level == 30 or
+		self.level == 40
+		) then
 		self.easy_mode_lifes = (self.easy_mode_lifes or 0) + 1
 	end
 end

game/modules/tome/data/birth/descriptors.lua

@@ -52,6 +52,7 @@ newBirthDescriptor{
 		money = 10,
 		resolvers.equip{ id=true,
 			{type="lite", subtype="lite", name="brass lantern"},
+			{type="tool", subtype="digger", name="iron pickaxe"},
 		},
 		resolvers.inventory{ id=true,
 			{type="potion", subtype="potion", name="potion of lesser healing", ego_chance=-1000},

game/modules/tome/data/general/objects/egos/amulets.lua

@@ -124,3 +124,20 @@ newEntity{
 		can_breath = {water=1},
 	},
 }
+
+newEntity{
+	name = " of teleportation", suffix=true, instant_resolve=true,
+	level_range = {20, 50},
+	rarity = 10,
+	cost = 40,
+	wielder = {
+		teleport_immune = 0.5,
+	},
+	max_power = 120, power_regen = 1,
+	use_power = { name = "teleport you anywhere on the level, randomly", power = 60, use = function(self, who)
+		game.level.map:particleEmitter(who.x, who.y, 1, "teleport")
+		who:teleportRandom(who.x, who.y, 200)
+		game.level.map:particleEmitter(who.x, who.y, 1, "teleport")
+		game.logSeen(who, "%s uses %s!", who.name:capitalize(), self:getName{no_count=true})
+	end}
+}

game/modules/tome/data/general/objects/objects.lua

@@ -32,6 +32,9 @@ loadIfNot("/data/general/objects/potions.lua")
 loadIfNot("/data/general/objects/scrolls.lua")
 loadIfNot("/data/general/objects/wands.lua")
 
+-- Tools
+loadIfNot("/data/general/objects/digger.lua")
+
 -- Jewelry stuff
 loadIfNot("/data/general/objects/jewelry.lua")