From 704972b6b1c6e7670ebb856fb7f3d79c264c9c89 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Mon, 7 Jan 2019 17:25:09 +0100
Subject: [PATCH] * Lord Windgrace - Fixed tooltip rule text.

---
 Mage.Sets/src/mage/cards/l/LordWindgrace.java       | 13 +++++++------
 .../effects/common/DestroyTargetEffect.java         |  8 ++++++--
 Mage/src/main/java/mage/filter/StaticFilters.java   |  4 ++--
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/l/LordWindgrace.java b/Mage.Sets/src/mage/cards/l/LordWindgrace.java
index a4126678c59..517407e8882 100644
--- a/Mage.Sets/src/mage/cards/l/LordWindgrace.java
+++ b/Mage.Sets/src/mage/cards/l/LordWindgrace.java
@@ -10,19 +10,20 @@ import mage.abilities.effects.common.CreateTokenEffect;
 import mage.abilities.effects.common.DestroyTargetEffect;
 import mage.abilities.effects.common.ReturnFromGraveyardToBattlefieldTargetEffect;
 import mage.cards.Card;
-import mage.constants.SubType;
-import mage.constants.SuperType;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
+import mage.constants.SubType;
+import mage.constants.SuperType;
 import mage.constants.TargetController;
+import mage.filter.StaticFilters;
 import mage.filter.common.FilterLandCard;
 import mage.filter.predicate.other.OwnerPredicate;
 import mage.game.Game;
 import mage.game.permanent.token.CatWarriorToken;
 import mage.players.Player;
-import mage.target.common.TargetCardInASingleGraveyard;
+import mage.target.common.TargetCardInYourGraveyard;
 import mage.target.common.TargetNonlandPermanent;
 
 /**
@@ -49,9 +50,9 @@ public final class LordWindgrace extends CardImpl {
 
         // -3: Return up to two target land cards from your graveyard to the battlefield.
         Ability ability = new LoyaltyAbility(
-                new ReturnFromGraveyardToBattlefieldTargetEffect(), -3
+                new ReturnFromGraveyardToBattlefieldTargetEffect().setText("return up to two target land cards from your graveyard to the battlefield"), -3
         );
-        ability.addTarget(new TargetCardInASingleGraveyard(0, 2, filter));
+        ability.addTarget(new TargetCardInYourGraveyard(0, 2, filter));
         this.addAbility(ability);
 
         // -11: Destroy up to six target nonland permanents, then create six 2/2 green Cat Warrior creature tokens with forestwalk.
@@ -61,7 +62,7 @@ public final class LordWindgrace extends CardImpl {
                         .setText(", then create six 2/2 green Cat Warrior "
                                 + "creature tokens with forestwalk")
         );
-        ability.addTarget(new TargetNonlandPermanent(0, 6, false));
+        ability.addTarget(new TargetNonlandPermanent(0, 6, StaticFilters.FILTER_PERMANENTS_NON_LAND, false));
         this.addAbility(ability);
 
         // Lord Windgrace can be your commander.
diff --git a/Mage/src/main/java/mage/abilities/effects/common/DestroyTargetEffect.java b/Mage/src/main/java/mage/abilities/effects/common/DestroyTargetEffect.java
index 6c86bed0a16..b9bcf29ba8d 100644
--- a/Mage/src/main/java/mage/abilities/effects/common/DestroyTargetEffect.java
+++ b/Mage/src/main/java/mage/abilities/effects/common/DestroyTargetEffect.java
@@ -1,4 +1,3 @@
-
 package mage.abilities.effects.common;
 
 import java.util.UUID;
@@ -100,7 +99,12 @@ public class DestroyTargetEffect extends OneShotEffect {
                 }
                 sb.append(targetName);
             } else {
-                sb.append("Destroy ").append(CardUtil.numberToText(target.getNumberOfTargets())).append(" target ").append(target.getTargetName());
+                if (target.getMaxNumberOfTargets() == target.getMinNumberOfTargets()) {
+                    sb.append("destroy ").append(CardUtil.numberToText(target.getNumberOfTargets()));
+                } else {
+                    sb.append("destroy up to ").append(CardUtil.numberToText(target.getMaxNumberOfTargets()));
+                }
+                sb.append(" target ").append(target.getTargetName());
             }
         }
         if (noRegen) {
diff --git a/Mage/src/main/java/mage/filter/StaticFilters.java b/Mage/src/main/java/mage/filter/StaticFilters.java
index 4226afe8767..8b05ee0dd09 100644
--- a/Mage/src/main/java/mage/filter/StaticFilters.java
+++ b/Mage/src/main/java/mage/filter/StaticFilters.java
@@ -405,13 +405,13 @@ public final class StaticFilters {
         FILTER_PERMANENT_PLANESWALKER.setLockedFilter(true);
     }
 
-    public static final FilterPermanent FILTER_PERMANENT_NON_LAND = new FilterNonlandPermanent();
+    public static final FilterNonlandPermanent FILTER_PERMANENT_NON_LAND = new FilterNonlandPermanent();
 
     static {
         FILTER_PERMANENT_NON_LAND.setLockedFilter(true);
     }
 
-    public static final FilterPermanent FILTER_PERMANENTS_NON_LAND = new FilterNonlandPermanent("nonland permanents");
+    public static final FilterNonlandPermanent FILTER_PERMANENTS_NON_LAND = new FilterNonlandPermanent("nonland permanents");
 
     static {
         FILTER_PERMANENTS_NON_LAND.setLockedFilter(true);