ybb

expansions/script/c9310043.lua

@@ -53,12 +53,10 @@ function c9310043.spfilter2(c,e,tp,m,f,chkf)
 		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
 end
 function c9310043.fcheck(tp,sg,fc)
-	if sg:IsExists(Card.IsLocation,1,nil,LOCATION_DECK) then
-		return sg:IsExists(c9310043.chkfilter,1,nil) end
-	return sg:FilterCount(Card.IsLocation,nil,LOCATION_DECK)<=1
+	return sg:FilterCount(Card.IsLocation,nil,LOCATION_DECK)<=1 and sg:IsExists(c9310043.chkfilter,1,nil,tp)
 end
 function c9310043.gcheck(sg)
-	return sg:FilterCount(Card.IsLocation,nil,LOCATION_DECK)<=1
+	return sg:FilterCount(Card.IsLocation,nil,LOCATION_DECK)<=1 
 end
 function c9310043.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then
@@ -72,7 +70,7 @@ function c9310043.target(e,tp,eg,ep,ev,re,r,rp,chk)
 		   aux.FCheckAdditional=c9310043.fcheck
 		   aux.GCheckAdditional=c9310043.gcheck
 		end
-		res=Duel.IsExistingMatchingCard(c9310043.spfilter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg2,nil,chkf)
+		res=Duel.IsExistingMatchingCard(c9310043.spfilter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg1,nil,chkf)
 		if not res then
 			local ce=Duel.GetChainMaterial(tp)
 			if ce~=nil then
@@ -105,7 +103,7 @@ function c9310043.activate(e,tp,eg,ep,ev,re,r,rp)
 	aux.FCheckAdditional=nil
 	aux.GCheckAdditional=nil
 	local mg3=nil
-	local sg2=Duel.GetMatchingGroup(c9310043.spfilter2,tp,LOCATION_EXTRA,0,nil,e,tp,mg2,nil,chkf)
+	local sg2=Duel.GetMatchingGroup(c9310043.spfilter2,tp,LOCATION_EXTRA,0,nil,e,tp,mg1,nil,chkf)
 	sg1:Merge(sg2)
 	local sg3=nil
 	local ce=Duel.GetChainMaterial(tp)