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

Merge branch 'more_fixes' into 'master'

More fixes
parents 93e8d735 1c692104
No related branches found
No related tags found
No related merge requests found
......@@ -104,7 +104,7 @@ newTalent{
type = {"chronomancy/fate-weaving", 4},
require = chrono_req4,
points = 5,
paradox = function (self, t) return getParadoxCost(self, t, 48) end,
paradox = function (self, t) return getParadoxCost(self, t, 24) end,
cooldown = 12,
tactical = { BUFF = 2, DEFEND = 2 },
getPower = function(self, t) return self:combatTalentLimit(t, 50, 10, 30)/100 end, -- Limit < 50%
......
......@@ -44,7 +44,7 @@ newTalent{
type = {"chronomancy/stasis",2},
require = chrono_req2,
points = 5,
paradox = function (self, t) return getParadoxCost(self, t, 48) end,
paradox = function (self, t) return getParadoxCost(self, t, 24) end,
cooldown = 18,
tactical = { DEFEND = 2 },
no_energy = true,
......
......@@ -123,7 +123,7 @@ newTalent{
require = chrono_req_high2,
points = 5,
cooldown = 24,
paradox = function(self, t) return getParadoxCost(self, t, 48) end,
paradox = function(self, t) return getParadoxCost(self, t, 24) end,
tactical = { ATTACK = 2, DISABLE = 2 },
remove_on_clone = true,
getDuration = function(self, t) return getExtensionModifier(self, t, math.floor(self:combatTalentScale(t, 3, 8))) end,
......
......@@ -2768,7 +2768,11 @@ newEffect{
self:removeParticles(eff.particle2)
if not game.zone.wilderness and not self.dead then
if not eff.twisted then
self:forceUseTalent(eff.talent, {force_target=self})
self:forceUseTalent(eff.talent, {force_target=self, ignore_energy=true})
-- manually use energy
local anom = self:getTalentFromId(eff.talent)
self:useEnergy(self:getTalentSpeed(anom) * game.energy_to_act)
game:playSoundNear(self, "talents/dispel")
self:incParadox(-eff.paradox)
end
......
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