5 files changed, 28 insertions, 14 deletions

@@ -510,7 +510,7 @@ public class MapViewGameState implements GameState
 
                     if (displayChar != ' ')
                     {
-                        g.drawImage(SystemFont.getCharacter(grid[x][y].getDisplayCharacter()), (x-viewportx)*TILE_WIDTH, (y-viewporty)*TILE_HEIGHT, TILE_WIDTH, TILE_HEIGHT, null);
+                        g.drawImage(SystemFont.getCharacter(grid[x][y].getDisplayCharacter(), Color.WHITE), (x-viewportx)*TILE_WIDTH, (y-viewporty)*TILE_HEIGHT, TILE_WIDTH, TILE_HEIGHT, null);
                     }
                 }
             }
@@ -521,12 +521,12 @@ public class MapViewGameState implements GameState
         {
             if ((gridLighting[mob.x][mob.y]) && (isInViewport(mob.x, mob.y)))
             {
-                g.drawImage(SystemFont.getCharacter(mob.getDisplayCharacter()), (mob.x-viewportx)*TILE_WIDTH, (mob.y-viewporty)*TILE_HEIGHT, TILE_WIDTH, TILE_HEIGHT, null);
+                g.drawImage(SystemFont.getCharacter(mob.getDisplayCharacter(), mob.getDisplayColor()), (mob.x-viewportx)*TILE_WIDTH, (mob.y-viewporty)*TILE_HEIGHT, TILE_WIDTH, TILE_HEIGHT, null);
             }
         }
         
         // Render player
-        g.drawImage(SystemFont.getCharacter('@'), (playerx-viewportx)*TILE_WIDTH, (playery-viewporty)*TILE_HEIGHT, TILE_WIDTH, TILE_HEIGHT, null);
+        g.drawImage(SystemFont.getCharacter('@', Color.WHITE), (playerx-viewportx)*TILE_WIDTH, (playery-viewporty)*TILE_HEIGHT, TILE_WIDTH, TILE_HEIGHT, null);
         
         // Render messages
         g.setColor(new Color(53, 63, 62));
@@ -538,7 +538,7 @@ public class MapViewGameState implements GameState
             {
                 for (int j=0; j<messages[i].length(); j++)
                 {
-                    g.drawImage(SystemFont.getCharacter(messages[i].charAt(j)), j*TILE_WIDTH, (VIEWPORT_HEIGHT+i)*TILE_HEIGHT, TILE_WIDTH, TILE_HEIGHT, null);
+                    g.drawImage(SystemFont.getCharacter(messages[i].charAt(j), Color.WHITE), j*TILE_WIDTH, (VIEWPORT_HEIGHT+i)*TILE_HEIGHT, TILE_WIDTH, TILE_HEIGHT, null);
                 }
             }
         }
@@ -4,6 +4,7 @@
  */
 package com.fourisland.frigidearth;
 
+import java.awt.Color;
 import java.awt.Point;
 
 /**
@@ -35,5 +36,6 @@ public abstract class Mob
     }
     
     public abstract char getDisplayCharacter();
+    public abstract Color getDisplayColor();
     public abstract String getName();
 }
@@ -4,6 +4,7 @@
  */
 package com.fourisland.frigidearth;
 
+import java.awt.Color;
 import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
@@ -12,6 +13,8 @@ import java.awt.Transparency;
 import java.awt.image.BufferedImage;
 import java.awt.image.FilteredImageSource;
 import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.imageio.ImageIO;
@@ -22,9 +25,9 @@ import javax.imageio.ImageIO;
  */
 public class SystemFont
 {
-    private static BufferedImage fontGraphic = null;
+    private static Map<Color,BufferedImage> fontGraphic = new HashMap<Color,BufferedImage>();
     
-    public static void initalize()
+    public static void initalize(Color color)
     {
         try
         {
@@ -32,21 +35,22 @@ public class SystemFont
             GraphicsEnvironment env = GraphicsEnvironment.getLocalGraphicsEnvironment();
             GraphicsDevice device = env.getDefaultScreenDevice();
             GraphicsConfiguration config = device.getDefaultConfiguration();
-            fontGraphic = config.createCompatibleImage(temp.getWidth(), temp.getHeight(), Transparency.TRANSLUCENT);
-            fontGraphic.createGraphics().drawImage(Toolkit.getDefaultToolkit().createImage(new FilteredImageSource(temp.getSource(), new TransparentPixelFilter(temp.getRGB(0, 0)))),0,0,null);
+            BufferedImage g = config.createCompatibleImage(temp.getWidth(), temp.getHeight(), Transparency.TRANSLUCENT);
+            g.createGraphics().drawImage(Toolkit.getDefaultToolkit().createImage(new FilteredImageSource(temp.getSource(), new TransparentPixelFilter(temp.getRGB(0, 0), color.getRGB()))),0,0,null);
+            fontGraphic.put(color, g);
         } catch (IOException ex)
         {
             Logger.getLogger(SystemFont.class.getName()).log(Level.SEVERE, null, ex);
         }
     }
     
-    public static BufferedImage getCharacter(char c)
+    public static BufferedImage getCharacter(char c, Color color)
     {
-        if (fontGraphic == null)
+        if (!fontGraphic.containsKey(color))
         {
-            initalize();
+            initalize(color);
         }
         
-        return fontGraphic.getSubimage((c % 16) * 12, (c / 16) * 12, 12, 12);
+        return fontGraphic.get(color).getSubimage((c % 16) * 12, (c / 16) * 12, 12, 12);
     }
 }
@@ -14,9 +14,11 @@ import java.awt.image.RGBImageFilter;
 public class TransparentPixelFilter extends RGBImageFilter {
 
     private int trans;
-    public TransparentPixelFilter(int i)
+    private int replace;
+    public TransparentPixelFilter(int i, int j)
     {
         trans = i;
+        replace = j;
         
         canFilterIndexColorModel = true;
     }
@@ -28,7 +30,7 @@ public class TransparentPixelFilter extends RGBImageFilter {
         {
             return 0;
         } else {
-            return rgb;
+            return replace;
         }
     }
 
@@ -5,6 +5,7 @@
 package com.fourisland.frigidearth.mobs;
 
 import com.fourisland.frigidearth.Mob;
+import java.awt.Color;
 
 /**
  *
@@ -24,6 +25,11 @@ public class Mouse extends Mob
         return 'm';
     }
     
+    public Color getDisplayColor()
+    {
+        return Color.GRAY;
+    }
+    
     public String getName()
     {
         return "Mouse";