mooooar

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

game/modules/tome/class/Actor.lua

@@ -4147,6 +4147,9 @@ function _M:on_set_temporary_effect(eff_id, e, p)
 		self:attr("mental_negative_status_effect_immune", -1)
 		if not self:attr("mental_negative_status_effect_immune") then self:removeEffect(self.EFF_CLEAR_MIND) end
 	end
+	if e.status == "detrimental" and e.type == "mental" and self:knowTalent(self.T_UNBREAKABLE_WILL) and not e.subtype["cross tier"] then
+		if self:triggerTalent(self.T_UNBREAKABLE_WILL) then p.dur = 0 end
+	end
 	if e.status == "detrimental" and e.type == "physical" and self:attr("physical_negative_status_effect_immune") and not e.subtype["cross tier"] then
 		p.dur = 0
 	end

game/modules/tome/data/talents/uber/str.lua

@@ -112,6 +112,12 @@ uberTalent{
 uberTalent{
 	name = "Irresistible Sun",
 	cooldown = 25,
+	require = { special={desc="Dealt over 50000 light or fire damage", fct=function(self) return 
+		self.damage_log and (
+			(self.damage_log[DamageType.FIRE] and self.damage_log[DamageType.FIRE] >= 50000) or
+			(self.damage_log[DamageType.L] and self.damage_log[DamageType.LIGHT] >= 50000)
+		)
+	end} },
 	action = function(self, t)
 		self:setEffect(self.EFF_IRRESISTIBLE_SUN, 6, {dam=50 + self:getStr() * 2})
 	end,

game/modules/tome/data/talents/uber/wil.lua

@@ -148,3 +148,38 @@ uberTalent{
 		:format()
 	end,
 }
+
+
+uberTalent{
+	name = "Lucky Day",
+	mode = "passive",
+	require = { special={desc="Be lucky already (at least +5 luck)", fct=function(self) return self:getLck() >= 55 end} },
+	on_learn = function(self, t)
+		self.inc_stats[self.STAT_LCK] = (self.inc_stats[self.STAT_LCK] or 0) + 40
+		self:onStatChange(self.STAT_LCK, 40)
+	end,
+	on_unlearn = function(self, t)
+		self.inc_stats[self.STAT_LCK] = (self.inc_stats[self.STAT_LCK] or 0) - 40
+		self:onStatChange(self.STAT_LCK, -40)
+	end,
+	info = function(self, t)
+		return ([[Every day is your lucky day! You gain a permanent +40 luck bonus.]])
+		:format()
+	end,
+}
+
+uberTalent{
+	name = "Unbreakable Will",
+	mode = "passive",
+	cooldown = 8,
+	trigger = function(self, t)
+		self:startTalentCooldown(t)
+		game.logSeen(self, "#LIGHT_BLUE#%s unbreakable will shrugs off the effect!", self.name:capitalize())
+		return true
+	end,
+	info = function(self, t)
+		return ([[Your will is so strong you simply ignore mental effects against you.
+		Warning: this has a cooldown.]])
+		:format()
+	end,
+}