Added support for other System files

Because the coordinates and transparent color previously used were tuned for the default System file, the coordinates were changed to be more forgiving and the color is picked from the last pixel of the first row from the graphic.

Also, for some reason, every file in source control has been marked as modified, even though most haven't been. Don't know why this happened.

70 files changed, 38 insertions, 16 deletions

@@ -7,6 +7,7 @@ package com.fourisland.fourpuzzle;
 import com.fourisland.fourpuzzle.gamestate.TitleScreenGameState;
 import com.fourisland.fourpuzzle.gamestate.mapview.ChipSet;
 import com.fourisland.fourpuzzle.util.Interval;
+import com.fourisland.fourpuzzle.window.SystemGraphic;
 import java.awt.GraphicsEnvironment;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
@@ -107,6 +108,8 @@ public class PuzzleApplication extends Application {
                 try {
                     Audio.init();
                     ChipSet.initalize();
+                    SystemGraphic.initalize();
+                    
                     Game.setGameState(new TitleScreenGameState());
                     
                     Interval in = Interval.createTickInterval(1);
@@ -73,7 +73,7 @@ public class ChoiceWindow {
         Graphics2D g2 = cacheBase.createGraphics();
         
         g2.drawImage(SystemGraphic.getMessageBackground(), 1, 1, TopLeft.getWidth()+getWidth()+TopRight.getWidth()-2, TopLeft.getHeight()+getHeight()+BottomLeft.getHeight()-2, null);
-        g2.drawImage(Toolkit.getDefaultToolkit().createImage(new FilteredImageSource(temp.getSource(), new TransparentPixelFilter(-25600))), 0, 0, null);
+        g2.drawImage(Toolkit.getDefaultToolkit().createImage(new FilteredImageSource(temp.getSource(), new TransparentPixelFilter(SystemGraphic.getTransparentColor().getRGB()))), 0, 0, null);
         g2.setFont(g2.getFont().deriveFont(Font.BOLD));
         
         int ty = TopLeft.getHeight()+g2.getFontMetrics().getHeight()-SPACER;
@@ -86,10 +86,6 @@ public class ChoiceWindow {
                 tx += ((width/2)-(g2.getFontMetrics().stringWidth(choice)/2));
             }
             
-            /* TODO The following code paints the text onto the window. However,
-             * when it paints the lowercase 'y', the tail is white, not the
-             * correct gradient. */
-            
             g2.setPaint(new TexturePaint(SystemGraphic.getTextColor(), new Rectangle(tx, ty, g2.getFontMetrics().stringWidth(choice),g2.getFontMetrics().getHeight())));
             g2.drawString(choice, tx, ty);
             
@@ -113,5 +109,21 @@ public class ChoiceWindow {
     {
         return height;
     }
+    
+    int selected = 0;
+    public void moveUp()
+    {
+        selected--;
+    }
+    
+    public void moveDown()
+    {
+        selected++;
+    }
+    
+    public String getSelected()
+    {
+        return choices.get(selected);
+    }
 
 }
@@ -11,13 +11,13 @@ package com.fourisland.fourpuzzle.window;
  */
 public enum SystemChoiceArea
 {
-    Top(47, 0, 1, 4),
-    TopRight(56, 0, 8, 8),
-    Right(60, 15, 4, 1),
-    BottomRight(56, 24, 8, 8),
-    Bottom(47, 28, 1, 4),
-    BottomLeft(32, 24, 8, 8),
-    Left(32, 15, 4, 1),
+    Top(47, 0, 1, 9),
+    TopRight(56, 0, 8, 9),
+    Right(56, 15, 8, 1),
+    BottomRight(56, 25, 8, 9),
+    Bottom(47, 24, 1, 9),
+    BottomLeft(32, 24, 11, 9),
+    Left(32, 15, 11, 1),
     TopLeft(32, 0, 8, 8),
     UpArrow(43, 9, 10, 6),
     DownArrow(43, 17, 10, 6);
@@ -6,6 +6,7 @@
 package com.fourisland.fourpuzzle.window;
 
 import com.fourisland.fourpuzzle.util.ObjectLoader;
+import java.awt.Color;
 import java.awt.image.BufferedImage;
 
 /**
@@ -15,14 +16,15 @@ import java.awt.image.BufferedImage;
 public class SystemGraphic {
     
     private static BufferedImage systemGraphic;
-    static
+    private static String filename = "System";
+    public static void setGraphic(String filename)
     {
-        initalize("System");
+        SystemGraphic.filename = filename;
     }
     
-    public static void initalize(String graphic)
+    public static void initalize()
     {
-        systemGraphic = ObjectLoader.getImage("Picture", graphic);
+        systemGraphic = ObjectLoader.getImage("Picture", filename);
     }
     
     public static BufferedImage getMessageBackground()
@@ -39,5 +41,10 @@ public class SystemGraphic {
     {
         return systemGraphic.getSubimage(0, 48, 16, 16);
     }
+    
+    public static Color getTransparentColor()
+    {
+        return new Color(systemGraphic.getRGB(159, 0));
+    }
 
 }