From abc1db104cc430fda2a6e7423ee45344aa8539c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= <hruskon5@fel.cvut.cz>
Date: Mon, 12 May 2014 01:46:18 +0200
Subject: [PATCH] removed testing class; tweaks to items; heart piece message

---
 src/mightypork/rogue/screens/game/InvSlot.java |  2 +-
 src/mightypork/rogue/t/TryItemDmg.java         | 16 ----------------
 src/mightypork/rogue/world/World.java          | 18 +++++++++++++++---
 .../rogue/world/item/items/ItemBaseFood.java   |  4 ++--
 .../rogue/world/item/items/ItemBaseWeapon.java |  4 ++--
 .../item/items/active/ItemHeartPiece.java      |  2 ++
 6 files changed, 22 insertions(+), 24 deletions(-)
 delete mode 100644 src/mightypork/rogue/t/TryItemDmg.java

diff --git a/src/mightypork/rogue/screens/game/InvSlot.java b/src/mightypork/rogue/screens/game/InvSlot.java
index 1b627bb..f2fd71a 100644
--- a/src/mightypork/rogue/screens/game/InvSlot.java
+++ b/src/mightypork/rogue/screens/game/InvSlot.java
@@ -138,7 +138,7 @@ public class InvSlot extends ClickableComponent {
 			
 			if (itm.getType() == ItemType.FOOD) {
 				rtTxP.setText(Calc.toString(itm.getFoodPoints() / 2D));
-				rbTxP.setColor(RGB.GREEN);
+				rtTxP.setColor(RGB.GREEN);
 				rtTxP.render();
 			} else if (itm.getType() == ItemType.WEAPON) {
 				
diff --git a/src/mightypork/rogue/t/TryItemDmg.java b/src/mightypork/rogue/t/TryItemDmg.java
deleted file mode 100644
index 3fcfc3c..0000000
--- a/src/mightypork/rogue/t/TryItemDmg.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package mightypork.rogue.t;
-
-
-import mightypork.rogue.world.item.Item;
-import mightypork.rogue.world.item.Items;
-
-
-public class TryItemDmg {
-	
-	public static void main(String[] args)
-	{
-		final Item itm = Items.CLUB.createItemDamaged(80);
-		System.out.println(itm.getMaxUses() + " - remaining: " + itm.getRemainingUses());
-	}
-	
-}
diff --git a/src/mightypork/rogue/world/World.java b/src/mightypork/rogue/world/World.java
index cd21fce..4e1914f 100644
--- a/src/mightypork/rogue/world/World.java
+++ b/src/mightypork/rogue/world/World.java
@@ -360,6 +360,12 @@ public class World implements DelegatingClient, BusAccess, IonObjBundled, Pausea
 		{
 			playerEntity.health.setHealthMax(health);
 		}
+
+
+		public World getWorld()
+		{
+			return World.this;
+		}
 	}
 	
 	// not saved stuffs
@@ -550,7 +556,7 @@ public class World implements DelegatingClient, BusAccess, IonObjBundled, Pausea
 	
 	public void msgPick(Item item)
 	{
-		console.addMessage("You've picked a " + item.getVisualName() + ".");
+		console.addMessage("You've picked up a " + item.getVisualName() + ".");
 		console.lastPickupItem = item;
 		console.timeSinceLastPickup = 0;
 	}
@@ -606,12 +612,18 @@ public class World implements DelegatingClient, BusAccess, IonObjBundled, Pausea
 	
 	public void msgCannotPick()
 	{
-		console.addMessage("Can't pick items, inventory is full.");
+		console.addMessage("Can't collect items, inventory is full.");
 	}
 	
 	
 	public void msgEnterFloor(int floor)
 	{
-		console.addMessage("~ Floor " + floor + " ~");
+		console.addMessage("~ Welcome to floor " + (1+floor) + "! ~");
+	}
+
+
+	public void msgHeartPiece()
+	{
+		console.addMessage("Your health capacity has been increased.");
 	}
 }
diff --git a/src/mightypork/rogue/world/item/items/ItemBaseFood.java b/src/mightypork/rogue/world/item/items/ItemBaseFood.java
index 579e7ef..7e1114c 100644
--- a/src/mightypork/rogue/world/item/items/ItemBaseFood.java
+++ b/src/mightypork/rogue/world/item/items/ItemBaseFood.java
@@ -22,14 +22,14 @@ public abstract class ItemBaseFood extends Item {
 	
 	
 	@Override
-	public int getAttackPoints()
+	public final int getAttackPoints()
 	{
 		return 0;
 	}
 	
 	
 	@Override
-	public ItemType getType()
+	public final ItemType getType()
 	{
 		return ItemType.FOOD;
 	}
diff --git a/src/mightypork/rogue/world/item/items/ItemBaseWeapon.java b/src/mightypork/rogue/world/item/items/ItemBaseWeapon.java
index 2602871..da11a78 100644
--- a/src/mightypork/rogue/world/item/items/ItemBaseWeapon.java
+++ b/src/mightypork/rogue/world/item/items/ItemBaseWeapon.java
@@ -22,14 +22,14 @@ public abstract class ItemBaseWeapon extends Item {
 	
 	
 	@Override
-	public int getFoodPoints()
+	public final int getFoodPoints()
 	{
 		return 0;
 	}
 	
 	
 	@Override
-	public ItemType getType()
+	public final ItemType getType()
 	{
 		return ItemType.WEAPON;
 	}
diff --git a/src/mightypork/rogue/world/item/items/active/ItemHeartPiece.java b/src/mightypork/rogue/world/item/items/active/ItemHeartPiece.java
index fcf5222..715447b 100644
--- a/src/mightypork/rogue/world/item/items/active/ItemHeartPiece.java
+++ b/src/mightypork/rogue/world/item/items/active/ItemHeartPiece.java
@@ -80,6 +80,8 @@ public class ItemHeartPiece extends Item {
 		pl.setHealthMax(pl.getHealthMax() + 2); // two points / heart
 		pl.setHealth(pl.getHealthMax());
 		
+		pl.getWorld().msgHeartPiece();
+		
 		return true;
 	}