hop

expansions/script/c60002010.lua

@@ -83,7 +83,7 @@ function cm.cvop2(e,tp,eg,ep,ev,re,r,rp)
 		end
 	end
 end
-function cm.filter(c,e,re)
+function cm.efilter(e,re)
 	return e:GetOwnerPlayer()~=re:GetOwnerPlayer() and re:IsActivated()
 end
 function cm.ofilter(c)
@@ -91,29 +91,21 @@ function cm.ofilter(c)
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 	local t=Duel.GetFlagEffect(tp,60002009)
-	if Duel.GetTurnCount()+t>=2 then
-		if Duel.GetCurrentPhase()==PHASE_MAIN1 then
+	if Duel.GetTurnCount()+t>=2 and Duel.GetFlagEffect(tp,m)==0 then
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetType(EFFECT_TYPE_FIELD)
 		e1:SetCode(EFFECT_IMMUNE_EFFECT)
 		e1:SetTargetRange(LOCATION_MZONE,0)
-			e1:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0xa620))
-			e1:SetValue(cm.filter)
+		e1:SetTarget(aux.TargetBoolFunction(Card.IsLevelAbove,9))
+		e1:SetValue(cm.efilter)
+		if Duel.GetCurrentPhase()==PHASE_MAIN1 then
 			e1:SetReset(RESET_PHASE+PHASE_MAIN1)
 			Duel.RegisterFlagEffect(tp,m,RESET_PHASE+PHASE_MAIN1,0,1)
-			Duel.RegisterEffect(e1,tp)
-		elseif Duel.GetCurrentPhase()==PHASE_MAIN2 then
-			local e1=Effect.CreateEffect(e:GetHandler())
-			e1:SetType(EFFECT_TYPE_FIELD)
-			e1:SetCode(EFFECT_IMMUNE_EFFECT)
-			e1:SetTargetRange(LOCATION_MZONE,0)
-			e1:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0xa620))
-			e1:SetValue(cm.filter)
+		else
 			e1:SetReset(RESET_PHASE+PHASE_MAIN2)
 			Duel.RegisterFlagEffect(tp,m,RESET_PHASE+PHASE_MAIN2,0,1)
-			Duel.RegisterEffect(e1,tp)
 		end
-		
+		Duel.RegisterEffect(e1,tp)
 	end
 	Duel.RegisterFlagEffect(tp,60002009,RESET_PHASE+PHASE_END,0,1000)
 	if Duel.IsExistingMatchingCard(cm.ofilter,tp,LOCATION_FZONE,0,1,c) then