Adventure Game/adventure_game/GameNavigator.py

@@ -36,14 +36,6 @@ class GameNavigator(npyscreen.FormBaseNew):
         """
         self.artBox.footer = location
 
-    def update_inventory(self, items):
-        res = ''
-        for element in items:
-            res = res + str(element) + '\n'
-        res = res.upper()  # Inventory is always uppercase
-
-        self.inventoryContent.value = res  # Set the logbox to that value
-
     def create(self):
         top_division_height = 20
         inventory_width = 20
@@ -74,14 +66,6 @@ class GameNavigator(npyscreen.FormBaseNew):
                                      rely=2,
                                      editable=False)
 
-        self.inventoryContent = self.add(npyscreen.MultiLineEdit,
-                                         max_width=inventory_width,
-                                         max_height=top_division_height,
-                                         relx=2,
-                                         rely=3,
-                                         value='------------------',
-                                         editable=False)
-
         self.logBoxOutline = self.add(npyscreen.BoxBasic,
                                       max_width=inventory_width + art_width,
                                       max_height=9,

Adventure Game/adventure_game/Handler.py

@@ -44,14 +44,15 @@ class Handler(npyscreen.ButtonPress):
 
             # Localize the player
             player = self.parent.parentApp.player
-            roomlocation = player.playerData['player']['location']
+            roomlocation = player.playerData['player']['location'] + '.yaml'
             try:
                 room = parse(self.parent.parentApp.mainPath / 'gamedata/world' / roomlocation)['room']
 
                 # If the file could not be found
             except FileNotFoundError:
                 # Log a critical error!
-                self.parent.parentApp.log.critical('Handler could not load the current room! Is the player file corrupt or was there a typo? Path was {0}'.format(
+                self.parent.parentApp.log.critical(
+                    'Handler could not load the current room! Is the player file corrupt or was there a typo? Path was {0}'.format(
                         self.parent.parentApp.mainPath / 'gamedata/world' / roomlocation))
                 # Put the player in a blank room i forgot to finish
                 room = parse(self.parent.parentApp.mainPath / 'gamedata/world/blank_room.yaml')
@@ -80,12 +81,12 @@ class Handler(npyscreen.ButtonPress):
             elif command == 'PICK':
                 try:
                     if arguments[0] == 'UP':
-                        if len(arguments) <= 2:  # If there are only 2 args ex:up, item then we dont need to merge that last arg
+                        if len(
+                                arguments) <= 2:  # If there are only 2 args ex:up, item then we dont need to merge that last arg
                             try:
                                 # Argument[1] is the "thing" you want to pick up, yaml is lowercase so we lowercase it.
                                 self.parent.parentApp.log.info('Player tried to pick up {0}'.format(arguments[1]))
                                 self.parent.update_log(room[arguments[1].lower()]['pick_up'])
-                                player.add_inventory(room[arguments[1].lower()]['item_name'])
                             except KeyError:
                                 self.parent.update_log("You cant pick that up.")
                         else:  # if its a longer list of args, the player prolly wants to pick up an item with multiple words, like hand_axe, or log_viewer
@@ -93,7 +94,6 @@ class Handler(npyscreen.ButtonPress):
                                 long_arg = '_'.join(arguments[1:])  # Joins whatever comes after 1 in our args with '_' between
                                 self.parent.parentApp.log.info('Player tried to pick up long object {0}'.format(long_arg))
                                 self.parent.update_log(room[long_arg.lower()]['pick_up'])
-                                player.add_inventory(room[long_arg.lower()]['item_name'])
                             except KeyError:
                                 self.parent.update_log("You cant pick that up.")
                 except IndexError:
@@ -110,16 +110,7 @@ class Handler(npyscreen.ButtonPress):
                 except KeyError:
                     self.parent.update_log("You cant open that.")
                 except IndexError:
-                    self.parent.update_log("You must specify something to open")
-
-            elif command == 'INSPECT':
-                try:
-                    self.parent.parentApp.log.info('Player inspecting: {0}'.format(arguments[0]))
-                    self.parent.update_log(room[arguments[0].lower()]['inspect']) # Prints the inspect text, if it exists
-                except KeyError:
-                    self.parent.update_log("Nothing more to inspect here.")
-                except IndexError:
-                    self.parent.update_log("You must specify something to inspect.")
+                    self.parent.update_log("you must specify something to open")
 
             else:
                 self.parent.parentApp.log.info('Player\'s command was not understood: {0}'.format(command))
@@ -141,8 +132,6 @@ class Handler(npyscreen.ButtonPress):
         except KeyError:
             self.parent.update_location('Unknown Location')
 
-        self.parent.update_inventory(player.playerData['player']['inventory'])
-
         # Make sure to re-draw the art box when we're all done (in case we updated it in logic above)
         self.parent.artContent.display()
 

Adventure Game/adventure_game/Player.py

@@ -1,5 +1,4 @@
 from yaml_parser import parse_datafile as parse
-from errors import ItemAlreadyTaken
 
 
 class Player:
@@ -23,12 +22,3 @@ class Player:
         room = self.playerData['player']['location']
 
         return parse('adventure_game/gamedata/world/' + room)['room']['upon_enter']
-
-    def add_inventory(self, item):
-        if item in self.playerData['player']['inventory']:
-            raise ItemAlreadyTaken
-        else:
-            self.playerData['player']['inventory'].append(item)
-
-    def remove_inventory(self, item):
-        pass

Adventure Game/adventure_game/errors.py

@@ -1,6 +0,0 @@
-class ItemAlreadyTaken(Exception):
-    pass
-
-
-class ItemRequired(Exception):
-    pass

Adventure Game/adventure_game/gamedata/world/hallway.yaml

@@ -7,9 +7,5 @@ room:
     inspect: "Its still a closet door."
     open: "You cant open this door."
   desk:
-    look_at: "Its your receptionists desk, she's not sitting behind it."
+    look_at: "Its your receptionists desks, she's not sitting behind it."
     inspect: "She's still not there."
-  door:
-    leads_to: office.yaml
-    look_at: "Its a door, it leads to your office. You should try to |OPEN| it."
-    inspect: "Its ornate but basic, this side of the door has your name on a plaque."

Adventure Game/adventure_game/gamedata/world/office.yaml

@@ -10,7 +10,7 @@ room:
     look_at: "The bookshelf is a bookshelf."
     inspect: "Its still a bookshelf."
   log_viewer:
-    item_name: "Log Viewer"
+    item: yes
     look_at: "The log viewer is a small piece of ornate code, allowing you to examine |entities| more closely."
     inspect: "The dials are wiggly and the viewer makes Beep Boop sounds sometimes."
     pick_up: "You pick up the *LOG VIEWER*."

Adventure Game/adventure_game/playerdata/defaults/default_player.yaml

@@ -1,4 +1,4 @@
 player:
   name: 'Default'
-  location: 'office.yaml'
-  inventory: ['Detective Hat']
+  location: 'office'
+  inventory: ['test', 'test2']