New LoseLifeAllEffect, added amount and random option to DiscardEachPlayerEffect.

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

@@ -1,30 +1,58 @@
 package mage.abilities.effects.common;
 
+import java.util.UUID;
 import mage.Constants;
 import mage.abilities.Ability;
+import mage.abilities.Mode;
+import mage.abilities.dynamicvalue.DynamicValue;
+import mage.abilities.dynamicvalue.common.StaticValue;
 import mage.abilities.effects.OneShotEffect;
+import mage.cards.Card;
 import mage.game.Game;
 import mage.players.Player;
 
-import java.util.UUID;
 
 public class DiscardEachPlayerEffect extends OneShotEffect<DiscardEachPlayerEffect> {
+
+    protected DynamicValue amount;
+    protected boolean randomDiscard;
+
     public DiscardEachPlayerEffect() {
+        this(new StaticValue(1), false);
+    }
+
+    public DiscardEachPlayerEffect(int amount, boolean randomDiscard) {
+        this(new StaticValue(amount), randomDiscard);
+    }
+
+    public DiscardEachPlayerEffect(DynamicValue amount, boolean randomDiscard) {
         super(Constants.Outcome.Discard);
-        staticText = "each player discards a card";
+        this.randomDiscard = randomDiscard;
+        this.amount = amount;
     }
 
     public DiscardEachPlayerEffect(final DiscardEachPlayerEffect effect) {
         super(effect);
+        this.randomDiscard = effect.randomDiscard;
+        this.amount = effect.amount;
     }
 
-
     @Override
     public boolean apply(Game game, Ability source) {
         for (UUID playerId : game.getPlayerList()) {
             Player player = game.getPlayer(playerId);
             if (player != null) {
-                player.discard(1, source, game);
+                if (randomDiscard) {
+                    int maxAmount = Math.min(amount.calculate(game, source), player.getHand().size());
+                    for (int i = 0; i < maxAmount; i++) {
+                        Card card = player.getHand().getRandom(game);
+                        if (card != null) {
+                            player.discard(card, source, game);
+                        }
+                    }
+                } else {
+                    player.discard(amount.calculate(game, source), source, game);
+                }
             }
         }
         return true;
@@ -35,4 +63,22 @@ public class DiscardEachPlayerEffect extends OneShotEffect<DiscardEachPlayerEffe
         return new DiscardEachPlayerEffect(this);
     }
 
+    @Override
+    public String getText(Mode mode) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("Each player discards ");
+        sb.append(amount).append(" card");
+        try {
+            if (Integer.parseInt(amount.toString()) > 1) {
+                sb.append("s");
+            }
+        } catch (Exception e) {
+            sb.append("s");
+        }
+        if (randomDiscard) {
+            sb.append(" at random");
+        }
+        return sb.toString();
+    }
+
 }

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

@@ -0,0 +1,77 @@
+/*
+ *  Copyright 2011 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.abilities.effects.common;
+
+import java.util.UUID;
+import mage.Constants;
+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;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class LoseLifeAllEffect extends OneShotEffect<LoseLifeAllEffect> {
+
+    private DynamicValue amount;
+
+    public LoseLifeAllEffect(int amount) {
+        this(new StaticValue(amount));
+    }
+
+    public LoseLifeAllEffect(DynamicValue amount) {
+        super(Constants.Outcome.Damage);
+        this.amount = amount;
+        staticText = "Each player loses " + amount + " life";
+    }
+
+    public LoseLifeAllEffect(final LoseLifeAllEffect effect) {
+        super(effect);
+        this.amount = effect.amount;
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        for (UUID playerId: game.getPlayer(source.getControllerId()).getInRange()) {
+            Player player = game.getPlayer(playerId);
+            if (player != null) {
+                player.loseLife(amount.calculate(game, source), game);
+            }
+        }
+        return true;
+    }
+
+    @Override
+    public LoseLifeAllEffect copy() {
+        return new LoseLifeAllEffect(this);
+    }
+}