- Fixed Mutavault.

- After taking control of it, Elspeth's ult should correctly affect the controller's creatures now.
- Echoing Truth will remove tokens from the game, instead of destroying them.

res/main.properties

@@ -1,6 +1,6 @@
 program/mail=mtgerror@yahoo.com
 program/forum=http://www.slightlymagic.net/forum/viewforum.php?f=26
-program/version=Forge -- official beta: 10/01/01, SVN revision: 274
+program/version=Forge -- official beta: 10/01/01, SVN revision: 275
 
 tokens--file=AllTokens.txt
 

src/forge/CardFactory.java

@@ -9752,7 +9752,7 @@ public class CardFactory implements NewConstants {
 	          for(int i = 0; i < sameName.size(); i++)
 	          {
 	            if(sameName.get(i).isToken())
-	              AllZone.GameAction.destroy(sameName.get(i));
+	              AllZone.GameAction.removeFromGame(sameName.get(i));
 	            else
 	            {
 	              PlayerZone hand = AllZone.getZone(Constant.Zone.Hand, sameName.get(i).getOwner());
@@ -9820,12 +9820,7 @@ public class CardFactory implements NewConstants {
             else
             {
               PlayerZone hand = AllZone.getZone(Constant.Zone.Hand, getTargetCard().getOwner());
-              @SuppressWarnings("unused") // play
-			  PlayerZone play = AllZone.getZone(Constant.Zone.Play, getTargetCard().getOwner());
               AllZone.GameAction.moveTo(hand, getTargetCard());
-              
-              //play.remove(getTargetCard());
-              //hand.add(getTargetCard());
             }
             AllZone.GameAction.drawCard(card.getController());
           }//if

src/forge/CardFactory_Lands.java

@@ -2019,7 +2019,7 @@ class CardFactory_Lands {
 	           }
 	         };//SpellAbility
 
-	         card.clearSpellAbility();
+	         card.clearSpellKeepManaAbility();
 	         card.addSpellAbility(a1);
 	         a1.setDescription("1: Mutavault becomes a 2/2 creature with all creature types until end of turn. It's still a land.");
 	         a1.setStackDescription(card +" becomes a 2/2 creature with changeling until EOT");
@@ -2924,13 +2924,12 @@ class CardFactory_Lands {
 	          public void execute()
 	            {
 	              Card c = card;	              
-
-	              c.setBaseAttack(0);
-	              c.setBaseDefense(0);
 	              c.removeType("Creature");
 	              c.removeType("Zombie");
 	              c.removeType("Plant");              
 	              c.setManaCost("");
+	              c.setBaseAttack(0);
+	              c.setBaseDefense(0);
 	              
 	            }
 	          };

src/forge/CardFactory_Planeswalkers.java

@@ -120,10 +120,10 @@ class CardFactory_Planeswalkers {
 	          turn[0] = AllZone.Phase.getTurn();
 	
 	          //make all permanents in play/hand/library and graveyard	
-	          PlayerZone play = AllZone.getZone(Constant.Zone.Play, card.getController());
-	          PlayerZone hand = AllZone.getZone(Constant.Zone.Hand, card.getController());
-	          PlayerZone library = AllZone.getZone(Constant.Zone.Library, card.getController());
-	          PlayerZone grave = AllZone.getZone(Constant.Zone.Graveyard, card.getController());
+	          PlayerZone play = AllZone.getZone(Constant.Zone.Play, card2.getController());
+	          PlayerZone hand = AllZone.getZone(Constant.Zone.Hand, card2.getController());
+	          PlayerZone library = AllZone.getZone(Constant.Zone.Library, card2.getController());
+	          PlayerZone grave = AllZone.getZone(Constant.Zone.Graveyard, card2.getController());
 	          
 	          CardList list = new CardList();
 	          list.addAll(play.getCards());

src/forge/Deck.java

@@ -135,6 +135,8 @@ public class Deck implements java.io.Serializable {
 
 
 class DeckSort implements Comparator<Object>, java.io.Serializable {
+	private static final long serialVersionUID = 6988753027196688633L;
+
 	public int compare(Object a, Object b) {
         String a1 = ((Deck) a).getName();
         String b1 = ((Deck) b).getName();

src/forge/GameAction.java

@@ -1236,6 +1236,40 @@ private int getDifferentLand(CardList list, String land)
 	    playSpellAbility(sa);
 	}
   }
+  
+  public void playCardNoCost(Card c)
+  {
+	    SpellAbility[] choices = canPlaySpellAbility(c.getSpellAbility());
+	    SpellAbility sa;
+	/*
+	 System.out.println(choices.length);
+	 for(int i = 0; i < choices.length; i++)
+	     System.out.println(choices[i]);
+	*/
+	    if(choices.length == 0)
+	      return;
+	    else if(choices.length == 1)
+	      sa = choices[0];
+	    else
+	      sa = (SpellAbility) AllZone.Display.getChoiceOptional("Choose", choices);
+	
+	    if(sa == null)
+	      return;
+	
+	    playSpellAbilityForFree(sa);
+  }
+  
+  public void playSpellAbilityForFree(SpellAbility sa)
+  {
+	if (sa.getBeforePayMana() == null){
+		AllZone.Stack.add(sa);
+		if (sa.isTapAbility())
+			sa.getSourceCard().tap();
+	}
+	else
+		AllZone.InputControl.setInput(sa.getBeforePayMana());
+  }
+  
   public void playSpellAbility(SpellAbility sa)
   {
 	if (sa.getManaCost().equals("0") && sa.getBeforePayMana() == null){

src/forge/GameActionUtil.java

@@ -140,6 +140,7 @@ public class GameActionUtil
 		playCard_Mold_Adder(c);
 		playCard_Fable_of_Wolf_and_Owl(c);
 	}
+	
 	public static void playCard_Emberstrike_Duo(Card c)
 	{
 		final String controller = c.getController();