Fix 終戒超獸－ヴァルドラス (#2617)

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()