diff options
| author | Starla Insigna <hatkirby@fourisland.com> | 2012-06-06 09:56:51 -0400 |
|---|---|---|
| committer | Starla Insigna <hatkirby@fourisland.com> | 2012-06-06 09:56:51 -0400 |
| commit | 58206e9c3bec966321978fb437130504eedb4343 (patch) | |
| tree | cbad5b136a1419d29a526501c7775d54b65ad1f3 | |
| parent | 854fe88a958256ae40db8cdf65691c2026e4ab08 (diff) | |
| download | frigidearth-58206e9c3bec966321978fb437130504eedb4343.tar.gz frigidearth-58206e9c3bec966321978fb437130504eedb4343.tar.bz2 frigidearth-58206e9c3bec966321978fb437130504eedb4343.zip | |
Added effect to ring of regeneration
| -rw-r--r-- | src/com/fourisland/frigidearth/Game.java | 10 | ||||
| -rw-r--r-- | src/com/fourisland/frigidearth/MapViewGameState.java | 2 |
2 files changed, 6 insertions, 6 deletions
| diff --git a/src/com/fourisland/frigidearth/Game.java b/src/com/fourisland/frigidearth/Game.java index 621148c..d31f1b2 100644 --- a/src/com/fourisland/frigidearth/Game.java +++ b/src/com/fourisland/frigidearth/Game.java | |||
| @@ -18,11 +18,11 @@ public class Game | |||
| 18 | public int level = 1; | 18 | public int level = 1; |
| 19 | public int experience = 0; | 19 | public int experience = 0; |
| 20 | public List<Item> inventory = new ArrayList<Item>(); | 20 | public List<Item> inventory = new ArrayList<Item>(); |
| 21 | private Item helmet = null; | 21 | public Item helmet = null; |
| 22 | private Item sword = null; | 22 | public Item sword = null; |
| 23 | private Item shield = null; | 23 | public Item shield = null; |
| 24 | private Item ring = null; | 24 | public Item ring = null; |
| 25 | private Item shoes = null; | 25 | public Item shoes = null; |
| 26 | 26 | ||
| 27 | public boolean equipItem(final Item i) | 27 | public boolean equipItem(final Item i) |
| 28 | { | 28 | { |
| diff --git a/src/com/fourisland/frigidearth/MapViewGameState.java b/src/com/fourisland/frigidearth/MapViewGameState.java index 9358f5f..c5e1d47 100644 --- a/src/com/fourisland/frigidearth/MapViewGameState.java +++ b/src/com/fourisland/frigidearth/MapViewGameState.java | |||
| @@ -1105,7 +1105,7 @@ public class MapViewGameState implements GameState | |||
| 1105 | } | 1105 | } |
| 1106 | } | 1106 | } |
| 1107 | 1107 | ||
| 1108 | if ((grid[playerx][playery] != Tile.Snow) && ((heartbeat == Functions.random(0, 7)) || (heartbeat == 8))) | 1108 | if ((grid[playerx][playery] != Tile.Snow) && ((heartbeat == Functions.random(0, 7)) || (heartbeat == 8) || (Main.currentGame.ring == Item.RingOfRegeneration))) |
| 1109 | { | 1109 | { |
| 1110 | if (Main.currentGame.health < Main.currentGame.maxHealth) | 1110 | if (Main.currentGame.health < Main.currentGame.maxHealth) |
| 1111 | { | 1111 | { |