fix dragonlady

expansions/script/c47500000.lua

 --姬塔
-local m=47500000
-local cm=_G["c"..m]
 function c47500000.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     --pendulum summon
     aux.EnablePendulumAttribute(c)
     --splimit
@@ -24,7 +23,6 @@ function c47500000.initial_effect(c)
     e2:SetOperation(c47500000.penop)
     c:RegisterEffect(e2)  
 end
-c47500000.card_code_list={47500000}
 function c47500000.pefilter(c)
     return (aux.IsCodeListed(c,47500000) or c:IsCode(47500000)) or c:IsSetCard(0x5d0)
 end

expansions/script/c47500001.lua

 --炼金术师 姬塔
-local m=47500001
-local cm=_G["c"..m]
 function c47500001.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     --pendulum summon
     aux.EnablePendulumAttribute(c)
     --pendulum set
@@ -44,7 +43,6 @@ function c47500001.initial_effect(c)
     e4:SetValue(47500000)
     c:RegisterEffect(e4)
 end
-c47500001.card_code_list={47500000}
 function c47500001.thfilter(c)
     return c:IsAbleToHand()
 end

expansions/script/c47500003.lua

 --枪神 姬塔
-local m=47500003
-local c47500003=_G["c"..m]
 function c47500003.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     --pendulum summon
     aux.EnablePendulumAttribute(c) 
     --effect gian
@@ -49,7 +48,6 @@ function c47500003.initial_effect(c)
     e5:SetValue(47500000)
     c:RegisterEffect(e5)
 end
-c47500003.card_code_list={47500000}
 function c47500003.atkval(e,c)
     return c:GetEquipCount()-1
 end

expansions/script/c47500005.lua

 --武士 姬塔
 function c47500005.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     --pendulum summon
     aux.EnablePendulumAttribute(c)
     --Double Attack
@@ -58,7 +59,6 @@ function c47500005.initial_effect(c)
     e6:SetOperation(c47500005.spop)
     c:RegisterEffect(e6)
 end
-c47500005.card_code_list={47500000}
 function c47500005.cfilter(c)
     return (aux.IsCodeListed(c,47500000) or c:IsCode(47500000)) and c:IsAbleToGraveAsCost()
 end

expansions/script/c47500007.lua

 --暗杀者 姬塔
 function c47500007.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     --pendulum summon
     aux.EnablePendulumAttribute(c)
     --destroy and spsummon
@@ -41,7 +42,6 @@ function c47500007.initial_effect(c)
     e5:SetValue(47500000)
     c:RegisterEffect(e5)
 end
-c47500007.card_code_list={47500000}
 function c47500007.efffilter(c,e,tp,eg,ep,ev,re,r,rp)
     local m=_G["c"..c:GetCode()]
     local te=m.act_effect

expansions/script/c47500009.lua

 --舞者 姬塔
 function c47500009.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     --pendulum summon
     aux.EnablePendulumAttribute(c)
     --twin act
@@ -35,7 +36,6 @@ function c47500009.initial_effect(c)
     e5:SetValue(47500000)
     c:RegisterEffect(e5)
 end
-c47500009.card_code_list={47500000}
 function c47500009.dbfilter(c)
     return c:IsFaceup() and c:IsCode(47500000)
 end

expansions/script/c47500011.lua

 --机械师 姬塔
 function c47500011.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     --pendulum summon
     aux.EnablePendulumAttribute(c)  
     --pendulum produce
@@ -49,7 +50,6 @@ function c47500011.initial_effect(c)
     e5:SetTarget(c47500011.splimit)
     c:RegisterEffect(e5)  
 end
-c47500011.card_code_list={47500000}
 function c47500011.splimit(e,c,tp,sumtp,sumpos)
     return not c:IsType(TYPE_PENDULUM)
 end

expansions/script/c47500013.lua

 --贤者 姬塔
 function c47500013.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     --pendulum summon
     aux.EnablePendulumAttribute(c,false)
     --Activate
@@ -80,7 +81,6 @@ c47500013.list={
         CATEGORY_LVCHANGE,
         CATEGORY_NEGATE,
 }
-c47500013.card_code_list={47500000}
 function c47500013.filter(c)
     return c:IsCode(47500015) and c:IsAbleToHand()
 end

expansions/script/c47500015.lua

 --黑猫道士 姬塔
 function c47500015.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     c:EnableCounterPermit(0x1)
     c:EnableReviveLimit()
     --pendulum summon
@@ -60,7 +61,6 @@ function c47500015.initial_effect(c)
     e6:SetOperation(c47500015.spop)
     c:RegisterEffect(e6)
 end
-c47500015.card_code_list={47500000}
 function c47500015.mfilter(c)
     return c:IsCode(47500000) and c:IsFaceup()
 end

expansions/script/c47500017.lua

 --一般店员 姬塔
 function c47500017.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     --link summon
     c:EnableReviveLimit()
     aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsCode,47500000),2,2)
@@ -29,7 +30,6 @@ function c47500017.initial_effect(c)
     e2:SetOperation(c47500017.drop)
     c:RegisterEffect(e2) 
 end
-c47500017.card_code_list={47500000}
 function c47500017.drcfilter(c,tp)
     return c:IsPreviousLocation(LOCATION_PZONE) and c:GetPreviousControler()==tp
 end

expansions/script/c47500019.lua

 --姬塔 Re:Link
 function c47500019.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     --link summon
     c:EnableReviveLimit()
     aux.AddLinkProcedure(c,c47500019.lfilter,2,2)
@@ -47,7 +48,6 @@ function c47500019.initial_effect(c)
     e5:SetValue(47500000)
     c:RegisterEffect(e5)
 end
-c47500019.card_code_list={47500000}
 function c47500019.lfilter(c)
     return c:GetOriginalCode()==47500000
 end

expansions/script/c47500021.lua

 --调查兵团 姬塔
 function c47500021.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     --link summon
     c:EnableReviveLimit()
     aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsType,TYPE_MONSTER),2,3,c47500021.lcheck)   
@@ -29,7 +30,6 @@ function c47500021.initial_effect(c)
     e2:SetOperation(c47500021.thop)
     c:RegisterEffect(e2)
 end
-c47500021.card_code_list={47500000}
 function c47500021.lfilter(c)
     return c:IsCode(47500000)
 end

expansions/script/c47500023.lua

 --红莲之王 姬塔
 function c47500023.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     --link summon
     c:EnableReviveLimit()
     aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsType,TYPE_EFFECT),3,4,c47500023.lcheck)   
@@ -36,7 +37,6 @@ function c47500023.initial_effect(c)
     e4:SetCode(EVENT_BE_BATTLE_TARGET)
     c:RegisterEffect(e4)
 end
-c47500023.card_code_list={47500000}
 function c47500023.lfilter(c)
     return c:IsAttribute(ATTRIBUTE_DARK) and c:IsCode(47500000)
 end

expansions/script/c47500025.lua

 --苍之命运
 function c47500025.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     --Activate
     local e1=Effect.CreateEffect(c)
     e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
@@ -12,7 +13,6 @@ function c47500025.initial_effect(c)
     c:RegisterEffect(e1)    
     c47500025.act_effect=e1
 end
-c47500025.card_code_list={47500000}
 function c47500025.condition(e,tp,eg,ep,ev,re,r,rp)
     return Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)==1
 end

expansions/script/c47500028.lua

 --晓之空
 function c47500028.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     --Activate
     local e1=Effect.CreateEffect(c)
     e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
@@ -10,7 +11,6 @@ function c47500028.initial_effect(c)
     e1:SetOperation(c47500028.activate)
     c:RegisterEffect(e1)    
 end
-c47500028.card_code_list={47500000}
 function c47500028.filter1(c,e,tp)
     local rk=c:GetRank()
     return rk>1 and c:IsFaceup() and c:IsType(TYPE_PENDULUM) and (aux.IsCodeListed(c,47500000) or c:IsSetCard(0x5d0)) and Duel.IsExistingMatchingCard(c47500028.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,c,rk,c:GetRace()) and Duel.GetLocationCountFromEx(tp,tp,c)>0 and aux.MustMaterialCheck(c,tp,EFFECT_MUST_BE_XMATERIAL)

expansions/script/c47500030.lua

 --空域图
 function c47500030.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     --Activate
     local e0=Effect.CreateEffect(c)
     e0:SetType(EFFECT_TYPE_ACTIVATE)
@@ -30,7 +31,6 @@ function c47500030.initial_effect(c)
     e5:SetValue(c47500030.effectfilter)
     c:RegisterEffect(e5)
 end
-c47500030.card_code_list={47500000}
 function c47500030.costfilter(c)
     return aux.IsCodeListed(c,47500000) and c:IsReleasable() and c:IsType(TYPE_PENDULUM)
 end

expansions/script/c47500031.lua

 --机炎复苏
 function c47500031.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     --act in hand
     local e0=Effect.CreateEffect(c)
     e0:SetType(EFFECT_TYPE_SINGLE)
@@ -28,7 +29,6 @@ function c47500031.initial_effect(c)
     e2:SetOperation(c47500031.spop)
     c:RegisterEffect(e2) 
 end
-c47500031.card_code_list={47500000}
 function c47500031.handcon(e,tp,eg,ep,ev,re,r,rp)
     return Duel.GetTurnPlayer()==tp
 end

expansions/script/c47500101.lua

 --拳皇 姬塔
 function c47500101.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     --synchro summon
     aux.AddSynchroMixProcedure(c,aux.Tuner(nil),aux.Tuner(nil),nil,aux.FilterBoolFunction(Card.IsCode,47500000),1,1)
     c:EnableReviveLimit() 
@@ -61,7 +62,6 @@ function c47500101.initial_effect(c)
     e8:SetOperation(c47500101.fop2)
     c:RegisterEffect(e8)
 end
-c47500101.card_code_list={47500000}
 function c47500101.pefilter(c)
     return c:IsRace(RACE_WARRIOR) or c:IsRace(RACE_SPELLCASTER) and c:IsLevel(8)
 end

expansions/script/c47500103.lua

 --斯巴达 姬塔
 function c47500103.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     aux.EnablePendulumAttribute(c,false)
     --fusion material
     c:EnableReviveLimit()
@@ -56,7 +57,6 @@ function c47500103.initial_effect(c)
     e8:SetOperation(c47500103.disop2)
     c:RegisterEffect(e8) 
 end
-c47500103.card_code_list={47500000}
 function c47500103.pefilter(c)
     return c:IsRace(RACE_WARRIOR) or c:IsRace(RACE_SPELLCASTER)
 end

expansions/script/c47500104.lua

 --大魔导师 姬塔
 function c47500104.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     --material
     c:EnableReviveLimit() 
     aux.AddXyzProcedure(c,aux.FilterBoolFunction(Card.IsType,TYPE_PENDULUM),8,2)
@@ -53,7 +54,6 @@ function c47500104.initial_effect(c)
     c:RegisterEffect(e6)
 end
 c47500104.pendulum_level=8
-c47500104.card_code_list={47500000}
 function c47500104.mfilter(c,xyzc)
     return c:IsLevel(8) and c:IsRace(RACE_SPELLCASTER)
 end

expansions/script/c47501002.lua

 --狂战士 姬塔
 function c47501002.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     --material
     c:EnableReviveLimit() 
     aux.AddXyzProcedure(c,aux.FilterBoolFunction(Card.IsRace,RACE_WARRIOR),8,2)
@@ -64,7 +65,6 @@ function c47501002.initial_effect(c)
     c:RegisterEffect(e6)
 end
 c47501002.pendulum_level=8
-c47501002.card_code_list={47500000}
 function c47501002.mfilter(c,xyzc)
     return c:IsLevel(8) and c:IsRace(RACE_WARRIOR)
 end

expansions/script/c47501005.lua

 --混沌领主 姬塔
 function c47501005.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     --material
     c:EnableReviveLimit() 
     aux.AddXyzProcedure(c,aux.FilterBoolFunction(Card.IsCode,47500000),8,2)
@@ -62,7 +63,6 @@ function c47501005.initial_effect(c)
     c:RegisterEffect(e7)
 end
 c47501005.pendulum_level=8
-c47501005.card_code_list={47500000}
 function c47501005.mfilter(c)
     return c:IsLevel(8)
 end

expansions/script/c47501006.lua

 --圣者 姬塔
 function c47501006.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     --synchro summon
     aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsSynchroType,TYPE_SYNCHRO),aux.FilterBoolFunction(Card.IsCode,47500000),1,1)
     c:EnableReviveLimit()    
@@ -42,7 +43,6 @@ function c47501006.initial_effect(c)
     e5:SetOperation(c47501006.spop)
     c:RegisterEffect(e5)
 end
-c47501006.card_code_list={47500000}
 function c47501006.pefilter(c)
     return c:IsRace(RACE_WARRIOR) or c:IsRace(RACE_SPELLCASTER)
 end

expansions/script/c47501007.lua

 --猎犬 姬塔
 function c47501007.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     aux.EnablePendulumAttribute(c,false)
     --fusion material
     c:EnableReviveLimit()
@@ -65,7 +66,6 @@ function c47501007.initial_effect(c)
     e6:SetOperation(c47501007.sop)
     c:RegisterEffect(e6)
 end
-c47501007.card_code_list={47500000}
 function c47501007.pefilter(c)
     return c:IsRace(RACE_WARRIOR) or c:IsRace(RACE_SPELLCASTER)
 end

expansions/script/c47501008.lua

 --极乐净土 姬塔
 function c47501008.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     --pendulum summon
     aux.EnablePendulumAttribute(c)
     --fusion material

expansions/script/c47501009.lua

 --义贼 姬塔
 function c47501009.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     --material
     c:EnableReviveLimit() 
     aux.AddXyzProcedureLevelFree(c,c47501009.mfilter,c47501009.xyzcheck,2,2)
@@ -53,7 +54,6 @@ function c47501009.initial_effect(c)
     c:RegisterEffect(e5) 
 end
 c47501009.pendulum_level=8
-c47501009.card_code_list={47500000}
 function c47501009.mfilter(c)
     return c:IsLevel(8)
 end

expansions/script/c47501010.lua

 --天女 姬塔
 function c47501010.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     --synchro summon
     aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsCode,47500000),aux.FilterBoolFunction(Card.IsType,TYPE_SYNCHRO),1,1)
     c:EnableReviveLimit()    
@@ -72,7 +73,6 @@ function c47501010.initial_effect(c)
     e8:SetTargetRange(LOCATION_MZONE,0)
     c:RegisterEffect(e8)
 end
-c47501010.card_code_list={47500000}
 function c47501010.pefilter(c)
     return c:IsRace(RACE_WARRIOR) or c:IsRace(RACE_SPELLCASTER)
 end

expansions/script/c47501011.lua

 --剑豪 姬塔
 function c47501011.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     aux.EnablePendulumAttribute(c,false)
     --fusion material
     c:EnableReviveLimit()
@@ -49,7 +50,6 @@ function c47501011.initial_effect(c)
     e4:SetValue(2)
     c:RegisterEffect(e4)
 end
-c47501011.card_code_list={47500000}
 function c47501011.pefilter(c)
     return c:IsRace(RACE_WARRIOR) or c:IsRace(RACE_SPELLCASTER)
 end

expansions/script/c47510007.lua

@@ -55,11 +55,10 @@ function c47510007.psplimit(e,c,tp,sumtp,sumpos)
     return not c47510007.pefilter(c) and bit.band(sumtp,SUMMON_TYPE_PENDULUM)==SUMMON_TYPE_PENDULUM
 end
 function c47510007.spfilter(c,e,tp)
-    return (c:IsSetCard(0x5da) or c:IsSetCard(0x5de)) and not c:IsType(TYPE_LINK) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE)
+    return (c:IsSetCard(0x5da) or c:IsSetCard(0x5de)) and not c:IsType(TYPE_LINK) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0
 end
 function c47510007.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
-    if chk==0 then return Duel.GetLocationCountFromEx(tp,tp,e:GetHandler())>0
-        and Duel.IsExistingMatchingCard(c47510007.spfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp) end
+    if chk==0 then return Duel.IsExistingMatchingCard(c47510007.spfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp) end
     Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
 end
 function c47510007.spop(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c47510245.lua

@@ -118,7 +118,7 @@ end
 function c47510245.filter2(c,e,tp,mc,rk,rc,code)
     if c:GetOriginalCode()==6165656 and code~=48995978 then return false end
     return c:IsRank(rk) and c:IsRace(rc) and mc:IsCanBeXyzMaterial(c)
-        and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false)
+        and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0
 end
 function c47510245.xtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
     if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_MZONE) and c47510245.filter1(chkc,e,tp) end
@@ -130,7 +130,7 @@ end
 function c47510245.xop(e,tp,eg,ep,ev,re,r,rp)
     local c=e:GetHandler()
     local tc=Duel.GetFirstTarget()
-    if Duel.GetLocationCountFromEx(tp,tp,tc)<=0 or not aux.MustMaterialCheck(tc,tp,EFFECT_MUST_BE_XMATERIAL) then return end
+    if not aux.MustMaterialCheck(tc,tp,EFFECT_MUST_BE_XMATERIAL) then return end
     if tc:IsFacedown() or not tc:IsRelateToEffect(e) or tc:IsControler(1-tp) or tc:IsImmuneToEffect(e) then return end
     Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
     local g=Duel.SelectMatchingCard(tp,c47510245.filter2,tp,LOCATION_EXTRA,0,1,1,nil,e,tp,tc,tc:GetRank()+1,tc:GetRace(),tc:GetCode())

expansions/script/c47520013.lua

@@ -153,13 +153,13 @@ function c47520013.filter(c,e,tp)
     return c:IsCode(47520015) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_SYNCHRO,tp,false,false)
 end
 function c47520013.awtg(e,tp,eg,ep,ev,re,r,rp,chk)
-    if chk==0 then return Duel.GetLocationCountFromEx(tp)>0
+    if chk==0 then return Duel.GetLocationCountFromEx(tp,tp,nil,TYPE_SYNCHRO)>0
         and aux.MustMaterialCheck(nil,tp,EFFECT_MUST_BE_SMATERIAL)
         and Duel.IsExistingMatchingCard(c47520013.filter,tp,LOCATION_EXTRA,0,1,nil,e,tp) end
     Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
 end
 function c47520013.awop(e,tp,eg,ep,ev,re,r,rp)
-    if Duel.GetLocationCountFromEx(tp)<=0 or not aux.MustMaterialCheck(nil,tp,EFFECT_MUST_BE_SMATERIAL) then return end
+    if Duel.GetLocationCountFromEx(tp,tp,nil,TYPE_SYNCHRO)<1 or not aux.MustMaterialCheck(nil,tp,EFFECT_MUST_BE_SMATERIAL) then return end
     Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
     local g=Duel.SelectMatchingCard(tp,c47520013.filter,tp,LOCATION_EXTRA,0,1,1,nil,e,tp)
     local tc=g:GetFirst()

expansions/script/c47530004.lua

@@ -68,7 +68,7 @@ function c47530004.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c47530004.spop(e,tp,eg,ep,ev,re,r,rp)
     local zone=aux.GetMultiLinkedZone(tp)
-    if Duel.GetLocationCountFromEx(tp)<=0 or zone==0 then return end
+    if zone==0 then return end
     Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
     local g=Duel.SelectMatchingCard(tp,c47530004.spfilter,tp,LOCATION_EXTRA,0,1,1,nil,e,tp,zone)
     if g:GetCount()>0 then

expansions/script/c47530015.lua

@@ -59,11 +59,10 @@ function c47530015.spcon(e,tp,eg,ep,ev,re,r,rp)
     return c:IsPreviousLocation(LOCATION_MZONE) and c:IsSummonType(SUMMON_TYPE_XYZ)
 end
 function c47530015.spfilter2(c,e,tp)
-    return c:IsSetCard(0x5d5) and not c:IsType(TYPE_LINK) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+    return c:IsSetCard(0x5d5) and not c:IsType(TYPE_LINK) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0
 end
 function c47530015.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
-    if chk==0 then return Duel.GetLocationCountFromEx(tp)>0
-        and Duel.IsExistingMatchingCard(c47530015.spfilter2,tp,LOCATION_EXTRA,0,1,nil,e,tp) end
+    if chk==0 then return Duel.IsExistingMatchingCard(c47530015.spfilter2,tp,LOCATION_EXTRA,0,1,nil,e,tp) end
     Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
 end
 function c47530015.spop(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c47530100.lua

@@ -97,12 +97,12 @@ function c47530100.spfilter(c,e,tp)
     return c:IsRace(RACE_MACHINE) and c:IsAttribute(ATTRIBUTE_LIGHT) and c:IsLink(3) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c47530100.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
-    if chk==0 then return Duel.GetLocationCountFromEx(tp)>0
+    if chk==0 then return Duel.GetLocationCountFromEx(tp,tp,nil,TYPE_LINK)>0
         and Duel.IsExistingMatchingCard(c47530100.spfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp) end
     Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
 end
 function c47530100.spop(e,tp,eg,ep,ev,re,r,rp)
-    if Duel.GetLocationCountFromEx(tp)<=0 then return end
+    if Duel.GetLocationCountFromEx(tp,tp,nil,TYPE_LINK)<=0 then return end
     Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
     local g=Duel.SelectMatchingCard(tp,c47530100.spfilter,tp,LOCATION_EXTRA,0,1,1,nil,e,tp)
     if g:GetCount()>0 then

expansions/script/c47550008.lua

 --苍空剑士 丽莎
 function c47550008.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     --pendulum summon
     aux.EnablePendulumAttribute(c)
     --splimit
@@ -43,7 +44,6 @@ function c47550008.initial_effect(c)
     e4:SetOperation(c47550008.pspop)
     c:RegisterEffect(e4)   
 end
-c47550008.card_code_list={47500000}
 function c47550008.pefilter(c)
     return c:IsRace(RACE_WARRIOR) or c:IsSetCard(0x5da) or c:IsAttribute(ATTRIBUTE_WIND) or c:IsRace(RACE_SPELLCASTER)
 end

expansions/script/c47551124.lua

 --蝴蝶幻刃
 function c47551124.initial_effect(c)
+    aux.AddCodeList(c,47500000)
     --Activate
     local e1=Effect.CreateEffect(c)
     e1:SetCategory(CATEGORY_REMOVE+CATEGORY_DISABLE+CATEGORY_DAMAGE)
@@ -27,7 +28,6 @@ function c47551124.initial_effect(c)
     e3:SetCondition(c47551124.handcon)
     c:RegisterEffect(e3)
 end
-c47551124.card_code_list={47500000}
 function c47551124.filter(c)
     return c:IsType(TYPE_XYZ) and c:IsSetCard(0x5d0)
 end

expansions/script/c47570400.lua

@@ -211,12 +211,11 @@ function c47570400.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
     Duel.Release(e:GetHandler(),REASON_COST)
 end
 function c47570400.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
-    if chk==0 then return Duel.IsExistingMatchingCard(c47570400.spfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 end
+    if chk==0 then return Duel.IsExistingMatchingCard(c47570400.spfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp) and Duel.GetLocationCountFromEx(tp,tp,nil,TYPE_FUSION)>0 end
     Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
 end
 function c47570400.spop(e,tp,eg,ep,ev,re,r,rp)
-    local ft=Duel.GetLocationCountFromEx(tp)
-    if ft<=0 or not aux.MustMaterialCheck(nil,tp,EFFECT_MUST_BE_SMATERIAL) then return end
+    if Duel.GetLocationCountFromEx(tp,tp,nil,TYPE_FUSION)<=0 or not aux.MustMaterialCheck(nil,tp,EFFECT_MUST_BE_SMATERIAL) then return end
     if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
     Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
     local g=Duel.SelectMatchingCard(tp,c47570400.spfilter,tp,LOCATION_EXTRA,0,1,1,nil,e,tp)

expansions/script/c47579908.lua

@@ -105,7 +105,7 @@ function c47579908.filter(c,e,tp)
     return c:IsCode(47551000) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c47579908.pentg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetLocationCountFromEx(tp)>0
+    if chk==0 then return Duel.GetLocationCountFromEx(tp,tp,nil,TYPE_LINK)>0
         and Duel.IsExistingMatchingCard(c47579908.filter,tp,LOCATION_EXTRA,0,1,nil,e,tp) and Duel.CheckLocation(tp,LOCATION_PZONE,0) or Duel.CheckLocation(tp,LOCATION_PZONE,1) end
     Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
 end
@@ -113,7 +113,7 @@ function c47579908.penop(e,tp,eg,ep,ev,re,r,rp)
     if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return false end
     local c=e:GetHandler()
     if c:IsRelateToEffect(e) and Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true) then
-	if Duel.GetLocationCountFromEx(tp)<=0 then return end
+    if Duel.GetLocationCountFromEx(tp,tp,nil,TYPE_LINK)<=0 then return end
         local tg=Duel.GetFirstMatchingCard(c47579908.filter,tp,LOCATION_EXTRA,0,nil,e,tp)
         if tg then
             Duel.SpecialSummon(tg,0,tp,tp,false,false,POS_FACEUP)

expansions/script/c47590008.lua

@@ -174,7 +174,7 @@ function c47590008.filter(c,e,tp)
     return c:IsCode(47578913) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c47590008.pentg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetLocationCountFromEx(tp)>0
+    if chk==0 then return Duel.GetLocationCountFromEx(tp,tp,nil,TYPE_SYNCHRO)>0
         and Duel.IsExistingMatchingCard(c47590008.filter,tp,LOCATION_EXTRA,0,1,nil,e,tp) and Duel.CheckLocation(tp,LOCATION_PZONE,0) or Duel.CheckLocation(tp,LOCATION_PZONE,1) end
     Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
 end
@@ -182,7 +182,7 @@ function c47590008.penop(e,tp,eg,ep,ev,re,r,rp)
     if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return false end
     local c=e:GetHandler()
     if c:IsRelateToEffect(e) and Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true) then
-	if Duel.GetLocationCountFromEx(tp)<=0 then return end
+    if Duel.GetLocationCountFromEx(tp,tp,nil,TYPE_SYNCHRO)<=0 then return end
         local tg=Duel.GetFirstMatchingCard(c47590008.filter,tp,LOCATION_EXTRA,0,nil,e,tp)
         if tg then
             Duel.SpecialSummon(tg,0,tp,tp,false,false,POS_FACEUP)

expansions/script/c47591392.lua

@@ -14,7 +14,7 @@ function c47591392.filter(c,e,tp)
     return ((c:IsAttribute(ATTRIBUTE_FIRE) and c:IsRace(RACE_WARRIOR) and c:IsLevel(5)) or (c:IsAttribute(ATTRIBUTE_WATER) and c:IsRace(RACE_PSYCHO) and c:IsLevel(3)) or (c:IsAttribute(ATTRIBUTE_WIND) and c:IsRace(RACE_SPELLCASTER) and c:IsLevel(4))) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c47591392.target(e,tp,eg,ep,ev,re,r,rp,chk)
-    if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.GetLocationCountFromEx(tp)>0 and Duel.IsExistingMatchingCard(c47591392.filter,tp,LOCATION_DECK,0,1,nil,e,tp) end
+    if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.GetLocationCountFromEx(tp,tp,nil,TYPE_XYZ)>0 and Duel.IsExistingMatchingCard(c47591392.filter,tp,LOCATION_DECK,0,1,nil,e,tp) end
     Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK+LOCATION_EXTRA)
 end
 function c47591392.spfilter2(c,e,tp,mc)
@@ -22,7 +22,7 @@ function c47591392.spfilter2(c,e,tp,mc)
 end
 function c47591392.activate(e,tp,eg,ep,ev,re,r,rp)
     local c=e:GetHandler()
-    if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 or Duel.GetLocationCountFromEx(tp)<1 then return end
+    if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 or Duel.GetLocationCountFromEx(tp,tp,nil,TYPE_XYZ)<1 then return end
     Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
     local g=Duel.SelectMatchingCard(tp,c47591392.filter,tp,LOCATION_DECK,0,1,1,nil,e,tp)
     local tc=g:GetFirst()

expansions/script/c47598773.lua

@@ -125,13 +125,13 @@ function c47598773.spfilter(c,e,tp)
         and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c47598773.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
-    if chk==0 then return Duel.GetLocationCountFromEx(tp)>0
+    if chk==0 then return Duel.GetLocationCountFromEx(tp,tp,nil,TYPE_XYZ)>0
         and Duel.IsExistingMatchingCard(c47598773.spfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp) end
     Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
 end
 function c47598773.spop(e,tp,eg,ep,ev,re,r,rp)
     if not e:GetHandler():IsRelateToEffect(e) then return end
-    if Duel.GetLocationCountFromEx(tp)<1 then return end
+    if Duel.GetLocationCountFromEx(tp,tp,nil,TYPE_XYZ)<1 then return end
     Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
     local g=Duel.SelectMatchingCard(tp,c47598773.spfilter,tp,LOCATION_EXTRA,0,1,1,nil,e,tp)
     if g:GetCount()>0 then