Damage penalty on rares stretches up until level 20

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

@@ -111,7 +111,7 @@ function _M:resolveLevelTalents()
 end
 
 --- Make the actor use the talent
-function _M:useTalent(id, who, force_level, ignore_cd, force_target)
+function _M:useTalent(id, who, force_level, ignore_cd, force_target, silent)
 	who = who or self
 	local ab = _M.talents_def[id]
 	assert(ab, "trying to cast talent "..tostring(id).." but it is not defined")
@@ -121,7 +121,7 @@ function _M:useTalent(id, who, force_level, ignore_cd, force_target)
 			game.logPlayer(who, "%s is still on cooldown for %d turns.", ab.name:capitalize(), self.talents_cd[ab.id])
 			return
 		end
-		if not self:preUseTalent(ab) then return end
+		if not self:preUseTalent(ab, silent) then return end
 		local co = coroutine.create(function()
 			local old_level
 			local old_target
@@ -145,7 +145,7 @@ function _M:useTalent(id, who, force_level, ignore_cd, force_target)
 			game.logPlayer(who, "%s is still on cooldown for %d turns.", ab.name:capitalize(), self.talents_cd[ab.id])
 			return
 		end
-		if not self:preUseTalent(ab) then return end
+		if not self:preUseTalent(ab, silent) then return end
 		local co = coroutine.create(function()
 			if not self.sustain_talents[id] then
 				local old_level
@@ -220,7 +220,7 @@ function _M:forceUseTalent(t, def)
 	if def.ignore_energy then self.energy.value = 10000 end
 
 	if def.ignore_ressources then self:attr("force_talent_ignore_ressources", 1) end
-	local ret = {self:useTalent(t, def.force_who, def.force_level, def.ignore_cd, def.force_target)}
+	local ret = {self:useTalent(t, def.force_who, def.force_level, def.ignore_cd, def.force_target, def.silent)}
 	if def.ignore_ressources then self:attr("force_talent_ignore_ressources", -1) end
 
 	if def.ignore_energy then

@@ -255,7 +255,7 @@ function _M:stripForExport()
 	for tid, act in pairs(self.sustain_talents) do if act then list[#list+1] = tid end end
 	while #list > 0 do
 		local eff = rng.tableRemove(list)
-		self:forceUseTalent(eff, {ignore_energy=true, no_equilibrium_fail=true, no_paradox_fail=true})
+		self:forceUseTalent(eff, {silent=true, ignore_energy=true, no_equilibrium_fail=true, no_paradox_fail=true, save_cleanup=true})
 	end
 end
 
@@ -3219,10 +3219,12 @@ function _M:forceUseTalent(t, def)
 	if def.no_equilibrium_fail then self:attr("no_equilibrium_fail", 1) end
 	if def.no_paradox_fail then self:attr("no_paradox_fail", 1) end
 	if def.talent_reuse then self:attr("talent_reuse", 1) end
+	if def.save_cleanup then self:attr("save_cleanup", 1) end
 	local ret = {engine.interface.ActorTalents.forceUseTalent(self, t, def)}
 	if def.no_equilibrium_fail then self:attr("no_equilibrium_fail", -1) end
 	if def.no_paradox_fail then self:attr("no_paradox_fail", -1) end
 	if def.talent_reuse then self:attr("talent_reuse", -1) end
+	if def.save_cleanup then self:attr("save_cleanup", -1) end
 	return unpack(ret)
 end
 

@@ -1118,9 +1118,9 @@ function _M:entityFilterPost(zone, level, type, e, filter)
 				level = filter.random_elite.level or zone:level_adjust_level(level, zone, type),
 				check_talents_level = true,
 				post = function(b, data)
-					if data.level <= 12 then
+					if data.level <= 20 then
 						b.inc_damage = b.inc_damage or {}
-						b.inc_damage.all = (b.inc_damage.all or 0) - 40 * (12 - data.level + 1) / 12
+						b.inc_damage.all = (b.inc_damage.all or 0) - 40 * (20 - data.level + 1) / 20
 					end
 				end,
 			}

@@ -90,6 +90,7 @@ newTalent{
 	deactivate = function(self, t, p)
 		local spike_str = getSpikeStrength(self, t)
 		self:removeTemporaryValue("kinetic_shield", p.am)
+		if self:attr("save_cleanup") then return true end
 		self:setEffect(self.EFF_KINSPIKE_SHIELD, 5, {power=spike_str})
 		return true
 	end,
@@ -193,6 +194,7 @@ newTalent{
 	deactivate = function(self, t, p)
 		local spike_str = getSpikeStrength(self, t)
 		self:removeTemporaryValue("thermal_shield", p.am)
+		if self:attr("save_cleanup") then return true end
 		self:setEffect(self.EFF_THERMSPIKE_SHIELD, 5, {power=spike_str})
 		return true
 	end,
@@ -293,6 +295,7 @@ newTalent{
 	deactivate = function(self, t, p)
 		local spike_str = getSpikeStrength(self, t)
 		self:removeTemporaryValue("charged_shield", p.am)
+		if self:attr("save_cleanup") then return true end
 		self:setEffect(self.EFF_CHARGESPIKE_SHIELD, 5, {power=spike_str})
 		return true
 	end,

@@ -154,6 +154,7 @@ newTalent{
 		return true
 	end,
 	deactivate = function(self, t, p)
+		if self:attr("save_cleanup") then return true end
 		local dam = t.getAuraSpikeStrength(self, t)
 		local cost = t.getSpikeCost(self, t)
 		if self:getPsi() <= cost then
@@ -269,6 +270,7 @@ newTalent{
 		return true
 	end,
 	deactivate = function(self, t, p)
+		if self:attr("save_cleanup") then return true end
 		local dam = t.getAuraSpikeStrength(self, t)
 		local cost = t.getSpikeCost(self, t)
 		--if self:isTalentActive(self.T_CONDUIT) then return true end
@@ -390,6 +392,7 @@ newTalent{
 		return true
 	end,
 	deactivate = function(self, t, p)
+		if self:attr("save_cleanup") then return true end
 		local dam = t.getAuraSpikeStrength(self, t)
 		local cost = t.getSpikeCost(self, t)
 		--if self:isTalentActive(self.T_CONDUIT) then return true end