Fixed teluvorta bug on load

Teluvortas now only swap 50% of the time
Teluvorta swap now has a saving throw
Fixed riposte not giving crit bonus


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

@@ -37,7 +37,7 @@ local function doTeluvortaSwap(self)
 		local a, id = rng.table(tgts)
 		local target = a
 
-		if target:canBe("teleport") and self:canBe("teleport") then
+		if self:checkHit(self:combatSpellpower(), target:combatSpellResist()) and target:canBe("teleport") and self:canBe("teleport") then
 			-- first remove the target so the destination tile is empty
 			game.level.map:remove(target.x, target.y, Map.ACTOR)
 			local px, py
@@ -151,7 +151,8 @@ newEntity{ base = "BASE_NPC_TELUGOROTH",
 	combat_armor = 0, combat_def = 20, combat_def_ranged = 20,
 	on_melee_hit = { [DamageType.TEMPORAL] = resolvers.mbonus(20, 10), },
 	ai = "dumb_talented_simple", ai_state = { talent_in=2, ai_move="move_snake" },
-
+	doTeluvortaSwap = doTeluvortaSwap,
+	
 	talent_cd_reduction = {[Talents.T_DUST_TO_DUST]=-3},
 
 	resolvers.talents{
@@ -161,7 +162,9 @@ newEntity{ base = "BASE_NPC_TELUGOROTH",
 	resolvers.sustains_at_birth(),
 
 	on_act = function(self)
-		doTeluvortaSwap(self)
+		if rng.chance(2) then
+			self:doTeluvortaSwap()
+		end
 	end,
 }
 
@@ -175,7 +178,8 @@ newEntity{ base = "BASE_NPC_TELUGOROTH",
 	combat_armor = 0, combat_def = 20, combat_def_ranged = 20,
 	on_melee_hit = { [DamageType.TEMPORAL] = resolvers.mbonus(20, 10), },
 	ai = "dumb_talented_simple", ai_state = { talent_in=2, ai_move="move_snake" },
-
+	doTeluvortaSwap = doTeluvortaSwap,
+	
 	talent_cd_reduction = {[Talents.T_DUST_TO_DUST]=-3},
 
 	resolvers.talents{
@@ -185,7 +189,9 @@ newEntity{ base = "BASE_NPC_TELUGOROTH",
 	},
 	resolvers.sustains_at_birth(),
 	on_act = function(self)
-		doTeluvortaSwap(self)
+		if rng.chance(2) then
+			self:doTeluvortaSwap()
+		end
 	end,
 }
 
@@ -201,7 +207,8 @@ newEntity{ base = "BASE_NPC_TELUGOROTH",
 	combat_armor = 0, combat_def = 20, combat_def_ranged = 20,
 	on_melee_hit = { [DamageType.TEMPORAL] = resolvers.mbonus(20, 10), },
 	ai = "tactical", ai_state = { talent_in=2, ai_move="move_snake" },
-
+	doTeluvortaSwap = doTeluvortaSwap,
+	
 	talent_cd_reduction = {[Talents.T_DUST_TO_DUST]=-3},
 
 	resolvers.talents{
@@ -213,6 +220,8 @@ newEntity{ base = "BASE_NPC_TELUGOROTH",
 	},
 	resolvers.sustains_at_birth(),
 	on_act = function(self)
-		doTeluvortaSwap(self)
+		if rng.chance(2) then
+			self:doTeluvortaSwap()
+		end
 	end,
 }

@@ -400,7 +400,7 @@ newEntity{
 		special_on_hit = {desc="20% chance to curse the target", fct=function(combat, who, target)
 			if not rng.percent(20) then return end
 			local eff = rng.table{"vuln", "defenseless", "impotence", "death", }
-			if not target:checkHit(who:combatSpellpower(), target:combatSpellResist()) then return end
+			if not who:checkHit(who:combatSpellpower(), target:combatSpellResist()) then return end
 			if eff == "vuln" then target:setEffect(target.EFF_CURSE_VULNERABILITY, 2, {power=20})
 			elseif eff == "defenseless" then target:setEffect(target.EFF_CURSE_DEFENSELESSNESS, 2, {power=20})
 			elseif eff == "impotence" then target:setEffect(target.EFF_CURSE_IMPOTENCE, 2, {power=20})
@@ -912,7 +912,7 @@ newEntity{
 			if not rng.percent(20) then return end
 			local eff = rng.table{"stun", "blind", "pin", "confusion", "silence",}
 			if not target:canBe(eff) then return end
-			if not target:checkHit(who:combatMindpower(), target:combatMentalResist()) then return end
+			if not who:checkHit(who:combatMindpower(), target:combatMentalResist()) then return end
 			if eff == "stun" then target:setEffect(target.EFF_STUNNED, 3, {})
 			elseif eff == "blind" then target:setEffect(target.EFF_BLINDED, 3, {})
 			elseif eff == "pin" then target:setEffect(target.EFF_PINNED, 3, {})

@@ -1790,10 +1790,12 @@ newEffect{
 	activate = function(self, eff)
 		eff.tmpid = self:addTemporaryValue("counterstrike", 1)
 		eff.def = self:addTemporaryValue("combat_def", -eff.power)
+		eff.crit = self:addTemporaryValue("combat_crit_vulnerable", eff.crit_inc or 0)
 		eff.dur = eff.dur * (self.global_speed or 1)
 	end,
 	deactivate = function(self, eff)
 		self:removeTemporaryValue("counterstrike", eff.tmpid)
 		self:removeTemporaryValue("combat_def", eff.def)
+		self:removeTemporaryValue("combat_crit_vulnerable", eff.crit)
 	end,
 }