- Added Dream Salvage

.gitattributes

@@ -2859,6 +2859,7 @@ res/cardsfolder/d/dream_fighter.txt -text
 res/cardsfolder/d/dream_fracture.txt svneol=native#text/plain
 res/cardsfolder/d/dream_halls.txt -text
 res/cardsfolder/d/dream_prowler.txt svneol=native#text/plain
+res/cardsfolder/d/dream_salvage.txt -text
 res/cardsfolder/d/dream_stalker.txt svneol=native#text/plain
 res/cardsfolder/d/dream_thief.txt -text
 res/cardsfolder/d/dream_thrush.txt -text

res/cardsfolder/d/dream_salvage.txt

@@ -0,0 +1,10 @@
+Name:Dream Salvage
+ManaCost:UB
+Types:Instant
+A:SP$ Draw | Cost$ UB | NumCards$ X | Defined$ You | ValidTgts$ Opponent | References$ X | SpellDescription$ Draw cards equal to the number of cards target opponent discarded this turn.
+SVar:X:TargetedPlayer$CardsDiscardedThisTurn
+SVar:RemAIDeck:True
+SVar:RemRandomDeck:True
+SVar:Picture:http://www.wizards.com/global/images/magic/general/dream_salvage.jpg
+Oracle:Draw cards equal to the number of cards target opponent discarded this turn.
+SetInfo:SHM Uncommon

src/main/java/forge/card/cardfactory/CardFactoryUtil.java

@@ -1065,6 +1065,12 @@ public class CardFactoryUtil {
             }
         }
         
+        if (sq[0].contains("CardsDiscardedThisTurn")) {
+            if (players.size() > 0) {
+                return CardFactoryUtil.doXMath(players.get(0).getNumDiscardedThisTurn(), m, source);
+            }
+        }
+
         if (sq[0].contains("AttackersDeclared")) {
             if (players.size() > 0) {
                 return CardFactoryUtil.doXMath(players.get(0).getAttackersDeclaredThisTurn(), m, source);

src/main/java/forge/game/player/Player.java

@@ -128,6 +128,9 @@ public abstract class Player extends GameEntity implements Comparable<Player> {
     private int numDrawnThisTurn = 0;
     private int numDrawnThisDrawStep = 0;
     
+    /** The num discarded this turn. */
+    private int numDiscardedThisTurn = 0;
+    
     /** The slowtrip list. */
     private List<Card> slowtripList = new ArrayList<Card>();
 
@@ -1607,11 +1610,13 @@ public abstract class Player extends GameEntity implements Comparable<Player> {
             game.getAction().moveToLibrary(c, 0);
             // Play the Discard sound
             game.getEvents().post(new CardDiscardedEvent());
+            this.numDiscardedThisTurn++;
         } else {
             game.getAction().moveToGraveyard(c);
 
             // Play the Discard sound
             game.getEvents().post(new CardDiscardedEvent());
+            this.numDiscardedThisTurn++;
         }
 
         // Run triggers
@@ -1628,6 +1633,27 @@ public abstract class Player extends GameEntity implements Comparable<Player> {
 
     } // end doDiscard
 
+    /**
+     * <p>
+     * Getter for the field <code>numDiscardedThisTurn</code>.
+     * </p>
+     * 
+     * @return a int.
+     */
+    public final int getNumDiscardedThisTurn() {
+        return this.numDiscardedThisTurn;
+    }
+    
+    /**
+     * <p>
+     * Getter for the field <code>numDrawnThisTurn</code>.
+     * </p>
+     * 
+     * @return a int.
+     */
+    public final void resetNumDiscardedThisTurn() {
+        this.numDiscardedThisTurn = 0;
+    }
     /**
      * <p>
      * discardUnless.
@@ -2767,6 +2793,7 @@ public abstract class Player extends GameEntity implements Comparable<Player> {
         }
         resetPreventNextDamage();
         resetNumDrawnThisTurn();
+        resetNumDiscardedThisTurn();
         setAttackedWithCreatureThisTurn(false);
         setNumLandsPlayed(0);
         clearAssignedDamage();