fix

expansions/script/c1009024.lua

@@ -27,6 +27,9 @@ function c1009024.initial_effect(c)
 	e3:SetOperation(c1009024.thop2)
 	c:RegisterEffect(e3)
 end
+function c1009024.thcon(e,tp,eg,ep,ev,re,r,rp)
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK)
+end
 function c1009024.thfilter(c)
 	return c:IsSetCard(0x520c) and c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToHand()
 end

expansions/script/c10969998.lua

--御魂术
+--御魂术
 function c10969998.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)

expansions/script/c12029034.lua

@@ -48,7 +48,7 @@ function cm.splimit(e,se,sp,st)
 end
 function cm.mfiter(c,mc)
 	local tp=mc:GetOwner()
-	return c:GetOwner()=1-tp and c:IsType(TYPE_MONSTER)
+	return c:GetOwner()==1-tp and c:IsType(TYPE_MONSTER)
 end
 function cm.cntg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

expansions/script/c12030021.lua

 --小黄
+if not pcall(function() require("expansions/script/c10199990") end) then require("script/c10199990") end
 local m=12030021
 local cm=_G["c"..m]
 cm.rssetcode="yatori"

expansions/script/c12030022.lua

 --小黄
+if not pcall(function() require("expansions/script/c10199990") end) then require("script/c10199990") end
 local m=12030022
 local cm=_G["c"..m]
 cm.rssetcode="yatori"

expansions/script/c12036020.lua

 --LINK2_Blue_Angel
-Duel.LoadScript("c12036000")
+require("expansions/script/c12036000")
 local m,cm=rscf.DefineCard(12036020,"BlueAngel")
 function cm.initial_effect(c)
 	c:EnableReviveLimit()

expansions/script/c12036021.lua

 --LINK3_Blue_Angel
-Duel.LoadScript("c12036000")
+require("expansions/script/c12036000")
 local m,cm=rscf.DefineCard(12036021,"BlueAngel")
 function cm.initial_effect(c)
 	c:EnableReviveLimit()

expansions/script/c12056006.lua

-Duel.LoadScript("c1200000.lua")
+Duel.LoadScript("c12000000.lua")
 --星之红茶 露点的猫
 local m=12056006
 local cm=_G["c"..m]

expansions/script/c16080031.lua

+--新津 铃绪奈
+local m=16080031
+local cm=_G["c"..m]
+xpcall(function() require("expansions/script/c81000000") end,function() require("script/c81000000") end)
+function cm.initial_effect(c)
+	--synchro summon
+	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x5ca),aux.NonTuner(Card.IsSetCard,0x5ca),1)
+	c:EnableReviveLimit()
+	--special summon
+	local e1=Effect.CreateEffect(c)
+	e1:SetDescription(aux.Stringid(m,0))
+	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
+	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
+	e1:SetCountLimit(1,m)
+	e1:SetCondition(cm.spcon)
+	e1:SetTarget(cm.sptg)
+	e1:SetOperation(cm.spop)
+	c:RegisterEffect(e1)
+	--inactivatable
+	local e4=Effect.CreateEffect(c)
+	e4:SetType(EFFECT_TYPE_FIELD)
+	e4:SetCode(EFFECT_CANNOT_INACTIVATE)
+	e4:SetRange(LOCATION_MZONE)
+	e4:SetValue(cm.effectfilter)
+	c:RegisterEffect(e4)
+	local e5=Effect.CreateEffect(c)
+	e5:SetType(EFFECT_TYPE_FIELD)
+	e5:SetCode(EFFECT_CANNOT_DISEFFECT)
+	e5:SetRange(LOCATION_MZONE)
+	e5:SetValue(cm.effectfilter)
+	c:RegisterEffect(e5)
+end
+function cm.effectfilter(e,ct)
+	local p=e:GetHandler():GetControler()
+	local te,tp,loc=Duel.GetChainInfo(ct,CHAININFO_TRIGGERING_EFFECT,CHAININFO_TRIGGERING_PLAYER,CHAININFO_TRIGGERING_LOCATION)
+	return p==tp and te:GetHandler():IsType(TYPE_SPELL+TYPE_TRAP) and bit.band(loc,LOCATION_ONFIELD)~=0
+end
+function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
+end
+function cm.filter(c,e,tp)
+	return c:IsSetCard(0x5ca) and c:IsLevelBelow(4) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+end
+function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
+		and Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_GRAVE,0,1,nil,e,tp) end
+	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_GRAVE)
+end
+function cm.spop(e,tp,eg,ep,ev,re,r,rp)
+	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
+	local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(cm.filter),tp,LOCATION_GRAVE,0,1,1,nil,e,tp)
+	if g:GetCount()>0 then
+		Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
+	end
+end

expansions/script/c18010006.lua

@@ -5,7 +5,7 @@ local cm=_G["c"..m]
 function cm.initial_effect(c)
 	rshr.Set(c)
 	c:EnableReviveLimit()
-	rscf.AddSynchroMixProcedure(c,aux.Tuner(Card.IsLevel,3),nil,nil,aux.Tuner(Card.IsLevel,3),1,1)
+	AddSynchroMixProcedure(c,aux.Tuner(Card.IsLevel,3),nil,nil,aux.Tuner(Card.IsLevel,3),1,1)
 	local e1=rsef.STO(c,EVENT_SPSUMMON_SUCCESS,{m,0},nil,"th","de,dsp",rscon.sumtype("syn"),nil,rsop.target({cm.thfilter,"th",LOCATION_GRAVE },{cm.thfilter,"th",0,LOCATION_GRAVE }),cm.op) 
 	local e2=rsef.FTO(c,EVENT_TO_GRAVE,{m,1},1,"se,th","de",LOCATION_MZONE,cm.thcon,nil,rsop.target(cm.thfilter2,"th",LOCATION_DECK),cm.thop)
 	local e3=rsef.QO(c,nil,{m,2},1,"sp",nil,LOCATION_MZONE,cm.syncon,nil,rsop.target(cm.synfilter,"sp",LOCATION_EXTRA),cm.synop)

expansions/script/c26803009.lua

 --夜下少女
-local m=26803008
+local m=26803009
 local cm=_G["c"..m]
 function cm.initial_effect(c)
 	c:EnableReviveLimit()

expansions/script/c33400426.lua

@@ -34,23 +34,23 @@ end
 function c33400426.lcheck(g)
 	return g:IsExists(Card.IsLinkSetCard,1,nil,0x9343) 
 end
-function c33400420.cccfilter1(c)
+function c33400426.cccfilter1(c)
 	return c:IsCode(33400428) and c:IsFaceup()
 end
-function c33400420.cccfilter2(c)
+function c33400426.cccfilter2(c)
 	return c:IsCode(33400425) and c:IsFaceup() and c:IsSummonType(SUMMON_TYPE_XYZ)
 end
-function c33400420.ccfilter(e,tp,eg,ep,ev,re,r,rp)
+function c33400426.ccfilter(e,tp,eg,ep,ev,re,r,rp)
 	return  Duel.IsExistingMatchingCard(Card.IsFaceup,tp,0,LOCATION_MZONE,1,nil) and 
-   (Duel.IsExistingMatchingCard(c33400420.cccfilter1,tp,LOCATION_ONFIELD,0,1,nil) or 
-	Duel.IsExistingMatchingCard(c33400420.cccfilter2,tp,LOCATION_MZONE,0,1,nil) 
+   (Duel.IsExistingMatchingCard(c33400426.cccfilter1,tp,LOCATION_ONFIELD,0,1,nil) or 
+	Duel.IsExistingMatchingCard(c33400426.cccfilter2,tp,LOCATION_MZONE,0,1,nil) 
 	)
 end
 function c33400426.thcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK) and not (not Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_MZONE,0,1,nil,0x341) and Duel.IsExistingMatchingCard(Card.IsSetCard,tp,0,LOCATION_MZONE,1,nil,0x341) or c33400420.ccfilter(e,tp,eg,ep,ev,re,r,rp))
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK) and not (not Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_MZONE,0,1,nil,0x341) and Duel.IsExistingMatchingCard(Card.IsSetCard,tp,0,LOCATION_MZONE,1,nil,0x341) or c33400426.ccfilter(e,tp,eg,ep,ev,re,r,rp))
 end
 function c33400426.thcon2(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK) and not Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_MZONE,0,1,nil,0x341) and Duel.IsExistingMatchingCard(Card.IsSetCard,tp,0,LOCATION_MZONE,1,nil,0x341) or  c33400420.ccfilter(e,tp,eg,ep,ev,re,r,rp)
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK) and not Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_MZONE,0,1,nil,0x341) and Duel.IsExistingMatchingCard(Card.IsSetCard,tp,0,LOCATION_MZONE,1,nil,0x341) or  c33400426.ccfilter(e,tp,eg,ep,ev,re,r,rp)
  
 end
 function c33400426.thfilter(c)
@@ -82,7 +82,7 @@ function c33400426.thop(e,tp,eg,ep,ev,re,r,rp)
 			 local g=Duel.SelectMatchingCard(tp,c33400426.thfilter2,tp,LOCATION_DECK,0,1,1,nil,tc:GetCode())
 			 if g:GetCount()>0 then
 				Duel.SendtoHand(g,tp,REASON_EFFECT)
-				Duel.ConfirmCards(1-tp,g)			
+				Duel.ConfirmCards(1-tp,g)		   
 			 end
 		end
 	end

expansions/script/c33500310.lua

 --薇奈特-融合
-function c33500310.initial_effect(c)
+local m=33500310
+local cm=_G["c"..m]
+function cm.initial_effect(c)
 	--f material
 	c:EnableReviveLimit()
 	aux.AddFusionProcFunRep(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0xa84),2,false)
@@ -8,24 +10,24 @@ function c33500310.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_CANNOT_INACTIVATE)
 	e1:SetRange(LOCATION_MZONE)
-	e1:SetValue(c33500310.efilter)
+	e1:SetValue(cm.efilter)
 	c:RegisterEffect(e1)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_CANNOT_DISEFFECT)
 	e2:SetRange(LOCATION_MZONE)
-	e2:SetValue(c33500310.efilter)
+	e2:SetValue(cm.efilter)
 	c:RegisterEffect(e2)
 	--2
  --   local e3=Effect.CreateEffect(c)
  --   e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
  --   e3:SetRange(LOCATION_MZONE)
  --   e3:SetCode(EVENT_CHAINING)
- --   e3:SetCountLimit(1,33500310)
+ --   e3:SetCountLimit(1,m)
  --   e3:SetProperty(EFFECT_FLAG_DELAY)
-  --  e3:SetCondition(c33500310.ncon)
-  --  e3:SetTarget(c33500310.ntg)
- --   e3:SetOperation(c33500310.nop)
+  --  e3:SetCondition(cm.ncon)
+  --  e3:SetTarget(cm.ntg)
+ --   e3:SetOperation(cm.nop)
  --   c:RegisterEffect(e3)
 	--tohand
 	local e5=Effect.CreateEffect(c)
@@ -41,26 +43,26 @@ function c33500310.initial_effect(c)
 	e5:SetOperation(cm.thop2)
 	c:RegisterEffect(e5)
 end
-function c33500310.efilter(e,ct)
+function cm.efilter(e,ct)
 	local player=e:GetHandler():GetControler()
 	local te,tp,loc=Duel.GetChainInfo(ct,CHAININFO_TRIGGERING_EFFECT,CHAININFO_TRIGGERING_PLAYER,CHAININFO_TRIGGERING_LOCATION)
 	return player==tp and te:GetHandler():IsSetCard(0xa84) and te:GetHandler():IsType(TYPE_MONSTER) and bit.band(loc,LOCATION_SZONE)~=0
 end
---function c33500310.ncon(e,tp,eg,ep,ev,re,r,rp)
+--function cm.ncon(e,tp,eg,ep,ev,re,r,rp)
  --   return rp==tp and re:IsHasType(EFFECT_TYPE_ACTIVATE) and re:GetHandler():IsCode(33500110)
 --end
---function c33500310.ntg(e,tp,eg,ep,ev,re,r,rp,chk)
+--function cm.ntg(e,tp,eg,ep,ev,re,r,rp,chk)
  --   if chk==0 then
- --	   return Duel.GetFieldGroupCount(tp,0,LOCATION_DECK)>0
+ --	return Duel.GetFieldGroupCount(tp,0,LOCATION_DECK)>0
   --  end
 --end
---function c33500310.nop(e,tp,eg,ep,ev,re,r,rp)
+--function cm.nop(e,tp,eg,ep,ev,re,r,rp)
  --   local c=e:GetHandler()
  --   if Duel.GetFieldGroupCount(tp,0,LOCATION_DECK)==0 then
---		return
+--	  return
  --   end
  --   Duel.ConfirmDecktop(1-tp,1)
---	local g=Duel.GetDecktopGroup(1-tp,1)
+--  local g=Duel.GetDecktopGroup(1-tp,1)
  --   local tc=g:GetFirst()
  --   local sel=nil
  --   if tc:IsType(TYPE_MONSTER) then sel=TYPE_MONSTER end
@@ -72,12 +74,12 @@ end
  --   e1:SetCode(EFFECT_CANNOT_ACTIVATE)
  --   e1:SetTargetRange(0,1)
  --   e1:SetLabel(sel)
- --   e1:SetValue(c33500310.aclimit)
---	e1:SetReset(RESET_PHASE+PHASE_END,2)
+ --   e1:SetValue(cm.aclimit)
+--  e1:SetReset(RESET_PHASE+PHASE_END,2)
  --   Duel.RegisterEffect(e1,tp)
 --end
---function c33500310.aclimit(e,re,tp)
---	local sel=e:GetLabel()
+--function cm.aclimit(e,re,tp)
+--  local sel=e:GetLabel()
  --   return re:IsActiveType(sel)
 --end
 --e5

expansions/script/c33700425.lua

@@ -4,7 +4,6 @@
 local s = c33700425
 local id = 33700425
 function s.initial_effect(c)
-	aux.AddEquipProcedure(c)
 	--0 atk
 	local e1 = Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_EQUIP)

expansions/script/c34511160.lua

@@ -15,14 +15,14 @@ function c34511160.initial_effect(c)
 	c:RegisterEffect(e2)
 ------------------------------   
 	local e3=Effect.CreateEffect(c)
-	e3:SetDescription(aux.Stringid(34511170,3))
+	e3:SetDescription(aux.Stringid(34511160,3))
 	e3:SetCategory(CATEGORY_TOHAND)
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e3:SetCode(EVENT_DESTROYED)
 	e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
 	e3:SetRange(LOCATION_MZONE)
-	e3:SetCountLimit(1,34511160)
-	e3:SetCondition(c34511170.spcon)
+	e3:SetCountLimit(1,34511170)
+	e3:SetCondition(c34511160.spcon)
 	e3:SetTarget(c34511160.ptg1)
 	e3:SetOperation(c34511160.pop1)
 	c:RegisterEffect(e3)

expansions/script/c40006827.lua

 --睿智之蓝 LV3-改4
 function c40006827.initial_effect(c)
+	c:EnableReviveLimitPendulumSummonable()
 	aux.EnablePendulumAttribute(c)
-	c:EnableUnsummonable()
-	aux.EnablePendulumAttribute(c,false) 
 	--spsummon from hand
 	local e1=Effect.CreateEffect(c)
 	e1:SetProperty(EFFECT_FLAG_UNCOPYABLE)

expansions/script/c40006884.lua

@@ -23,7 +23,7 @@ function c40006884.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY)
 	e2:SetCode(EVENT_TO_GRAVE)
-	e3:SetCountLimit(1,40006884)
+	e2:SetCountLimit(1,40006884)
 	e2:SetCondition(c40006884.thcon)
 	e2:SetTarget(c40006884.thtg)
 	e2:SetOperation(c40006884.thop)

expansions/script/c40008548.lua

@@ -44,14 +44,14 @@ function c40008548.initial_effect(c)
 	e6:SetType(EFFECT_TYPE_IGNITION)
 	e6:SetRange(LOCATION_MZONE)
 	e6:SetCountLimit(1)
-	e6:SetCondition(c40008460.spcon1)
+	e6:SetCondition(c40008548.spcon1)
 	e6:SetOperation(c40008548.spop)
 	c:RegisterEffect(e6) 
 	local e7=e6:Clone()
 	e7:SetType(EFFECT_TYPE_QUICK_O)
 	e7:SetCode(EVENT_FREE_CHAIN)
 	e7:SetHintTiming(0,TIMING_END_PHASE,TIMING_DRAW_PHASE)
-	e7:SetCondition(c40008460.spcon2)
+	e7:SetCondition(c40008548.spcon2)
 	c:RegisterEffect(e7)   
 end
 function c40008548.ffilter(c,fc,sub,mg,sg)

expansions/script/c40008561.lua

@@ -42,7 +42,7 @@ function c40008561.initial_effect(c)
 	e3:SetOperation(c40008561.tdop)
 	c:RegisterEffect(e3)	   
 end
-function c40008545.cost1(e,tp,eg,ep,ev,re,r,rp,chk)
+function c40008561.cost1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.CheckLPCost(tp,2000) end
 	Duel.PayLPCost(tp,2000)
 end

expansions/script/c62200000.lua

 baka=baka or {}
 local cm=baka
 baka.loaded_metatable_list={}
+function c62200000.initial_effect(c)
+	
+end
 function baka.load_metatable(code)
-    local m1=_G["c"..code]
-    if m1 then return m1 end
-    local m2=baka.loaded_metatable_list[code]
-    if m2 then return m2 end
-    _G["c"..code]={}
-    if pcall(function() dofile("expansions/script/c"..code..".lua") end) or pcall(function() dofile("script/c"..code..".lua") end) then
-        local mt=_G["c"..code]
-        _G["c"..code]=nil
-        if mt then
-            baka.loaded_metatable_list[code]=mt
-            return mt
-        end
-    else
-        _G["c"..code]=nil
-    end
+	local m1=_G["c"..code]
+	if m1 then return m1 end
+	local m2=baka.loaded_metatable_list[code]
+	if m2 then return m2 end
+	_G["c"..code]={}
+	if pcall(function() dofile("expansions/script/c"..code..".lua") end) or pcall(function() dofile("script/c"..code..".lua") end) then
+		local mt=_G["c"..code]
+		_G["c"..code]=nil
+		if mt then
+			baka.loaded_metatable_list[code]=mt
+			return mt
+		end
+	else
+		_G["c"..code]=nil
+	end
 end
 function baka.check_set(c,setcode,v,f,...) 
-    local codet=nil
-    if type(c)=="number" then
-        codet={c}
-    elseif type(c)=="table" then
-        codet=c
-    elseif type(c)=="userdata" then
-        local f=f or Card.GetCode
-        codet={f(c)}
-    end
-    local ncodet={...}
-    for i,code in pairs(codet) do
-        for i,ncode in pairs(ncodet) do
-            if code==ncode then return true end
-        end
-        local mt=baka.load_metatable(code)
-        if mt and mt["named_with_"..setcode] and (not v or mt["named_with_"..setcode]==v) then return true end
-    end
-    return false
+	local codet=nil
+	if type(c)=="number" then
+		codet={c}
+	elseif type(c)=="table" then
+		codet=c
+	elseif type(c)=="userdata" then
+		local f=f or Card.GetCode
+		codet={f(c)}
+	end
+	local ncodet={...}
+	for i,code in pairs(codet) do
+		for i,ncode in pairs(ncodet) do
+			if code==ncode then return true end
+		end
+		local mt=baka.load_metatable(code)
+		if mt and mt["named_with_"..setcode] and (not v or mt["named_with_"..setcode]==v) then return true end
+	end
+	return false
 end
 --fool
 function baka.check_set_FragileArticles(c)
-    return baka.check_set(c,"FragileArticles")--玻 离 之 物
+	return baka.check_set(c,"FragileArticles")--玻 离 之 物
 end
 function baka.check_set_FragileLyric(c)
-    return baka.check_set(c,"FragileLyric")--玻 离 乐 章
+	return baka.check_set(c,"FragileLyric")--玻 离 乐 章
 end
 --lover
 function baka.check_set_AzayakaSin(c)
-    return baka.check_set(c,"AzakayaSin")--华 欲
+	return baka.check_set(c,"AzakayaSin")--华 欲
 end
 --magician
 function baka.check_set_MechanicalCrafter(c)
-    return baka.check_set(c,"MechanicalCrafter")--机 匠 工 造
+	return baka.check_set(c,"MechanicalCrafter")--机 匠 工 造
 end
 --judgement
 function baka.check_set_ApocryphaSavior(c)
-    return baka.check_set(c,"ApocryphaSavior")--外 典 救 世 主
+	return baka.check_set(c,"ApocryphaSavior")--外 典 救 世 主
 end
 --
 function baka.check_set_PregnantSwordHime(c)
-    return baka.check_set(c,"PregnantSwordHime")--孕 剑 姬
+	return baka.check_set(c,"PregnantSwordHime")--孕 剑 姬
 end
 --
 function baka.check_set_BugOfBug(c)
-    return baka.check_set(c,"BugOfBug")--残 思 乐 源
+	return baka.check_set(c,"BugOfBug")--残 思 乐 源
 end
 --
 function baka.check_set_AnoKare(c)
-    return baka.check_set(c,"AnoKare")--残 思 乐 源
+	return baka.check_set(c,"AnoKare")--残 思 乐 源
 end
\ No newline at end of file

expansions/script/c65050166.lua

@@ -2,7 +2,7 @@
 function c65050166.initial_effect(c)
 	--fusion material
 	c:EnableReviveLimit()
-	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0x6da8),c65050164.ffilter,true)
+	aux.AddFusionProcFun2(c,aux.FilterBoolFunction(Card.IsFusionSetCard,0x6da8),c65050166.ffilter,true)
 	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(65050166,0))
@@ -52,7 +52,7 @@ function c65050166.activate2(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 
-function c65050164.ffilter(c)
+function c65050166.ffilter(c)
 	return c:IsFusionSetCard(0x6da8) and c:IsAttackAbove(2000)
 end
 function c65050166.disfilter(c)

expansions/script/c65050222.lua

@@ -32,10 +32,10 @@ function c65050222.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 	e3:SetCode(EVENT_LEVEL_UP)
 	e3:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE)
-	e3:SetOperation(c65050221.raop)
+	e3:SetOperation(c65050222.raop)
 	c:RegisterEffect(e3)
 end
-function c65050221.raop(e,tp,eg,ep,ev,re,r,rp)
+function c65050222.raop(e,tp,eg,ep,ev,re,r,rp)
 	if e:GetHandler():IsLocation(LOCATION_MZONE) then
 	Duel.RaiseEvent(e:GetHandler(),EVENT_CUSTOM+65050216,e,0,tp,0,0)
 	end

expansions/script/c65060025.lua

@@ -61,6 +61,10 @@ function c65060025.damop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.ConfirmCards(1-tp,g)
 	end
 end
+function c65060025.spcon(e,tp,eg,ep,ev,re,r,rp)
+	local ph=Duel.GetCurrentPhase()
+	return ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE 
+end
 function c65060025.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if chk==0 then return c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_ATTACK) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 end

expansions/script/c77757301.lua

@@ -2,7 +2,7 @@ local m=77757301
 local cm=_G["c"..m]
 Duel.LoadScript("c37564765.lua")
 function cm.initial_effect(c)
-	local e1=EFfect.CreateEffect(c)
+	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)

expansions/script/c81011018.lua

@@ -5,9 +5,9 @@ function c81011018.initial_effect(c)
 	--token
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOKEN)
-	e0:SetType(EFFECT_TYPE_QUICK_O)
-	e0:SetCode(EVENT_FREE_CHAIN)
-	e0:SetHintTiming(0,TIMING_END_PHASE)
+	e1:SetType(EFFECT_TYPE_QUICK_O)
+	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetHintTiming(0,TIMING_END_PHASE)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCountLimit(1,81011018)
 	e1:SetCost(c81011018.spcost)