fix

expansions/script/c13700041.lua

---交际妖精
 local s,id,o=GetID()
 function s.initial_effect(c)
-    c:EnableReviveLimit()
-    aux.AddLinkProcedure(c,nil,2,2,s.checkl)
-    local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e1:SetCode(EFFECT_EXTRA_LINK_MATERIAL)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetCondition(s.mcon)
-	e1:SetValue(s.matval)
-	--c:RegisterEffect(e1)
-	local e11=Effect.CreateEffect(c)
-	e11:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_GRANT)
-	e11:SetRange(LOCATION_MZONE)
-	e11:SetTargetRange(0,LOCATION_MZONE)
-	e11:SetTarget(s.eftg)
-	e11:SetLabelObject(e1)
-	c:RegisterEffect(e11)
+	-- 连接属性设置
+	c:EnableReviveLimit()
+	aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsLinkSetCard,0x4b9),1)
+	-- ①特殊召唤检索
+	local e1=Effect.CreateEffect(c)
+	e1:SetDescription(aux.Stringid(id,0))
+	e1:SetCategory(CATEGORY_SEARCH+CATEGORY_TOHAND)
+	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
+	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
+	e1:SetCountLimit(1,id)
+	e1:SetCondition(s.thcon)
+	e1:SetTarget(s.thtg)
+	e1:SetOperation(s.thop)
+	c:RegisterEffect(e1)
+	
+	-- ②衍生物生成
+	local e2=Effect.CreateEffect(c)
+	e2:SetDescription(aux.Stringid(id,1))
+	e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOKEN)
+	e2:SetType(EFFECT_TYPE_IGNITION)
+	e2:SetRange(LOCATION_MZONE)
+	e2:SetCountLimit(1,id+1)
+	--e2:SetCondition(s.tkcon)
+	e2:SetTarget(s.tktg)
+	e2:SetOperation(s.tkop)
+	c:RegisterEffect(e2)
+	
+	-- ③等级替代
+	local e3=Effect.CreateEffect(c)
+	e3:SetType(EFFECT_TYPE_SINGLE)
+	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e3:SetCode(EFFECT_XYZ_LEVEL)
+	e3:SetRange(LOCATION_MZONE)
+	e3:SetValue(s.xyzlv)
+	c:RegisterEffect(e3)
 end
 
-function s.checkl(g,lc)
-    return g:GetClassCount(Card.GetLinkRace)==g:GetCount()
+-- 效果①处理
+function s.thcon(e,tp,eg,ep,ev,re,r,rp)
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK)
 end
 
-function s.eftg(e,c)
-	local lg=e:GetHandler():GetLinkedGroup()
-	local tp=e:GetHandler():GetOwner()
-	c:RegisterFlagEffect(id,0,0,1,tp)
-	return c:IsFaceup() and lg:IsContains(c)
+function s.thfilter(c)
+	return c:IsSetCard(0x4b9) and c:IsType(TYPE_SPELL) and c:IsAbleToHand()
 end
 
-function s.mcon(e)
-	return true
+function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil) end
+	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
 end
 
-function s.matval(e,lc,mg,c,tp)
-	if  not lc:IsLinkAbove(5) or not lc:IsRace(RACE_FAIRY) or not lc:IsAttribute(ATTRIBUTE_DARK) then return false,nil end
-	return true,not mg or mg:IsExists(s.exmfilter,1,nil)
+function s.thop(e,tp,eg,ep,ev,re,r,rp)
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
+	local g=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_DECK,0,1,1,nil)
+	if #g>0 then
+		Duel.SendtoHand(g,nil,REASON_EFFECT)
+		Duel.ConfirmCards(1-tp,g)
+	end
 end
 
-function s.exmfilter(c)
-	return c:IsLocation(LOCATION_MZONE) and c:IsCode(13700041)
+-- 效果②处理
+
+function s.tktg(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
+		and Duel.IsPlayerCanSpecialSummonMonster(tp,id+1,0x4b9,TYPES_TOKEN,1500,1500,4,RACE_FISH,ATTRIBUTE_WATER) end
+	Duel.SetOperationInfo(0,CATEGORY_TOKEN,nil,1,0,0)
+	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,0)
+end
+
+function s.tkop(e,tp,eg,ep,ev,re,r,rp)
+	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
+	if not Duel.IsPlayerCanSpecialSummonMonster(tp,id+1,0x4b9,TYPES_TOKEN,1500,1500,4,RACE_FISH,ATTRIBUTE_WATER) then return end
+	local token=Duel.CreateToken(tp,id+1)
+	if Duel.SpecialSummon(token,0,tp,tp,false,false,POS_FACEUP)>0 then
+		-- 攻击力提升效果
+		local e1=Effect.CreateEffect(e:GetHandler())
+		e1:SetType(EFFECT_TYPE_FIELD)
+		e1:SetCode(EFFECT_UPDATE_ATTACK)
+		e1:SetTargetRange(LOCATION_MZONE,0)
+		e1:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x4b9))
+		e1:SetValue(500)
+		e1:SetReset(RESET_EVENT+RESETS_STANDARD)
+		Duel.RegisterEffect(e1,tp)
+		local e2=e1:Clone()
+		e2:SetCode(EFFECT_UPDATE_DEFENSE)
+		Duel.RegisterEffect(e2,tp)
+	end
+end
+
+-- 效果③处理
+function s.xyzlv(e,c,rc)
+	if rc:IsSetCard(0x4b9) then
+		return 5,6
+	else
+		return e:GetHandler():GetLevel()
+	end
 end
\ No newline at end of file

expansions/script/c16101185.lua

@@ -37,7 +37,14 @@ function cm.initial_effect(c)
 	local e3=e2:Clone()
 	e3:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
 	c:RegisterEffect(e3)
-	local e4=rsef.FV_CANNOT_BE_TARGET(c,"effect",aux.tgoval,cm.tgfilter,{LOCATION_MZONE,0})
+	local e2=Effect.CreateEffect(c)
+	e2:SetType(EFFECT_TYPE_FIELD)
+	e2:SetRange(LOCATION_MZONE)
+	e2:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
+	e2:SetTargetRange(LOCATION_MZONE,0)
+	e2:SetTarget(cm.tgfilter)
+	e2:SetValue(aux.tgoval)
+	c:RegisterEffect(e2)
 	--Destroy replace
 	local e5=Effect.CreateEffect(c)
 	e5:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_SINGLE)
@@ -48,6 +55,9 @@ function cm.initial_effect(c)
 	e5:SetOperation(cm.desrepop)
 	c:RegisterEffect(e5)
 end
+function cm.tgfilter(e,c)
+	return rk.check(c,"PORO")
+end
 function cm.tfilter(c)
 	return c:IsCode(m-1)
 end

expansions/script/c17061820.lua

@@ -97,6 +97,9 @@ function cm.rmop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.DisableShuffleCheck()
 	Duel.Remove(g,POS_FACEUP,REASON_EFFECT)
 end
+function cm.rmcheck(c)
+	return c:IsAbleToRemove() and c:IsType(TYPE_MONSTER)
+end
 function cm.atkop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) and c:IsFaceup() then
@@ -107,7 +110,7 @@ function cm.atkop(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_DISABLE)
 		c:RegisterEffect(e1)
 	end
-	g=Duel.GetMatchingGroup(Card.IsAbleToRemove,tp,0,LOCATION_GRAVE,nil)
+	g=Duel.GetMatchingGroup(cm.rmcheck,tp,0,LOCATION_GRAVE,nil)
 	if c:GetAttack()>=4500 and #g>0 then
 		Duel.Remove(g,POS_FACEUP,REASON_EFFECT)
 		local e2=Effect.CreateEffect(c)

expansions/script/c31750141.lua

@@ -48,7 +48,7 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_CHAIN_SOLVING)
 	e2:SetCountLimit(1)
-	e2:SetReset(RESET_EVENT+EVENT_CHAIN_END)
+	e2:SetReset(RESET_CHAIN)
 	e2:SetCondition(s.negcon)
 	e2:SetOperation(s.negop)
 	Duel.RegisterEffect(e2,tp)

expansions/script/c36700300.lua

@@ -60,7 +60,7 @@ function s.chkfilter(c)
 end
 
 function s.spfilter2(c,e,tp)
-	return c:IsSetCard(0xc50) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP,1-tp)
+	return c:IsSetCard(0xc22) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP,1-tp)
 end
 function s.coinop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c36700302.lua

@@ -52,7 +52,7 @@ function s.discost(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 
 function s.tgfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0xc50)
+	return c:IsFaceup() and c:IsSetCard(0xc22)
 end
 
 function s.thfilter(c,tc)
@@ -83,7 +83,7 @@ function s.thcon(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function s.thtgfilter(c)
-	return (c:IsFaceup() or c:IsLocation(LOCATION_GRAVE)) and c:IsSetCard(0xc50)
+	return (c:IsFaceup() or c:IsLocation(LOCATION_GRAVE)) and c:IsSetCard(0xc22)
 end
 
 function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)

expansions/script/c36700304.lua

@@ -50,7 +50,7 @@ function s.initial_effect(c)
 end
 
 function s.thfilter(c)
-	return c:IsSetCard(0xc50) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand() and not c:IsCode(id)
+	return c:IsSetCard(0xc22) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand() and not c:IsCode(id)
 end
 
 function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c36700306.lua

@@ -59,11 +59,11 @@ end
 
 function s.thfilter(c,tc)
 	if tc:IsType(TYPE_MONSTER) then
-		return c:IsSetCard(0xc50) and not c:IsType(TYPE_MONSTER) and (c:IsAbleToHand() or c:IsAbleToGrave())
+		return c:IsSetCard(0xc22) and not c:IsType(TYPE_MONSTER) and (c:IsAbleToHand() or c:IsAbleToGrave())
 	elseif tc:IsType(TYPE_SPELL) then
-		return c:IsSetCard(0xc50) and not c:IsType(TYPE_SPELL) and (c:IsAbleToHand() or c:IsAbleToGrave())
+		return c:IsSetCard(0xc22) and not c:IsType(TYPE_SPELL) and (c:IsAbleToHand() or c:IsAbleToGrave())
 	else
-		return c:IsSetCard(0xc50) and not c:IsType(TYPE_TRAP) and (c:IsAbleToHand() or c:IsAbleToGrave())
+		return c:IsSetCard(0xc22) and not c:IsType(TYPE_TRAP) and (c:IsAbleToHand() or c:IsAbleToGrave())
 	end
 end
 
@@ -106,7 +106,7 @@ function s.spcon2(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function s.spfilter(c,e,tp)
-	return c:IsSetCard(0xc50) and c:IsType(TYPE_MONSTER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0xc22) and c:IsType(TYPE_MONSTER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 
 function s.sptg2(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c36700308.lua

@@ -47,7 +47,7 @@ function s.initial_effect(c)
 end
 
 function s.spfilter(c)
-	return c:IsSetCard(0xc50) and c:IsType(TYPE_MONSTER) and not c:IsPublic() and c:IsLocation(LOCATION_HAND)
+	return c:IsSetCard(0xc22) and c:IsType(TYPE_MONSTER) and not c:IsPublic() and c:IsLocation(LOCATION_HAND)
 end
 
 function s.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
@@ -67,7 +67,7 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 
 function s.thfilter(c)
-	return c:IsSetCard(0xc50) and c:IsAbleToHand()
+	return c:IsSetCard(0xc22) and c:IsAbleToHand()
 end
 
 function s.spop(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c36700310.lua

@@ -46,7 +46,7 @@ function s.initial_effect(c)
 end
 
 function s.thfilter(c)
-	return c:IsSetCard(0xc50) and c:IsAbleToHand()
+	return c:IsSetCard(0xc22) and c:IsAbleToHand()
 end
 
 function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)

expansions/script/c36700312.lua

@@ -68,13 +68,13 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,c)
 end
 
 function s.thfilter(c)
-	return c:IsSetCard(0xc50) and c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToHand()
+	return c:IsSetCard(0xc22) and c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToHand()
 end
 
 function s.spop(e,tp,eg,ep,ev,re,r,rp,c)
 	local g=e:GetLabelObject()
 	local tc=g:GetFirst()
-	if Duel.SendtoGrave(g,REASON_DISCARD+REASON_COST)~=0 and tc:IsSetCard(0xc50)
+	if Duel.SendtoGrave(g,REASON_DISCARD+REASON_COST)~=0 and tc:IsSetCard(0xc22)
 	and tc:IsType(TYPE_MONSTER) and Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil)
 	and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)

expansions/script/c36700313.lua

@@ -49,7 +49,7 @@ function s.initial_effect(c)
 end
 
 function s.tgfilter(c)
-	return c:IsSetCard(0xc50) and c:IsAbleToGrave()
+	return c:IsSetCard(0xc22) and c:IsAbleToGrave()
 end
 
 function s.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
@@ -70,7 +70,7 @@ function s.eqcon(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function s.eqfilter(c,ec)
-	return c:IsSetCard(0xc50) and c:IsType(TYPE_EQUIP) and c:CheckEquipTarget(ec)
+	return c:IsSetCard(0xc22) and c:IsType(TYPE_EQUIP) and c:CheckEquipTarget(ec)
 end
 
 function s.eqtg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c36700315.lua

@@ -58,7 +58,7 @@ function s.thcon(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function s.thfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0xc50) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
+	return c:IsFaceup() and c:IsSetCard(0xc22) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
 end
 
 function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
@@ -93,7 +93,7 @@ function s.thtg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 end
 
 function s.searchfilter(c)
-	return c:IsSetCard(0xc50) and c:IsAbleToHand()
+	return c:IsSetCard(0xc22) and c:IsAbleToHand()
 end
 
 function s.thop2(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c36700317.lua

@@ -40,7 +40,7 @@ function s.initial_effect(c)
 end
 
 function s.thfilter(c)
-	return c:IsSetCard(0xc50) and c:IsAbleToHand()
+	return c:IsSetCard(0xc22) and c:IsAbleToHand()
 end
 
 function s.activate(e,tp,eg,ep,ev,re,r,rp)
@@ -55,19 +55,19 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function s.monfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0xc50) and c:IsType(TYPE_MONSTER)
+	return c:IsFaceup() and c:IsSetCard(0xc22) and c:IsType(TYPE_MONSTER)
 end
 
 function s.stfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0xc50) and (c:IsType(TYPE_SPELL) or c:IsType(TYPE_TRAP))
+	return c:IsFaceup() and c:IsSetCard(0xc22) and (c:IsType(TYPE_SPELL) or c:IsType(TYPE_TRAP))
 end
 
 function s.stfilter2(c)
-	return c:IsSetCard(0xc50) and (c:IsType(TYPE_SPELL) or c:IsType(TYPE_TRAP)) and c:IsAbleToHand()
+	return c:IsSetCard(0xc22) and (c:IsType(TYPE_SPELL) or c:IsType(TYPE_TRAP)) and c:IsAbleToHand()
 end
 
 function s.monfilter2(c)
-	return c:IsSetCard(0xc50) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
+	return c:IsSetCard(0xc22) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
 end
 
 function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)

expansions/script/c36700318.lua

@@ -50,7 +50,7 @@ function s.thcon(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function s.thfilter(c)
-	return c:IsSetCard(0xc50) and c:IsType(TYPE_MONSTER) and c:IsLevelBelow(5) and c:IsAbleToHand()
+	return c:IsSetCard(0xc22) and c:IsType(TYPE_MONSTER) and c:IsLevelBelow(5) and c:IsAbleToHand()
 end
 
 function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
@@ -79,7 +79,7 @@ function s.eqcon(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function s.eqfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0xc50) and c:IsType(TYPE_MONSTER)
+	return c:IsFaceup() and c:IsSetCard(0xc22) and c:IsType(TYPE_MONSTER)
 end
 
 function s.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)

expansions/script/c36700320.lua

@@ -34,11 +34,11 @@ function s.rlfilter(c,e,tp)
 end
 
 function s.spfilter(c,e,tp)
-	return c:IsSetCard(0xc50) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0xc22) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 
 function s.thfilter(c,e,tp)
-	return c:IsSetCard(0xc50) and (c:IsAbleToHand() or c:IsCanBeSpecialSummoned(e,0,tp,false,false))
+	return c:IsSetCard(0xc22) and (c:IsAbleToHand() or c:IsCanBeSpecialSummoned(e,0,tp,false,false))
 	and c:IsType(TYPE_MONSTER)
 end
 

expansions/script/c36700321.lua

@@ -74,7 +74,7 @@ function s.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function s.eqlimit(e,c)
-	return c:IsSetCard(0xc50) and c:IsFaceup()
+	return c:IsSetCard(0xc22) and c:IsFaceup()
 end
 
 function s.atkcon(e)
@@ -95,7 +95,7 @@ function s.eqcon(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function s.eqfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0xc50)
+	return c:IsFaceup() and c:IsSetCard(0xc22)
 end
 
 function s.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
@@ -128,16 +128,16 @@ end
 function s.eqsop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tc=Duel.GetFirstTarget()
-	if c:IsRelateToEffect(e) and tc:IsRelateToEffect(e) and tc:IsFaceup() and tc:IsSetCard(0xc50) then
+	if c:IsRelateToEffect(e) and tc:IsRelateToEffect(e) and tc:IsFaceup() and tc:IsSetCard(0xc22) then
 		Duel.Equip(tp,c,tc)
 	end
 end
 -- 装备目标过滤器
 function s.eqsfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0xc50) -- 0xc50是火之晨曦卡组的setcode
+	return c:IsFaceup() and c:IsSetCard(0xc22) -- 0xc22是火之晨曦卡组的setcode
 end
 
 -- 装备限制函数
 function s.eqslimit(e,c)
-	return c:IsFaceup() and c:IsSetCard(0xc50)
+	return c:IsFaceup() and c:IsSetCard(0xc22)
 end

expansions/script/c36700322.lua

@@ -107,12 +107,12 @@ end
 
 -- 装备目标过滤器
 function s.eqfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0xc50) -- 0xc50是火之晨曦卡组的setcode
+	return c:IsFaceup() and c:IsSetCard(0xc22) -- 0xc22是火之晨曦卡组的setcode
 end
 
 -- 装备限制函数
 function s.eqlimit(e,c)
-	return c:IsFaceup() and c:IsSetCard(0xc50)
+	return c:IsFaceup() and c:IsSetCard(0xc22)
 end
 
 -- 装备目标函数
@@ -128,7 +128,7 @@ end
 function s.eqop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tc=Duel.GetFirstTarget()
-	if c:IsRelateToEffect(e) and tc:IsRelateToEffect(e) and tc:IsFaceup() and tc:IsSetCard(0xc50) then
+	if c:IsRelateToEffect(e) and tc:IsRelateToEffect(e) and tc:IsFaceup() and tc:IsSetCard(0xc22) then
 		Duel.Equip(tp,c,tc)
 	end
 end
@@ -140,7 +140,7 @@ end
 
 -- 墓地装备目标
 function s.eqfilter2(c)
-	return c:IsFaceup() and c:IsSetCard(0xc50) and c:IsControler(tp)
+	return c:IsFaceup() and c:IsSetCard(0xc22) and c:IsControler(tp)
 end
 
 function s.eqtg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)

expansions/script/c36700324.lua

@@ -85,12 +85,12 @@ end
 
 -- 装备目标过滤器
 function s.eqfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0xc50) -- 0xc50是火之晨曦卡组的setcode
+	return c:IsFaceup() and c:IsSetCard(0xc22) -- 0xc22是火之晨曦卡组的setcode
 end
 
 -- 装备限制函数
 function s.eqlimit(e,c)
-	return c:IsFaceup() and c:IsSetCard(0xc50)
+	return c:IsFaceup() and c:IsSetCard(0xc22)
 end
 
 -- 装备目标函数
@@ -106,13 +106,13 @@ end
 function s.eqop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tc=Duel.GetFirstTarget()
-	if c:IsRelateToEffect(e) and tc:IsRelateToEffect(e) and tc:IsFaceup() and tc:IsSetCard(0xc50) then
+	if c:IsRelateToEffect(e) and tc:IsRelateToEffect(e) and tc:IsFaceup() and tc:IsSetCard(0xc22) then
 		Duel.Equip(tp,c,tc)
 	end
 end
 
 function s.eqfilter2(c,tp)
-	return c:IsSetCard(0xc50) and c:IsType(TYPE_EQUIP) and c:CheckUniqueOnField(tp) and not c:IsForbidden() and c:GetCode()~=id
+	return c:IsSetCard(0xc22) and c:IsType(TYPE_EQUIP) and c:CheckUniqueOnField(tp) and not c:IsForbidden() and c:GetCode()~=id
 end
 
 function s.eqtgfilter(c,tp,ec)
@@ -165,7 +165,7 @@ function s.eqcon(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function s.eqtgfilter2(c,tp)
-	return c:IsFaceup() and c:IsSetCard(0xc50) and c:IsControler(tp)
+	return c:IsFaceup() and c:IsSetCard(0xc22) and c:IsControler(tp)
 end
 
 function s.eqtg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)

expansions/script/c36700326.lua

@@ -155,16 +155,16 @@ end
 function s.eqop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tc=Duel.GetFirstTarget()
-	if c:IsRelateToEffect(e) and tc:IsRelateToEffect(e) and tc:IsFaceup() and tc:IsSetCard(0xc50) then
+	if c:IsRelateToEffect(e) and tc:IsRelateToEffect(e) and tc:IsFaceup() and tc:IsSetCard(0xc22) then
 		Duel.Equip(tp,c,tc)
 	end
 end
 -- 装备目标过滤器
 function s.eqfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0xc50) -- 0xc50是火之晨曦卡组的setcode
+	return c:IsFaceup() and c:IsSetCard(0xc22) -- 0xc22是火之晨曦卡组的setcode
 end
 
 -- 装备限制函数
 function s.eqlimit(e,c)
-	return c:IsFaceup() and c:IsSetCard(0xc50)
+	return c:IsFaceup() and c:IsSetCard(0xc22)
 end

expansions/script/c36700327.lua

@@ -80,7 +80,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 end
 
 function s.thfilter(c)
-	return c:IsSetCard(0xc50) and c:IsAbleToHand()
+	return c:IsSetCard(0xc22) and c:IsAbleToHand()
 end
 
 function s.activate(e,tp,eg,ep,ev,re,r,rp)
@@ -109,7 +109,7 @@ function s.spcon(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function s.spfilter(c,e,tp)
-	return c:IsSetCard(0xc50) and c:IsType(TYPE_MONSTER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0xc22) and c:IsType(TYPE_MONSTER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 
 function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c36700328.lua

@@ -56,7 +56,7 @@ function s.initial_effect(c)
 end
 
 function s.deckfilter(c)
-	return c:IsSetCard(0xc50)
+	return c:IsSetCard(0xc22)
 end
 
 function s.condition(e,tp,eg,ep,ev,re,r,rp)
@@ -91,7 +91,7 @@ function s.distg(e,c)
 end
 
 function s.fdfilter(c,e,tp)
-	return c:IsSetCard(0xc50) and c:IsType(TYPE_MONSTER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0xc22) and c:IsType(TYPE_MONSTER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 
 function s.lmffilter(c)

expansions/script/c36700332.lua

@@ -53,7 +53,7 @@ function s.fglfilter(c)
 end
 
 function s.fdfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0xc50)
+	return c:IsFaceup() and c:IsSetCard(0xc22)
 end
 
 function s.condition(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c36700333.lua

@@ -49,7 +49,7 @@ function s.initial_effect(c)
 end
 
 function s.fdfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0xc50)
+	return c:IsFaceup() and c:IsSetCard(0xc22)
 end
 
 function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)

expansions/script/c36700336.lua

@@ -79,7 +79,7 @@ function s.spcon(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function s.spfilter(c,e,tp)
-	return c:IsSetCard(0xc50) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0xc22) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 
 function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
@@ -106,7 +106,7 @@ function s.lkcon(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function s.lkfilter(c,mg)
-	return c:IsSetCard(0xc50) and c:IsLinkSummonable(nil,mg,nil,nil,nil,2)
+	return c:IsSetCard(0xc22) and c:IsLinkSummonable(nil,mg,nil,nil,nil,2)
 end
 
 function s.lktg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c36700338.lua

@@ -100,7 +100,7 @@ end
 
 -- Copy effect filter
 function s.cpfilter(c)
-	return c:IsSetCard(0xc50) and c:IsType(TYPE_MONSTER) and (c:IsLocation(LOCATION_GRAVE) or c:IsLocation(LOCATION_REMOVED))
+	return c:IsSetCard(0xc22) and c:IsType(TYPE_MONSTER) and (c:IsLocation(LOCATION_GRAVE) or c:IsLocation(LOCATION_REMOVED))
 end
 
 -- Copy effect target

expansions/script/c36700340.lua

@@ -80,7 +80,7 @@ end
 -- Check if a "Fire's Dawn" monster left the field
 function s.cfilter(c,e,tp)
 	return c:IsPreviousPosition(POS_FACEUP) and c:IsPreviousControler(tp)
-		and c:IsSetCard(0xc50) and c:IsPreviousLocation(LOCATION_MZONE)
+		and c:IsSetCard(0xc22) and c:IsPreviousLocation(LOCATION_MZONE)
 		and c:IsCanBeSpecialSummoned(e,0,tp,true,false)
 end
 
@@ -105,7 +105,7 @@ end
 
 -- Filter for "Fire's Dawn" monsters
 function s.fdfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0xc50)
+	return c:IsFaceup() and c:IsSetCard(0xc22)
 end
 
 -- Filter for "Seven Deadly Sins, Lust" and "Luminous, Fire's Dawn"
@@ -119,7 +119,7 @@ end
 
 -- Filter for Link-3 or higher "Fire's Dawn" monsters
 function s.link3filter(c)
-	return c:IsFaceup() and c:IsSetCard(0xc50) and c:IsType(TYPE_LINK) and c:GetLink()>=3
+	return c:IsFaceup() and c:IsSetCard(0xc22) and c:IsType(TYPE_LINK) and c:GetLink()>=3
 end
 
 -- Protection condition check

expansions/script/c36700341.lua

@@ -34,7 +34,7 @@ end
 
 -- Filter for "Fire's Dawn" monsters
 function s.fdfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0xc50)
+	return c:IsFaceup() and c:IsSetCard(0xc22)
 end
 
 -- Check activation condition

expansions/script/c36700342.lua

@@ -148,7 +148,7 @@ end
 --Link material filter
 function s.matfilter(c)
 	return not c:IsType(TYPE_LINK) and ((c:IsType(TYPE_MONSTER) and c:IsFaceup())
-	or (c:IsSetCard(0xc50) and c:IsType(TYPE_SPELL+TYPE_TRAP)))
+	or (c:IsSetCard(0xc22) and c:IsType(TYPE_SPELL+TYPE_TRAP)))
 end
 
 function s.racefilter(c)
@@ -196,13 +196,13 @@ end
 --Extra material filter
 function s.extramatfilter(c)
 	if c:IsLocation(LOCATION_ONFIELD) and c:IsFacedown() then
-		local res=c:IsSetCard(0xc50) and c:IsType(TYPE_SPELL+TYPE_TRAP)
+		local res=c:IsSetCard(0xc22) and c:IsType(TYPE_SPELL+TYPE_TRAP)
 		if res then
 			c:RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
 		end
 		return res
 	else
-		return c:IsSetCard(0xc50) and c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsCanBeLinkMaterial() and c:IsOnField()
+		return c:IsSetCard(0xc22) and c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsCanBeLinkMaterial() and c:IsOnField()
 	end
 end
 
@@ -214,7 +214,7 @@ end
 
 --Special Summon target
 function s.spfilter(c,e,tp)
-	return c:IsSetCard(0xc50) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0xc22) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 
 function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
@@ -252,7 +252,7 @@ end
 
 --Equip target
 function s.eqfilter(c)
-	return c:IsFaceup() and (c:IsSetCard(0xc50) or c:IsSetCard(0xc51))
+	return c:IsFaceup() and (c:IsSetCard(0xc22) or c:IsSetCard(0x3c22))
 end
 
 function s.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)

expansions/script/c36700344.lua

@@ -71,7 +71,7 @@ end
 --素材过滤器（允许使用魔法陷阱卡）
 function s.matfilter(c,lc,sumtype,tp)
 	return (c:IsType(TYPE_MONSTER) and c:IsFaceup())
-	or (c:IsSetCard(0xc50) and c:IsType(TYPE_SPELL+TYPE_TRAP))
+	or (c:IsSetCard(0xc22) and c:IsType(TYPE_SPELL+TYPE_TRAP))
 end
 
 --连接素材检查（需要包含战士族·炎属性怪兽）
@@ -88,7 +88,7 @@ end
 
 --装备目标过滤器
 function s.eqfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0xc50)
+	return c:IsFaceup() and c:IsSetCard(0xc22)
 end
 
 --装备目标
@@ -128,7 +128,7 @@ end
 
 --装备限制条件
 function s.eqlimit(e,c)
-	return c:IsSetCard(0xc50)
+	return c:IsSetCard(0xc22)
 end
 
 --无效怪兽效果条件

expansions/script/c36700346.lua

@@ -71,7 +71,7 @@ end
 --素材过滤器（允许使用魔法陷阱卡）
 function s.matfilter(c,lc,sumtype,tp)
 	return (c:IsType(TYPE_MONSTER) and c:IsFaceup())
-	or (c:IsSetCard(0xc50) and c:IsType(TYPE_SPELL+TYPE_TRAP))
+	or (c:IsSetCard(0xc22) and c:IsType(TYPE_SPELL+TYPE_TRAP))
 end
 
 --连接素材检查（需要包含战士族·炎属性怪兽）
@@ -90,7 +90,7 @@ end
 
 --装备目标过滤器
 function s.eqfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0xc50)
+	return c:IsFaceup() and c:IsSetCard(0xc22)
 end
 
 --装备目标
@@ -130,7 +130,7 @@ end
 
 --装备限制条件
 function s.eqlimit(e,c)
-	return c:IsSetCard(0xc50)
+	return c:IsSetCard(0xc22)
 end
 
 --无效魔法陷阱效果条件

expansions/script/c36700348.lua

@@ -64,7 +64,7 @@ end
 --素材过滤器（允许使用魔法陷阱卡）
 function s.matfilter(c,lc,sumtype,tp)
 	return (c:IsType(TYPE_MONSTER) and c:IsFaceup())
-	or (c:IsSetCard(0xc50) and c:IsType(TYPE_SPELL+TYPE_TRAP))
+	or (c:IsSetCard(0xc22) and c:IsType(TYPE_SPELL+TYPE_TRAP))
 end
 
 --连接素材检查（需要包含战士族·炎属性怪兽）
@@ -83,7 +83,7 @@ end
 
 --特召过滤器
 function s.spfilter(c,e,tp)
-	return c:IsSetCard(0xc50) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0xc22) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 
 --特召目标
@@ -112,7 +112,7 @@ end
 --保护条件
 function s.protcon(e)
 	local c=e:GetHandler()
-	return c:IsSetCard(0xc50) and c:IsType(TYPE_LINK)
+	return c:IsSetCard(0xc22) and c:IsType(TYPE_LINK)
 end
 
 function s.LinkCondition(f,minct,maxct,gf)

expansions/script/c36700349.lua

@@ -30,7 +30,7 @@ function s.initial_effect(c)
 end
 
 function s.spfilter(c,e,tp)
-	return c:IsSetCard(0xc50) and c:IsType(TYPE_MONSTER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0xc22) and c:IsType(TYPE_MONSTER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c36700350.lua

@@ -74,7 +74,7 @@ end
 --素材过滤器（允许使用魔法陷阱卡）
 function s.matfilter(c,lc,sumtype,tp)
 	return (c:IsType(TYPE_MONSTER) and c:IsFaceup())
-	or (c:IsSetCard(0xc50) and c:IsType(TYPE_SPELL+TYPE_TRAP))
+	or (c:IsSetCard(0xc22) and c:IsType(TYPE_SPELL+TYPE_TRAP))
 end
 
 --连接素材检查（需要包含战士族·炎属性怪兽）
@@ -196,7 +196,7 @@ end
 
 --放置火之晨曦魔法陷阱卡过滤器
 function s.setfilter(c)
-	return c:IsSetCard(0xc50) and c:IsType(TYPE_SPELL+TYPE_TRAP) and (c:IsSSetable() or (c:IsType(TYPE_CONTINUOUS) and c:IsSSetable(true)))
+	return c:IsSetCard(0xc22) and c:IsType(TYPE_SPELL+TYPE_TRAP) and (c:IsSSetable() or (c:IsType(TYPE_CONTINUOUS) and c:IsSSetable(true)))
 end
 
 --放置火之晨曦魔法陷阱卡目标

expansions/script/c36700352.lua

@@ -95,7 +95,7 @@ end
 --素材过滤器（允许使用魔法陷阱卡）
 function s.matfilter(c)
 	return (c:IsType(TYPE_MONSTER) and c:IsRace(RACE_WARRIOR) and c:IsAttribute(ATTRIBUTE_FIRE) and c:IsFaceup())
-	or (c:IsSetCard(0xc50) and c:IsType(TYPE_SPELL+TYPE_TRAP))
+	or (c:IsSetCard(0xc22) and c:IsType(TYPE_SPELL+TYPE_TRAP))
 end
 
 --连接素材检查（需要包含战士族·炎属性怪兽）
@@ -144,7 +144,7 @@ function s.eqop(e,tp,eg,ep,ev,re,r,rp)
 			e2:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 			e2:SetRange(LOCATION_SZONE)
 			e2:SetTargetRange(LOCATION_MZONE,0)
-			e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0xc50))
+			e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0xc22))
 			e2:SetValue(aux.tgoval)
 			token:RegisterEffect(e2)
 			local e3=e2:Clone()
@@ -244,7 +244,7 @@ end
 
 --The Gathering言灵效果目标
 function s.yanlingfilter(c)
-	return c:IsSetCard(0xc52) and c:IsType(TYPE_SPELL+TYPE_TRAP)
+	return c:IsSetCard(0xc23) and c:IsType(TYPE_SPELL+TYPE_TRAP)
 end
 
 function s.gathering_tg(e,tp,eg,ep,ev,re,r,rp,chk)
@@ -254,7 +254,7 @@ function s.gathering_tg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CODE)
 	-- 宣言卡名 (使用逆波兰表达式正确过滤言灵卡片)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CODE)
-	local announce_filter={0xc52,OPCODE_ISSETCARD,TYPE_SPELL+TYPE_TRAP,OPCODE_ISTYPE,OPCODE_AND}
+	local announce_filter={0xc23,OPCODE_ISSETCARD,TYPE_SPELL+TYPE_TRAP,OPCODE_ISTYPE,OPCODE_AND}
 	local code=Duel.AnnounceCard(tp,table.unpack(announce_filter))
 	Duel.SetTargetParam(code)
 	e:SetLabel(code)