POTIONS!

-----------------------
Implemented a new item type, with single effects when consumed.
(MISSING: Item will not disappear from the Inventory)

Author: FrancPS

ZORK/Creature.cpp

@@ -257,4 +257,17 @@ void Creature::Go(const vector<string>& tokens) {
 		ChangeParent(exit->GetDestination((Room*)parent));	// change the parent of the player (position)
 		GetRoom()->creaturesIn.push_back(this);
 	}
+}
+
+// ---- GET MAX HP ----
+/* Returns the maximum number of Health Points this creature has.
+
+	Parameters:
+		- NONE
+	Return:
+		- NONE
+*/
+const int Creature::GetMaxHP() const
+{
+	return maxHP;
 }

ZORK/Creature.h

@@ -20,6 +20,7 @@ class Creature : public Entity
 		void PrintStats() const;
 		virtual void Inventory() const;
 		virtual void Go(const vector<string>& tokens);
+		const int GetMaxHP() const;
 
 		// Object Attr
 		int HP = 10;   // !!! Is it correct to initialise here?

ZORK/Item.h

@@ -10,7 +10,8 @@ enum ItemType
 	COMMON,
 	WEAPON,
 	ARMOUR,
-	SHIELD
+	SHIELD,
+	HP_POTION
 };
 
 class Item : public Entity

ZORK/Player.cpp

@@ -469,7 +469,7 @@ void Player::Loot(const vector<string>& tokens)
 		cout << "That is not something you can loot." << endl;
 }
 
-// ---- LOOT ----
+// ---- VICTORY ----
 /* Check the conditions for winning the game. The conditions are:
 	- The player has the troll's amulet
 	- The player escaped to the Rooftop
@@ -488,4 +488,38 @@ void Player::Victory() const
 			gameOver = true;
 		}
 	}
+}
+
+// ---- DRINK ----
+/* Player consumes a potion from its inventory
+
+	Parameters:
+		- Vector of strings
+	Return:
+		- NONE
+*/
+void Player::Drink(const vector<string>& tokens)
+{
+	Entity* thing = Find(tokens[1]);
+
+	if (thing != NULL) {
+		if (thing->type == ITEM) {
+			Item* potion = (Item*)thing;
+			if (potion->item_type == HP_POTION) {
+				HP += potion->combatVal;
+
+				if (HP > GetMaxHP()) {
+					HP = GetMaxHP();
+				}
+
+				cout << "You drink " << potion->name << " and recover " << potion->combatVal << " HP." << endl;
+			}
+			else
+				cout << "You cannot drink this!" << endl;
+		}
+		else
+			cout << "You cannot drink this!" << endl;
+	}
+	else
+		cout << "Cannot find '" << tokens[1] << "', it is not in your inventory." << endl;
 }

ZORK/Player.h

@@ -23,6 +23,7 @@ class Player : public Creature
 	void Stats(const vector<string>& tokens) const;
 	void Loot(const vector<string>& tokens);
 	void Victory() const;
+	void Drink(const vector<string>& tokens);
 
 };
 

ZORK/World.cpp

@@ -23,7 +23,8 @@ World::World() {
 	Room* mazeE = new Room("Maze Entrance", "You enter a dark and narrow corridor excavated in the underground that splits into three. \n"
 		"As you get to the crossroad, the doorway from where you came collapses. You are trapped!");
 	rooms.push_back(mazeE);
-	Room* bones = new Room("Bone Room", "You follow the corridor to a room with an extinguished firecamp in a corner,\nand human bones scattered all around the floor.");
+	Room* bones = new Room("Bone Room", "You follow the corridor to a room with an extinguished firecamp in a corner,\nand human bones scattered all around the floor.\n"
+		"There is a rotting corpse in a corner");
 	rooms.push_back(bones);
 	Room* maze1 = new Room("Maze1", "You are in a small room that splits the corridor in two directions.");
 	rooms.push_back(maze1);
@@ -68,17 +69,21 @@ World::World() {
 	exits.push_back(exME);
 
 	// PLAYER
-	player = new Player("Hero", "You are an awesome adventurer!", maze1);
+	player = new Player("Hero", "You are an awesome adventurer!", forest);
 
 	// CREATURES
 	Creature* butler = new Creature("Butler", "It's James, the house Butler.", house);
 	butler->SetStats(15, 0, 3, 0);
 	creatures.push_back(butler);
 
 	Creature* troll = new Creature("Troll", "It's an enormous Troll! You see he is wearing a shiny amulet on his neck.", maze1);
-	butler->SetStats(5, 0, 3, 0);
+	troll->SetStats(40, 0, 7, 3);
 	creatures.push_back(troll);
 
+	Creature* corpse = new Creature("Soldier", "It's the rotting body of someone, possibly a soldier or an adventurer like you.\nOne leg has been... bitten? by something big.", bones);
+	corpse->SetStats(0, 0, 3, 0);
+	creatures.push_back(corpse);
+
 	// ITEMS
 	Item* mailbox = new Item("Mailbox", "Looks like it might contain something.", house);
 	mailbox->isContainer = true;
@@ -102,6 +107,10 @@ World::World() {
 	//exME->key = amulet;
 	items.push_back(amulet);
 
+	Item* potion = new Item("Potion", "A magical beverage to recover vitality.", corpse, HP_POTION);
+	potion->combatVal = 15;
+	items.push_back(potion);
+
 	// EQUIP CREATURES
 	butler->Equip(shield);
 	butler->Equip(sword2);
@@ -126,6 +135,7 @@ const bool World::Parser(vector<string>& tokens)
 		{
 			if (Same(tokens[0], "look") || Same(tokens[0], "l"))
 			{
+				trollAutoMove(trollPath);
 				player->Look(tokens);
 			}
 			else if (Same(tokens[0], "north") || Same(tokens[0], "n"))
@@ -231,6 +241,10 @@ const bool World::Parser(vector<string>& tokens)
 			{
 				player->Stats(tokens);
 			}
+			else if (Same(tokens[0], "drink"))
+			{
+				player->Drink(tokens);
+			}
 			else
 				ret = false;
 			break;