bug fix

expansions/script/c15000000.lua

@@ -3,7 +3,28 @@ SUMMON_TYPE_SPLIT=15000001
 SUMMON_VALUE_SPLIT=0x15000001
 EFFECT_EXTRA_SPLIT_SUMMON=15000002
 EFFECT_CANNOT_BE_SPLIT_MATERIAL=15000003
---if not pcall(function() require("expansions/script/c15000000") end) then require("script/c15000000") end
+--[[
+if not require and loadfile then
+	function require(str)
+		require_list=require_list or {}
+		if not require_list[str] then
+			if string.find(str,"%.") then
+				require_list[str]=loadfile(str)
+			else
+				require_list[str]=loadfile(str..".lua")
+			end
+			require_list[str]()
+			return require_list[str]
+		end
+		return require_list[str]
+	end
+end
+if not pcall(function() require("expansions/script/c15000000") end) then require("script/c15000000") end
+]]--
+if Satl_Library_Switch then
+	return
+end
+Satl_Library_Switch=true
 --为 卡 片 c添 加 裂 解 召 唤 手 续 ,mf为 裂 解 素 材 需 满 足 的 条 件
 function Satl.AddSplitProcedure(c,mf)
 	if not Satl.PendulumChecklist then
@@ -321,7 +342,7 @@ end
 function Satl.GetHearogenehirpSolvingCount(e,tp)
 	local g=Group.CreateGroup()
 	local code=15005050
-	while code<15006000 do
+	while code<15005070 do
 		if Duel.GetFlagEffect(tp,code)~=0 then
 			local tg=Duel.GetMatchingGroup(Card.IsOriginalCodeRule,tp,0xff,0xff,nil,code)
 			local tc=tg:GetFirst()
@@ -336,7 +357,7 @@ end
 function Satl.AddHearogenehirpSolving(e,tp)
 	local code=15005050
 	local g=Group.CreateGroup()
-	while code<15006000 do
+	while code<15005070 do
 		if Duel.GetFlagEffect(tp,code)~=0 then
 			local tg=Duel.GetMatchingGroup(Card.IsOriginalCodeRule,tp,0xff,0xff,nil,code)
 			local tc=tg:GetFirst()
@@ -350,7 +371,7 @@ function Satl.AddHearogenehirpSolving(e,tp)
 		g:Clear()
 		local list={}
 		local code=15005050
-		while code<15006000 do
+		while code<15005070 do
 			if Duel.GetFlagEffect(tp,code)~=0 then
 				local tg=Duel.GetMatchingGroup(Card.IsOriginalCodeRule,tp,0xff,0xff,nil,code)
 				local tc=tg:GetFirst()
@@ -381,7 +402,7 @@ function Satl.AddHearogenehirpSolving(e,tp)
 		end
 		g:Clear()
 		local code=15005050
-		while code<15006000 do
+		while code<15005070 do
 			if Duel.GetFlagEffect(tp,code)~=0 then
 				local tg=Duel.GetMatchingGroup(Card.IsOriginalCodeRule,tp,0xff,0xff,nil,code)
 				local tc=tg:GetFirst()
@@ -503,7 +524,7 @@ function Satl.HearogenehirpXyzLevelFreeCondition(f,gf,minct,maxct)
 				else
 					mg=Duel.GetMatchingGroup(Satl.XyzLevelFreeFilter,tp,LOCATION_MZONE,0,nil,c,f)
 				end
-				local sg=Auxiliary.GetMustMaterialGroup(tp,EFFECT_MUST_BE_XMATERIAL)
+				local sg=Duel.GetMustMaterial(tp,EFFECT_MUST_BE_XMATERIAL)
 				if sg:IsExists(Auxiliary.MustMaterialCounterFilter,1,nil,mg) then return false end
 				Duel.SetSelectedCard(sg)
 				Auxiliary.GCheckAdditional=Auxiliary.TuneMagicianCheckAdditionalX(EFFECT_TUNE_MAGICIAN_X)
@@ -529,7 +550,7 @@ function Satl.HearogenehirpXyzLevelFreeTarget(f,gf,minct,maxct)
 				else
 					mg=Duel.GetMatchingGroup(Satl.XyzLevelFreeFilter,tp,LOCATION_MZONE,0,nil,c,f)
 				end
-				local sg=Auxiliary.GetMustMaterialGroup(tp,EFFECT_MUST_BE_XMATERIAL)
+				local sg=Duel.GetMustMaterial(tp,EFFECT_MUST_BE_XMATERIAL)
 				Duel.SetSelectedCard(sg)
 				Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL)
 				local cancel=Duel.IsSummonCancelable()

expansions/script/c15004104.lua

@@ -71,32 +71,32 @@ end
 function cm.sp1filter(c,e,tp)
 	return c:IsCode(15004106) and c:IsCanBeSpecialSummoned(e,0,tp,true,true)
 end
-function cm.sp2filter(c,e,tp)
-	return c:IsCode(15004107) and c:IsCanBeSpecialSummoned(e,0,tp,true,true) and Duel.IsExistingMatchingCard(cm.bugfilter,tp,LOCATION_MZONE,0,1,aux.ExceptThisCard(e))
+function cm.sp2filter(c,e,tp,chk)
+	return c:IsCode(15004107) and c:IsCanBeSpecialSummoned(e,0,tp,true,true) and ((chk==0 and Duel.IsExistingMatchingCard(cm.bugfilter,tp,LOCATION_MZONE,0,1,e:GetHandler())) or (chk~=0 and Duel.IsExistingMatchingCard(cm.bugfilter,tp,LOCATION_MZONE,0,1,aux.ExceptThisCard(e))))
 end
 function cm.bugfilter(c)
 	return c:IsRace(RACE_INSECT) and c:IsFaceup()
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>-1
-		and e:GetHandler():IsAbleToDeck() and (Duel.IsExistingMatchingCard(cm.sp1filter,tp,LOCATION_DECK,0,1,nil,e,tp) or Duel.IsExistingMatchingCard(cm.sp2filter,tp,LOCATION_DECK,0,1,nil,e,tp)) end
-	Duel.SetOperationInfo(0,CATEGORY_TODECK,e:GetHandler(),1,0,0)
+	local c=e:GetHandler()
+	if chk==0 then return Duel.GetMZoneCount(tp,c)>0 and c:IsAbleToDeck()
+		and (Duel.IsExistingMatchingCard(cm.sp1filter,tp,LOCATION_DECK,0,1,nil,e,tp) or Duel.IsExistingMatchingCard(cm.sp2filter,tp,LOCATION_DECK,0,1,nil,e,tp,0)) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK)
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
 	if not c:IsRelateToEffect(e) then return end
 	if not c:IsAbleToDeck() then return end
 	local b1=Duel.IsExistingMatchingCard(cm.sp1filter,tp,LOCATION_DECK,0,1,nil,e,tp)
-	local b2=Duel.IsExistingMatchingCard(cm.sp2filter,tp,LOCATION_DECK,0,1,nil,e,tp)
+	local b2=Duel.IsExistingMatchingCard(cm.sp2filter,tp,LOCATION_DECK,0,1,nil,e,tp,1)
 	local op=0
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	if b1 and b2 then op=Duel.SelectOption(tp,aux.Stringid(m,0),aux.Stringid(m,1))
 	elseif b1 then op=Duel.SelectOption(tp,aux.Stringid(m,0))
 	else op=Duel.SelectOption(tp,aux.Stringid(m,1))+1 end
 	if op==0 then
-		if Duel.SendtoDeck(c,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)>0 and c:IsLocation(LOCATION_DECK) then
+		if Duel.SendtoDeck(c,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)~=0 then
+			if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 			local g=Duel.SelectMatchingCard(tp,cm.sp1filter,tp,LOCATION_HAND+LOCATION_DECK,0,1,1,nil,e,tp)
 			local tc=g:GetFirst()
@@ -107,9 +107,10 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 		end
 	end
 	if op==1 then
-		if Duel.SendtoDeck(c,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)>0 and c:IsLocation(LOCATION_DECK) then
+		if Duel.SendtoDeck(c,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)~=0 then
+			if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-			local g=Duel.SelectMatchingCard(tp,cm.sp2filter,tp,LOCATION_HAND+LOCATION_DECK,0,1,1,nil,e,tp)
+			local g=Duel.SelectMatchingCard(tp,cm.sp2filter,tp,LOCATION_HAND+LOCATION_DECK,0,1,1,nil,e,tp,1)
 			local tc=g:GetFirst()
 			if tc then
 				Duel.SpecialSummon(tc,SUMMON_VALUE_LV,tp,tp,true,true,POS_FACEUP)

expansions/script/c15005050.lua

+if not require and loadfile then
+	function require(str)
+		require_list=require_list or {}
+		if not require_list[str] then
+			if string.find(str,"%.") then
+				require_list[str]=loadfile(str)
+			else
+				require_list[str]=loadfile(str..".lua")
+			end
+			require_list[str]()
+			return require_list[str]
+		end
+		return require_list[str]
+	end
+end
 if not pcall(function() require("expansions/script/c15000000") end) then require("script/c15000000") end
 local m=15005050
 local cm=_G["c"..m]
-cm.name="异闻鸣星-支原体"
+cm.name="异闻鸣星-伊奥"
 function cm.initial_effect(c)
 	--flip
 	local e1=Effect.CreateEffect(c)

expansions/script/c15005052.lua

+if not require and loadfile then
+	function require(str)
+		require_list=require_list or {}
+		if not require_list[str] then
+			if string.find(str,"%.") then
+				require_list[str]=loadfile(str)
+			else
+				require_list[str]=loadfile(str..".lua")
+			end
+			require_list[str]()
+			return require_list[str]
+		end
+		return require_list[str]
+	end
+end
 if not pcall(function() require("expansions/script/c15000000") end) then require("script/c15000000") end
 local m=15005052
 local cm=_G["c"..m]
-cm.name="异闻鸣星-衣原体"
+cm.name="异闻鸣星-欧罗巴"
 function cm.initial_effect(c)
 	--flip
 	local e1=Effect.CreateEffect(c)

expansions/script/c15005054.lua

+if not require and loadfile then
+	function require(str)
+		require_list=require_list or {}
+		if not require_list[str] then
+			if string.find(str,"%.") then
+				require_list[str]=loadfile(str)
+			else
+				require_list[str]=loadfile(str..".lua")
+			end
+			require_list[str]()
+			return require_list[str]
+		end
+		return require_list[str]
+	end
+end
 if not pcall(function() require("expansions/script/c15000000") end) then require("script/c15000000") end
 local m=15005054
 local cm=_G["c"..m]
-cm.name="异闻鸣星-立克次氏体"
+cm.name="异闻鸣星-盖尼米得"
 function cm.initial_effect(c)
 	--flip
 	local e1=Effect.CreateEffect(c)

expansions/script/c15005056.lua

+if not require and loadfile then
+	function require(str)
+		require_list=require_list or {}
+		if not require_list[str] then
+			if string.find(str,"%.") then
+				require_list[str]=loadfile(str)
+			else
+				require_list[str]=loadfile(str..".lua")
+			end
+			require_list[str]()
+			return require_list[str]
+		end
+		return require_list[str]
+	end
+end
 if not pcall(function() require("expansions/script/c15000000") end) then require("script/c15000000") end
 local m=15005056
 local cm=_G["c"..m]

expansions/script/c15005063.lua

+if not require and loadfile then
+	function require(str)
+		require_list=require_list or {}
+		if not require_list[str] then
+			if string.find(str,"%.") then
+				require_list[str]=loadfile(str)
+			else
+				require_list[str]=loadfile(str..".lua")
+			end
+			require_list[str]()
+			return require_list[str]
+		end
+		return require_list[str]
+	end
+end
 if not pcall(function() require("expansions/script/c15000000") end) then require("script/c15000000") end
 local m=15005063
 local cm=_G["c"..m]

expansions/script/c15005064.lua

+if not require and loadfile then
+	function require(str)
+		require_list=require_list or {}
+		if not require_list[str] then
+			if string.find(str,"%.") then
+				require_list[str]=loadfile(str)
+			else
+				require_list[str]=loadfile(str..".lua")
+			end
+			require_list[str]()
+			return require_list[str]
+		end
+		return require_list[str]
+	end
+end
 if not pcall(function() require("expansions/script/c15000000") end) then require("script/c15000000") end
 local m=15005064
 local cm=_G["c"..m]

expansions/script/c15005067.lua

+if not require and loadfile then
+	function require(str)
+		require_list=require_list or {}
+		if not require_list[str] then
+			if string.find(str,"%.") then
+				require_list[str]=loadfile(str)
+			else
+				require_list[str]=loadfile(str..".lua")
+			end
+			require_list[str]()
+			return require_list[str]
+		end
+		return require_list[str]
+	end
+end
 if not pcall(function() require("expansions/script/c15000000") end) then require("script/c15000000") end
 local m=15005067
 local cm=_G["c"..m]

expansions/script/c17032650.lua

 --苍空的无铭剑豪
-xpcall(function() require("expansions/script/c17035101") end,function() require("script/c17035101") end)
+xpcall(function() dofile("expansions/script/c17035101.lua") end,function() dofile("script/c17035101.lua") end)
 function c17032650.initial_effect(c)
 	c:EnableReviveLimit()
 	aux.EnablePendulumAttribute(c,false)

expansions/script/c22000010.lua

 --圣律·西莉斯特
-xpcall(function() require("expansions/script/c22000000") end,function() require("script/c22000000") end)
+xpcall(function() dofile("expansions/script/c22000000.lua") end,function() dofile("script/c22000000.lua") end)
 local s,id,o=GetID()
 function s.initial_effect(c)
 	wco.slp(c,22000010)

expansions/script/c22000020.lua

 --圣律·娜奥米亚
-xpcall(function() require("expansions/script/c22000000") end,function() require("script/c22000000") end)
-local s,id,o=GetID()
+xpcall(function() dofile("expansions/script/c22000000.lua") end,function() dofile("script/c22000000.lua") end)
 function s.initial_effect(c)
 	wco.slp(c,22000020)
 	wco.snp(c,22000020)

expansions/script/c22000030.lua

 --圣律·伊塔吉雅
-xpcall(function() require("expansions/script/c22000000") end,function() require("script/c22000000") end)
-local s,id,o=GetID()
+xpcall(function() dofile("expansions/script/c22000000.lua") end,function() dofile("script/c22000000.lua") end)
 function s.initial_effect(c)
 	wco.slp(c,22000030)
 	wco.snp(c,22000030)

expansions/script/c22000040.lua

 --圣律·艾瑞丽尔
-xpcall(function() require("expansions/script/c22000000") end,function() require("script/c22000000") end)
-local s,id,o=GetID()
+xpcall(function() dofile("expansions/script/c22000000.lua") end,function() dofile("script/c22000000.lua") end)
 function s.initial_effect(c)
 	wco.slp(c,22000040)
 	wco.snp(c,22000040)

expansions/script/c22000050.lua

 --圣律·贝利嘉德
-xpcall(function() require("expansions/script/c22000000") end,function() require("script/c22000000") end)
-local s,id,o=GetID()
+xpcall(function() dofile("expansions/script/c22000000.lua") end,function() dofile("script/c22000000.lua") end)
 function s.initial_effect(c)
 	wco.slp(c,22000050)
 	wco.snp2(c,22000050)

expansions/script/c22000060.lua

 --圣律·普拉薇安
-xpcall(function() require("expansions/script/c22000000") end,function() require("script/c22000000") end)
-local s,id,o=GetID()
+xpcall(function() dofile("expansions/script/c22000000.lua") end,function() dofile("script/c22000000.lua") end)
 function s.initial_effect(c)
 	wco.slp(c,22000060)
 	wco.snp2(c,22000060)

expansions/script/c22000070.lua

 --圣律·莎尔索斯
-xpcall(function() require("expansions/script/c22000000") end,function() require("script/c22000000") end)
-local s,id,o=GetID()
+xpcall(function() dofile("expansions/script/c22000000.lua") end,function() dofile("script/c22000000.lua") end)
 function s.initial_effect(c)
 	wco.slp(c,22000070)
 	wco.snp2(c,22000070)

expansions/script/c22000080.lua

 --圣律·帕尔妮兹
-xpcall(function() require("expansions/script/c22000000") end,function() require("script/c22000000") end)
-local s,id,o=GetID()
+xpcall(function() dofile("expansions/script/c22000000.lua") end,function() dofile("script/c22000000.lua") end)
 function s.initial_effect(c)
 	wco.slp(c,22000080)
 	wco.snp2(c,22000080)

expansions/script/c22000090.lua

 --圣律·玛奇尤姆
-xpcall(function() require("expansions/script/c22000000") end,function() require("script/c22000000") end)
-local s,id,o=GetID()
+xpcall(function() dofile("expansions/script/c22000000.lua") end,function() dofile("script/c22000000.lua") end)
 function s.initial_effect(c)
 	wco.slp(c,22000090)
 	wco.snp3(c,22000090)

expansions/script/c22000100.lua

 --圣律·库托里希
-xpcall(function() require("expansions/script/c22000000") end,function() require("script/c22000000") end)
-local s,id,o=GetID()
+xpcall(function() dofile("expansions/script/c22000000.lua") end,function() dofile("script/c22000000.lua") end)
 function s.initial_effect(c)
 	wco.slp(c,22000100)
 	wco.snp3(c,22000100)

expansions/script/c22000110.lua

 --圣律·露泽莫尔
-xpcall(function() require("expansions/script/c22000000") end,function() require("script/c22000000") end)
-local s,id,o=GetID()
+xpcall(function() dofile("expansions/script/c22000000.lua") end,function() dofile("script/c22000000.lua") end)
 function s.initial_effect(c)
 	wco.slp(c,22000110)
 	wco.snp3(c,22000110)

expansions/script/c22000130.lua

 --圣律之智慧·克洛托
-xpcall(function() require("expansions/script/c22000000") end,function() require("script/c22000000") end)
-local s,id,o=GetID()
+xpcall(function() dofile("expansions/script/c22000000.lua") end,function() dofile("script/c22000000.lua") end)
 function s.initial_effect(c)
 	wco.sslp(c,22000130)
 	--synchro summon

expansions/script/c22000140.lua

 --圣律之力量·拉克希斯
-xpcall(function() require("expansions/script/c22000000") end,function() require("script/c22000000") end)
-local s,id,o=GetID()
+xpcall(function() dofile("expansions/script/c22000000.lua") end,function() dofile("script/c22000000.lua") end)
 function s.initial_effect(c)
 	wco.sslp(c,22000140)
 	--synchro summon
@@ -55,7 +54,7 @@ function s.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	end
 end
 function s.tdestg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	local g=Duel.GetMatchingGroup(aux.TRUE,tp,0,LOCATION_ONFIELD,nil)
+	local g=Duel.GetMatchingGroup(aux.TRUE,tp,0,LOCATION_MZONE,nil)
 	local rg=Duel.GetMatchingGroup(Card.IsDiscardable,tp,LOCATION_HAND,0,nil)
 	if chkc then return false end
 	if chk==0 then

expansions/script/c22000150.lua

 --圣律之信仰·阿特洛波斯
-xpcall(function() require("expansions/script/c22000000") end,function() require("script/c22000000") end)
-local s,id,o=GetID()
+xpcall(function() dofile("expansions/script/c22000000.lua") end,function() dofile("script/c22000000.lua") end)
 function s.initial_effect(c)
 	wco.sslp(c,22000150)
 	--synchro summon

expansions/script/c22000160.lua

 --圣律·萨普戴伊
-xpcall(function() require("expansions/script/c22000000") end,function() require("script/c22000000") end)
-local s,id,o=GetID()
+xpcall(function() dofile("expansions/script/c22000000.lua") end,function() dofile("script/c22000000.lua") end)
 function s.initial_effect(c)
 	wco.slp(c,22000160)
 	wco.snp3(c,22000160)

expansions/script/c23000400.lua

@@ -3,15 +3,11 @@ if c23000400 then return end
 c23000400=c23000400 or {}
 local m = 23000400
 local bm = _G["c"..m]
-local Version_Number=20230906
+local Version_Number=20231002
 local tcode=0x364
 --Instructions about how to use this
 --[[
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364
@@ -443,7 +439,7 @@ function bm.s.con(e,c,tuner,mg)
 		local mpg=Duel.GetMatchingGroup(nil,tp,mz+sz,0,nil)
 		g1=mpg:Filter(bm.matfilter1,nil,c,tp)
 		g2=mpg:Filter(bm.matfilter2,nil,c)
-		g3=Duel.GetMatchingGroup(bm.matfilter2,tp,mz+hz,0,nil,c)
+		g3=Duel.GetMatchingGroup(bm.matfilter2,tp,mz+ha,0,nil,c)
 	end
 	local lv=c:GetLevel()
 	local sg=nil
@@ -468,7 +464,7 @@ function bm.s.tg(e,tp,eg,ep,ev,re,r,rp,chk,c,tuner,mg)
 		local mpg=Duel.GetMatchingGroup(nil,tp,mz+sz,0,nil)
 		g1=mpg:Filter(bm.matfilter1,nil,c,tp)
 		g2=mpg:Filter(bm.matfilter2,nil,c)
-		g3=Duel.GetMatchingGroup(bm.matfilter2,tp,mz+hz,0,nil,c)
+		g3=Duel.GetMatchingGroup(bm.matfilter2,tp,mz+ha,0,nil,c)
 	end
 	local pe=Duel.IsPlayerAffectedByEffect(tp,EFFECT_MUST_BE_SMATERIAL)
 	local lv=c:GetLevel()

expansions/script/c23000410.lua

 --统合骑士团的纹章
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000420.lua

 --统合骑士团的试炼之地
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000430.lua

 --统合骑士团 双剑骑士
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000440.lua

 --统合骑士团的冒险者
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000450.lua

 --统合骑士团 笃实骑士
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000460.lua

 --统合骑士团新兵
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000470.lua

 --统合骑士团 应征剑士
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000480.lua

 --统合骑士团 应征战士
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000490.lua

 --统合骑士团 贯志射手
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000500.lua

 --统合骑士团 寒冰骑士
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000520.lua

 --统合骑士团的使者
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000530.lua

 --统合骑士团 暮色奇兵
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000540.lua

 --统合骑士团 鹰眼看守长
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000550.lua

 --统合骑士团 盗贼队长
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000560.lua

 --统合骑士团 献身的少女
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000570.lua

 --统合骑士团 天平守护者
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000580.lua

 --统合骑士团 正义骑士
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000590.lua

 --统合骑士团的翠风
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000600.lua

 --统合骑士团的紫华
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000620.lua

 --统合骑士团 见习枪兵
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000630.lua

 --统合骑士团 螺旋骑士
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000640.lua

 --统合骑士团 枪兵队长
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000650.lua

 --统合骑士团的巨龙
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000655.lua

 --统合骑士团之盾
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000660.lua

 --统合骑士团的药师
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000665.lua

 --统合骑士团 圣殿之枪
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000670.lua

 --统合骑士团的紫衣
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000675.lua

 --统合骑士团的暴啮模龙
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000680.lua

 --统合骑士团之傲
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000685.lua

 --统合骑士团的见习勇者
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000690.lua

 --统合骑士团 统合圣剑
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000695.lua

 --统合骑士团 骑士枪盾
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000701.lua

 --统合骑士团的棱镜
-if not pcall(function() require("expansions/script/c23000400") end) then
-	if not pcall(function() require("script/c23000400") end) then
-		require("c23000400")
-	end
-end
+Duel.LoadScript("c23000400")
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c37128327.lua

@@ -22,6 +22,7 @@ function id.initial_effect(c)
 	e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e4:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
 	e4:SetCode(EVENT_TO_GRAVE)
+	e4:SetCountLimit(1,37128327)
 	e4:SetCondition(id.con4)
 	e4:SetTarget(id.tg4)
 	e4:SetOperation(id.op4)

expansions/script/c37902001.lua

 --初王·艾德里·德温
 local m=37902001
 local cm=_G["c"..m]
-Duel.LoadScript("c81000000.lua")
 function cm.initial_effect(c)
 	--pendulum summon
 	aux.EnablePendulumAttribute(c)

expansions/script/c37902002.lua

 --迹王·卢修曼
 local m=37902002
 local cm=_G["c"..m]
-Duel.LoadScript("c81000000.lua")
 function cm.initial_effect(c)
 	--pendulum summon
 	aux.EnablePendulumAttribute(c)

expansions/script/c37902003.lua

 --神王·奥斯·托拜厄
 local m=37902003
 local cm=_G["c"..m]
-Duel.LoadScript("c81000000.lua")
 function cm.initial_effect(c)
 	--pendulum summon
 	aux.EnablePendulumAttribute(c)

expansions/script/c47310001.lua

 -- 面灵气 秦心
-xpcall(function() require("expansions/script/c47310000") end,function() require("script/c47310000") end)
+Duel.LoadScript('c47310000.lua')
 local s,id=GetID()
 function s.equip(c)
     local e1=Effect.CreateEffect(c)

expansions/script/c47310002.lua

 -- 面灵气 吼怒的妖狐面
-xpcall(function() require("expansions/script/c47310000") end,function() require("script/c47310000") end)
+Duel.LoadScript('c47310000.lua')
 local s,id=GetID()
 
 function s.effgain(c)

expansions/script/c47310003.lua

 -- 面灵气 怒声的大蜘蛛面
-xpcall(function() require("expansions/script/c47310000") end,function() require("script/c47310000") end)
+Duel.LoadScript('c47310000.lua')
 local s,id=GetID()
 
 function s.effgain(c)

expansions/script/c47310004.lua

 -- 面灵气 忧叹的长壁面
-xpcall(function() require("expansions/script/c47310000") end,function() require("script/c47310000") end)
+Duel.LoadScript('c47310000.lua')
 local s,id=GetID()
 
 function s.effgain(c)

expansions/script/c47310005.lua

 -- 面灵气 忧心的鬼婆面
-xpcall(function() require("expansions/script/c47310000") end,function() require("script/c47310000") end)
+Duel.LoadScript('c47310000.lua')
 local s,id=GetID()
 
 function s.effgain(c)

expansions/script/c47310006.lua

 -- 面灵气 欢喜的狮子面
-xpcall(function() require("expansions/script/c47310000") end,function() require("script/c47310000") end)
+Duel.LoadScript('c47310000.lua')
 local s,id=GetID()
 
 function s.effgain(c)

expansions/script/c47310007.lua

 -- 面灵气 狂喜的火男面
-xpcall(function() require("expansions/script/c47310000") end,function() require("script/c47310000") end)
+Duel.LoadScript('c47310000.lua')
 local s,id=GetID()
 
 function s.effgain(c)

expansions/script/c47310008.lua

 -- 面灵气 心的轮盘
-xpcall(function() require("expansions/script/c47310000") end,function() require("script/c47310000") end)
+Duel.LoadScript('c47310000.lua')
 local s,id=GetID()
 function s.change(c)
 	local e1=Effect.CreateEffect(c)

expansions/script/c47310009.lua

 -- 面灵气 希望的恋心
-xpcall(function() require("expansions/script/c47310000") end,function() require("script/c47310000") end)
+Duel.LoadScript('c47310000.lua')
 local s,id=GetID()
 function s.spsummon(c)
 	local e1=Effect.CreateEffect(c)
@@ -56,7 +56,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 		local g=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_DECK,0,1,1,nil,e,tp)
 		if g:GetCount()>0 then
 			local tc=g:GetFirst()
-			if Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)~=0 then
+			if Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)~=0 and Duel.GetLocationCount(tp,LOCATION_SZONE)>0 then
 				Duel.BreakEffect()
 				Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EQUIP)
 				local g2=Duel.SelectMatchingCard(tp,Hnk.eqfilter,tp,LOCATION_DECK,0,1,1,nil,tc,tp)

expansions/script/c47310010.lua

 -- 面灵气 秦心·深秘
-xpcall(function() require("expansions/script/c47310000") end,function() require("script/c47310000") end)
+Duel.LoadScript('c47310000.lua')
 local s,id=GetID()
 function s.equip(c)
     local e1=Effect.CreateEffect(c)

expansions/script/c47310011.lua

 -- 面灵气 秦心·凭依
-xpcall(function() require("expansions/script/c47310000") end,function() require("script/c47310000") end)
+Duel.LoadScript('c47310000.lua')
 local s,id=GetID()
 function s.equip(c)
     local e1=Effect.CreateEffect(c)

expansions/script/c47310012.lua

 -- 凭依「喜怒哀乐附体」
-xpcall(function() require("expansions/script/c47310000") end,function() require("script/c47310000") end)
+Duel.LoadScript('c47310000.lua')
 local s,id=GetID()
 function s.eff1(c)
 	local e1=Effect.CreateEffect(c)

expansions/script/c47310013.lua

 -- 怒符「愤怒的忌狼之面」
-xpcall(function() require("expansions/script/c47310000") end,function() require("script/c47310000") end)
+Duel.LoadScript('c47310000.lua')
 local s,id=GetID()
 function s.eff1(c)
 	local e1=Effect.CreateEffect(c)

expansions/script/c47310014.lua

 -- 忧符「忧世之苦不绝如轮」
-xpcall(function() require("expansions/script/c47310000") end,function() require("script/c47310000") end)
+Duel.LoadScript('c47310000.lua')
 local s,id=GetID()
 function s.eff1(c)
 	local e1=Effect.CreateEffect(c)

expansions/script/c47310015.lua

 -- 喜符「昂扬的神乐狮子」
-xpcall(function() require("expansions/script/c47310000") end,function() require("script/c47310000") end)
+Duel.LoadScript('c47310000.lua')
 local s,id=GetID()
 function s.eff1(c)
 	local e1=Effect.CreateEffect(c)

expansions/script/c47310017.lua

 -- 「亡失的情感」
-xpcall(function() require("expansions/script/c47310000") end,function() require("script/c47310000") end)
+Duel.LoadScript('c47310000.lua')
 local s,id=GetID()
 function s.aih(c)
 	local e1=Effect.CreateEffect(c)

expansions/script/c47310018.lua

 -- 面灵气 秦心·希望之面
-xpcall(function() require("expansions/script/c47310000") end,function() require("script/c47310000") end)
+Duel.LoadScript('c47310000.lua')
 local s,id=GetID()
 function s.search(c)
     local e1=Effect.CreateEffect(c)

expansions/script/c47310019.lua

 -- 面灵气 秦心※心貌百面
-xpcall(function() require("expansions/script/c47310000") end,function() require("script/c47310000") end)
+Duel.LoadScript('c47310000.lua')
 local s,id=GetID()
 function s.equip(c)
     local e1=Effect.CreateEffect(c)

expansions/script/c47330001.lua

 --秘械龙 末日
-xpcall(function() require("expansions/script/c47330000") end,function() require("script/c47330000") end)
-local s,id,o=GetID()
+Duel.LoadScript('c47330000.lua')
+local s,id=GetID()
 function s.initial_effect(c)
 	Ms_my.register(c,id)
 	--

expansions/script/c47330002.lua

 --秘械龙 夜巫
-xpcall(function() require("expansions/script/c47330000") end,function() require("script/c47330000") end)
-local s,id,o=GetID()
+Duel.LoadScript('c47330000.lua')
+local s,id=GetID()
 function s.initial_effect(c)
 	Ms_my.register(c,id)
 	Ms_my.spsummon(c,id)

expansions/script/c47330003.lua

 --秘械龙 瑞兽
-xpcall(function() require("expansions/script/c47330000") end,function() require("script/c47330000") end)
-local s,id,o=GetID()
+Duel.LoadScript('c47330000.lua')
+local s,id=GetID()
 function s.initial_effect(c)
 	Ms_my.register(c,id)
 	Ms_my.spsummon(c,id)

expansions/script/c47330004.lua

 --秘械龙 龙落
-xpcall(function() require("expansions/script/c47330000") end,function() require("script/c47330000") end)
-local s,id,o=GetID()
+Duel.LoadScript('c47330000.lua')
+local s,id=GetID()
 function s.initial_effect(c)
 	Ms_my.register(c,id)
 	Ms_my.spsummon(c,id)

expansions/script/c47330005.lua

 --秘械龙 宽恕
-xpcall(function() require("expansions/script/c47330000") end,function() require("script/c47330000") end)
-local s,id,o=GetID()
+Duel.LoadScript('c47330000.lua')
+local s,id=GetID()
 function s.initial_effect(c)
 	Ms_my.register(c,id)
 	Ms_my.spsummon(c,id)

expansions/script/c47330006.lua

 --秘械龙 灾祸
-xpcall(function() require("expansions/script/c47330000") end,function() require("script/c47330000") end)
-local s,id,o=GetID()
+Duel.LoadScript('c47330000.lua')
+local s,id=GetID()
 function s.initial_effect(c)
 	Ms_my.register(c,id)
 	Ms_my.spsummon(c,id)

expansions/script/c47330007.lua

 --秘械龙 幻冰
-xpcall(function() require("expansions/script/c47330000") end,function() require("script/c47330000") end)
-local s,id,o=GetID()
+Duel.LoadScript('c47330000.lua')
+local s,id=GetID()
 function s.initial_effect(c)
 	
 	c:EnableReviveLimit()

expansions/script/c47330008.lua

 --秘械龙 蚣蝮
-local s,id,o=GetID()
+local s,id=GetID()
 function s.initial_effect(c)
 	
 	aux.AddSynchroProcedure(c,nil,aux.NonTuner(Card.IsRace,RACE_MACHINE),1)

expansions/script/c47330009.lua

 --秘械龙 百灵
-local s,id,o=GetID()
+local s,id=GetID()
 function s.initial_effect(c)
 	aux.AddXyzProcedure(c,nil,6,2)
 	c:EnableReviveLimit()

expansions/script/c47330010.lua

 --秘械龙 龙绝
-local s,id,o=GetID()
+local s,id=GetID()
 function s.initial_effect(c)
 	c:EnableReviveLimit()
 	aux.AddLinkProcedure(c,aux.NOT(aux.FilterBoolFunction(Card.IsLinkType,TYPE_TOKEN)),2)

expansions/script/c47330011.lua

 --再秘械化
-xpcall(function() require("expansions/script/c47330000") end,function() require("script/c47330000") end)
-local s,id,o=GetID()
+Duel.LoadScript('c47330000.lua')
+local s,id=GetID()
 function s.initial_effect(c)
 
 	--activate

expansions/script/c47330012.lua

 --秘械化的地脉
-local s,id,o=GetID()
+local s,id=GetID()
 function s.initial_effect(c)
 	c:SetUniqueOnField(1,0,id)
 	--Activate

expansions/script/c47330013.lua

 --秘械龙觉醒
-xpcall(function() require("expansions/script/c47330000") end,function() require("script/c47330000") end)
-local s,id,o=GetID()
+Duel.LoadScript('c47330000.lua')
+local s,id=GetID()
 function s.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)

expansions/script/c47330015.lua

 --秘械术士 宙读
-xpcall(function() require("expansions/script/c47330000") end,function() require("script/c47330000") end)
-local s,id,o=GetID()
+Duel.LoadScript('c47330000.lua')
+local s,id=GetID()
 function s.movetf(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(id,0))