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

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

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

@@ -256,12 +256,12 @@ def Use(moveone, movetwo=None):
         type_text("You can't use that", colorTrue=color_coding)
 
 
-def PickKey(lock):
+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:")
+            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
@@ -299,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
 
@@ -319,12 +319,15 @@ 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()
-            newRoom = 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
@@ -1009,6 +1012,11 @@ You must navigate the mansion and uncover the truth behind your captivity, all w
     while True:
         command()
 
+        if 'random_events' in ROOMS[player.CURRENTROOM]:
+            for event in ROOMS[player.CURRENTROOM]['random_events']:
+                if isinstance(event, RandomEvent):
+                    event.check_and_trigger(player)
+
         # Move guards
         for guard in guards:
             if isinstance(guard, Guard):

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

@@ -57,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:
@@ -221,6 +224,14 @@ ROOMS = {
                         'I wonder if there is anything salvageable in the %*RED*%cupboards%*RESET*%.',
                         'I should probably look around.',
                     ],
+                    'random_events': [
+                        RandomEvent(
+                            name='Event name',
+                            probability=0.15,  # Adjust this for the probability of the event running (e.g., 0.1 is 10% chance)
+                            condition=lambda player: True,  # Condition under which the event can occur
+                            effect=lambda player: ROOMS['Kitchen']['containers']['cupboards'].take_contents(),  # Define the effect of the event
+                        )
+                    ],
                     },
 
                 'Dining Room': {
@@ -317,7 +328,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',
@@ -353,7 +364,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'),
@@ -469,7 +480,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.',
@@ -496,7 +507,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': {
@@ -524,7 +535,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(
@@ -685,9 +696,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': '''
@@ -707,10 +720,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': '''
 █████████
 █       █
@@ -722,7 +737,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-3.3.0 → neelthee_mansion-3.4.0}/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.3.0 → neelthee_mansion-3.4.0}/neelthee_mansion.egg-info/PKG-INFO

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

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