ndyd

expansions/script/c12038000.lua

@@ -107,7 +107,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e5)
 end
 function cm.scfilter(c)
-	return c:IsSynchroSummonable(nil) and c:IsSetCard(0xfa6)
+	return c:IsSynchroSummonable(nil) and c:IsSetCard(0x3fa6)
 end
 function cm.sctg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.scfilter,tp,LOCATION_EXTRA,0,1,nil) end
@@ -123,7 +123,7 @@ function cm.scop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function cm.xyzfilter(c)
-	return c:IsXyzSummonable(nil) and c:IsSetCard(0xfa6)
+	return c:IsXyzSummonable(nil) and c:IsSetCard(0x3fa6)
 end
 function cm.xyztg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.xyzfilter,tp,LOCATION_EXTRA,0,1,nil) end
@@ -139,7 +139,7 @@ function cm.xyzop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function cm.lkfilter(c)
-	return c:IsLinkSummonable(nil) and c:IsSetCard(0xfa6)
+	return c:IsLinkSummonable(nil) and c:IsSetCard(0x3fa6)
 end
 function cm.lktg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.lkfilter,tp,LOCATION_EXTRA,0,1,nil) end

expansions/script/c12038002.lua

@@ -32,14 +32,14 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function cm.costfilter(c)
-	return c:IsSetCard(0xfa6) and c:IsDiscardable()
+	return c:IsSetCard(0x3fa6) and c:IsDiscardable()
 end
 function cm.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.costfilter,tp,LOCATION_HAND,0,1,e:GetHandler()) end
 	Duel.DiscardHand(tp,cm.costfilter,1,1,REASON_COST+REASON_DISCARD)
 end
 function cm.filter(c,e,tp)
-	return c:IsSetCard(0xfa6) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x3fa6) 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 not Duel.IsPlayerAffectedByEffect(tp,59822133)

expansions/script/c12038003.lua

@@ -31,7 +31,7 @@ function cm.thcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsPreviousLocation(LOCATION_DECK)
 end
 function cm.filter(c,e,tp)
-	return c:IsSetCard(0xfa6) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x3fa6) 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 not Duel.IsPlayerAffectedByEffect(tp,59822133)

expansions/script/c12038011.lua

@@ -4,7 +4,7 @@ local m=12038011
 local cm=_G["c"..m]
 function cm.initial_effect(c)
 	--synchro summon
-	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0xfa6),aux.NonTuner(nil),1)
+	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x3fa6),aux.NonTuner(nil),1)
 	c:EnableReviveLimit()
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))
@@ -45,7 +45,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function cm.stfilter1(c,tc)
-	return c:IsSynchroType(TYPE_TUNER) and c:IsSetCard(0xfa6) and c:IsPosition(POS_FACEUP) and c:IsCanBeSynchroMaterial(tc)
+	return c:IsSynchroType(TYPE_TUNER) and c:IsSetCard(0x3fa6) and c:IsPosition(POS_FACEUP) and c:IsCanBeSynchroMaterial(tc)
 end
 function cm.stfilter2(c,tc)
 	return not c:IsSynchroType(TYPE_TUNER) and c:IsPosition(POS_FACEUP) and c:IsCanBeSynchroMaterial(tc)

expansions/script/c12038012.lua

@@ -50,7 +50,7 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function cm.mfilter(c,xyzc)  
-	return c:IsFaceup() and c:IsRace(RACE_PSYCHO) and ( c:GetLevel()==2 or c:IsSetCard(0xfa6) )
+	return c:IsFaceup() and c:IsRace(RACE_PSYCHO) and ( c:GetLevel()==2 or c:IsSetCard(0x3fa6) )
 end  
 function cm.spcon1(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c12038013.lua

@@ -38,7 +38,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function cm.lcheck(g)
-	return g:IsExists(Card.IsLinkSetCard,1,nil,0xfa6)
+	return g:IsExists(Card.IsLinkSetCard,1,nil,0x3fa6)
 end
 function cm.cost1(e,c,tp,st)
 	if bit.band(st,SUMMON_TYPE_LINK)~=SUMMON_TYPE_LINK then return true end
@@ -91,7 +91,7 @@ function cm.redisop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Destroy(tc,REASON_EFFECT)
 end
 function cm.spfilter1(c,e,tp)
-	return c:IsFaceup() and c:IsSetCard(0xfa6) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsFaceup() and c:IsSetCard(0x3fa6) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function cm.sptg1(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return false end

expansions/script/c12038015.lua

@@ -46,7 +46,7 @@ function cm.cost1(e,c,tp,st)
 end
 function cm.ovfilter(c)
 	local tp=c:GetControler()
-	return c:IsFaceup() and c:IsType(TYPE_XYZ) and c:IsSetCard(0xfa6) and c:GetOverlayCount()==0
+	return c:IsFaceup() and c:IsType(TYPE_XYZ) and c:IsSetCard(0x3fa6) and c:GetOverlayCount()==0
 end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end

expansions/script/c40006764.lua

@@ -42,20 +42,34 @@ function cm.initial_effect(c)
 	e4:SetOperation(cm.spop)
 	c:RegisterEffect(e4)
 end
-function cm.matfilter(c)
-	return c:IsCanOverlay() and c:IsType(TYPE_TUNER) and c:IsLevelAbove(1) and c:IsFaceup()
+function cm.tgrfilter(c)
+	return c:IsFaceup() and c:IsLevelAbove(1) and c:IsCanOverlay()
 end
-function cm.gcheck(g,tp,c)
-	return g:CheckWithSumEqual(Card.GetLevel,8,2,2) and Duel.GetLocationCountFromEx(tp,tp,g,c)>0
+function cm.tgrfilter1(c)
+	return c:IsType(TYPE_TUNER) and c:IsLevelAbove(1)
 end
-function cm.con(e,c,tp)
-	local g=Duel.GetMatchingGroup(cm.matfilter,tp,LOCATION_MZONE,0,nil)
-	return g:CheckSubGroup(cm.gcheck,2,2,tp,c)
+function cm.mnfilter(c,g)
+	return g:IsExists(cm.mnfilter2,1,c,c)
+end
+function cm.mnfilter2(c,mc)
+	return c:GetLevel()+mc:GetLevel()==8
+end
+function cm.fselect(g,tp,sc)
+	return g:GetCount()==2
+		and g:IsExists(cm.tgrfilter1,2,nil)
+		and g:IsExists(cm.mnfilter,1,nil,g)
+		and Duel.GetLocationCountFromEx(tp,tp,g,sc)>0
+end
+function cm.con(e,c)
+	if c==nil then return true end
+	local tp=c:GetControler()
+	local g=Duel.GetMatchingGroup(cm.tgrfilter,tp,LOCATION_MZONE,0,nil)
+	return g:CheckSubGroup(cm.fselect,2,2,tp,c)
 end
 function cm.op(e,tp,eg,ep,ev,re,r,rp,c)
-	local g=Duel.GetMatchingGroup(cm.matfilter,tp,LOCATION_MZONE,0,nil)
+	local g=Duel.GetMatchingGroup(cm.tgrfilter,tp,LOCATION_MZONE,0,nil)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL)
-	local matg=g:SelectSubGroup(tp,cm.gcheck,false,2,2,tp,c)
+	local matg=g:SelectSubGroup(tp,cm.fselect,false,2,2,tp,c)
 	local og = Group.CreateGroup()
 	for tc in aux.Next(matg) do
 		og:Merge(tc:GetOverlayGroup())

expansions/script/c40006766.lua

@@ -38,20 +38,34 @@ function cm.initial_effect(c)
 	e4:SetOperation(cm.rmop)
 	c:RegisterEffect(e4)
 end
-function cm.matfilter(c)
-	return c:IsCanOverlay() and c:IsType(TYPE_TUNER) and c:IsLevelAbove(1) and c:IsFaceup()
+function cm.tgrfilter(c)
+	return c:IsFaceup() and c:IsLevelAbove(1) and c:IsCanOverlay()
 end
-function cm.gcheck(g,tp,c)
-	return g:CheckWithSumEqual(Card.GetLevel,11,2,2) and Duel.GetLocationCountFromEx(tp,tp,g,c)>0
+function cm.tgrfilter1(c)
+	return c:IsType(TYPE_TUNER) and c:IsLevelAbove(1)
 end
-function cm.con(e,c,tp)
-	local g=Duel.GetMatchingGroup(cm.matfilter,tp,LOCATION_MZONE,0,nil)
-	return g:CheckSubGroup(cm.gcheck,2,2,tp,c)
+function cm.mnfilter(c,g)
+	return g:IsExists(cm.mnfilter2,1,c,c)
+end
+function cm.mnfilter2(c,mc)
+	return c:GetLevel()+mc:GetLevel()==11
+end
+function cm.fselect(g,tp,sc)
+	return g:GetCount()==2
+		and g:IsExists(cm.tgrfilter1,2,nil)
+		and g:IsExists(cm.mnfilter,1,nil,g)
+		and Duel.GetLocationCountFromEx(tp,tp,g,sc)>0
+end
+function cm.con(e,c)
+	if c==nil then return true end
+	local tp=c:GetControler()
+	local g=Duel.GetMatchingGroup(cm.tgrfilter,tp,LOCATION_MZONE,0,nil)
+	return g:CheckSubGroup(cm.fselect,2,2,tp,c)
 end
 function cm.op(e,tp,eg,ep,ev,re,r,rp,c)
-	local g=Duel.GetMatchingGroup(cm.matfilter,tp,LOCATION_MZONE,0,nil)
+	local g=Duel.GetMatchingGroup(cm.tgrfilter,tp,LOCATION_MZONE,0,nil)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL)
-	local matg=g:SelectSubGroup(tp,cm.gcheck,false,2,2,tp,c)
+	local matg=g:SelectSubGroup(tp,cm.fselect,false,2,2,tp,c)
 	local og = Group.CreateGroup()
 	for tc in aux.Next(matg) do
 		og:Merge(tc:GetOverlayGroup())

expansions/strings.conf

@@ -199,7 +199,7 @@
 !setname 0x1fb5 迦陵频伽
 !setname 0x2fb5 火売
 !setname 0x4fb5 极丽六鸟
-!setname 0xfa6 普利兹姆
+!setname 0x3fa6 普利兹姆
 !setname 0xfa7 苍波
 !setname 0x3fa7 苍波玲那
 !setname 0x5fa7 苍波茅圣