traps now do damage themselves

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

game/modules/tome/class/Actor.lua

@@ -346,7 +346,7 @@ function _M:die(src)
 	engine.interface.ActorLife.die(self, src)
 
 	-- Gives the killer some exp for the kill
-	if src then
+	if src and src:resolveSource().gainExp then
 		src:resolveSource():gainExp(self:worthExp(src:resolveSource()))
 	end
 	-- Do we get a blooooooody death ?
@@ -363,20 +363,18 @@ function _M:die(src)
 	self.inven = {}
 
 	-- Give stamina back
-	if src and src:knowTalent(src.T_UNENDING_FRENZY) then
+	if src and src.knowTalent and src:knowTalent(src.T_UNENDING_FRENZY) then
 		src:incStamina(src:getTalentLevel(src.T_UNENDING_FRENZY) * 2)
 	end
 
-	-- Achievements
-	if src and src:resolveSource().player then
-		if src:resolveSource().life == 1 then world:gainAchievement("THAT_WAS_CLOSE", src:resolveSource()) end
-		world:gainAchievement("EXTERMINATOR", src:resolveSource(), self)
-		world:gainAchievement("PEST_CONTROL", src:resolveSource(), self)
-	end
-
-	-- Record kills
 	if src and src:resolveSource().player then
+		-- Achievements
 		local p = src:resolveSource()
+		if p.life == 1 then world:gainAchievement("THAT_WAS_CLOSE", p) end
+		world:gainAchievement("EXTERMINATOR", p, self)
+		world:gainAchievement("PEST_CONTROL", p, self)
+
+		-- Record kills
 		p.all_kills = p.all_kills or {}
 		p.all_kills[self.name] = p.all_kills[self.name] or 0
 		p.all_kills[self.name] = p.all_kills[self.name] + 1

game/modules/tome/class/Trap.lua

@@ -19,16 +19,19 @@
 
 require "engine.class"
 require "engine.Trap"
+require "engine.interface.ActorProject"
 require "engine.interface.ObjectIdentify"
 
 module(..., package.seeall, class.inherit(
 	engine.Trap,
-	engine.interface.ObjectIdentify
+	engine.interface.ObjectIdentify,
+	engine.interface.ActorProject
 ))
 
 function _M:init(t, no_default)
 	engine.Trap.init(self, t, no_default)
 	engine.interface.ObjectIdentify.init(self, t)
+	engine.interface.ActorProject.init(self, t)
 end
 
 --- Gets the full name of the object
@@ -71,3 +74,11 @@ function _M:canTrigger(x, y, who)
 	if self.safe_levitation and who:attr("levitation") then return false end
 	return true
 end
+
+function _M:resolveSource()
+	if self.summoner_gain_exp and self.summoner then
+		return self.summoner:resolveSource()
+	else
+		return self
+	end
+end

game/modules/tome/data/damage_types.lua

@@ -28,10 +28,12 @@ setDefaultProjector(function(src, x, y, type, dam)
 		end
 
 		-- Reduce damage with resistance
-		local res = target.resists[type] or 0
-		print("[PROJECTOR] res", res, (100 - res) / 100, " on dam", dam)
-		if res >= 100 then dam = 0
-		else dam = dam * ((100 - res) / 100)
+		if target.resists then
+			local res = target.resists[type] or 0
+			print("[PROJECTOR] res", res, (100 - res) / 100, " on dam", dam)
+			if res >= 100 then dam = 0
+			else dam = dam * ((100 - res) / 100)
+			end
 		end
 		print("[PROJECTOR] final dam", dam)
 

game/modules/tome/data/general/traps/elemental.lua

@@ -21,7 +21,7 @@ newEntity{ define_as = "TRAP_ELEMENTAL",
 	type = "elemental", id_by_type=true, unided_name = "trap",
 	display = '^',
 	triggered = function(self, x, y, who)
-		(self.src or who):project({type="hit"}, x, y, self.damtype, self.dam, self.particles and {type=self.particles})
+		self:project({type="hit",x=x,y=y}, x, y, self.damtype, self.dam, self.particles and {type=self.particles})
 		return true
 	end,
 }
@@ -29,7 +29,7 @@ newEntity{ define_as = "TRAP_ELEMENTAL_BLAST",
 	type = "elemental", id_by_type=true, unided_name = "trap",
 	display = '^',
 	triggered = function(self, x, y, who)
-		(self.src or who):project({type="ball", radius=self.radius or 2}, x, y, self.damtype, self.dam, self.particles and {type=self.particles})
+		self:project({type="ball",x=x,y=y, radius=self.radius or 2}, x, y, self.damtype, self.dam, self.particles and {type=self.particles})
 		return true
 	end,
 }

game/modules/tome/data/general/traps/natural_forest.lua

@@ -21,7 +21,7 @@ newEntity{ define_as = "TRAP_NATURAL_FOREST",
 	type = "natural", subtype="forest", id_by_type=true, unided_name = "trap",
 	display = '^',
 	triggered = function(self, x, y, who)
-		(self.src or who):project({type="hit"}, x, y, self.damtype, self.dam, self.particles and {type=self.particles})
+		self:project({type="hit",x=x,y=y}, x, y, self.damtype, self.dam, self.particles and {type=self.particles})
 		return true
 	end,
 }