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

c10158145.lua

@@ -87,7 +87,7 @@ function c10158145.spop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c10158145.splimit(e,c,sump,sumtype,sumpos,targetp)
-	return not c:IsType(TYPE_LINK)
+	return c:GetOriginalType()&TYPE_LINK~=TYPE_LINK
 end
 function c10158145.condition(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD) and e:GetHandler():IsPreviousControler(tp)

c63060238.lua

@@ -87,5 +87,5 @@ function c63060238.tgop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e5,tp)
 end
 function c63060238.splimit(e,c,tp,sumtp,sumpos)
-	return not c:IsType(TYPE_FUSION)
+	return c:GetOriginalType()&TYPE_FUSION~=TYPE_FUSION
 end

c64442155.lua

@@ -47,5 +47,5 @@ function c64442155.activate(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e1,tp)
 end
 function c64442155.splimit(e,c)
-	return c:GetType()&0x81~=0x81
+	return c:GetOriginalType()&0x81~=0x81
 end

c72782945.lua

@@ -66,9 +66,9 @@ function s.xop(e,tp,eg,ep,ev,re,r,rp)
 	if not c:IsRelateToEffect(e) or not c:IsLocation(LOCATION_ONFIELD) or not s.xyzfilter(c,tp,e) then return end
 	local tc=Duel.GetFirstTarget()
 	if not tc:IsRelateToEffect(e) or tc:IsImmuneToEffect(e) then return end
-	local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.xyzfilter),tp,LOCATION_MZONE+LOCATION_HAND+LOCATION_GRAVE,0,c,tp,e)
+	local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(s.xyzfilter),tp,LOCATION_MZONE+LOCATION_HAND+LOCATION_GRAVE,0,1,1,c,tp,e)
 	if g:GetCount()>0 then
-		local mg=Group.__add(c,g:Select(tp,1,1,c))
-		if mg:GetCount()==2 then Duel.Overlay(tc,mg) end
+		local mg=c+g
+		Duel.Overlay(tc,mg)
 	end
 end