neelthee-mansion 3.6.4__tar.gz → 3.6.6__tar.gz

{neelthee_mansion-3.6.4 → neelthee_mansion-3.6.6}/PKG-INFO

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

@@ -660,8 +660,8 @@ def select_target(chooser, targets: list):
 
 
 def command():
-        global player
-    #try:
+    global player
+    try:
         ShouldBreak = False
 
         while True:
@@ -689,12 +689,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)
@@ -759,13 +759,13 @@ def search_container(player: PC, Container):
         if isinstance(Container.lock, Lock):
             key = PickKey(Container.lock)
             Container.Unlock(key, player)
-        Container.take_contents(player)
         type_text(f"You search the{' secret' if Container.secret else ''} %*RED*%{ContainerName}%*RESET*% and find a ", newline=False, colorTrue=color_coding)
         for searchitem in Container.contents:
             if searchitem:
                 if isinstance(searchitem, item):
                     end_str = ' and a ' if Container.contents.index(searchitem) < last_index(Container.contents) else '\n'
                     type_text(f"%*BLUE*%{searchitem.name}%*RESET*%{end_str}", newline=False, colorTrue=color_coding)
+        Container.take_contents(player)
 
 
 def handle_put_command(player: PC, PutItem: item = None, container = None, sub_container = None):

{neelthee_mansion-3.6.4 → neelthee_mansion-3.6.6}/neelthee_mansion.egg-info/PKG-INFO

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

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