From 58206e9c3bec966321978fb437130504eedb4343 Mon Sep 17 00:00:00 2001 From: Starla Insigna Date: Wed, 6 Jun 2012 09:56:51 -0400 Subject: Added effect to ring of regeneration --- src/com/fourisland/frigidearth/Game.java | 10 +++++----- 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 public int level = 1; public int experience = 0; public List inventory = new ArrayList(); - private Item helmet = null; - private Item sword = null; - private Item shield = null; - private Item ring = null; - private Item shoes = null; + public Item helmet = null; + public Item sword = null; + public Item shield = null; + public Item ring = null; + public Item shoes = null; public boolean equipItem(final Item i) { 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 } } - if ((grid[playerx][playery] != Tile.Snow) && ((heartbeat == Functions.random(0, 7)) || (heartbeat == 8))) + if ((grid[playerx][playery] != Tile.Snow) && ((heartbeat == Functions.random(0, 7)) || (heartbeat == 8) || (Main.currentGame.ring == Item.RingOfRegeneration))) { if (Main.currentGame.health < Main.currentGame.maxHealth) { -- cgit 1.4.1