Added basic equipping system (though equipped items have no worth yet) and added some new items

6 files changed, 326 insertions, 9 deletions

@@ -19,4 +19,132 @@ public class Game
     public int level = 1;
     public int experience = 0;
     public List<Item> inventory = new ArrayList<Item>();
+    private Item helmet = null;
+    private Item sword = null;
+    private Item shield = null;
+    private Item ring = null;
+    private Item shoes = null;
+    
+    public boolean equipItem(final Item i)
+    {
+        if ((i.getItemType() != ItemType.Helmet) && (i.getItemType() != ItemType.Sword) && (i.getItemType() != ItemType.Shield) && (i.getItemType() != ItemType.Ring) && (i.getItemType() != ItemType.Shoes))
+        {
+            throw new IllegalArgumentException("You can only equip helmets, swords, shields, rings and shoes.");
+        }
+        
+        boolean alreadyEquipped = false;
+        boolean alreadyEquippedSame = false;
+        Item equippedItem = null;
+        
+        switch (i.getItemType())
+        {
+            case Helmet:
+                if (helmet != null)
+                {
+                    alreadyEquipped = true;
+                    equippedItem = helmet;
+                    
+                    if (helmet == i)
+                    {
+                        alreadyEquippedSame = true;
+                    }
+                }
+                
+                break;
+                
+            case Sword:
+                if (sword != null)
+                {
+                    alreadyEquipped = true;
+                    equippedItem = sword;
+                    
+                    if (sword == i)
+                    {
+                        alreadyEquippedSame = true;
+                    }
+                }
+                
+                break;
+                
+            case Shield:
+                if (shield != null)
+                {
+                    alreadyEquipped = true;
+                    equippedItem = shield;
+                    
+                    if (shield == i)
+                    {
+                        alreadyEquippedSame = true;
+                    }
+                }
+                
+                break;
+                
+            case Ring:
+                if (ring != null)
+                {
+                    alreadyEquipped = true;
+                    equippedItem = ring;
+                    
+                    if (ring == i)
+                    {
+                        alreadyEquippedSame = true;
+                    }
+                }
+                
+                break;
+                
+            case Shoes:
+                if (shoes != null)
+                {
+                    alreadyEquipped = true;
+                    equippedItem = shoes;
+                    
+                    if (shoes == i)
+                    {
+                        alreadyEquippedSame = true;
+                    }
+                }
+                
+                break;
+        }
+        
+        if (alreadyEquippedSame)
+        {
+            ((MapViewGameState) Main.getGameState()).printMessage("You have already equipped " + i.getItemName().toLowerCase());
+            
+            return false;
+        } else if (alreadyEquipped)
+        {
+            inventory.add(equippedItem);
+            ((MapViewGameState) Main.getGameState()).printMessage("You unequip your " + equippedItem.getItemName().toLowerCase() + " and equip " + i.getItemName().toLowerCase());
+        } else {
+            ((MapViewGameState) Main.getGameState()).printMessage("You equip " + i.getItemName().toLowerCase());
+        }
+        
+        switch (i.getItemType())
+        {
+            case Helmet:
+                helmet = i;
+                break;
+                
+            case Sword:
+                sword = i;
+                break;
+                
+            case Shield:
+                shield = i;
+                break;
+                
+            case Ring:
+                ring = i;
+                break;
+                
+            case Shoes:
+                shoes = i;
+                break;
+        }
+        
+        return true;
+    }
 }
@@ -108,10 +108,10 @@ public class InventoryOverlay implements Renderable, Inputable
                     ((MapViewGameState) Main.getGameState()).tick();
                     Main.removeRenderable(this);
                     Main.removeInputable(this);
-                    
-                    return;
                 }
                 
+                return;
+                
             case KeyEvent.VK_D:
                 ((MapViewGameState) Main.getGameState()).dropItemAtPlayer(Main.currentGame.inventory.get(id));
                 Main.currentGame.inventory.remove(id);
@@ -70,12 +70,89 @@ public enum Item
         {
             return ItemType.Helmet;
         }
+    },
+    WoodenSword {
+        public String getItemName()
+        {
+            return "Wooden Sword";
+        }
         
-        public boolean useItem()
+        public char getDisplayCharacter()
         {
-            // Nope not yet
-            
-            return true;
+            return '/';
+        }
+        
+        public Color getDisplayColor()
+        {
+            return new Color(128, 42, 42);
+        }
+        
+        public ItemType getItemType()
+        {
+            return ItemType.Sword;
+        }
+    },
+    WoodenShield {
+        public String getItemName()
+        {
+            return "Wooden Shield";
+        }
+        
+        public char getDisplayCharacter()
+        {
+            return 'O';
+        }
+        
+        public Color getDisplayColor()
+        {
+            return new Color(128, 42, 42);
+        }
+        
+        public ItemType getItemType()
+        {
+            return ItemType.Shield;
+        }
+    },
+    RingOfRegeneration {
+        public String getItemName()
+        {
+            return "Ring of Regeneration";
+        }
+        
+        public char getDisplayCharacter()
+        {
+            return 'o';
+        }
+        
+        public Color getDisplayColor()
+        {
+            return Color.YELLOW;
+        }
+        
+        public ItemType getItemType()
+        {
+            return ItemType.Ring;
+        }
+    },
+    Crocs {
+        public String getItemName()
+        {
+            return "Crocs";
+        }
+        
+        public char getDisplayCharacter()
+        {
+            return 'd';
+        }
+        
+        public Color getDisplayColor()
+        {
+            return new Color(128, 42, 42);
+        }
+        
+        public ItemType getItemType()
+        {
+            return ItemType.Shoes;
         }
     },
     Key {
@@ -111,7 +188,22 @@ public enum Item
     public abstract char getDisplayCharacter();
     public abstract Color getDisplayColor();
     public abstract ItemType getItemType();
-    public abstract boolean useItem();
+    
+    public boolean useItem()
+    {
+        switch (getItemType())
+        {
+            case Helmet:
+            case Sword:
+            case Shield:
+            case Ring:
+            case Shoes:
+                return Main.currentGame.equipItem(this);
+                
+            default:
+                throw new java.lang.AbstractMethodError();
+        }
+    }
     
     public static Item getWeightedRandomItem()
     {
@@ -13,15 +13,39 @@ public enum ItemType
     Helmet {
         public double getRarity()
         {
-            return 0.75;
+            return 0.2;
         }
     },
-    Scroll {
+    Sword {
+        public double getRarity()
+        {
+            return 0.2;
+        }
+    },
+    Shield {
+        public double getRarity()
+        {
+            return 0.2;
+        }
+    },
+    Ring {
+        public double getRarity()
+        {
+            return 0.05;
+        }
+    },
+    Shoes {
         public double getRarity()
         {
             return 0.25;
         }
     },
+    Scroll {
+        public double getRarity()
+        {
+            return 0.1;
+        }
+    },
     Special {
         public double getRarity()
         {
@@ -984,6 +984,12 @@ public class MapViewGameState implements GameState
                     }
                 }
             }
+            
+            // Snow weakens (but doesn't kill) mobs too!
+            if ((grid[mob.x][mob.y] == Tile.Snow) && (heartbeat % 2 == 0))
+            {
+                mob.health--;
+            }
         }
         
         // Move snow
@@ -0,0 +1,67 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.fourisland.frigidearth;
+
+import java.awt.Color;
+import java.awt.Graphics2D;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ *
+ * @author hatkirby
+ */
+public class MessageOverlay implements Renderable
+{
+    private final int TILE_WIDTH = 12;
+    private final int TILE_HEIGHT = 12;
+    
+    List<String> message;
+    int x;
+    int y;
+    int width;
+    
+    public MessageOverlay(String msg, int x, int y, int width)
+    {
+        message = new ArrayList<String>();
+        this.x = x;
+        this.y = y;
+        this.width = width;
+        
+        String temp = msg;
+        
+        while (temp.length() > width)
+        {
+            String shortm = temp.substring(0, width);
+            
+            if ((temp.charAt(width) == ' ') || (shortm.endsWith(" ")))
+            {
+                message.add(shortm);
+                temp = temp.substring(width);
+            } else {
+                int lastSpace = shortm.lastIndexOf(" ");
+                message.add(shortm.substring(0, lastSpace));
+                temp = temp.substring(lastSpace);
+            }
+        }
+        
+        message.add(temp);
+    }
+
+    public void render(Graphics2D g)
+    {
+        g.setColor(Color.BLACK);
+        g.fillRect(x*TILE_WIDTH, y*TILE_HEIGHT, (x+width)*TILE_WIDTH, (y+message.size())*TILE_HEIGHT);
+        
+        for (int i=0; i<message.size(); i++)
+        {
+            for (int j=0; j<message.get(i).length(); j++)
+            {
+                g.drawImage(SystemFont.getCharacter(message.get(i).charAt(j), Color.WHITE), (x+j)*TILE_WIDTH, (y+i)*TILE_HEIGHT, TILE_WIDTH, TILE_HEIGHT, null);
+            }
+        }
+    }
+    
+}