ndyd

expansions/script/c12030007.lua

@@ -143,13 +143,13 @@ function c12030007.drop(e,tp,eg,ep,ev,re,r,rp)
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_SINGLE)
 		e1:SetCode(EFFECT_DISABLE)
-		e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
+		e1:SetReset(RESET_EVENT+RESETS_STANDARD)
 		tc:RegisterEffect(e1)
 		local e2=Effect.CreateEffect(c)
 		e2:SetType(EFFECT_TYPE_SINGLE)
 		e2:SetCode(EFFECT_DISABLE_EFFECT)
 		e2:SetValue(RESET_TURN_SET)
-		e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
+		e2:SetReset(RESET_EVENT+RESETS_STANDARD)
 		tc:RegisterEffect(e2)
 		Duel.BreakEffect()
 	 end

expansions/script/c12062011.lua

@@ -63,7 +63,7 @@ function cm.efilter(e,re)
 end
 function cm.spfilter(c,ft,tp)
 	return c:GetAttackAnnouncedCount()~=0 and c:IsCode(12062001)
-		and (ft>0 or (c:IsControler(tp) and c:GetSequence()<5)) and (c:IsControler(tp) or c:IsFaceup())
+		and (ft>0 or (c:IsControler(tp) and c:GetSequence()<5)) and c:IsFaceup()
 end
 function cm.spcon(e,c)
 	if c==nil then return true end

expansions/script/c12062020.lua

@@ -94,7 +94,7 @@ function cm.desop(e,tp)
 end
 function cm.spfilter(c,ft,tp)
 	return c:GetAttackAnnouncedCount()~=0 and c:IsCode(12062002)
-		and (ft>0 or (c:IsControler(tp) and c:GetSequence()<5)) and (c:IsControler(tp) or c:IsFaceup())
+		and (ft>0 or (c:IsControler(tp) and c:GetSequence()<5)) and c:IsFaceup()
 end
 function cm.spcon(e,c)
 	if c==nil then return true end

expansions/script/c12062030.lua

@@ -90,7 +90,7 @@ function cm.desop(e,tp)
 end
 function cm.spfilter1(c,ft,tp)
 	return c:GetAttackAnnouncedCount()~=0 and c:IsCode(12062003)
-		and (ft>0 or (c:IsControler(tp) and c:GetSequence()<5)) and (c:IsControler(tp) or c:IsFaceup())
+		and (ft>0 or (c:IsControler(tp) and c:GetSequence()<5)) and c:IsFaceup()
 end
 function cm.spcon(e,c)
 	if c==nil then return true end

expansions/script/c12062040.lua

@@ -68,7 +68,7 @@ function cm.spop1(e,tp,eg,ep,ev,re,r,rp)
 end
 function cm.spfilter1(c,ft,tp)
 	return c:GetAttackAnnouncedCount()~=0 and c:IsCode(12062004)
-		and (ft>0 or (c:IsControler(tp) and c:GetSequence()<5)) and (c:IsControler(tp) or c:IsFaceup())
+		and (ft>0 or (c:IsControler(tp) and c:GetSequence()<5)) and c:IsFaceup()
 end
 function cm.spcon(e,c)
 	if c==nil then return true end

expansions/script/c12062050.lua

@@ -63,7 +63,7 @@ function cm.desop(e,tp)
 end
 function cm.spfilter(c,ft,tp)
 	return c:GetAttackAnnouncedCount()~=0 and c:IsCode(12062005)
-		and (ft>0 or (c:IsControler(tp) and c:GetSequence()<5)) and (c:IsControler(tp) or c:IsFaceup())
+		and (ft>0 or (c:IsControler(tp) and c:GetSequence()<5)) and  c:IsFaceup()
 end
 function cm.spcon(e,c)
 	if c==nil then return true end

expansions/script/c12062060.lua

@@ -70,7 +70,7 @@ function cm.desop(e,tp)
 end
 function cm.spfilter(c,ft,tp)
 	return c:GetAttackAnnouncedCount()~=0 and c:IsCode(12026026)
-		and (ft>0 or (c:IsControler(tp) and c:GetSequence()<5)) and (c:IsControler(tp) or c:IsFaceup())
+		and (ft>0 or (c:IsControler(tp) and c:GetSequence()<5)) and  c:IsFaceup()
 end
 function cm.spcon(e,c)
 	if c==nil then return true end