neelthee-mansion 3.16.9__tar.gz → 3.16.11__tar.gz

{neelthee_mansion-3.16.9 → neelthee_mansion-3.16.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: neelthee_mansion
-Version: 3.16.9
+Version: 3.16.11
 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.16.9 → neelthee_mansion-3.16.11}/neelthee_mansion/Mansion_of_Amnesia.py

@@ -125,7 +125,7 @@ go [%*GREEN*%direction%*RESET*%/%*GREEN*%teleport%*RESET*%/%*GREEN*%number%*RESE
 get [%*BLUE*%item%*RESET*%] - Pick up an item from your current location
 search [the/] [%*RED*%container%*RESET*%] - Search a container in your current location
 use [%*BLUE*%item%*RESET*%] - Use an item from your inventory
-put [%*BLUE*%item%*RESET*%] [the/] [%*RED*%container%*RESET*%] - Put an item from your inventory into a container in your current location
+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
 sleep - Rest for a bit and regain some health
 look - Look around your current location
@@ -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)
@@ -789,16 +789,18 @@ def search_container(player: PC, Container):
         Container.take_contents(player)
 
 
-def handle_put_command(player: PC, PutItem: item = None, container = None, sub_container = None):
+def handle_put_command(player: PC, *Args):
+    arguments = " ".join(Args)
+    Arguments = arguments.split("in")
+    for arg in Arguments:
+        Arguments[Arguments.index(arg)] = arg.strip()
+    PutItem = Arguments[0]
+    Container = Arguments[1]
     if PutItem in player.inventory:
         if 'containers' in ROOMS[player.CURRENTROOM]:
-            if container == 'the' and sub_container in ROOMS[player.CURRENTROOM]['containers']:
-                put_in_container(player, player.inventory[player.inventory.index(PutItem)], sub_container)
-                return
-            elif container in ROOMS[player.CURRENTROOM]['containers']:
-                put_in_container(player, player.inventory[player.inventory.index(PutItem)], container)
-                return
-    type_text(f"You cannot put the {PutItem.name} in the {container}", colorTrue=color_coding)
+            put_in_container(player, player.inventory[player.inventory.index(PutItem)], Container)
+            return
+    type_text(f"You cannot put the {PutItem.name} in the {Container}", colorTrue=color_coding)
 
 
 def put_in_container(player: PC, PutItem = None, container = None):

{neelthee_mansion-3.16.9 → neelthee_mansion-3.16.11}/neelthee_mansion.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: neelthee-mansion
-Version: 3.16.9
+Version: 3.16.11
 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.16.9 → neelthee_mansion-3.16.11}/setup.py

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