2 files changed, 60 insertions, 1 deletions

@@ -191,7 +191,7 @@ public class MapViewGameState implements GameState
                     if (ways == 0)
                     {
                         grid[newx][newy] = Tile.DownStairs;
-                        playerx=newx+1;
+                        playerx=newx;
                         playery=newy;
                         state = 10;
                         break;
@@ -673,6 +673,22 @@ public class MapViewGameState implements GameState
         
         adjustViewport();
         calculateFieldOfView();
+        
+        if (health <= 0)
+        {
+            printMessage("You have died! Press [ENTER] to quit.");
+            
+            Main.addInputable(new Inputable() {
+                @Override
+                public void processInput(KeyEvent e)
+                {
+                    if (e.getKeyCode() == KeyEvent.VK_ENTER)
+                    {
+                        System.exit(0);
+                    }
+                }
+            });
+        }
     }
     
     private void adjustViewport()
@@ -109,6 +109,49 @@ public enum Tile
         {
             return new Color(162, 181, 205);
         }
+    },
+    Window {
+        public boolean isBlocked()
+        {
+            return true;
+        }
+        
+        public char getDisplayCharacter()
+        {
+            return 'W';
+        }
+        
+        public Color getBackgroundColor()
+        {
+            return new Color(0, 63, 135);
+        }
+    },
+    ShatteredWindow {
+        public boolean isBlocked()
+        {
+            return false;
+        }
+        
+        public char getDisplayCharacter()
+        {
+            return 'W';
+        }
+        
+        public Color getBackgroundColor()
+        {
+            return new Color(162, 181, 205);
+        }
+    },
+    Snow {
+        public boolean isBlocked()
+        {
+            return false;
+        }
+        
+        public Color getBackgroundColor()
+        {
+            return new Color(255, 250, 250);
+        }
     };
     
     public abstract boolean isBlocked();