Skip to content
Snippets Groups Projects
Commit d4c26087 authored by DarkGod's avatar DarkGod
Browse files

added missing bits for mindslayers to combat

parent 00d11916
No related branches found
No related tags found
No related merge requests found
......@@ -747,10 +747,28 @@ function _M:attackTargetWith(target, weapon, damtype, mult, force_dam)
target:setEffect(target.EFF_STONE_SKIN, 5, {power=target:attr("auto_stoneskin")})
end
-- Conduit (Psi)
if hitted and not target.dead and self:knowTalent(self.T_CONDUIT) and self:isTalentActive(self.T_CONDUIT) and self:attr("use_psi_combat") then
local t = self:getTalentFromId(self.T_CONDUIT)
t.do_combat(self, t, target)
-- Psi Auras
local psiweapon = self:getInven("PSIONIC_FOCUS") and self:getInven("PSIONIC_FOCUS")[1]
if psiweapon and psiweapon.combat and psiweapon.subtype ~= "mindstar" then
if hitted and not target.dead and self:knowTalent(self.T_KINETIC_AURA) and self:isTalentActive(self.T_KINETIC_AURA) and (self.use_psi_combat or self:hasEffect(EFF_TRANSCENDENT_TELEKINESIS)) then
local t = self:getTalentFromId(self.T_KINETIC_AURA)
t.do_combat(self, t, target)
end
if hitted and not target.dead and self:knowTalent(self.T_THERMAL_AURA) and self:isTalentActive(self.T_THERMAL_AURA) and (self.use_psi_combat or self:hasEffect(EFF_TRANSCENDENT_TELEKINESIS)) then
local t = self:getTalentFromId(self.T_THERMAL_AURA)
t.do_combat(self, t, target)
end
if hitted and not target.dead and self:knowTalent(self.T_CHARGED_AURA) and self:isTalentActive(self.T_CHARGED_AURA) and (self.use_psi_combat or self:hasEffect(EFF_TRANSCENDENT_TELEKINESIS)) then
local t = self:getTalentFromId(self.T_CHARGED_AURA)
t.do_combat(self, t, target)
end
end
-- Static dis-Charge
if hitted and not target.dead and self:hasEffect(self.EFF_STATIC_CHARGE) then
local eff = self:hasEffect(self.EFF_STATIC_CHARGE)
DamageType:get(DamageType.LIGHTNING).projector(self, target.x, target.y, DamageType.LIGHTNING, eff.power)
self:removeEffect(self.EFF_STATIC_CHARGE)
end
-- Exploit Weakness
......@@ -1441,6 +1459,10 @@ function _M:combatDamage(weapon, adddammod)
end
end
if self:attr("use_psi_combat") then
totstat = totstat * (0.8 + self:callTalent(self.T_RESONANT_FOCUS, "bonus")/100)
end
if self:knowTalent(self.T_SUPERPOWER) then
totstat = totstat + self:getStat("wil") * 0.3
end
......
......@@ -83,7 +83,7 @@ newTalent{
local heal = t.getHeal(self, t)
local duration = t.getDuration(self, t)
return ([[A magical zone of Sunlight appears around you, healing and shielding all within a radius of %d for %0.2f per turn and increasing healing effects on everyone within by %d%%. The effect lasts for %d turns.
Existing damage shields will be added to instead of overwritten and have their duration set to 2 if it isn't higher. Refreshing the same damage shield more than 20 times will cause it to explode.
Existing damage shields will be added to instead of overwritten and have their duration set to 2 if it isn't higher. Refreshing the same damage shield more than 20 times will cause it to explode.
It also lights up the affected zone.
The amount healed will increase with the Magic stat]]):
format(radius, heal, heal / 2, duration)
......
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