Added item Wooden Helmet (no use yet) and added ability to drop items

4 files changed, 58 insertions, 3 deletions

@@ -111,6 +111,15 @@ public class InventoryOverlay implements Renderable, Inputable
                     
                     return;
                 }
+                
+            case KeyEvent.VK_D:
+                ((MapViewGameState) Main.getGameState()).dropItemAtPlayer(Main.currentGame.inventory.get(id));
+                Main.currentGame.inventory.remove(id);
+                ((MapViewGameState) Main.getGameState()).tick();
+                Main.removeRenderable(this);
+                Main.removeInputable(this);
+
+                return;
         }
     }
     
@@ -50,6 +50,34 @@ public enum Item
             return true;
         }
     },
+    WoodenHelmet {
+        public String getItemName()
+        {
+            return "Wooden Helmet";
+        }
+        
+        public char getDisplayCharacter()
+        {
+            return '^';
+        }
+        
+        public Color getDisplayColor()
+        {
+            return new Color(128, 42, 42);
+        }
+        
+        public ItemType getItemType()
+        {
+            return ItemType.Helmet;
+        }
+        
+        public boolean useItem()
+        {
+            // Nope not yet
+            
+            return true;
+        }
+    },
     Key {
         public String getItemName()
         {
@@ -10,10 +10,16 @@ package com.fourisland.frigidearth;
  */
 public enum ItemType
 {
+    Helmet {
+        public double getRarity()
+        {
+            return 0.75;
+        }
+    },
     Scroll {
         public double getRarity()
         {
-            return 1;
+            return 0.25;
         }
     },
     Special {
@@ -55,8 +55,8 @@ public class MapViewGameState implements GameState
     {
         this.floor = floor;
         
-        mapWidth += (50 * floor);
-        mapHeight += (50 * floor);
+        mapWidth += (50 * (floor-1));
+        mapHeight += (50 * (floor-1));
         
         grid = new Tile[mapWidth][mapHeight];
         gridLighting = new boolean[mapWidth][mapHeight];
@@ -891,6 +891,8 @@ public class MapViewGameState implements GameState
                         {
                             Main.currentGame.inventory.remove(Item.Key);
                             Main.setGameState(new MapViewGameState(floor+1));
+                            
+                            return;
                         } else {
                             printMessage("The stairs are locked! You need a key.");
                         }
@@ -1372,4 +1374,14 @@ public class MapViewGameState implements GameState
             return null;
         }
     }
+
+    public void dropItemAtPlayer(Item item)
+    {
+        ItemInstance ii = new ItemInstance();
+        ii.item = item;
+        ii.x = playerx;
+        ii.y = playery;
+        
+        items.add(ii);
+    }
 }