From 40a37539ff1fc8381c5c335d94618c47754dfcd1 Mon Sep 17 00:00:00 2001
From: Shibari <ShibariTOME@Gmail.com>
Date: Thu, 18 Jan 2018 14:23:07 -0500
Subject: [PATCH] Fix Intuitive Shots blocking all attacks after it procs
---
game/modules/tome/class/interface/Combat.lua | 5 +----
game/modules/tome/data/talents/techniques/reflexes.lua | 1 +
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/game/modules/tome/class/interface/Combat.lua b/game/modules/tome/class/interface/Combat.lua
index 694eb10283..6f5fb78fc4 100644
--- a/game/modules/tome/class/interface/Combat.lua
+++ b/game/modules/tome/class/interface/Combat.lua
@@ -487,10 +487,7 @@ function _M:attackTargetWith(target, weapon, damtype, mult, force_dam)
if target:isTalentActive(target.T_INTUITIVE_SHOTS) then
local chance = target:callTalent(target.T_INTUITIVE_SHOTS, "getChance")
- self.turn_procs.intuitive_shots = self.turn_procs.intuitive_shots or target:callTalent(target.T_INTUITIVE_SHOTS, "proc", self)
- if self.turn_procs.intuitive_shots == true then
- repelled = true
- end
+ repelled = target:callTalent(target.T_INTUITIVE_SHOTS, "proc", self)
end
-- Dwarves stoneskin
diff --git a/game/modules/tome/data/talents/techniques/reflexes.lua b/game/modules/tome/data/talents/techniques/reflexes.lua
index eeeac30e3b..144b69155c 100644
--- a/game/modules/tome/data/talents/techniques/reflexes.lua
+++ b/game/modules/tome/data/talents/techniques/reflexes.lua
@@ -136,6 +136,7 @@ newTalent{
-- called by _M:attackTarget in mod.class.interface.Combat.lua
proc = function(self, t, target)
if not rng.percent(t.getChance(self,t)) then return end
+ if target.turn_procs.intuitive_shots == true then return true end -- If we've proc'd once confirm the deflect but skip the counterattack
local old = self.energy.value
local weapon, ammo = self:hasArcheryWeapon()
if not weapon then return end
--
GitLab