fix

expansions/lflist.conf

@@ -2,9 +2,9 @@
 !THE LIST
 
 #99
-09910007 1
+#09910007 1
 09910011 1
-09910036 1
+#09910036 1
 09910052 1
 09910056 1
 09950000 1
@@ -52,6 +52,27 @@
 09950190 1
 09950193 0
 09950254 1
+09950514 0
+09950912 0
+09951092 0
+09951064 0
+09950939 0
+09951102 0
+09950154 0
+09951031 0
+09950177 0
+09950183 0
+09950925 1
+09950176 1
+09950978 1
+09951046 1
+09951043 1
+09950947 1
+09950547 1
+09950920 1
+09950915 0
+09950963 0
+09950144 0
 
 09980110 2
 09980111 1
@@ -183,6 +204,8 @@
 09981536 0
 09981579 1
 09981582 0
+09981637 1
+09981632 1
 
 #132
 13257316 2
@@ -315,6 +338,11 @@
 46250004 1
 46250009 1
 
+#907
+90700001 0
+90700005 1
+90700002 0
+
 #???
 #987
 98730001 1 --DR-燃龙
@@ -342,11 +370,15 @@
 111146448 0 --多元魔导书的圆环
 111464489 1 --多元魔导书的神判
 
+118038143 1 --闪光
+#Use Nora-Cat, Baby
+121082832 1 --混沌
+
 #BUGs
 
 
 
-#forbidden TCG
+#FORBIDDEN TCG					===Forbidden===
 76794549 0 --Astrograph Sorcerer
 09929398 0 --Blackwing - Gofu the Vague Shadow
 53804307 0 --Blaster, Dragon Ruler of Infernos
@@ -404,7 +436,6 @@
 18326736 0 --Tellarknight Ptolemaeus
 81122844 0 --Wind-Up Carrier Zenmaity
 85115440 0 --Zoodiac Broadbull
-48905153 0 --Zoodiac Drident
 07394770 0 --Brilliant Fusion
 69243953 0 --Butterfly Dagger - Elma
 57953380 0 --Card of Safe Return
@@ -442,7 +473,12 @@
 64697231 0 --Trap Dustshoot
 80604091 0 --Ultimate Offering
 05851097 0 --Vanity's Emptiness
-#limit
+9047460 0 --Blackwing - Steam the Cloak
+5560911 0 --Destrudo the Lost Dragon's Frisson
+67441435 0 --Glow-Up Bulb
+83190280 0 --Lunalight Tiger
+91258852 0 --SPYRAL Master Plan
+#LIMITED TCG						====Limited===
 07902349 1 --Left Arm of the Forbidden One
 44519536 1 --Left Leg of the Forbidden One
 70903634 1 --Right Arm of the Forbidden One
@@ -460,7 +496,7 @@
 64034255 1 --Genex Ally Birdman
 20758643 1 --Graff, Malebranche of the Burning Abyss
 99177923 1 --Infernity Archfiend
-33508719 1 --Morphing Jar
+#33508719 1 --Morphing Jar (Let's Do this for fun!)
 16226786 1 --Night Assailant
 12958919 1 --Phantom Skyblaster
 88264978 1 --Red-Eyes Darkness Metal Dragon
@@ -503,7 +539,6 @@
 33782437 1 --One Day of Peace
 02295440 1 --One for One
 22842126 1 --Pantheism of the Monarchs
-67169062 1 --Pot of Avarice
 12580477 1 --Raigeki
 58577036 1 --Reasoning
 32807846 1 --Reinforcement of the Army
@@ -528,10 +563,17 @@
 82732705 1 --Skill Drain
 35125879 1 --True King's Return
 17078030 1 --Wall of Revealing Light
-#semi limit
-43694650 2 --Danger!? Jackalope?
-99745551 2 --Danger!? Tsuchinoko?
-78868119 2 --Deep Sea Diva
-28297833 2 --Necroface
+43694650 1 --Danger!? Jackalope?
+99745551 1 --Danger!? Tsuchinoko?
+1561110 1 --ABC-Dragon Buster
+90953320 1 --T.G. Hyper Librarian
+52687916 1 --Trishula, Dragon of the Ice Barrier
+90809975 1 --Toadally Awesome
+48905153 1 --Zoodiac Drident
+1845204 1 --Instant Fusion
+37520316 1 --Mind Control
+46060017 1 --Zoodiac Barrage
+#SEMI LIMITED TCG					===Semi Limited===
 10802915 2 --Tour Guide From the Underworld
-37520316 2 --Mind Control
\ No newline at end of file
+9411399 2 --Destiny HERO - Malicious
+98338152 2 --Sky Striker Mecha - Widow Anchor
\ No newline at end of file

expansions/script/c33400006.lua

 --时崎狂三---战斗启幕者
 function c33400006.initial_effect(c)
+c:EnableCounterPermit(0x34f)
 	--link summon
 	aux.AddLinkProcedure(c,c33400006.mfilter,1)
 	c:EnableReviveLimit()
@@ -53,7 +54,8 @@ function c33400006.thfilter2(c,e,tp)
 end
 function c33400006.thtg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return false end
-	if chk==0 then return  Duel.IsExistingTarget(c33400006.thfilter2,tp,LOCATION_GRAVE,0,1,nil,e,tp) end
+	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
+		and Duel.IsExistingTarget(c33400006.thfilter2,tp,LOCATION_GRAVE,0,1,nil,e,tp)  end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local g2=Duel.SelectTarget(tp,c33400006.thfilter2,tp,LOCATION_GRAVE,0,1,1,nil,e,tp)
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,nil,1,0,0)

expansions/script/c33400033.lua

@@ -94,7 +94,7 @@ end
 function c33400033.spcon(e,c)
 	if c==nil then return true end
 	local tp=c:GetControler()
-	return Duel.GetLocationCountFromEx(tp)>0
+	return Duel.GetLocationCountFromEx(tp,tp,nil,c)>0
 		and Duel.IsExistingMatchingCard(c33400033.spfilter1,tp,LOCATION_GRAVE+LOCATION_MZONE,0,1,nil,c,fc,tp) 
 		and Duel.IsExistingMatchingCard(c33400033.spfilter2,tp,LOCATION_GRAVE+LOCATION_MZONE,0,1,nil,c,fc,tp)
 		and Duel.IsExistingMatchingCard(c33400033.spfilter3,tp,LOCATION_GRAVE+LOCATION_MZONE,0,1,nil,c,fc,tp)

expansions/script/c33400037.lua

@@ -120,7 +120,7 @@ function c33400037.TojiEquip(ec,e,tp,eg,ep,ev,re,r,rp)
 			e5:SetCountLimit(1)
 			token:RegisterEffect(e5)
 			--inm
-			local e6=Effect.CreateEffect(token)
+			local e6=Effect.CreateEffect(ec)
 			e6:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 			e6:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP)
 			e6:SetCode(EVENT_DESTROYED)

expansions/script/c33400114.lua

@@ -7,26 +7,26 @@ function c33400114.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetHintTiming(0,TIMING_END_PHASE)
+	e1:SetCountLimit(1,33400114+EFFECT_COUNT_CODE_OATH)
 	e1:SetCost(c33400114.cost)
 	e1:SetTarget(c33400114.target)
 	e1:SetOperation(c33400114.activate)
 	c:RegisterEffect(e1)
 end
 function c33400114.tfilter(c,e,tp)
-	return c:IsCode(33400011) and c:IsCanBeSpecialSummoned(e,0,tp,true,false)
+	return c:IsCode(33400011) and c:IsCanBeSpecialSummoned(e,0,tp,true,false) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0
 end
 function c33400114.filter(c,e,tp)
 	return  c:IsSetCard(0x3341) 
 		and Duel.IsExistingMatchingCard(c33400114.tfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp)		
-		and Duel.GetLocationCountFromEx(tp,tp,c)>0
 end
 function c33400114.chkfilter(c)
 	return c:IsFaceup() and c:IsSetCard(0x3341) 
 end
 function c33400114.cost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(c33400114.filter,tp,LOCATION_HAND+LOCATION_MZONE,0,1,nil,e,tp) end
+	if chk==0 then return Duel.IsExistingMatchingCard(c33400114.filter,tp,LOCATION_MZONE,0,1,nil,e,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
-	local g=Duel.SelectMatchingCard(tp,c33400114.filter,tp,LOCATION_HAND+LOCATION_MZONE,0,1,1,nil,e,tp)
+	local g=Duel.SelectMatchingCard(tp,c33400114.filter,tp,LOCATION_MZONE,0,1,1,nil,e,tp)
 	Duel.SendtoGrave(g,REASON_COST)
 end
 function c33400114.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)

expansions/script/c33400220.lua

@@ -227,7 +227,7 @@ function c33400220.TojiEquip(ec,e,tp,eg,ep,ev,re,r,rp)
 			e5:SetCountLimit(1)
 			token:RegisterEffect(e5)
 			--inm
-			local e6=Effect.CreateEffect(token)
+			local e6=Effect.CreateEffect(ec)
 			e6:SetType(EFFECT_TYPE_QUICK_O)
 			e6:SetCategory(CATEGORY_ANNOUNCE)
 			e6:SetRange(LOCATION_SZONE)

expansions/script/c33400222.lua

@@ -129,7 +129,7 @@ function c33400222.TojiEquip(ec,e,tp,eg,ep,ev,re,r,rp)
 			e5:SetCountLimit(1)
 			token:RegisterEffect(e5)
 			--inm
-			local e6=Effect.CreateEffect(token)
+			local e6=Effect.CreateEffect(ec)
 			e6:SetType(EFFECT_TYPE_QUICK_O)
 			e6:SetCategory(CATEGORY_ANNOUNCE)
 			e6:SetRange(LOCATION_SZONE)

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,RESET_EVENT+RESETS_STANDARD,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)
@@ -26,7 +25,7 @@ function cm.initial_effect(c)
 	e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e4:SetCode(EVENT_TO_GRAVE)
 	e4:SetProperty(EFFECT_FLAG_DELAY)
-	e4:SetCountLimit(1,m)
+	e4:SetCountLimit(1,m+10000)
 	e4:SetCondition(cm.con1)
 	e4:SetTarget(cm.xyztg)
 	e4:SetOperation(cm.xyzop)
@@ -37,7 +36,7 @@ function cm.initial_effect(c)
 	e41:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e41:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e41:SetProperty(EFFECT_FLAG_DELAY)
-	e41:SetCountLimit(1,m)
+	e41:SetCountLimit(1,m+10000)
 	e41:SetTarget(cm.xyztg)
 	e41:SetOperation(cm.xyzop)
 	c:RegisterEffect(e41)
@@ -48,7 +47,7 @@ function cm.initial_effect(c)
 	e5:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e5:SetCode(EVENT_TO_GRAVE)
 	e5:SetProperty(EFFECT_FLAG_DELAY)
-	e5:SetCountLimit(1,m+10000)
+	e5:SetCountLimit(1,m+20000)
 	e5:SetCondition(cm.con1)
 	e5:SetTarget(cm.target)
 	e5:SetOperation(cm.activate)
@@ -59,30 +58,30 @@ function cm.initial_effect(c)
 	e51:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e51:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e51:SetProperty(EFFECT_FLAG_DELAY)
-	e51:SetCountLimit(1,m+10000)
+	e51:SetCountLimit(1,m+20000)
 	e51:SetTarget(cm.target)
 	e51:SetOperation(cm.activate)
 	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,RESET_EVENT+RESETS_STANDARD,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)
@@ -29,7 +28,7 @@ function cm.initial_effect(c)
 	e5:SetCountLimit(1,m+10000)
 	e5:SetCondition(cm.con1)
 	e5:SetTarget(cm.thtg)
-	e5:SetOperation(cm.tgop)
+	e5:SetOperation(cm.thop)
 	c:RegisterEffect(e5)
 	local e51=Effect.CreateEffect(c)
 	e51:SetDescription(aux.Stringid(m,1))
@@ -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,RESET_EVENT+RESETS_STANDARD,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)
@@ -29,7 +28,7 @@ function cm.initial_effect(c)
 	e5:SetCountLimit(1,m+10000)
 	e5:SetCondition(cm.con1)
 	e5:SetTarget(cm.thtg)
-	e5:SetOperation(cm.tgop)
+	e5:SetOperation(cm.thop)
 	c:RegisterEffect(e5)
 	local e51=Effect.CreateEffect(c)
 	e51:SetDescription(aux.Stringid(m,1))
@@ -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,RESET_EVENT+RESETS_STANDARD,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,8 +18,7 @@ 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:SetCountLimit(1,m+10000)
 	e1:SetCondition(cm.spcon)
 	e1:SetTarget(cm.target)
 	e1:SetOperation(cm.activate)
@@ -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,RESET_EVENT+RESETS_STANDARD,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,RESET_EVENT+RESETS_STANDARD,0,0)  
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 local c=e:GetHandler()
@@ -58,11 +58,34 @@ local c=e:GetHandler()
 		if  Duel.SelectYesNo(tp,aux.Stringid(m,1)) then 
 		 Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 		 local tr=Duel.SelectMatchingCard(tp,Card.IsAbleToRemove,tp,LOCATION_ONFIELD,0,1,1,c:IsCode(m)) 
-		  Duel.Remove(tr,POS_FACEUP,REASON_EFFECT)
+		 tc=tr:GetFirst()
+			if  Duel.Remove(tc,0,REASON_EFFECT+REASON_TEMPORARY)>0 then 
+				local e1=Effect.CreateEffect(e:GetHandler())
+					e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+					e1:SetCode(EVENT_PHASE+PHASE_STANDBY)
+					e1:SetLabelObject(tc)
+					e1:SetCountLimit(1)
+					if Duel.GetCurrentPhase()==PHASE_STANDBY then
+						e1:SetLabel(Duel.GetTurnCount())
+						e1:SetCondition(cm.retcon)
+						e1:SetReset(RESET_PHASE+PHASE_STANDBY,2)
+					else
+						e1:SetReset(RESET_PHASE+PHASE_STANDBY)
+					end
+					e1:SetOperation(cm.retop)
+					Duel.RegisterEffect(e1,tp)
+			end
 		end
 	end   
 		Duel.SpecialSummon(e:GetHandler(),0,tp,tp,false,false,POS_FACEUP)
 end
+function cm.retcon(e,tp,eg,ep,ev,re,r,rp)
+	return Duel.GetTurnCount()~=e:GetLabel()
+end
+function cm.retop(e,tp,eg,ep,ev,re,r,rp)
+	local tc=e:GetLabelObject()
+	Duel.ReturnToField(tc) 
+end
 
 function cm.con1(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
@@ -85,7 +108,6 @@ function cm.reop(e,tp,eg,ep,ev,re,r,rp)
 	end
 	if Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,0,LOCATION_ONFIELD+LOCATION_GRAVE,1,nil) then 
 		if  Duel.SelectYesNo(tp,aux.Stringid(m,2)) then   
-		Duel.RemoveOverlayCard(tp,1,0,1,1,REASON_EFFECT)
 		 Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 		local tr=Duel.SelectMatchingCard(tp,Card.IsAbleToRemove,tp,0,LOCATION_ONFIELD+LOCATION_GRAVE,1,1,nil) 
 		  Duel.Remove(tr,POS_FACEUP,REASON_EFFECT)

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,RESET_EVENT+RESETS_STANDARD,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,RESET_EVENT+RESETS_STANDARD,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,RESET_EVENT+RESETS_STANDARD,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,RESET_EVENT+RESETS_STANDARD,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,RESET_EVENT+RESETS_STANDARD,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,RESET_EVENT+RESETS_STANDARD,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,RESET_EVENT+RESETS_STANDARD,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

@@ -5,6 +5,13 @@ function cm.initial_effect(c)
 	 --xyz summon
 	c:EnableReviveLimit()
 	 aux.AddXyzProcedureLevelFree(c,cm.mfilter,cm.xyzcheck,3,99,cm.ovfilter,aux.Stringid(m,0),cm.xyzop)
+	--spsummon limit
+	local e0=Effect.CreateEffect(c)
+	e0:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	e0:SetType(EFFECT_TYPE_SINGLE)
+	e0:SetCode(EFFECT_SPSUMMON_CONDITION)
+	e0:SetValue(aux.xyzlimit)
+	c:RegisterEffect(e0)
  --CANNOT ACTIVATE
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD)
@@ -63,13 +70,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 +152,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,RESET_EVENT+RESETS_STANDARD,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,RESET_EVENT+RESETS_STANDARD,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,RESET_EVENT+RESETS_STANDARD,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,RESET_EVENT+RESETS_STANDARD,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,RESET_EVENT+RESETS_STANDARD,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/c33401307.lua

@@ -30,6 +30,7 @@ function c33401307.initial_effect(c)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetCountLimit(1,33401307+10000)
 	e3:SetCondition(c33401307.thcon)
+	e3:SetTarget(c33401307.thtg)
 	e3:SetOperation(c33401307.thop)
 	c:RegisterEffect(e3)
 end
@@ -92,6 +93,10 @@ end
 function c33401307.thfilter(c)
 	return c:IsSetCard(0x341) and c:IsSetCard(0x46) and c:IsType(TYPE_SPELL) and c:IsAbleToHand()
 end
+function c33401307.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.IsExistingMatchingCard(c33401307.thfilter,tp,LOCATION_DECK,0,1,nil) end
+	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
+end
 function c33401307.thop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 	local g=Duel.SelectMatchingCard(tp,c33401307.thfilter,tp,LOCATION_DECK,0,1,1,nil)

expansions/script/c33401310.lua

@@ -48,6 +48,7 @@ function c33401310.thcon(e,tp,eg,ep,ev,re,r,rp)
 end
 function c33401310.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
+ if chk==0 then return Duel.IsExistingTarget(c33401310.thfilter,tp,LOCATION_GRAVE,0,1,nil) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,0,tp,LOCATION_GRAVE)
 end
 function c33401310.thfilter(c)

expansions/script/c33700937.lua

@@ -9,7 +9,7 @@ function cm.initial_effect(c)
 	local f=function(e)
 		return Duel.IsAbleToEnterBP()
 	end
-	local e1=rsef.I(c,{m,0},1,nil,nil,LOCATION_MZONE,f,rscost.rmxyzs(true),nil,cm.op)
+	local e1=rsef.I(c,{m,0},1,nil,nil,LOCATION_MZONE,f,rscost.rmxyz(true),nil,cm.op)
 	local e2=rsef.STO(c,EVENT_BATTLE_DESTROYING,{m,1},nil,nil,"de",cm.xyzcon,nil,cm.xyztg,cm.xyzop)
 end
 function cm.xyzcon(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c46250024.lua

@@ -98,6 +98,20 @@ function c46250024.tgop(e,tp,eg,ep,ev,re,r,rp)
             tc:RegisterEffect(e3)
         end
         Duel.SpecialSummonComplete()
+        local sxg=Duel.GetMatchingGroup(c46250024.sxfilter,tp,LOCATION_EXTRA,0,nil,sg1)
+        if sxg:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(46250024,0)) then
+            Duel.BreakEffect()
+            Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
+            local sxc=sxg:Select(tp,1,1,nil):GetFirst()
+            if sxc:IsType(TYPE_FUSION) then
+                sxc:SetMaterial(sg1)
+                Duel.SendtoGrave(sg1,REASON_EFFECT+REASON_MATERIAL+REASON_FUSION)
+                Duel.BreakEffect()
+                Duel.SpecialSummon(sxc,SUMMON_TYPE_FUSION,tp,tp,false,true,POS_FACEUP)
+            else
+                Duel.XyzSummon(tp,sxc,sg1)
+            end
+        end
         sg1:KeepAlive()
         local e1=Effect.CreateEffect(c)
         e1:SetType(EFFECT_TYPE_FIELD)
@@ -117,20 +131,6 @@ function c46250024.tgop(e,tp,eg,ep,ev,re,r,rp)
         e2:SetTargetRange(1,0)
         e2:SetValue(c46250024.tgval)
         Duel.RegisterEffect(e2,tp)
-        local sxg=Duel.GetMatchingGroup(c46250024.sxfilter,tp,LOCATION_EXTRA,0,nil,sg1)
-        if sxg:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(46250024,0)) then
-            Duel.BreakEffect()
-            Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-            local sxc=sxg:Select(tp,1,1,nil):GetFirst()
-            if sxc:IsType(TYPE_FUSION) then
-                sxc:SetMaterial(sg1)
-                Duel.SendtoGrave(sg1,REASON_EFFECT+REASON_MATERIAL+REASON_FUSION)
-                Duel.BreakEffect()
-                Duel.SpecialSummon(sxc,SUMMON_TYPE_FUSION,tp,tp,false,true,POS_FACEUP)
-            else
-                Duel.XyzSummon(tp,sxc,sg1)
-            end
-        end
     end
 end
 function c46250024.sumlimit(e,c,sump,sumtype,sumpos,targetp,se)

expansions/script/c65010556.lua

@@ -23,7 +23,7 @@ function c65010556.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c65010556.filter(c,e,tp)
-	return (c:IsCode(65010558) or c:IsCode(65010552)) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return (c:IsCode(65010558) or c:IsCode(65010552)) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE)
 end
 function c65010556.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
@@ -35,8 +35,7 @@ function c65010556.spop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local g=Duel.SelectMatchingCard(tp,c65010556.filter,tp,LOCATION_REMOVED,0,1,1,nil,e,tp)
 	local tc=g:GetFirst()
-	if tc and Duel.SpecialSummonStep(tc,0,tp,tp,false,false,POS_FACEUP)~=0 then
-		Duel.SpecialSummonStep(g,0,tp,tp,false,false,POS_FACEUP)
+	if tc and Duel.SpecialSummonStep(tc,0,tp,tp,false,false,POS_FACEUP_DEFENSE)~=0 then
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetType(EFFECT_TYPE_SINGLE)
 		e1:SetCode(EFFECT_CANNOT_TRIGGER)
@@ -48,7 +47,7 @@ function c65010556.spop(e,tp,eg,ep,ev,re,r,rp)
 			e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 			e2:SetReset(RESET_EVENT+RESETS_REDIRECT)
 			e2:SetValue(LOCATION_DECKBOT)
-			c:RegisterEffect(e2)
+			tc:RegisterEffect(e2)
 	end
 		Duel.SpecialSummonComplete()
 end

expansions/script/c9910032.lua

@@ -47,7 +47,7 @@ function c9910032.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c9910032.spfilter1(c,e,tp)
 	return c:IsType(TYPE_PENDULUM) and c:IsSetCard(0x3950) and not c:IsCode(9910032)
-		and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+		and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE)
 end
 function c9910032.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0

expansions/script/c9910265.lua

@@ -24,7 +24,7 @@ function c9910265.initial_effect(c)
 	e3:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_DECKDES)
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e3:SetRange(LOCATION_SZONE)
-	e3:SetProperty(EFFECT_FLAG_DELAY)
+	e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
 	e3:SetCode(EVENT_DESTROYED)
 	e3:SetCountLimit(1)
 	e3:SetCondition(c9910265.spcon)

expansions/strings.conf

@@ -180,6 +180,7 @@
 !setname 0x7342 本条
 !counter 0x34f 时间指示物
 !setname 0x5341 夜刀神
+!setname 0x5344 Ratatoskr
 !setname 0x3343 天香
 
 #777