Nowhere

expansions/script/c20200007.lua

@@ -39,7 +39,7 @@ function c20200007.initial_effect(c)
 	local e6=Effect.CreateEffect(c)
 	e6:SetDescription(aux.Stringid(20200007,1))
 	e6:SetCategory(CATEGORY_CONTROL)
-	e6:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
+	e6:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e6:SetType(EFFECT_TYPE_QUICK_O)
 	e6:SetRange(LOCATION_SZONE)
 	e6:SetCode(EVENT_FREE_CHAIN)

expansions/script/c26818034.lua

@@ -9,6 +9,13 @@ function cm.initial_effect(c)
 	c:EnableReviveLimit()
 	aux.AddFusionProcFunRep(c,cm.ffilter,2,true)
 	aux.AddContactFusionProcedure(c,Card.IsAbleToGraveAsCost,LOCATION_MZONE,0,Duel.SendtoGrave,REASON_COST)
+	--special summon condition
+	local e9=Effect.CreateEffect(c)
+	e9:SetType(EFFECT_TYPE_SINGLE)
+	e9:SetCode(EFFECT_SPSUMMON_CONDITION)
+	e9:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	e9:SetValue(cm.splimit)
+	c:RegisterEffect(e9)
 	--Negate
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))
@@ -40,6 +47,9 @@ end
 function cm.ffilter(c)
 	return (aux.IsCodeListed(c,26818000) or aux.IsCodeListed(c,26818001)) and c:IsFusionType(TYPE_MONSTER)
 end
+function cm.splimit(e,se,sp,st)
+	return not e:GetHandler():IsLocation(LOCATION_EXTRA)
+end
 function cm.negcon(e,tp,eg,ep,ev,re,r,rp)
 	local ph=Duel.GetCurrentPhase()
 	return ep~=tp and Duel.IsChainNegatable(ev) and ph>PHASE_MAIN1 and ph<PHASE_MAIN2

expansions/script/c33400601.lua

@@ -19,7 +19,6 @@ function cm.initial_effect(c)
 	e2:SetCategory(CATEGORY_TODECK+CATEGORY_REMOVE)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_REMOVED)
-	e2:SetProperty(EFFECT_FLAG_NO_TURN_RESET)
 	e2:SetCountLimit(1,m+10000)
 	e2:SetCondition(cm.tdcon1)
 	e2:SetTarget(cm.tdtg)
@@ -52,10 +51,10 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 
 function cm.tdcon1(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetFlagEffect(tp,33460651)==0
+	return Duel.GetFlagEffect(tp,33460651)==0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.tdcon2(e,tp,eg,ep,ev,re,r,rp) 
-	return Duel.GetFlagEffect(tp,33460651)>0 
+	return Duel.GetFlagEffect(tp,33460651)>0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.tdfilter(c,tp)
 	return  c:IsSetCard(0x340,0x341) and c:IsAbleToDeck() and Duel.IsExistingMatchingCard(cm.refilter,tp,LOCATION_DECK,0,1,nil,c:GetCode(),tp)
@@ -68,6 +67,7 @@ function cm.tdtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.tdfilter,tp,LOCATION_REMOVED,0,1,nil,tp) end  
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,1,tp,LOCATION_REMOVED)
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_DECK)
+	e:GetHandler():RegisterFlagEffect(m,0,0,0)
 end
 function cm.tdop(e,tp,eg,ep,ev,re,r,rp)
 Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)

expansions/script/c33400602.lua

@@ -8,7 +8,6 @@ function cm.initial_effect(c)
 	e2:SetCategory(CATEGORY_REMOVE)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_REMOVED)
-	e2:SetProperty(EFFECT_FLAG_NO_TURN_RESET)
 	e2:SetCountLimit(1,m)
 	e2:SetCondition(cm.tdcon1)
 	e2:SetTarget(cm.tdtg)
@@ -65,24 +64,24 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e51)
 end
 function cm.tdcon1(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetFlagEffect(tp,33460651)==0 
+	return Duel.GetFlagEffect(tp,33460651)==0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.tdcon2(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetFlagEffect(tp,33460651)>0 
+	return Duel.GetFlagEffect(tp,33460651)>0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.refilter(c,tp)
-	return  c:IsSetCard(0x9342) and c:IsAbleToRemove()  and Duel.GetFlagEffect(tp,c:GetCode()+10000)==0
+	return  c:IsSetCard(0x9342) and c:IsAbleToRemove()  
 end
 function cm.tdtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.refilter,tp,LOCATION_DECK,0,1,nil,tp) end   
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_DECK)
+ e:GetHandler():RegisterFlagEffect(m,0,0,0)	
 end
 function cm.tdop(e,tp,eg,ep,ev,re,r,rp)  
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) 
 		local g2=Duel.SelectMatchingCard(tp,cm.refilter,tp,LOCATION_DECK,0,1,1,nil,tp)
 		local tc2=g2:GetFirst()
 		Duel.Remove(tc2,POS_FACEUP,REASON_EFFECT)		   
-		Duel.RegisterFlagEffect(tp,tc2:GetCode()+10000,RESET_EVENT+RESET_PHASE+PHASE_END,0,0)		
 end
 
 function cm.con1(e,tp,eg,ep,ev,re,r,rp)
@@ -94,8 +93,8 @@ function cm.xyzfilter(c)
 	return c:IsXyzSummonable(nil)
 end
 function cm.xyztg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.xyzfilter,tp,LOCATION_EXTRA,0,1,nil) and e:GetHandler():GetFlagEffect(m)==0 end
-e:GetHandler():RegisterFlagEffect(m,RESET_CHAIN,0,1)
+	if chk==0 then return Duel.IsExistingMatchingCard(cm.xyzfilter,tp,LOCATION_EXTRA,0,1,nil) and e:GetHandler():GetFlagEffect(m+1)==0 end
+e:GetHandler():RegisterFlagEffect(m+1,RESET_CHAIN,0,1)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
 end
 function cm.xyzop(e,tp,eg,ep,ev,re,r,rp)
@@ -108,8 +107,8 @@ function cm.xyzop(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsPlayerCanDraw(tp,1)  and e:GetHandler():GetFlagEffect(m)==0 end
-e:GetHandler():RegisterFlagEffect(m,RESET_CHAIN,0,1)
+	if chk==0 then return Duel.IsPlayerCanDraw(tp,1)  and e:GetHandler():GetFlagEffect(m+1)==0 end
+e:GetHandler():RegisterFlagEffect(m+1,RESET_CHAIN,0,1)
 	Duel.SetTargetPlayer(tp)
 	Duel.SetTargetParam(1)
 	Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1)

expansions/script/c33400603.lua

@@ -8,7 +8,6 @@ function cm.initial_effect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_REMOVED)
-	e1:SetProperty(EFFECT_FLAG_NO_TURN_RESET)
 	e1:SetCountLimit(1,m)
 	e1:SetCondition(cm.spcon)
 	e1:SetTarget(cm.sptg)
@@ -43,10 +42,10 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e51)
 end
 function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)==0
+	 return Duel.GetFlagEffect(tp,33460651)==0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.spcon2(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)>0
+	 return Duel.GetFlagEffect(tp,33460651)>0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.spfilter(c,e,tp)
 	return c:IsSetCard(0x9342,0xc342)  and c:IsCanBeSpecialSummoned(e,0,tp,false,false) 
@@ -56,6 +55,7 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and Duel.IsExistingMatchingCard(cm.spfilter,tp,LOCATION_HAND+LOCATION_REMOVED,0,1,c,e,tp) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND+LOCATION_REMOVED)
+ e:GetHandler():RegisterFlagEffect(m,0,0,0) 
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end

expansions/script/c33400604.lua

@@ -8,7 +8,6 @@ function cm.initial_effect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_REMOVED)
-	e1:SetProperty(EFFECT_FLAG_NO_TURN_RESET)
 	e1:SetCountLimit(1,m)
 	e1:SetCondition(cm.spcon)
 	e1:SetTarget(cm.sptg)
@@ -43,10 +42,10 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e51)
 end
 function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)==0
+	 return Duel.GetFlagEffect(tp,33460651)==0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.spcon2(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)>0
+	 return Duel.GetFlagEffect(tp,33460651)>0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.spfilter(c,e,tp)
 	return c:IsSetCard(0x9342,0xc342)  and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
@@ -56,6 +55,7 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and Duel.IsExistingMatchingCard(cm.spfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,c,e,tp) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_GRAVE+LOCATION_REMOVED)
+  e:GetHandler():RegisterFlagEffect(m,0,0,0)	
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end

expansions/script/c33400605.lua

@@ -18,7 +18,6 @@ function cm.initial_effect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_REMOVED)
-	e1:SetProperty(EFFECT_FLAG_NO_TURN_RESET)
 	e1:SetCountLimit(1,m+10000)
 	e1:SetCondition(cm.spcon)
 	e1:SetTarget(cm.target)
@@ -51,26 +50,25 @@ function cm.tgop(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 
 function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)==0 
+	 return Duel.GetFlagEffect(tp,33460651)==0  and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.spcon2(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)>0 
+	 return Duel.GetFlagEffect(tp,33460651)>0  and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.filter1(c,e,tp)
 	local rk=c:GetRank()
 	return c:IsFaceup() and c:IsAttribute(ATTRIBUTE_DARK) and c:IsRace(RACE_SPELLCASTER) and c:IsType(TYPE_XYZ)
 		and Duel.IsExistingMatchingCard(cm.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,c,rk+2)	
-		and Duel.GetLocationCountFromEx(tp,tp,c)>0
 		and aux.MustMaterialCheck(c,tp,EFFECT_MUST_BE_XMATERIAL)
 end
 function cm.filter2(c,e,tp,mc,rk)
-	return c:IsRank(rk) and  c:IsAttribute(ATTRIBUTE_DARK) and c:IsRace(RACE_SPELLCASTER) and c:IsSetCard(0x341) and mc:IsCanBeXyzMaterial(c)
-		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false)
+	return c:IsRank(rk) and  c:IsAttribute(ATTRIBUTE_DARK) and c:IsRace(RACE_SPELLCASTER) and c:IsSetCard(0x341) and mc:IsCanBeXyzMaterial(c)  and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false) and Duel.GetLocationCountFromEx(tp,tp,mc,c)>0
 end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_MZONE) and cm.filter1(chkc,e,tp) end
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.filter1,tp,LOCATION_MZONE,0,1,nil,e,tp) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
+ e:GetHandler():RegisterFlagEffect(m,0,0,0) 
 end
 function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 if not Duel.IsExistingMatchingCard(cm.filter1,tp,LOCATION_MZONE,0,1,nil,e,tp) then return end

expansions/script/c33400606.lua

@@ -8,7 +8,6 @@ function cm.initial_effect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_REMOVED)
-	e1:SetProperty(EFFECT_FLAG_NO_TURN_RESET)
 	e1:SetCountLimit(1,m)
 	e1:SetCondition(cm.spcon)
 	e1:SetTarget(cm.sptg)
@@ -41,15 +40,16 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e51)
 end
 function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)==0
+	 return Duel.GetFlagEffect(tp,33460651)==0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.spcon2(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)>0
+	 return Duel.GetFlagEffect(tp,33460651)>0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0   end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_REMOVED)
+e:GetHandler():RegisterFlagEffect(m,0,0,0)  
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 local c=e:GetHandler()

expansions/script/c33400607.lua

@@ -22,8 +22,7 @@ function cm.initial_effect(c)
 	e1:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_DEFCHANGE)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_REMOVED)
-	e1:SetProperty(EFFECT_FLAG_NO_TURN_RESET)
-	e1:SetCountLimit(1,m)
+	e1:SetCountLimit(1,m+10000)
 	e1:SetCondition(cm.atkcon)
 	e1:SetTarget(cm.atktg)
 	e1:SetOperation(cm.atkop)
@@ -74,15 +73,16 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function cm.atkcon(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)==0
+	 return Duel.GetFlagEffect(tp,33460651)==0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.atkcon2(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)>0
+	 return Duel.GetFlagEffect(tp,33460651)>0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.atktg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if chk==0 then return  Duel.IsExistingMatchingCard(Card.IsFaceup,tp,LOCATION_MZONE,0,1,nil) end
 	Duel.SetOperationInfo(0,CATEGORY_ATKCHANGE+CATEGORY_DEFCHANGE,nil,1,tp,LOCATION_MZONE)
+e:GetHandler():RegisterFlagEffect(m,0,0,0)  
 end
 function cm.atkop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c33400608.lua

@@ -21,7 +21,6 @@ function cm.initial_effect(c)
 	e1:SetCategory(CATEGORY_REMOVE)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_REMOVED)
-	e1:SetProperty(EFFECT_FLAG_NO_TURN_RESET)
 	e1:SetCountLimit(1,m+10000)
 	e1:SetCondition(cm.rmcon1)
 	e1:SetTarget(cm.rmtg1)
@@ -82,15 +81,16 @@ function cm.retop(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function cm.rmcon1(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)==0
+	 return Duel.GetFlagEffect(tp,33460651)==0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.rmcon2(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)>0
+	 return Duel.GetFlagEffect(tp,33460651)>0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.rmtg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if chk==0 then return  Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,LOCATION_GRAVE,0,1,nil) end
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_GRAVE)
+e:GetHandler():RegisterFlagEffect(m,0,0,0)  
 end
 function cm.rmop1(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c33400609.lua

@@ -37,7 +37,6 @@ function cm.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_IGNITION)
 	e3:SetRange(LOCATION_REMOVED)
-	e3:SetProperty(EFFECT_FLAG_NO_TURN_RESET)
 	e3:SetCountLimit(1,m+20000)
 	e3:SetCondition(cm.spcon)
 	e3:SetTarget(cm.sptg)
@@ -126,14 +125,15 @@ function cm.rmop1(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)==0
+	 return Duel.GetFlagEffect(tp,33460651)==0  and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.spcon2(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)>0
+	 return Duel.GetFlagEffect(tp,33460651)>0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsFaceup,tp,LOCATION_MZONE,0,1,nil) end
+e:GetHandler():RegisterFlagEffect(m,0,0,0)  
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.IsExistingMatchingCard(Card.IsFaceup,tp,LOCATION_MZONE,0,1,nil) then return end

expansions/script/c33400610.lua

@@ -35,7 +35,6 @@ function cm.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_IGNITION)
 	e3:SetRange(LOCATION_REMOVED)
-	e3:SetProperty(EFFECT_FLAG_NO_TURN_RESET)
 	e3:SetCountLimit(1,m+20000)
 	e3:SetCondition(cm.spcon)
 	e3:SetTarget(cm.sptg)
@@ -128,16 +127,17 @@ function cm.disop(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)==0
+	 return Duel.GetFlagEffect(tp,33460651)==0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.spcon2(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)>0
+	 return Duel.GetFlagEffect(tp,33460651)>0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
    if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,LOCATION_ONFIELD,0,1,nil) and 
 	Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,0,LOCATION_ONFIELD,1,nil) end
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_ONFIELD)
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,1-tp,LOCATION_ONFIELD)
+ e:GetHandler():RegisterFlagEffect(m,0,0,0) 
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c33400611.lua

@@ -31,7 +31,6 @@ function cm.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_IGNITION)
 	e3:SetRange(LOCATION_REMOVED)
-	e3:SetProperty(EFFECT_FLAG_NO_TURN_RESET)
 	e3:SetCountLimit(1,m+10000)
 	e3:SetCondition(cm.dmcon)
 	e3:SetTarget(cm.dmtg)
@@ -98,13 +97,14 @@ function cm.desop(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function cm.dmcon(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)==0
+	 return Duel.GetFlagEffect(tp,33460651)==0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.dmcon2(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)>0
+	 return Duel.GetFlagEffect(tp,33460651)>0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.dmtg(e,tp,eg,ep,ev,re,r,rp,chk)
    if chk==0 then return Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_MZONE,0,1,nil,0x341) end
+e:GetHandler():RegisterFlagEffect(m,0,0,0)	
 end
 function cm.dmop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c33400612.lua

@@ -27,7 +27,6 @@ function cm.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_IGNITION)
 	e3:SetRange(LOCATION_REMOVED)
-	e3:SetProperty(EFFECT_FLAG_NO_TURN_RESET)
 	e3:SetCountLimit(1,m+10000)
 	e3:SetCondition(cm.setcon)
 	e3:SetTarget(cm.settg)
@@ -117,10 +116,10 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function cm.setcon(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)==0
+	 return Duel.GetFlagEffect(tp,33460651)==0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.setcon2(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)>0
+	 return Duel.GetFlagEffect(tp,33460651)>0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.setfilter(c,tp)
 	return c:IsType(TYPE_SPELL,TYPE_TRAP)  and c:IsSetCard(0x340,0x341) and  c:IsSSetable(true) and (c:IsType(TYPE_FIELD) or Duel.GetLocationCount(tp,LOCATION_SZONE)>0)
@@ -128,6 +127,7 @@ end
 function cm.settg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_REMOVED) and cm.setfilter(chkc,tp) end
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.setfilter,tp,LOCATION_REMOVED,0,1,nil,tp) end 
+ e:GetHandler():RegisterFlagEffect(m,0,0,0)	  
 end
 function cm.setop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()  

expansions/script/c33400617.lua

@@ -25,7 +25,6 @@ function cm.initial_effect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_REMOVED)
-	e1:SetProperty(EFFECT_FLAG_NO_TURN_RESET)
 	e1:SetCountLimit(1,m+10000)
 	e1:SetCondition(cm.spcon)
 	e1:SetTarget(cm.sptg)
@@ -68,10 +67,10 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)==0
+	 return Duel.GetFlagEffect(tp,33460651)==0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.spcon2(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)>0
+	 return Duel.GetFlagEffect(tp,33460651)>0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.spfilter(c,e,tp)
 	return c:IsSetCard(0x341) and c:IsLevel(4) and c:IsAttribute(ATTRIBUTE_DARK) and c:IsRace(RACE_SPELLCASTER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) 
@@ -81,6 +80,7 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and Duel.IsExistingMatchingCard(cm.spfilter,tp,LOCATION_REMOVED,0,1,nil,e,tp) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_REMOVED)
+e:GetHandler():RegisterFlagEffect(m,0,0,0)	
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end

expansions/script/c33400636.lua

@@ -63,13 +63,12 @@ function cm.initial_effect(c)
 	e6:SetTarget(cm.target)
 	e6:SetOperation(cm.activate)
 	c:RegisterEffect(e6)
- --todeck
+ --rm+sp
 	local e7=Effect.CreateEffect(c)
 	e7:SetDescription(aux.Stringid(m,0))
 	e7:SetCategory(CATEGORY_REMOVE+CATEGORY_SPECIAL_SUMMON)
 	e7:SetType(EFFECT_TYPE_IGNITION)
 	e7:SetRange(LOCATION_REMOVED)
-	e7:SetProperty(EFFECT_FLAG_NO_TURN_RESET)
 	e7:SetCountLimit(1,m+10000)
 	e7:SetCondition(cm.tdcon1)
 	e7:SetTarget(cm.tdtg)
@@ -146,14 +145,15 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function cm.tdcon1(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetFlagEffect(tp,33460651)==0 
+	return Duel.GetFlagEffect(tp,33460651)==0  and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.tdcon2(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetFlagEffect(tp,33460651)>0 
+	return Duel.GetFlagEffect(tp,33460651)>0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.tdtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,LOCATION_DECK,0,1,nil,tp) end   
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_DECK)
+e:GetHandler():RegisterFlagEffect(m,0,0,0)	
 end
 function cm.spfilter(c,e,tp)
 	return c:IsSetCard(0x341)  and c:IsAttribute(ATTRIBUTE_DARK) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) 

expansions/script/c33400653.lua

@@ -18,7 +18,6 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_REMOVED)
 	e1:SetCountLimit(1,m)
-	e1:SetProperty(EFFECT_FLAG_NO_TURN_RESET)
 	e1:SetCondition(cm.spcon)
 	e1:SetTarget(cm.sptg)
 	e1:SetOperation(cm.spop)
@@ -95,10 +94,10 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)==0
+	 return Duel.GetFlagEffect(tp,33460651)==0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.spcon2(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)>0
+	 return Duel.GetFlagEffect(tp,33460651)>0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.refilter(c)
 	return c:IsSetCard(0x9342,0xc342)  and c:IsAbleToRemove()
@@ -110,6 +109,7 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if chk==0 then return  Duel.IsExistingMatchingCard(cm.refilter,tp,LOCATION_GRAVE,0,1,nil) end
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_GRAVE)
+e:GetHandler():RegisterFlagEffect(m,0,0,0)	
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp) 
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)

expansions/script/c33400654.lua

@@ -16,7 +16,6 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_REMOVED)
 	e1:SetCountLimit(1,m+10000)
-	e1:SetProperty(EFFECT_FLAG_NO_TURN_RESET)
 	e1:SetCondition(cm.spcon)
 	e1:SetTarget(cm.drtg)
 	e1:SetOperation(cm.drop)
@@ -189,10 +188,10 @@ function cm.muop2(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)==0
+	 return Duel.GetFlagEffect(tp,33460651)==0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.spcon2(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)>0
+	 return Duel.GetFlagEffect(tp,33460651)>0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.refilter(c)
 	return c:IsAbleToDeck()
@@ -203,6 +202,7 @@ function cm.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return  Duel.IsExistingMatchingCard(cm.refilter,tp,LOCATION_REMOVED,LOCATION_REMOVED,3,nil) and Duel.IsPlayerCanDraw(tp,1) end
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,3,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1)
+e:GetHandler():RegisterFlagEffect(m,0,0,0)	
 end
 function cm.drop(e,tp,eg,ep,ev,re,r,rp) 
 if not (Duel.IsExistingMatchingCard(cm.refilter,tp,LOCATION_REMOVED,LOCATION_REMOVED,3,nil) and Duel.IsPlayerCanDraw(tp,1))  then return end 

expansions/script/c33400655.lua

@@ -16,7 +16,6 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_REMOVED)
 	e1:SetCountLimit(1,m+10000)
-	e1:SetProperty(EFFECT_FLAG_NO_TURN_RESET)
 	e1:SetCondition(cm.spcon)
 	e1:SetTarget(cm.tg)
 	e1:SetOperation(cm.op)
@@ -57,10 +56,10 @@ if not Duel.IsExistingMatchingCard(cm.refilter,tp,LOCATION_REMOVED+LOCATION_GRAV
 end
 
 function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)==0
+	 return Duel.GetFlagEffect(tp,33460651)==0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.spcon2(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)>0
+	 return Duel.GetFlagEffect(tp,33460651)>0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.refilter2(c)
 	return c:IsSetCard(0x340,0x341) and c:IsFaceup()
@@ -69,6 +68,7 @@ function cm.tg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
   if chkc then return chkc:IsLocation(LOCATION_ONFIELD) and chkc:IsControler(tp)  and cm.refilter2(chkc) end 
 	if chk==0 then return  Duel.IsExistingMatchingCard(cm.refilter2,tp,LOCATION_ONFIELD,0,1,nil) end
+ e:GetHandler():RegisterFlagEffect(m,0,0,0)  
 end
 function cm.op(e,tp,eg,ep,ev,re,r,rp) 
 local c=e:GetHandler()

expansions/script/c33400656.lua

@@ -20,7 +20,7 @@ function cm.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetCode(EVENT_FREE_CHAIN)
 	e2:SetRange(LOCATION_GRAVE)
-	e2:SetCountLimit(1,m)
+	e2:SetCondition(aux.exccon)
 	e2:SetCost(cm.cost2)
 	e2:SetTarget(cm.thtg)
 	e2:SetOperation(cm.thop)

expansions/script/c33400657.lua

@@ -15,8 +15,7 @@ function cm.initial_effect(c)
 	e1:SetCategory(CATEGORY_TODECK+CATEGORY_DRAW)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_REMOVED)
-	e1:SetCountLimit(1)
-	e1:SetProperty(EFFECT_FLAG_NO_TURN_RESET)
+	e1:SetCountLimit(1,m)
 	e1:SetCondition(cm.spcon)
 	e1:SetTarget(cm.tg)
 	e1:SetOperation(cm.op)
@@ -47,10 +46,10 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)==0 and Duel.GetFlagEffect(tp,m+80000)==0
+	 return Duel.GetFlagEffect(tp,33460651)==0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.spcon2(e,tp,eg,ep,ev,re,r,rp)
-	 return Duel.GetFlagEffect(tp,33460651)>0 and Duel.GetFlagEffect(tp,m+80000)==0
+	 return Duel.GetFlagEffect(tp,33460651)>0 and e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.refilter(c)
 	return c:IsAbleToGrave() and c:IsSetCard(0x340,0x341)
@@ -60,6 +59,7 @@ function cm.tg(e,tp,eg,ep,ev,re,r,rp,chk)
   if chkc then return chkc:IsLocation(LOCATION_REMOVED)  and cm.refilter(chkc) end 
 	if chk==0 then return  Duel.IsExistingMatchingCard(cm.refilter,tp,LOCATION_REMOVED,0,1,nil)end
 	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,0,LOCATION_REMOVED)
+ e:GetHandler():RegisterFlagEffect(m,0,0,0)   
 end
 function cm.op(e,tp,eg,ep,ev,re,r,rp) 
 if not Duel.IsExistingMatchingCard(cm.refilter,tp,LOCATION_REMOVED,0,1,nil)  then return end 

expansions/script/c60151601.lua

@@ -51,7 +51,7 @@ function c60151601.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function c60151601.spcondition(e,tp,eg,ep,ev,re,r,rp)
-	return not e:GetHandler():GetSummonType()==SUMMON_TYPE_SPECIAL+1
+	return e:GetHandler():GetFlagEffect(60151601)==0
 end
 function c60151601.filter(c)
 	return c:IsFaceup() and c:IsSetCard(0xcb25) and c:IsType(TYPE_MONSTER)
@@ -89,10 +89,12 @@ function c60151601.target(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c60151601.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:IsRelateToEffect(e) and Duel.SpecialSummon(c,1,tp,tp,false,false,POS_FACEUP)~=0 then
-		c:RegisterFlagEffect(60151601,RESET_EVENT+RESETS_STANDARD,0,1)
+	if c:IsRelateToEffect(e) then
+		Duel.SpecialSummon(c,1,tp,tp,false,false,POS_FACEUP)
+		if c:IsFaceup() then
+			c:RegisterFlagEffect(60151601,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+RESET_SELF_TURN,0,1)
+		end
 	end
-	Duel.SpecialSummonComplete()
 end
 function c60151601.filter3(c)
 	return c:IsFaceup() and c:IsSetCard(0xcb25) and c:IsType(TYPE_PENDULUM) and c:IsAbleToHand()

expansions/script/c60151602.lua

@@ -51,7 +51,7 @@ function c60151602.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function c60151602.spcondition(e,tp,eg,ep,ev,re,r,rp)
-	return not e:GetHandler():GetSummonType()==SUMMON_TYPE_SPECIAL+1
+	return e:GetHandler():GetFlagEffect(60151602)==0
 end
 function c60151602.filter(c)
 	return c:IsFaceup() and c:IsSetCard(0xcb25) and c:IsType(TYPE_MONSTER)
@@ -89,10 +89,12 @@ function c60151602.target(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c60151602.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:IsRelateToEffect(e) and Duel.SpecialSummon(c,1,tp,tp,false,false,POS_FACEUP)~=0 then
-		c:RegisterFlagEffect(60151602,RESET_EVENT+RESETS_STANDARD,0,1)
+	if c:IsRelateToEffect(e) then
+		Duel.SpecialSummon(c,1,tp,tp,false,false,POS_FACEUP)
+		if c:IsFaceup() then
+			c:RegisterFlagEffect(60151602,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+RESET_SELF_TURN,0,1)
+		end
 	end
-    Duel.SpecialSummonComplete()
 end
 function c60151602.filter3(c)
 	return c:IsSetCard(0xcb25) and c:IsType(TYPE_PENDULUM) and not c:IsCode(60151602) and c:IsAbleToHand()

expansions/script/c60151603.lua

@@ -51,7 +51,7 @@ function c60151603.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function c60151603.spcondition(e,tp,eg,ep,ev,re,r,rp)
-	return not e:GetHandler():GetSummonType()==SUMMON_TYPE_SPECIAL+1
+	return e:GetHandler():GetFlagEffect(60151603)==0
 end
 function c60151603.filter(c)
 	return c:IsFaceup() and c:IsSetCard(0xcb25) and c:IsType(TYPE_MONSTER)
@@ -89,13 +89,12 @@ function c60151603.target(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c60151603.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:IsRelateToEffect(e) and Duel.SpecialSummon(c,1,tp,tp,false,false,POS_FACEUP)~=0 then
-		if c:GetSummonLocation()==LOCATION_EXTRA then
-			
+	if c:IsRelateToEffect(e) then
+		Duel.SpecialSummon(c,1,tp,tp,false,false,POS_FACEUP)
+		if c:IsFaceup() then
+			c:RegisterFlagEffect(60151603,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+RESET_SELF_TURN,0,1)
 		end
-		c:RegisterFlagEffect(60151603,RESET_EVENT+RESETS_STANDARD,0,1)
 	end
-    Duel.SpecialSummonComplete()
 end
 function c60151603.filter3(c,e,tp)
 	return c:IsSetCard(0xcb25) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

expansions/script/c60151604.lua

@@ -51,7 +51,7 @@ function c60151604.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function c60151604.spcondition(e,tp,eg,ep,ev,re,r,rp)
-	return not e:GetHandler():GetSummonType()==SUMMON_TYPE_SPECIAL+1
+	return e:GetHandler():GetFlagEffect(60151604)==0
 end
 function c60151604.filter(c)
 	return c:IsFaceup() and c:IsSetCard(0xcb25) and c:IsType(TYPE_MONSTER)
@@ -89,13 +89,12 @@ function c60151604.target(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c60151604.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:IsRelateToEffect(e) and Duel.SpecialSummon(c,1,tp,tp,false,false,POS_FACEUP)~=0 then
-		if c:GetSummonLocation()==LOCATION_EXTRA then
-			
+	if c:IsRelateToEffect(e) then
+		Duel.SpecialSummon(c,1,tp,tp,false,false,POS_FACEUP)
+		if c:IsFaceup() then
+			c:RegisterFlagEffect(60151604,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+RESET_SELF_TURN,0,1)
 		end
-		c:RegisterFlagEffect(60151601,RESET_EVENT+RESETS_STANDARD,0,1)
 	end
-    Duel.SpecialSummonComplete()
 end
 function c60151604.filter3(c,e,tp)
 	return c:IsSetCard(0xcb25) and c:IsType(TYPE_PENDULUM) 

expansions/script/c60151605.lua

@@ -51,7 +51,7 @@ function c60151605.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function c60151605.spcondition(e,tp,eg,ep,ev,re,r,rp)
-	return not e:GetHandler():GetSummonType()==SUMMON_TYPE_SPECIAL+1
+	return e:GetHandler():GetFlagEffect(60151605)==0
 end
 function c60151605.filter(c)
 	return c:IsFaceup() and c:IsSetCard(0xcb25) and c:IsType(TYPE_MONSTER)
@@ -89,21 +89,20 @@ function c60151605.target(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c60151605.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:IsRelateToEffect(e) and Duel.SpecialSummon(c,1,tp,tp,false,false,POS_FACEUP)~=0 then
-		if c:GetSummonLocation()==LOCATION_EXTRA then
-			
+	if c:IsRelateToEffect(e) then
+		Duel.SpecialSummon(c,1,tp,tp,false,false,POS_FACEUP)
+		if c:IsFaceup() then
+			c:RegisterFlagEffect(60151605,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+RESET_SELF_TURN,0,1)
 		end
-		c:RegisterFlagEffect(60151605,RESET_EVENT+RESETS_STANDARD,0,1)
 	end
-    Duel.SpecialSummonComplete()
 end
 function c60151605.filter3(c)
 	return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsDestructable()
 end
 function c60151605.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 
-		and Duel.IsExistingMatchingCard(c60151605.filter3,tp,0,LOCATION_ONFIELD,1,nil) end
-	Duel.SetOperationInfo(0,CATEGORY_DESTROY,nil,1,tp,LOCATION_ONFIELD)
+	if chk==0 then return Duel.IsExistingMatchingCard(c60151605.filter3,tp,0,LOCATION_ONFIELD,1,nil) end
+    local g=Duel.GetMatchingGroup(c60151605.filter3,tp,0,LOCATION_ONFIELD,nil)
+    Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0)
 end
 function c60151605.spop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)

expansions/script/c60151606.lua

@@ -51,7 +51,7 @@ function c60151606.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function c60151606.spcondition(e,tp,eg,ep,ev,re,r,rp)
-	return not e:GetHandler():GetSummonType()==SUMMON_TYPE_SPECIAL+1
+	return e:GetHandler():GetFlagEffect(60151606)==0
 end
 function c60151606.filter(c)
 	return c:IsFaceup() and c:IsSetCard(0xcb25) and c:IsType(TYPE_MONSTER)
@@ -89,21 +89,20 @@ function c60151606.target(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c60151606.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:IsRelateToEffect(e) and Duel.SpecialSummon(c,1,tp,tp,false,false,POS_FACEUP)~=0 then
-		if c:GetSummonLocation()==LOCATION_EXTRA then
-			
+	if c:IsRelateToEffect(e) then
+		Duel.SpecialSummon(c,1,tp,tp,false,false,POS_FACEUP)
+		if c:IsFaceup() then
+			c:RegisterFlagEffect(60151606,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END+RESET_SELF_TURN,0,1)
 		end
-		c:RegisterFlagEffect(60151606,RESET_EVENT+RESETS_STANDARD,0,1)
 	end
-    Duel.SpecialSummonComplete()
 end
 function c60151606.filter3(c)
 	return c:IsType(TYPE_MONSTER) and c:IsAbleToRemove()
 end
 function c60151606.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 
-		and Duel.IsExistingMatchingCard(c60151606.filter3,tp,0,LOCATION_ONFIELD,1,nil) end
-	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_ONFIELD)
+	if chk==0 then return Duel.IsExistingMatchingCard(c60151606.filter3,tp,0,LOCATION_ONFIELD,1,nil) end
+    local g=Duel.GetMatchingGroup(c60151606.filter3,tp,0,LOCATION_ONFIELD,nil)
+    Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,1,0,0)
 end
 function c60151606.spop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)