From 8468ec529403afadfd347e7e4ca6847749fd896d Mon Sep 17 00:00:00 2001
From: Starla Insigna <hatkirby@fourisland.com>
Date: Wed, 6 Jun 2012 10:20:18 -0400
Subject: Added two mobs for second floor and added power counter to status bar

---
 .../fourisland/frigidearth/MapViewGameState.java   | 14 +++++-
 src/com/fourisland/frigidearth/mobs/FireSnake.java | 55 ++++++++++++++++++++++
 src/com/fourisland/frigidearth/mobs/IceSnake.java  | 55 ++++++++++++++++++++++
 3 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 src/com/fourisland/frigidearth/mobs/FireSnake.java
 create mode 100644 src/com/fourisland/frigidearth/mobs/IceSnake.java

(limited to 'src/com')

diff --git a/src/com/fourisland/frigidearth/MapViewGameState.java b/src/com/fourisland/frigidearth/MapViewGameState.java
index c5e1d47..0e136d5 100644
--- a/src/com/fourisland/frigidearth/MapViewGameState.java
+++ b/src/com/fourisland/frigidearth/MapViewGameState.java
@@ -4,6 +4,8 @@
  */
 package com.fourisland.frigidearth;
 
+import com.fourisland.frigidearth.mobs.FireSnake;
+import com.fourisland.frigidearth.mobs.IceSnake;
 import com.fourisland.frigidearth.mobs.Mouse;
 import com.fourisland.frigidearth.mobs.Rat;
 import com.fourisland.frigidearth.mobs.Spider;
@@ -761,8 +763,16 @@ public class MapViewGameState implements GameState
             g.drawImage(SystemFont.getCharacter(healthText.charAt(i), healthColor), (i+2)*TILE_WIDTH, 0, TILE_WIDTH, TILE_HEIGHT, null);
         }
         
-        g.drawImage(SystemFont.getCharacter((char) 5, Color.GRAY), (healthText.length()+3)*TILE_WIDTH, 0, TILE_WIDTH, TILE_HEIGHT, null);
+        g.drawImage(SystemFont.getCharacter('/', Color.ORANGE), (healthText.length()+3)*TILE_WIDTH, 0, TILE_WIDTH, TILE_HEIGHT, null);
         int b = healthText.length()+4;
+        String powerText = Integer.toString(Main.currentGame.getAttackPower());
+        for (int i=0; i<powerText.length(); i++)
+        {
+            g.drawImage(SystemFont.getCharacter(powerText.charAt(i), Color.WHITE), (i+b)*TILE_WIDTH, 0, TILE_WIDTH, TILE_HEIGHT, null);
+        }
+        
+        g.drawImage(SystemFont.getCharacter((char) 5, Color.GRAY), (b+powerText.length()+1)*TILE_WIDTH, 0, TILE_WIDTH, TILE_HEIGHT, null);
+        b += powerText.length()+2;
         String defenseText = Integer.toString(Main.currentGame.getDefense());
         for (int i=0; i<defenseText.length(); i++)
         {
@@ -1425,6 +1435,8 @@ public class MapViewGameState implements GameState
             case 4:
             case 3:
             case 2:
+                mobTypes.add(FireSnake.class);
+                mobTypes.add(IceSnake.class);
             case 1:
                 mobTypes.add(Mouse.class);
                 mobTypes.add(Rat.class);
diff --git a/src/com/fourisland/frigidearth/mobs/FireSnake.java b/src/com/fourisland/frigidearth/mobs/FireSnake.java
new file mode 100644
index 0000000..83cc2a6
--- /dev/null
+++ b/src/com/fourisland/frigidearth/mobs/FireSnake.java
@@ -0,0 +1,55 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.fourisland.frigidearth.mobs;
+
+import com.fourisland.frigidearth.Functions;
+import com.fourisland.frigidearth.Mob;
+import java.awt.Color;
+
+/**
+ *
+ * @author hatkirby
+ */
+public class FireSnake extends Mob
+{
+    public FireSnake(int x, int y)
+    {
+        super(x, y);
+        
+        health = Functions.rollDice(2, 5);
+        hostile = true;
+    }
+
+    public char getDisplayCharacter()
+    {
+        return 's';
+    }
+
+    public Color getDisplayColor()
+    {
+        return Color.RED;
+    }
+
+    public String getName()
+    {
+        return "Fire Snake";
+    }
+
+    public String getBattleMessage()
+    {
+        return "The fire snake bites you";
+    }
+
+    public int getAttackPower()
+    {
+        return Functions.rollDice(1, 4);
+    }
+
+    public int getBaseExperience()
+    {
+        return 200;
+    }
+    
+}
diff --git a/src/com/fourisland/frigidearth/mobs/IceSnake.java b/src/com/fourisland/frigidearth/mobs/IceSnake.java
new file mode 100644
index 0000000..778d498
--- /dev/null
+++ b/src/com/fourisland/frigidearth/mobs/IceSnake.java
@@ -0,0 +1,55 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package com.fourisland.frigidearth.mobs;
+
+import com.fourisland.frigidearth.Functions;
+import com.fourisland.frigidearth.Mob;
+import java.awt.Color;
+
+/**
+ *
+ * @author hatkirby
+ */
+public class IceSnake extends Mob
+{
+    public IceSnake(int x, int y)
+    {
+        super(x, y);
+        
+        health = Functions.rollDice(3, 4);
+        hostile = true;
+    }
+
+    public char getDisplayCharacter()
+    {
+        return 's';
+    }
+
+    public Color getDisplayColor()
+    {
+        return Color.BLUE;
+    }
+
+    public String getName()
+    {
+        return "Ice Snake";
+    }
+
+    public String getBattleMessage()
+    {
+        return "The ice snake bites you";
+    }
+
+    public int getAttackPower()
+    {
+        return Functions.rollDice(1, 4);
+    }
+
+    public int getBaseExperience()
+    {
+        return 450;
+    }
+    
+}
-- 
cgit 1.4.1