neelthee-mansion 3.2.0__py3-none-any.whl → 3.3.1__py3-none-any.whl

neelthee_mansion/Mansion_of_Amnesia.py

@@ -256,29 +256,28 @@ def Use(moveone, movetwo=None):
         type_text("You can't use that", colorTrue=color_coding)
 
 
-def PickKey(lock):
-    if player.inventory.keys():
+def PickKey(locked_obj):
+    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()
+            type_text(f"Please pick which key you want to use in the lock. This is what you know about the lock: {locked_obj}. These are your 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)
 
 
@@ -300,10 +299,10 @@ def Move(move):
     def attempt_move_to_garden():
         global player
         type_text("Please pick whitch key you want to try in the lock on the gate")   
-        for key in player.inventory.keys():
-            if key.KeyCode == "629.IdnXwnt":
-                End('You unlock the gate to the garden with the key!')
-                return newRoom
+        key = PickKey(Lock("629.IdnXwnt"))
+        if key.KeyCode == "629.IdnXwnt":
+            End('You unlock the gate to the garden with the key!')
+            return newRoom
         type_text('The gate is locked.', colorTrue=color_coding)
         return newRoom
 
@@ -320,20 +319,26 @@ def Move(move):
             return newRoom
 
     if move in ROOMS[player.CURRENTROOM]['directions']:
+        newRoom = "Hall"
         if isinstance(ROOMS[player.CURRENTROOM]['directions'][move], Door):
             if isinstance(ROOMS[player.CURRENTROOM]['directions'][move].lock, Lock):
                 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()
+        elif isinstance(ROOMS[player.CURRENTROOM]['directions'][move], str):
+            newRoom = ROOMS[player.CURRENTROOM]['directions'][move]
+        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/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
@@ -40,6 +57,9 @@ class Door:
         else:
             type_text("The door is locked.")
             return currentroom
+    
+    def __str__(self) -> str:
+        return self.CurentRevealStr
 
 class SwitchDoor(Door):
     def __init__(self, RoomOneName, RoomTwoName, KeyCode=None) -> None:
@@ -300,7 +320,7 @@ You notice a ''%*RED*%storage%*RESET*% device in one corner. You hear a %*YELLOW
                     'directions': {
                         'west': Door('Armoury'),
                         'south': Door('Dining Room'),
-                        'down': 'Basement 1',
+                        'down': Door('Basement 1'),
                         },
                     'creatures stats': creature(
                         'grumpy pig',
@@ -336,7 +356,7 @@ You notice a ''%*RED*%storage%*RESET*% device in one corner. You hear a %*YELLOW
                     'position': (1, 8, 0),
                     'discovered': False,
                     'directions': {
-                        'down': 'Hall',
+                        'down': Door('Hall'),
                         'north': Door('Tower Bottom'),
                         'east': Door('Bedroom'),
                         'south': Door('Balcony'),
@@ -452,7 +472,7 @@ You notice a ''%*RED*%storage%*RESET*% device in one corner. You hear a %*YELLOW
                     'directions': {
                         'south': Door('Landing'),
                         'east': Door('Office'),
-                        'down': 'Armoury',
+                        'down': Door('Armoury'),
                         'up': Door('Tower Middle'),
                         },
                     'info': 'You are in the base of a stone tower, there is a spiral staircase going up into the darkness.',
@@ -479,7 +499,7 @@ You notice a ''%*RED*%storage%*RESET*% device in one corner. You hear a %*YELLOW
                     'position': (2, 0, 0),
                     'discovered': False,
                     'directions': {
-                        'down': 'Tower Bottom',
+                        'down': Door('Tower Bottom'),
                         'up': Door('Tower Top'),
                         },
                     'containers': {
@@ -507,7 +527,7 @@ You notice a ''%*RED*%storage%*RESET*% device in one corner. You hear a %*YELLOW
                     'position': (3, 0, 0),
                     'discovered': False,
                     'directions': {
-                        'down': 'Tower Middle',
+                        'down': Door('Tower Middle'),
                         'teleport': Door('Teleportation Deck'),
                         },
                     'creatures stats': creature(
@@ -668,9 +688,11 @@ You notice a ''%*RED*%storage%*RESET*% device in one corner. You hear a %*YELLOW
 
                 'Cavern 1': {
                     'room type': 'cavern',
+                    'position': (-2, 0, 0),
+                    'discovered': False,
                     'directions': {
                         'up': Door('Basement 4'),
-                        'down': 'Cavern 2',
+                        'down': Door('Cavern 2'),
                         },
                     'info': 'you are in a dark cavern with the only light coming from the shoot you came through. A voice in the back of your head says: \'Do not go down the shoot, leave while you still can!\'',
                     'map': '''
@@ -690,10 +712,12 @@ You notice a ''%*RED*%storage%*RESET*% device in one corner. You hear a %*YELLOW
 
                 'Cavern 2': {
                     'room type': 'cavern',
+                    'position': (-3, 0, 0),
+                    'discovered': False,
                     'directions': {
-                        
+                            'up': SwitchDoor('Cavern 1', 'Cavern 3', '7k69fImz4y')
                         },
-                    'info': 'you are in a dark cavern with the only light coming from the shoot you came through. A voice in the back of your head says: \'You fool! You can never escape!\'',
+                    'info': 'you are in a dark cavern with the only light coming from the shoot you came through. A voice in the back of your head says: \'You fool! You can never get back now!\'',
                     'map': '''
 █████████
 █       █
@@ -705,7 +729,8 @@ You notice a ''%*RED*%storage%*RESET*% device in one corner. You hear a %*YELLOW
 █       █
 █████████''',
                     'Hints': [
-                        'I should probably quit so I\'m not here forever.',
+                        'I should probably go back up so I\'m not here forever.',
+                        'I wander what the voice was talking about.',
                     ],
                     },
 

neelthee_mansion/items.py

@@ -156,3 +156,6 @@ class container:
     
     def Unlock(self, key: Key, player):
         return self.lock.unlock(key, player)
+    
+    def __str__(self) -> str:
+        return self.CurentRevealStr

{neelthee_mansion-3.2.0.dist-info → neelthee_mansion-3.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: neelthee-mansion
-Version: 3.2.0
+Version: 3.3.1
 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.dist-info → neelthee_mansion-3.3.1.dist-info}/RECORD

@@ -1,14 +1,14 @@
-neelthee_mansion/Mansion_of_Amnesia.py,sha256=cB9Ql3o6dPbYWAVNbGoO7Dw7OBYqPWb4getkzVJlKLg,45661
+neelthee_mansion/Mansion_of_Amnesia.py,sha256=n1x4vtwczYcQ9mMrD8MZLGiEVwBOMJr8WzyHMkDStv0,45955
 neelthee_mansion/Quests.py,sha256=q6VzR3mt9AYe29ACWZuf-suz4yOKrL946aJ493eQRS0,2611
-neelthee_mansion/Rooms.py,sha256=CWha-UQOxWvaJWJeh1HDzfBqKvw8g_HFXeYVZDsGuCg,86124
+neelthee_mansion/Rooms.py,sha256=j8jJObdeTFGIn_G1a_saSx8C7ihWWYiJWAGfyAfY5u0,87314
 neelthee_mansion/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 neelthee_mansion/__main__.py,sha256=OIAWZ04le70DyjtR4hlmK9csHej7EHxeUrMoNnM-Vjc,95
 neelthee_mansion/all_game_utils.py,sha256=Xfty9uXiYAfmA6iVzJurq852ZBPn7a4gQUcUcaV9yEU,341
 neelthee_mansion/creatures.py,sha256=kSfzQSE5UmFiDV0eDsTXCk-LQwZIyY5Rwsyh5Uhropw,14826
-neelthee_mansion/items.py,sha256=T5Y_oTuWv4SlDHG1Q3Z_wdddQJgtjMfdTdDU489yjCw,5027
+neelthee_mansion/items.py,sha256=ysXxbGTfVSW9gc8N4uGEZlQ-_Nsv2eFjHdfIBUGxBNQ,5101
 neelthee_mansion/utils.py,sha256=PhFBDQXQoSNHpBUd0NKhP0KcclXK5Mho0qGnrpKAbe0,12187
-neelthee_mansion-3.2.0.dist-info/METADATA,sha256=EC_4oexL3YVwh-U4hj0HBpVmWYDNDKe-BbcrLa8YTkg,1991
-neelthee_mansion-3.2.0.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
-neelthee_mansion-3.2.0.dist-info/entry_points.txt,sha256=j5ScTTyIidFhmT3F6hcX9pnlom4cJdDmfe26BmM6Igo,56
-neelthee_mansion-3.2.0.dist-info/top_level.txt,sha256=woQImQewylhly5Rb24HwPEGMxPY6do_PaUwGd5BNLOM,17
-neelthee_mansion-3.2.0.dist-info/RECORD,,
+neelthee_mansion-3.3.1.dist-info/METADATA,sha256=o0Wti0QOa-OkGfYlNq0but3Q0Fhn5edcBp5DaBbetJE,1991
+neelthee_mansion-3.3.1.dist-info/WHEEL,sha256=eOLhNAGa2EW3wWl_TU484h7q1UNgy0JXjjoqKoxAAQc,92
+neelthee_mansion-3.3.1.dist-info/entry_points.txt,sha256=j5ScTTyIidFhmT3F6hcX9pnlom4cJdDmfe26BmM6Igo,56
+neelthee_mansion-3.3.1.dist-info/top_level.txt,sha256=woQImQewylhly5Rb24HwPEGMxPY6do_PaUwGd5BNLOM,17
+neelthee_mansion-3.3.1.dist-info/RECORD,,