iVictoris · iVictoris · May 8, 2020 · May 8, 2020 · May 8, 2020 · May 8, 2020
diff --git a/src/adv.py b/src/adv.py
@@ -1,44 +1,106 @@
 from room import Room
+from player import Player
 
-# Declare all the rooms
+def main():
 
-room = {
-    'outside':  Room("Outside Cave Entrance",
-                     "North of you, the cave mount beckons"),
+    room = {
+        'outside':  Room("Outside Cave Entrance", "North of you, the cave mount beckons", ['Common Staff', 'Common Sword']),
+        'foyer':    Room("Foyer", """Dim light filters in from the south. Dusty
+    passages run north and east.""", ['Rare Staff', 'Rare Sword', 'Rare Armor']),
 
-    'foyer':    Room("Foyer", """Dim light filters in from the south. Dusty
-passages run north and east."""),
+        'overlook': Room("Grand Overlook", """A steep cliff appears before you, falling
+    into the darkness. Ahead to the north, a light flickers in
+    the distance, but there is no way across the chasm.""", ['Rare Gloves', 'Epic Sword', 'Epic Staff', 'Epic Bow', 'Epic Glove']),
 
-    'overlook': Room("Grand Overlook", """A steep cliff appears before you, falling
-into the darkness. Ahead to the north, a light flickers in
-the distance, but there is no way across the chasm."""),
+        'narrow':   Room("Narrow Passage", """The narrow passage bends here from west
+    to north. The smell of gold permeates the air."""),
 
-    'narrow':   Room("Narrow Passage", """The narrow passage bends here from west
-to north. The smell of gold permeates the air."""),
+        'treasure': Room("Treasure Chamber", """You've found the long-lost treasure
+    chamber! Sadly, it has already been completely emptied by
+    earlier adventurers. The only exit is to the south."""),
+    }
 
-    'treasure': Room("Treasure Chamber", """You've found the long-lost treasure
-chamber! Sadly, it has already been completely emptied by
-earlier adventurers. The only exit is to the south."""),
-}
+    room['outside'].assign_room('s', room['foyer'])
+    room['foyer'].assign_room('s', room['overlook'])
+    room['foyer'].assign_room('w', room['narrow'])
+    room['overlook'].assign_room('n', room['foyer'])
+    room['narrow'].assign_room('s', room['treasure'])
+    valid_choices = list('newsqi') + ['inventory']
 
+    # Make a new player object that is currently in the 'outside' room.
+    player = Player('Me', room['outside'])
 
-# Link rooms together
+    # Player's __str__ method prints its name and room location
+    while True:
+        print('\n------------------------------------------------- \n')
+        print(player)
+
+        # get room will return the room the player is currently in
+        print('\n' + player.get_room().get_description())
+
+        choice = input('Please choose what direction you would like to go or enter a take/drop command: ').split(' ')
+
+        # only if len(choice) < 1 or take or drop not inside choice
+        if (len(choice) < 1 or (not len(choice) == 1 and 'take' not in choice and 'drop' not in choice)):
+            continue
+
+        elif (len(choice) == 1):
+            choice = ''.join(choice)
+            if (choice not in valid_choices):
+                print(f'Choices can only be {", ".join(valid_choices).rstrip() }.')
+                continue
+
+            if (choice == 'q'):
+                return
+
+            if (choice == 'i' or choice == 'inventory'):
+                print(f"""\n\t\tPlayer Inventory\n-------------------------------------------------
+                {', '.join([ str(item) for item in player.inventory])}
+                """)
+                continue
+            try:
+                player.enter_room(choice)
+                continue
+            except ValueError:
+                print('Unfortunately, that path does not exist, please try again')
+                continue
+
+        # here the choices > 1
+        current_room = player.get_room()
+        verb, *item = choice
+        item = ' '.join(item)
+        # if user enters get/take
+        if verb == 'get' or verb == 'take':
+
+            # check current room for item name
+            # if item in room
+            if (item in current_room):
+
+                # remove item from room and add to player's inventory
+                current_room.remove_item(item)
+                player.add_item(item)
+                continue
+
+            # if not in the room
+                # print error -> continue
+            print(f"{item} does not exist in room. Please try again")
+            continue
+
+        # check verb to be remove or drop
+        if verb == 'remove' or verb == 'drop':
+
+            # now we want to check if the item is in the player's inventory
+            if item in player:
+
+                # remove item from player and drop into room if it is
+                player.drop_item(item)
+                current_room.add_item(item)
 
-room['outside'].n_to = room['foyer']
-room['foyer'].s_to = room['outside']
-room['foyer'].n_to = room['overlook']
-room['foyer'].e_to = room['narrow']
-room['overlook'].s_to = room['foyer']
-room['narrow'].w_to = room['foyer']
-room['narrow'].n_to = room['treasure']
-room['treasure'].s_to = room['narrow']
 
-#
-# Main
-#
 
-# Make a new player object that is currently in the 'outside' room.
 
+if __name__ == '__main__':
+    main()
 # Write a loop that:
 #
 # * Prints the current room name

diff --git a/src/item.py b/src/item.py
@@ -0,0 +1,16 @@
+class Item:
+  def __init__(self, name):
+    self.__name = name
+
+  def __str__(self):
+    return self.__name
+
+  def __repr__(self):
+    return f"Item({self.__name})"
+
+  def on_take(self):
+    print(f'You have picked up {self.__name}')
+
+  def on_drop(self):
+    print(f'You have dropped {self.__name}')
+
diff --git a/src/player.py b/src/player.py
@@ -1,2 +1,50 @@
+from item import Item
 # Write a class to hold player information, e.g. what room they are in
 # currently.
+
+class Player: 
+  def __init__(self, name, room, inventory=[]):
+    self.__name = name
+    self.__current_room = room
+    self.inventory = inventory
+
+  def __str__(self):
+    room = self.__current_room
+    return f'''Player: {self.__name}, currently in room: {self.__current_room}
+
+    \t\t\t Map Overview:
+
+    \t\t\t\t{room.n}
+    \t{room.w}\t\t{room}\t\t\t{room.e}
+    \t\t\t\t{room.s}
+
+    Other info:
+    Items: {', '.join([str(item) for item in room.items])}'''
+
+  def get_room(self):
+    return self.__current_room
+
+  def enter_room(self, direction):
+    next_room = getattr(self.__current_room, direction)
+    if not next_room:
+      raise ValueError()
+    self.__current_room = next_room
+
+  def add_item(self, item):
+    item = Item(item)
+    self.inventory.append(item)
+    item.on_take()
+
+  def drop_item(self, item):
+    item_location = 0
+    for index in range(len(self.inventory)):
+      if str(self.inventory[index]) == item:
+        item_location = index
+        break
+
+    self.inventory = self.inventory[0:item_location] + self.inventory[item_location+1:]
+
+  def __contains__(self, item):
+    for i in self.inventory:
+      if str(i) == item:
+        return True
diff --git a/src/room.py b/src/room.py
@@ -1,2 +1,54 @@
+from item import Item
 # Implement a class to hold room information. This should have name and
-# description attributes.
+# description attributes.
+class Room:
+  def __init__(self, name, description, items=[]):
+    self.__name = name
+    self.__description = description
+    self.items = [Item(item) for item in items]
+    self.n = None
+    self.e = None
+    self.w = None
+    self.s = None
+
+  def __str__(self):
+    return f"{self.__name}"
+
+  def __repr__(self):
+    return f"Room({self.__name})"
+
+  def assign_room(self, direction, room):
+    opposite_direction = {
+      's': 'n',
+      'n': 's',
+      'w': 'e',
+      'e': 'w'
+    }
+    setattr(self, direction, room)
+    setattr(room, opposite_direction[direction], self)
+
+  def get_room(self, direction):
+    return self[direction]
+
+  def get_description(self):
+    return self.__description
+
+  def __contains__(self, item):
+    for i in self.items:
+      if str(i) == item:
+        return True
+
+  def remove_item(self, item):
+    # slice up to index of item name 
+    # concat the index after item
+    item_location = 0
+    for index in range(len(self.items)):
+      if str(self.items[index]) == item:
+        item_location = index
+        break
+
+    self.items = self.items[0:item_location] + self.items[item_location+1:]
+
+  def add_item(self, item):
+    item = Item(item)
+    self.items.append(item)