Reavers's Ruin talent now also heals them for each hit they do

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

game/modules/tome/class/Trap.lua

@@ -74,7 +74,7 @@ end
 --- Called when triggered
 function _M:canTrigger(x, y, who, no_random)
 	if self.pressure_trap and who:attr("avoid_pressure_traps") then return false end
-	if self.faction and who:reactionToward(self) >= 0 then return false end
+	if self.faction and who.reactionToward and who:reactionToward(self) >= 0 then return false end
 	if not no_random and who.trap_avoidance and rng.percent(who.trap_avoidance) then
 		if self:knownBy(who) then
 			game.logPlayer(who, "You carefully avoid the trap (%s).", self:getName())

game/modules/tome/class/UserChatExtension.lua

@@ -37,7 +37,7 @@ end
 function _M:sendActorLink(m)
 	local rank, rank_color = m:TextRank()
 	local name = rank_color..m.name:removeUIDCodes().."#LAST#"
-	local desc = tostring(m:tooltip(m.x, m.y, game.player)):removeUIDCodes()
+	local desc = tostring(m:tooltip(m.x, m.y, game.player) or "???"):removeUIDCodes()
 	if not desc then return end
 	local ser = zlib.compress(table.serialize{kind="actor-link", name=name, desc=desc})
 	core.profile.pushOrder(string.format("o='ChatSerialData' channel=%q msg=%q", self.chat.cur_channel, ser))

game/modules/tome/data/birth/classes/corrupted.lua

@@ -74,7 +74,7 @@ newBirthDescriptor{
 		resolvers.equip{ id=true,
 			{type="weapon", subtype="waraxe", name="iron waraxe", autoreq=true, ego_chance=-1000},
 			{type="weapon", subtype="waraxe", name="iron waraxe", autoreq=true, ego_chance=-1000},
-			{type="armor", subtype="heavy", name="iron mail armour", autoreq=true, ego_chance=-1000}
+			{type="armor", subtype="light", name="rough leather armour", autoreq=true, ego_chance=-1000}
 		},
 	},
 	copy_add = {

game/modules/tome/data/talents/corruptions/scourge.lua

@@ -79,7 +79,7 @@ newTalent{
 	activate = function(self, t)
 		game:playSoundNear(self, "talents/slime")
 		local ret = {
-			per = self:addTemporaryValue("melee_project", {[DamageType.BLIGHT] = self:combatTalentSpellDamage(t, 15, 40)}),
+			per = self:addTemporaryValue("melee_project", {[DamageType.DRAINLIFE] = self:combatTalentSpellDamage(t, 15, 40)}),
 		}
 		return ret
 	end,
@@ -88,9 +88,10 @@ newTalent{
 		return true
 	end,
 	info = function(self, t)
-		return ([[Concentrate on the corruption you bring, enhancing each of your melee strikes with %0.2f blight damage.
+		local dam = damDesc(self, DamageType.BLIGHT, self:combatTalentSpellDamage(t, 15, 40))
+		return ([[Concentrate on the corruption you bring, enhancing each of your melee strikes with %0.2f blight damage (which also heals you for %0.2f each hit).
 		The damage will increase with your Magic stat.]]):
-		format(damDesc(self, DamageType.BLIGHT, self:combatTalentSpellDamage(t, 15, 40)))
+		format(dam, dam * 0.4)
 	end,
 }