From 0cf18df0aa60e7ba1b0cbfed89a241f93281484f Mon Sep 17 00:00:00 2001
From: jeffwadsworth <>
Date: Fri, 18 Jan 2013 21:33:00 -0600
Subject: [PATCH] - Fixed Sovreigns Of Lost Alara.

---
 .../alarareborn/SovereignsOfLostAlara.java    | 28 ++++----
 .../other/AuraCardCanAttachToPermanentId.java | 69 +++++++++++++++++++
 .../AuraPermanentCanAttachToPermanentId.java  | 68 ++++++++++++++++++
 3 files changed, 151 insertions(+), 14 deletions(-)
 create mode 100644 Mage/src/mage/filter/predicate/other/AuraCardCanAttachToPermanentId.java
 create mode 100644 Mage/src/mage/filter/predicate/other/AuraPermanentCanAttachToPermanentId.java

diff --git a/Mage.Sets/src/mage/sets/alarareborn/SovereignsOfLostAlara.java b/Mage.Sets/src/mage/sets/alarareborn/SovereignsOfLostAlara.java
index 526117a8de..72760014f6 100644
--- a/Mage.Sets/src/mage/sets/alarareborn/SovereignsOfLostAlara.java
+++ b/Mage.Sets/src/mage/sets/alarareborn/SovereignsOfLostAlara.java
@@ -41,14 +41,14 @@ import mage.cards.Card;
 import mage.cards.CardImpl;
 import mage.filter.FilterCard;
 import mage.filter.predicate.mageobject.SubtypePredicate;
-import mage.filter.predicate.other.CardCanTargetPermanentId;
+import mage.filter.predicate.other.AuraCardCanAttachToPermanentId;
 import mage.game.Game;
 import mage.game.events.GameEvent;
 import mage.game.events.GameEvent.EventType;
 import mage.game.permanent.Permanent;
 import mage.players.Player;
 import mage.target.common.TargetCardInLibrary;
-import mage.target.common.TargetCreaturePermanent;
+import mage.target.targetpointer.FixedTarget;
 
 /**
  *
@@ -57,7 +57,7 @@ import mage.target.common.TargetCreaturePermanent;
 public class SovereignsOfLostAlara extends CardImpl<SovereignsOfLostAlara> {
 
     public SovereignsOfLostAlara(UUID ownerId) {
-        super(ownerId, 12, "Sovereigns of Lost Alara", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{4}{W}{U}");
+        super(ownerId, 12, "Sovereigns of Lost Alara", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{W}{U}");
         this.expansionSetCode = "ARB";
         this.subtype.add("Spirit");
 
@@ -103,9 +103,7 @@ class CreatureControlledAttacksAloneTriggeredAbility extends TriggeredAbilityImp
         if (game.getActivePlayerId().equals(this.controllerId)) {
             if (event.getType() == EventType.DECLARED_ATTACKERS) {
                 if (game.getCombat().attacksAlone()) {
-                    TargetCreaturePermanent target = new TargetCreaturePermanent();
-                    this.addTarget(target);
-                    this.getTargets().get(0).add(game.getCombat().getAttackers().get(0), game);
+                    this.getEffects().get(0).setTargetPointer(new FixedTarget(game.getCombat().getAttackers().get(0)));
                     return true;
                 }
             }
@@ -133,19 +131,21 @@ class SovereignsOfLostAlaraEffect extends OneShotEffect<SovereignsOfLostAlaraEff
     @Override
     public boolean apply(Game game, Ability source) {
         Player you = game.getPlayer(source.getControllerId());
-        Permanent attackingCreature = game.getPermanent(source.getFirstTarget());
+        Permanent attackingCreature = game.getPermanent(getTargetPointer().getFirst(game, source));
         if (you != null && attackingCreature != null) {
-            FilterCard filter = new FilterCard("aura that could enchant that creature");
+            FilterCard filter = new FilterCard("aura that could enchant the lone attacking creature");
             filter.add(new SubtypePredicate("Aura"));
-            filter.add(new CardCanTargetPermanentId(attackingCreature.getId()));
-            if (you.chooseUse(Constants.Outcome.Benefit, "Attach an Aura from your library?", game)) {
+            filter.add(new AuraCardCanAttachToPermanentId(attackingCreature.getId()));
+            if (you.chooseUse(Constants.Outcome.Benefit, "Do you want to search your library?", game)) {
                 TargetCardInLibrary target = new TargetCardInLibrary(filter);
                 target.setNotTarget(true);
                 if (you.searchLibrary(target, game)) {
-                    Card aura = game.getCard(target.getFirstTarget());
-                    game.getState().setValue("attachTo:" + aura.getId(), attackingCreature);
-                    aura.putOntoBattlefield(game, Constants.Zone.LIBRARY, source.getId(), you.getId());
-                    return attackingCreature.addAttachment(aura.getId(), game);
+                    if (target.getFirstTarget() != null) {
+                        Card aura = game.getCard(target.getFirstTarget());
+                        game.getState().setValue("attachTo:" + aura.getId(), attackingCreature);
+                        aura.putOntoBattlefield(game, Constants.Zone.LIBRARY, source.getId(), you.getId());
+                        return attackingCreature.addAttachment(aura.getId(), game);
+                    }
                 }
             }
             you.shuffleLibrary(game);
diff --git a/Mage/src/mage/filter/predicate/other/AuraCardCanAttachToPermanentId.java b/Mage/src/mage/filter/predicate/other/AuraCardCanAttachToPermanentId.java
new file mode 100644
index 0000000000..ce16de928d
--- /dev/null
+++ b/Mage/src/mage/filter/predicate/other/AuraCardCanAttachToPermanentId.java
@@ -0,0 +1,69 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.filter.predicate.other;
+
+import java.util.UUID;
+import mage.cards.Card;
+import mage.filter.Filter;
+import mage.filter.predicate.Predicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.target.Target;
+
+/**
+ *
+ * @author jeffwadsworth
+ */
+// Use this predicate if a aura card comes into play attached to a permanent without targeting
+
+public class AuraCardCanAttachToPermanentId implements Predicate<Card> {
+
+    private final UUID toBeCheckedPermanentId;
+
+    public AuraCardCanAttachToPermanentId(UUID toBeCheckedPermanentId) {
+        this.toBeCheckedPermanentId = toBeCheckedPermanentId;
+    }
+
+    @Override
+    public boolean apply(Card input, Game game) {
+        final Permanent permanent = game.getPermanent(toBeCheckedPermanentId);
+        Filter filter;
+        for (Target target : input.getSpellAbility().getTargets()) {
+            filter = target.getFilter();
+            if (filter.match(permanent, game)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        return "AuraCardCanAttachToPermanentId(" + toBeCheckedPermanentId + ')';
+    }
+}
\ No newline at end of file
diff --git a/Mage/src/mage/filter/predicate/other/AuraPermanentCanAttachToPermanentId.java b/Mage/src/mage/filter/predicate/other/AuraPermanentCanAttachToPermanentId.java
new file mode 100644
index 0000000000..d999436fe0
--- /dev/null
+++ b/Mage/src/mage/filter/predicate/other/AuraPermanentCanAttachToPermanentId.java
@@ -0,0 +1,68 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.filter.predicate.other;
+
+import java.util.UUID;
+import mage.filter.Filter;
+import mage.filter.predicate.Predicate;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+import mage.target.Target;
+
+/**
+ *
+ * @author jeffwadsworth
+ */
+// // Use this predicate if a aura permanent is to be attached to a permanent without targeting
+
+public class AuraPermanentCanAttachToPermanentId implements Predicate<Permanent> {
+
+    private final UUID toBeCheckedPermanentId;
+
+    public AuraPermanentCanAttachToPermanentId(UUID toBeCheckedPermanentId) {
+        this.toBeCheckedPermanentId = toBeCheckedPermanentId;
+    }
+
+    @Override
+    public boolean apply(Permanent input, Game game) {
+        final Permanent permanent = game.getPermanent(toBeCheckedPermanentId);
+        Filter filter;
+        for (Target target : input.getSpellAbility().getTargets()) {
+            filter = target.getFilter();
+            if (filter.match(permanent, game)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        return "AuraPermanentCanAttachToPermanentId(" + toBeCheckedPermanentId + ')';
+    }
+}
\ No newline at end of file