fix

expansions/lflist.conf

@@ -1796,7 +1796,6 @@
 98920042 0
 98920101 0
 98920105 0
-98920127 0
 98920146 0
 98920156 0
 98920183 0
@@ -2687,11 +2686,8 @@
 12835102 0 --侍之魂 仁心丸
 61000041 0 --狂剑·双龙
 61000042 0 --狂剑·零式
-88881099 0 --G·M 大狮神航母
 72001050 0 --探索界·玫瑰庭院
-14010049 0 --荒喰凶兽·饕餮
 15000600 1 --幻智指令·钙质化
-98920127 1 --圣刻龙-半龙伊姆
 72001005 1 --探索界·鸽
 72001035 1 --探索界·采莲
 10202932 1
@@ -2800,7 +2796,6 @@
 21401126 0
 22348311 0
 37629203 0
-61000042 0
 88881120 0
 88897024 0
 260023013 0
@@ -3479,7 +3474,6 @@
 40009249 0
 40009459 0
 82208107 0
-15000600 0
 82566601 0
 82567779 0
 82567782 0
@@ -6583,7 +6577,6 @@
 53797152 0
 7435985 0
 11451888 0
-12835102 1
 12847010 0
 12877040 0
 12896010 0
@@ -6720,7 +6713,6 @@
 79100120 1
 79100510 0
 28318606 1
-61000041 1
 91300026 1
 22021790 1
 10113006 1
@@ -6741,10 +6733,6 @@
 130006112 1
 130006113 1
 11451802 1
-12835105 1
-12835106 1
-12835107 1
-12835108 1
 44401001 1
 44401003 1
 75000863 1

expansions/script/c30553403.lua

@@ -31,7 +31,7 @@ function s.thcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetTurnPlayer()==tp
 end
 function s.thfilter(c)
-	return c:IsSetCard(0x309) and c:IsAbleToHand() and c:IsType(TYPE_TRAP) or c:IsType(TYPE_SPELL)
+	return c:IsSetCard(0x309) and c:IsAbleToHand() and (c:IsType(TYPE_TRAP) or c:IsType(TYPE_SPELL))
 end
 function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsAbleToRemove() and Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil) end

expansions/script/c47310000.lua

@@ -50,7 +50,7 @@ function Hata_no_Kokoro.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function Hata_no_Kokoro.eqfilter(c,tc,tp)
 	if not c:IsType(TYPE_EQUIP) then return false end
-    return c:IsSetCard(0x3ca0) and c:CheckEquipTarget(tc) and c:CheckUniqueOnField(tp,LOCATION_SZONE) and not c:IsForbidden()
+    return c:IsSetCard(0x3c10) and c:CheckEquipTarget(tc) and c:CheckUniqueOnField(tp,LOCATION_SZONE) and not c:IsForbidden()
 end
 function Hata_no_Kokoro.spop(loc)
     return function(e,tp,eg,ep,ev,re,r,rp)
@@ -94,10 +94,10 @@ function Hata_no_Kokoro.hnk_equip(c,id,e)
     c:RegisterEffect(e3)
 end
 function Hata_no_Kokoro.eqlimit(e,c)
-	return c:IsSetCard(0x3ca0)
+	return c:IsSetCard(0x3c10)
 end
 function Hata_no_Kokoro.filter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3ca0)
+	return c:IsFaceup() and c:IsSetCard(0x3c10)
 end
 function Hata_no_Kokoro.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and Hata_no_Kokoro.filter(chkc) end
@@ -125,7 +125,7 @@ function Hata_no_Kokoro.anger_eq(c)
 	c:RegisterEffect(e2)
 end
 function Hata_no_Kokoro.eftg(e,c)
-	return e:GetOwner():GetEquipTarget()==c and c:IsSetCard(0x3ca0)
+	return e:GetOwner():GetEquipTarget()==c and c:IsSetCard(0x3c10)
 end
 function Hata_no_Kokoro.efcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
@@ -193,13 +193,13 @@ function Hata_no_Kokoro.steff2(c,id)
 	c:RegisterEffect(e1)
 end
 function Hata_no_Kokoro.tdfilterq(c)
-	return c:IsSetCard(0x3ca0) and c:IsType(TYPE_EQUIP) and c:IsAbleToDeck()
+	return c:IsSetCard(0x3c10) and c:IsType(TYPE_EQUIP) and c:IsAbleToDeck()
 end
 function Hata_no_Kokoro.tdfilter(c)
-	return c:IsSetCard(0x3ca0) and c:IsType(TYPE_MONSTER) and c:IsAbleToDeck()
+	return c:IsSetCard(0x3c10) and c:IsType(TYPE_MONSTER) and c:IsAbleToDeck()
 end
 function Hata_no_Kokoro.tdtgq(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-    if chkc then return chkc:IsSetCard(0x3ca0) and chkc:IsAbleToDeck() end
+    if chkc then return chkc:IsSetCard(0x3c10) and chkc:IsAbleToDeck() end
     if chk==0 then return Duel.IsExistingTarget(Hata_no_Kokoro.tdfilterq,tp,LOCATION_GRAVE,0,1,nil) end
     Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
     local g=Duel.SelectTarget(tp,Hata_no_Kokoro.tdfilterq,tp,LOCATION_GRAVE,0,1,1,nil)
@@ -207,7 +207,7 @@ function Hata_no_Kokoro.tdtgq(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
     Duel.SetOperationInfo(0,CATEGORY_TODECK,g,2,tp,LOCATION_GRAVE)
 end
 function Hata_no_Kokoro.tdtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-    if chkc then return chkc:IsSetCard(0x3ca0) and chkc:IsAbleToDeck() end
+    if chkc then return chkc:IsSetCard(0x3c10) and chkc:IsAbleToDeck() end
     if chk==0 then return Duel.IsExistingTarget(Hata_no_Kokoro.tdfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil) end
     Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
     local g=Duel.SelectTarget(tp,Hata_no_Kokoro.tdfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,1,nil)

expansions/script/c47310007.lua

@@ -30,7 +30,7 @@ function s.thcon(e,tp,eg,ep,ev,re,r,rp)
 	return tp~=Duel.GetTurnPlayer() and e:GetOwner():GetFlagEffect(id)>0
 end
 function s.filter(c)
-	return c:IsSetCard(0x3ca0) and c:IsType(TYPE_SPELL) and c:IsAbleToHand()
+	return c:IsSetCard(0x3c10) and c:IsType(TYPE_SPELL) and c:IsAbleToHand()
 end
 function s.thop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetLabelObject()
@@ -51,7 +51,7 @@ function s.set(c)
 	c:RegisterEffect(e1)
 end
 function s.thfilter(c)
-	if not (c:IsSetCard(0x3ca0) and c:IsType(TYPE_TRAP)) then return false end
+	if not (c:IsSetCard(0x3c10) and c:IsType(TYPE_TRAP)) then return false end
 	return c:IsAbleToHand() or c:IsSSetable()
 end
 function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c47310008.lua

@@ -14,13 +14,13 @@ function s.change(c)
 	c:RegisterEffect(e1)
 end
 function s.tdfilter(c,tp)
-	if c:IsFacedown() or not c:IsSetCard(0x3ca0) or not c:IsType(TYPE_EQUIP) or not c:IsAbleToDeck() then return false end
+	if c:IsFacedown() or not c:IsSetCard(0x3c10) or not c:IsType(TYPE_EQUIP) or not c:IsAbleToDeck() then return false end
 	local ec=c:GetEquipTarget()
 	local code=c:GetCode()
 	return Duel.IsExistingMatchingCard(s.eqfilter,tp,LOCATION_DECK,0,1,nil,code,ec,tp)
 end
 function s.eqfilter(c,code)
-	return c:IsSetCard(0x3ca0) and c:IsType(TYPE_SPELL) and not c:IsCode(code)
+	return c:IsSetCard(0x3c10) and c:IsType(TYPE_SPELL) and not c:IsCode(code)
 end
 function s.chtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsOnField() and chkc:IsAbleToDeck() end

expansions/script/c47310009.lua

@@ -16,7 +16,7 @@ function s.spsummon(c)
 	Duel.AddCustomActivityCounter(id,ACTIVITY_SPSUMMON,s.counterfilter)
 end
 function s.counterfilter(c)
-	return not c:IsSummonLocation(LOCATION_HAND+LOCATION_DECK+LOCATION_REMOVED) or c:IsSetCard(0x3ca0)
+	return not c:IsSummonLocation(LOCATION_HAND+LOCATION_DECK+LOCATION_REMOVED) or c:IsSetCard(0x3c10)
 end
 function s.cfilter(c)
 	return c:GetSequence()<5
@@ -36,10 +36,10 @@ function s.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.RegisterEffect(e1,tp)
 end
 function s.splimit(e,c)
-	return not c:IsSetCard(0x3ca0) and c:IsLocation(LOCATION_HAND+LOCATION_DECK+LOCATION_REMOVED)
+	return not c:IsSetCard(0x3c10) and c:IsLocation(LOCATION_HAND+LOCATION_DECK+LOCATION_REMOVED)
 end
 function s.filter(c,e,tp)
-	return c:IsSetCard(0x3ca0) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x3c10) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0

expansions/script/c47310010.lua

@@ -19,13 +19,13 @@ function s.eqcon(e,tp,eg,ep,ev,re,r,rp)
 	return rp==1-tp and (re:IsActiveType(TYPE_MONSTER) or  re:GetHandler():IsType(TYPE_SPELL))
 end
 function s.defilter(c)
-    return c:IsSetCard(0x3ca0)
+    return c:IsSetCard(0x3c10)
 end
 function s.eqfilter(c,tc,code,tp)
     return Hnk.eqfilter(c,tc,tp) and not c:IsCode(code)
 end
 function s.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-    if chkc then return chkc:IsOnField() and chkc:IsSetCard(0x3ca0) end
+    if chkc then return chkc:IsOnField() and chkc:IsSetCard(0x3c10) end
     local c=e:GetHandler()
     if chk==0 then return Duel.IsExistingTarget(s.defilter,tp,LOCATION_ONFIELD,0,1,c) end
     Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)

expansions/script/c47310012.lua

@@ -14,7 +14,7 @@ function s.eff1(c)
 	c:RegisterEffect(e1)
 end
 function s.filter(c,tp)
-	return c:IsSetCard(0x3ca0) and Duel.IsExistingMatchingCard(s.eqfilter,tp,LOCATION_GRAVE,0,1,nil,c,tp)
+	return c:IsSetCard(0x3c10) and Duel.IsExistingMatchingCard(s.eqfilter,tp,LOCATION_GRAVE,0,1,nil,c,tp)
 end
 function s.eqfilter(c,tc,tp)
 	return c:IsType(TYPE_EQUIP) and c:CheckEquipTarget(tc) and c:CheckUniqueOnField(tp,LOCATION_SZONE)
@@ -62,7 +62,7 @@ function s.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SendtoGrave(c,REASON_COST+REASON_DISCARD)
 end
 function s.thfilter(c)
-	return c:IsSetCard(0x3ca0) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
+	return c:IsSetCard(0x3c10) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
 end
 function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then

expansions/script/c47310013.lua

@@ -17,7 +17,7 @@ function s.filter(c)
 	return c:IsAbleToGrave()
 end
 function s.eqfilter(c)
-	return c:IsType(TYPE_EQUIP) and c:IsSetCard(0x3ca0) and c:IsFaceup()
+	return c:IsType(TYPE_EQUIP) and c:IsSetCard(0x3c10) and c:IsFaceup()
 end
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return false end

expansions/script/c47310014.lua

@@ -15,7 +15,7 @@ function s.eff1(c)
 	c:RegisterEffect(e1)
 end
 function s.confilter(c)
-	return c:IsSetCard(0x3ca0) and c:IsFaceup()
+	return c:IsSetCard(0x3c10) and c:IsFaceup()
 end
 function s.con(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(s.confilter,tp,LOCATION_ONFIELD,0,1,nil)

expansions/script/c47310015.lua

@@ -14,7 +14,7 @@ function s.eff1(c)
 	c:RegisterEffect(e1)
 end
 function s.sfilter(c)
-	return c:IsSetCard(0x3ca0) and c:IsAbleToHand()
+	return c:IsSetCard(0x3c10) and c:IsAbleToHand()
 end
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsOnField() and chkc:IsAbleToHand() end

expansions/script/c47310016.lua

@@ -12,14 +12,14 @@ function s.eff1(c)
 	c:RegisterEffect(e1)
 end
 function s.cfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3ca0) and c:IsType(TYPE_MONSTER)
+	return c:IsFaceup() and c:IsSetCard(0x3c10) and c:IsType(TYPE_MONSTER)
 end
 function s.con(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_MZONE,0,1,nil)
 		and Duel.IsChainNegatable(ev) and (re:IsActiveType(TYPE_MONSTER) or re:IsHasType(EFFECT_TYPE_ACTIVATE))
 end
 function s.thfilter(c)
-	return c:IsSetCard(0x3ca0) and c:IsFaceup() and c:IsAbleToHand()
+	return c:IsSetCard(0x3c10) and c:IsFaceup() and c:IsAbleToHand()
 end
 function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.NegateActivation(ev) and re:GetHandler():IsRelateToEffect(re) then
@@ -47,7 +47,7 @@ function s.eff2(c)
 	c:RegisterEffect(e1)
 end
 function s.filter(c)
-	return c:IsType(TYPE_TRAP) and c:IsSetCard(0x3ca0) and c:IsAbleToHand()
+	return c:IsType(TYPE_TRAP) and c:IsSetCard(0x3c10) and c:IsAbleToHand()
 end
 function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingTarget(s.filter,tp,LOCATION_GRAVE,0,1,e:GetHandler()) end

expansions/script/c47310017.lua

@@ -11,7 +11,7 @@ function s.aih(c)
 	c:RegisterEffect(e1)
 end
 function s.aihtg(e,c)
-	return c:IsSetCard(0x3ca0) and c:IsPublic()
+	return c:IsSetCard(0x3c10) and c:IsPublic()
 end
 function s.eq(c)
 	local e1=Effect.CreateEffect(c)
@@ -26,10 +26,10 @@ function s.eq(c)
 	c:RegisterEffect(e1)
 end
 function s.filter(c,tp)
-	return c:IsType(TYPE_MONSTER) and c:IsSetCard(0x3ca0) and Duel.IsExistingMatchingCard(Hnk.eqfilter,tp,LOCATION_DECK,0,1,nil,c,tp)
+	return c:IsType(TYPE_MONSTER) and c:IsSetCard(0x3c10) and Duel.IsExistingMatchingCard(Hnk.eqfilter,tp,LOCATION_DECK,0,1,nil,c,tp)
 end
 function s.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsOnField() and chkc:IsSetCard(0x3ca0) end
+	if chkc then return chkc:IsOnField() and chkc:IsSetCard(0x3c10) end
 	if chk==0 then return Duel.IsExistingTarget(s.filter,tp,LOCATION_MZONE,0,1,nil,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
 	Duel.SelectTarget(tp,s.filter,tp,LOCATION_MZONE,0,1,1,nil,tp)
@@ -58,7 +58,7 @@ function s.atkup(c)
 	c:RegisterEffect(e1)
 end
 function s.pbfilter(c)
-	return c:IsSetCard(0x3ca0) and c:IsType(TYPE_TRAP) and not c:IsPublic()
+	return c:IsSetCard(0x3c10) and c:IsType(TYPE_TRAP) and not c:IsPublic()
 end
 function s.atkcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(s.pbfilter,tp,LOCATION_HAND,0,1,nil) end
@@ -72,7 +72,7 @@ function s.atkcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	tc:RegisterEffect(e1)
 end
 function s.atkfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3ca0)
+	return c:IsFaceup() and c:IsSetCard(0x3c10)
 end
 function s.atktg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(s.atkfilter,tp,LOCATION_MZONE,0,1,nil) end

expansions/script/c47310018.lua

@@ -18,7 +18,7 @@ function s.thcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK)
 end
 function s.thfilter(c)
-	return c:IsSetCard(0x3ca0) and c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToHand()
+	return c:IsSetCard(0x3c10) and c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToHand()
 end
 function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil) end
@@ -57,7 +57,7 @@ function s.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.Release(e:GetHandler(),REASON_COST)
 end
 function s.thfilter2(c)
-	return c:IsSetCard(0x3ca0) and c:IsAbleToHand()
+	return c:IsSetCard(0x3c10) and c:IsAbleToHand()
 end
 function s.thtg2(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_GRAVE,0,1,nil) end
@@ -88,5 +88,5 @@ function s.initial_effect(c)
     s.tohand(c)
 end
 function s.lcheck(g)
-	return g:IsExists(Card.IsLinkSetCard,1,nil,0x3ca0)
+	return g:IsExists(Card.IsLinkSetCard,1,nil,0x3c10)
 end
\ No newline at end of file

expansions/script/c47310019.lua

@@ -114,7 +114,7 @@ function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,0,0)
 end
 function s.thfilter(c,code)
-	return c:IsSetCard(0x3ca0) and c:IsType(TYPE_TRAP) and not c:IsCode(code) and c:IsAbleToHand()
+	return c:IsSetCard(0x3c10) and c:IsType(TYPE_TRAP) and not c:IsCode(code) and c:IsAbleToHand()
 end
 function s.thop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
@@ -141,7 +141,7 @@ function s.initial_effect(c)
 	s.tohand(c)
 end
 function s.lfilter(c)
-	return c:IsLinkSetCard(0x3ca0) and c:IsType(TYPE_LINK)
+	return c:IsLinkSetCard(0x3c10) and c:IsType(TYPE_LINK)
 end
 function s.lcheck(g)
 	return g:IsExists(s.lfilter,1,nil)

expansions/script/c47310020.lua

@@ -19,7 +19,7 @@ function s.tfcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.Remove(c,POS_FACEUP,REASON_COST)
 end
 function s.pfilter(c,tp)
-	return c:IsType(TYPE_EQUIP) and c:IsSetCard(0x3ca0)
+	return c:IsType(TYPE_EQUIP) and c:IsSetCard(0x3c10)
 		and not c:IsForbidden() and c:CheckUniqueOnField(tp)
 end
 function s.tftg(e,tp,eg,ep,ev,re,r,rp,chk)
@@ -27,7 +27,7 @@ function s.tftg(e,tp,eg,ep,ev,re,r,rp,chk)
 		and Duel.IsExistingMatchingCard(s.pfilter,tp,LOCATION_DECK,0,1,nil,tp) end
 end
 function s.eqfilter(c,tc)
-    return tc:CheckEquipTarget(c) and c:IsSetCard(0x3ca0) and c:IsType(TYPE_MONSTER) and c:IsFaceup()
+    return tc:CheckEquipTarget(c) and c:IsSetCard(0x3c10) and c:IsType(TYPE_MONSTER) and c:IsFaceup()
 end
 function s.tfop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 then return end
@@ -64,7 +64,7 @@ function s.eff3(c)
 	c:RegisterEffect(e1)
 end
 function s.thfilter(c)
-    return c:IsSetCard(0x3ca0) and c:IsAbleToHand()
+    return c:IsSetCard(0x3c10) and c:IsAbleToHand()
 end
 function s.spop(e,tp,eg,ep,ev,re,r,rp)
     local c=e:GetHandler()

expansions/script/c47310021.lua

@@ -18,7 +18,7 @@ function s.desfilter(c)
     return c:IsType(TYPE_EQUIP) and c:IsFaceup()
 end
 function s.eqfilter(c,tp,ec)
-    return c:IsSetCard(0x3ca0) and c:IsType(TYPE_EQUIP) and not c:IsCode(47310021) and c:CheckEquipTarget(ec) and not c:IsForbidden() and c:CheckUniqueOnField(tp)
+    return c:IsSetCard(0x3c10) and c:IsType(TYPE_EQUIP) and not c:IsCode(47310021) and c:CheckEquipTarget(ec) and not c:IsForbidden() and c:CheckUniqueOnField(tp)
 end
 function s.tg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
     if chkc then return chkc:IsOnField() and chkc:IsAbleToDeck() and chkc:IsControler(tp) end
@@ -65,7 +65,7 @@ function s.remove(c)
     c:RegisterEffect(e1)
 end
 function s.rmfilter(c)
-    return c:IsSetCard(0x3ca0) and c:IsType(TYPE_MONSTER) and c:IsAbleToRemove()
+    return c:IsSetCard(0x3c10) and c:IsType(TYPE_MONSTER) and c:IsAbleToRemove()
 end
 function s.rmtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(s.rmfilter,tp,LOCATION_HAND+LOCATION_DECK,0,1,nil) end

expansions/script/c47310022.lua

@@ -45,7 +45,7 @@ function s.todeck(c)
     c:RegisterEffect(e1)
 end
 function s.tdfilter(c)
-    return c:IsSetCard(0x3ca0) and c:IsAbleToRemove()
+    return c:IsSetCard(0x3c10) and c:IsAbleToRemove()
 end
 function s.tdtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(s.tdfilter,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,nil) end

expansions/script/c47310023.lua

@@ -50,7 +50,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
     end
 end
 function s.efilter(e,te)
-	return not te:GetOwner():IsSetCard(0x3ca0)
+	return not te:GetOwner():IsSetCard(0x3c10)
 end
 function s.eff2(c)
     local e1=Effect.CreateEffect(c)
@@ -67,7 +67,7 @@ function s.eff2(c)
 	c:RegisterEffect(e1)
 end
 function s.filter(c)
-    return c:IsSetCard(0x3ca0) and c:IsFaceup() and c:IsType(TYPE_EQUIP)
+    return c:IsSetCard(0x3c10) and c:IsFaceup() and c:IsType(TYPE_EQUIP)
 end
 function s.atktg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
     if chk==0 then return Duel.IsExistingTarget(s.filter,tp,LOCATION_SZONE,0,1,nil) end

expansions/script/c47310024.lua

@@ -6,7 +6,7 @@ function s.sprule(c)
 	aux.AddLinkProcedure(c,s.matfilter,1,1)
 end
 function s.matfilter(c)
-	return c:IsLinkSetCard(0x3ca0) and not c:IsType(TYPE_LINK)
+	return c:IsLinkSetCard(0x3c10) and not c:IsType(TYPE_LINK)
 end
 function s.search(c)
     local e1=Effect.CreateEffect(c)
@@ -48,7 +48,7 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e1,tp)
 end
 function s.splimit(e,c)
-	return not c:IsSetCard(0x3ca0) and c:IsLocation(LOCATION_HAND+LOCATION_DECK+LOCATION_REMOVED)
+	return not c:IsSetCard(0x3c10) and c:IsLocation(LOCATION_HAND+LOCATION_DECK+LOCATION_REMOVED)
 end
 function s.tohand(c)
     local e1=Effect.CreateEffect(c)
@@ -64,7 +64,7 @@ function s.tohand(c)
 	c:RegisterEffect(e1)
 end
 function s.thfilter2(c)
-	return c:IsSetCard(0x3ca0) and c:IsType(TYPE_EQUIP+TYPE_TRAP) and c:IsAbleToHand()
+	return c:IsSetCard(0x3c10) and c:IsType(TYPE_EQUIP+TYPE_TRAP) and c:IsAbleToHand()
 end
 function s.thtg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
     if chkc then return chkc:IsLocation(LOCATION_GRAVE) and s.thfilter2(chkc) and chkc:IsControler(tp) end

expansions/script/c47310025.lua

@@ -5,7 +5,7 @@ function s.sprule(c)
 	aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsLinkType,TYPE_EFFECT),2,99,s.lcheck)
 end
 function s.lcheck(g)
-	return g:IsExists(Card.IsLinkSetCard,1,nil,0x3ca0)
+	return g:IsExists(Card.IsLinkSetCard,1,nil,0x3c10)
 end
 function s.tohand(c)
     local e1=Effect.CreateEffect(c)
@@ -24,7 +24,7 @@ function s.thcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK)
 end
 function s.thfilter(c,e,tp)
-	return c:IsSetCard(0x3ca0) and c:IsFaceupEx() and (c:IsAbleToHand() or (c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE) and Duel.GetMZoneCount(tp)>0))
+	return c:IsSetCard(0x3c10) and c:IsFaceupEx() and (c:IsAbleToHand() or (c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE) and Duel.GetMZoneCount(tp)>0))
 end
 function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
     if chkc then return chkc:IsLocation(LOCATION_GRAVE+LOCATION_REMOVED) and s.thfilter(chkc) and chkc:IsControler(tp) end
@@ -67,7 +67,7 @@ function s.tdcon(e,tp,eg,ep,ev,re,r,rp)
 	return c:IsLocation(LOCATION_GRAVE+LOCATION_REMOVED) and r==REASON_LINK
 end
 function s.tdfilters(c,tp)
-    return c:IsSetCard(0x3ca0) and c:IsFaceupEx() and c:IsAbleToDeck()
+    return c:IsSetCard(0x3c10) and c:IsFaceupEx() and c:IsAbleToDeck()
      and Duel.IsExistingTarget(Card.IsAbleToDeck,tp,LOCATION_ONFIELD+LOCATION_GRAVE,LOCATION_ONFIELD+LOCATION_GRAVE,1,c)
 end
 function s.tdtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
@@ -101,10 +101,10 @@ function s.draw(c)
 	c:RegisterEffect(e1)
 end
 function s.lffilter(c,tp)
-    return c:IsSetCard(0x3ca0) and c:IsType(TYPE_EQUIP) and c:IsPreviousPosition(POS_FACEUP) and c:IsPreviousControler(tp)
+    return c:IsSetCard(0x3c10) and c:IsType(TYPE_EQUIP) and c:IsPreviousPosition(POS_FACEUP) and c:IsPreviousControler(tp)
 end
 function s.drfilter(c)
-    return c:IsSetCard(0x3ca0) and c:IsType(TYPE_LINK) and c:IsFaceup()
+    return c:IsSetCard(0x3c10) and c:IsType(TYPE_LINK) and c:IsFaceup()
 end
 function s.drcon(e,tp,eg,ep,ev,re,r,rp)
     return eg:IsExists(s.lffilter,1,nil,tp) and Duel.IsExistingMatchingCard(s.drfilter,tp,LOCATION_MZONE,0,1,nil)
@@ -119,7 +119,7 @@ function s.eqcfilter(c,ec)
     return ec:CheckEquipTarget(c) and c:IsFaceup()
 end
 function s.eqfilter(c,tp)
-    return c:IsType(TYPE_EQUIP) and c:IsSetCard(0x3ca0) and Duel.IsExistingMatchingCard(s.eqcfilter,tp,LOCATION_MZONE,0,1,nil,c)
+    return c:IsType(TYPE_EQUIP) and c:IsSetCard(0x3c10) and Duel.IsExistingMatchingCard(s.eqcfilter,tp,LOCATION_MZONE,0,1,nil,c)
 end
 function s.drop(e,tp,eg,ep,ev,re,r,rp)
 	local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)

expansions/script/c47310026.lua

@@ -12,7 +12,7 @@ function s.sprule(c)
 	c:RegisterEffect(e1)
 end
 function s.mfilter(c)
-	return c:IsLinkSetCard(0x3ca0)
+	return c:IsLinkSetCard(0x3c10)
 end
 function s.spsummon(c)
     local e1=Effect.CreateEffect(c)
@@ -38,7 +38,7 @@ function s.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
     Duel.Remove(c,POS_FACEUP,REASON_COST)
 end
 function s.spfilter(c,e,tp)
-	return c:IsSetCard(0x3ca0) and not c:IsCode(47310026) and c:IsType(TYPE_MONSTER) and c:IsFaceupEx() and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x3c10) and not c:IsCode(47310026) and c:IsType(TYPE_MONSTER) and c:IsFaceupEx() and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
     if chkc then return chkc:IsLocation(LOCATION_GRAVE+LOCATION_REMOVED) and s.spfilter(chkc,e,tp) and chkc:IsControler(tp) end
@@ -71,7 +71,7 @@ function s.atk(c)
 	e1:SetCode(EFFECT_DIRECT_ATTACK)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetTargetRange(LOCATION_MZONE,0)
-	e1:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x3ca0))
+	e1:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x3c10))
 	c:RegisterEffect(e1)
     local e2=e1:Clone()
     e2:SetCode(EFFECT_UPDATE_ATTACK)
@@ -93,7 +93,7 @@ function s.spsummonself(c)
 	c:RegisterEffect(e1)
 end
 function s.lffilter(c,tp)
-    return c:IsSetCard(0x3ca0) and c:IsType(TYPE_MONSTER) and c:IsPreviousPosition(POS_FACEUP) and c:IsPreviousControler(tp)
+    return c:IsSetCard(0x3c10) and c:IsType(TYPE_MONSTER) and c:IsPreviousPosition(POS_FACEUP) and c:IsPreviousControler(tp)
 end
 function s.spcon(e,tp,eg,ep,ev,re,r,rp)
     return eg:IsExists(s.lffilter,1,nil,tp) and rp==1-tp

expansions/script/c47310201.lua

@@ -84,7 +84,7 @@ function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,0,LOCATION_DECK)
 end
 function s.thfilter(c)
-	return (c:IsRace(RACE_WYRM) or (c:IsSetCard(0x5ca0) and c:IsType(TYPE_SPELL+TYPE_TRAP))) and c:IsAbleToHand()
+	return (c:IsRace(RACE_WYRM) or (c:IsSetCard(0x5c10) and c:IsType(TYPE_SPELL+TYPE_TRAP))) and c:IsAbleToHand()
 end
 function s.thop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.ConfirmDecktop(tp,5)

expansions/script/c47310202.lua

@@ -15,7 +15,7 @@ function s.tfcon(e,tp,eg,ep,ev,re,r,rp)
 	return not e:GetHandler():IsPublic()
 end
 function s.pfilter(c,tp)
-	return c:IsType(TYPE_CONTINUOUS) and c:IsSetCard(0x5ca0)
+	return c:IsType(TYPE_CONTINUOUS) and c:IsSetCard(0x5c10)
 		and not c:IsForbidden() and c:CheckUniqueOnField(tp)
 end
 function s.tftg(e,tp,eg,ep,ev,re,r,rp,chk)
@@ -62,7 +62,7 @@ function s.retop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.ReturnToField(e:GetLabelObject(),POS_FACEUP)
 end
 function s.thfilter(c)
-	return c:IsSetCard(0x5ca0) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
+	return c:IsSetCard(0x5c10) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
 end
 function s.tg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil) end

expansions/script/c47310203.lua

@@ -17,7 +17,7 @@ function s.tgcon(e,tp,eg,ep,ev,re,r,rp)
 	return not e:GetHandler():IsPublic()
 end
 function s.costfilter(c,ec,e,tp)
-	if not c:IsSetCard(0x5ca0) or not c:IsType(TYPE_MONSTER) or c:IsPublic() then return false end
+	if not c:IsSetCard(0x5c10) or not c:IsType(TYPE_MONSTER) or c:IsPublic() then return false end
 	local g=Group.FromCards(c,ec)
 	return g:IsExists(s.tgspfilter,1,nil,g,e,tp)
 end

expansions/script/c47310205.lua

@@ -11,7 +11,7 @@ function s.spsummon(c)
 	c:RegisterEffect(e1)
 end
 function s.spfilter(c,e,tp)
-    return c:IsSetCard(0x5ca0) and c:IsType(TYPE_DUAL) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+    return c:IsSetCard(0x5c10) and c:IsType(TYPE_DUAL) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function s.dualfilter(c)
 	return c:IsDualState() and c:IsFaceup()

expansions/script/c47310206.lua

@@ -12,7 +12,7 @@ function s.todeck(c)
 	c:RegisterEffect(e1)
 end
 function s.tdfilter(c,e)
-	return (c:IsRace(RACE_WYRM) or (c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsSetCard(0x5ca0))) and c:IsCanBeEffectTarget(e) and c:IsAbleToDeck()
+	return (c:IsRace(RACE_WYRM) or (c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsSetCard(0x5c10))) and c:IsCanBeEffectTarget(e) and c:IsAbleToDeck()
 end
 function s.thfilter(c,g)
     return g:IsExists(Card.IsCode,1,nil,c:GetCode()) and c:IsAbleToHand()

expansions/script/c47310207.lua

@@ -106,7 +106,7 @@ function s.spsummon(c)
 	c:RegisterEffect(e1)
 end
 function s.spfilter(c,e,tp)
-	return c:IsSetCard(0x5ca0) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x5c10) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc,exc)
     if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and s.spfilter(chkc,e,tp) end

expansions/script/c47310208.lua

@@ -25,7 +25,7 @@ function s.dualfilter(c)
 	return c:IsDualState() and c:IsFaceup()
 end
 function s.thfilter(c)
-    return c:IsSetCard(0x5ca0) and c:IsAbleToHand()
+    return c:IsSetCard(0x5c10) and c:IsAbleToHand()
 end
 function s.dstg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local check=Duel.IsExistingMatchingCard(s.dualfilter,tp,LOCATION_MZONE,0,1,nil)

expansions/script/c47310209.lua

@@ -10,7 +10,7 @@ function s.activate(c)
 	c:RegisterEffect(e1)
 end
 function s.thfilter(c)
-	return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsType(TYPE_CONTINUOUS) and c:IsSetCard(0x5ca0)
+	return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsType(TYPE_CONTINUOUS) and c:IsSetCard(0x5c10)
 		and c:IsAbleToHand()
 end
 function s.op(e,tp,eg,ep,ev,re,r,rp)
@@ -31,7 +31,7 @@ function s.exsummon(c)
 	e1:SetCode(EFFECT_EXTRA_SUMMON_COUNT)
 	e1:SetRange(LOCATION_FZONE)
 	e1:SetTargetRange(LOCATION_HAND+LOCATION_MZONE,0)
-	e1:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x5ca0))
+	e1:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x5c10))
 	c:RegisterEffect(e1)
 end
 function s.indes(c)

expansions/script/c47310210.lua

@@ -13,7 +13,7 @@ function s.search(c)
 	c:RegisterEffect(e1)
 end
 function s.filter(c)
-	return c:IsSetCard(0x5ca0) and c:IsAbleToHand()
+	return c:IsSetCard(0x5c10) and c:IsAbleToHand()
 end
 function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil) end
@@ -29,7 +29,7 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e1,tp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_OPERATECARD)
-	local g=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_DECK,0,1,1,nil)
+	local g=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil)
 	if g:GetCount()<=0 then return end
 	local tc=g:GetFirst()
     Duel.SendtoHand(tc,nil,REASON_EFFECT)

expansions/script/c47312024.lua

 --面灵气 秦心※冬雪
 local s,id=GetID()
 function s.sprule(c)
-    aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x3ca0),aux.NonTuner(aux.FilterBoolFunction(Card.IsSetCard,0x3ca0)),1,1)
+    aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x3c10),aux.NonTuner(aux.FilterBoolFunction(Card.IsSetCard,0x3c10)),1,1)
 	c:EnableReviveLimit()
     local e0=Effect.CreateEffect(c)
 	e0:SetDescription(aux.Stringid(id,0))
@@ -15,11 +15,11 @@ function s.sprule(c)
 	c:RegisterEffect(e0)
 end
 function s.sprfilter1(c,tp)
-	return c:IsFaceup() and c:IsSetCard(0x3ca0) and c:IsSynchroType(TYPE_LINK)
+	return c:IsFaceup() and c:IsSetCard(0x3c10) and c:IsSynchroType(TYPE_LINK)
 		and Duel.IsExistingMatchingCard(s.sprfilter2,tp,LOCATION_MZONE,0,1,c)
 end
 function s.sprfilter2(c)
-	return c:IsFaceup() and c:IsSetCard(0x3ca0) and c:GetLevel()==4 and c:IsCanBeSynchroMaterial() and c:IsType(TYPE_TUNER)
+	return c:IsFaceup() and c:IsSetCard(0x3c10) and c:GetLevel()==4 and c:IsCanBeSynchroMaterial() and c:IsType(TYPE_TUNER)
 end
 function s.spcon(e,c)
 	if c==nil then return true end
@@ -53,10 +53,10 @@ function s.e1con(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO)
 end
 function s.tdfilter(c,e)
-	return c:IsSetCard(0x3ca0) and c:IsType(TYPE_MONSTER) and c:IsFaceup() and c:IsCanBeEffectTarget(e) and c:IsAbleToDeck()
+	return c:IsSetCard(0x3c10) and c:IsType(TYPE_MONSTER) and c:IsFaceup() and c:IsCanBeEffectTarget(e) and c:IsAbleToDeck()
 end
 function s.spfilter(c,ct,e,tp)
-	return c:IsSetCard(0x3ca0) and c:IsType(TYPE_LINK) and c:IsLink(ct)
+	return c:IsSetCard(0x3c10) and c:IsType(TYPE_LINK) and c:IsLink(ct)
 	and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_LINK,tp,false,false) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0
 end
 function s.fselect(g,e,tp)
@@ -98,7 +98,7 @@ function s.e1op(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e1,tp)
 end
 function s.splimit(e,c,tp,sumtp,sumpos)
-	return bit.band(sumtp,SUMMON_TYPE_LINK)==SUMMON_TYPE_LINK and not c:IsSetCard(0x3ca0)
+	return bit.band(sumtp,SUMMON_TYPE_LINK)==SUMMON_TYPE_LINK and not c:IsSetCard(0x3c10)
 end
 function s.eff2(c)
 	local e1=Effect.CreateEffect(c)
@@ -119,7 +119,7 @@ function s.tdcon(e,tp,eg,ep,ev,re,r,rp)
 	local ct=Duel.GetCurrentChain()
 	if ct<2 then return end
 	local te,p=Duel.GetChainInfo(ct-1,CHAININFO_TRIGGERING_EFFECT,CHAININFO_TRIGGERING_PLAYER)
-	return te and te:IsActiveType(TYPE_MONSTER) and te:GetHandler():IsSetCard(0x3ca0) and p==tp and rp==1-tp
+	return te and te:IsActiveType(TYPE_MONSTER) and te:GetHandler():IsSetCard(0x3c10) and p==tp and rp==1-tp
 end
 function s.tdfilter2(c)
 	return c:IsType(TYPE_EQUIP) and c:IsFaceup() and c:IsAbleToHand()