fix

expansions/script/c11451615.lua

@@ -120,8 +120,10 @@ function cm.desop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function cm.ceop(e,tp,eg,ep,ev,re,r,rp)
-	local g1=Duel.GetMatchingGroup(nil,tp,LOCATION_ONFIELD,0,nil)
-	local g2=Duel.GetMatchingGroup(nil,tp,0,LOCATION_ONFIELD,nil)
+	local exc=nil
+	if re:IsHasType(EFFECT_TYPE_ACTIVATE) and not re:GetHandler():IsType(TYPE_CONTINUOUS) then exc=aux.ExceptThisCard(re) end
+	local g1=Duel.GetMatchingGroup(nil,rp,LOCATION_ONFIELD,0,exc)
+	local g2=Duel.GetMatchingGroup(nil,rp,0,LOCATION_ONFIELD,nil)
 	if ep~=tp and #g1>0 and #g2>0 and Duel.SelectYesNo(tp,aux.Stringid(m,1)) then
 		Duel.Hint(HINT_CARD,0,m)
 		local g=Group.CreateGroup()
@@ -131,7 +133,9 @@ function cm.ceop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function cm.reop(e,tp,eg,ep,ev,re,r,rp)
-	local g1=Duel.GetMatchingGroup(nil,tp,LOCATION_ONFIELD,0,nil)
+	local exc=nil
+	if e:IsHasType(EFFECT_TYPE_ACTIVATE) and not e:GetHandler():IsType(TYPE_CONTINUOUS) then exc=aux.ExceptThisCard(e) end
+	local g1=Duel.GetMatchingGroup(nil,tp,LOCATION_ONFIELD,0,exc)
 	local g2=Duel.GetMatchingGroup(nil,tp,0,LOCATION_ONFIELD,nil)
 	if #g1>0 and #g2>0 then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)

expansions/script/c12802030.lua

@@ -3,7 +3,7 @@ local s,id,o=GetID()
 function s.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(id,0))
-	e1:SetCategory(CATEGORY_POSITION)
+	e1:SetCategory(CATEGORY_POSITION+CATEGORY_MSET)
 	e1:SetType(EFFECT_TYPE_TRIGGER_O+EFFECT_TYPE_FIELD)
 	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e1:SetProperty(EFFECT_FLAG_DELAY)

expansions/script/c12825604.lua

@@ -6,7 +6,7 @@ function c12825604.initial_effect(c)
 	c:EnableReviveLimit()
 	chiki.c4a71Limit(c)
 	chiki.c4a71tohand(c,c12825604.tgtg,c12825604.tgop,CATEGORY_TOGRAVE)
-	chiki.c4a71kang2(c,nil,c12825604.settg,c12825604.setop,nil,12825604,1109,12825609)
+	chiki.c4a71kang2(c,nil,c12825604.settg,c12825604.setop,CATEGORY_SSET,12825604,1109,12825609)
 end
 function c12825604.filter(c)
 	return c:IsSetCard(0x4a76) and c:IsType(TYPE_QUICKPLAY) and c:IsSSetable()

expansions/script/c12825609.lua

@@ -4,7 +4,7 @@ local s,id,o=GetID()
 function s.initial_effect(c)
 	aux.AddCodeList(c,12825604)
 	chiki.c4a71rankup(c,s.filter1,s.filter2,12825609)
-	chiki.chikiav(c,nil,nil,s.effcon,s.target,s.operation,nil,12825609,1102)
+	chiki.chikiav(c,nil,nil,s.effcon,s.target,s.operation,CATEGORY_SSET,12825609,1102)
 end
 function s.filter1(c)
 	return c:IsFaceup() and c:IsSetCard(0x4a76) and not c:IsCode(12825604)

expansions/script/c12825623.lua

@@ -9,6 +9,7 @@ function s.initial_effect(c)
 	--set
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(id,1))
+	e1:SetCategory(CATEGORY_SSET)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetRange(LOCATION_MZONE)

expansions/script/c12832001.lua

@@ -14,6 +14,7 @@ function s.initial_effect(c)
 	c:RegisterEffect(e1)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(id,1))
+	e2:SetCategory(CATEGORY_SSET)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetProperty(EFFECT_FLAG_DELAY)
 	e2:SetCode(EVENT_SUMMON_SUCCESS)

expansions/script/c12832006.lua

 --Servant-Archer
 local s,id,o=GetID()
 function s.initial_effect(c)
-	aux.AddCodeList(c,12832010,16400104)
+	aux.AddCodeList(c,12832010,16400970)
 	aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsLinkType,TYPE_EFFECT),2)
 	c:EnableReviveLimit()
 	local e0=Effect.CreateEffect(c)
@@ -12,7 +12,7 @@ function s.initial_effect(c)
 	c:RegisterEffect(e0)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(id,0))
-	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
+	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SSET)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
@@ -43,6 +43,7 @@ function s.thfilter(c)
 end
 function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil) end
+	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_GRAVE+LOCATION_REMOVED)
 end
 function s.thop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_OPERATECARD)
@@ -61,7 +62,7 @@ function s.lmfilter(c)
 	return c:IsLinkAttribute(ATTRIBUTE_LIGHT) and c:IsLinkRace(RACE_FIEND)
 end
 function s.spfilter(c,e,tp)
-	return c:IsCode(12832010,16400104) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP)
+	return c:IsCode(12832010,16400970) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP)
 end
 function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_SZONE)>0 and Duel.GetLocationCount(tp,LOCATION_MZONE)>0

expansions/script/c12832007.lua

@@ -24,7 +24,7 @@ function s.initial_effect(c)
 	c:RegisterEffect(e2)
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(id,2))
-	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e3:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_SSET)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e3:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
 	e3:SetCode(EVENT_LEAVE_FIELD)

expansions/script/c12832009.lua

@@ -11,6 +11,7 @@ function s.initial_effect(c)
 	c:RegisterEffect(e1)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(id,1))
+	e2:SetCategory(CATEGORY_SSET)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_FZONE)
 	e2:SetCountLimit(1,id+o*10000)

expansions/script/c12832012.lua

@@ -12,7 +12,7 @@ function s.initial_effect(c)
 	c:RegisterEffect(e0)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(id,0))
-	e1:SetCategory(CATEGORY_DESTROY)
+	e1:SetCategory(CATEGORY_DESTROY+CATEGORY_SSET)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e1:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET)

expansions/script/c12832015.lua

@@ -24,6 +24,7 @@ function s.initial_effect(c)
 	e2:SetOperation(s.setop)
 	c:RegisterEffect(e2)
 	local e3=Effect.CreateEffect(c)
+	e3:SetCategory(CATEGORY_SSET)
 	e3:SetType(EFFECT_TYPE_SINGLE)
 	e3:SetDescription(aux.Stringid(id,2))
 	e3:SetCode(EFFECT_TRAP_ACT_IN_SET_TURN)

expansions/script/c12847417.lua

@@ -5,6 +5,7 @@ function s.initial_effect(c)
 	--set
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(id,0))
+	e1:SetCategory(CATEGORY_SSET)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetCountLimit(1,id+EFFECT_COUNT_CODE_OATH)

expansions/script/c12852005.lua

@@ -30,7 +30,7 @@ function c12852005.initial_effect(c)
 	--turnset
 	local e21=Effect.CreateEffect(c)
 	e21:SetDescription(aux.Stringid(12852005,0))
-	e21:SetCategory(CATEGORY_POSITION)
+	e21:SetCategory(CATEGORY_POSITION+CATEGORY_MSET)
 	e21:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e21:SetCode(EVENT_ATTACK_ANNOUNCE)
 	e21:SetRange(LOCATION_MZONE)

expansions/script/c12856010.lua

@@ -6,6 +6,7 @@ function c12856010.initial_effect(c)
 	aux.AddCodeList(c,12856000)
 	--set
 	local e1=Effect.CreateEffect(c)
+	e1:SetCategory(CATEGORY_SSET)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_HAND)
 	e1:SetCost(c12856010.cost)

expansions/script/c12856050.lua

@@ -6,6 +6,7 @@ function c12856050.initial_effect(c)
 	aux.AddCodeList(c,12856000)
 	--set
 	local e1=Effect.CreateEffect(c)
+	e1:SetCategory(CATEGORY_SSET)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_HAND)
 	e1:SetCost(c12856050.cost)

expansions/script/c12856065.lua

@@ -6,6 +6,7 @@ function c12856065.initial_effect(c)
 	aux.AddCodeList(c,12856000)
 	--set
 	local e1=Effect.CreateEffect(c)
+	e1:SetCategory(CATEGORY_SSET)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_HAND)
 	e1:SetCost(c12856065.cost)

expansions/script/c12856070.lua

@@ -6,7 +6,7 @@ function c12856070.initial_effect(c)
 	aux.AddCodeList(c,12856000)
 	--position
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_POSITION)
+	e1:SetCategory(CATEGORY_POSITION+CATEGORY_MSET)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_HAND)
 	e1:SetCost(c12856070.cost)

expansions/script/c12866730.lua

@@ -14,7 +14,7 @@ function s.initial_effect(c)
 	c:RegisterEffect(e1)
 	--destroy
 	local e2=Effect.CreateEffect(c)
-	e2:SetCategory(CATEGORY_DESTROY)
+	e2:SetCategory(CATEGORY_DESTROY+CATEGORY_SSET)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_SZONE)
 	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)

expansions/script/c12866760.lua

@@ -42,7 +42,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
 		Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
 	else
 		if chk==0 then return Duel.IsExistingMatchingCard(s.setfilter,tp,LOCATION_DECK,0,1,nil) end
-		e:SetCategory(0)
+		e:SetCategory(CATEGORY_SSET)
 	end
 end
 function s.activate(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c12866780.lua

@@ -26,7 +26,7 @@ function s.initial_effect(c)
 	--pos change
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(id,1))
-	e2:SetCategory(CATEGORY_POSITION)
+	e2:SetCategory(CATEGORY_POSITION+CATEGORY_MSET)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCountLimit(1)

expansions/script/c12882005.lua

@@ -5,6 +5,7 @@ function s.initial_effect(c)
 	--
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(1153)
+	e1:SetCategory(CATEGORY_SSET)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetCode(EVENT_SUMMON_SUCCESS)

expansions/script/c12882055.lua

@@ -15,7 +15,7 @@ function s.initial_effect(c)
 	c:RegisterEffect(e1)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(1118)
-	e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_DESTROY)
+	e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_DESTROY+CATEGORY_SSET)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET)
 	e2:SetCode(EVENT_DESTROYED)

expansions/script/c12899005.lua

@@ -13,6 +13,7 @@ function s.initial_effect(c)
 	--
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(1153)
+	e2:SetCategory(CATEGORY_SSET)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetCode(EVENT_FREE_CHAIN)
 	e2:SetRange(LOCATION_SZONE)

expansions/script/c12899015.lua

@@ -24,7 +24,7 @@ function c12899015.initial_effect(c)
 	--tograve
 	local e4=Effect.CreateEffect(c)
 	e4:SetDescription(aux.Stringid(12899015,0))
-	e4:SetCategory(CATEGORY_TOGRAVE)
+	e4:SetCategory(CATEGORY_TOGRAVE+CATEGORY_SSET)
 	e4:SetType(EFFECT_TYPE_QUICK_O)
 	e4:SetRange(LOCATION_MZONE)
 	e4:SetCode(EVENT_CHAINING)

expansions/script/c12899017.lua

@@ -14,7 +14,7 @@ function s.initial_effect(c)
 	--spsummon
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(12899017,0))
-	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_SSET)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetCode(EVENT_FREE_CHAIN)
 	e2:SetRange(LOCATION_HAND)

expansions/script/c12899019.lua

@@ -32,6 +32,7 @@ function s.initial_effect(c)
 	--search
 	local e4=Effect.CreateEffect(c)
 	e4:SetDescription(1109)
+	e4:SetCategory(CATEGORY_SSET)
 	e4:SetCategory(CATEGORY_TOHAND)
 	e4:SetType(EFFECT_TYPE_IGNITION)
 	e4:SetRange(LOCATION_GRAVE)