eme

7751e37c · Tachibana · 5a055adf · 7751e37c · 7751e37c · 7751e37c
Commit 7751e37c authored Dec 26, 2021 by Tachibana
23 changed files
--- a/expansions/222DIY.cdb
+++ b/expansions/222DIY.cdb
--- a/expansions/script/c23000300.lua
+++ b/expansions/script/c23000300.lua
@@ -16,7 +16,7 @@ function c23000300.initial_effect(c)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetTargetRange(LOCATION_MZONE,0)
-	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x35b))
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x36b))
 	e2:SetValue(500)
 	c:RegisterEffect(e2)
 	--defense
@@ -25,7 +25,7 @@ function c23000300.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c23000300.filter(c)
-	return c:IsFaceup() and c:IsSetCard(0x35b)
+	return c:IsFaceup() and c:IsSetCard(0x36b)
 end
 function c23000300.spcon(e,c)
 	if c==nil then return true end

--- a/expansions/script/c23000301.lua
+++ b/expansions/script/c23000301.lua
@@ -20,7 +20,7 @@ function c23000301.initial_effect(c)
 	e3:SetCode(EFFECT_UPDATE_ATTACK)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetTargetRange(LOCATION_MZONE,0)
-	e3:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x35b))
+	e3:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x36b))
 	e3:SetValue(500)
 	c:RegisterEffect(e3)
 	--defense
@@ -29,7 +29,7 @@ function c23000301.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function c23000301.thfilter(c)
-	return c:IsSetCard(0x35b) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
+	return c:IsSetCard(0x36b) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
 end
 function c23000301.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c23000301.thfilter,tp,LOCATION_DECK,0,1,nil) end

--- a/expansions/script/c23000302.lua
+++ b/expansions/script/c23000302.lua
@@ -19,7 +19,7 @@ function c23000302.initial_effect(c)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetTargetRange(LOCATION_MZONE,0)
-	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x35b))
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x36b))
 	e2:SetValue(500)
 	c:RegisterEffect(e2)
 	--defense
@@ -28,7 +28,7 @@ function c23000302.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c23000302.spfilter(c,e,tp)
-	return c:IsSetCard(0x35b) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and not c:IsCode(23000302)
+	return c:IsSetCard(0x36b) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and not c:IsCode(23000302)
 end
 function c23000302.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
@@ -53,7 +53,7 @@ function c23000302.spop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e1,tp)
 end
 function c23000302.splimit(e,c)
-	return not c:IsSetCard(0x35b)
+	return not c:IsSetCard(0x36b)
 end

--- a/expansions/script/c23000303.lua
+++ b/expansions/script/c23000303.lua
@@ -19,7 +19,7 @@ function c23000303.initial_effect(c)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetTargetRange(LOCATION_MZONE,0)
-	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x35b))
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x36b))
 	e2:SetValue(500)
 	c:RegisterEffect(e2)
 	--defense
@@ -32,11 +32,11 @@ function c23000303.initial_effect(c)
 	e4:SetCode(EFFECT_PIERCE)
 	e4:SetRange(LOCATION_MZONE)
 	e4:SetTargetRange(LOCATION_MZONE,0)
-	e4:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x35b))
+	e4:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x36b))
 	c:RegisterEffect(e4)
 end
 function c23000303.spfilter2(c,e,tp)
-	return c:IsSetCard(0x35b) and c:IsLevel(3) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x36b) and c:IsLevel(3) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c23000303.sptg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c23000303.spfilter2(chkc,e,tp) end

--- a/expansions/script/c23000304.lua
+++ b/expansions/script/c23000304.lua
@@ -19,7 +19,7 @@ function c23000304.initial_effect(c)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetTargetRange(LOCATION_MZONE,0)
-	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x35b))
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x36b))
 	e2:SetValue(500)
 	c:RegisterEffect(e2)
 	--defense
@@ -39,7 +39,7 @@ function c23000304.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function c23000304.spfilter2(c,e,tp)
-	return c:IsSetCard(0x35b) and c:IsLevel(3) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x36b) and c:IsLevel(3) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c23000304.sptg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c23000304.spfilter2(chkc,e,tp) end
@@ -56,7 +56,7 @@ function c23000304.spop2(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c23000304.cfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x35b) and not c:IsCode(23000304)
+	return c:IsFaceup() and c:IsSetCard(0x36b) and not c:IsCode(23000304)
 end
 function c23000304.tdcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(c23000304.cfilter,tp,LOCATION_MZONE,0,2,e:GetHandler())

--- a/expansions/script/c23000305.lua
+++ b/expansions/script/c23000305.lua
@@ -9,7 +9,7 @@ function c23000305.initial_effect(c)
 	e1:SetCode(EFFECT_INDESTRUCTABLE_COUNT)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetTargetRange(LOCATION_ONFIELD,0)
-	e1:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x35b))
+	e1:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x36b))
 	e1:SetCountLimit(2)
 	e1:SetValue(1)
 	c:RegisterEffect(e1)
@@ -19,7 +19,7 @@ function c23000305.initial_effect(c)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetTargetRange(LOCATION_MZONE,0)
-	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x35b))
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x36b))
 	e2:SetValue(500)
 	c:RegisterEffect(e2)
 	--defense
@@ -56,7 +56,7 @@ function c23000305.initial_effect(c)
 	c:RegisterEffect(e6)
 end
 function c23000305.spfilter2(c,e,tp)
-	return c:IsSetCard(0x35b) and c:IsLevel(3) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x36b) and c:IsLevel(3) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c23000305.sptg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c23000305.spfilter2(chkc,e,tp) end

--- a/expansions/script/c23000306.lua
+++ b/expansions/script/c23000306.lua
@@ -17,7 +17,7 @@ function c23000306.initial_effect(c)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetTargetRange(LOCATION_MZONE,0)
-	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x35b))
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x36b))
 	e2:SetValue(500)
 	c:RegisterEffect(e2)
 	--defense
@@ -40,7 +40,7 @@ function c23000306.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SendtoGrave(c,REASON_COST+REASON_DISCARD)
 end
 function c23000306.filter(c)
-	return c:IsSetCard(0x35b) and c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToHand()
+	return c:IsSetCard(0x36b) and c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToHand()
 end
 function c23000306.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c23000306.filter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil) end
@@ -55,7 +55,7 @@ function c23000306.operation(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c23000306.slevel(e,c)
-	if c:IsSetCard(0x35b) then
+	if c:IsSetCard(0x36b) then
 		return e:GetHandler():GetLevel()+4*65536
 	else
 		return e:GetHandler():GetLevel()

--- a/expansions/script/c23000307.lua
+++ b/expansions/script/c23000307.lua
@@ -20,7 +20,7 @@ function c23000307.initial_effect(c)
 	e4:SetCode(EFFECT_UPDATE_ATTACK)
 	e4:SetRange(LOCATION_MZONE)
 	e4:SetTargetRange(LOCATION_MZONE,0)
-	e4:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x35b))
+	e4:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x36b))
 	e4:SetValue(500)
 	c:RegisterEffect(e4)
 	--defense
@@ -54,7 +54,7 @@ function c23000307.spop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e2,tp)
 end
 function c23000307.splimit(e,c,sump,sumtype,sumpos,targetp,se)
-	return not c:IsSetCard(0x35b) and c:IsLocation(LOCATION_EXTRA)
+	return not c:IsSetCard(0x36b) and c:IsLocation(LOCATION_EXTRA)
 end

--- a/expansions/script/c23000308.lua
+++ b/expansions/script/c23000308.lua
@@ -19,7 +19,7 @@ function c23000308.initial_effect(c)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetTargetRange(LOCATION_MZONE,0)
-	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x35b))
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x36b))
 	e2:SetValue(500)
 	c:RegisterEffect(e2)
 	--defense
@@ -40,7 +40,7 @@ function c23000308.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function c23000308.spfilter2(c,e,tp)
-	return c:IsSetCard(0x35b) and c:IsLevel(3) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x36b) and c:IsLevel(3) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c23000308.sptg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c23000308.spfilter2(chkc,e,tp) end
@@ -57,7 +57,7 @@ function c23000308.spop2(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c23000308.cfilter(c)
-	return c:IsSetCard(0x35b) and c:IsType(TYPE_MONSTER)
+	return c:IsSetCard(0x36b) and c:IsType(TYPE_MONSTER)
 end
 function c23000308.tdcon(e,tp,eg,ep,ev,re,r,rp)
 	return aux.dscon()

--- a/expansions/script/c23000309.lua
+++ b/expansions/script/c23000309.lua
 --赛须眉·公孙玥
 function c23000309.initial_effect(c)
 	aux.AddMaterialCodeList(c,23000303)
 	--synchro summon
@@ -12,7 +12,7 @@ function c23000309.initial_effect(c)
 	e1:SetCode(EFFECT_INDESTRUCTABLE_COUNT)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetTargetRange(LOCATION_MZONE,0)
-	e1:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x35b))
+	e1:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x36b))
 	e1:SetValue(c23000309.indct)
 	c:RegisterEffect(e1)
 	--atk
@@ -61,7 +61,7 @@ function c23000309.indct(e,re,r,rp)
 end
 function c23000309.actcon(e)
 	local a=Duel.GetAttacker()
-	return a and a:IsControler(e:GetHandlerPlayer()) and a:IsSetCard(0x35b)
+	return a and a:IsControler(e:GetHandlerPlayer()) and a:IsSetCard(0x36b)
 end
 function c23000309.aclimit(e,re,tp)
 	return re:IsHasType(EFFECT_TYPE_ACTIVATE)
@@ -71,11 +71,11 @@ function c23000309.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST+REASON_DISCARD)
 end
 function c23000309.spfilter1(c,e,tp)
-	return c:GetLevel()>0 and c:IsSetCard(0x35b) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:GetLevel()>0 and c:IsSetCard(0x36b) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 		and Duel.IsExistingTarget(c23000309.spfilter2,tp,LOCATION_GRAVE,0,1,c,c:GetLevel(),e,tp)
 end
 function c23000309.spfilter2(c,lv,e,tp)
-	return c:IsLevel(lv) and c:IsSetCard(0x35b) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsLevel(lv) and c:IsSetCard(0x36b) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c23000309.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return false end

--- a/expansions/script/c23000310.lua
+++ b/expansions/script/c23000310.lua
 --白马夜袭
 function c23000310.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
@@ -31,7 +31,7 @@ function c23000310.activate(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c23000310.filter(c)
-	return c:IsFaceup() and c:IsSetCard(0x35b)
+	return c:IsFaceup() and c:IsSetCard(0x36b)
 end
 function c23000310.handcon(e)
 	return Duel.IsExistingMatchingCard(c23000310.filter,e:GetHandlerPlayer(),LOCATION_MZONE,0,2,nil)

--- a/expansions/script/c23000311.lua
+++ b/expansions/script/c23000311.lua
@@ -15,7 +15,7 @@ function c23000311.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)==0
 end
 function c23000311.filter(c,e,tp)
-	return c:IsSetCard(0x35b) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x36b) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c23000311.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0

--- a/expansions/script/c23000312.lua
+++ b/expansions/script/c23000312.lua
@@ -13,7 +13,7 @@ function c23000312.initial_effect(c)
 	Duel.AddCustomActivityCounter(23000312,ACTIVITY_SPSUMMON,c23000312.counterfilter)
 end
 function c23000312.counterfilter(c)
-	return c:IsSetCard(0x35b)
+	return c:IsSetCard(0x36b)
 end
 function c23000312.rmcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetCustomActivityCount(23000312,tp,ACTIVITY_SPSUMMON)==0 end
@@ -28,13 +28,13 @@ function c23000312.rmcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.RegisterEffect(e1,tp)
 end
 function c23000312.splimit(e,c,sump,sumtype,sumpos,targetp,se)
-	return not c:IsSetCard(0x35b)
+	return not c:IsSetCard(0x36b)
 end
 function c23000312.filter(c)
-	return c:IsSetCard(0x35b) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
+	return c:IsSetCard(0x36b) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
 end
 function c23000312.spfilter(c,e,tp)
-	return c:IsSetCard(0x35b) and c:IsLevelBelow(7) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x36b) and c:IsLevelBelow(7) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c23000312.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c23000312.filter,tp,LOCATION_DECK,0,1,nil) end

--- a/expansions/script/c23000313.lua
+++ b/expansions/script/c23000313.lua
@@ -90,7 +90,7 @@ function c23000313.eqlimit(e,c)
 	return c:IsRace(RACE_WARRIOR) or e:GetHandler():GetEquipTarget()==c
 end
 function c23000313.slevel(e,c)
-	if c:IsSetCard(0x35b) then
+	if c:IsSetCard(0x36b) then
 		return e:GetHandler():GetLevel()+4*65536
 	else
 		return e:GetHandler():GetLevel()

--- a/expansions/script/c23000314.lua
+++ b/expansions/script/c23000314.lua
@@ -31,7 +31,7 @@ function c23000314.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c23000314.cfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x35b)
+	return c:IsFaceup() and c:IsSetCard(0x36b)
 end
 function c23000314.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(c23000314.cfilter,tp,LOCATION_MZONE,0,1,nil)
@@ -74,16 +74,16 @@ function c23000314.op(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e2,tp)
 end
 function c23000314.splimit(e,c)
-	return not c:IsSetCard(0x35b)
+	return not c:IsSetCard(0x36b)
 end
 function c23000314.atktg(e,c)
-	return c:IsSetCard(0x35b)
+	return c:IsSetCard(0x36b)
 end
 function c23000314.drcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetTurnPlayer()==tp
 end
 function c23000314.tdfilter(c)
-	return c:IsSetCard(0x35b) and c:IsAbleToDeck()
+	return c:IsSetCard(0x36b) and c:IsAbleToDeck()
 end
 function c23000314.drtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c23000314.tdfilter(chkc) end

--- a/expansions/script/c23000315.lua
+++ b/expansions/script/c23000315.lua
@@ -35,7 +35,7 @@ function c23000315.condition2(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(c23000315.filter,tp,LOCATION_MZONE,0,2,nil) and aux.dscon(e) and aux.exccon(e)
 end
 function c23000315.atkfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x35b)
+	return c:IsFaceup() and c:IsSetCard(0x36b)
 end
 function c23000315.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c23000315.filter(chkc) end

--- a/expansions/script/c23000316.lua
+++ b/expansions/script/c23000316.lua
@@ -23,7 +23,7 @@ function c23000316.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c23000316.desfilter(c)
-	 return c:IsFaceup() and c:IsSetCard(0x35b) 
+	 return c:IsFaceup() and c:IsSetCard(0x36b) 
 end
 function c23000316.desfilter2(c,g)
 	return g:IsContains(c)
@@ -54,7 +54,7 @@ function c23000316.desop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c23000316.atkfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x35b)
+	return c:IsFaceup() and c:IsSetCard(0x36b)
 end
 function c23000316.atktg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c23000316.atkfilter(chkc) end

--- a/expansions/script/c23000317.lua
+++ b/expansions/script/c23000317.lua
@@ -33,7 +33,7 @@ function c23000317.initial_effect(c)
 	e4:SetCode(EFFECT_UPDATE_ATTACK)
 	e4:SetRange(LOCATION_MZONE)
 	e4:SetTargetRange(LOCATION_MZONE,0)
-	e4:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x35b))
+	e4:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x36b))
 	e4:SetValue(500)
 	c:RegisterEffect(e4)
 	--defense
@@ -45,7 +45,7 @@ function c23000317.synfilter1(c,syncard,tuner,f)
 	return c:IsFaceup() and c:IsCanBeSynchroMaterial(syncard,tuner) and (f==nil or f(c,syncard))
 end
 function c23000317.synfilter2(c,syncard,tuner,f)
-	return c:IsSetCard(0x35b) and c:IsCanBeSynchroMaterial(syncard,tuner) and (f==nil or f(c,syncard))
+	return c:IsSetCard(0x36b) and c:IsCanBeSynchroMaterial(syncard,tuner) and (f==nil or f(c,syncard))
 end
 function c23000317.syncheck(c,g,mg,tp,lv,syncard,minc,maxc)
 	g:AddCard(c)
@@ -69,7 +69,7 @@ function c23000317.syntg(e,syncard,f,min,max)
 	if lv<=c:GetLevel() then return false end
 	local g=Group.FromCards(c)
 	local mg=Duel.GetMatchingGroup(c23000317.synfilter1,syncard:GetControler(),LOCATION_MZONE,LOCATION_MZONE,c,syncard,c,f)
-	if syncard:IsSetCard(0x35b) then
+	if syncard:IsSetCard(0x36b) then
 		local exg=Duel.GetMatchingGroup(c23000317.synfilter2,syncard:GetControler(),LOCATION_HAND,0,c,syncard,c,f)
 		mg:Merge(exg)
 	end
@@ -82,7 +82,7 @@ function c23000317.synop(e,tp,eg,ep,ev,re,r,rp,syncard,f,min,max)
 	local lv=syncard:GetLevel()
 	local g=Group.FromCards(c)
 	local mg=Duel.GetMatchingGroup(c23000317.synfilter1,syncard:GetControler(),LOCATION_MZONE,LOCATION_MZONE,c,syncard,c,f)
-	if syncard:IsSetCard(0x35b) then
+	if syncard:IsSetCard(0x36b) then
 		local exg=Duel.GetMatchingGroup(c23000317.synfilter2,syncard:GetControler(),LOCATION_HAND,0,c,syncard,c,f)
 		mg:Merge(exg)
 	end
@@ -101,7 +101,7 @@ function c23000317.synop(e,tp,eg,ep,ev,re,r,rp,syncard,f,min,max)
 	Duel.SetSynchroMaterial(g)
 end
 function c23000317.hsyntg(e,c)
-	return c:IsSetCard(0x35b)
+	return c:IsSetCard(0x36b)
 end
 function c23000317.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)==0

--- a/expansions/script/c23000318.lua
+++ b/expansions/script/c23000318.lua
@@ -30,7 +30,7 @@ function c23000318.initial_effect(c)
 	e3:SetCode(EFFECT_UPDATE_ATTACK)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetTargetRange(LOCATION_MZONE,0)
-	e3:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x35b))
+	e3:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x36b))
 	e3:SetValue(500)
 	c:RegisterEffect(e3)
 	--defense
@@ -40,7 +40,7 @@ function c23000318.initial_effect(c)
 end
 function c23000318.atkcon(e,tp,eg,ep,ev,re,r,rp)
 	local at=Duel.GetAttackTarget()
-	return Duel.GetAttacker():IsControler(1-tp) and at:IsControler(tp) and at:IsFaceup() and at:IsSetCard(0x35b)
+	return Duel.GetAttacker():IsControler(1-tp) and at:IsControler(tp) and at:IsFaceup() and at:IsSetCard(0x36b)
 end
 function c23000318.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
@@ -57,7 +57,7 @@ function c23000318.operation(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c23000318.cfilter(c,tp)
-	return c:IsFaceup() and c:IsSetCard(0x35b) and c:IsLocation(LOCATION_MZONE) and c:IsControler(tp)
+	return c:IsFaceup() and c:IsSetCard(0x36b) and c:IsLocation(LOCATION_MZONE) and c:IsControler(tp)
 end
 function c23000318.tgcon(e,tp,eg,ep,ev,re,r,rp)
 	if rp~=1-tp or not re:IsHasProperty(EFFECT_FLAG_CARD_TARGET) then return false end

--- a/expansions/script/c23000319.lua
+++ b/expansions/script/c23000319.lua
@@ -19,7 +19,7 @@ function c23000319.initial_effect(c)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetTargetRange(LOCATION_MZONE,0)
-	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x35b))
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x36b))
 	e2:SetValue(500)
 	c:RegisterEffect(e2)
 	--defense
@@ -37,7 +37,7 @@ function c23000319.initial_effect(c)
 	c:RegisterEffect(e5)
 end
 function c23000319.spfilter2(c,e,tp)
-	return c:IsSetCard(0x35b) and c:IsLevel(3) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x36b) and c:IsLevel(3) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c23000319.sptg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c23000319.spfilter2(chkc,e,tp) end

--- a/expansions/script/c23000350.lua
+++ b/expansions/script/c23000350.lua
 local m=23000350
 local cm=_G["c"..m]
 --白马队率 子龙
 function cm.initial_effect(c)
@@ -20,7 +20,7 @@ function cm.initial_effect(c)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetTargetRange(LOCATION_MZONE,0)
-	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x35b))
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x36b))
 	e2:SetValue(500)
 	c:RegisterEffect(e2)
 	--defense

--- a/expansions/strings.conf
+++ b/expansions/strings.conf
@@ -179,7 +179,6 @@
 !setname 0x6b5e 御龙士
 #PurpleNightfall 114 0x970-0x97f
-#【2021年12月31日前禁止投稿】
 !setname 0x6978 龙宫城
 !setname 0x97a 虚诞
 !setname 0x97c 珂拉琪
@@ -391,7 +390,6 @@
 !counter 0x12e7 碟子指示物
 #Candy 1195203843 148 0x800-0x80f
-#【2021年12月31日前禁止投稿】
 !setname 0x4800 陆星
 !setname 0x480b 星际战舰
 !counter 0x48f 能量指示物
@@ -588,7 +586,6 @@
 !setname 0x9ff 从者
 #持剑者 380518667 221 0x8f0-0x8ff
-#【2021年12月31日前禁止投稿】
 !setname 0x8fa 源键
 #兔锅 1874883039 222
@@ -601,10 +598,8 @@
 !setname 0x261 传灵
 !setname 0x262 占星少女
-#拳定天下 1805927248 230 0x350-0x35f
+#拳定天下 1805927248 230 0x360-0x36f
-#【2021年12月31日前禁止投稿】
+!setname 0x36b 白马义从
-!setname 0x351 奇妙冒险团
-!setname 0x35b 白马义从
 #天堂的路人 547998027 243
 #AddCodeList(24300021) 迦拉克隆记述
@@ -895,7 +890,6 @@
 #Millux 498433112 500
 #积木 - 502 0xcb0-0xcbf
-#【2021年12月31日前禁止投稿】
 !setname 0xcb1 数码兽
 !setname 0xcb2 T·F
 !setname 0xcb3 季神
@@ -911,7 +905,6 @@
 #DJ YOSHITAKA 2207455797 525
 #AD钙 540551322 537 0x530-0x53f
-#【2021年12月31日前禁止投稿】
 !setname 0x530 惧轮
 !setname 0x533 圆盘生物
 !setname 0x534 幻海袭