From 7e853da353cc0aa89efd74335dbdebb758d1b32a Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sat, 9 Mar 2013 18:40:36 +0100
Subject: [PATCH] Made target of Mindslaver mandatory. Mana abilities of Wall
 of Roots and Mana Bloom are handled as mana abilities now. Improved select
 text of Chord of Calling.

---
 Mage.Sets/src/mage/sets/ravnika/ChordOfCalling.java     | 5 +++--
 Mage.Sets/src/mage/sets/returntoravnica/ManaBloom.java  | 4 ++--
 Mage.Sets/src/mage/sets/scarsofmirrodin/Mindslaver.java | 2 +-
 Mage.Sets/src/mage/sets/timeshifted/WallOfRoots.java    | 6 +++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Mage.Sets/src/mage/sets/ravnika/ChordOfCalling.java b/Mage.Sets/src/mage/sets/ravnika/ChordOfCalling.java
index 38e20eed86..3012ad8368 100644
--- a/Mage.Sets/src/mage/sets/ravnika/ChordOfCalling.java
+++ b/Mage.Sets/src/mage/sets/ravnika/ChordOfCalling.java
@@ -89,10 +89,11 @@ class ChordofCallingSearchEffect extends OneShotEffect<ChordofCallingSearchEffec
         if (player == null) {
             return false;
         }
-        FilterCard filter = new FilterCard("creature card with converted mana cost X or less");
+        int xCost = source.getManaCostsToPay().getX();
+        FilterCard filter = new FilterCard(new StringBuilder("creature card with converted mana cost ").append(xCost).append(" or less").toString());
         filter.add(new CardTypePredicate(CardType.CREATURE));
         //Set the mana cost one higher to 'emulate' a less than or equal to comparison.
-        filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.LessThan, source.getManaCostsToPay().getX() + 1));
+        filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.LessThan, xCost + 1));
         TargetCardInLibrary target = new TargetCardInLibrary(filter);
         if (player.searchLibrary(target, game)) {
             if (target.getTargets().size() > 0) {
diff --git a/Mage.Sets/src/mage/sets/returntoravnica/ManaBloom.java b/Mage.Sets/src/mage/sets/returntoravnica/ManaBloom.java
index 6d2d2d5a31..331bfab19d 100644
--- a/Mage.Sets/src/mage/sets/returntoravnica/ManaBloom.java
+++ b/Mage.Sets/src/mage/sets/returntoravnica/ManaBloom.java
@@ -37,7 +37,6 @@ import mage.Constants.Zone;
 import mage.abilities.Ability;
 import mage.abilities.SpellAbility;
 import mage.abilities.TriggeredAbility;
-import mage.abilities.common.ActivateOncePerTurnActivatedAbility;
 import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
 import mage.abilities.common.EntersBattlefieldAbility;
 import mage.abilities.condition.common.HasCounterCondition;
@@ -47,6 +46,7 @@ import mage.abilities.effects.EntersBattlefieldEffect;
 import mage.abilities.effects.OneShotEffect;
 import mage.abilities.effects.common.AddManaOfAnyColorEffect;
 import mage.abilities.effects.common.ReturnToHandSourceEffect;
+import mage.abilities.mana.ActivateOncePerTurnManaAbility;
 import mage.cards.CardImpl;
 import mage.choices.ChoiceColor;
 import mage.counters.CounterType;
@@ -71,7 +71,7 @@ public class ManaBloom extends CardImpl<ManaBloom> {
         this.addAbility(new EntersBattlefieldAbility(new ManaBloomEffect(),rule));
 
         // Remove a charge counter from Mana Bloom: Add one mana of any color to your mana pool. Activate this ability only once each turn.
-        Ability ability = new ActivateOncePerTurnActivatedAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(), new RemoveCountersSourceCost(CounterType.CHARGE.createInstance()));
+        Ability ability = new ActivateOncePerTurnManaAbility(Zone.BATTLEFIELD, new AddManaOfAnyColorEffect(), new RemoveCountersSourceCost(CounterType.CHARGE.createInstance()));
         ability.addChoice(new ChoiceColor());
         this.addAbility(ability);
 
diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/Mindslaver.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/Mindslaver.java
index 31566b2772..57a7205057 100644
--- a/Mage.Sets/src/mage/sets/scarsofmirrodin/Mindslaver.java
+++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/Mindslaver.java
@@ -56,7 +56,7 @@ public class Mindslaver extends CardImpl<Mindslaver> {
         Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new ControlTargetPlayerNextTurnEffect(), new GenericManaCost(4));
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
-        ability.addTarget(new TargetPlayer());
+        ability.addTarget(new TargetPlayer(true));
         this.addAbility(ability);
     }
 
diff --git a/Mage.Sets/src/mage/sets/timeshifted/WallOfRoots.java b/Mage.Sets/src/mage/sets/timeshifted/WallOfRoots.java
index dfa41caf33..0ffaa77e91 100644
--- a/Mage.Sets/src/mage/sets/timeshifted/WallOfRoots.java
+++ b/Mage.Sets/src/mage/sets/timeshifted/WallOfRoots.java
@@ -28,16 +28,16 @@
 package mage.sets.timeshifted;
 
 import java.util.UUID;
-import mage.Constants;
 import mage.Constants.CardType;
 import mage.Constants.Rarity;
+import mage.Constants.Zone;
 import mage.MageInt;
 import mage.Mana;
 import mage.abilities.Ability;
-import mage.abilities.common.ActivateOncePerTurnActivatedAbility;
 import mage.abilities.costs.CostImpl;
 import mage.abilities.effects.common.BasicManaEffect;
 import mage.abilities.keyword.DefenderAbility;
+import mage.abilities.mana.ActivateOncePerTurnManaAbility;
 import mage.cards.CardImpl;
 import mage.counters.BoostCounter;
 import mage.game.Game;
@@ -62,7 +62,7 @@ public class WallOfRoots extends CardImpl<WallOfRoots> {
         // Defender
         this.addAbility(DefenderAbility.getInstance());
         // Put a -0/-1 counter on Wall of Roots: Add {G} to your mana pool. Activate this ability only once each turn.
-        Ability ability = new ActivateOncePerTurnActivatedAbility(Constants.Zone.BATTLEFIELD, new BasicManaEffect(Mana.GreenMana), new WallOfRootsCost());
+        Ability ability = new ActivateOncePerTurnManaAbility(Zone.BATTLEFIELD, new BasicManaEffect(Mana.GreenMana), new WallOfRootsCost());
         this.addAbility(ability);
     }