fix (#850)

c1686814.lua

@@ -41,25 +41,34 @@ function c1686814.initial_effect(c)
 	e5:SetValue(1)
 	c:RegisterEffect(e5)
 end
-function c1686814.sprfilter1(c,tp)
+function c1686814.sprfilter(c,ft)
+	return c:IsFaceup() and c:GetLevel()>4 and c:IsAbleToGraveAsCost()
+end
+function c1686814.sprfilter1(c,ft,g)
 	local lv=c:GetLevel()
-	return lv>4 and c:IsFaceup() and c:IsType(TYPE_TUNER) and c:IsAbleToGraveAsCost()
-		and Duel.IsExistingMatchingCard(c1686814.sprfilter2,tp,LOCATION_MZONE,0,1,nil,lv)
+	local chk=false
+	if ft>0 or c:CheckMZoneFromEX() then chk=true end
+	return c:IsType(TYPE_TUNER) and g:IsExists(c1686814.sprfilter2,1,c,lv,ft,chk)
 end
-function c1686814.sprfilter2(c,lv)
-	return c:IsFaceup() and c:GetLevel()==lv and not c:IsType(TYPE_TUNER) and c:IsAbleToGraveAsCost()
+function c1686814.sprfilter2(c,lv,ft,chk)
+	return (chk or ft>0 or c:CheckMZoneFromEX()) and c:GetLevel()==lv and not c:IsType(TYPE_TUNER)
 end
 function c1686814.sprcon(e,c)
 	if c==nil then return true end
 	local tp=c:GetControler()
-	return Duel.GetLocationCount(tp,LOCATION_MZONE)>-2
-		and Duel.IsExistingMatchingCard(c1686814.sprfilter1,tp,LOCATION_MZONE,0,1,nil,tp)
+	local ft=Duel.GetLocationCountFromEx(tp)
+	local g=Duel.GetMatchingGroup(c1686814.sprfilter,tp,LOCATION_MZONE,0,nil,ft)
+	return ft>-2 and g:IsExists(c1686814.sprfilter1,1,nil,ft,g)
 end
 function c1686814.sprop(e,tp,eg,ep,ev,re,r,rp,c)
+	local ft=Duel.GetLocationCountFromEx(tp)
+	local g=Duel.GetMatchingGroup(c1686814.sprfilter,tp,LOCATION_MZONE,0,nil,ft)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
-	local g1=Duel.SelectMatchingCard(tp,c1686814.sprfilter1,tp,LOCATION_MZONE,0,1,1,nil,tp)
+	local g1=g:FilterSelect(tp,c1686814.sprfilter1,1,1,nil,ft,g)
+	local chk=false
+	if ft>0 or g1:GetFirst():CheckMZoneFromEX() then chk=true end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
-	local g2=Duel.SelectMatchingCard(tp,c1686814.sprfilter2,tp,LOCATION_MZONE,0,1,1,nil,g1:GetFirst():GetLevel())
+	local g2=g:FilterSelect(tp,c1686814.sprfilter2,1,1,g1:GetFirst(),g1:GetFirst():GetLevel(),ft,chk)
 	g1:Merge(g2)
 	Duel.SendtoGrave(g1,REASON_COST)
 end
@@ -71,12 +80,12 @@ function c1686814.spfilter(c,e,tp)
 		and c:IsType(TYPE_SYNCHRO) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c1686814.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
+	if chk==0 then return Duel.GetLocationCountFromEx(tp)>0
 		and Duel.IsExistingMatchingCard(c1686814.spfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
 end
 function c1686814.spop(e,tp,eg,ep,ev,re,r,rp)
-	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
+	if Duel.GetLocationCountFromEx(tp)<=0 then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local g=Duel.SelectMatchingCard(tp,c1686814.spfilter,tp,LOCATION_EXTRA,0,1,1,nil,e,tp)
 	if g:GetCount()>0 then

c90884403.lua

@@ -46,25 +46,34 @@ function c90884403.initial_effect(c)
 	e5:SetOperation(c90884403.spop)
 	c:RegisterEffect(e5)
 end
-function c90884403.sprfilter1(c,tp)
+function c90884403.sprfilter(c,ft)
+	return c:IsFaceup() and c:GetLevel()>7 and c:IsAbleToGraveAsCost()
+end
+function c90884403.sprfilter1(c,ft,g)
 	local lv=c:GetLevel()
-	return lv>7 and c:IsFaceup() and c:IsType(TYPE_TUNER) and c:IsAbleToGraveAsCost()
-		and Duel.IsExistingMatchingCard(c90884403.sprfilter2,tp,LOCATION_MZONE,0,1,nil,lv)
+	local chk=false
+	if ft>0 or c:CheckMZoneFromEX() then chk=true end
+	return c:IsType(TYPE_TUNER) and g:IsExists(c90884403.sprfilter2,1,c,lv,ft,chk)
 end
-function c90884403.sprfilter2(c,lv)
-	return c:IsFaceup() and c:GetLevel()==lv and not c:IsType(TYPE_TUNER) and c:IsAbleToGraveAsCost()
+function c90884403.sprfilter2(c,lv,ft,chk)
+	return (chk or ft>0 or c:CheckMZoneFromEX()) and c:GetLevel()==lv and not c:IsType(TYPE_TUNER)
 end
 function c90884403.sprcon(e,c)
 	if c==nil then return true end
 	local tp=c:GetControler()
-	return Duel.GetLocationCount(tp,LOCATION_MZONE)>-2
-		and Duel.IsExistingMatchingCard(c90884403.sprfilter1,tp,LOCATION_MZONE,0,1,nil,tp)
+	local ft=Duel.GetLocationCountFromEx(tp)
+	local g=Duel.GetMatchingGroup(c90884403.sprfilter,tp,LOCATION_MZONE,0,nil,ft)
+	return ft>-2 and g:IsExists(c90884403.sprfilter1,1,nil,ft,g)
 end
 function c90884403.sprop(e,tp,eg,ep,ev,re,r,rp,c)
+	local ft=Duel.GetLocationCountFromEx(tp)
+	local g=Duel.GetMatchingGroup(c90884403.sprfilter,tp,LOCATION_MZONE,0,nil,ft)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
-	local g1=Duel.SelectMatchingCard(tp,c90884403.sprfilter1,tp,LOCATION_MZONE,0,1,1,nil,tp)
+	local g1=g:FilterSelect(tp,c90884403.sprfilter1,1,1,nil,ft,g)
+	local chk=false
+	if ft>0 or g1:GetFirst():CheckMZoneFromEX() then chk=true end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
-	local g2=Duel.SelectMatchingCard(tp,c90884403.sprfilter2,tp,LOCATION_MZONE,0,1,1,nil,g1:GetFirst():GetLevel())
+	local g2=g:FilterSelect(tp,c90884403.sprfilter2,1,1,g1:GetFirst(),g1:GetFirst():GetLevel(),ft,chk)
 	g1:Merge(g2)
 	Duel.SendtoGrave(g1,REASON_COST)
 end