fix bugs

expansions/script/c16104622.lua

@@ -54,7 +54,7 @@ function cm.sumaddcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_MAIN2
 end
 function cm.chtg2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsCanTurnSet,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
+	if chk==0 then return true end
 	local g=Duel.GetMatchingGroup(Card.IsCanTurnSet,tp,LOCATION_MZONE,LOCATION_MZONE,nil)
 	Duel.SetOperationInfo(0,CATEGORY_POSITION,g,g:GetCount(),0,0)
 end

expansions/script/c23000400.lua

@@ -7,7 +7,22 @@ local Version_Number=20231002
 local tcode=0x364
 --Instructions about how to use this
 --[[
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000410.lua

 --统合骑士团的纹章
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000420.lua

 --统合骑士团的试炼之地
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000430.lua

 --统合骑士团 双剑骑士
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000440.lua

 --统合骑士团的冒险者
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000450.lua

 --统合骑士团 笃实骑士
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000460.lua

 --统合骑士团新兵
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000470.lua

 --统合骑士团 应征剑士
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000480.lua

 --统合骑士团 应征战士
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000490.lua

 --统合骑士团 贯志射手
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000500.lua

 --统合骑士团 寒冰骑士
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000520.lua

 --统合骑士团的使者
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000530.lua

 --统合骑士团 暮色奇兵
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000540.lua

 --统合骑士团 鹰眼看守长
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000550.lua

 --统合骑士团 盗贼队长
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000560.lua

 --统合骑士团 献身的少女
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000570.lua

 --统合骑士团 天平守护者
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000580.lua

 --统合骑士团 正义骑士
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000590.lua

 --统合骑士团的翠风
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000600.lua

 --统合骑士团的紫华
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000620.lua

 --统合骑士团 见习枪兵
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000630.lua

 --统合骑士团 螺旋骑士
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000640.lua

 --统合骑士团 枪兵队长
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000650.lua

 --统合骑士团的巨龙
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000655.lua

 --统合骑士团之盾
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000660.lua

 --统合骑士团的药师
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000665.lua

 --统合骑士团 圣殿之枪
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000670.lua

 --统合骑士团的紫衣
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000675.lua

 --统合骑士团的暴啮模龙
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000680.lua

 --统合骑士团之傲
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000685.lua

 --统合骑士团的见习勇者
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000690.lua

 --统合骑士团 统合圣剑
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000695.lua

 --统合骑士团 骑士枪盾
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364

expansions/script/c23000701.lua

 --统合骑士团的棱镜
-Duel.LoadScript("c23000400")
+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/c23000400") end) then require("script/c23000400") end
 local m1=23000400
 local bm = _G["c"..m1]
 local tcode=0x364
 
-local m=23000450
+local m=23000701
 local cm = _G["c"..m]
 
 function cm.initial_effect(c)

expansions/script/c30611020.lua

@@ -9,6 +9,7 @@ function cm.initial_effect(c)
 	aux.AddCodeList(c,30611025)
 	fgo.spsumselfex(c,m,30611005,30611025)
 	fgo.spsumgrail(c,cm.level_base_side,cm.level_rejuvenation_side,0,cm.sumcost)
+	fgo.spsum(c,RACE_DRAGON+RACE_SPELLCASTER,cm.level_base_side,cm.level_rejuvenation_side,0,0)
 	fgo.spsumline(c,m)--召唤台词
 	fgo.effect1(c,m,EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O,CATEGORY_TOHAND+CATEGORY_SEARCH,EVENT_SPSUMMON_SUCCESS,0,0,cm.thtg,cm.thop,0,EFFECT_FLAG_DELAY,m,0,0)
 	fgo.effect2(c,m,EFFECT_TYPE_IGNITION,CATEGORY_TOHAND,0,cm.cost,cm.con,cm.tg,cm.op,0,0,1,0,0)

expansions/script/c33201407.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
 xpcall(function() require("expansions/script/c33201401") end,function() require("script/c33201401") end)
 function c33201407.initial_effect(c)
 	--pendulum summon
@@ -71,12 +86,12 @@ function c33201407.scop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetCode(EFFECT_UPDATE_LSCALE)
+	e1:SetCode(EFFECT_CHANGE_LSCALE)
 	e1:SetValue(0)
-	e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_DISABLE+RESET_PHASE+PHASE_END)
+	e1:SetReset(RESET_EVENT+RESETS_STANDARD)
 	c:RegisterEffect(e1)
 	local e2=e1:Clone()
-	e2:SetCode(EFFECT_UPDATE_RSCALE)
+	e2:SetCode(EFFECT_CHANGE_RSCALE)
 	c:RegisterEffect(e2)
 end
 --

expansions/script/c47344564.lua

@@ -46,16 +46,16 @@ function s.filter(c)
 end
 function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
     local b1=Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_DECK,0,1,nil,e)
-    local b2=Duel.GetMZoneCount(tp,c)>0
-	if chk==0 then return b1 and b2 end
+    local b2=Duel.GetLocationCount(tp,LOCATION_MZONE)
+	if chk==0 then return b2>0 end
 	local off=1
 	local ops,opval={},{}
-	if b1 and b2 then
+	if b1 and b2>0 then
 		ops[off]=aux.Stringid(id,0)
 		opval[off]=0
 		off=off+1
 	end
-	if b2 then
+	if b2>0 then
 		ops[off]=aux.Stringid(id,1)
 		opval[off]=1
 		off=off+1
@@ -73,10 +73,9 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	end
 end
 function s.splimit(e,c)
-	return not (c:IsType(TYPE_SYNCHRO) or c:IsType(TYPE_XYZ)) and c:IsLocation(LOCATION_EXTRA)
+	return not (c:IsSetCard(0x43f) or c:IsSetCard(0x43e)) and c:IsLocation(LOCATION_EXTRA)
 end
 function s.spop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
 	local sel=e:GetLabel()
 	if sel==0 then
 		if Duel.GetLocationCount(tp,LOCATION_MZONE)>0

expansions/script/c47344566.lua

@@ -44,8 +44,8 @@ function s.filter(c)
 	and not (c:IsType(TYPE_QUICKPLAY) or c:IsType(TYPE_CONTINUOUS) or c:IsType(TYPE_EQUIP) or c:IsType(TYPE_COUNTER) or c:IsType(TYPE_FIELD))
 end
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_DECK,0,1,nil) and Duel.GetFieldGroupCount(tp,LOCATION_SZONE,0)<5 end
-	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
+	if chk==0 then return Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil) and Duel.GetFieldGroupCount(tp,LOCATION_SZONE,0)<5 end
+	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK+LOCATION_GRAVE)
 end
 function s.operation(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET)

expansions/script/c47344573.lua

@@ -58,10 +58,13 @@ end
 function s.tdop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=re:GetHandler()
 	if tc:IsRelateToEffect(re) then
+		tc:CancelToGrave()
 		if Duel.SendtoDeck(tc,nil,1,REASON_EFFECT)~=0 and tc:IsLocation(LOCATION_DECK) then
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_COUNTER)
-    		local ac=Duel.SelectMatchingCard(tp,s.acfilter,tp,LOCATION_ONFIELD,0,1,1,nil)
-			ac:AddCounter(0x43f,1)
+    		local ag=Duel.SelectMatchingCard(tp,s.acfilter,tp,LOCATION_ONFIELD,0,1,1,nil)
+			if #ag>0 then
+				ag:GetFirst():AddCounter(0x43f,1)
+			end
 		end
 	end
 end

expansions/script/c47344580.lua

@@ -3,7 +3,7 @@ local s,id=GetID()
 function s.initial_effect(c)
 	--activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_TOGRAVE+CATEGORY_TOHAND+CATEGORY_SEARCH)
+	e1:SetCategory(CATEGORY_TOKEN+CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetCountLimit(1,id+EFFECT_COUNT_CODE_OATH)

expansions/script/c47344587.lua

@@ -82,7 +82,7 @@ function s.thop1(e,tp,eg,ep,ev,re,r,rp)
 		and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 		and Duel.SelectEffectYesNo(tp,e:GetHandler(),aux.Stringid(47344587,2)) then
 			Duel.BreakEffect()
-			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
+			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 			local sg=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp)
 			Duel.SpecialSummon(sg,0,tp,tp,false,false,POS_FACEUP)
 		end

expansions/script/c50218112.lua

@@ -38,7 +38,7 @@ end
 c50218112.lvup={50218111}
 c50218112.lvdn={50218111,50218110}   
 function c50218112.atkfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0xcb1) and c:IsType(TYPE_MONSTER)
+	return c:IsSetCard(0xcb1) and c:IsType(TYPE_MONSTER)
 end
 function c50218112.atkup(e,c)
 	return Duel.GetMatchingGroupCount(c50218112.atkfilter,c:GetControler(),LOCATION_GRAVE,0,nil)*200

expansions/script/c50218134.lua

@@ -85,9 +85,6 @@ function c50218134.spop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.SpecialSummon(token,0,tp,tp,false,false,POS_FACEUP)
 	end
 end
-function c50218134.atkfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0xcb1)
-end
 function c50218134.atkup(e,c)
-	return Duel.GetMatchingGroupCount(c50218134.atkfilter,c:GetControler(),LOCATION_GRAVE,0,nil)*300
+	return Duel.GetMatchingGroupCount(Card.IsSetCard,c:GetControler(),LOCATION_GRAVE,0,nil,0xcb1)*300
 end
\ No newline at end of file

expansions/script/c50218138.lua

@@ -33,6 +33,7 @@ function c50218138.initial_effect(c)
 	e4:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_DEFCHANGE)
 	e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e4:SetCode(EVENT_SPSUMMON_SUCCESS)
+	e4:SetProperty(EFFECT_FLAG_DELAY)
 	e4:SetCondition(c50218138.atkcon)
 	e4:SetTarget(c50218138.atktg)
 	e4:SetOperation(c50218138.atkop)

expansions/script/c88178006.lua

@@ -35,9 +35,9 @@ function c88178006.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(c88178006.cfilter,tp,LOCATION_ONFIELD,0,1,nil)
 end
 function c88178006.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chk==0 then return Duel.IsExistingTarget(aux.aux.NegateAnyFilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
+	if chk==0 then return Duel.IsExistingTarget(aux.NegateAnyFilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DISABLE)
-	local g=Duel.SelectTarget(tp,aux.aux.NegateAnyFilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,nil)
+	local g=Duel.SelectTarget(tp,aux.NegateAnyFilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,nil)
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH)

expansions/script/c9310007.lua

@@ -57,7 +57,7 @@ function c9310007.spop(e,tp,eg,ep,ev,re,r,rp)
 			local kg2=kg:Select(tp,1,1,nil)
 			local sc=kg2:GetFirst()
 			local sg1=sg:SelectSubGroup(tp,c9310007.mtfilter,false,1,#sg,kc,sc)
-			sg1:Merge(kc)
+			sg1:Merge(Group.FromCards(kc))
 			sc:SetMaterial(sg1)
 			Duel.BreakEffect()
 			Duel.SynchroSummon(tp,sc,nil,sg1)