fix

c23122036.lua

@@ -36,9 +36,11 @@ function c23122036.operation(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetReset(RESET_EVENT+0x1fe0000)
 		c:RegisterEffect(e1)
 		local e2=Effect.CreateEffect(c)
-		e2:SetType(EFFECT_TYPE_EQUIP)
-		e2:SetCode(EFFECT_AVOID_BATTLE_DAMAGE)
-		e2:SetValue(1)
+		e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+		e2:SetCode(EVENT_PRE_BATTLE_DAMAGE)
+		e2:SetRange(LOCATION_SZONE)
+		e2:SetCondition(c23122036.damcon)
+		e2:SetOperation(c23122036.damop)
 		e2:SetReset(RESET_EVENT+0x1fe0000)
 		c:RegisterEffect(e2)
 		--Equip limit
@@ -54,3 +56,10 @@ end
 function c23122036.valcon(e,re,r,rp)
 	return bit.band(r,REASON_BATTLE)~=0 and e:GetHandler():GetEquipTarget():IsPosition(POS_FACEUP_ATTACK)
 end
+function c23122036.damcon(e,tp,eg,ep,ev,re,r,rp)
+	local ec=e:GetHandler():GetEquipTarget()
+	return ec and ep==tp and (Duel.GetAttacker()==ec or Duel.GetAttackTarget()==ec)
+end
+function c23122036.damop(e,tp,eg,ep,ev,re,r,rp)
+	Duel.ChangeBattleDamage(tp,0)
+end

c88610708.lua

@@ -24,9 +24,11 @@ function c88610708.initial_effect(c)
 	c:RegisterEffect(e3)
 	--no damage
 	local e4=Effect.CreateEffect(c)
-	e4:SetType(EFFECT_TYPE_EQUIP)
-	e4:SetCode(EFFECT_AVOID_BATTLE_DAMAGE)
-	e4:SetValue(1)
+	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e4:SetCode(EVENT_PRE_BATTLE_DAMAGE)
+	e4:SetRange(LOCATION_SZONE)
+	e4:SetCondition(c88610708.damcon)
+	e4:SetOperation(c88610708.damop)
 	c:RegisterEffect(e4)
 end
 function c88610708.eqlimit(e,c)
@@ -49,3 +51,10 @@ function c88610708.operation(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Equip(tp,c,tc)
 	end
 end
+function c88610708.damcon(e,tp,eg,ep,ev,re,r,rp)
+	local ec=e:GetHandler():GetEquipTarget()
+	return ec and ep==tp and (Duel.GetAttacker()==ec or Duel.GetAttackTarget()==ec)
+end
+function c88610708.damop(e,tp,eg,ep,ev,re,r,rp)
+	Duel.ChangeBattleDamage(tp,0)
+end