From b29bb5ac155d48f1d08fa3849573fb492b0e560b Mon Sep 17 00:00:00 2001
From: Brian Hill <cbrianhill@gmail.com>
Date: Mon, 15 Jun 2015 22:09:31 -0400
Subject: [PATCH] Finish adding Dreamborn Muse
---
Mage.Sets/src/mage/sets/legions/DreambornMuse.java | 12 ++++++------
...dCount.java => CardsInTargetPlayerHandCount.java} | 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
rename Mage/src/mage/abilities/dynamicvalue/common/{CardsInTargetHandCount.java => CardsInTargetPlayerHandCount.java} (71%)
diff --git a/Mage.Sets/src/mage/sets/legions/DreambornMuse.java b/Mage.Sets/src/mage/sets/legions/DreambornMuse.java
index 418e75355e..15de5eceeb 100644
--- a/Mage.Sets/src/mage/sets/legions/DreambornMuse.java
+++ b/Mage.Sets/src/mage/sets/legions/DreambornMuse.java
@@ -30,7 +30,7 @@ package mage.sets.legions;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
-import mage.abilities.dynamicvalue.common.CardsInTargetHandCount;
+import mage.abilities.dynamicvalue.common.CardsInTargetPlayerHandCount;
import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
@@ -49,9 +49,13 @@ public class DreambornMuse extends CardImpl {
this.subtype.add("Spirit");
this.power = new MageInt(2);
this.toughness = new MageInt(2);
+
+ PutLibraryIntoGraveTargetEffect effect = new PutLibraryIntoGraveTargetEffect(new CardsInTargetPlayerHandCount());
+ effect.setText("that player puts the top X cards of his or her library into his or her graveyard, where X is the number of cards in his or her hand.");
// At the beginning of each player's upkeep, that player puts the top X cards of his or her library into his or her graveyard, where X is the number of cards in his or her hand.
- this.addAbility(new BeginningOfUpkeepTriggeredAbility(new PutLibraryIntoGraveTargetEffect(new CardsInTargetHandCount()), TargetController.ANY, false));
+ this.addAbility(new BeginningOfUpkeepTriggeredAbility(effect, TargetController.ANY, false));
+
}
public DreambornMuse(final DreambornMuse card) {
@@ -63,7 +67,3 @@ public class DreambornMuse extends CardImpl {
return new DreambornMuse(this);
}
}
-
-class DreambornMuseEffect {
-
-}
diff --git a/Mage/src/mage/abilities/dynamicvalue/common/CardsInTargetHandCount.java b/Mage/src/mage/abilities/dynamicvalue/common/CardsInTargetPlayerHandCount.java
similarity index 71%
rename from Mage/src/mage/abilities/dynamicvalue/common/CardsInTargetHandCount.java
rename to Mage/src/mage/abilities/dynamicvalue/common/CardsInTargetPlayerHandCount.java
index 4bff7fb799..8c7807eb0d 100644
--- a/Mage/src/mage/abilities/dynamicvalue/common/CardsInTargetHandCount.java
+++ b/Mage/src/mage/abilities/dynamicvalue/common/CardsInTargetPlayerHandCount.java
@@ -10,17 +10,17 @@ import mage.players.Player;
*
* @author cbrianhill
*/
-public class CardsInTargetHandCount implements DynamicValue {
+public class CardsInTargetPlayerHandCount implements DynamicValue {
@Override
public int calculate(Game game, Ability sourceAbility, Effect effect) {
- Player player = game.getPlayer(sourceAbility.getFirstTarget());
+ Player player = game.getPlayer(effect.getTargetPointer().getFirst(game, sourceAbility));
return player.getHand().size();
}
@Override
public DynamicValue copy() {
- return new CardsInTargetHandCount();
+ return new CardsInTargetPlayerHandCount();
}
@Override