Arcane Combat and Shadow Combat will not trigger if not enough mana, this...

Arcane Combat and Shadow Combat will not trigger if not enough mana, this preventing disabled other spells because of those


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

game/modules/tome/class/interface/Combat.lua

@@ -277,9 +277,11 @@ function _M:attackTargetWith(target, weapon, damtype, mult)
 	-- Shadow cast
 	if hitted and not target.dead and self:knowTalent(self.T_SHADOW_COMBAT) and self:isTalentActive(self.T_SHADOW_COMBAT) and self:getMana() > 0 then
 		local dam = 3 + self:getTalentLevel(self.T_SHADOW_COMBAT) * 2
-		local mana = 1 + self:getTalentLevelRaw(t) / 1.5
-		DamageType:get(DamageType.DARKNESS).projector(self, target.x, target.y, DamageType.DARKNESS, dam)
-		self:incMana(-mana)
+		local mana = 1 + self:getTalentLevelRaw(self.T_SHADOW_COMBAT) / 1.5
+		if self:getMana() > mana then
+			DamageType:get(DamageType.DARKNESS).projector(self, target.x, target.y, DamageType.DARKNESS, dam)
+			self:incMana(-mana)
+		end
 	end
 
 	-- Temporal cast

game/modules/tome/data/talents/techniques/magical-combat.lua

@@ -28,10 +28,12 @@ newTalent{
 	cooldown = 5,
 	tactical = { BUFF = 2 },
 	do_trigger = function(self, t, target)
-		if rng.percent(20 + self:getTalentLevel(t) * (1 + self:getDex(9, true))) then
+		if rng.percent(200 + self:getTalentLevel(t) * (1 + self:getDex(9, true))) then
 			local spells = {}
-			if self:knowTalent(self.T_FLAME) then spells[#spells+1] = self.T_FLAME end
-			if self:knowTalent(self.T_LIGHTNING) then spells[#spells+1] = self.T_LIGHTNING end
+			local fatigue = (100 + 2 * self:combatFatigue()) / 100
+			local mana = self:getMana() - 1
+			if self:knowTalent(self.T_FLAME) and mana > self:getTalentFromId(self.T_FLAME).mana * fatigue then spells[#spells+1] = self.T_FLAME end
+			if self:knowTalent(self.T_LIGHTNING) and mana > self:getTalentFromId(self.T_LIGHTNING).mana * fatigue then spells[#spells+1] = self.T_LIGHTNING end
 			local tid = rng.table(spells)
 			if tid then
 				-- Extending beam target, assumes a maximum range of 10