fix (#990)

c19700943.lua

@@ -8,25 +8,20 @@ function c19700943.initial_effect(c)
 	c:RegisterEffect(e1)
 	--immune
 	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_ATTACK_ANNOUNCE)
-	e2:SetOperation(c19700943.atkop)
+	e2:SetType(EFFECT_TYPE_SINGLE)
+	e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e2:SetRange(LOCATION_MZONE)
+	e2:SetCode(EFFECT_IMMUNE_EFFECT)
+	e2:SetCondition(c19700943.immcon)
+	e2:SetValue(c19700943.efilter)
 	c:RegisterEffect(e2)
 end
 function c19700943.sumcon(e,c,minc)
 	if not c then return true end
 	return false
 end
-function c19700943.atkop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetCode(EFFECT_IMMUNE_EFFECT)
-	e1:SetValue(c19700943.efilter)
-	e1:SetReset(RESET_PHASE+PHASE_DAMAGE)
-	c:RegisterEffect(e1)
+function c19700943.immcon(e)
+	return Duel.GetAttacker()==e:GetHandler()
 end
 function c19700943.efilter(e,te)
 	return te:GetOwner()~=e:GetOwner()

c41517789.lua

@@ -23,24 +23,20 @@ function c41517789.initial_effect(c)
 	c:RegisterEffect(e3)
 	--immune
 	local e4=Effect.CreateEffect(c)
-	e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e4:SetCode(EVENT_ATTACK_ANNOUNCE)
-	e4:SetOperation(c41517789.atkop)
+	e4:SetType(EFFECT_TYPE_SINGLE)
+	e4:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e4:SetRange(LOCATION_MZONE)
+	e4:SetCode(EFFECT_IMMUNE_EFFECT)
+	e4:SetCondition(c41517789.immcon)
+	e4:SetValue(c41517789.efilter)
 	c:RegisterEffect(e4)
 end
 function c41517789.sumsuc(e,tp,eg,ep,ev,re,r,rp)
 	if not e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) then return end
 	Duel.SetChainLimitTillChainEnd(aux.FALSE)
 end
-function c41517789.atkop(e,tp,eg,ep,ev,re,r,rp)
-	local e1=Effect.CreateEffect(e:GetHandler())
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetCode(EFFECT_IMMUNE_EFFECT)
-	e1:SetValue(c41517789.efilter)
-	e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_DAMAGE)
-	e:GetHandler():RegisterEffect(e1)
+function c41517789.immcon(e)
+	return Duel.GetAttacker()==e:GetHandler()
 end
 function c41517789.efilter(e,te)
 	return te:GetOwner()~=e:GetOwner()

c86274272.lua

@@ -20,9 +20,12 @@ function c86274272.initial_effect(c)
 	c:RegisterEffect(e2)
 	--immune
 	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e3:SetCode(EVENT_ATTACK_ANNOUNCE)
-	e3:SetOperation(c86274272.atkop)
+	e3:SetType(EFFECT_TYPE_SINGLE)
+	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e3:SetRange(LOCATION_MZONE)
+	e3:SetCode(EFFECT_IMMUNE_EFFECT)
+	e3:SetCondition(c86274272.immcon)
+	e3:SetValue(c86274272.efilter)
 	c:RegisterEffect(e3)
 	--special summon
 	local e4=Effect.CreateEffect(c)
@@ -66,16 +69,8 @@ function c86274272.sprop(e,tp,eg,ep,ev,re,r,rp,c)
 	c:SetMaterial(g1)
 	Duel.Remove(g1,POS_FACEUP,REASON_COST)
 end
-function c86274272.atkop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetCode(EFFECT_IMMUNE_EFFECT)
-	e1:SetValue(c86274272.efilter)
-	e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_DAMAGE)
-	c:RegisterEffect(e1)
+function c86274272.immcon(e)
+	return Duel.GetAttacker()==e:GetHandler()
 end
 function c86274272.efilter(e,te)
 	return te:GetOwner()~=e:GetOwner()