fix

expansions/script/c17035101.lua

@@ -323,7 +323,7 @@ function Chikichikibanban.XyzLevelFreeCondition(f,gf,minc,loc1,loc2,maxc)
 				end
 				local exg=Duel.GetMatchingGroup(Chikichikibanban.XyzLevelFreeFilter,tp,loc1,loc2,nil,c,f)
 				mg:Merge(exg)
-				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)
@@ -352,7 +352,7 @@ function Chikichikibanban.XyzLevelFreeTarget(f,gf,minc,loc1,loc2,maxc)
 				end
 				local exg=Duel.GetMatchingGroup(Chikichikibanban.XyzLevelFreeFilter,tp,loc1,loc2,nil,c,f)
 				mg:Merge(exg)
-				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()
@@ -426,7 +426,7 @@ function Chikichikibanban.XyzLevelFreeCondition2(f,gf,minc,loc1,loc2,maxc,alterf
 					if minc>maxc then return false end
 				end
 				mg=mg:Filter(Chikichikibanban.XyzLevelFreeFilter,nil,c,f)
-				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)
@@ -452,7 +452,7 @@ function Chikichikibanban.XyzLevelFreeTarget2(f,gf,minc,loc1,loc2,maxc,alterf,de
 				else
 					mg=Duel.GetFieldGroup(tp,LOCATION_MZONE+loc1,loc2)
 				end
-				local sg=Auxiliary.GetMustMaterialGroup(tp,EFFECT_MUST_BE_XMATERIAL)
+				local sg=Duel.GetMustMaterial(tp,EFFECT_MUST_BE_XMATERIAL)
 				local mg2=mg:Filter(Chikichikibanban.XyzLevelFreeFilter,nil,c,f)
 				Duel.SetSelectedCard(sg)
 				local b1=mg2:CheckSubGroup(Chikichikibanban.XyzLevelFreeGoal,minc,maxc,tp,c,gf)
@@ -1512,4 +1512,29 @@ end
 
 function Chikichikibanban.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
+end
+
+function Chikichikibanban.BeginPuzzle2(effect)
+	local e1=Effect.GlobalEffect()
+	e1:SetType(EFFECT_TYPE_FIELD)
+	e1:SetCode(EFFECT_UPDATE_ATTACK)
+	e1:SetTargetRange(0,LOCATION_MZONE)
+	e1:SetValue(5500000)
+	Duel.RegisterEffect(e1,0)
+end
+function Chikichikibanban.BeginPuzzle3(effect)
+	local e1=Effect.GlobalEffect()
+	e1:SetType(EFFECT_TYPE_FIELD)
+	e1:SetCode(EFFECT_ADD_SETCODE)
+	e1:SetTargetRange(LOCATION_MZONE+LOCATION_DECK,0)
+	e1:SetValue(0x3a0d)
+	Duel.RegisterEffect(e1,0)
+end
+function Chikichikibanban.BeginPuzzle4(effect)
+	local e1=Effect.GlobalEffect()
+	e1:SetType(EFFECT_TYPE_FIELD)
+	e1:SetCode(EFFECT_UPDATE_ATTACK)
+	e1:SetTargetRange(LOCATION_MZONE,0)
+	e1:SetValue(5500000)
+	Duel.RegisterEffect(e1,0)
 end
\ No newline at end of file

expansions/script/c17061410.lua

 --魅眼的星晶兽 斯忒诺
 local m=17061410
 local cm=_G["c"..m]
-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 cm.initial_effect(c)
 	aux.EnablePendulumAttribute(c,false)
 	chiki.AddXyzProcedureLevelFree(c,cm.xyzfilter,cm.fselect,2,LOCATION_GRAVE,0)

expansions/script/c37900000.lua

 --复读姬的外包
-if not pcall(function() require("expansions/script/c10199990.lua") end) then require("script/c10199990.lua") end
\ No newline at end of file
+if not pcall(function() dofile("expansions/script/c10199990.lua") end) then dofile("script/c10199990.lua") end
\ No newline at end of file

expansions/script/c37900001.lua

 --神社
-if not pcall(function() require("expansions/script/c37900000.lua") end) then require("script/c37900000.lua") end
+if not pcall(function() dofile("expansions/script/c37900000.lua") end) then dofile("script/c37900000.lua") end
 local m , cm = rscf.DefineCard(37900001)
 function cm.initial_effect(c)
 	local e1 = rsef.A(c)

expansions/script/c37900002.lua

 --神隐之地
-if not pcall(function() require("expansions/script/c37900000.lua") end) then require("script/c37900000.lua") end
+if not pcall(function() dofile("expansions/script/c37900000.lua") end) then dofile("script/c37900000.lua") end
 local m , cm = rscf.DefineCard(37900002,"ShenYing")
 function cm.initial_effect(c)
 	local e1 = rsef.A(c)

expansions/script/c37900003.lua

 --神隐的奇迹
-if not pcall(function() require("expansions/script/c37900000.lua") end) then require("script/c37900000.lua") end
+if not pcall(function() dofile("expansions/script/c37900000.lua") end) then dofile("script/c37900000.lua") end
 local m , cm = rscf.DefineCard(37900003,"ShenYing")
 function cm.initial_effect(c)
 	local e1 = rsef.A(c,nil,nil,nil,nil,"dis~,dise~,neg~",cm.con,nil,nil,cm.act)

expansions/script/c37900004.lua

 --现世的神隐事件
-if not pcall(function() require("expansions/script/c37900000.lua") end) then require("script/c37900000.lua") end
+if not pcall(function() dofile("expansions/script/c37900000.lua") end) then dofile("script/c37900000.lua") end
 local m , cm = rscf.DefineCard(37900004,"ShenYing")
 function cm.initial_effect(c)
 	local e1 = rsef.A(c,nil,nil,{1,m},"sp,se,th",nil,nil,nil,rsop.target({ cm.spfilter,"sp",LOCATION_HAND },{ aux.TRUE,"dum",LOCATION_DECK,0,5 }),cm.act)

expansions/script/c37900006.lua

 --神隐事件·符卡重构
-if not pcall(function() require("expansions/script/c37900000.lua") end) then require("script/c37900000.lua") end
+if not pcall(function() dofile("expansions/script/c37900000.lua") end) then dofile("script/c37900000.lua") end
 local m,cm = rscf.DefineCard(37900006)
 function cm.initial_effect(c)
 	local e2 = rsef.I(c,"td",{1,m},"td,dr",nil,LOCATION_GRAVE,nil,nil,rsop.target(Card.IsAbleToDeck,"td"),cm.tdop)

expansions/script/c37900011.lua

 --黑白魔法使
-if not pcall(function() require("expansions/script/c37900000.lua") end) then require("script/c37900000.lua") end
+if not pcall(function() dofile("expansions/script/c37900000.lua") end) then dofile("script/c37900000.lua") end
 local m,cm = rscf.DefineCard(37900011)
 function cm.initial_effect(c)
 	--xyz summon

expansions/script/c37900012.lua

 --色彩艳丽的门卫
-if not pcall(function() require("expansions/script/c37900000.lua") end) then require("script/c37900000.lua") end
+if not pcall(function() dofile("expansions/script/c37900000.lua") end) then dofile("script/c37900000.lua") end
 local m,cm = rscf.DefineCard(37900012)
 function cm.initial_effect(c)
 	--xyz summon

expansions/script/c37900013.lua

 --隐居地上的月球公主
-if not pcall(function() require("expansions/script/c37900000.lua") end) then require("script/c37900000.lua") end
+if not pcall(function() dofile("expansions/script/c37900000.lua") end) then dofile("script/c37900000.lua") end
 local m,cm = rscf.DefineCard(37900013)
 function cm.initial_effect(c)
 	c:SetSPSummonOnce(m)

expansions/script/c37900014.lua

 --永远的巫女
-if not pcall(function() require("expansions/script/c37900000.lua") end) then require("script/c37900000.lua") end
+if not pcall(function() dofile("expansions/script/c37900000.lua") end) then dofile("script/c37900000.lua") end
 local m,cm = rscf.DefineCard(37900014)
 function cm.initial_effect(c)
 	--xyz summon

expansions/script/c37900016.lua

 --完美潇洒的女仆长
-if not pcall(function() require("expansions/script/c37900000.lua") end) then require("script/c37900000.lua") end
+if not pcall(function() dofile("expansions/script/c37900000.lua") end) then dofile("script/c37900000.lua") end
 local m,cm = rscf.DefineCard(37900016)
 function cm.initial_effect(c)
 	c:SetSPSummonOnce(m)

expansions/script/c37900017.lua

 --不明的魔法之元
-if not pcall(function() require("expansions/script/c37900000.lua") end) then require("script/c37900000.lua") end
+if not pcall(function() dofile("expansions/script/c37900000.lua") end) then dofile("script/c37900000.lua") end
 local m,cm = rscf.DefineCard(37900017)
 function cm.initial_effect(c)
 	--xyz summon

expansions/script/c37900029.lua

 --不老不死的魔女
-if not pcall(function() require("expansions/script/c37900000.lua") end) then require("script/c37900000.lua") end
+if not pcall(function() dofile("expansions/script/c37900000.lua") end) then dofile("script/c37900000.lua") end
 local m,cm = rscf.DefineCard(37900029)
 function cm.initial_effect(c)
 	c:EnableReviveLimit()

expansions/script/c37900030.lua

 --护界神·提露密努斯·艾斯特
-if not pcall(function() require("expansions/script/c37900000.lua") end) then require("script/c37900000.lua") end
+if not pcall(function() dofile("expansions/script/c37900000.lua") end) then dofile("script/c37900000.lua") end
 local m,cm = rscf.DefineCard(37900030)
 function cm.initial_effect(c)
 	--xyz summon

expansions/script/c37900031.lua

 --歼魔圣剑·提露密努斯·艾斯特
-local cm,m,o=GetID()
+local m=37900031
+local cm=_G["c"..m]
 function cm.initial_effect(c)
 	aux.AddXyzProcedure(c,nil,7,3,cm.xyz,aux.Stringid(m,0))
 	c:EnableReviveLimit()