Commit ef0d36ef3109f73c2daef2170d0993e3093cd588

Authored by DarkGod
1 parent 473c9b1a

orc talents:

- switch wil & con in 1st & 4th talent
- made sure hold the ground odesnt go on cooldown for nothing
- set max for 1st talent from 5% to 6%
@@ -655,7 +655,7 @@ newTalent{ @@ -655,7 +655,7 @@ newTalent{
655 points = 5, 655 points = 5,
656 no_energy = true, 656 no_energy = true,
657 cooldown = function(self, t) return math.ceil(self:combatTalentLimit(t, 5, 46, 30)) end, -- Limit to >5 turns 657 cooldown = function(self, t) return math.ceil(self:combatTalentLimit(t, 5, 46, 30)) end, -- Limit to >5 turns
658 - getPower = function(self, t) return self:combatStatScale("wil", 1, 5 ) end, 658 + getPower = function(self, t) return self:combatStatScale("con", 1, 6 ) end,
659 tactical = { ATTACK = 2 }, 659 tactical = { ATTACK = 2 },
660 action = function(self, t) 660 action = function(self, t)
661 -- Count actors in view 661 -- Count actors in view
@@ -672,7 +672,7 @@ newTalent{ @@ -672,7 +672,7 @@ newTalent{
672 info = function(self, t) 672 info = function(self, t)
673 return ([[Summons your lust for blood and destruction, especially when the odds are against you. 673 return ([[Summons your lust for blood and destruction, especially when the odds are against you.
674 You increase your damage by 10%% + %0.1f%% per enemy in line of sight up to 5 (max %0.1f%%) for 3 turns. 674 You increase your damage by 10%% + %0.1f%% per enemy in line of sight up to 5 (max %0.1f%%) for 3 turns.
675 - The damage bonus will increase with your Willpower.]]): 675 + The damage bonus will increase with your Constitution.]]):
676 format(t.getPower(self, t), 10 + t.getPower(self, t) * 5) 676 format(t.getPower(self, t), 10 + t.getPower(self, t) * 5)
677 end, 677 end,
678 } 678 }
@@ -688,22 +688,21 @@ newTalent{ @@ -688,22 +688,21 @@ newTalent{
688 getDebuff = function(self, t) return math.ceil(self:combatTalentStatDamage(t, "wil", 1, 5)) end, 688 getDebuff = function(self, t) return math.ceil(self:combatTalentStatDamage(t, "wil", 1, 5)) end,
689 passives = function(self, t, p) 689 passives = function(self, t, p)
690 self:talentTemporaryValue(p, "combat_physresist", t.getSaves(self, t)) 690 self:talentTemporaryValue(p, "combat_physresist", t.getSaves(self, t))
691 - self:talentTemporaryValue(p, "combat_mentalresist", t.getSaves(self, t))  
692 end, 691 end,
693 callbackOnTakeDamage = function(self, t, src, x, y, type, dam, state) 692 callbackOnTakeDamage = function(self, t, src, x, y, type, dam, state)
694 if self:isTalentCoolingDown(t) then return end 693 if self:isTalentCoolingDown(t) then return end
695 if not ( (self.life - dam) < (self.max_life * 0.5) ) then return end 694 if not ( (self.life - dam) < (self.max_life * 0.5) ) then return end
696 695
697 - local nb = 0  
698 - nb = nb + self:removeEffectsFilter({status = "detrimental", type = "mental"}, t.getDebuff(self, t))  
699 - game.logSeen(self, "%s roars with rage shaking off %d mental debuffs!", self.name:capitalize(), nb)  
700 -  
701 - self:startTalentCooldown(t) 696 + local nb = self:removeEffectsFilter({status = "detrimental", type = "mental"}, t.getDebuff(self, t))
  697 + if nb > 0 then
  698 + game.logSeen(self, "#CRIMSON#%s roars with rage shaking off %d mental debuffs!", self.name:capitalize(), nb)
  699 + self:startTalentCooldown(t)
  700 + end
702 end, 701 end,
703 info = function(self, t) 702 info = function(self, t)
704 return ([[Orcs have been the prey of the other races for thousands of years, with or without justification. They have learnt to withstand things that would break weaker races. 703 return ([[Orcs have been the prey of the other races for thousands of years, with or without justification. They have learnt to withstand things that would break weaker races.
705 When your life goes below 50%% your sheer determination cleanses you of %d mental debuff(s) based on talent level and Willpower. This can only happen once every 10 turns. 704 When your life goes below 50%% your sheer determination cleanses you of %d mental debuff(s) based on talent level and Willpower. This can only happen once every 10 turns.
706 - Increase physical and mental save by +%d.]]): 705 + Also increase physical save by +%d.]]):
707 format(t.getDebuff(self, t), t.getSaves(self, t)) 706 format(t.getDebuff(self, t), t.getSaves(self, t))
708 end, 707 end,
709 } 708 }
@@ -741,7 +740,7 @@ newTalent{ @@ -741,7 +740,7 @@ newTalent{
741 cooldown = function(self, t) return math.ceil(self:combatTalentLimit(t, 10, 46, 30)) end, -- Limit to >10 740 cooldown = function(self, t) return math.ceil(self:combatTalentLimit(t, 10, 46, 30)) end, -- Limit to >10
742 remcount = function(self,t) return math.ceil(self:combatTalentScale(t, 0.5, 3, "log", 0, 3)) end, 741 remcount = function(self,t) return math.ceil(self:combatTalentScale(t, 0.5, 3, "log", 0, 3)) end,
743 --heal = function(self, t) return 25 + 2.3* self:getCon() + self:combatTalentLimit(t, 0.1, 0.01, 0.05)*self.max_life end, 742 --heal = function(self, t) return 25 + 2.3* self:getCon() + self:combatTalentLimit(t, 0.1, 0.01, 0.05)*self.max_life end,
744 - heal = function(self, t) return 50+self:combatTalentStatDamage(t, "con", 100, 500) end, 743 + heal = function(self, t) return 50+self:combatTalentStatDamage(t, "wil", 100, 500) end,
745 tactical = { DEFEND = 1, HEAL = 2, CURE = function(self, t, target) 744 tactical = { DEFEND = 1, HEAL = 2, CURE = function(self, t, target)
746 local nb = 0 745 local nb = 0
747 for eff_id, p in pairs(self.tmp) do 746 for eff_id, p in pairs(self.tmp) do
@@ -787,7 +786,7 @@ newTalent{ @@ -787,7 +786,7 @@ newTalent{
787 info = function(self, t) 786 info = function(self, t)
788 return ([[Call upon the will of all of the Orc Prides to survive this battle. 787 return ([[Call upon the will of all of the Orc Prides to survive this battle.
789 You remove up to %d detrimental effect(s) then heal for %d life. 788 You remove up to %d detrimental effect(s) then heal for %d life.
790 - The healing will increase with your talent level and Constitution.]]): 789 + The healing will increase with your talent level and Willpower.]]):
791 format(t.remcount(self,t), t.heal(self, t)) 790 format(t.remcount(self,t), t.heal(self, t))
792 end, 791 end,
793 } 792 }