5 files changed, 188 insertions, 26 deletions

@@ -4,16 +4,41 @@
  */
 package com.fourisland.frigidearth;
 
+import java.awt.Point;
+import java.awt.event.KeyEvent;
+
 /**
  *
  * @author hatkirby
  */
 public enum Direction
 {
-    North,
-    East,
-    South,
-    West;
+    North {
+        public Point to(Point pos)
+        {
+            return new Point(pos.x, pos.y-1);
+        }
+    },
+    East {
+        public Point to(Point pos)
+        {
+            return new Point(pos.x+1, pos.y);
+        }
+    },
+    South {
+        public Point to(Point pos)
+        {
+            return new Point(pos.x, pos.y+1);
+        }
+    },
+    West {
+        public Point to(Point pos)
+        {
+            return new Point(pos.x-1, pos.y);
+        }
+    };
+    
+    public abstract Point to(Point pos);
     
     public static Direction getRandomDirection()
     {
@@ -28,4 +53,16 @@ public enum Direction
             default: return null; // This can't happen
         }
     }
+    
+    public static Direction fromKeyEvent(KeyEvent e)
+    {
+        switch (e.getKeyCode())
+        {
+            case KeyEvent.VK_UP: return North;
+            case KeyEvent.VK_RIGHT: return East;
+            case KeyEvent.VK_DOWN: return South;
+            case KeyEvent.VK_LEFT: return West;
+            default: return null;
+        }
+    }
 }
@@ -18,4 +18,16 @@ public class Functions
         
         return r.nextInt(max - min + 1) + min;
     }
+    
+    public static int rollDice(int dice, int sides)
+    {
+        int result = 0;
+        
+        for (int i=0; i<dice; i++)
+        {
+            result += random(1, sides);
+        }
+        
+        return result;
+    }
 }
@@ -4,8 +4,10 @@
  */
 package com.fourisland.frigidearth;
 
+import com.fourisland.frigidearth.mobs.Mouse;
 import java.awt.Color;
 import java.awt.Graphics2D;
+import java.awt.Point;
 import java.awt.event.KeyEvent;
 import java.util.ArrayList;
 import java.util.List;
@@ -32,6 +34,7 @@ public class MapViewGameState implements GameState
     private Tile[][] grid;
     private boolean[][] gridLighting;
     private List<Room> rooms = new ArrayList<Room>();
+    private List<Mob> mobs = new ArrayList<Mob>();
     private int playerx = 4;
     private int playery = 4;
     private int viewportx = 0;
@@ -225,6 +228,13 @@ public class MapViewGameState implements GameState
         
         rooms.add(room);
         
+        // Place mice in random rooms because yolo
+        if (Functions.random(0, 100) < 25)
+        {
+            Mob mob = new Mouse(Functions.random(room.getX()+1, room.getX()+room.getWidth()-2), Functions.random(room.getY()+1, room.getY()+room.getHeight()-2));
+            mobs.add(mob);
+        }
+        
         return true;
     }
     
@@ -460,38 +470,59 @@ public class MapViewGameState implements GameState
             }
         }
         
+        // Render mobs
+        for (Mob mob : mobs)
+        {
+            if ((gridLighting[mob.getX()][mob.getY()]) && (mob.getX() > viewportx) && (mob.getX() < viewportx+VIEWPORT_WIDTH) && (mob.getY() > viewporty) && (mob.getY() < viewporty+VIEWPORT_HEIGHT))
+            {
+                g.drawImage(SystemFont.getCharacter(mob.getDisplayCharacter()), (mob.getX()-viewportx)*TILE_WIDTH, (mob.getY()-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);
     }
     
     public void processInput(KeyEvent e)
     {
-        if (e.getKeyCode() == KeyEvent.VK_LEFT)
-        {
-            if ((playerx > 0) && (!grid[playerx-1][playery].isBlocked()))
-            {
-                playerx--;
-            }
-        } else if (e.getKeyCode() == KeyEvent.VK_RIGHT)
-        {
-            if ((playerx < GAME_WIDTH - 1) && (!grid[playerx+1][playery].isBlocked()))
-            {
-                playerx++;
-            }
-        } else if (e.getKeyCode() == KeyEvent.VK_UP)
+        switch (e.getKeyCode())
         {
-            if ((playery > 0) && (!grid[playerx][playery-1].isBlocked()))
-            {
-                playery--;
-            }
-        } else if (e.getKeyCode() == KeyEvent.VK_DOWN)
+            case KeyEvent.VK_LEFT:
+            case KeyEvent.VK_RIGHT:
+            case KeyEvent.VK_UP:
+            case KeyEvent.VK_DOWN:
+                Direction dir = Direction.fromKeyEvent(e);
+                Point to = dir.to(new Point(playerx, playery));
+                
+                if ((isValidPosition(to.x,to.y)) && (!grid[to.x][to.y].isBlocked()))
+                {
+                    playerx = to.x;
+                    playery = to.y;
+                } else {
+                    return;
+                }
+                
+                break;
+                
+            default:
+                return;
+        }
+        
+        // Move mobs randomly
+        for (Mob mob : mobs)
         {
-            if ((playery < GAME_HEIGHT - 1) && (!grid[playerx][playery+1].isBlocked()))
+            Direction toDir = null;
+            
+            for (int i=0; i<10; i++)
             {
-                playery++;
+                toDir = Direction.getRandomDirection();
+                Point to = toDir.to(mob.getPosition());
+                if ((isValidPosition(to.x,to.y)) &&(!grid[to.x][to.y].isBlocked()))
+                {
+                    mob.moveInDirection(toDir);
+                    break;
+                }
             }
-        } else {
-            return;
         }
         
         adjustViewport();
@@ -524,4 +555,14 @@ public class MapViewGameState implements GameState
             viewporty = 0;
         }
     }
+    
+    private boolean isValidPosition(int x, int y)
+    {
+        if (x < 0) return false;
+        if (x > GAME_WIDTH) return false;
+        if (y < 0) return false;
+        if (y > GAME_HEIGHT) return false;
+        
+        return true;
+    }
 }
@@ -0,0 +1,47 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.fourisland.frigidearth;
+
+import java.awt.Point;
+
+/**
+ *
+ * @author hatkirby
+ */
+public abstract class Mob
+{
+    private int x;
+    private int y;
+    
+    public Mob(int x, int y)
+    {
+        this.x = x;
+        this.y = y;
+    }
+    
+    public int getX()
+    {
+        return x;
+    }
+    
+    public int getY()
+    {
+        return y;
+    }
+    
+    public Point getPosition()
+    {
+        return new Point(x,y);
+    }
+    
+    public void moveInDirection(Direction dir)
+    {
+        Point to = dir.to(getPosition());
+        x = to.x;
+        y = to.y;
+    }
+    
+    public abstract char getDisplayCharacter();
+}
@@ -0,0 +1,25 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.fourisland.frigidearth.mobs;
+
+import com.fourisland.frigidearth.Mob;
+
+/**
+ *
+ * @author hatkirby
+ */
+public class Mouse extends Mob
+{
+    public Mouse(int x, int y)
+    {
+        super(x, y);
+    }
+    
+    
+    public char getDisplayCharacter()
+    {
+        return 'm';
+    }
+}