fix

c32391631.lua

@@ -33,35 +33,6 @@ function c32391631.initial_effect(c)
 	e5:SetTarget(c32391631.destg)
 	e5:SetOperation(c32391631.desop)
 	c:RegisterEffect(e5)
-	if not c32391631.global_check then
-		c32391631.global_check=true
-		local ge1=Effect.CreateEffect(c)
-		ge1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-		ge1:SetCode(EVENT_ATTACK_ANNOUNCE)
-		ge1:SetOperation(c32391631.check)
-		Duel.RegisterEffect(ge1,0)
-		local ge2=Effect.CreateEffect(c)
-		ge2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-		ge2:SetCode(EVENT_ATTACK_DISABLED)
-		ge2:SetOperation(c32391631.check2)
-		Duel.RegisterEffect(ge2,0)
-	end
-end
-function c32391631.check(e,tp,eg,ep,ev,re,r,rp)
-	local tc=eg:GetFirst()
-	local ct=tc:GetFlagEffectLabel(32391631)
-	if ct then
-		tc:SetFlagEffectLabel(32391631,ct+1)
-	else
-		tc:RegisterFlagEffect(32391631,RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END,0,1,1)
-	end
-end
-function c32391631.check2(e,tp,eg,ep,ev,re,r,rp)
-	local tc=eg:GetFirst()
-	local ct=tc:GetFlagEffectLabel(32391631)
-	if ct then
-		tc:SetFlagEffectLabel(32391631,ct-1)
-	end
 end
 function c32391631.rectg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
@@ -75,8 +46,7 @@ function c32391631.recop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Recover(p,d,REASON_EFFECT)
 end
 function c32391631.desfilter(c)
-	local ct=c:GetFlagEffectLabel(32391631)
-	return c:IsPosition(POS_FACEUP_ATTACK) and (not ct or ct==0)
+	return c:IsPosition(POS_FACEUP_ATTACK) and c:GetAttackAnnouncedCount()==0
 end
 function c32391631.destg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

c70902743.lua

@@ -25,35 +25,6 @@ function c70902743.initial_effect(c)
 	e2:SetTarget(c70902743.target2)
 	e2:SetOperation(c70902743.operation2)
 	c:RegisterEffect(e2)
-	if not c70902743.global_check then
-		c70902743.global_check=true
-		local ge1=Effect.CreateEffect(c)
-		ge1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-		ge1:SetCode(EVENT_ATTACK_ANNOUNCE)
-		ge1:SetOperation(c70902743.check)
-		Duel.RegisterEffect(ge1,0)
-		local ge2=Effect.CreateEffect(c)
-		ge2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-		ge2:SetCode(EVENT_ATTACK_DISABLED)
-		ge2:SetOperation(c70902743.check2)
-		Duel.RegisterEffect(ge2,0)
-	end
-end
-function c70902743.check(e,tp,eg,ep,ev,re,r,rp)
-	local tc=eg:GetFirst()
-	local ct=tc:GetFlagEffectLabel(70902743)
-	if ct then
-		tc:SetFlagEffectLabel(70902743,ct+1)
-	else
-		tc:RegisterFlagEffect(70902743,RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END,0,1,1)
-	end
-end
-function c70902743.check2(e,tp,eg,ep,ev,re,r,rp)
-	local tc=eg:GetFirst()
-	local ct=tc:GetFlagEffectLabel(70902743)
-	if ct then
-		tc:SetFlagEffectLabel(70902743,ct-1)
-	end
 end
 function c70902743.condition1(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetAttacker()==e:GetHandler() and Duel.GetAttackTarget() and not Duel.GetAttackTarget():IsAttackPos()
@@ -71,8 +42,7 @@ function c70902743.operation1(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Destroy(g,REASON_EFFECT)
 end
 function c70902743.filter2(c)
-	local ct=c:GetFlagEffectLabel(70902743)
-	return (not ct or ct==0)
+	return c:GetAttackAnnouncedCount()==0
 end
 function c70902743.condition2(e,tp,eg,ep,ev,re,r,rp)
 	return tp==Duel.GetTurnPlayer()

c96746083.lua

@@ -47,8 +47,8 @@ function c96746083.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,nil,2,tp,LOCATION_MZONE)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,c,1,0,0)
 end
-function c96746083.rmfilter(c,tp)
-	return c:IsType(TYPE_MONSTER) and c:IsAbleToRemove(tp)
+function c96746083.rmfilter(c)
+	return c:IsType(TYPE_MONSTER) and c:IsAbleToRemove()
 end
 function c96746083.spop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
@@ -83,7 +83,7 @@ function c96746083.spop(e,tp,eg,ep,ev,re,r,rp)
 		if Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)==0 then
 			return
 		end
-		local rg=Duel.GetMatchingGroup(c96746083.rmfilter,tp,0,LOCATION_MZONE+LOCATION_GRAVE,nil,tp)
+		local rg=Duel.GetMatchingGroup(c96746083.rmfilter,tp,0,LOCATION_MZONE+LOCATION_GRAVE,nil)
 		if rm and rg:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(96746083,0)) then
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 			local tg=rg:Select(tp,1,1,nil)