neelthee-mansion 3.17.0__py3-none-any.whl → 3.17.2__py3-none-any.whl

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.dist-info → neelthee_mansion-3.17.2.dist-info}/METADATA

@@ -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.dist-info → neelthee_mansion-3.17.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 neelthee_mansion/Books.py,sha256=P608nxbspB5wnGTKjK6ATrb4p-rCvfOxjwJ1O5tMhjY,25595
-neelthee_mansion/Mansion_of_Amnesia.py,sha256=2JR0QqHOKMffcBq8Hqdl7D9jJeLlTUOmWel8FcuUYt4,46814
+neelthee_mansion/Mansion_of_Amnesia.py,sha256=lOfPmCCMmkdGvq7eF-WtEHiDzgZn6O2lMZttPp_G1ls,46580
 neelthee_mansion/Quests.py,sha256=q6VzR3mt9AYe29ACWZuf-suz4yOKrL946aJ493eQRS0,2611
 neelthee_mansion/Rooms.py,sha256=DuPkR0a0dC6jB3_Ebh1U88sJ9XND77xup1z6CulUxTc,90157
 neelthee_mansion/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -8,8 +8,8 @@ neelthee_mansion/all_game_utils.py,sha256=mnxws_YEnsoftkkBMZv1k_zlnGKWGenUvsZnNK
 neelthee_mansion/creatures.py,sha256=nc-6YQ7S89teDiypJdHKLLuq-q3UpbQCVGfJ4hnCb7M,15600
 neelthee_mansion/items.py,sha256=HTy9BhHWB0T_S53HFls0y6ER5jD7XAeI6PlY1ZnCZug,5711
 neelthee_mansion/utils.py,sha256=Wt1CdK4eCskrxRXkeKgzVoa_NIzwQ047dJU-b_e8pb8,13559
-neelthee_mansion-3.17.0.dist-info/METADATA,sha256=rqA7RCVuQKSBWlwfiNNtd_YnU4XmET5rD4dMKm1Nr6Y,1992
-neelthee_mansion-3.17.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-neelthee_mansion-3.17.0.dist-info/entry_points.txt,sha256=j5ScTTyIidFhmT3F6hcX9pnlom4cJdDmfe26BmM6Igo,56
-neelthee_mansion-3.17.0.dist-info/top_level.txt,sha256=woQImQewylhly5Rb24HwPEGMxPY6do_PaUwGd5BNLOM,17
-neelthee_mansion-3.17.0.dist-info/RECORD,,
+neelthee_mansion-3.17.2.dist-info/METADATA,sha256=CtKge-Rlmn7D61NZrgIXFqxmhzCL3S57aJmr1UP2ipM,1992
+neelthee_mansion-3.17.2.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+neelthee_mansion-3.17.2.dist-info/entry_points.txt,sha256=j5ScTTyIidFhmT3F6hcX9pnlom4cJdDmfe26BmM6Igo,56
+neelthee_mansion-3.17.2.dist-info/top_level.txt,sha256=woQImQewylhly5Rb24HwPEGMxPY6do_PaUwGd5BNLOM,17
+neelthee_mansion-3.17.2.dist-info/RECORD,,