From c56cced9928438a58ccc6aacd4e6ad3b54d4e60a Mon Sep 17 00:00:00 2001
From: Eric Wykoff <ericwykoff@yahoo.com>
Date: Thu, 8 Jan 2015 08:10:10 -0600
Subject: [PATCH] rebase clean up
---
game/modules/tome/data/damage_types.lua | 6 +-----
.../tome/data/talents/chronomancy/guardian.lua | 9 ---------
.../data/talents/chronomancy/temporal-combat.lua | 13 ++++++++-----
3 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/game/modules/tome/data/damage_types.lua b/game/modules/tome/data/damage_types.lua
index 817808fb41..d5521bea26 100644
--- a/game/modules/tome/data/damage_types.lua
+++ b/game/modules/tome/data/damage_types.lua
@@ -3651,8 +3651,4 @@ newDamageType{
target:setEffect(target.EFF_STATIC_CHARGE, 4, {power=dam.weapon}, true)
end
end,
-}
- state = state or {}
- useImplicitCrit(src, state)
- state = state or {}
- useImplicitCrit(src, state)
+}
\ No newline at end of file
diff --git a/game/modules/tome/data/talents/chronomancy/guardian.lua b/game/modules/tome/data/talents/chronomancy/guardian.lua
index 4c74905e21..5a3a1703e8 100644
--- a/game/modules/tome/data/talents/chronomancy/guardian.lua
+++ b/game/modules/tome/data/talents/chronomancy/guardian.lua
@@ -110,12 +110,3 @@ newTalent{
This effect can only occur once per turn and the amount of damage split scales with your Spellpower.]]):format(trigger, split, split/2, duration)
end,
}
-
-
- range = function(self, t)
- if self:hasArcheryWeapon("bow") then return util.getval(archery_range, self, t) end
- return 1
- end,
- is_melee = function(self, t) return not self:hasArcheryWeapon("bow") end,
-
- if not target or not self:canProject(tg, x, y) then return nil end
diff --git a/game/modules/tome/data/talents/chronomancy/temporal-combat.lua b/game/modules/tome/data/talents/chronomancy/temporal-combat.lua
index de2c7d0854..bb54a3f876 100644
--- a/game/modules/tome/data/talents/chronomancy/temporal-combat.lua
+++ b/game/modules/tome/data/talents/chronomancy/temporal-combat.lua
@@ -260,7 +260,11 @@ newTalent{
paradox = function (self, t) return getParadoxCost(self, t, 15) end,
tactical = { ATTACK = {weapon = 2}, DISABLE = 3 },
requires_target = true,
- range = archery_range,
+ range = function(self, t)
+ if self:hasArcheryWeapon("bow") then return util.getval(archery_range, self, t) end
+ return 1
+ end,
+ is_melee = function(self, t) return not self:hasArcheryWeapon("bow") end,
speed = function(self, t) return self:hasArcheryWeapon("bow") and "archery" or "weapon" end,
getDamage = function(self, t) return self:combatTalentWeaponDamage(t, 1, 1.5) end,
getDuration = function(self, t) return getExtensionModifier(self, t, math.floor(self:combatTalentScale(t, 3, 7))) end,
@@ -280,12 +284,11 @@ newTalent{
-- Melee attack
local tg = {type="hit", range=self:getTalentRange(t), talent=t}
local x, y, target = self:getTarget(tg)
- if not x or not y or not target then return nil end
- if core.fov.distance(self.x, self.y, x, y) > 1 then return nil end
+ if not target or not self:canProject(tg, x, y) then return nil end
local hitted = self:attackTarget(target, nil, t.getDamage(self, t), true)
if hitted then
- target:setEffect(target.EFF_BREACH, t.getDuration(self, t), {apply_power=getParadoxSpellpower(self, t)})
+ target:setEffect(target.EFF_BREACH, t.getDuration(self, t), {apply_power=getParadoxSpellpower(self, t)})
end
else
game.logPlayer(self, "You cannot use Breach without an appropriate weapon!")
@@ -302,4 +305,4 @@ newTalent{
Breach chance scales with your Spellpower.]])
:format(damage, duration)
end
-}
+}
\ No newline at end of file
--
GitLab