Lich Lord of Unx, fix sword

Mage.Sets/src/mage/sets/alarareborn/LichLordofUnx.java

@@ -0,0 +1,108 @@
+/*
+ *  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.sets.alarareborn;
+
+import java.util.UUID;
+
+import mage.Constants;
+import mage.Constants.CardType;
+import mage.Constants.Rarity;
+import mage.MageInt;
+import mage.ObjectColor;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
+import mage.abilities.effects.OneShotEffect;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.LoseLifeTargetEffect;
+import mage.abilities.effects.common.PutLibraryIntoGraveTargetEffect;
+import mage.cards.CardImpl;
+import mage.filter.Filter;
+import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.game.Game;
+import mage.game.permanent.token.Token;
+import mage.players.Player;
+import mage.target.TargetPlayer;
+
+/**
+ *
+ * @author Loki
+ */
+public class LichLordofUnx extends CardImpl<LichLordofUnx> {
+    private static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Zombies you control");
+
+    static {
+        filter.getSubtype().add("Zombie");
+        filter.setScopeSubtype(Filter.ComparisonScope.Any);
+    }
+
+    public LichLordofUnx (UUID ownerId) {
+        super(ownerId, 24, "Lich Lord of Unx", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{1}{U}{B}");
+        this.expansionSetCode = "ARB";
+        this.subtype.add("Zombie");
+        this.subtype.add("Wizard");
+		this.color.setBlue(true);
+		this.color.setBlack(true);
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(2);
+        Ability ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new CreateTokenEffect(new ZombieWizardToken()), new ManaCostsImpl("{U}{B}"));
+        ability.addCost(new TapSourceCost());
+        this.addAbility(ability);
+        ability = new SimpleActivatedAbility(Constants.Zone.BATTLEFIELD, new LoseLifeTargetEffect(new PermanentsOnBattlefieldCount(filter, 1)), new ManaCostsImpl("{U}{U}{B}{B}"));
+        ability.addEffect(new PutLibraryIntoGraveTargetEffect(new PermanentsOnBattlefieldCount(filter, 1)));
+        ability.addTarget(new TargetPlayer());
+        this.addAbility(ability);
+    }
+
+    public LichLordofUnx (final LichLordofUnx card) {
+        super(card);
+    }
+
+    @Override
+    public LichLordofUnx copy() {
+        return new LichLordofUnx(this);
+    }
+
+}
+
+class ZombieWizardToken extends Token {
+    ZombieWizardToken() {
+        super("Zombie Wizard", "a 1/1 blue and black Zombie Wizard creature token");
+        cardType.add(CardType.CREATURE);
+        color.setGreen(true);
+        color.setBlack(true);
+        subtype.add("Zombie");
+        subtype.add("Wizard");
+        power = new MageInt(1);
+		toughness = new MageInt(1);
+    }
+}

Mage.Sets/src/mage/sets/mirrodinbesieged/SwordOfFeastAndFamine.java

@@ -37,6 +37,7 @@ import mage.Constants.Zone;
 import mage.abilities.TriggeredAbilityImpl;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.effects.Effect;
 import mage.abilities.effects.common.continious.BoostEquippedEffect;
 import mage.abilities.effects.common.DiscardTargetEffect;
 import mage.abilities.effects.common.UntapAllLandsControllerEffect;
@@ -51,6 +52,7 @@ import mage.game.events.DamagedPlayerEvent;
 import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
 import mage.target.TargetPlayer;
+import mage.target.targetpointer.FixedTarget;
 
 /**
  *
@@ -92,7 +94,6 @@ class SwordOfFeastAndFamineAbility extends TriggeredAbilityImpl<SwordOfFeastAndF
     public SwordOfFeastAndFamineAbility() {
         super(Zone.BATTLEFIELD, new DiscardTargetEffect(1));
         this.addEffect(new UntapAllLandsControllerEffect());
-        this.addTarget(new TargetPlayer());
     }
 
     public SwordOfFeastAndFamineAbility(final SwordOfFeastAndFamineAbility ability) {
@@ -110,7 +111,9 @@ class SwordOfFeastAndFamineAbility extends TriggeredAbilityImpl<SwordOfFeastAndF
             DamagedPlayerEvent damageEvent = (DamagedPlayerEvent)event;
             Permanent p = game.getPermanent(event.getSourceId());
             if (damageEvent.isCombatDamage() && p != null && p.getAttachments().contains(this.getSourceId())) {
-                this.targets.get(0).add(event.getPlayerId(), game);
+                for (Effect effect : this.getEffects()) {
+                        effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
+                }
 			    return true;
             }
         }

Mage/src/mage/abilities/dynamicvalue/common/PermanentsOnBattlefieldCount.java

@@ -15,7 +15,7 @@ public class PermanentsOnBattlefieldCount implements DynamicValue {
     private Integer amount;
 
     public PermanentsOnBattlefieldCount() {
-        filter = new FilterPermanent();
+        this(new FilterPermanent(), 1);
     }
 
     public PermanentsOnBattlefieldCount(FilterPermanent filter) {
@@ -29,6 +29,7 @@ public class PermanentsOnBattlefieldCount implements DynamicValue {
 
     public PermanentsOnBattlefieldCount(final PermanentsOnBattlefieldCount dynamicValue) {
         this.filter = dynamicValue.filter;
+        this.amount = dynamicValue.amount;
     }
 
     @Override

Mage/src/mage/abilities/effects/common/DiscardTargetEffect.java

@@ -64,7 +64,7 @@ public class DiscardTargetEffect extends OneShotEffect<DiscardTargetEffect> {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        Player player = game.getPlayer(source.getFirstTarget());
+        Player player = game.getPlayer(targetPointer.getFirst(source));
         if (player != null) {
             player.discard(amount.calculate(game, source), source, game);
             return true;

Mage/src/mage/abilities/effects/common/LoseLifeTargetEffect.java

@@ -30,6 +30,8 @@ package mage.abilities.effects.common;
 
 import mage.Constants.Outcome;
 import mage.abilities.Ability;
+import mage.abilities.dynamicvalue.DynamicValue;
+import mage.abilities.dynamicvalue.common.StaticValue;
 import mage.abilities.effects.OneShotEffect;
 import mage.game.Game;
 import mage.players.Player;
@@ -40,20 +42,20 @@ import mage.players.Player;
  */
 public class LoseLifeTargetEffect extends OneShotEffect<LoseLifeTargetEffect> {
 
-	protected int amount;
+	protected DynamicValue amount;
 
     public LoseLifeTargetEffect(int amount) {
+        this(new StaticValue(amount));
+    }
+
+	public LoseLifeTargetEffect(DynamicValue amount) {
 		super(Outcome.Damage);
 		this.amount = amount;
 	}
 
-	public int getAmount() {
-		return amount;
-	}
-
 	public LoseLifeTargetEffect(final LoseLifeTargetEffect effect) {
 		super(effect);
-		this.amount = effect.amount;
+		this.amount = effect.amount.clone();
 	}
 
 	@Override
@@ -65,7 +67,7 @@ public class LoseLifeTargetEffect extends OneShotEffect<LoseLifeTargetEffect> {
 	public boolean apply(Game game, Ability source) {
 		Player player = game.getPlayer(targetPointer.getFirst(source));
 		if (player != null) {
-			player.loseLife(amount, game);
+			player.loseLife(amount.calculate(game, source), game);
 			return true;
 		}
 		return false;
@@ -79,7 +81,7 @@ public class LoseLifeTargetEffect extends OneShotEffect<LoseLifeTargetEffect> {
         } else {
             result.append("that player");
         }
-        result.append(" loses ").append(amount).append(" life");
+        result.append(" loses ").append(amount).append(" life").append(amount.getMessage());
         return result.toString();
 	}
 

Mage/src/mage/abilities/effects/common/PutLibraryIntoGraveTargetEffect.java

@@ -31,6 +31,8 @@ package mage.abilities.effects.common;
 import mage.Constants.Outcome;
 import mage.Constants.Zone;
 import mage.abilities.Ability;
+import mage.abilities.dynamicvalue.DynamicValue;
+import mage.abilities.dynamicvalue.common.StaticValue;
 import mage.abilities.effects.OneShotEffect;
 import mage.cards.Card;
 import mage.game.Game;
@@ -42,16 +44,20 @@ import mage.players.Player;
  */
 public class PutLibraryIntoGraveTargetEffect extends OneShotEffect<PutLibraryIntoGraveTargetEffect> {
 
-	private int amount;
+	private DynamicValue amount;
 
     public PutLibraryIntoGraveTargetEffect(int amount) {
+        this(new StaticValue(amount));
+    }
+
+	public PutLibraryIntoGraveTargetEffect(DynamicValue amount) {
 		super(Outcome.Detriment);
 		this.amount = amount;
 	}
 
 	public PutLibraryIntoGraveTargetEffect(final PutLibraryIntoGraveTargetEffect effect) {
 		super(effect);
-		this.amount = effect.amount;
+		this.amount = effect.amount.clone();
 	}
 
 	@Override
@@ -64,7 +70,7 @@ public class PutLibraryIntoGraveTargetEffect extends OneShotEffect<PutLibraryInt
 		Player player = game.getPlayer(source.getFirstTarget());
 		if (player != null) {
 			// putting cards to grave shouldn't end the game, so getting minimun available
-			int cardsCount = Math.min(amount, player.getLibrary().size());
+			int cardsCount = Math.min(amount.calculate(game, source), player.getLibrary().size());
 			for (int i = 0; i < cardsCount; i++) {
 				Card card = player.getLibrary().removeFromTop(game);
 				if (card != null)
@@ -81,11 +87,11 @@ public class PutLibraryIntoGraveTargetEffect extends OneShotEffect<PutLibraryInt
 		StringBuilder sb = new StringBuilder();
 		sb.append("Target ").append(source.getTargets().get(0).getTargetName());
 		sb.append(" puts the top ");
-		if (amount == 1)
+		if (amount instanceof StaticValue && amount.calculate(null, null) == 1)
 			sb.append(amount).append(" card ");
 		else
 			sb.append(amount).append(" cards ");
-		sb.append("of his or her library into his or her graveyard");
+		sb.append("of his or her library into his or her graveyard").append(amount.getMessage());
 		return sb.toString();
 	}