From 53827346efa5d63a501cf5529b6bf4d942293ec1 Mon Sep 17 00:00:00 2001 From: Eric Wykoff <ericwykoff@yahoo.com> Date: Mon, 26 Jan 2015 09:37:20 -0600 Subject: [PATCH] more --- game/modules/tome/data/talents/chronomancy/energy.lua | 4 ++-- game/modules/tome/data/talents/chronomancy/fate-weaving.lua | 1 - game/modules/tome/data/talents/chronomancy/flux.lua | 6 +++--- game/modules/tome/data/talents/chronomancy/stasis.lua | 5 ++--- .../tome/data/talents/chronomancy/timeline-threading.lua | 4 ++-- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/game/modules/tome/data/talents/chronomancy/energy.lua b/game/modules/tome/data/talents/chronomancy/energy.lua index c751d7ef46..dbb15a0e91 100644 --- a/game/modules/tome/data/talents/chronomancy/energy.lua +++ b/game/modules/tome/data/talents/chronomancy/energy.lua @@ -67,7 +67,7 @@ newTalent{ tactical = { DISABLE = 2 }, direct_hit = true, requires_target = true, - range = 10, + range = 6, getTalentCount = function(self, t) return 1 + math.floor(self:combatTalentLimit(t, 3, 0, 2)) end, @@ -169,7 +169,7 @@ newTalent{ paradox = function (self, t) return getParadoxCost(self, t, 20) end, cooldown = 12, tactical = { DEBUFF=3 }, - range = 10, + range = 6, getDuration = function(self, t) return getExtensionModifier(self, t, math.floor(self:combatTalentScale(t, 1, 7))) end, target = function(self, t) return {type="hit", range=self:getTalentRange(t), talent=t} diff --git a/game/modules/tome/data/talents/chronomancy/fate-weaving.lua b/game/modules/tome/data/talents/chronomancy/fate-weaving.lua index 8762bb8f74..fbe0c98460 100644 --- a/game/modules/tome/data/talents/chronomancy/fate-weaving.lua +++ b/game/modules/tome/data/talents/chronomancy/fate-weaving.lua @@ -107,7 +107,6 @@ newTalent{ paradox = function (self, t) return getParadoxCost(self, t, 20) end, cooldown = 12, tactical = { BUFF = 2, DEFEND = 2 }, - range = 10, getPower = function(self, t) return self:combatTalentLimit(t, 50, 10, 30)/100 end, -- Limit < 50% getDuration = function(self, t) return getExtensionModifier(self, t, 5) end, no_energy = true, diff --git a/game/modules/tome/data/talents/chronomancy/flux.lua b/game/modules/tome/data/talents/chronomancy/flux.lua index 557fa7c49e..21057600bd 100644 --- a/game/modules/tome/data/talents/chronomancy/flux.lua +++ b/game/modules/tome/data/talents/chronomancy/flux.lua @@ -118,13 +118,13 @@ newTalent{ points = 5, cooldown = 4, tactical = { ATTACKAREA = { TEMPORAL = 2 } }, - range = 10, + range = 6, radius = function(self, t) return math.floor(self:combatTalentScale(t, 1, 2)) end, getDamage = function(self, t) return self:combatTalentSpellDamage(t, 25, 290, getParadoxSpellpower(self, t)) end, getDuration = function(self, t) return getExtensionModifier(self, t, 4) end, getReduction = function(self, t) return self:getTalentLevel(t) * 2 end, target = function(self, t) - return {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), selffire=false, nowarning=true, talent=t} + return {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), selffire=self:spellFriendlyFire(), nowarning=true, talent=t} end, requires_target = true, direct_hit = true, @@ -155,7 +155,7 @@ newTalent{ local duration = t.getDuration(self, t) local radius = self:getTalentRadius(t) local reduction = t.getReduction(self, t) - return ([[Deals %0.2f temporal damage over %d turns to all other targets in a radius of %d. If the target is slain before the effect expires you'll recover %d Paradox. + return ([[Deals %0.2f temporal damage over %d turns to all targets in a radius of %d. If the target is slain before the effect expires you'll recover %d Paradox. If the target is hit by an Anomaly the remaining damage will be done instantly. The damage will scale with your Spellpower.]]):format(damDesc(self, DamageType.TEMPORAL, damage), duration, radius, reduction) end, diff --git a/game/modules/tome/data/talents/chronomancy/stasis.lua b/game/modules/tome/data/talents/chronomancy/stasis.lua index 2facff28fa..7f8f9a3046 100644 --- a/game/modules/tome/data/talents/chronomancy/stasis.lua +++ b/game/modules/tome/data/talents/chronomancy/stasis.lua @@ -47,7 +47,6 @@ newTalent{ paradox = function (self, t) return getParadoxCost(self, t, 10) end, cooldown = 18, tactical = { DEFEND = 2 }, - range = 10, no_energy = true, getMaxAbsorb = function(self, t) return 50 + self:combatTalentSpellDamage(t, 50, 450, getParadoxSpellpower(self, t)) end, getDuration = function(self, t) return getExtensionModifier(self, t, util.bound(5 + math.floor(self:getTalentLevel(t)), 5, 15)) end, @@ -78,12 +77,12 @@ newTalent{ paradox = function (self, t) return getParadoxCost(self, t, 20) end, cooldown = 8, tactical = { ATTACKAREA = 1, DISABLE = 3 }, - range = 10, + range = 6, radius = function(self, t) return math.floor(self:combatTalentScale(t, 1.3, 2.7)) end, direct_hit = true, requires_target = true, target = function(self, t) - return {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), selffire=false, talent=t} + return {type="ball", range=self:getTalentRange(t), radius=self:getTalentRadius(t), selffire=self:spellFriendlyFire(), talent=t} end, getDuration = function(self, t) return getExtensionModifier(self, t, math.ceil(self:combatTalentScale(t, 2.3, 4.3))) end, getDamage = function(self, t) return self:combatTalentSpellDamage(t, 20, 220, getParadoxSpellpower(self, t)) end, diff --git a/game/modules/tome/data/talents/chronomancy/timeline-threading.lua b/game/modules/tome/data/talents/chronomancy/timeline-threading.lua index b057c45071..7d6dfa1f94 100644 --- a/game/modules/tome/data/talents/chronomancy/timeline-threading.lua +++ b/game/modules/tome/data/talents/chronomancy/timeline-threading.lua @@ -27,7 +27,7 @@ newTalent{ cooldown = 4, paradox = function (self, t) return getParadoxCost(self, t, 10) end, tactical = { ATTACKAREA = {TEMPORAL = 2}, PARADOX = 2 }, - range = 10, + range = 6, direct_hit = true, reflectable = true, requires_target = true, @@ -219,7 +219,7 @@ newTalent{ points = 5, cooldown = 24, paradox = function (self, t) return getParadoxCost(self, t, 25) end, - range = 10, + range = 6, tactical = { ATTACK = 2 }, requires_target = true, direct_hit = true, -- GitLab