Merge remote-tracking branch 'upstream/master' into master

c30964246.lua

@@ -64,6 +64,9 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
 		end
 	end
 end
+function s.filter(c,e)
+	return c:IsAbleToHand() and c:IsCanBeEffectTarget(e)
+end
 function s.thfilters(c)
 	return c:IsFaceup() and c:IsAllTypes(TYPE_CONTINUOUS|TYPE_TRAP) and c:IsSetCard(0x1c1)
 end
@@ -71,7 +74,7 @@ function s.sgselect(g)
 	return g:IsExists(s.thfilters,1,nil)
 end
 function s.thtg1(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	local g=Duel.GetMatchingGroup(Card.IsAbleToHand,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil)
+	local g=Duel.GetMatchingGroup(s.filter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil,e)
 	if chkc then return false end
 	if chk==0 then return g:CheckSubGroup(s.sgselect,2,2) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)

c58071334.lua

@@ -38,8 +38,9 @@ end
 function s.mfilter2(c)
 	return c:IsRace(RACE_ILLUSION)
 end
-function s.sprfilter(c)
-	return c:GetOriginalType()&TYPE_MONSTER~=0 and c:IsFaceup() and c:IsAbleToGraveAsCost()
+function s.sprfilter(c,sc)
+	return c:GetOriginalType()&TYPE_MONSTER~=0 and c:IsFaceup()
+		and c:IsAbleToGraveAsCost() and c:IsCanBeFusionMaterial(sc,SUMMON_TYPE_SPECIAL)
 end
 function s.sgchk(g,tp,sc)
 	return Duel.GetLocationCountFromEx(tp,tp,g,sc)>0
@@ -47,12 +48,12 @@ end
 function s.hspcon(e,c)
 	if c==nil then return true end
 	local tp=c:GetControler()
-	local g=Duel.GetMatchingGroup(s.sprfilter,tp,LOCATION_SZONE,0,e:GetHandler())
+	local g=Duel.GetMatchingGroup(s.sprfilter,tp,LOCATION_SZONE,0,c,c)
 	return g:CheckSubGroup(s.sgchk,2,2,tp,c)
 end
 function s.hsptg(e,tp,eg,ep,ev,re,r,rp,chk,c)
 	local cp=c:GetControler()
-	local g=Duel.GetMatchingGroup(s.sprfilter,cp,LOCATION_SZONE,0,nil)
+	local g=Duel.GetMatchingGroup(s.sprfilter,cp,LOCATION_SZONE,0,c,c)
 	Duel.Hint(HINT_SELECTMSG,cp,HINTMSG_TOGRAVE)
 	local sg=g:SelectSubGroup(cp,s.sgchk,true,2,2,cp,c)
 	if sg then

c95095116.lua

@@ -31,8 +31,8 @@ function s.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 c95095116.material_type=TYPE_SYNCHRO
-function s.mfilter(c)
-	return c:IsFaceup() and c:IsLocation(LOCATION_MZONE)
+function s.mfilter(c,fc)
+	return c:IsFaceup() and c:IsLocation(LOCATION_MZONE) and c:IsControler(fc:GetControler())
 end
 function s.negcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()