From 03b5aea22999afa381d81355b68f0313b1e638e4 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Tue, 18 Jun 2013 08:33:27 +0200
Subject: [PATCH] Added DrawDiscardTargetEffect, improved
 DrawDiscardControllerEffect.

---
 .../common/DrawDiscardControllerEffect.java   | 25 +++++-
 .../common/DrawDiscardTargetEffect.java       | 85 +++++++++++++++++++
 2 files changed, 106 insertions(+), 4 deletions(-)
 create mode 100644 Mage/src/mage/abilities/effects/common/DrawDiscardTargetEffect.java

diff --git a/Mage/src/mage/abilities/effects/common/DrawDiscardControllerEffect.java b/Mage/src/mage/abilities/effects/common/DrawDiscardControllerEffect.java
index c37d692d13e..251843ae5c3 100644
--- a/Mage/src/mage/abilities/effects/common/DrawDiscardControllerEffect.java
+++ b/Mage/src/mage/abilities/effects/common/DrawDiscardControllerEffect.java
@@ -28,11 +28,12 @@
 
 package mage.abilities.effects.common;
 
-import mage.constants.Outcome;
 import mage.abilities.Ability;
 import mage.abilities.effects.OneShotEffect;
+import mage.constants.Outcome;
 import mage.game.Game;
 import mage.players.Player;
+import mage.util.CardUtil;
 
 /**
  *
@@ -40,13 +41,29 @@ import mage.players.Player;
  */
 public class DrawDiscardControllerEffect extends OneShotEffect<DrawDiscardControllerEffect> {
 
+    private int cardsToDraw;
+    private int cardsToDiscard;
+
     public DrawDiscardControllerEffect() {
+        this(1,1);
+    }
+
+    public DrawDiscardControllerEffect(int cardsToDraw, int cardsToDiscard) {
         super(Outcome.DrawCard);
-        staticText = "Draw a card, then discard a card";
+        this.cardsToDraw = cardsToDraw;
+        this.cardsToDiscard = cardsToDiscard;
+        staticText = new StringBuilder("Draw ")
+                .append(cardsToDraw == 1?"a": CardUtil.numberToText(cardsToDraw))
+                .append(" card").append(cardsToDraw == 1?" ": "s")
+                .append(", then discard ")
+                .append(cardsToDiscard == 1?"a": CardUtil.numberToText(cardsToDiscard))
+                .append(" card").append(cardsToDiscard == 1?" ": "s").toString();
     }
 
     public DrawDiscardControllerEffect(final DrawDiscardControllerEffect effect) {
         super(effect);
+        this.cardsToDraw = effect.cardsToDraw;
+        this.cardsToDiscard = effect.cardsToDiscard;
     }
 
     @Override
@@ -58,8 +75,8 @@ public class DrawDiscardControllerEffect extends OneShotEffect<DrawDiscardContro
     public boolean apply(Game game, Ability source) {
         Player player = game.getPlayer(source.getControllerId());
         if (player != null) {
-            player.drawCards(1, game);
-            player.discard(1, source, game);
+            player.drawCards(cardsToDraw, game);
+            player.discard(cardsToDiscard, source, game);
             return true;
         }
         return false;
diff --git a/Mage/src/mage/abilities/effects/common/DrawDiscardTargetEffect.java b/Mage/src/mage/abilities/effects/common/DrawDiscardTargetEffect.java
new file mode 100644
index 00000000000..219a21ff76d
--- /dev/null
+++ b/Mage/src/mage/abilities/effects/common/DrawDiscardTargetEffect.java
@@ -0,0 +1,85 @@
+/*
+ *  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 mage.abilities.Ability;
+import mage.abilities.effects.OneShotEffect;
+import mage.constants.Outcome;
+import mage.game.Game;
+import mage.players.Player;
+import mage.util.CardUtil;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class DrawDiscardTargetEffect extends OneShotEffect<DrawDiscardTargetEffect> {
+
+    private int cardsToDraw;
+    private int cardsToDiscard;
+
+    public DrawDiscardTargetEffect() {
+        this(1,1);
+    }
+
+    public DrawDiscardTargetEffect(int cardsToDraw, int cardsToDiscard) {
+        super(Outcome.DrawCard);
+        this.cardsToDraw = cardsToDraw;
+        this.cardsToDiscard = cardsToDiscard;
+        staticText = new StringBuilder("Target player draws ")
+                .append(cardsToDraw == 1?"a": CardUtil.numberToText(cardsToDraw))
+                .append(" card").append(cardsToDraw == 1?" ": "s")
+                .append(", then discard ")
+                .append(cardsToDiscard == 1?"a": CardUtil.numberToText(cardsToDiscard))
+                .append(" card").append(cardsToDiscard == 1?" ": "s").toString();
+    }
+
+    public DrawDiscardTargetEffect(final DrawDiscardTargetEffect effect) {
+        super(effect);
+        this.cardsToDraw = effect.cardsToDraw;
+        this.cardsToDiscard = effect.cardsToDiscard;
+    }
+
+    @Override
+    public DrawDiscardTargetEffect copy() {
+        return new DrawDiscardTargetEffect(this);
+    }
+
+    @Override
+    public boolean apply(Game game, Ability source) {
+        Player player = game.getPlayer(getTargetPointer().getFirst(game, source));
+        if (player != null) {
+            player.drawCards(cardsToDraw, game);
+            player.discard(cardsToDiscard, source, game);
+            return true;
+        }
+        return false;
+    }
+
+}