fix

expansions/script/c12869010.lua

@@ -100,6 +100,9 @@ function c12869010.sptg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return not Duel.IsPlayerAffectedByEffect(tp,59822133) and Duel.GetLocationCount(tp,LOCATION_MZONE)>1 and Duel.IsPlayerCanSpecialSummonMonster(tp,12869000,0,TYPES_TOKEN_MONSTER,0,0,1,RACE_AQUA,ATTRIBUTE_WATER) end
 	Duel.SetOperationInfo(0,CATEGORY_TOKEN,nil,2,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,2,0,0)
+	if e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) and e:GetHandler():IsOriginalCodeRule(12869095) then
+		Duel.SetChainLimit(c12869010.chainlm)
+	end
 end
 function c12869010.spop1(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)>1 and not Duel.IsPlayerAffectedByEffect(tp,59822133) and Duel.IsPlayerCanSpecialSummonMonster(tp,12869000,0,TYPES_TOKEN_MONSTER,0,0,1,RACE_AQUA,ATTRIBUTE_WATER) then

expansions/script/c12869015.lua

@@ -104,6 +104,9 @@ function c12869015.sptg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return not Duel.IsPlayerAffectedByEffect(tp,59822133) and Duel.GetLocationCount(tp,LOCATION_MZONE)>1 and Duel.IsPlayerCanSpecialSummonMonster(tp,12869000,0,TYPES_TOKEN_MONSTER,0,0,1,RACE_AQUA,ATTRIBUTE_WATER) end
 	Duel.SetOperationInfo(0,CATEGORY_TOKEN,nil,2,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,2,0,0)
+	if e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) and e:GetHandler():IsOriginalCodeRule(12869095) then
+		Duel.SetChainLimit(c12869015.chainlm)
+	end
 end
 function c12869015.spop1(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)>1 and not Duel.IsPlayerAffectedByEffect(tp,59822133) and Duel.IsPlayerCanSpecialSummonMonster(tp,12869000,0,TYPES_TOKEN_MONSTER,0,0,1,RACE_AQUA,ATTRIBUTE_WATER) then

expansions/script/c12869020.lua

@@ -108,6 +108,9 @@ function c12869020.sptg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return not Duel.IsPlayerAffectedByEffect(tp,59822133) and Duel.GetLocationCount(tp,LOCATION_MZONE)>1 and Duel.IsPlayerCanSpecialSummonMonster(tp,12869000,0,TYPES_TOKEN_MONSTER,0,0,1,RACE_AQUA,ATTRIBUTE_WATER) end
 	Duel.SetOperationInfo(0,CATEGORY_TOKEN,nil,2,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,2,0,0)
+	if e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) and e:GetHandler():IsOriginalCodeRule(12869095) then
+		Duel.SetChainLimit(c12869020.chainlm)
+	end
 end
 function c12869020.spop1(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)>1 and not Duel.IsPlayerAffectedByEffect(tp,59822133) and Duel.IsPlayerCanSpecialSummonMonster(tp,12869000,0,TYPES_TOKEN_MONSTER,0,0,1,RACE_AQUA,ATTRIBUTE_WATER) then

expansions/script/c12869030.lua

@@ -58,10 +58,23 @@ function c12869030.indop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetProperty(EFFECT_FLAG_CLIENT_HINT+EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_NO_TURN_RESET)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCountLimit(1)
+	e1:SetCondition(c12869030.icon)
 	e1:SetTarget(c12869030.tg)
 	e1:SetOperation(c12869030.op)
 	e1:SetReset(RESET_EVENT+RESETS_STANDARD)
 	rc:RegisterEffect(e1,true)
+	local e2=e1:Clone()
+	e2:SetCondition(c12869030.qcon)
+	e2:SetTarget(c12869030.qtg)
+	rc:RegisterEffect(e2,true)
+	if not rc:IsType(TYPE_EFFECT) then
+		local e3=Effect.CreateEffect(c)
+		e3:SetType(EFFECT_TYPE_SINGLE)
+		e3:SetCode(EFFECT_ADD_TYPE)
+		e3:SetValue(TYPE_EFFECT)
+		e3:SetReset(RESET_EVENT+RESETS_STANDARD)
+		rc:RegisterEffect(e3,true)
+	end
 end
 function c12869030.filter(c,e,tp)
 	return c:IsCanBeSpecialSummoned(e,0,tp,false,false) and c:IsSetCard(0x6a70) and c:IsType(TYPE_LINK)
@@ -73,6 +86,9 @@ function c12869030.tg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local g=Duel.SelectTarget(tp,c12869030.filter,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,1,nil,e,tp)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g,1,0,0)
+	if e:GetHandler():IsOriginalCodeRule(12869095) then 
+		Duel.SetChainLimit(c12869030.chainlm)
+	end
 	e:Reset()
 	e:GetHandler():RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(12869030,3))
 end
@@ -88,4 +104,24 @@ function c12869030.op(e,tp,eg,ep,ev,re,r,rp)
 		tc:RegisterEffect(e1)
 	end
 	Duel.SpecialSummonComplete()
+end
+function c12869030.icon(e,tp,eg,ep,ev,re,r,rp)
+	return not e:GetHandler():IsOriginalCodeRule(12869095) or not Duel.IsEnvironment(12869005)
+end
+function c12869030.qcon(e,tp,eg,ep,ev,re,r,rp)
+	return e:GetHandler():IsOriginalCodeRule(12869095) and Duel.IsEnvironment(12869005)
+end
+function c12869030.qtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and c12869030.filter(chkc,e,tp) end
+	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
+		and Duel.IsExistingTarget(c12869030.filter,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil,e,tp) end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
+	local g=Duel.SelectTarget(tp,c12869030.filter,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,1,nil,e,tp)
+	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g,1,0,0)
+	Duel.SetChainLimit(c12869030.chainlm)
+	e:Reset()
+	e:GetHandler():RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(12869030,3))
+end
+function c12869030.chainlm(e,ep,tp)
+	return tp==ep
 end
\ No newline at end of file

expansions/script/c12869035.lua

@@ -60,10 +60,23 @@ function c12869035.indop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_END_PHASE)
 	e1:SetCountLimit(1)
+	e1:SetCondition(c12869035.icon)
 	e1:SetTarget(c12869035.tg)
 	e1:SetOperation(c12869035.op)
 	e1:SetReset(RESET_EVENT+RESETS_STANDARD)
 	rc:RegisterEffect(e1,true)
+	local e2=e1:Clone()
+	e2:SetCondition(c12869035.qcon)
+	e2:SetTarget(c12869035.qtg)
+	rc:RegisterEffect(e2,true)
+	if not rc:IsType(TYPE_EFFECT) then
+		local e3=Effect.CreateEffect(c)
+		e3:SetType(EFFECT_TYPE_SINGLE)
+		e3:SetCode(EFFECT_ADD_TYPE)
+		e3:SetValue(TYPE_EFFECT)
+		e3:SetReset(RESET_EVENT+RESETS_STANDARD)
+		rc:RegisterEffect(e3,true)
+	end
 end
 function c12869035.tg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsOnField() and chkc:IsAbleToRemove() end
@@ -71,6 +84,9 @@ function c12869035.tg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 	local g=Duel.SelectTarget(tp,Card.IsAbleToRemove,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,nil)
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,1,0,0)
+	if e:GetHandler():IsOriginalCodeRule(12869095) then 
+		Duel.SetChainLimit(c12869035.chainlm)
+	end
 	e:Reset()
 	e:GetHandler():RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(12869035,3))
 end
@@ -79,4 +95,23 @@ function c12869035.op(e,tp,eg,ep,ev,re,r,rp)
 	if tc:IsRelateToEffect(e) then
 		Duel.Remove(tc,POS_FACEUP,REASON_EFFECT)
 	end
+end
+function c12869035.icon(e,tp,eg,ep,ev,re,r,rp)
+	return not e:GetHandler():IsOriginalCodeRule(12869095) or not Duel.IsEnvironment(12869005)
+end
+function c12869035.qcon(e,tp,eg,ep,ev,re,r,rp)
+	return e:GetHandler():IsOriginalCodeRule(12869095) and Duel.IsEnvironment(12869005)
+end
+function c12869035.qtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+	if chkc then return chkc:IsOnField() and chkc:IsAbleToRemove() end
+	if chk==0 then return Duel.IsExistingTarget(Card.IsAbleToRemove,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
+	local g=Duel.SelectTarget(tp,Card.IsAbleToRemove,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,nil)
+	Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,1,0,0)
+	e:Reset()
+	e:GetHandler():RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(12869035,3))
+	Duel.SetChainLimit(c12869035.chainlm)
+end
+function c12869035.chainlm(e,ep,tp)
+	return tp==ep
 end
\ No newline at end of file

expansions/script/c12869040.lua

@@ -60,11 +60,24 @@ function c12869040.indop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetHintTiming(0,TIMING_MAIN_END+TIMING_END_PHASE+TIMING_STANDBY_PHASE+TIMINGS_CHECK_MONSTER)
 	e1:SetCountLimit(1)
+	e1:SetCondition(c12869040.icon)
 	e1:SetTarget(c12869040.target)
 	e1:SetCondition(c12869040.condition)
 	e1:SetOperation(c12869040.op)
 	e1:SetReset(RESET_EVENT+RESETS_STANDARD)
 	rc:RegisterEffect(e1,true)
+	local e2=e1:Clone()
+	e2:SetCondition(c12869040.qcon)
+	e2:SetTarget(c12869040.qtg)
+	rc:RegisterEffect(e2,true)
+	if not rc:IsType(TYPE_EFFECT) then
+		local e3=Effect.CreateEffect(c)
+		e3:SetType(EFFECT_TYPE_SINGLE)
+		e3:SetCode(EFFECT_ADD_TYPE)
+		e3:SetValue(TYPE_EFFECT)
+		e3:SetReset(RESET_EVENT+RESETS_STANDARD)
+		rc:RegisterEffect(e3,true)
+	end
 end
 function c12869040.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Auxiliary.nbcon(tp,re) end
@@ -77,6 +90,9 @@ function c12869040.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	else
 		e:SetCategory(e:GetCategory()&~CATEGORY_GRAVE_ACTION)
 	end
+	if e:GetHandler():IsOriginalCodeRule(12869095) then 
+		Duel.SetChainLimit(c12869040.chainlm)
+	end
 	e:Reset()
 	e:GetHandler():RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(12869040,3))
 end
@@ -88,3 +104,27 @@ function c12869040.op(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Remove(eg,POS_FACEUP,REASON_EFFECT)
 	end
 end
+function c12869040.icon(e,tp,eg,ep,ev,re,r,rp)
+	return not e:GetHandler():IsOriginalCodeRule(12869095) or not Duel.IsEnvironment(12869005)
+end
+function c12869040.qcon(e,tp,eg,ep,ev,re,r,rp)
+	return e:GetHandler():IsOriginalCodeRule(12869095) and Duel.IsEnvironment(12869005)
+end
+function c12869040.qtg(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Auxiliary.nbcon(tp,re) end
+	Duel.SetOperationInfo(0,CATEGORY_NEGATE,eg,1,0,0)
+	if re:GetHandler():IsRelateToEffect(re) then
+		Duel.SetOperationInfo(0,CATEGORY_REMOVE,eg,1,0,0)
+	end
+	if re:GetActivateLocation()==LOCATION_GRAVE then
+		e:SetCategory(e:GetCategory()|CATEGORY_GRAVE_ACTION)
+	else
+		e:SetCategory(e:GetCategory()&~CATEGORY_GRAVE_ACTION)
+	end
+	Duel.SetChainLimit(c12869040.chainlm)
+	e:Reset()
+	e:GetHandler():RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(12869040,3))
+end
+function c12869040.chainlm(e,ep,tp)
+	return tp==ep
+end
\ No newline at end of file

expansions/script/c12869045.lua

@@ -2,7 +2,7 @@
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--synchro summon
-	aux.AddSynchroMixProcedure(c,aux.Tuner(aux.FilterBoolFunction(Card.IsSetCard,0x6a70)),nil,nil,aux.NonTuner(nil),1,1)
+	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x6a70),aux.NonTuner(nil),1,1)
 	c:EnableReviveLimit()
 	--token
 	local e1=Effect.CreateEffect(c)
@@ -102,6 +102,9 @@ function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_DECK,0,1,nil) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
 	e:GetHandler():RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(12869045,3))
+	if e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) and e:GetHandler():IsOriginalCodeRule(12869095) then
+		Duel.SetChainLimit(s.chainlm)
+	end
 end
 function s.thop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)

expansions/script/c12869050.lua

@@ -2,7 +2,7 @@
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--synchro summon
-	aux.AddSynchroMixProcedure(c,aux.Tuner(aux.FilterBoolFunction(Card.IsSetCard,0x6a70)),nil,nil,aux.NonTuner(nil),1,99)
+	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x6a70),aux.NonTuner(nil),1)
 	c:EnableReviveLimit()
 	--token
 	local e1=Effect.CreateEffect(c)
@@ -101,6 +101,9 @@ function s.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetTargetParam(1)
 	Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1)
 	e:GetHandler():RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(12869050,3))
+	if e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) and e:GetHandler():IsOriginalCodeRule(12869095) then
+		Duel.SetChainLimit(s.chainlm)
+	end
 end
 function s.drop(e,tp,eg,ep,ev,re,r,rp)
 	local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)

expansions/script/c12869055.lua

@@ -2,7 +2,7 @@
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--synchro summon
-	aux.AddSynchroMixProcedure(c,aux.Tuner(aux.FilterBoolFunction(Card.IsSetCard,0x6a70)),nil,nil,aux.NonTuner(nil),1,99)
+	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x6a70),aux.NonTuner(nil),1)
 	c:EnableReviveLimit()
 	--token
 	local e1=Effect.CreateEffect(c)
@@ -101,6 +101,9 @@ end
 function s.sstg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_DECK,0,1,nil) end
 	e:GetHandler():RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(12869055,3))
+	if e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) and e:GetHandler():IsOriginalCodeRule(12869095) then
+		Duel.SetChainLimit(s.chainlm)
+	end
 end
 function s.ssop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET)

expansions/script/c12869060.lua

@@ -2,7 +2,7 @@
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--synchro summon
-	aux.AddSynchroMixProcedure(c,aux.Tuner(aux.FilterBoolFunction(Card.IsSetCard,0x6a70)),nil,nil,aux.NonTuner(nil),1,99)
+	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x6a70),aux.NonTuner(nil),1)
 	c:EnableReviveLimit()
 	--token
 	local e1=Effect.CreateEffect(c)
@@ -29,6 +29,7 @@ function s.initial_effect(c)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetProperty(EFFECT_FLAG_NO_TURN_RESET)
 	e2:SetCountLimit(1)
+	e2:SetTarget(s.imtg)
 	e2:SetCost(s.imcost)
 	e2:SetOperation(s.imop)
 	c:RegisterEffect(e2)
@@ -121,6 +122,12 @@ function s.imcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.Release(sg,REASON_COST)
 	e:GetHandler():RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(12869060,7))
 end
+function s.imtg(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return true end
+	if e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) and e:GetHandler():IsOriginalCodeRule(12869095) then
+		Duel.SetChainLimit(s.chainlm)
+	end
+end
 function s.imop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if c:IsFaceup() then

expansions/script/c12869085.lua

@@ -17,6 +17,8 @@ function s.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCountLimit(1)
+	e2:SetCondition(s.icon)
+	e2:SetTarget(s.eftg)
 	e2:SetCost(s.efcost)
 	e2:SetOperation(s.efop)
 	c:RegisterEffect(e2)
@@ -94,6 +96,12 @@ function s.efcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local cg=Duel.SelectMatchingCard(tp,s.costfilter,tp,LOCATION_DECK,0,1,1,nil)
 	Duel.SendtoGrave(cg,REASON_COST)
 end
+function s.eftg(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return true end
+	if e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) and e:GetHandler():IsOriginalCodeRule(12869095) then
+		Duel.SetChainLimit(s.chainlm)
+	end
+end
 function s.efop(e,tp,eg,ep,ev,re,r,rp)
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD)

expansions/script/c28368431.lua

@@ -50,7 +50,7 @@ function c28368431.activate(e,tp,eg,ep,ev,re,r,rp)
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetDescription(aux.Stringid(28368431,0))
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e1:SetCode(EVENT_LEAVE_FIELD)
+	e1:SetCode(EVENT_DESTROYED)
 	e1:SetProperty(EFFECT_FLAG_DELAY)
 	--e1:SetCondition(c28368431.regcon)
 	e1:SetOperation(c28368431.regop)

expansions/script/c71405000.lua

@@ -116,7 +116,7 @@ function s.op3(e,tp,eg,ep,ev,re,r,rp)
 	local tc1=g1:GetFirst()
 	if not tc1 then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local g2=Duel.SelectMatchingCard(tp,s.filterc3,tp,LOCATION_EXTRA,0,1,1,tc1,e,tp,lv-tc1:GetLevel()+1,false)
+	local g2=Duel.SelectMatchingCard(tp,s.filterc3,tp,LOCATION_EXTRA,0,1,1,tc1,lv-tc1:GetLevel()+1,e,tp,false)
 	g1:Merge(g2)
 	for tc in aux.Next(g1) do
 		tc:SetMaterial(nil)

expansions/script/c71405005.lua

@@ -38,6 +38,7 @@ function s.initial_effect(c)
 	c:RegisterEffect(e3a)
 end
 function s.cost1(e,tp,eg,ep,ev,re,r,rp,chk)
+	local c=e:GetHandler()
 	if chk==0 then return c:GetMaterial():GetCount()==0 or Duel.IsExistingMatchingCard(Card.IsAbleToRemoveAsCost,tp,LOCATION_HAND,0,1,nil) end
 	if c:GetMaterial():GetCount()>0 then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)

expansions/script/c71405011.lua

@@ -64,7 +64,7 @@ function s.op1(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 		local rg=Duel.SelectMatchingCard(tp,Card.IsAbleToRemove,tp,LOCATION_HAND,0,1,1,nil)
 		Duel.ShuffleHand(tp)
-		if dg:GetCount()>0 then
+		if rg:GetCount()>0 then
 			Duel.BreakEffect()
 			Duel.Remove(rg,POS_FACEUP,REASON_EFFECT)
 		end

expansions/script/c71405012.lua

@@ -15,7 +15,6 @@ function s.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_HAND)
 	e1:SetCountLimit(1,id)
-	e1:SetCondition(s.con1)
 	e1:SetCost(s.cost1)
 	e1:SetTarget(s.tg1)
 	e1:SetOperation(s.op1)

expansions/script/c89490102.lua

@@ -69,7 +69,7 @@ function s.sumlimit(e,c)
 	return c:IsControler(e:GetHandlerPlayer())
 end
 function s.repfilter(c,tp)
-	return c:IsFaceup() and c:IsControler(tp) and c:IsLocation(LOCATION_ONFIELD) and c:IsSetCard(0xc37) and c:IsType(TYPE_PENDULUM) and c:IsReason(REASON_EFFECT+REASON_BATTLE) and not c:IsReason(REASON_REPLACE)
+	return c:IsFaceup() and c:IsControler(tp) and c:IsLocation(LOCATION_ONFIELD) and c:IsSetCard(0xc37) and c:GetOriginalType()&TYPE_MONSTER~=0 and c:IsReason(REASON_EFFECT+REASON_BATTLE) and not c:IsReason(REASON_REPLACE)
 end
 function s.reptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsAbleToRemove() and eg:IsExists(s.repfilter,1,nil,tp) end

expansions/script/c9910050.lua

@@ -10,7 +10,7 @@ function c9910050.initial_effect(c)
 	c:RegisterEffect(e1)
 	--set
 	local e2=Effect.CreateEffect(c)
-	e2:SetCategory(CATEGORY_TOHAND+CATEGORY_SUMMON)
+	e2:SetCategory(CATEGORY_SSET)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetProperty(EFFECT_FLAG_DELAY)
 	e2:SetCode(EVENT_TO_GRAVE)

expansions/script/c9910052.lua

@@ -10,7 +10,7 @@ function c9910052.initial_effect(c)
 	c:RegisterEffect(e1)
 	--set
 	local e2=Effect.CreateEffect(c)
-	e2:SetCategory(CATEGORY_TOHAND+CATEGORY_SUMMON)
+	e2:SetCategory(CATEGORY_SSET)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetProperty(EFFECT_FLAG_DELAY)
 	e2:SetCode(EVENT_TO_GRAVE)

expansions/script/c9910066.lua

@@ -2,7 +2,7 @@
 function c9910066.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_REMOVE)
+	e1:SetCategory(CATEGORY_REMOVE+CATEGORY_MSET+CATEGORY_SSET)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_END_PHASE)

expansions/script/c9910070.lua

@@ -21,7 +21,7 @@ function c9910070.initial_effect(c)
 	--effect gain
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(9910070,0))
-	e3:SetCategory(CATEGORY_POSITION)
+	e3:SetCategory(CATEGORY_POSITION+CATEGORY_MSET)
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e3:SetProperty(EFFECT_FLAG_DELAY)
 	e3:SetCode(EVENT_SPSUMMON_SUCCESS)

expansions/script/c9910075.lua

@@ -2,7 +2,7 @@
 function c9910075.initial_effect(c)
 	--turn set
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_POSITION+CATEGORY_SEARCH+CATEGORY_TOHAND)
+	e1:SetCategory(CATEGORY_POSITION+CATEGORY_MSET+CATEGORY_SEARCH+CATEGORY_TOHAND)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCountLimit(1,9910075)

expansions/script/c9910078.lua

@@ -2,7 +2,7 @@
 function c9910078.initial_effect(c)
 	--turn set
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_POSITION+CATEGORY_SPECIAL_SUMMON)
+	e1:SetCategory(CATEGORY_POSITION+CATEGORY_MSET+CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCountLimit(1,9910078)

expansions/script/c9910080.lua

@@ -8,7 +8,7 @@ function c9910080.initial_effect(c)
 	--remove
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(9910080,0))
-	e1:SetCategory(CATEGORY_REMOVE)
+	e1:SetCategory(CATEGORY_REMOVE+CATEGORY_SSET)
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e1:SetCode(EVENT_TO_GRAVE)
 	e1:SetProperty(EFFECT_FLAG_DELAY)

expansions/script/c9910081.lua

@@ -2,7 +2,7 @@
 function c9910081.initial_effect(c)
 	--turn set
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_POSITION+CATEGORY_SPECIAL_SUMMON)
+	e1:SetCategory(CATEGORY_POSITION+CATEGORY_MSET+CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCountLimit(1,9910081)

expansions/script/c9910085.lua

@@ -36,7 +36,7 @@ function c9910085.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	end
 	local cate=CATEGORY_NEGATE+CATEGORY_DESTROY+CATEGORY_REMOVE 
 	if bit.band(re:GetHandler():GetOriginalType(),TYPE_MONSTER)~=0 then
-		e:SetCategory(cate+CATEGORY_SPECIAL_SUMMON+CATEGORY_GRAVE_SPSUMMON)
+		e:SetCategory(cate+CATEGORY_SPECIAL_SUMMON+CATEGORY_GRAVE_SPSUMMON+CATEGORY_MSET+CATEGORY_SSET)
 	else
 		e:SetCategory(cate)
 	end

expansions/script/c9910086.lua

@@ -2,7 +2,7 @@
 function c9910086.initial_effect(c)
 	--turn set
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_POSITION+CATEGORY_SEARCH+CATEGORY_TOHAND)
+	e1:SetCategory(CATEGORY_POSITION+CATEGORY_MSET+CATEGORY_SEARCH+CATEGORY_TOHAND)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCountLimit(1,9910086)

expansions/script/c9910104.lua

@@ -6,7 +6,7 @@ function c9910104.initial_effect(c)
 	--get effect
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(9910104,0))
-	e2:SetCategory(CATEGORY_POSITION)
+	e2:SetCategory(CATEGORY_POSITION+CATEGORY_MSET)
 	e2:SetType(EFFECT_TYPE_XMATERIAL+EFFECT_TYPE_QUICK_O)
 	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e2:SetCode(EVENT_FREE_CHAIN)

expansions/script/c9910162.lua

@@ -12,7 +12,7 @@ function c9910162.initial_effect(c)
 	c:RegisterEffect(e1)
 	--set
 	local e2=Effect.CreateEffect(c)
-	e2:SetCategory(CATEGORY_LEAVE_GRAVE)
+	e2:SetCategory(CATEGORY_LEAVE_GRAVE+CATEGORY_SSET)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetRange(LOCATION_GRAVE)
 	e2:SetCode(EVENT_FREE_CHAIN)

expansions/script/c9910182.lua

@@ -2,7 +2,7 @@
 function c9910182.initial_effect(c)
 	--activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TODECK)
+	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_MSET+CATEGORY_SSET+CATEGORY_TODECK)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_CHAINING)
 	e1:SetCountLimit(1,9910182)

expansions/script/c9910184.lua

@@ -3,7 +3,7 @@ function c9910184.initial_effect(c)
 	--activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(9910184,2))
-	e1:SetCategory(CATEGORY_TODECK+CATEGORY_TOHAND+CATEGORY_GRAVE_ACTION)
+	e1:SetCategory(CATEGORY_TODECK+CATEGORY_SSET+CATEGORY_TOHAND+CATEGORY_GRAVE_ACTION)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetCode(EVENT_TO_GRAVE)

expansions/script/c9910191.lua

@@ -2,7 +2,7 @@
 function c9910191.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_TOGRAVE+CATEGORY_DECKDES)
+	e1:SetCategory(CATEGORY_SSET+CATEGORY_TOGRAVE+CATEGORY_DECKDES)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetCountLimit(1,9910191)

expansions/script/c9910200.lua

@@ -15,7 +15,7 @@ function c9910200.initial_effect(c)
 	--position/return to hand
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(9910200,1))
-	e2:SetCategory(CATEGORY_POSITION+CATEGORY_TOHAND)
+	e2:SetCategory(CATEGORY_POSITION+CATEGORY_MSET+CATEGORY_TOHAND)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e2:SetRange(LOCATION_MZONE)

expansions/script/c9910253.lua

@@ -13,7 +13,7 @@ function c9910253.initial_effect(c)
 	c:RegisterEffect(e1)
 	--add counter & set
 	local e2=Effect.CreateEffect(c)
-	e2:SetCategory(CATEGORY_COUNTER+CATEGORY_LEAVE_GRAVE)
+	e2:SetCategory(CATEGORY_COUNTER+CATEGORY_LEAVE_GRAVE+CATEGORY_SSET)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetCode(EVENT_SUMMON_SUCCESS)
 	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)

expansions/script/c9910255.lua

@@ -39,7 +39,7 @@ function c9910255.initial_effect(c)
 	--position
 	local e6=Effect.CreateEffect(c)
 	e6:SetDescription(aux.Stringid(9910255,1))
-	e6:SetCategory(CATEGORY_POSITION)
+	e6:SetCategory(CATEGORY_POSITION+CATEGORY_MSET)
 	e6:SetType(EFFECT_TYPE_QUICK_O)
 	e6:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e6:SetCode(EVENT_FREE_CHAIN)

expansions/script/c9910264.lua

@@ -2,7 +2,7 @@
 function c9910264.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_COUNTER+CATEGORY_NEGATE+CATEGORY_REMOVE)
+	e1:SetCategory(CATEGORY_COUNTER+CATEGORY_NEGATE+CATEGORY_REMOVE+CATEGORY_SSET)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_CHAINING)
 	e1:SetCondition(c9910264.condition)

expansions/script/c9910266.lua

@@ -13,7 +13,7 @@ function c9910266.initial_effect(c)
 	c:RegisterEffect(e1)
 	--add counter / special summon
 	local e2=Effect.CreateEffect(c)
-	e2:SetCategory(CATEGORY_COUNTER+CATEGORY_SPECIAL_SUMMON+CATEGORY_POSITION)
+	e2:SetCategory(CATEGORY_COUNTER+CATEGORY_SPECIAL_SUMMON+CATEGORY_POSITION+CATEGORY_MSET)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCode(EVENT_BECOME_TARGET)

expansions/script/c9910268.lua

@@ -15,7 +15,7 @@ function c9910268.initial_effect(c)
 	--disable
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(9910268,1))
-	e2:SetCategory(CATEGORY_DISABLE)
+	e2:SetCategory(CATEGORY_DISABLE+CATEGORY_SSET)
 	e2:SetType(EFFECT_TYPE_ACTIVATE)
 	e2:SetCode(EVENT_FREE_CHAIN)
 	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)

expansions/script/c9910269.lua

@@ -2,7 +2,7 @@
 function c9910269.initial_effect(c)
 	--spsummon
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_MSET)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_GRAVE)
 	e1:SetCountLimit(1,9910269)

expansions/script/c9910284.lua

@@ -15,7 +15,7 @@ function c9910284.initial_effect(c)
 	--set
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(9910284,0))
-	e2:SetCategory(CATEGORY_DISABLE)
+	e2:SetCategory(CATEGORY_SSET+CATEGORY_DISABLE)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e2:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET)
 	e2:SetRange(LOCATION_MZONE)

expansions/script/c9910331.lua

@@ -11,7 +11,7 @@ function c9910331.initial_effect(c)
 	--special summon
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(9910331,1))
-	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e2:SetCategory(CATEGORY_SSET+CATEGORY_DESTROY+CATEGORY_TOHAND)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e2:SetProperty(EFFECT_FLAG_DELAY)
 	e2:SetCode(EVENT_MSET)

expansions/script/c9910334.lua

@@ -2,7 +2,7 @@
 function c9910334.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_HANDES+CATEGORY_TODECK)
+	e1:SetCategory(CATEGORY_HANDES+CATEGORY_SSET+CATEGORY_TODECK)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetTarget(c9910334.target)

expansions/script/c9910366.lua

@@ -14,7 +14,7 @@ function c9910366.initial_effect(c)
 	c:RegisterEffect(e1)
 	--set
 	local e2=Effect.CreateEffect(c)
-	e2:SetCategory(CATEGORY_POSITION+CATEGORY_TODECK)
+	e2:SetCategory(CATEGORY_POSITION+CATEGORY_MSET+CATEGORY_TODECK)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetCode(EVENT_FREE_CHAIN)
 	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)

expansions/script/c9910376.lua

@@ -14,7 +14,7 @@ function c9910376.initial_effect(c)
 	c:RegisterEffect(e1)
 	--remove & set
 	local e2=Effect.CreateEffect(c)
-	e2:SetCategory(CATEGORY_REMOVE+CATEGORY_TODECK)
+	e2:SetCategory(CATEGORY_REMOVE+CATEGORY_SSET+CATEGORY_TODECK)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetCode(EVENT_CHAINING)
 	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)

expansions/script/c9910413.lua

@@ -15,7 +15,7 @@ function c9910413.initial_effect(c)
 	c:RegisterEffect(e1)
 	--position
 	local e2=Effect.CreateEffect(c)
-	e2:SetCategory(CATEGORY_POSITION)
+	e2:SetCategory(CATEGORY_POSITION+CATEGORY_MSET)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
 	e2:SetCode(EVENT_LEAVE_FIELD)

expansions/script/c9910427.lua

@@ -12,7 +12,7 @@ function c9910427.initial_effect(c)
 	c:RegisterEffect(e1)
 	--destroy & set
 	local e2=Effect.CreateEffect(c)
-	e2:SetCategory(CATEGORY_DESTROY)
+	e2:SetCategory(CATEGORY_DESTROY+CATEGORY_SSET)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e2:SetRange(LOCATION_MZONE)

expansions/script/c9910462.lua

@@ -15,7 +15,7 @@ function c9910462.initial_effect(c)
 	c:RegisterEffect(e1)
 	--negate
 	local e2=Effect.CreateEffect(c)
-	e2:SetCategory(CATEGORY_NEGATE)
+	e2:SetCategory(CATEGORY_NEGATE+CATEGORY_SSET)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
 	e2:SetCode(EVENT_CHAINING)

expansions/script/c9910476.lua

@@ -28,6 +28,7 @@ function c9910476.initial_effect(c)
 	c:RegisterEffect(e2)
 	--set
 	local e3=Effect.CreateEffect(c)
+	e3:SetCategory(CATEGORY_SSET)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
 	e3:SetCode(EVENT_DESTROYED)

expansions/script/c9910479.lua

@@ -28,6 +28,7 @@ function c9910479.initial_effect(c)
 	c:RegisterEffect(e2)
 	--set
 	local e3=Effect.CreateEffect(c)
+	e3:SetCategory(CATEGORY_SSET)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
 	e3:SetCode(EVENT_DESTROYED)

expansions/script/c9910482.lua

@@ -32,6 +32,7 @@ function c9910482.initial_effect(c)
 	c:RegisterEffect(e3)
 	--set
 	local e4=Effect.CreateEffect(c)
+	e4:SetCategory(CATEGORY_SSET)
 	e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e4:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
 	e4:SetCode(EVENT_DESTROYED)

expansions/script/c9910485.lua

@@ -32,6 +32,7 @@ function c9910485.initial_effect(c)
 	c:RegisterEffect(e3)
 	--set
 	local e4=Effect.CreateEffect(c)
+	e4:SetCategory(CATEGORY_SSET)
 	e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e4:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
 	e4:SetCode(EVENT_DESTROYED)

expansions/script/c9910505.lua

@@ -13,6 +13,7 @@ function c9910505.initial_effect(c)
 	c:RegisterEffect(e1)
 	--set
 	local e2=Effect.CreateEffect(c)
+	e2:SetCategory(CATEGORY_SSET)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetCode(EVENT_RELEASE)
 	e2:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP)

expansions/script/c9910512.lua

@@ -2,7 +2,7 @@
 function c9910512.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_POSITION+CATEGORY_SPECIAL_SUMMON+CATEGORY_DECKDES)
+	e1:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_POSITION+CATEGORY_MSET+CATEGORY_SPECIAL_SUMMON+CATEGORY_DECKDES)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP)
 	e1:SetCode(EVENT_FREE_CHAIN)

expansions/script/c9910515.lua

@@ -16,7 +16,7 @@ function c9910515.initial_effect(c)
 	c:RegisterEffect(e1)
 	--set card
 	local e2=Effect.CreateEffect(c)
-	e2:SetCategory(CATEGORY_GRAVE_SPSUMMON)
+	e2:SetCategory(CATEGORY_GRAVE_SPSUMMON+CATEGORY_MSET+CATEGORY_SSET)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetCode(EVENT_RELEASE)
 	e2:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP)

expansions/script/c9910564.lua

@@ -7,7 +7,7 @@ function c9910564.initial_effect(c)
 	QutryTxjp.AddTgFlag(c)
 	--to hand
 	local e2=Effect.CreateEffect(c)
-	e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_REMOVE+CATEGORY_DRAW)
+	e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_MSET+CATEGORY_REMOVE+CATEGORY_DRAW)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetCode(EVENT_CHAINING)
 	e2:SetRange(LOCATION_HAND)

expansions/script/c9910571.lua

@@ -3,7 +3,7 @@ function c9910571.initial_effect(c)
 	--flip
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(9910571,0))
-	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH+CATEGORY_GRAVE_ACTION)
+	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP+EFFECT_TYPE_TRIGGER_O)
 	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetCountLimit(1,9910571)
@@ -33,6 +33,14 @@ function c9910571.thfilter2(c)
 end
 function c9910571.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c9910571.thfilter1,tp,LOCATION_DECK,0,1,nil) end
+	e:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
+	local chain=Duel.GetCurrentChain()
+	if chain>1 then
+		local te=Duel.GetChainInfo(chain-1,CHAININFO_TRIGGERING_EFFECT)
+		if te and te:GetHandler()==e:GetHandler() then
+			e:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH+CATEGORY_GRAVE_ACTION)
+		end
+	end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
 end
 function c9910571.operation(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c9910573.lua

@@ -3,7 +3,7 @@ function c9910573.initial_effect(c)
 	--flip
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(9910573,0))
-	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH+CATEGORY_GRAVE_ACTION)
+	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP+EFFECT_TYPE_TRIGGER_O)
 	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetCountLimit(1,9910573)
@@ -33,6 +33,14 @@ function c9910573.spfilter(c,e,tp)
 end
 function c9910573.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c9910573.thfilter,tp,LOCATION_DECK,0,1,nil) end
+	e:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
+	local chain=Duel.GetCurrentChain()
+	if chain>1 then
+		local te=Duel.GetChainInfo(chain-1,CHAININFO_TRIGGERING_EFFECT)
+		if te and te:GetHandler()==e:GetHandler() then
+			e:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH+CATEGORY_SPECIAL_SUMMON+CATEGORY_MSET)
+		end
+	end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
 end
 function c9910573.operation(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c9910575.lua

@@ -2,7 +2,6 @@
 function c9910575.initial_effect(c)
 	--activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_POSITION)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetCountLimit(1,9910575+EFFECT_COUNT_CODE_OATH)
@@ -49,7 +48,9 @@ function c9910575.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	end
 	e:SetLabel(s)
 	if s==0 then
-		e:SetCategory(CATEGORY_POSITION+CATEGORY_SPECIAL_SUMMON+CATEGORY_DECKDES)
+		e:SetCategory(CATEGORY_POSITION+CATEGORY_SPECIAL_SUMMON+CATEGORY_MSET+CATEGORY_DECKDES)
+	else
+		e:SetCategory(CATEGORY_POSITION+CATEGORY_MSET)
 	end
 	Duel.SetOperationInfo(0,CATEGORY_POSITION,nil,1,0,0)
 end

expansions/script/c9910576.lua

@@ -25,26 +25,37 @@ function c9910576.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	Duel.Hint(HINT_OPSELECTED,1-tp,e:GetDescription())
 end
-function c9910576.tgfilter(c)
+function c9910576.tgfilter(c,tp,res)
 	return c:IsType(TYPE_FLIP) and c:IsAbleToGrave()
+		and (c:IsLocation(LOCATION_HAND) or Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)>=2 or res)
 end
 function c9910576.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsPlayerCanDraw(tp,1)
-		and Duel.IsExistingMatchingCard(c9910576.tgfilter,tp,LOCATION_HAND,0,1,nil) end
+	local loc=LOCATION_HAND
+	local chain=Duel.GetCurrentChain()
+	Debug.Message("chain=")
+	Debug.Message(chain)
+	if chain>0 then
+		local te=Duel.GetChainInfo(chain,CHAININFO_TRIGGERING_EFFECT)
+		if te:GetHandler()==e:GetHandler() then loc=LOCATION_HAND+LOCATION_DECK end
+	end
+	Debug.Message("loc=")
+	Debug.Message(loc)
+	if chk==0 then return Duel.IsExistingMatchingCard(c9910576.tgfilter,tp,loc,0,1,nil,tp,false) and Duel.IsPlayerCanDraw(tp,1) end
+	e:SetCategory(CATEGORY_TOGRAVE+CATEGORY_DRAW)
+	if loc==LOCATION_HAND+LOCATION_DECK then e:SetCategory(CATEGORY_TOGRAVE+CATEGORY_DECKDES+CATEGORY_DRAW) end
 	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,tp,LOCATION_HAND+LOCATION_DECK)
 	Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1)
 end
 function c9910576.operation(e,tp,eg,ep,ev,re,r,rp)
-	local loc=LOCATION_HAND 
+	local loc=LOCATION_HAND
 	local chain=Duel.GetCurrentChain()
 	if chain>1 then
 		local te=Duel.GetChainInfo(chain-1,CHAININFO_TRIGGERING_EFFECT)
 		if te:GetHandler()==e:GetHandler() then loc=LOCATION_HAND+LOCATION_DECK end
 	end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
-	local g=Duel.SelectMatchingCard(tp,c9910576.tgfilter,tp,loc,0,1,1,nil)
-	if g:GetCount()>0 and Duel.SendtoGrave(g,REASON_EFFECT)~=0
-		and g:GetFirst():IsLocation(LOCATION_GRAVE) then
+	local g=Duel.SelectMatchingCard(tp,c9910576.tgfilter,tp,loc,0,1,1,nil,tp,true)
+	if g:GetCount()>0 and Duel.SendtoGrave(g,REASON_EFFECT)~=0 and g:GetFirst():IsLocation(LOCATION_GRAVE) then
 		Duel.Draw(tp,1,REASON_EFFECT)
 	end
 end

expansions/script/c9910579.lua

@@ -2,7 +2,6 @@
 function c9910579.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_POSITION)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_END_PHASE)
@@ -53,14 +52,10 @@ function c9910579.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	end
 	e:SetLabel(s)
 	if s==0 then
+		e:SetCategory(CATEGORY_POSITION)
 		Duel.SetOperationInfo(0,CATEGORY_POSITION,g1,g1:GetCount(),0,0)
-		local tep=nil
-		if Duel.GetCurrentChain()>1 then tep=Duel.GetChainInfo(Duel.GetCurrentChain()-1,CHAININFO_TRIGGERING_PLAYER) end
-		if e:IsHasType(EFFECT_TYPE_ACTIVATE) and tep and tep==1-tp then
-			e:SetCategory(CATEGORY_POSITION+CATEGORY_TOHAND)
-		end
 	else
-		e:SetCategory(CATEGORY_POSITION+CATEGORY_SPECIAL_SUMMON)
+		e:SetCategory(CATEGORY_POSITION+CATEGORY_MSET+CATEGORY_SPECIAL_SUMMON)
 		Duel.SetOperationInfo(0,CATEGORY_POSITION,g2,g2:GetCount(),0,0)
 	end
 end

expansions/script/c9910580.lua

@@ -3,7 +3,6 @@ function c9910580.initial_effect(c)
 	--flip
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(9910580,0))
-	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH+CATEGORY_GRAVE_ACTION)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP+EFFECT_TYPE_TRIGGER_O)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY)
 	e1:SetCountLimit(1,9910580)
@@ -38,14 +37,19 @@ function c9910580.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET)
 	local g=Duel.SelectTarget(tp,c9910580.setfilter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp)
 	if g:GetFirst():IsType(TYPE_MONSTER) then
-		e:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_DESTROY)
+		e:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_MSET)
 		Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g,1,0,0)
 	else
-		e:SetCategory(CATEGORY_DESTROY)
+		e:SetCategory(CATEGORY_SSET)
 		Duel.SetOperationInfo(0,CATEGORY_LEAVE_GRAVE,g,1,0,0)
 	end
-	local dg=Duel.GetMatchingGroup(aux.TRUE,tp,LOCATION_ONFIELD,0,nil)
-	Duel.SetOperationInfo(0,CATEGORY_DESTROY,dg,1,0,0)
+	local chain=Duel.GetCurrentChain()
+	if chain>1 then
+		local te=Duel.GetChainInfo(chain-1,CHAININFO_TRIGGERING_EFFECT)
+		if te and te:GetHandler()==e:GetHandler() then
+			e:SetCategory(e:GetCategory()+CATEGORY_TOHAND)
+		end
+	end
 end
 function c9910580.operation(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
@@ -85,7 +89,7 @@ function c9910580.geop(e,tp,eg,ep,ev,re,r,rp,chk)
 	while tc do
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetDescription(aux.Stringid(9910580,2))
-		e1:SetCategory(CATEGORY_POSITION)
+		e1:SetCategory(CATEGORY_POSITION+CATEGORY_MSET)
 		e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP+EFFECT_TYPE_TRIGGER_O)
 		e1:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_CLIENT_HINT)
 		e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_DISABLE)

expansions/script/c9910583.lua

@@ -22,7 +22,7 @@ function c9910583.initial_effect(c)
 	--spsummon
 	local e4=e2:Clone()
 	e4:SetDescription(aux.Stringid(9910583,1))
-	e4:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e4:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_MSET)
 	e4:SetTarget(c9910583.sptg)
 	e4:SetOperation(c9910583.spop)
 	c:RegisterEffect(e4)

expansions/script/c9910586.lua

@@ -5,7 +5,7 @@ function c9910586.initial_effect(c)
 	c:EnableReviveLimit()
 	--spsummon
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_DECKDES)
+	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_DECKDES+CATEGORY_MSET)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCountLimit(1)