From d8a3a408dfeebed0906a78d7e2c52891b8f30c10 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Mon, 16 Jul 2018 10:47:28 -0400 Subject: [PATCH] fixed Vivien Reid's first ability not putting cards back in a random order --- Mage.Sets/src/mage/cards/v/VivienReid.java | 8 ++++++-- .../common/LookLibraryAndPickControllerEffect.java | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Mage.Sets/src/mage/cards/v/VivienReid.java b/Mage.Sets/src/mage/cards/v/VivienReid.java index 2e3468420a7..219a8c5a3cd 100644 --- a/Mage.Sets/src/mage/cards/v/VivienReid.java +++ b/Mage.Sets/src/mage/cards/v/VivienReid.java @@ -14,6 +14,7 @@ import mage.constants.SuperType; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; +import mage.constants.Zone; import mage.filter.FilterCard; import mage.filter.FilterPermanent; import mage.filter.predicate.Predicates; @@ -56,8 +57,11 @@ public final class VivienReid extends CardImpl { // +1: Look at the top four cards of your library. You may reveal a creature or land card from among them and put it into your hand. Put the rest on the bottom of your library in any order. this.addAbility(new LoyaltyAbility( new LookLibraryAndPickControllerEffect( - new StaticValue(4), false, new StaticValue(1), filter, false - ), 1 + new StaticValue(4), false, new StaticValue(1), filter, + Zone.LIBRARY, false, true, false, Zone.HAND, true, false, false) + .setBackInRandomOrder(true) + .setText("Look at the top four cards of your library. You may reveal a creature or land card from among them" + + " and put it into your hand. Put the rest on the bottom of your library in a random order."), 1 )); // -3: Destroy target artifact, enchantment, or creature with flying. diff --git a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java index d27e8f43208..285dd2b9fa8 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/LookLibraryAndPickControllerEffect.java @@ -61,6 +61,7 @@ public class LookLibraryAndPickControllerEffect extends LookLibraryControllerEff private boolean putOnTopSelected; private boolean anyOrder; + //TODO: These constructors are a mess public LookLibraryAndPickControllerEffect(DynamicValue numberOfCards, boolean mayShuffleAfter, DynamicValue numberToPick, FilterCard pickFilter, boolean putOnTop) {