neelthee-mansion 3.17.0__tar.gz → 3.17.2__tar.gz

{neelthee_mansion-3.17.0 → neelthee_mansion-3.17.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: neelthee_mansion
-Version: 3.17.0
+Version: 3.17.2
 Summary: A text-based adventure game set in Neel-thee’s mansion.
 Home-page: https://github.com/Flameblade375/neelthee_mansion
 Author: Alexander.E.F

{neelthee_mansion-3.17.0 → neelthee_mansion-3.17.2}/neelthee_mansion/Mansion_of_Amnesia.py

@@ -123,7 +123,7 @@ def showInstructions():
 Commands:
 go [%*GREEN*%direction%*RESET*%/%*GREEN*%teleport%*RESET*%/%*GREEN*%number%*RESET*%] - Move to another location
 get [%*BLUE*%item%*RESET*%] - Pick up an item from your current location
-search [the/] [%*RED*%container%*RESET*%] - Search a container in your current location
+search [%*RED*%container%*RESET*%] - Search a container in your current location
 use [%*BLUE*%item%*RESET*%] - Use an item from your inventory
 put [%*BLUE*%item%*RESET*%] [in] [%*RED*%container%*RESET*%] - Put an item from your inventory into a container in your current location
 examine [%*GREEN*%direction%*RESET*%/%*RED*%container%*RESET*%/%*BLUE*%item%*RESET*%] - Find out some info about the object
@@ -678,8 +678,8 @@ def select_target(chooser, targets: list):
 
 
 def command():
-        global player
-    #try:
+    global player
+    try:
         ShouldBreak = False
 
         while True:
@@ -707,12 +707,12 @@ def command():
                         ShouldBreak = True
             if ShouldBreak:
                 return
-    #except KeyError as e:
-    #    type_text(f"KeyError: {e} - This might be due to an undefined command or incorrect arguments.", colorTrue=color_coding)
-    #except ValueError as e:
-    #    type_text(f"ValueError: {e} - This might be due to incorrect arguments provided.", colorTrue=color_coding)
-    #except Exception as e:
-    #    type_text(f"Unexpected Error: {e}", colorTrue=color_coding)
+    except KeyError as e:
+        type_text(f"KeyError: {e} - This might be due to an undefined command or incorrect arguments.", colorTrue=color_coding)
+    except ValueError as e:
+        type_text(f"ValueError: {e} - This might be due to incorrect arguments provided.", colorTrue=color_coding)
+    except Exception as e:
+        type_text(f"Unexpected Error: {e}", colorTrue=color_coding)
 
 def handle_sleep_command(player: PC):
     type_text("You decide to rest for a while.", colorTrue=color_coding)
@@ -739,7 +739,8 @@ def handle_go_command(direction):
     global player
     Move(direction)
 
-def handle_get_command(player: PC, item_name):
+def handle_get_command(player: PC, Args):
+    item_name = " ".join(Args)
     if "item" in ROOMS[player.CURRENTROOM] and item_name == ROOMS[player.CURRENTROOM]['item'].name:
         player.inventory_add([ROOMS[player.CURRENTROOM]['item']])
         del ROOMS[player.CURRENTROOM]['item']
@@ -764,14 +765,13 @@ def handle_use_command(item = None, sub_item = None):
     global player
     Use(item, sub_item)
 
-def handle_search_command(player, container = None, sub_container = None):
+def handle_search_command(player, *Args):
+    Container = " ".join(Args)
     if 'containers' in ROOMS[player.CURRENTROOM]:
-        if container == 'the' and sub_container in ROOMS[player.CURRENTROOM]['containers'] and not all_same_value(ROOMS[player.CURRENTROOM]['containers'][sub_container].contents, None):
-            search_container(player, sub_container)
-        elif container in ROOMS[player.CURRENTROOM]['containers'] and not all_same_value(ROOMS[player.CURRENTROOM]['containers'][container].contents, None):
-            search_container(player, container)
+        if Container in ROOMS[player.CURRENTROOM]['containers'] and not all_same_value(ROOMS[player.CURRENTROOM]['containers'][Container].contents, None):
+            search_container(player, Container)
         else:
-            type_text(f"You cannot search the {container}", colorTrue=color_coding)
+            type_text(f"You cannot search the {Container}", colorTrue=color_coding)
 
 def search_container(player: PC, Container):
     ContainerName = Container

{neelthee_mansion-3.17.0 → neelthee_mansion-3.17.2}/neelthee_mansion.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: neelthee-mansion
-Version: 3.17.0
+Version: 3.17.2
 Summary: A text-based adventure game set in Neel-thee’s mansion.
 Home-page: https://github.com/Flameblade375/neelthee_mansion
 Author: Alexander.E.F

{neelthee_mansion-3.17.0 → neelthee_mansion-3.17.2}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='neelthee_mansion',
-    version='3.17.0',
+    version='3.17.2',
     packages=find_packages(),  # Automatically finds all packages and modules
     install_requires=[
         'wheel', 'psutil', 'playsound', 'requests', 'keyboard', 'pandas', 'validators', 'dicttoxml', 'pytz',