From f97d9581c7b5a1db7db6434938ea594749c08ff5 Mon Sep 17 00:00:00 2001
From: Starla Insigna <hatkirby@fourisland.com>
Date: Sun, 3 Jun 2012 07:58:20 -0400
Subject: Added background colors for tiles

---
 .../fourisland/frigidearth/MapViewGameState.java   | 15 +++++++-
 src/com/fourisland/frigidearth/Tile.java           | 41 ++++++++++++++--------
 2 files changed, 40 insertions(+), 16 deletions(-)

(limited to 'src/com/fourisland')

diff --git a/src/com/fourisland/frigidearth/MapViewGameState.java b/src/com/fourisland/frigidearth/MapViewGameState.java
index f378d5a..fe32fe2 100644
--- a/src/com/fourisland/frigidearth/MapViewGameState.java
+++ b/src/com/fourisland/frigidearth/MapViewGameState.java
@@ -4,6 +4,7 @@
  */
 package com.fourisland.frigidearth;
 
+import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.event.KeyEvent;
 
@@ -483,7 +484,19 @@ public class MapViewGameState implements GameState
         {
             for (int y=viewporty; y<viewporty+VIEWPORT_HEIGHT; y++)
             {
-                g.drawImage(SystemFont.getCharacter(grid[x][y].getDisplayCharacter()), (x-viewportx)*TILE_WIDTH, (y-viewporty)*TILE_HEIGHT, TILE_WIDTH, TILE_HEIGHT, null);
+                char displayChar = grid[x][y].getDisplayCharacter();
+                Color displayColor = grid[x][y].getBackgroundColor();
+                
+                if (!displayColor.equals(Color.BLACK))
+                {
+                    g.setColor(displayColor);
+                    g.fillRect((x-viewportx)*TILE_WIDTH, (y-viewporty)*TILE_HEIGHT, TILE_WIDTH, TILE_HEIGHT);
+                }
+                
+                if (displayChar != ' ')
+                {
+                    g.drawImage(SystemFont.getCharacter(grid[x][y].getDisplayCharacter()), (x-viewportx)*TILE_WIDTH, (y-viewporty)*TILE_HEIGHT, TILE_WIDTH, TILE_HEIGHT, null);
+                }
             }
         }
         
diff --git a/src/com/fourisland/frigidearth/Tile.java b/src/com/fourisland/frigidearth/Tile.java
index e25cedd..cc128a6 100644
--- a/src/com/fourisland/frigidearth/Tile.java
+++ b/src/com/fourisland/frigidearth/Tile.java
@@ -4,6 +4,8 @@
  */
 package com.fourisland.frigidearth;
 
+import java.awt.Color;
+
 /**
  *
  * @author hatkirby
@@ -15,11 +17,6 @@ public enum Tile
         {
             return true;
         }
-        
-        public char getDisplayCharacter()
-        {
-            return 'X';
-        }
     },
     DirtWall {
         public boolean isBlocked()
@@ -27,9 +24,9 @@ public enum Tile
             return true;
         }
         
-        public char getDisplayCharacter()
+        public Color getBackgroundColor()
         {
-            return '#';
+            return new Color(96, 51, 17);
         }
     },
     DirtFloor {
@@ -38,9 +35,9 @@ public enum Tile
             return false;
         }
         
-        public char getDisplayCharacter()
+        public Color getBackgroundColor()
         {
-            return ' ';
+            return new Color(205, 127, 50);
         }
     },
     StoneWall {
@@ -48,11 +45,6 @@ public enum Tile
         {
             return true;
         }
-        
-        public char getDisplayCharacter()
-        {
-            return 'X';
-        }
     },
     Corridor {
         public boolean isBlocked()
@@ -64,6 +56,11 @@ public enum Tile
         {
             return '.';
         }
+        
+        public Color getBackgroundColor()
+        {
+            return new Color(182, 175, 169);
+        }
     },
     Door {
         public boolean isBlocked()
@@ -75,6 +72,11 @@ public enum Tile
         {
             return 'D';
         }
+        
+        public Color getBackgroundColor()
+        {
+            return new Color(96, 51, 17);
+        }
     },
     UpStairs {
         public boolean isBlocked()
@@ -100,5 +102,14 @@ public enum Tile
     };
     
     public abstract boolean isBlocked();
-    public abstract char getDisplayCharacter();
+    
+    public char getDisplayCharacter()
+    {
+        return ' ';
+    }
+    
+    public Color getBackgroundColor()
+    {
+        return Color.BLACK;
+    }
 }
-- 
cgit 1.4.1