neelthee-mansion 3.7.1__tar.gz → 3.7.4__tar.gz

{neelthee_mansion-3.7.1 → neelthee_mansion-3.7.4}/PKG-INFO

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

@@ -433,15 +433,15 @@ def display_directions(text):
 
 def Examin(*Args):
     Name = ' '.join(Args)
-    if player.inventory.index(Name):
-        Item = player.inventory[player.inventory.index(Name)]
-        if Item in player.inventory.keys():
-            type_text("You look at your key and you figure out this about it:")
-            revealer.reveal_key_code(Item)
-        elif isinstance(Item, item):
-            if Item.type == 'weapon':
-                type_text(f"This item is a weapon that adds {Item.value} damage.")
-    elif Name in ROOMS[player.CURRENTROOM]['directions']:
+    item_index = player.inventory.index(Name)  # Store the result of index in a variable
+
+    if item_index is not None:  # Check explicitly if item_index is valid
+        _ = player.inventory[item_index]
+        type_text("You look at your item and you figure out this about it:")
+        if not revealer.reveal_key_code(_):
+            if _.type == 'weapon':
+                type_text(f"This item is a weapon that adds {_.value} damage.")
+    elif Name in ROOMS[player.CURRENTROOM]['directions']:  # Check exits in the room
         door = ROOMS[player.CURRENTROOM]['directions'][Name]
         if isinstance(door, Door):
             if isinstance(door.lock, Lock):
@@ -450,8 +450,8 @@ def Examin(*Args):
             else:
                 type_text(f"The exit {Name} has no lock.")
         else:
-            type_text(f"There is nothing spechial about the exit {Name}.")
-    elif Name in ROOMS[player.CURRENTROOM]['containers']:
+            type_text(f"There is nothing special about the exit {Name}.")
+    elif Name in ROOMS[player.CURRENTROOM]['containers']:  # Check containers in the room
         containerins = ROOMS[player.CURRENTROOM]['containers'][Name]
         if isinstance(containerins, container):
             if isinstance(containerins.lock, Lock):
@@ -460,7 +460,9 @@ def Examin(*Args):
             else:
                 type_text(f"The container {Name} has no lock.")
         else:
-            type_text(f"There is no container {containerins} in this room")
+            type_text(f"There is no container named {Name} in this room.")
+    else:
+        type_text(f"There is no {Name} to examine.")
 
 def battle(player: PC, good_guys: list, bad_guys: list, last_room):
     """

{neelthee_mansion-3.7.1 → neelthee_mansion-3.7.4}/neelthee_mansion/items.py

@@ -63,26 +63,29 @@ class KeyRevealer:
         self.max_reveals = max_reveals
     
     def reveal_key_code(self, obj: Key, mask_char="="):
-        if obj.reveal_count >= self.max_reveals:
-            type_text(f"You can only reveal a Key Code twice.")
-            type_text(f"Here is what you already know about this lock: {obj.CurentRevealStr}")
-            return
-        
-        if not hasattr(obj, 'lock'):
-            key_code = obj.value
-        else:
-            key_code = obj.lock.key_code
-        one_third_length = len(key_code) // 3
-        selected_indices = random.sample(range(len(key_code)), one_third_length)
-        
-        result = [
-            key_code[i] if i in selected_indices else mask_char
-            for i in range(len(key_code))
-        ]
-        
-        obj.reveal_count += 1
-        obj.CurentRevealStr = ''.join(result)
-        return ''.join(result)
+        if isinstance(obj, Key):
+            if obj.reveal_count >= self.max_reveals:
+                type_text(f"You can only reveal a Key Code twice.")
+                type_text(f"Here is what you already know about this lock: {obj.CurentRevealStr}")
+                return
+
+            if not hasattr(obj, 'lock'):
+                key_code = obj.value
+            else:
+                key_code = obj.lock.key_code
+            one_third_length = len(key_code) // 3
+            selected_indices = random.sample(range(len(key_code)), one_third_length)
+
+            result = [
+                key_code[i] if i in selected_indices else mask_char
+                for i in range(len(key_code))
+            ]
+
+            obj.reveal_count += 1
+            obj.CurentRevealStr = ''.join(result)
+            type_text("".join(result))
+            return True
+        return
 
 class ShopItem:
     def __init__(self, item: item, price: int):

{neelthee_mansion-3.7.1 → neelthee_mansion-3.7.4}/neelthee_mansion.egg-info/PKG-INFO

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

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