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

c4064925.lua

@@ -36,6 +36,10 @@ function c4064925.initial_effect(c)
 		ge3:SetCode(EVENT_SPSUMMON_SUCCESS)
 		ge3:SetCondition(c4064925.ssetcon)
 		Duel.RegisterEffect(ge3,0)
+		local ge4=ge1:Clone()
+		ge4:SetCode(EVENT_CHANGE_POS)
+		ge4:SetCondition(c4064925.cpcon)
+		Duel.RegisterEffect(ge4,0)	
 	end
 end
 function c4064925.checkop(e,tp,eg,ep,ev,re,r,rp)
@@ -47,6 +51,12 @@ end
 function c4064925.ssetcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(c4064925.cfilter,1,nil)
 end
+function c4064925.cfilter2(c)
+	return c:IsPreviousPosition(POS_FACEUP) and c:IsFacedown()
+end
+function c4064925.cpcon(e,tp,eg,ep,ev,re,r,rp)
+	return eg:IsExists(c4064925.cfilter2,1,nil)
+end
 function c4064925.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetFlagEffect(tp,4064925)==0 end
 	local e1=Effect.CreateEffect(e:GetHandler())

c70636044.lua

@@ -55,17 +55,13 @@ function s.distg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function s.disop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	local g=Duel.GetFieldGroup(tp,LOCATION_ONFIELD,LOCATION_ONFIELD)
-	if Duel.NegateActivation(ev)
-		and g:GetCount()>0 and c:CheckRemoveOverlayCard(tp,1,REASON_EFFECT)
+	if Duel.NegateActivation(ev) then
+		if Duel.GetMatchingGroupCount(Card.IsOnField,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil)>0
+			and c:CheckRemoveOverlayCard(tp,1,REASON_EFFECT)
 			and Duel.SelectYesNo(tp,aux.Stringid(id,3)) then
 			Duel.BreakEffect()
 			if c:RemoveOverlayCard(tp,1,1,REASON_EFFECT)~=0 then
-			if re:GetHandler():IsRelateToEffect(re) and re:IsHasType(EFFECT_TYPE_ACTIVATE) then
-				g=Duel.GetFieldGroup(tp,LOCATION_ONFIELD,LOCATION_ONFIELD):Select(tp,1,1,re:GetHandler())
-			else
-				g=Duel.GetFieldGroup(tp,LOCATION_ONFIELD,LOCATION_ONFIELD):Select(tp,1,1,nil)
-			end
+				local g=Duel.SelectMatchingCard(tp,Card.IsOnField,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,nil)
 				if #g>0 then
 					Duel.BreakEffect()
 					Duel.HintSelection(g)
@@ -73,6 +69,7 @@ function s.disop(e,tp,eg,ep,ev,re,r,rp)
 				end
 			end
 		end
+	end
 end
 function s.descon1(e)
 	local c=e:GetHandler()