- Fixed Dakmor Ghoul CIP text.

- Added Chronatog, Kismet, Frozen AEther, Loxodon Gatekeeper, Gush.
- Removed warnings (mostly just by adding a @SuppressWarnings("unused"); ) from the JLayer libs.
- Removed some old commented out code of cards that have been replaced by keywords.
- Boreal Centaur and Knight of the Skyward Eye abilities can only be used once per turn now.

res/cards.txt

@@ -1,3 +1,30 @@
+Chronatog
+1 U
+Creature Atog
+no text
+1/2
+
+Loxodon Gatekeeper
+2 W W
+Creature Elephant Soldier
+Artifacts, creatures, and lands your opponents control enter the battlefield tapped.
+2/3
+
+Frozen AEther
+3 U
+Enchantment
+Artifacts, creatures, and lands your opponents control enter the battlefield tapped.
+
+Kismet
+3 W
+Enchantment
+Artifacts, creatures, and lands your opponents control enter the battlefield tapped.
+
+Gush
+4 U
+Instant
+no text
+
 Stasis
 1 U
 Enchantment

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: 09/12/14, SVN revision: 245
+program/version=Forge -- official beta: 09/12/14, SVN revision: 246
 
 tokens--file=AllTokens.txt
 

src/forge/CardFactoryUtil.java

@@ -223,6 +223,9 @@ public class CardFactoryUtil
     {"Wild Aesthir",  	  new Integer(1)},
     {"Viashino Slaughtermaster", new Integer(1)},
     {"Twinblade Slasher", new Integer(1)},
+    {"Boreal Centaur", new Integer(1)},
+    {"Knight of the Skyward Eye", new Integer(1)},
+    {"Chronatog", new Integer(1)},
 
     {"Phyrexian Battleflies"   , new Integer(2)},
     {"Pit Imp"                 , new Integer(2)},
@@ -2097,6 +2100,22 @@ public class CardFactoryUtil
 	  
   }
   
+  public static boolean oppHasKismet(String player)
+  {
+	  String opp = AllZone.GameAction.getOpponent(player);
+	  PlayerZone play = AllZone.getZone(Constant.Zone.Play, opp);
+	  CardList list = new CardList(play.getCards());
+	  list = list.filter(new CardListFilter()
+	  {
+		  public boolean addCard(Card c)
+		  {
+			  return c.getName().equals("Kismet") || c.getName().equals("Frozen AEther") ||
+			  		 c.getName().equals("Loxodon Gatekeeper");
+		  }
+	  });
+	  return list.size() > 0;
+  }
+  
   public static int getNumberOfManaSymbolsControlledByColor(String colorAbb, String player)
   {
 	  PlayerZone play = AllZone.getZone(Constant.Zone.Play,player);

src/forge/CardFactory_Creatures.java

@@ -2999,7 +2999,7 @@ public class CardFactory_Creatures {
 
 			public void execute()
 	        {
-	          ability.setStackDescription("Highway Robber - " +card.getController() +" gains 2 life and opponent loses 2 life.");
+	          ability.setStackDescription(card.getName() + " - " +card.getController() +" gains 2 life and opponent loses 2 life.");
 	          AllZone.Stack.add(ability);
 	        }
 	      };
@@ -13965,7 +13965,6 @@ public class CardFactory_Creatures {
 	  //*************** START *********** START **************************
 	    else if(cardName.equals("Fallen Angel"))
 	    {
-	      
 	      final SpellAbility a2 = new Ability(card, "0")
 	      {
 	        final Command eot1 = new Command()
@@ -19211,23 +19210,49 @@ public class CardFactory_Creatures {
 		      return newCard;
 		  }//*************** END ************ END **************************
 	       
-	       /*
-	      else if (cardName.equals("Acridian"))
-	      {
-	    	  card.setEchoCost(card.getManaCost());
 	       
-	    	  final Command intoPlay = new Command()
+	     //*************** START *********** START **************************
+	      else if (cardName.equals("Chronatog"))
 	      {
-				private static final long serialVersionUID = 8930023870127082001L;
 	    	  
-				public void execute() {
-	    			  card.addIntrinsicKeyword("(Echo unpaid)");
+	    	  final Command untilEOT = new Command()
+		      {
+				private static final long serialVersionUID = 6926430725410883578L;
+
+				public void execute()
+		        {
+		          if(AllZone.GameAction.isCardInPlay(card))
+		          {
+		            card.addTempAttackBoost(-3);
+		            card.addTempDefenseBoost(-3);
+		          }
 		        }
 		      };
-	    	  card.addComesIntoPlayCommand(intoPlay);
-	      }
-	      */
 
+	    	  final Ability ability = new Ability(card, "0")
+	    	  {
+	    		  public void resolve()
+	    		  {
+    		          if(AllZone.GameAction.isCardInPlay(card))
+    		          {
+    		            card.addTempAttackBoost(3);
+    		            card.addTempDefenseBoost(3);
+    		            AllZone.EndOfTurn.addUntil(untilEOT);
+    		            
+    		            AllZone.Phase.subtractExtraTurn(card.getController());
+    		          }
+	    		  }
+	    		  
+	    		  public boolean canPlayAI()
+	    		  {
+	    			  return false;
+	    		  }
+	    	  };
+	    	  ability.setStackDescription(card.getName() + " gets +3/+3 until end of turn, " +card.getController() + " skips his/her next turn.");
+	    	  ability.setDescription("0: Chronatog gets +3/+3 until end of turn. You skip your next turn. Activate this ability only once each turn.");
+	    	  
+	    	  card.addSpellAbility(ability);
+	      }//*************** END ************ END **************************
 	       
 	      // Cards with Cycling abilities
 	      // -1 means keyword "Cycling" not found
@@ -19334,32 +19359,6 @@ public class CardFactory_Creatures {
 	        }
 	      }//echo
 	      
-	      /*
-	      if (hasKeyword(card, "Upkeep") != -1)
-	      {
-	        int n = hasKeyword(card, "Upkeep");
-	        if (n != -1)
-	        {
-	          String parse = card.getKeyword().get(n).toString();
-	          card.removeIntrinsicKeyword(parse);
-
-	          String k[] = parse.split(":");
-	          final String manacost = k[1];
-	          card.addIntrinsicKeyword("At the beginning of your upkeep, sacrifice " + card.getName() + " unless you pay " + manacost+".");
-	          
-	          final Command intoPlay = new Command()
-	    	  {
-				private static final long serialVersionUID = 925179072354331141L;
-
-				public void execute() {
-	    			  card.setUpkeepCost(manacost);
-	    		}
-	    	  };
-	    	  card.addComesIntoPlayCommand(intoPlay);
-	          
-	        }
-	      }//upkeep
-	      */
 	      	      
 		 return card;
 	}

src/forge/CardListUtil.java

@@ -150,6 +150,26 @@ public class CardListUtil
 	   list.sort(com);
   }
   
+  public static void sortByTapped(CardList list)
+  {
+	  Comparator<Card> com = new Comparator<Card>()
+	  {
+	      public int compare(Card a, Card b)
+	      {
+	    	
+	        if( a.isTapped() && b.isTapped())
+	          return 0;
+	        else if(a.isTapped())
+	          return 1;
+	        else if(b.isTapped())
+	          return -1;
+
+	        return 0;
+	     }
+	   };
+	   list.sort(com);
+  }
+  
   
   public static void sortCMC(CardList list)
   {

src/forge/ComputerUtil.java

@@ -37,6 +37,7 @@ private static Random random = new Random();
 
         payManaCost(all[i]);
         all[i].chooseTargetAI();
+        all[i].getBeforePayManaAI().execute();
         AllZone.Stack.add(all[i]);
 
         return false;

src/forge/GameAction.java

@@ -74,6 +74,12 @@ private Card getCurrentCard(int ID)
     moveTo(grave, c);
   }
   
+  public void moveToHand(Card c)
+  {
+	  PlayerZone hand = AllZone.getZone(Constant.Zone.Hand, c.getOwner());
+	  moveTo(hand, c);
+  }
+
   public void moveToTopOfLibrary(Card c)
   {
 	  PlayerZone p = AllZone.getZone(c);

src/forge/Phase.java

@@ -108,10 +108,28 @@ public class Phase extends MyObservable
     	String player = getActivePlayer();
     	String opponent = AllZone.GameAction.getOpponent(player);
     	
+    	if (player.equals(Constant.Player.Computer))
+    		computerExtraTurns--;
+    	else
+    		humanExtraTurns--;
+    	
     	AllZone.GameAction.setLastPlayerToDraw(opponent);
     	setPhase(Constant.Phase.Untap, player);
     	
     }
+    else if ((is(Constant.Phase.Cleanup, Constant.Player.Computer) && humanExtraTurns < 0 ) || 
+        	(is(Constant.Phase.Cleanup, Constant.Player.Human) && computerExtraTurns < 0 ) )
+    {
+    	String player = getActivePlayer();
+    	String opp = AllZone.GameAction.getOpponent(player);
+    	if (player.equals(Constant.Player.Computer))
+    		humanExtraTurns++;
+    	else
+    		computerExtraTurns++;
+    	
+    	AllZone.GameAction.setLastPlayerToDraw(opp);
+    	setPhase(Constant.Phase.Untap, player);
+    }
     else
     {
 	    phaseIndex++;
@@ -124,18 +142,22 @@ public class Phase extends MyObservable
     if (is(Constant.Phase.Untap, Constant.Player.Human))
     {
       turn++;
+      /*
       if (humanExtraTurns > 0)
     	  humanExtraTurns--;
       else if(humanExtraTurns < 0)
     	  humanExtraTurns++;
+    	  */
     }
     else if (is(Constant.Phase.Untap, Constant.Player.Computer))
     {
       turn++;
+      /*
       if (computerExtraTurns > 0)
     	  computerExtraTurns--;
       else if(computerExtraTurns < 0)
     	  computerExtraTurns++;
+    	  */
     }
     
     //for debugging: System.out.println(getPhase());
@@ -188,6 +210,14 @@ public class Phase extends MyObservable
 		  computerExtraTurns++;
   }
   
+  public void subtractExtraTurn(String player)
+  {
+	  if (player.equals(Constant.Player.Human))
+		  humanExtraTurns--;
+	  else
+		  computerExtraTurns--;
+  }
+  
   public int getExtraTurns(String player)
   {
 	  if (player.equals(Constant.Player.Human))

src/forge/PlayerZone_ComesIntoPlay.java

@@ -23,6 +23,9 @@ public class PlayerZone_ComesIntoPlay extends DefaultPlayerZone
 
 		Card c = (Card) o;
 		
+		if (CardFactoryUtil.oppHasKismet(c.getController()) && (c.isLand() || c.isCreature() || c.isArtifact() ))
+			c.tap();
+		
 		//cannot use addComesIntoPlayCommand - trigger might be set to false;
 		if (c.getName().equals("Exploration")) {
 			Input_Main.canPlayNumberOfLands++;
@@ -161,8 +164,6 @@ public class PlayerZone_ComesIntoPlay extends DefaultPlayerZone
 			}
 		}
 		
-
-		
 		/*
 		for (String effect : AllZone.StateBasedEffects.getStateBasedMap().keySet() ) {
 			Command com = GameActionUtil.commands.get(effect);

src/forge/SpellAbility.java

@@ -28,7 +28,8 @@ public abstract class SpellAbility
   private Input afterResolve;
   private Input afterPayMana;
   
-  private Command cancelCommand = null;
+  private Command cancelCommand = Command.Blank;
+  private Command beforePayManaAI = Command.Blank;
 
   private CommandArgs randomTarget = new CommandArgs() {
   
@@ -90,6 +91,9 @@ public void execute(Object o) {}};
   public void setSourceCard(Card c) {sourceCard=c;}
   public Card getSourceCard()  {return sourceCard;}
   
+  public Command getBeforePayManaAI() 		 { return beforePayManaAI; }
+  public void setBeforePayManaAI(Command c)  { beforePayManaAI = c; }
+  
   //begin - Input methods
   public Input getBeforePayMana()            {return beforePayMana;}
   public void  setBeforePayMana(Input in) {beforePayMana = in; }

src/javazoom/jl/converter/RiffFile.java

@@ -466,6 +466,7 @@ public class RiffFile
    /**
     * Error Messages.
 	*/
+   @SuppressWarnings("unused")
    private String DDCRET_String(int retcode)
    {
    	 switch ( retcode )
@@ -484,6 +485,7 @@ public class RiffFile
    /**
     * Fill the header.
 	*/
+   @SuppressWarnings("deprecation")
    public static int FourCC(String ChunkName)
    {
       byte[] p = {0x20,0x20,0x20,0x20};

src/javazoom/jl/converter/WaveFileObuffer.java

@@ -67,6 +67,7 @@ public class WaveFileObuffer extends Obuffer
 	
 	outWave = new WaveFile();
 	
+    @SuppressWarnings("unused")
 	int rc = outWave.OpenForWrite (FileName,freq,(short)16,(short)channels);
   }
 
@@ -86,7 +87,9 @@ public class WaveFileObuffer extends Obuffer
   public void write_buffer(int val)
   {
 	  
+    @SuppressWarnings("unused")
 	int k = 0;
+    @SuppressWarnings("unused")
 	int rc = 0;
     
 	rc = outWave.WriteData(buffer, bufferp[0]);

src/javazoom/jl/converter/jlc.java

@@ -46,6 +46,7 @@ public class jlc
 	static public void main(String args[])
 	{
 		String[] argv;
+		@SuppressWarnings("unused")
 		long start = System.currentTimeMillis();
 		int argc = args.length + 1;
 		argv = new String[argc];
@@ -118,6 +119,7 @@ public class jlc
 	  public boolean processArgs(String[] argv)
 	  {
 		 filename = null;
+		 @SuppressWarnings("unused")
 		 Crc16[] crc;
 		 crc = new Crc16[1];
 	     int i;

src/javazoom/jl/decoder/BitReserve.java

@@ -57,6 +57,7 @@ final class BitReserve
 	
 	private int 					offset, totbit, buf_byte_idx;
 	private final int[] 			buf = new int[BUFSIZE];
+	@SuppressWarnings("unused")
 	private int 					buf_bit_idx;
 	
    BitReserve()

src/javazoom/jl/decoder/Bitstream.java

@@ -218,7 +218,9 @@ public final class Bitstream implements BitstreamErrors
 		if ( (id3header[0]=='I') && (id3header[1]=='D') && (id3header[2]=='3'))
 		{
 			in.read(id3header,0,3);
+			@SuppressWarnings("unused")
 			int majorVersion = id3header[0];
+			@SuppressWarnings("unused")
 			int revision = id3header[1];
 			in.read(id3header,0,4);
 			size = (int) (id3header[0] << 21) + (id3header[1] << 14) + (id3header[2] << 7) + (id3header[3]);
@@ -514,6 +516,7 @@ public final class Bitstream implements BitstreamErrors
 	
 	for (int k=0;k<bytesize;k=k+4)
 	{
+		@SuppressWarnings("unused")
 		int convert = 0;
 		byte b0 = 0;
 		byte b1 = 0;

src/javazoom/jl/decoder/BitstreamException.java

@@ -37,9 +37,10 @@ package javazoom.jl.decoder;
  * @author MDM	12/12/99
  */
 
-public class BitstreamException extends JavaLayerException
+	@SuppressWarnings("serial")
+	public class BitstreamException extends JavaLayerException
 	implements BitstreamErrors
-{	
+    {	
 	private int errorcode = UNKNOWN_ERROR;
 	
 	public BitstreamException(String msg, Throwable t)

src/javazoom/jl/decoder/Decoder.java

@@ -271,6 +271,7 @@ public class Decoder implements DecoderErrors
 		float scalefactor = 32700.0f;
 		
 		int mode = header.mode();
+		@SuppressWarnings("unused")
 		int layer = header.layer();
 		int channels = mode==Header.SINGLE_CHANNEL ? 1 : 2;
 

src/javazoom/jl/decoder/DecoderException.java

@@ -29,6 +29,7 @@ package javazoom.jl.decoder;
 public class DecoderException extends JavaLayerException
 	implements DecoderErrors
 {	
+	private static final long serialVersionUID = 739129173366217466L;
 	private int		errorcode = UNKNOWN_ERROR;
 	
 	public DecoderException(String msg, Throwable t)

src/javazoom/jl/decoder/JavaLayerError.java

@@ -28,4 +28,5 @@ package javazoom.jl.decoder;
  */
 public class JavaLayerError extends Error
 {
+	private static final long serialVersionUID = -8924506540200863304L;	
 }

src/javazoom/jl/decoder/JavaLayerException.java

@@ -34,7 +34,7 @@ import java.io.PrintStream;
  */
 public class JavaLayerException extends Exception
 {
-	
+	private static final long serialVersionUID = 7212135786131434159L;
 	private Throwable		exception;
 	
 	

src/javazoom/jl/decoder/JavaLayerUtils.java

@@ -44,6 +44,7 @@ public class JavaLayerUtils
 	 * @param in	The input stream to deserialize an object from.
 	 * @param cls	The expected class of the deserialized object. 
 	 */
+	@SuppressWarnings("unchecked")
 	static public Object deserialize(InputStream in, Class cls)
 		throws IOException
 	{
@@ -107,6 +108,7 @@ public class JavaLayerUtils
 	 * @param length	The expected length of the array, or -1 if
 	 *					any length is expected.
 	 */
+	@SuppressWarnings("unchecked")
 	static public Object deserializeArray(InputStream in, Class elemType, int length)
 		throws IOException
 	{
@@ -138,6 +140,7 @@ public class JavaLayerUtils
 		return obj;
 	}
 
+	@SuppressWarnings("unchecked")
 	static public Object deserializeArrayResource(String name, Class elemType, int length)
 		throws IOException
 	{		
@@ -188,6 +191,7 @@ public class JavaLayerUtils
 	 *				provided, its getResourceAsStream() method is called
 	 *				to retrieve the resource. 
 	 */
+	@SuppressWarnings("unchecked")
 	static synchronized public InputStream getResourceAsStream(String name)
 	{
 		InputStream is = null;

src/javazoom/jl/decoder/SynthesisFilter.java

@@ -572,6 +572,7 @@ final class SynthesisFilter
   /**
    * Compute new values via a fast cosine transform.
    */
+  @SuppressWarnings("unused")
   private void compute_new_v_old()
   {
 	// p is fully initialized from x1
@@ -970,6 +971,7 @@ final class SynthesisFilter
   {
 	final float[] vp = actual_v;
 	
+	@SuppressWarnings("unused")
 	int idx = 0;
 	//int inc = v_inc;
 	final float[] tmpOut = _tmpOut;
@@ -1613,6 +1615,7 @@ private void compute_pcm_samples(Obuffer buffer)
    * Loads the data for the d[] from the resource SFd.ser. 
    * @return the loaded values for d[].
    */
+	@SuppressWarnings("unchecked")
 	static private float[] load_d()
 	{
 		try

src/javazoom/jl/decoder/huffcodetab.java

@@ -49,14 +49,19 @@ final class huffcodetab
   
   private char				 tablename0 = ' ';      /* string, containing table_description   */
   private char				 tablename1 = ' ';      /* string, containing table_description   */
+  @SuppressWarnings("unused")
   private char				 tablename2 = ' ';      /* string, containing table_description   */
   
   private int				 xlen; 			        /* max. x-index+                          */
   private int				 ylen;	                /* max. y-index+				          */
   private int				 linbits; 		        /* number of linbits   	                  */
+  @SuppressWarnings("unused")
   private int 				 linmax;		        /* max number to be stored in linbits	  */
+  @SuppressWarnings("unused")
   private int				 ref;			        /* a positive value indicates a reference */
+  @SuppressWarnings("unused")
   private int[]				 table=null;	        /* pointer to array[xlen][ylen]		      */
+  @SuppressWarnings("unused")
   private int[]   			 hlen=null;             /* pointer to array[xlen][ylen]		      */
   private int[][]			 val=null;		        /* decoder tree		    	              */
   private int 				 treelen;	            /* length of decoder tree  	              */
@@ -417,6 +422,7 @@ final class huffcodetab
 
   public static huffcodetab[]  ht = null;     /* Simulate extern struct                 */
 
+  @SuppressWarnings("unused")
   private static int[] bitbuf = new int[32];
   
   /**
@@ -453,6 +459,7 @@ final class huffcodetab
 	// 32,33 count1-tables
 
 	int dmask = 1 << ((4 * 8) - 1);
+	@SuppressWarnings("unused")
 	int hs    = 4 * 8;
   	int level;
   	int point = 0;

src/javazoom/jl/player/AudioDeviceFactory.java

@@ -62,6 +62,7 @@ public abstract class AudioDeviceFactory
 	 * @param name		The name of the class to load.
 	 * @return			A newly-created instance of the audio device class.
 	 */
+	@SuppressWarnings("unchecked")
 	protected AudioDevice instantiate(ClassLoader loader, String name)
 		throws ClassNotFoundException, 
 			   IllegalAccessException, 

src/javazoom/jl/player/FactoryRegistry.java

@@ -50,7 +50,8 @@ public class FactoryRegistry extends AudioDeviceFactory
 	}
 
 	
-	protected Hashtable factories = new Hashtable();
+	@SuppressWarnings("unchecked")
+	protected Hashtable<Class<? extends AudioDeviceFactory>, AudioDeviceFactory> factories = new Hashtable();
 	
 	/**
 	 * Registers an <code>AudioDeviceFactory</code> instance
@@ -61,7 +62,7 @@ public class FactoryRegistry extends AudioDeviceFactory
 		factories.put(factory.getClass(), factory);						  
 	}
 	
-	public void removeFactoryType(Class cls)
+	public void removeFactoryType(Class<?> cls)
 	{
 		factories.remove(cls);
 	}
@@ -111,7 +112,7 @@ public class FactoryRegistry extends AudioDeviceFactory
 			{
 				fa = new AudioDeviceFactory[size];
 				int idx = 0;
-				Enumeration e = factories.elements();
+				Enumeration<AudioDeviceFactory> e = factories.elements();
 				while (e.hasMoreElements())
 				{
 					AudioDeviceFactory factory = (AudioDeviceFactory)e.nextElement();

src/javazoom/jl/player/Player.java

@@ -44,6 +44,7 @@ public class Player
 	/**
 	 * The current frame number. 
 	 */
+	@SuppressWarnings("unused")
 	private int frame = 0;
 	
 	/**

src/javazoom/jl/player/PlayerApplet.java

@@ -37,6 +37,8 @@ import javazoom.jl.decoder.JavaLayerException;
  */
 public class PlayerApplet extends Applet implements Runnable
 {
+	private static final long serialVersionUID = 713230088845043034L;
+
 	static public final String AUDIO_PARAMETER = "audioURL";
 	
 	/**

src/javazoom/jl/player/advanced/AdvancedPlayer.java

@@ -45,7 +45,9 @@ public class AdvancedPlayer
 	/** Has the player been closed? */
 	private boolean closed = false;
 	/** Has the player played back all frames from the stream? */
+	@SuppressWarnings("unused")
 	private boolean complete = false;
+	@SuppressWarnings("unused")
 	private int lastPosition = 0;
 	/** Listener for the playback process */
 	private PlaybackListener listener;