warden's focus better

game/modules/tome/class/interface/Archery.lua

@@ -189,8 +189,8 @@ local function archery_projectile(tx, ty, tg, self, tmp)
 	if self:hasEffect(self.EFF_WARDEN_S_FOCUS) then
 		local eff = self:hasEffect(self.EFF_WARDEN_S_FOCUS)
 		if target == eff.target then
-			tg.archery.crit_chance = (tg.archery.crit_chance or 0) + eff.crit
-			tg.archery.crit_power = (tg.archery.crit_power or 0) + eff.crit_power
+			tg.archery.crit_chance = (tg.archery.crit_chance or 0) + eff.power
+			tg.archery.crit_power = (tg.archery.crit_power or 0) + (eff.power/100)
 		end
 	end
 

game/modules/tome/class/interface/Combat.lua

@@ -430,9 +430,8 @@ function _M:attackTargetWith(target, weapon, damtype, mult, force_dam)
 	end
 	
 	if target:hasEffect(target.EFF_WARDEN_S_FOCUS) and target:hasDualWeapon() then
-		game.logPlayer(self, "test!")
 		local eff = target:hasEffect(target.EFF_WARDEN_S_FOCUS)
-		if eff.target == self and rng.percent(eff.parry) then
+		if eff.target == self and rng.percent(eff.power) then
 			game.logSeen(target, "#ORCHID#%s parries the attack with %s dual weapons!#LAST#", target.name:capitalize(), string.his_her(target))
 			repelled = true
 		end

game/modules/tome/data/talents/chronomancy/guardian.lua

@@ -142,23 +142,12 @@ newTalent{
 			end
 		end
 	end,
-	callbackOnTakeDamage = function(self, t, src, x, y, type, dam, tmp)
-		local eff = self:hasEffect(self.EFF_WARDEN_S_FOCUS)
-		if eff and dam > 0 and eff.target ~= src and src ~= self and (src.rank and src.rank < 3) then
-			-- Reduce damage
-			local reduction = dam * self:callTalent(self.T_VIGILANCE, "getPower")/100
-			dam = dam -  reduction
-			game:delayedLogDamage(src, self, 0, ("%s(%d vigilance)#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", reduction), false)
-		end
-		return {dam=dam}
-	end,
 	info = function(self, t)
 		local sense = t.getSense(self, t)
 		local power = t.getPower(self, t)
 		return ([[Improves your capacity to see invisible foes by +%d and to see through stealth by +%d.  Additionally you have a %d%% chance to recover from a single negative status effect each turn.
-		While Warden's Focus is active you also take %d%% less damage from vermin and normal rank enemies, if they're not also your focus target.
 		Sense abilities will scale with your Magic stat.]]):
-		format(sense, sense, power, power)
+		format(sense, sense, power)
 	end,
 }
 
@@ -182,8 +171,7 @@ newTalent{
 	is_melee = function(self, t) return not self:hasArcheryWeapon() end,
 	speed = function(self, t) return self:hasArcheryWeapon() and "archery" or "weapon" end,
 	on_pre_use = function(self, t, silent) if self:attr("disarmed") then if not silent then game.logPlayer(self, "You require a weapon to use this talent.") end return false end return true end,
-	getCrit = function(self, t) return self:combatTalentLimit(t, 40, 10, 30) end, -- Limit < 40%
-	getParry = function(self, t) return self:combatTalentLimit(t, 40, 10, 30) end, -- Limit < 40%
+	getPower = function(self, t) return self:combatTalentLimit(t, 40, 10, 30) end, -- Limit < 40%
 	getDamage = function(self, t) return 1.2 end,
 	action = function(self, t)
 		-- Grab our target so we can set our effect
@@ -202,17 +190,17 @@ newTalent{
 			self:attackTarget(target, nil, t.getDamage(self, t), true)
 		end
 		
-		self:setEffect(self.EFF_WARDEN_S_FOCUS, 10, {target=target, parry=t.getParry(self, t), crit=t.getCrit(self, t), crit_power=t.getCrit(self, t)/100})
+		self:setEffect(self.EFF_WARDEN_S_FOCUS, 10, {target=target, power=t.getPower(self, t)})
 		target:setEffect(target.EFF_WARDEN_S_TARGET, 10, {src=self})
 		
 		return true
 	end,
 	info = function(self, t)
-		local crit = t.getCrit(self, t)
 		local damage = t.getDamage(self, t) * 100
-		local parry = t.getParry(self, t)
-		return ([[Attack the target with either your ranged or melee weapons for %d%% weapon damage.  For the next six turns random targeting, such as from Blink Blade and Warden's Call, will focus on this target.
-		Additionally your bow attacks gain %d%% critical chance and critical strike power against the target and you have a %d%% chance to parry melee attacks from the target while you have your blades equipped.]])
-		:format(damage, crit, parry)
+		local power = t.getPower(self, t)
+		return ([[Attack the target with either your ranged or melee weapons for %d%% weapon damage.  For the next ten turns random targeting, such as from Blink Blade and Warden's Call, will focus on this target.
+		Additionally your bow attacks gain %d%% critical chance and critical strike power against the target and you have a %d%% chance to parry melee attacks from the target while you have your blades equipped.
+		While Warden's Focus is active you also take %d%% less damage from vermin and normal rank enemies, if they're not also your focus target.]])
+		:format(damage, power, power, power)
 	end
 }
\ No newline at end of file

game/modules/tome/data/timed_effects/magical.lua

@@ -3453,14 +3453,24 @@ newEffect{
 	name = "WARDEN_S_FOCUS", image = "talents/warden_s_focus.png",
 	desc = "Warden's Focus",
 	long_desc = function(self, eff) 
-		return ("Focused on %s, +%d%% critical strike damage and +%d%% critical hit chance with ranged attacks against this target and %d%% chance to parry melee attacks from this target."):format(eff.target.name, eff.crit_power *100, eff.crit, eff.parry)
+		return ("Focused on %s, +%d%% critical strike damage and +%d%% critical hit chance with ranged attacks against this target and %d%% chance to parry melee attacks from this target."):format(eff.target.name, eff.power, eff.power, eff.power)
 	end,
 	type = "magical",
 	subtype = { tactic=true },
 	status = "beneficial",
 	on_gain = function(self, err) return nil, "+Warden's Focus" end,
 	on_lose = function(self, err) return nil, "-Warden's Focus" end,
-	parameters = { crit=0, crit_power=0, parry=0},
+	parameters = { power=0},
+	callbackOnTakeDamage = function(self, eff, src, x, y, type, dam, tmp)
+		local eff = self:hasEffect(self.EFF_WARDEN_S_FOCUS)
+		if eff and dam > 0 and eff.target ~= src and src ~= self and (src.rank and src.rank < 3) then
+			-- Reduce damage
+			local reduction = dam * eff.power/100
+			dam = dam -  reduction
+			game:delayedLogDamage(src, self, 0, ("%s(%d focus)#LAST#"):format(DamageType:get(type).text_color or "#aaaaaa#", reduction), false)
+		end
+		return {dam=dam}
+	end,
 	on_timeout = function(self, eff)
 		if eff.target.dead or not game.level:hasEntity(self) or not game.level:hasEntity(eff.target) or core.fov.distance(self.x, self.y, eff.target.x, eff.target.y) > 10 then
 			self:removeEffect(self.EFF_WARDEN_S_FOCUS)