Counterstrike also works to increase archery damage

git-svn-id: http://svn.net-core.org/repos/t-engine4@5292 51575b47-30f0-44d4-a5cc-537603b46e54

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

@@ -148,6 +148,14 @@ local function archery_projectile(tx, ty, tg, self, tmp)
 		local damrange = self:combatDamageRange(ammo)
 		dam = rng.range(dam, dam * damrange)
 		print("[ATTACK ARCHERY] after range", dam)
+
+		if target:hasEffect(target.EFF_COUNTERSTRIKE) then
+			dam = dam * 2
+			local eff = target.tmp[target.EFF_COUNTERSTRIKE]
+			eff.nb = eff.nb - 1
+			if eff.nb == 0 then target:removeEffect(target.EFF_COUNTERSTRIKE) end
+			print("[ATTACK] after counterstrike", dam)
+		end
 		
 		if ammo and ammo.inc_damage_type then
 			for t, idt in pairs(ammo.inc_damage_type) do

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

@@ -357,7 +357,6 @@ function _M:attackTargetWith(target, weapon, damtype, mult, force_dam)
 
 		if target:hasEffect(target.EFF_COUNTERSTRIKE) then
 			dam = dam * 2
-			--self:removeEffect(target.EFF_COUNTERSTRIKE)
 			local eff = target.tmp[target.EFF_COUNTERSTRIKE]
 			eff.nb = eff.nb - 1
 			if eff.nb == 0 then target:removeEffect(target.EFF_COUNTERSTRIKE) end