Swallow now works on bosses that have 5% or less life left, making the Huge...

Swallow now works on bosses that have 5% or less life left, making the Huge Appettite achievement possible (but hard)


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

game/modules/tome/class/Actor.lua

@@ -1515,7 +1515,6 @@ function _M:die(src)
 		world:gainAchievement("EXTERMINATOR", p, self)
 		world:gainAchievement("PEST_CONTROL", p, self)
 		world:gainAchievement("REAVER", p, self)
-		world:gainAchievement("EAT_BOSSES", p, self)
 
 		if self.unique then
 			game.player:registerUniqueKilled(self)

game/modules/tome/data/achievements/kills.lua

@@ -138,8 +138,8 @@ newAchievement{
 	show = "full",
 	desc = [[Ate 20 bosses.]],
 	mode = "player",
-	can_gain = function(self, who)
-		if who.rank < 3.5 then return false end
+	can_gain = function(self, who, target)
+		if target.rank < 3.5 then return false end
 		self.nb = (self.nb or 0) + 1
 		if self.nb >= 20 then return true end
 	end,

game/modules/tome/data/talents/gifts/sand-drake.lua

@@ -42,8 +42,9 @@ newTalent{
 			return true
 		end
 
-		if (target:checkHit(self:combatAttackStr(), target:combatPhysicalResist(), 0, 95, 15) or target.dead) and target:canBe("instakill") then
+		if (target:checkHit(self:combatAttackStr(), target:combatPhysicalResist(), 0, 95, 15) or target.dead) and (target:canBe("instakill") or target.life * 100 / target.max_life <= 5) then
 			if not target.dead then target:die(self) end
+			world:gainAchievement("EAT_BOSSES", self, target)
 			self:incEquilibrium(-target.level - 5)
 			self:heal(target.level * 2 + 5)
 		else