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)

c12172567.lua

@@ -76,4 +76,4 @@ function s.ctop(e,tp,eg,ep,ev,re,r,rp)
 	if a:IsRelateToEffect(e) and b:IsRelateToEffect(e) then
 		Duel.SwapControl(a,b)
 	end
-end
+end
\ No newline at end of file

c16699558.lua

@@ -97,4 +97,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
 		tc:RegisterEffect(e1)
 	end
 	Duel.SpecialSummonComplete()
-end
+end
\ No newline at end of file

c17947697.lua

@@ -99,4 +99,4 @@ function s.spop2(e,tp,eg,ep,ev,re,r,rp)
 	if g:GetCount()>0 then
 		Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
 	end
-end
+end
\ No newline at end of file

c42097666.lua

@@ -106,4 +106,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
 		tc:RegisterEffect(e3)
 	end
 	Duel.SpecialSummonComplete()
-end
+end
\ No newline at end of file

c43219114.lua

@@ -56,4 +56,4 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 end
 function s.mfilter(c,e,tp,chk)
 	return (not chk or c~=e:GetHandler()) and c:IsCode(89631139)
-end
+end
\ No newline at end of file

c48705086.lua

@@ -58,4 +58,4 @@ function s.spop2(e,tp,eg,ep,ev,re,r,rp)
 	if tc:IsRelateToEffect(e) and aux.NecroValleyFilter()(tc) then
 		Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP_DEFENSE)
 	end
-end
+end
\ No newline at end of file

c54332792.lua

@@ -95,4 +95,4 @@ function s.tgop(e,tp,eg,ep,ev,re,r,rp)
 	if g:GetCount()>0 then
 		Duel.SendtoGrave(g,REASON_EFFECT)
 	end
-end
+end
\ No newline at end of file

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
+end
\ No newline at end of file

c80326401.lua

@@ -96,4 +96,4 @@ function s.eqop(e,tp,eg,ep,ev,re,r,rp)
 end
 function s.eqlimit(e,c)
 	return c==e:GetLabelObject()
-end
+end
\ No newline at end of file

c8170654.lua

@@ -70,4 +70,4 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp)
 		e2:SetValue(atk)
 		tc:RegisterEffect(e2)
 	end
-end
+end
\ No newline at end of file

c89604813.lua

@@ -85,4 +85,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
 	if g:GetCount()>0 then
 		Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
 	end
-end
+end
\ No newline at end of file

c93053159.lua

@@ -146,4 +146,4 @@ end
 function s.tgop(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetMatchingGroup(Card.IsAbleToGrave,tp,LOCATION_EXTRA,LOCATION_EXTRA,nil)
 	Duel.SendtoGrave(g,REASON_EFFECT)
-end
+end
\ No newline at end of file