fix

expansions/script/c10150099.lua

@@ -8,7 +8,7 @@ function cm.initial_effect(c)
 	local e1=rsef.SV_CANNOT_BE_MATERIAL(c,"xyz")
 	local e2=rsef.STO(c,EVENT_ATTACK_ANNOUNCE,{m,1},nil,"dis,atk",nil,cm.atkcon,rscost.rmxyz(2),cm.atktg,cm.atkop)
 end
-cm.xyz_number=62
+aux.xyz_number[10150099]=62
 function cm.ovfilter(c)
 	return c:IsFaceup() and c:IsSetCard(0x107b) and c:IsType(TYPE_XYZ) and c:IsRank(8)
 end

expansions/script/c114514.lua

@@ -22,6 +22,7 @@ function c114514.initial_effect(c)
 	e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	c:RegisterEffect(e3)
 end
+aux.xyz_number[114514]=114514
 function c114514.rfilter(c,tp)
 	return c:IsControler(tp) and c:IsFaceup() and not c:IsCode(114514)
 end

expansions/script/c12825613.lua

@@ -62,8 +62,7 @@ end
 function c12825613.drop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)
-	Duel.Draw(p,d,REASON_EFFECT)
-	if c:GetOwner()~=e:GetHandlerPlayer() then
+	if Duel.Draw(p,d,REASON_EFFECT)>0 and c:GetOwner()~=e:GetHandlerPlayer() then
 		if Duel.GetLocationCount(1-tp,LOCATION_MZONE)>0 then
 			Duel.GetControl(c,1-tp)
 		else

expansions/script/c13131368.lua

@@ -37,6 +37,7 @@ function cm.initial_effect(c)
 	e3:SetOperation(cm.remop)
 	c:RegisterEffect(e3)
 end
+aux.xyz_number[m]=21
 function cm.ovfilter(c)
 	return c:IsFaceup() and c:IsXyzType(TYPE_XYZ) and c:IsRank(6)
 end

expansions/script/c20220679.lua

@@ -80,7 +80,7 @@ function s.initial_effect(c)
 	e12:SetOperation(s.penop)
 	c:RegisterEffect(e12)
 end
-s.xyz_number=95
+aux.xyz_number[id]=95
 s.pendulum_level=9
 function s.chlimit(e,ep,tp)
 	return tp==ep

expansions/script/c20220680.lua

@@ -37,7 +37,7 @@ function s.initial_effect(c)
 	e3:SetOperation(s.op)
 	c:RegisterEffect(e3)
 end
-s.xyz_number=107
+aux.xyz_number[id]=107
 function s.cfilter(c)
 	return c:IsSetCard(0x95) and c:IsType(TYPE_SPELL) and c:IsDiscardable()
 end

expansions/script/c22348446.lua

@@ -24,6 +24,7 @@ function c22348446.initial_effect(c)
 	e2:SetOperation(c22348446.op)
 	c:RegisterEffect(e2)
 end
+aux.xyz_number[22348446]=90
 function c22348446.discon(e,tp,eg,ep,ev,re,r,rp)
 	return re:IsActiveType(TYPE_SPELL+TYPE_TRAP) or Duel.IsChainDisablable(ev)
 end

expansions/script/c31400115.lua

@@ -25,7 +25,7 @@ function cm.initial_effect(c)
 	e2:SetOperation(cm.desop)
 	c:RegisterEffect(e2)
 end
-cm.xyz_number=39
+aux.xyz_number[m]=39
 function cm.efilter(e,te)
 	local tc=te:GetHandler()
 	if tc==e:GetHandler() then return false end

expansions/script/c4875102.lua

@@ -43,7 +43,7 @@ function c4875102.initial_effect(c)
 	e7:SetValue(aux.xyzlimit)
 	c:RegisterEffect(e7)
 end
-c4875102.xyz_number=62
+aux.xyz_number[4875102]=62
 function c4875102.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,2,REASON_COST) end
 	e:GetHandler():RemoveOverlayCard(tp,2,2,REASON_COST)

expansions/script/c49678550.lua

@@ -28,8 +28,7 @@ function c49678550.initial_effect(c)
 	e2:SetOperation(c49678550.spop)
 	c:RegisterEffect(e2)
 end
-c49678550.xyz_number=102
-
+aux.xyz_number[49678550]=102
 function c49678550.counterfilter(c)
 	return c:IsSetCard(0x86) or not c:IsSummonLocation(LOCATION_HAND) or not c:IsSummonLocation(LOCATION_GRAVE)
 end

expansions/script/c70002120.lua

@@ -86,16 +86,17 @@ function cm.initial_effect(c)
 	e12:SetOperation(cm.atkop)
 	c:RegisterEffect(e12)
 end
-	function cm.spfilter(c)
+aux.xyz_number[m]=1500
+function cm.spfilter(c)
 	return c:IsSetCard(0x1115) and c:IsAbleToRemoveAsCost() and not c:IsCode(m)
 end
-	function cm.spcon(e,c)
+function cm.spcon(e,c)
 	if c==nil then return true end
 	local tp=c:GetControler()
 	return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and Duel.IsExistingMatchingCard(cm.spfilter,tp,LOCATION_EXTRA,0,14,c)
 end
-	function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk,c)
+function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk,c)
 	local g=Duel.GetMatchingGroup(cm.spfilter,tp,LOCATION_EXTRA,0,c)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 	local sg=g:CancelableSelect(tp,14,14,nil)
@@ -110,56 +111,56 @@ end
 	Duel.Remove(g,POS_FACEDOWN,REASON_SPSUMMON)
 	g:DeleteGroup()
 end
-	function cm.atkval(e,c)
+function cm.atkval(e,c)
 	if Duel.GetTurnPlayer()==1-e:GetHandlerPlayer() then
 		return 150000
 	else
 		return 1500
 	end
 end
-	function cm.indtg(e,c)
+function cm.indtg(e,c)
 	return c:IsCode(m)
 end
-	function cm.efilter(e,re)
+function cm.efilter(e,re)
 	return e:GetHandlerPlayer()~=re:GetOwnerPlayer()
 end
-	function cm.wincon(e,tp,eg,ep,ev,re,r,rp)
+function cm.wincon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	return c:IsPreviousControler(tp) and c:GetReasonPlayer()==1-tp
 end
-	function cm.winop(e,tp,eg,ep,ev,re,r,rp)
+function cm.winop(e,tp,eg,ep,ev,re,r,rp)
 	local WIN_REASON_NUMERONIUS_NUMERONIA=0x21
 	Duel.Win(tp,WIN_REASON_NUMERONIUS_NUMERONIA)
 end
-	function cm.filter(c)
+function cm.filter(c)
 	return c:IsSetCard(0x115) and c:IsAbleToGrave()
 end
-	function cm.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
+function cm.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_DECK,0,1,nil) end
 	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,tp,LOCATION_DECK)
 end
-	function cm.tgop(e,tp,eg,ep,ev,re,r,rp)
+function cm.tgop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
 	local g=Duel.SelectMatchingCard(tp,cm.filter,tp,LOCATION_DECK,0,1,1,nil)
 	Duel.SendtoGrave(g,REASON_EFFECT)
 end
-	function cm.thfilter(c,tp)
+function cm.thfilter(c,tp)
 	return c:IsSetCard(0x115) and c:IsType(TYPE_SPELL) and c:IsAbleToHand()
 end
-	function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and cm.thfilter(chkc) end
 	if chk==0 then return Duel.IsExistingTarget(cm.thfilter,tp,LOCATION_GRAVE,0,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 	local sg=Duel.SelectTarget(tp,cm.thfilter,tp,LOCATION_GRAVE,0,1,1,nil)
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,sg,1,0,0)
 end
-	function cm.thop(e,tp,eg,ep,ev,re,r,rp)
+function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
 	if tc:IsRelateToEffect(e) then
 		Duel.SendtoHand(tc,nil,REASON_EFFECT)
 	end
 end
-	function cm.op(e,tp,eg,ep,ev,re,r,rp)
+function cm.op(e,tp,eg,ep,ev,re,r,rp)
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e1:SetCode(EVENT_PHASE+PHASE_END)
@@ -169,15 +170,15 @@ end
 	e1:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e1,tp)
 end
-	function cm.opfilter(c,tp)
+function cm.opfilter(c,tp)
 	return c:IsSetCard(0x115) and c:IsType(TYPE_SPELL) and c:IsAbleToHand()
 		and not Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_GRAVE,0,1,nil,c:GetCode())
 end
-	function cm.tg2(e,tp,eg,ep,ev,re,r,rp,chk)
+function cm.tg2(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.opfilter,tp,LOCATION_DECK,0,1,nil,tp) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
 end
-	function cm.op2(e,tp,eg,ep,ev,re,r,rp)
+function cm.op2(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 	local g=Duel.SelectMatchingCard(tp,cm.opfilter,tp,LOCATION_DECK,0,1,1,nil,tp)
 	if g:GetCount()>0 then
@@ -185,13 +186,13 @@ end
 		Duel.ConfirmCards(1-tp,g)
 	end
 end
-	function cm.atktg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+function cm.atktg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and chkc:IsFaceup() end
 	if chk==0 then return Duel.IsExistingTarget(Card.IsFaceup,tp,0,LOCATION_MZONE,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
 	Duel.SelectTarget(tp,Card.IsFaceup,tp,0,LOCATION_MZONE,1,1,nil)
 end
-	function cm.atkop(e,tp,eg,ep,ev,re,r,rp)
+function cm.atkop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
 	if tc:IsRelateToEffect(e) then
 		local e1=Effect.CreateEffect(e:GetHandler())

expansions/script/c7407235.lua

@@ -38,7 +38,7 @@ function s.initial_effect(c)
 	e2:SetOperation(s.operation)
 	c:RegisterEffect(e2)
 end
-s.xyz_number=69
+aux.xyz_number[id]=69
 --Xyz Summon(normal)
 function s.Xyzfilter2(c,sc)
 	return c:IsSetCard(0x76) and c:IsCanBeXyzMaterial(sc) and c:IsXyzLevel(sc,4)

expansions/script/c79029505.lua

@@ -55,7 +55,7 @@ function c79029505.initial_effect(c)
 	e6:SetValue(1)
 	c:RegisterEffect(e6)
 end
-c79029505.xyz_number=88
+aux.xyz_number[79029505]=88
 function c79029505.sprfilter(c)
 	return c:GetOriginalLevel()==10 and c:IsFaceup() and c:IsCanOverlay()
 end

expansions/script/c79029506.lua

@@ -59,7 +59,7 @@ function c79029506.initial_effect(c)
 	e7:SetOperation(c79029506.spop)
 	c:RegisterEffect(e7)
 end
-c79029506.xyz_number=5
+aux.xyz_number[79029506]=5
 function c79029506.atkval(e,c)
 	local g=e:GetHandler():GetOverlayGroup()
 	return g:GetCount()*1500

expansions/script/c79029515.lua

@@ -49,7 +49,7 @@ function c79029515.initial_effect(c)
 	e1:SetValue(c79029515.splimit)
 	c:RegisterEffect(e1)
 end
-c79029515.xyz_number=103
+aux.xyz_number[79029515]=103
 function c79029515.splimit(e,se,sp,st)
 	return se:GetHandler():IsSetCard(0x95) and se:GetHandler():IsType(TYPE_SPELL)
 end

expansions/script/c79029516.lua

@@ -41,7 +41,7 @@ function c79029516.initial_effect(c)
 	e4:SetOperation(c79029516.spop)
 	c:RegisterEffect(e4)
 end
-c79029516.xyz_number=53
+aux.xyz_number[79029516]=53
 function c79029516.ovfilter(c)
 	return c:IsFaceup() and c:IsCode(23998625)
 end

expansions/script/c79029520.lua

@@ -45,7 +45,7 @@ function c79029520.initial_effect(c)
 	e3:SetOperation(c79029520.spop1)
 	c:RegisterEffect(e3)
 end
-c79029520.xyz_number=62
+aux.xyz_number[79029520]=62
 function c79029520.atkval(e,c)
 	return c:GetOverlayCount()*500
 end

expansions/script/c79029521.lua

@@ -38,7 +38,7 @@ function c79029521.initial_effect(c)
 	e5:SetCode(EVENT_BECOME_TARGET)
 	c:RegisterEffect(e5)
 end
-c79029521.xyz_number=69
+aux.xyz_number[79029521]=69
 function c79029521.effilter(c)
 	return c:IsType(TYPE_MONSTER) and c:IsFaceup()
 end

expansions/script/c79029525.lua

@@ -33,6 +33,7 @@ function c79029525.initial_effect(c)
 	e3:SetOperation(c79029525.op)
 	c:RegisterEffect(e3)
 end
+aux.xyz_number[79029525]=65
 function c79029525.eqcon(e,tp,eg,ep,ev,re,r,rp)
 	local ec=e:GetLabelObject()
 	return ec==nil or ec:GetFlagEffect(79029525)==0 and e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)

expansions/script/c79029526.lua

@@ -53,7 +53,7 @@ function c79029526.initial_effect(c)
 	e1:SetValue(c79029526.splimit)
 	c:RegisterEffect(e1)
 end
-c79029526.xyz_number=101
+aux.xyz_number[79029526]=101
 function c79029526.splimit(e,se,sp,st)
 	return se:GetHandler():IsSetCard(0x95) and se:GetHandler():IsType(TYPE_SPELL)
 end

expansions/script/c79029528.lua

@@ -44,7 +44,7 @@ function c79029528.initial_effect(c)
 	e1:SetValue(c79029528.splimit)
 	c:RegisterEffect(e1)
 end
-c79029528.xyz_number=104
+aux.xyz_number[79029528]=104
 function c79029528.splimit(e,se,sp,st)
 	return se:GetHandler():IsSetCard(0x95) and se:GetHandler():IsType(TYPE_SPELL)
 end

expansions/script/c79029530.lua

@@ -37,7 +37,7 @@ function c79029530.initial_effect(c)
 	e3:SetOperation(c79029530.atkop)
 	c:RegisterEffect(e3)
 end
-c79029530.xyz_number=39
+aux.xyz_number[79029530]=39
 function c79029530.condition(e,tp,eg,ep,ev,re,r,rp,chk)
 	return not e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED) and ep~=tp
 end

expansions/script/c79029531.lua

@@ -40,7 +40,7 @@ function c79029531.initial_effect(c)
 	e1:SetValue(c79029531.splimit)
 	c:RegisterEffect(e1)
 end
-c79029531.xyz_number=106
+aux.xyz_number[79029531]=106
 function c79029531.splimit(e,se,sp,st)
 	return se:GetHandler():IsSetCard(0x95) and se:GetHandler():IsType(TYPE_SPELL)
 end

expansions/script/c79029532.lua

@@ -61,6 +61,7 @@ function c79029532.initial_effect(c)
 	e8:SetOperation(c79029532.atkop)
 	c:RegisterEffect(e8)
 end
+aux.xyz_number[79029532]=96
 function c79029532.target(e,c)
 	return c:IsLocation(LOCATION_MZONE)
 end

expansions/script/c79029533.lua

@@ -25,7 +25,7 @@ function c79029533.initial_effect(c)
 	e3:SetOperation(c79029533.op)
 	c:RegisterEffect(e3)	
 end
-c79029533.xyz_number=54
+aux.xyz_number[79029533]=54
 function c79029533.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	 if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end
 	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)

expansions/script/c79029534.lua

@@ -25,6 +25,7 @@ function c79029534.initial_effect(c)
 	e2:SetOperation(c79029534.dcop)
 	c:RegisterEffect(e2) 
 end
+aux.xyz_number[79029534]=39
 function c79029534.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end
 	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)

expansions/script/c79029549.lua

@@ -44,7 +44,7 @@ function c79029549.initial_effect(c)
 	e5:SetOperation(c79029549.activate)
 	c:RegisterEffect(e5)
 end
-c79029549.xyz_number=99
+aux.xyz_number[79029549]=99
 function c79029549.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end
 	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)

expansions/script/c79029550.lua

@@ -45,7 +45,7 @@ function c79029550.initial_effect(c)
 	e5:SetOperation(c79029550.rop)
 	c:RegisterEffect(e5)
 end
-c79029550.xyz_number=0
+aux.xyz_number[79029550]=0
 function c79029550.mfilter(c,xyzc)
 	return c:IsXyzType(TYPE_XYZ)
 end

expansions/script/c79029555.lua

@@ -59,7 +59,7 @@ function c79029555.initial_effect(c)
 	e1:SetValue(c79029555.splimit)
 	c:RegisterEffect(e1)
 end
-c79029555.xyz_number=105
+aux.xyz_number[79029555]=105
 function c79029555.splimit(e,se,sp,st)
 	return se:GetHandler():IsSetCard(0x95) and se:GetHandler():IsType(TYPE_SPELL)
 end

expansions/script/c79029556.lua

@@ -49,7 +49,7 @@ function c79029556.initial_effect(c)
 	e1:SetValue(c79029556.splimit)
 	c:RegisterEffect(e1)
 end
-c79029556.xyz_number=102
+aux.xyz_number[79029556]=102
 function c79029556.splimit(e,se,sp,st)
 	return se:GetHandler():IsSetCard(0x95) and se:GetHandler():IsType(TYPE_SPELL)
 end

expansions/script/c79029557.lua

@@ -35,7 +35,7 @@ function c79029557.initial_effect(c)
 	e1:SetValue(c79029557.splimit)
 	c:RegisterEffect(e1)
 end
-c79029557.xyz_number=107
+aux.xyz_number[79029557]=107
 function c79029557.splimit(e,se,sp,st)
 	return se:GetHandler():IsSetCard(0x95) and se:GetHandler():IsType(TYPE_SPELL)
 end

expansions/script/c79029560.lua

@@ -37,7 +37,7 @@ function c79029560.initial_effect(c)
 	e5:SetOperation(c79029560.slop)
 	c:RegisterEffect(e5)
 end
-c79029560.xyz_number=89
+aux.xyz_number[79029560]=89
 function c79029560.rmcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end
 	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)

expansions/script/c79029561.lua

@@ -65,7 +65,7 @@ function c79029561.initial_effect(c)
 		Duel.RegisterEffect(ge1,0)
 	end
 end
-c79029561.xyz_number=92
+aux.xyz_number[79029561]=92
 function c79029561.checkop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=eg:GetFirst()
 	while tc do

expansions/script/c79029562.lua

@@ -36,7 +36,7 @@ function c79029562.initial_effect(c)
 	e3:SetOperation(c79029562.rop)
 	c:RegisterEffect(e3)
 end
-c79029562.xyz_number=73
+aux.xyz_number[79029562]=73
 function c79029562.atkcon(e,tp,eg,ep,ev,re,r,rp)
 	local a=Duel.GetAttacker()
 	local d=Duel.GetAttackTarget()

expansions/script/c91300052.lua

@@ -39,7 +39,7 @@ function s.initial_effect(c)
 	e5:SetRange(LOCATION_MZONE)
 	e5:SetTargetRange(1,1)
 	e5:SetValue(s.aclimit)
-	Duel.RegisterEffect(e5)
+	c:RegisterEffect(e5)
 	--tograve
 	local e6=Effect.CreateEffect(c)
 	e6:SetCategory(CATEGORY_TOGRAVE)