- Cleanup, updates and little fixes.

res/cardsfolder/s/slitherhead.txt

@@ -5,6 +5,8 @@ Text:no text
 PT:1/1
 A:AB$ PutCounter | Cost$ 0 ExileFromGrave<1/CARDNAME> | ActivationZone$ Graveyard | ValidTgts$ Creature | CounterType$ P1P1 | CounterNum$ X | SorcerySpeed$ True | References$ X | PrecostDesc$ Scavenge | SpellDescription$ Put a number of +1/+1 counter's equal to this card's power on target creature. Scavenge only as a sorcery.
 SVar:X:Count$CardPower
+SVar:SacMe:1
+SVar:DiscardMe:1
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/slitherhead.jpg
 SetInfo:RTR|Uncommon|http://magiccards.info/scans/en/rtr/222.jpg

res/quest/duels/Doc Holiday 1.dck

@@ -3,7 +3,7 @@
 Name=Doc Holiday 1
 Title=Doc Holiday
 Difficulty=easy
-Description=WUG Morph deck
+Description=WUG Morph deck with Ixidron, Aphetto Runecaster and Aven Farseer
 Icon=Doc Holiday.jpg
 Deck Type=constructed
 [main]

res/quest/duels/Jesse James 1.dck

@@ -3,7 +3,7 @@
 Name=Jesse James 1
 Title=Jesse James
 Difficulty=easy
-Description=WG Morph deck
+Description=WG Morph deck with Ixidron and Primal Whisperer
 Icon=Jesse James.jpg
 Deck Type=constructed
 [main]

src/main/java/forge/AllZoneUtil.java

@@ -411,26 +411,4 @@ public abstract class AllZoneUtil {
         return false;
     }
 
-    /**
-     * <p>
-     * matchesValid.
-     * </p>
-     * 
-     * @param o
-     *            a {@link java.lang.Object} object.
-     * @param valids
-     *            an array of {@link java.lang.String} objects.
-     * @param srcCard
-     *            a {@link forge.Card} object.
-     * @return a boolean.
-     */
-    /*public static boolean matchesValid(final Object o, final String[] valids, final Card srcCard) {
-        if (o instanceof GameEntity) {
-            final GameEntity c = (GameEntity) o;
-            return c.isValid(valids, srcCard.getController(), srcCard);
-        }
-
-        return false;
-    }*/
-
 } // end class AllZoneUtil

src/main/java/forge/card/CardSuperType.java

@@ -26,8 +26,8 @@ public enum CardSuperType {
     Basic,
     /** The Legendary. */
     Legendary,
-    /** The Show. */
-    Show,
+    /** The Snow. */
+    Snow,
     /** The Ongoing. */
     Ongoing,
     /** The World. */

src/main/java/forge/card/cost/CostDamage.java

@@ -17,7 +17,6 @@
  */
 package forge.card.cost;
 
-import forge.AllZone;
 import forge.Card;
 import forge.GameActionUtil;
 import forge.card.abilityfactory.AbilityFactory;
@@ -101,7 +100,7 @@ public class CostDamage extends CostPart {
      */
     @Override
     public final void payAI(final Player ai, final SpellAbility ability, final Card source, final CostPayment payment) {
-        AllZone.getComputerPlayer().addDamage(this.getLastPaidAmount(), source);
+        ability.getActivatingPlayer().addDamage(this.getLastPaidAmount(), source);
     }
 
     /*

src/main/java/forge/card/cost/CostDiscard.java

@@ -21,7 +21,6 @@ import java.util.List;
 
 import com.google.common.base.Predicate;
 
-import forge.AllZone;
 import forge.Card;
 import forge.CardPredicates;
 
@@ -352,7 +351,7 @@ public class CostDiscard extends CostPartWithList {
                     this.done();
                 }
 
-                if (AllZone.getHumanPlayer().getZone(ZoneType.Hand).isEmpty()) {
+                if (sa.getActivatingPlayer().getZone(ZoneType.Hand).isEmpty()) {
                     this.stop();
                 }
                 final StringBuilder type = new StringBuilder("");
@@ -393,7 +392,7 @@ public class CostDiscard extends CostPartWithList {
                         // in case no more cards in hand
                         if (this.nDiscard == nNeeded) {
                             this.done();
-                        } else if (AllZone.getHumanPlayer().getZone(ZoneType.Hand).size() == 0) {
+                        } else if (sa.getActivatingPlayer().getZone(ZoneType.Hand).size() == 0) {
                             // really
                             // shouldn't
                             // happen

src/main/java/forge/card/cost/CostPayment.java

@@ -19,7 +19,6 @@ package forge.card.cost;
 
 import java.util.ArrayList;
 
-import forge.AllZone;
 import forge.Card;
 import forge.card.spellability.SpellAbility;
 import forge.card.spellability.SpellAbilityRequirements;
@@ -271,7 +270,7 @@ public class CostPayment {
         }
 
         // Move this to CostMana
-        AllZone.getHumanPlayer().getManaPool().refundManaPaid(this.ability, false);
+        this.ability.getActivatingPlayer().getManaPool().refundManaPaid(this.ability, false);
     }
 
     /**

src/main/java/forge/card/cost/CostReveal.java

@@ -19,7 +19,6 @@ package forge.card.cost;
 
 import java.util.List;
 
-import forge.AllZone;
 import forge.Card;
 
 import forge.CardLists;
@@ -295,7 +294,7 @@ public class CostReveal extends CostPartWithList {
                     // in case no more cards in hand
                     if (this.nReveal == nNeeded) {
                         this.done();
-                    } else if (AllZone.getHumanPlayer().getZone(ZoneType.Hand).size() == 0) {
+                    } else if (sa.getActivatingPlayer().getZone(ZoneType.Hand).size() == 0) {
                         // really
                         // shouldn't
                         // happen

src/main/java/forge/card/spellability/SpellAbilityRequirements.java

@@ -234,7 +234,7 @@ public class SpellAbilityRequirements {
             this.ability.setStackDescription(sb.toString());
         }
 
-        AllZone.getHumanPlayer().getManaPool().clearManaPaid(this.ability, false);
+        this.ability.getActivatingPlayer().getManaPool().clearManaPaid(this.ability, false);
         AllZone.getStack().addAndUnfreeze(this.ability);
     }
 }