Push by Appveyor

expansions/script/c1150012.lua

@@ -23,7 +23,7 @@ function c1150012.initial_effect(c)
 	e3:SetRange(LOCATION_FZONE)
 	e3:SetCondition(c1150012.con3)
 	e3:SetTarget(c1150012.tg3)
-	e3:SetOperation(c150012.op3)
+	e3:SetOperation(c1150012.op3)
 	c:RegisterEffect(e3)
 --
 	local e4=Effect.CreateEffect(c)
@@ -52,14 +52,14 @@ function c1150012.tfilter3(c,e,sp)
 	return c:IsRace(RACE_AQUA) and c:IsCanBeSpecialSummoned(e,0,sp,false,false) and c:GetLevel()<5 and not c:IsType(TYPE_XYZ)
 end
 function c1150012.tg3(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetMZoneCount(tp)>0
+	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and Duel.IsExistingMatchingCard(c1150012.tfilter3,tp,LOCATION_HAND,0,1,nil,e,tp) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND)
 end
 --
 function c1150012.op3(e,tp,eg,ep,ev,re,r,rp)
 	if e:GetHandler():IsRelateToEffect(e) then
-		if Duel.GetMZoneCount(tp)>0 then
+		if Duel.GetLocationCount(tp,LOCATION_MZONE)>0 then
 			if Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)==0 then 
 				Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 				local g=Duel.SelectMatchingCard(tp,c1150012.tfilter3,tp,LOCATION_HAND,0,1,1,nil,e,tp)

expansions/script/c13254107.lua

@@ -79,7 +79,7 @@ function c13254107.efilter(e,te)
 	return te:GetOwner()~=e:GetOwner()
 end
 function c13254107.drcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK) 
+	return bit.band(e:GetHandler():GetSummonType(),SUMMON_TYPE_LINK)==SUMMON_TYPE_LINK 
 end
 function c13254107.thfilter(c)
 	return c:IsSetCard(0x356) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
@@ -102,11 +102,11 @@ function c13254107.spfilter(c,e,tp)
 end
 function c13254107.spcon(e,c,sg,og)
 	local tp=e:GetHandlerPlayer()
-	return Duel.GetMZoneCount(tp)>0
+	return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and Duel.IsExistingMatchingCard(c13254107.spfilter,tp,LOCATION_HAND,0,1,nil,e,tp)
 end
 function c13254107.spop(e,tp,eg,ep,ev,re,r,rp,c,sg,og)
-	if Duel.GetMZoneCount(tp)<=0 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,c13254107.spfilter,tp,LOCATION_HAND,0,1,1,nil,e,tp)
 	sg:Merge(g)
@@ -133,7 +133,7 @@ function c13254107.splimit(e,c,sump,sumtype,sumpos,targetp)
 	return not c:IsSetCard(0x356) or not c:IsType(TYPE_MONSTER)
 end
 function c13254107.cfilter(c,tp)
-	return c:IsSetCard(0x356) and c:GetPreviousControler()==tp
+	return c:IsSetCard(0x356) and c:IsType(TYPE_MONSTER) and c:GetPreviousControler()==tp
 end
 function c13254107.descon(e,tp,eg,ep,ev,re,r,rp)
 	return not eg:IsContains(e:GetHandler()) and eg:IsExists(c13254107.cfilter,1,nil,tp)

expansions/script/c13257220.lua

@@ -102,8 +102,8 @@ function c13257220.regop(e,tp,eg,ep,ev,re,r,rp)
 end
 function c13257220.dreptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
-	if chk==0 then return not e:GetHandler():IsDisabled() end
-	if Duel.SelectYesNo(tp,aux.Stringid(13257220,1)) then
+	if chk==0 then return true end
+	if not c:IsDisabled() and Duel.SelectYesNo(tp,aux.Stringid(13257220,1)) then
 		local e4=Effect.CreateEffect(c)
 		e4:SetType(EFFECT_TYPE_SINGLE)
 		e4:SetCode(EFFECT_DISABLE)

expansions/script/c17060845.lua

@@ -96,13 +96,6 @@ end
 function c17060845.splimit(e,se,sp,st)
 	return bit.band(st,SUMMON_TYPE_FUSION)==SUMMON_TYPE_FUSION
 end
-function c17060845.spfilter1(c,tp,fc)
-	return c:IsType(TYPE_PENDULUM) and c:IsCanBeFusionMaterial(fc) and c:IsAbleToDeckOrExtraAsCost()
-end
-function c17060845.spfilter2(c,fc)
-	return c:IsType(TYPE_FUSION) and c:IsRace(RACE_WARRIOR) and c:IsCanBeFusionMaterial(fc) and c:IsAbleToDeckOrExtraAsCost()
-end
-
 function c17060845.spfilter1(c,tp,g)
 	return g:IsExists(c17060845.spfilter2,1,c,tp,c)
 end
@@ -112,7 +105,7 @@ function c17060845.spfilter2(c,tp,mc)
 		and Duel.GetLocationCountFromEx(tp,tp,Group.FromCards(c,mc))>0
 end
 function c17060845.matfilter(c)
-	return((c:IsType(TYPE_FUSION) and c:IsRace(RACE_WARRIOR)) or c:IsFusionType(TYPE_PENDULUM) and c:IsAbleToDeckOrExtraAsCost()
+	return((c:IsType(TYPE_FUSION) and c:IsRace(RACE_WARRIOR)) or c:IsFusionType(TYPE_PENDULUM)) and c:IsAbleToDeckOrExtraAsCost()
 end
 function c17060845.spcon(e,c)
 	if c==nil then return true end
@@ -176,7 +169,7 @@ function c17060845.sptg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
 end
 function c17060845.spop1(e,tp,eg,ep,ev,re,r,rp)
-	if Duel.GetMZoneCount(tp)<=0 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,c17060845.filter,tp,LOCATION_EXTRA,0,1,1,nil,e,tp)
 	if g:GetCount()>0 then

expansions/script/c37564054.lua

@@ -19,16 +19,17 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,0,tp,LOCATION_EXTRA)
 end
 function cm.sfilter(c)
-	return c:IsFaceup() and c:IsCanBeXyzMaterial()
+	return c:IsFaceup() and c:IsCanBeXyzMaterial(nil)
 end
 function cm.filter(c,tg,tp)
-	return Duel.IsExistingMatchingCard(cm.xfilter,tp,LOCATION_EXTRA,0,1,nil,tg,tc)
+	return Duel.IsExistingMatchingCard(cm.xfilter,tp,LOCATION_EXTRA,0,1,nil,tg,c)
 end
-function cm.xfilter(c,tg,tc)
-	return tg:IsExists(cm.mfilter,1,nil,c,tc)
+function cm.gcheck(g,xyzc)
+	local ct=g:GetCount()
+	return xyzc:IsXyzSummonable(g,ct,ct)
 end
-function cm.mfilter(c,xyzc,exc)
-	return c:IsCanBeXyzMaterial(xyzc) and exc:IsCanBeXyzMaterial(xyzc) and xyzc:IsXyzSummonable(Group.FromCards(c,exc),2,2)
+function cm.xfilter(c,tg,tc)
+	return Senya.CheckGroup(tg,cm.gcheck,Group.FromCards(tc),2,63,c)
 end
 function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	local p=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER)
@@ -36,15 +37,14 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetFieldGroup(p,0,LOCATION_HAND)
 	if g:GetCount()>0 then
 		Duel.ConfirmCards(p,g)
-		if g:IsExists(cm.filter,1,nil,tg,p) and Duel.SelectYesNo(p,37564007*16) then
+		if g:IsExists(cm.filter,1,nil,tg,p) and Duel.SelectYesNo(p,m*16) then
 			Duel.Hint(HINT_SELECTMSG,p,HINTMSG_XMATERIAL)
 			local g1=g:FilterSelect(p,cm.filter,1,1,nil,tg,p)
 			Duel.Hint(HINT_SELECTMSG,p,HINTMSG_SPSUMMON)
 			local xyzc=Duel.SelectMatchingCard(p,cm.xfilter,p,LOCATION_EXTRA,0,1,1,nil,tg,g1:GetFirst()):GetFirst()
-			Duel.Hint(HINT_SELECTMSG,p,HINTMSG_XMATERIAL)
-			local g2=tg:FilterSelect(p,cm.mfilter,1,1,nil,xyzc,g1:GetFirst())
-			g1:Merge(g2)
-			Duel.XyzSummon(p,xyzc,g1)
+			local mg=Senya.SelectGroup(tp,HINTMSG_XMATERIAL,tg,cm.gcheck,g1,2,63,xyzc)
+			Duel.XyzSummon(p,xyzc,mg)
 		end
 	end
+	Duel.ShuffleHand(1-p)
 end
\ No newline at end of file