fixes

more mummies


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

game/engine/interface/ActorAI.lua

@@ -151,6 +151,7 @@ end
 -- @param target the target we are tracking
 -- @return x, y coords to move/cast to
 function _M:aiSeeTargetPos(target)
+	if not target then return self.x, self.y end
 	local tx, ty = target.x, target.y
 	local see, chance = self:canSee(target)
 

game/engine/interface/GameSound.lua

@@ -42,7 +42,7 @@ function _M:playSound(name)
 			print("[SOUND] loading from", "/data/sound/"..name..".lua", ":=:", "/data/sound/"..def.file, ":>")
 			def.file = core.sound.newSound("/data/sound/"..def.file)
 			print("[SOUND] :=>", def.file)
-			if def.volume then def.file:setVolume(def.volume) end
+			if def.volume and def.file then def.file:setVolume(def.volume) end
 		elseif fs.exists("/data/sound/"..name..".wav") then
 			def = {file = core.sound.newSound("/data/sound/"..name..".wav")}
 			print("[SOUND] loading from", "/data/sound/"..name..".wav", ":=:", def.file)

game/modules/tome/data/zones/ancient-elven-ruins/npcs.lua

@@ -78,10 +78,11 @@ newEntity{ base = "BASE_NPC_MUMMY",
 	rarity = 2,
 	max_life = resolvers.rngavg(120,140),
 	ai_state = { talent_in=4, },
+	stats = { mag=25, wil=20, },
 
 	resolvers.equip{
 		{type="weapon", subtype="greatsword", autoreq=true},
-		{type="armor", subtype="mummy", ego_chance=100, autoreq=true},
+		{type="armor", subtype="mummy", autoreq=true},
 	},
 	resolvers.talents{
 		[Talents.T_STUNNING_BLOW]=2,
@@ -90,3 +91,46 @@ newEntity{ base = "BASE_NPC_MUMMY",
 	},
 	drops = resolvers.drops{chance=70, nb=1, {type="money"}, {} },
 }
+
+newEntity{ base = "BASE_NPC_MUMMY",
+	name = "animated mummy wrappings", color=colors.SLATE, display='[',
+	desc = [[An animated mummy wrappings, without a corpse inside... It seems like it can not move.]],
+	level_range = {7, 50}, exp_worth = 1,
+	rarity = 7,
+	max_life = resolvers.rngavg(20,40), life_rating=4,
+	ai_state = { talent_in=2, },
+	never_move = 1,
+
+	resolvers.equip{
+		{type="armor", subtype="mummy", ego_chance=100, autoreq=true},
+	},
+	autolevel = "caster",
+	resolvers.talents{
+		[Talents.T_MANATHRUST]=3,
+		[Talents.T_FREEZE]=3,
+		[Talents.T_LIGHTNING]=3,
+		[Talents.T_STRIKE]=3,
+	},
+}
+
+newEntity{ base = "BASE_NPC_MUMMY",
+	name = "rotting mummy", color=colors.TAN,
+	desc = [[An rotting animated corpse in mummy wrappings.]],
+	level_range = {7, 50}, exp_worth = 1,
+	rarity = 3,
+	max_life = resolvers.rngavg(60,80), life_rating=7,
+	ai_state = { talent_in=4, },
+
+	resolvers.equip{
+		{type="armor", subtype="mummy", autoreq=true},
+	},
+	autolevel = "ghoul",
+	resolvers.talents{
+		[Talents.T_WEAKNESS_DISEASE]=1,
+		[Talents.T_GNAW]=3,
+		[Talents.T_RETCH]=3,
+		[Talents.T_BITE_POISON]=3,
+	},
+	combat = { dam=8, atk=10, apr=0, dammod={str=0.7} },
+}
+

game/modules/tome/resolvers.lua

@@ -51,6 +51,7 @@ function resolvers.calc.equip(t, e)
 
 			-- Do not drop it unless it is an ego or better
 			if not o.egoed and not o.unique then o.no_drop = true end
+			if filter.force_drop then o.no_drop = nil end
 			game.zone:addEntity(game.level, o, "object")
 
 			if t[1].id then o:identify(t[1].id) end