fix

expansions/lflist.conf

@@ -176,6 +176,32 @@
 49966682 0
 49966683 0
 49999999 0
+#All 霜火 cards
+90700001 0
+90700002 0
+90700003 0
+90700004 0
+90700005 0
+90700006 0
+90700007 0
+90700008 0
+90700009 0
+#210404
+14010199 0
+22020630 0
+33403500 0
+33403510 0
+65010022 0
+65010526 0
+65010543 0
+65020213 0
+79029445 0
+79034029 0
+40009398 0
+65010014 1
+65010546 1
+82208105 1
+22070090 2
 #210328
 82224044 0
 31400017 0
@@ -578,7 +604,6 @@
 72100038 0
 72100034 0
 25010005 0
-79029010 0
 79029011 0
 79029020 0
 79029034 0
@@ -1219,16 +1244,13 @@
 79029062 0
 79029067 0
 79029066 0
-79029070 0
 79029072 0
 79029090 0
 79029099 0
-79029110 0
 79029112 0
 79029117 0
 79029121 0
 79029122 0
-79029123 0
 79029124 0
 79029125 0
 79029130 0
@@ -1462,7 +1484,6 @@
 25000017 1
 79029038 1
 79029050 1
-79029087 1
 79029239 1
 9980400 1
 9981158 1
@@ -1665,7 +1686,7 @@
 #118038143 2
 9950448 1
 9950452 1
-33403500 1
+#33403500 1
 25000018 1
 25000019 1
 25000020 1
@@ -1743,7 +1764,7 @@
 82208125 1
 9981465 0
 871100006 1
-14010199 1
+#14010199 1
 14010150 1
 #semi limit
 9950623 2

expansions/script/c1.lua

---
-function c1.initial_effect(c)
-	
-end

expansions/script/c111015.lua

@@ -24,8 +24,9 @@ function cm.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetCategory(CATEGORY_TOGRAVE)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
-	e2:SetCode(EVENT_FREE_CHAIN)
+	e2:SetCode(EVENT_CHAINING)
 	e2:SetRange(LOCATION_MZONE)
+	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
 	e2:SetCost(cm.mccost)
 	e2:SetCondition(cm.mccon)
 	e2:SetTarget(cm.mctg)
@@ -100,7 +101,7 @@ function cm.mccost(e,tp,eg,ep,ev,re,r,rp,chk)
 	end
 end
 function cm.mccon(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetTurnPlayer()~=tp
+	return (rp==1-tp or re:GetHandler():IsCode(m)) and not e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED)
 end
 function cm.mctg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
@@ -115,7 +116,7 @@ function cm.retop(e,tp,eg,ep,ev,re,r,rp)
 			c:ResetFlagEffect(m+1)
 			--Debug.Message("This max chain count "..Chain_Count[1])
 			local num=Chain_Count[1]
-			local g=Duel.GetDecktopGroup(tp,math.min(num,Duel.GetFieldGroupCount(1-tp,LOCATION_DECK,0)))
+			local g=Duel.GetDecktopGroup(1-tp,math.min(num,Duel.GetFieldGroupCount(1-tp,LOCATION_DECK,0)))
 			Duel.SendtoGrave(g,REASON_EFFECT)
 		end
 	end

expansions/script/c11451466.lua

@@ -50,7 +50,7 @@ function cm.ceop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e1,tp)
 end
 function cm.ceop2(e,tp,eg,ep,ev,re,r,rp)
-	if rp==1-tp and re:GetHandler():IsCode(11451461) and Duel.SelectYesNo(tp,aux.Stringid(m,2)) then
+	if rp==1-tp and re:GetHandler():IsCode(11451460) and Duel.SelectYesNo(tp,aux.Stringid(m,2)) then
 		Duel.Hint(HINT_CARD,0,m)
 		Duel.ChangeChainOperation(ev,cm.reop)
 		e:Reset()

expansions/script/c11451467.lua

@@ -61,7 +61,7 @@ function cm.caop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e2,tp)
 end
 function cm.catg(e,c)
-	return c:IsCode(11451461) and c:IsType(TYPE_MONSTER)
+	return c:IsCode(11451460) and c:IsType(TYPE_MONSTER)
 end
 function cm.caval(e,c)
 	if c:IsAttribute(ATTRIBUTE_DEVINE) then return 0x7f end

expansions/script/c11451521.lua

@@ -160,7 +160,6 @@ function cm.pspop(e,tp,eg,ep,ev,re,r,rp)
 	end
 	Duel.SpecialSummonComplete()
 	for tc in aux.Next(g) do tc:CompleteProcedure() end
-	e:Reset()
 end
 function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c11451522.lua

@@ -160,7 +160,6 @@ function cm.pspop(e,tp,eg,ep,ev,re,r,rp)
 	end
 	Duel.SpecialSummonComplete()
 	for tc in aux.Next(g) do tc:CompleteProcedure() end
-	e:Reset()
 end
 function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c11451523.lua

@@ -161,7 +161,6 @@ function cm.pspop(e,tp,eg,ep,ev,re,r,rp)
 	end
 	Duel.SpecialSummonComplete()
 	for tc in aux.Next(g) do tc:CompleteProcedure() end
-	e:Reset()
 end
 function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c11451524.lua

@@ -160,7 +160,6 @@ function cm.pspop(e,tp,eg,ep,ev,re,r,rp)
 	end
 	Duel.SpecialSummonComplete()
 	for tc in aux.Next(g) do tc:CompleteProcedure() end
-	e:Reset()
 end
 function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c11451525.lua

@@ -159,7 +159,6 @@ function cm.pspop(e,tp,eg,ep,ev,re,r,rp)
 	end
 	Duel.SpecialSummonComplete()
 	for tc in aux.Next(g) do tc:CompleteProcedure() end
-	e:Reset()
 end
 function cm.regcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c11451526.lua

@@ -159,7 +159,6 @@ function cm.pspop(e,tp,eg,ep,ev,re,r,rp)
 	end
 	Duel.SpecialSummonComplete()
 	for tc in aux.Next(g) do tc:CompleteProcedure() end
-	e:Reset()
 end
 function cm.regcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c11451527.lua

@@ -217,5 +217,4 @@ function cm.pspop(e,tp,eg,ep,ev,re,r,rp)
 	end
 	Duel.SpecialSummonComplete()
 	for tc in aux.Next(g) do tc:CompleteProcedure() end
-	e:Reset()
 end
\ No newline at end of file

expansions/script/c15000540.lua

@@ -103,7 +103,7 @@ function cm.filter(c)
 	return c:IsCanOverlay()
 end
 function cm.condition(e,tp,eg,ep,ev,re,r,rp)
-	return not re or re~=cm.self_flip_effect2
+	return e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chkc then return chkc:IsLocation(LOCATION_ONFIELD+LOCATION_GRAVE) and chkc:IsControler(1-tp) and chkc:IsCanOverlay() end
@@ -135,6 +135,7 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	local pos=Duel.SelectPosition(tp,e:GetHandler(),POS_FACEUP_ATTACK+POS_FACEUP_DEFENSE)
 	Duel.ChangePosition(e:GetHandler(),pos)
+	e:GetHandler():RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,0,1)
 end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chkc then return chkc:IsLocation(LOCATION_ONFIELD+LOCATION_GRAVE) and chkc:IsControler(1-tp) and chkc:IsCanOverlay() end

expansions/script/c15000541.lua

@@ -44,7 +44,7 @@ function cm.filter(c,e,tp)
 	return c:IsSetCard(0xf3b) and c:IsType(TYPE_MONSTER) and not c:IsCode(15000541) and (c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_ATTACK) or c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEDOWN_DEFENSE))
 end
 function cm.condition(e,tp,eg,ep,ev,re,r,rp)
-	return not re or re~=cm.self_flip_effect2
+	return e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
@@ -74,6 +74,7 @@ end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	Duel.ChangePosition(e:GetHandler(),POS_FACEUP)
+	e:GetHandler():RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,0,1)
 end
 function cm.sp2tg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0

expansions/script/c15000542.lua

@@ -41,7 +41,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function cm.condition(e,tp,eg,ep,ev,re,r,rp)
-	return not re or re~=cm.self_flip_effect2
+	return e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingTarget(aux.TURE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) end
@@ -64,6 +64,7 @@ end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	Duel.ChangePosition(e:GetHandler(),POS_FACEUP)
+	e:GetHandler():RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,0,1)
 end
 function cm.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingTarget(aux.TURE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) end

expansions/script/c15000543.lua

@@ -44,7 +44,7 @@ function cm.filter(c,e,tp)
 	return c:IsSetCard(0xf3b) and c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToHand()
 end
 function cm.condition(e,tp,eg,ep,ev,re,r,rp)
-	return not re or re~=cm.self_flip_effect2
+	return e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_DECK,0,1,nil,e,tp) end
@@ -65,6 +65,7 @@ end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	Duel.ChangePosition(e:GetHandler(),POS_FACEUP)
+	e:GetHandler():RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,0,1)
 end
 function cm.sp2tg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_DECK,0,1,nil,e,tp) end

expansions/script/c15000546.lua

@@ -68,7 +68,7 @@ function cm.tgcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK)
 end
 function cm.tgfilter(c)
-	return c:IsSetCard(0xf3b) and c:IsAbleToGrave()
+	return c:IsSetCard(0xf3b) and c:IsType(TYPE_MONSTER) and c:IsAbleToGrave()
 end
 function cm.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.tgfilter,tp,LOCATION_DECK,0,1,nil) end

expansions/script/c15000547.lua

@@ -44,7 +44,7 @@ function cm.filter(c)
 	return c:IsType(TYPE_FLIP) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand() and not c:IsCode(15000547)
 end
 function cm.condition(e,tp,eg,ep,ev,re,r,rp)
-	return not re or re~=cm.self_flip_effect2
+	return e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_DECK,0,1,nil) end
@@ -64,6 +64,7 @@ end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	Duel.ChangePosition(e:GetHandler(),POS_FACEUP_DEFENSE)
+	e:GetHandler():RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,0,1)
 end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(aux.NecroValleyFilter(cm.filter),tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil) end

expansions/script/c15000548.lua

@@ -44,7 +44,7 @@ function cm.filter(c)
 	return ((c:IsType(TYPE_FLIP) and c:IsType(TYPE_MONSTER)) or c:IsSetCard(0xf3b)) and c:IsAbleToDeck()
 end
 function cm.condition(e,tp,eg,ep,ev,re,r,rp)
-	return not re or re~=cm.self_flip_effect2
+	return e:GetHandler():GetFlagEffect(m)==0
 end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
@@ -70,6 +70,7 @@ end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	Duel.ChangePosition(e:GetHandler(),POS_FACEUP_DEFENSE)
+	e:GetHandler():RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,0,1)
 end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()

expansions/script/c33400601.lua

@@ -67,7 +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)
+	e:GetHandler():RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,3))
 end
 function cm.tdop(e,tp,eg,ep,ev,re,r,rp)
 Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
@@ -78,6 +78,6 @@ Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) 
 		local g2=Duel.SelectMatchingCard(tp,cm.refilter,tp,LOCATION_DECK,0,1,1,nil,m1,tp)
 		local tc2=g2:GetFirst()
-		Duel.Remove(tc2,POS_FACEUP,REASON_EFFECT)	   
+		Duel.Remove(tc2,POS_FACEUP,REASON_EFFECT)	  
 	end 
 end
\ No newline at end of file

expansions/script/c33400602.lua

@@ -75,13 +75,13 @@ 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) 
+ e:GetHandler():RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,3))
 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.Remove(tc2,POS_FACEUP,REASON_EFFECT)		 
 end
 
 function cm.con1(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c33400603.lua

@@ -55,7 +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) 
+e:GetHandler():RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,3))
 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

@@ -55,7 +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)	
+ e:GetHandler():RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,3))
 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

@@ -68,7 +68,7 @@ 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) 
+e:GetHandler():RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,3))
 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

@@ -49,7 +49,7 @@ 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)  
+e:GetHandler():RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,3))
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 local c=e:GetHandler()

expansions/script/c33400607.lua

@@ -82,7 +82,7 @@ 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)  
+e:GetHandler():RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,3))
 end
 function cm.atkop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c33400608.lua

@@ -90,7 +90,7 @@ 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)  
+e:GetHandler():RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,3))
 end
 function cm.rmop1(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c33400609.lua

@@ -133,7 +133,7 @@ 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)  
+e:GetHandler():RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,5))
 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

@@ -137,7 +137,7 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	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) 
+ e:GetHandler():RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,3))
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c33400611.lua

@@ -104,7 +104,7 @@ function cm.dmcon2(e,tp,eg,ep,ev,re,r,rp)
 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)  
+e:GetHandler():RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,6))
 end
 function cm.dmop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c33400612.lua

@@ -127,7 +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)   
+e:GetHandler():RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,3)) 
 end
 function cm.setop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()  

expansions/script/c33400617.lua

@@ -80,7 +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)  
+e:GetHandler():RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,3))
 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

@@ -163,7 +163,7 @@ end
 function cm.tdtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.tdfilter1,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)  
+e:GetHandler():RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,6))
 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

@@ -109,7 +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)  
+e:GetHandler():RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,3)) 
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp) 
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)

expansions/script/c33400654.lua

@@ -104,7 +104,7 @@ function cm.xdop(e,tp,eg,ep,ev,re,r,rp)
 		  Duel.RegisterFlagEffect(tp,tc:GetCode()+40000,RESET_EVENT+RESET_PHASE+PHASE_END,0,0)   
 		  Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
 		   local dg=Duel.SelectMatchingCard(tp,nil,tp,LOCATION_ONFIELD,0,1,1,nil)
-		   Duel.Destroy(dg,REASON_EFFECT)	
+		   Duel.Destroy(dg,REASON_EFFECT)   
 		end   
    end 
 end
@@ -130,7 +130,7 @@ function cm.xdop2(e,tp,eg,ep,ev,re,r,rp)
 		  Duel.RegisterFlagEffect(tp,tc:GetCode()+40000,RESET_EVENT+RESET_PHASE+PHASE_END,0,0)   
 		  Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
 		   local dg=Duel.SelectMatchingCard(tp,nil,tp,LOCATION_ONFIELD,0,1,1,nil)
-		   Duel.Destroy(dg,REASON_EFFECT)	
+		   Duel.Destroy(dg,REASON_EFFECT)   
 		end   
    end 
 end
@@ -202,7 +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)  
+e:GetHandler():RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,4))
 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

@@ -68,7 +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)  
+e:GetHandler():RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,3))
 end
 function cm.op(e,tp,eg,ep,ev,re,r,rp) 
 local c=e:GetHandler()

expansions/script/c33400657.lua

@@ -59,7 +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)   
+e:GetHandler():RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,3))  
 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/c40009044.lua

@@ -11,6 +11,11 @@ function c40009044.initial_effect(c)
 	e1:SetTarget(c40009044.target)
 	e1:SetOperation(c40009044.activate)
 	c:RegisterEffect(e1)
+	--act in hand
+	local e2=Effect.CreateEffect(c)
+	e2:SetType(EFFECT_TYPE_SINGLE)
+	e2:SetCode(EFFECT_TRAP_ACT_IN_HAND)
+	c:RegisterEffect(e2
 end
 function c40009044.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()

expansions/script/c40009398.lua

@@ -31,14 +31,6 @@ function c40009398.operation(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetOperation(c40009398.drop1)
 	e1:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e1,tp)
-	local e4=Effect.CreateEffect(c)
-	e4:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
-	e4:SetProperty(EFFECT_FLAG_DELAY)
-	e4:SetCode(EVENT_SUMMON_SUCCESS)
-	e4:SetCondition(c40009398.drcon1)
-	e4:SetOperation(c40009398.drop1)
-	e4:SetReset(RESET_PHASE+PHASE_END)
-	Duel.RegisterEffect(e4,tp)
 	--counter2
 	local e5=Effect.CreateEffect(c)
 	e5:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)

expansions/script/c79029513.lua

@@ -121,14 +121,18 @@ function c79029513.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end
 	ag=e:GetHandler():GetOverlayCount()
 	e:GetHandler():RemoveOverlayCard(tp,ag,ag,REASON_COST)
+	e:SetLabel(ag)
 end
 function c79029513.efop(e,tp,eg,ep,ev,re,r,rp)
+	local ag=e:GetLabel()
+	if not ag or ag<=0 then return end
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD)
-	e1:SetCode(EFFECT_CANNOT_TRIGGER)
-	e1:SetTargetRange(0,LOCATION_ONFIELD+LOCATION_DECK+LOCATION_GRAVE+LOCATION_EXTRA+LOCATION_HAND+LOCATION_REMOVED)
-	e1:SetTarget(c79029513.actfilter)
-	e1:SetReset(RESET_PHASE+PHASE_END+RESET_OPPO_TURN,ag)
+	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
+	e1:SetCode(EFFECT_CANNOT_ACTIVATE)
+	e1:SetTargetRange(0,1)
+	e1:SetValue(aux.TRUE)
+	e1:SetReset(RESET_PHASE+PHASE_END,ag)
 	Duel.RegisterEffect(e1,tp)
 end
 function c79029513.actfilter(e,c)

expansions/script/c89387008.lua

@@ -2,89 +2,93 @@
 local m=89387008
 local cm=_G["c"..m]
 function cm.initial_effect(c)
-    c:EnableReviveLimit()
-    aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsLinkRace,RACE_MACHINE),2,2)
-    local e1=Effect.CreateEffect(c)
-    e1:SetType(EFFECT_TYPE_FIELD)
-    e1:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
-    e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
-    e1:SetRange(LOCATION_MZONE)
-    e1:SetTargetRange(LOCATION_MZONE,0)
-    e1:SetTarget(cm.indestg)
-    e1:SetValue(aux.indoval)
-    c:RegisterEffect(e1)
-    local e2=Effect.CreateEffect(c)
-    e2:SetType(EFFECT_TYPE_FIELD)
-    e2:SetCode(EFFECT_CHANGE_DAMAGE)
-    e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
-    e2:SetRange(LOCATION_MZONE)
-    e2:SetTargetRange(0,1)
-    e2:SetValue(cm.val)
-    c:RegisterEffect(e2)
-    local e3=Effect.CreateEffect(c)
-    e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
-    e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
-    e3:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP)
-    e3:SetCode(EVENT_SPSUMMON_SUCCESS)
-    e3:SetRange(LOCATION_MZONE)
-    e3:SetCountLimit(1,m)
-    e3:SetCondition(cm.thcon)
-    e3:SetTarget(cm.thtg)
-    e3:SetOperation(cm.thop)
-    c:RegisterEffect(e3)
-    local e4=Effect.CreateEffect(c)
-    e4:SetType(EFFECT_TYPE_IGNITION)
-    e4:SetRange(LOCATION_MZONE)
-    e4:SetCountLimit(1,m+100000000)
-    e4:SetTarget(cm.sttg)
-    e4:SetOperation(cm.stop)
-    c:RegisterEffect(e4)
+	c:EnableReviveLimit()
+	aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsLinkRace,RACE_MACHINE),2,2)
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_FIELD)
+	e1:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
+	e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
+	e1:SetRange(LOCATION_MZONE)
+	e1:SetTargetRange(LOCATION_MZONE,0)
+	e1:SetTarget(cm.indestg)
+	e1:SetValue(aux.indoval)
+	c:RegisterEffect(e1)
+	local e2=Effect.CreateEffect(c)
+	e2:SetType(EFFECT_TYPE_FIELD)
+	e2:SetCode(EFFECT_CHANGE_DAMAGE)
+	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
+	e2:SetRange(LOCATION_MZONE)
+	e2:SetTargetRange(0,1)
+	e2:SetValue(cm.val)
+	c:RegisterEffect(e2)
+	local e3=Effect.CreateEffect(c)
+	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
+	e3:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP)
+	e3:SetCode(EVENT_SPSUMMON_SUCCESS)
+	e3:SetRange(LOCATION_MZONE)
+	e3:SetCountLimit(1,m)
+	e3:SetCondition(cm.thcon)
+	e3:SetTarget(cm.thtg)
+	e3:SetOperation(cm.thop)
+	c:RegisterEffect(e3)
+	local e4=Effect.CreateEffect(c)
+	e4:SetType(EFFECT_TYPE_IGNITION)
+	e4:SetRange(LOCATION_MZONE)
+	e4:SetCountLimit(1,m+100000000)
+	e4:SetCondition(cm.stcon)
+	e4:SetTarget(cm.sttg)
+	e4:SetOperation(cm.stop)
+	c:RegisterEffect(e4)
 end
 function cm.indestg(e,c)
-    return c:IsSetCard(0x83)
+	return c:IsSetCard(0x83)
 end
-function cm.val(e,re,dam,r,rp)
-    local rc=re:GetHandler()
-    if bit.band(r,REASON_EFFECT)~=0 and rc:IsSetCard(0x83) and rc:IsControler(e:GetHandlerPlayer()) then
-        return dam*2
-    else return dam end
+function cm.val(e,re,val,r,rp)
+	if r&REASON_EFFECT==REASON_EFFECT and re and re:IsActiveType(TYPE_MONSTER) then
+		local rc=re:GetHandler()
+		if rc:IsFaceup() and rc:IsSetCard(0x83) and rc:IsControler(e:GetHandlerPlayer()) then
+			return val*2
+		end
+	end
+	return val
 end
 function cm.cfilter(c,tp)
-    return c:IsFaceup() and c:IsSetCard(0x83) and c:IsControler(tp)
+	return c:IsFaceup() and c:IsSetCard(0x83) and c:IsControler(tp)
 end
 function cm.thcon(e,tp,eg,ep,ev,re,r,rp)
-    return eg:IsExists(cm.cfilter,1,nil,tp)
+	return eg:IsExists(cm.cfilter,1,nil,tp)
 end
 function cm.thfilter(c,e,tp,cg)
-    return c:IsSetCard(0x83) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and not cg:IsExists(Card.IsCode,1,nil,c:GetCode())
+	return c:IsSetCard(0x83) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and not cg:IsExists(Card.IsCode,1,nil,c:GetCode())
 end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
-    if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsExistingMatchingCard(cm.thfilter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil,e,tp,eg) end
-    Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK+LOCATION_GRAVE)
+	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsExistingMatchingCard(cm.thfilter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil,e,tp,eg) end
+	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK+LOCATION_GRAVE)
 end
 function cm.thop(e,tp,eg,ep,ev,re,r,rp)
-    local c=e:GetHandler()
-    if Duel.GetLocationCount(tp,LOCATION_MZONE)>0 then
-        Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-        local g=Duel.SelectMatchingCard(tp,cm.thfilter,tp,LOCATION_DECK,0,1,1,nil,e,tp,eg)
-        if not g or g:GetCount()==0 then return end
-        Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
-    end
+	local c=e:GetHandler()
+	if Duel.GetLocationCount(tp,LOCATION_MZONE)>0 then
+		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
+		local g=Duel.SelectMatchingCard(tp,cm.thfilter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil,e,tp,eg)
+		if not g or g:GetCount()==0 then return end
+		Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
+	end
 end
 function cm.confilter(c)
-    return c:IsFaceup() and c:IsType(TYPE_XYZ) and c:IsRankAbove(5) and c:IsRace(RACE_MACHINE)
+	return c:IsFaceup() and c:IsType(TYPE_XYZ) and c:IsRankAbove(5) and c:IsRace(RACE_MACHINE)
 end
-function cm.condition(e,tp,eg,ep,ev,re,r,rp)
-    return Duel.IsExistingMatchingCard(cm.confilter,tp,LOCATION_MZONE,0,1,nil)
+function cm.stcon(e,tp,eg,ep,ev,re,r,rp)
+	return Duel.IsExistingMatchingCard(cm.confilter,tp,LOCATION_MZONE,0,1,nil)
 end
 function cm.stfilter(c)
-    return c:IsCode(94220427) and c:IsSSetable()
+	return c:IsCode(94220427) and c:IsSSetable()
 end
 function cm.sttg(e,tp,eg,ep,ev,re,r,rp,chk)
-    if chk==0 then return Duel.IsExistingMatchingCard(cm.stfilter,tp,LOCATION_DECK,0,1,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(cm.stfilter,tp,LOCATION_DECK,0,1,nil) end
 end
 function cm.stop(e,tp,eg,ep,ev,re,r,rp)
-    local g=Duel.GetMatchingGroup(cm.stfilter,tp,LOCATION_DECK,0,nil)
-    if not g or g:GetCount()==0 then return end
-    Duel.SSet(tp,g:GetFirst())
+	local g=Duel.GetMatchingGroup(cm.stfilter,tp,LOCATION_DECK,0,nil)
+	if not g or g:GetCount()==0 then return end
+	Duel.SSet(tp,g:GetFirst())
 end

expansions/script/c90700065.lua

@@ -52,7 +52,7 @@ function cm.enable(e,tp,eg,ep,ev,re,r,rp)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_ADJUST)
 	e2:SetOperation(cm.todeckop)
-	Duel.RegisterEffect(e2,1-e:GetHandlerPlayer())
+	Duel.RegisterEffect(e2,e:GetHandlerPlayer())
 end
 function cm.filter(c,tp)
 	return c:IsLocation(LOCATION_ONFIELD) and not c:IsControler(tp)

expansions/script/c9910023.lua

@@ -6,7 +6,6 @@ function c9910023.initial_effect(c)
 	--sort
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_TRIGGER_O+EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e1:SetCondition(c9910023.stcon)
 	e1:SetTarget(c9910023.sttg)

expansions/script/c9910105.lua

@@ -27,11 +27,14 @@ function c9910105.spfilter(c,e,tp)
 	return c:IsSetCard(0x952) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c9910105.target(e,tp,eg,ep,ev,re,r,rp,chk)
+	local ct=0
+	if e:GetHandler():GetSequence()>4 then ct=1 end
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE,tp,LOCATION_REASON_CONTROL)>0
 		and (Duel.IsExistingMatchingCard(aux.TRUE,tp,0,LOCATION_ONFIELD,1,nil)
-		or (Duel.GetLocationCount(tp,LOCATION_MZONE)>0
+		or (Duel.GetLocationCount(tp,LOCATION_MZONE)>ct
 		and Duel.IsExistingMatchingCard(c9910105.spfilter,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,nil,e,tp))) end
 	Duel.Hint(HINT_OPSELECTED,1-tp,e:GetDescription())
+	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,0,tp,LOCATION_HAND+LOCATION_GRAVE)
 end
 function c9910105.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
@@ -44,13 +47,14 @@ function c9910105.operation(e,tp,eg,ep,ev,re,r,rp)
 	local off=1
 	local ops={}
 	local opval={}
-	if Duel.IsExistingMatchingCard(aux.TRUE,tp,0,LOCATION_ONFIELD,1,nil) then
+	local g1=Duel.GetFieldGroup(tp,0,LOCATION_ONFIELD)
+	local g2=Duel.GetMatchingGroup(aux.NecroValleyFilter(c9910105.spfilter),tp,LOCATION_HAND+LOCATION_GRAVE,0,nil,e,tp)
+	if g1:GetCount()>0 then
 		ops[off]=aux.Stringid(9910105,2)
 		opval[off-1]=1
 		off=off+1
 	end
-	if Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and Duel.IsExistingMatchingCard(c9910105.spfilter,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,nil,e,tp) then
+	if Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and g2:GetCount()>0 then
 		ops[off]=aux.Stringid(9910105,3)
 		opval[off-1]=2
 		off=off+1
@@ -59,16 +63,16 @@ function c9910105.operation(e,tp,eg,ep,ev,re,r,rp)
 	local op=Duel.SelectOption(tp,table.unpack(ops))
 	if opval[op]==1 then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
-		local g=Duel.SelectMatchingCard(tp,aux.TRUE,tp,0,LOCATION_ONFIELD,1,1,nil)
-		if g:GetCount()>0 then
-			Duel.HintSelection(g)
-			Duel.Destroy(g,REASON_EFFECT)
+		local sg1=g1:Select(tp,1,1,nil)
+		if sg1:GetCount()>0 then
+			Duel.HintSelection(sg1)
+			Duel.Destroy(sg1,REASON_EFFECT)
 		end
 	elseif opval[op]==2 then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-		local g=Duel.SelectMatchingCard(tp,c9910105.spfilter,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,1,nil,e,tp)
-		if g:GetCount()>0 then
-			Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
+		local sg2=g2:Select(tp,1,1,nil)
+		if sg2:GetCount()>0 then
+			Duel.SpecialSummon(sg2,0,tp,tp,false,false,POS_FACEUP)
 		end
 	end
 end

expansions/script/c9910106.lua

@@ -23,11 +23,12 @@ function Zcd.XyzCondition(f,lv,minc,maxc,alterf,desc,op)
 				if og then
 					mg=og
 				else
-					mg=Duel.GetFieldGroup(tp,LOCATION_ONFIELD,0)
+					mg=Duel.GetMatchingGroup(Card.IsFaceup,tp,LOCATION_ONFIELD,0,nil)
 				end
 				if (not min or min<=1) and mg:IsExists(Zcd.XyzAlterFilter,minc,nil,alterf,c,e,tp,op,lv) then
 					local ssg=mg:Filter(Zcd.XyzAlterFilter,nil,alterf,c,e,tp,op,lv)
-					if ssg:IsExists(Zcd.MFilter1,1,nil) and ssg:IsExists(Zcd.MFilter2,1,nil,c,tp) then return true end
+					if ssg:IsExists(Zcd.MFilter1,1,nil) and ssg:IsExists(Zcd.MFilter2,1,nil,c,tp)
+						and ssg:IsExists(Card.IsLocation,1,nil,LOCATION_SZONE) then return true end
 				end
 				local minc=minc
 				local maxc=maxc
@@ -54,7 +55,7 @@ function Zcd.XyzTarget(f,lv,minc,maxc,alterf,desc,op)
 				if og then
 					mg=og
 				else
-					mg=Duel.GetFieldGroup(tp,LOCATION_ONFIELD,0)
+					mg=Duel.GetMatchingGroup(Card.IsFaceup,tp,LOCATION_ONFIELD,0,nil)
 				end
 				local b1=Duel.CheckXyzMaterial(c,f,lv,minc,maxc,og)
 				local b2=nil
@@ -62,6 +63,7 @@ function Zcd.XyzTarget(f,lv,minc,maxc,alterf,desc,op)
 				if (not min or min<=1) and mg:IsExists(Zcd.XyzAlterFilter,minc,nil,alterf,c,e,tp,op,lv) then
 					ssg=mg:Filter(Zcd.XyzAlterFilter,nil,alterf,c,e,tp,op,lv)
 					b2=ssg:IsExists(Zcd.MFilter1,1,nil) and ssg:IsExists(Zcd.MFilter2,1,nil,c,tp)
+						and ssg:IsExists(Card.IsLocation,1,nil,LOCATION_SZONE)
 				end
 				local g=Group.CreateGroup()
 				if b2 and (not b1 or Duel.SelectYesNo(tp,desc)) then

expansions/script/c9910443.lua

@@ -54,7 +54,7 @@ function c9910443.descost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local g=Group.CreateGroup()
 	local g1=Duel.GetFieldGroup(tp,LOCATION_GRAVE,0)
 	local g2=e:GetHandler():GetOverlayGroup()
-	if g2:GetCount()>0 then g:Merge(g1) end
+	if g1:GetCount()>0 then g:Merge(g1) end
 	if g2:GetCount()>0 then g:Merge(g2) end
 	if chk==0 then return g:IsExists(c9910443.cfilter,2,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)