Skip to content
Snippets Groups Projects
Commit 8af702b1 authored by dg's avatar dg
Browse files

Acid, Lightning, Cold Infusion now also benefit from +%damage gems

Shockwave Bomb is not increased by Fire Infusion


git-svn-id: http://svn.net-core.org/repos/t-engine4@5289 51575b47-30f0-44d4-a5cc-537603b46e54
parent 0caa6ec7
No related branches found
No related tags found
No related merge requests found
......@@ -61,8 +61,9 @@ newTalent{
if self:isTalentActive(self.T_ACID_INFUSION) then inc_dam = acidi.getIncrease(self,acidi); damtype = DamageType.ACID_BLIND; particle = "ball_acid"
elseif self:isTalentActive(self.T_LIGHTNING_INFUSION) then inc_dam = lightningi.getIncrease(self,lightningi); damtype = DamageType.LIGHTNING_DAZE; particle = "ball_lightning"
elseif self:isTalentActive(self.T_FROST_INFUSION) then inc_dam = frosti.getIncrease(self,frosti); damtype = DamageType.ICE; particle = "ball_ice"
else inc_dam = fireinf.getIncrease(self,fireinf) + (ammo.alchemist_bomb and ammo.alchemist_bomb.power or 0) / 100; damtype = self:knowTalent(self.T_FIRE_INFUSION) and DamageType.FIREBURN or DamageType.FIRE
else inc_dam = fireinf.getIncrease(self,fireinf); damtype = self:knowTalent(self.T_FIRE_INFUSION) and DamageType.FIREBURN or DamageType.FIRE
end
inc_dam = inc_dam + (ammo.alchemist_bomb and ammo.alchemist_bomb.power or 0) / 100
local dam = self:combatTalentSpellDamage(t, 15, 150, ((ammo.alchemist_power or 0) + self:combatSpellpower()) / 2)
dam = dam * (1 + inc_dam)
return dam, damtype, particle
......@@ -233,7 +234,7 @@ newTalent{
local inc_dam = 0
local damtype = DamageType.SPELLKNOCKBACK
local particle = "ball_fire"
inc_dam = self:getTalentLevel(self.T_FIRE_INFUSION) * 0.05 + (ammo.alchemist_bomb and ammo.alchemist_bomb.power or 0) / 100
inc_dam = (ammo.alchemist_bomb and ammo.alchemist_bomb.power or 0) / 100
local dam = self:combatTalentSpellDamage(t, 15, 120, ((ammo.alchemist_power or 0) + self:combatSpellpower()) / 2)
dam = dam * (1 + inc_dam)
return dam, damtype, particle
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment