4 files changed, 39 insertions, 5 deletions

@@ -15,7 +15,6 @@ public class Game
 {
     public int health = 15;
     public int maxHealth = 15;
-    public int defense = 0;
     public int level = 1;
     public int experience = 0;
     public List<Item> inventory = new ArrayList<Item>();
@@ -147,4 +146,14 @@ public class Game
         
         return true;
     }
+    
+    public int getAttackPower()
+    {
+        return (int) (Math.floor(Math.sqrt(level)) + (sword == null ? 0 : sword.getAttackPower()));
+    }
+    
+    public int getDefense()
+    {
+        return (helmet == null ? 0 : helmet.getDefense()) + (shield == null ? 0 : shield.getDefense()) + (shoes == null ? 0 : shoes.getDefense());
+    }
 }
@@ -70,6 +70,11 @@ public enum Item
         {
             return ItemType.Helmet;
         }
+        
+        public int getDefense()
+        {
+            return 1;
+        }
     },
     WoodenSword {
         public String getItemName()
@@ -91,6 +96,11 @@ public enum Item
         {
             return ItemType.Sword;
         }
+        
+        public int getAttackPower()
+        {
+            return 1;
+        }
     },
     WoodenShield {
         public String getItemName()
@@ -112,6 +122,11 @@ public enum Item
         {
             return ItemType.Shield;
         }
+        
+        public int getDefense()
+        {
+            return 1;
+        }
     },
     RingOfRegeneration {
         public String getItemName()
@@ -244,4 +259,14 @@ public enum Item
         
         return null;
     }
+    
+    public int getAttackPower()
+    {
+        return 0;
+    }
+    
+    public int getDefense()
+    {
+        return 0;
+    }
 }
@@ -761,7 +761,7 @@ public class MapViewGameState implements GameState
         
         g.drawImage(SystemFont.getCharacter((char) 5, Color.GRAY), (healthText.length()+3)*TILE_WIDTH, 0, TILE_WIDTH, TILE_HEIGHT, null);
         int b = healthText.length()+4;
-        String defenseText = Integer.toString(Main.currentGame.defense);
+        String defenseText = Integer.toString(Main.currentGame.getDefense());
         for (int i=0; i<defenseText.length(); i++)
         {
             g.drawImage(SystemFont.getCharacter(defenseText.charAt(i), Color.WHITE), (i+b)*TILE_WIDTH, 0, TILE_WIDTH, TILE_HEIGHT, null);
@@ -808,7 +808,7 @@ public class MapViewGameState implements GameState
                         if (mob.getPosition().equals(to))
                         {
                             printMessage("You hit the " + mob.getName().toLowerCase());
-                            mob.health -= (int) (Math.floor(Math.sqrt(Main.currentGame.level)));
+                            mob.health -= Main.currentGame.getAttackPower();
                             
                             if (mob.health <= 0)
                             {
@@ -942,7 +942,7 @@ public class MapViewGameState implements GameState
                 if (arePointsAdjacent(playerx, playery, mob.x, mob.y, false))
                 {
                     // Attack!
-                    Main.currentGame.health -= Math.max(mob.getAttackPower() - Main.currentGame.defense, 0);
+                    Main.currentGame.health -= Math.max(mob.getAttackPower() - Functions.random(0,Main.currentGame.getDefense()), 0);
                     printMessage(mob.getBattleMessage());
                 } else {
                     List<Direction> path = findPath(mob.getPosition(), new Point(playerx, playery));
@@ -44,7 +44,7 @@ public class Spider extends Mob
 
     public int getAttackPower()
     {
-        return 1;
+        return Functions.rollDice(1,2);
     }
     
     public int getBaseExperience()