neelthee-mansion 3.2.0__tar.gz → 3.3.0__tar.gz

{neelthee_mansion-3.2.0 → neelthee_mansion-3.3.0}/PKG-INFO

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

@@ -257,28 +257,27 @@ def Use(moveone, movetwo=None):
 
 
 def PickKey(lock):
-    if player.inventory.keys():
+    keys = player.inventory.keys()
+    
+    if keys:
         while True:
             type_text(f"Please pick which key you want to use in the lock. This is what you know about the lock: {lock}. These are your keys:")
-            keys = player.inventory.keys()
 
             # Enumerate keys and display them
             for idx, key in enumerate(keys, 1):  # Starts numbering at 1
                 type_text(f"{idx}. {key}")
-
-            # Use loop_til_valid_input to get a valid integer
+            
+            # Use loop_til_valid_input to get a valid integer within the correct range
             choice = loop_til_valid_input(
                 input_text="Enter the number of the key you'd like to use: ", 
                 bad_text="That's not a valid choice, please try again.", 
                 Class=int  # Ensuring input is an integer
             )
 
-            # Check if the chosen number corresponds to a valid key
+            # Since loop_til_valid_input ensures valid input, just return the selected key
             if 1 <= choice <= len(keys):
-                selected_key = keys[choice - 1]  # Adjust index since list is 0-based
-                return selected_key
-            else:
-                type_text("Invalid choice, please try again.")
+                return keys[choice - 1]  # Fetch the key using 0-based index
+    
     return Key(KeyCode=None)
 
 
@@ -325,15 +324,18 @@ def Move(move):
                 key = PickKey(ROOMS[player.CURRENTROOM]['directions'][move].lock)
                 ROOMS[player.CURRENTROOM]['directions'][move].unlock(key, player)
             newRoom = ROOMS[player.CURRENTROOM]['directions'][move].GetRoom()
-            player.CURRENTROOM = move_to_room()
+            newRoom = move_to_room()
         return
     elif move in ROOMS:
         newRoom = move
         if newRoom == 'Garden':
-            player.CURRENTROOM = attempt_move_to_garden()
-        else:
-            player.CURRENTROOM = newRoom
+            newRoom = attempt_move_to_garden()
         player.LASTROOM = player.CURRENTROOM
+        player.CURRENTROOM = newRoom
+        if 'random_events' in ROOMS[player.CURRENTROOM]:
+            for randomEvent in ROOMS[player.CURRENTROOM]['random_events']:
+                if isinstance(randomEvent, RandomEvent):
+                    randomEvent.check_and_trigger(player)
         return
     type_text(f"There is no exit {move}", colorTrue=color_coding)
 

{neelthee_mansion-3.2.0 → neelthee_mansion-3.3.0}/neelthee_mansion/Rooms.py

@@ -24,6 +24,23 @@ KEY = [
     'π = desk',
 ]
 
+class RandomEvent:
+    def __init__(self, 
+                 name='Event name', 
+                 probability=0.0,  # Probability of the event running (0.1 = 10% chance)
+                 condition=lambda player: True,  # Condition under which the event can occur
+                 effect=lambda player: None):  # Define the effect of the event
+        self.name = name
+        self.probability = probability
+        self.condition = condition
+        self.effect = effect
+
+    def check_and_trigger(self, player):
+        """Check if the event can occur based on its condition and probability, and trigger the effect."""
+        import random
+        if self.condition(player) and random.random() < self.probability:
+            self.effect(player)
+
 class Door:
     def __init__(self, RoomName, KeyCode=None) -> None:
         self.destination = RoomName

{neelthee_mansion-3.2.0 → neelthee_mansion-3.3.0}/neelthee_mansion.egg-info/PKG-INFO

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

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