turtle summons now get a shell shield talent

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

game/modules/tome/data/damage_types.lua

@@ -24,13 +24,13 @@ setDefaultProjector(function(src, x, y, type, dam)
 		print("[PROJECTOR] starting dam", dam)
 
 		-- Difficulty settings
-		if game.difficulty == game.DIFFICULTY_EASY and target.player then
+		if game.difficulty == game.DIFFICULTY_EASY and target:resolveSource().player then
 			dam = dam * 0.8
-		elseif game.difficulty == game.DIFFICULTY_NIGHTMARE and target.player then
+		elseif game.difficulty == game.DIFFICULTY_NIGHTMARE and target:resolveSource().player then
 			dam = dam * 1.2
 		elseif game.difficulty == game.DIFFICULTY_INSANE then
-			if target.player then dam = dam * 1.2
-			elseif src.player then dam = dam * 0.8 end
+			if target:resolveSource().player then dam = dam * 1.2
+			elseif target:resolveSource().player then dam = dam * 0.8 end
 		end
 		print("[PROJECTOR] after difficulty dam", dam)
 
@@ -42,7 +42,7 @@ setDefaultProjector(function(src, x, y, type, dam)
 
 		-- Reduce damage with resistance
 		if target.resists then
-			local res = target.resists[type] or 0
+			local res = (target.resists.all or 0) + (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)

game/modules/tome/data/talents/gifts/summon-utility.lua

@@ -50,6 +50,23 @@ newTalent{
 	end,
 }
 
+
+newTalent{
+	name = "Shell Shield",
+	type = {"technique/other",1},
+	points = 5,
+	cooldown = 10,
+	action = function(self, t)
+		local dur = math.ceil(4 + self:getTalentLevel(t) * 0.7)
+		local power = 34 + self:getTalentLevel(t) * 7
+		self:setEffect(self.EFF_SHELL_SHIELD, dur, {power=power})
+		return true
+	end,
+	info = function(self, t)
+		return ([[Under the cover of your shell you take %d%% less damage for %d turns]]):format(34 + self:getTalentLevel(t) * 7, math.ceil(4 + self:getTalentLevel(t) * 0.7))
+	end,
+}
+
 newTalent{ short_name="SPIDER_WEB",
 	name = "Web",
 	type = {"wild-gift/other",1},
@@ -165,6 +182,7 @@ newTalent{
 
 			resolvers.talents{
 				[self.T_TAUNT]=self:getTalentLevelRaw(t),
+				[self.T_SHELL_SHIELD]=self:getTalentLevelRaw(t),
 			},
 
 			summoner = self, summoner_gain_exp=true,
@@ -181,7 +199,7 @@ newTalent{
 		return true
 	end,
 	info = function(self, t)
-		return ([[Summon a Turtle to distract your foes. Turtles are resilient, but not very powerful. However they will periodically force any foes to attack them.
+		return ([[Summon a Turtle to distract your foes. Turtles are resilient, but not very powerful. However they will periodically force any foes to attack them and can protect themselves with their shell.
 		It will get %d constitution and %d dexterity.]]):format(15 + self:getWil() * self:getTalentLevel(t) / 5, 10 + self:getTalentLevel(t) * 2)
 	end,
 }
@@ -218,18 +236,18 @@ newTalent{
 			desc = [[]],
 			autolevel = "none",
 			ai = "summoned", ai_real = "dumb_talented_simple", ai_state = { talent_in=1, },
-			stats = { str=15 + self:getWil() * self:getTalentLevel(t) / 5, wil=18, dex=10 + self:getTalentLevel(t) * 2, con=10 + self:getTalentLevelRaw(self.T_RESILIENCE)*2 },
+			stats = { dex=15 + self:getWil() * self:getTalentLevel(t) / 5, wil=18, str=10 + self:getTalentLevel(t) * 2, con=10 + self:getTalentLevelRaw(self.T_RESILIENCE)*2 },
 			level_range = {self.level, self.level}, exp_worth = 0,
 
 			max_life = 50,
 			life_rating = 10,
 
 			combat_armor = 0, combat_def = 0,
-			combat = { dam=10, atk=16, },
+			combat = { dam=resolvers.rngavg(20,25), atk=16, apr=9, damtype=DamageType.NATURE, dammod={dex=1.2} },
 
 			resolvers.talents{
 				[self.T_SPIDER_WEB]=self:getTalentLevelRaw(t),
-				[self.T_BITE_POISON]=self:getTalentLevelRaw(t),
+				[self.T_SPIT_POISON]=self:getTalentLevelRaw(t),
 			},
 
 			summoner = self, summoner_gain_exp=true,
@@ -247,7 +265,7 @@ newTalent{
 	end,
 	info = function(self, t)
 		return ([[Summon a Spider to harass your foes. Spiders can poison your foes and throw webs to pin them to the ground.
-		It will get %d strength and %d dexterity.]]):format(15 + self:getWil() * self:getTalentLevel(t) / 5, 10 + self:getTalentLevel(t) * 2)
+		It will get %d dexterity and %d strength.]]):format(15 + self:getWil() * self:getTalentLevel(t) / 5, 10 + self:getTalentLevel(t) * 2)
 	end,
 }
 

game/modules/tome/data/timed_effects.lua

@@ -404,6 +404,22 @@ newEffect{
 	end,
 }
 
+newEffect{
+	name = "SHELL_SHIELD",
+	desc = "Shell Shield",
+	type = "physical",
+	status = "beneficial",
+	parameters = { power=50 },
+	on_gain = function(self, err) return "#Target# takes cover under its shell.", "+Shell Shield" end,
+	on_lose = function(self, err) return "#Target# leaves the cover of its shell.", "-Shell Shield" end,
+	activate = function(self, eff)
+		eff.pid = self:addTemporaryValue("resists", {all=eff.power})
+	end,
+	deactivate = function(self, eff)
+		self:removeTemporaryValue("resists", eff.pid)
+	end,
+}
+
 newEffect{
 	name = "TIME_PRISON",
 	desc = "Time Prison",