neelthee-mansion 2.4.4__tar.gz → 3.1.0__tar.gz

{neelthee_mansion-2.4.4 → neelthee_mansion-3.1.0}/PKG-INFO

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

@@ -403,7 +403,7 @@ def battle(player: PC, good_guys: list, bad_guys: list, last_room):
     while player.hp > 0 and any(monster.hp > 0 for monster in bad_guys):
         if ask_for_consent("Do you want to run away"):
             Move(last_room)
-            return None, bad_guys
+            return good_guys, bad_guys
 
         # Player and good guys' turn
         for ally in [player] + good_guys:
@@ -411,7 +411,7 @@ def battle(player: PC, good_guys: list, bad_guys: list, last_room):
                 handle_victory(player, bad_guys)
                 return good_guys, None
 
-            target = select_target(bad_guys)
+            target = select_target(ally, bad_guys)
             player_turn(ally, target)
 
         # Bad guys' turn
@@ -548,20 +548,42 @@ def use_special_ability(player: PC, monster: creature):
         type_text("Your special ability is not ready yet.", colorTrue=color_coding)
 
 
-def select_target(targets: list):
+def select_target(chooser, targets: list):
     """
     Select a target from a list of characters.
 
     Args:
+        chooser: The entity (e.g., player or AI) selecting the target.
         targets (list): List of characters to select from.
 
     Returns:
         The selected target.
     """
-    # Basic logic to select the first valid target. Could be expanded to allow player choice.
-    for target in targets:
-        if target.hp > 0:
-            return target
+    if chooser == player:
+        valid_targets = []
+        type_text("Who do you want to attack? The options:")
+        # Enumerate through the targets to get both the index and the enemy.
+        for index, enemy in enumerate(targets):
+            if enemy.hp > 0:
+                type_text(f"{index + 1}: {enemy.name} ({enemy.hp} HP)")
+                valid_targets.append(index)
+        
+        # Prompt the player to select a target
+        while True:
+            try:
+                choice = int(input("Enter the number of the target: ")) - 1
+                if choice in valid_targets:
+                    return targets[choice]
+                else:
+                    type_text("Invalid choice. Please select a valid target.")
+            except ValueError:
+                type_text("Invalid input. Please enter a number.")
+    else:
+        # AI or other logic for non-player chooser
+        for target in targets:
+            if target.hp > 0:
+                return target
+
 
 
 def command():

{neelthee_mansion-2.4.4 → neelthee_mansion-3.1.0}/neelthee_mansion/Rooms.py

@@ -160,14 +160,6 @@ ROOMS = {
                         'A large 7ft 8 brown bear that looks hungry',
                         'A %*CYAN*%hungry%*RESET*% bear attacks you!',
                         ),
-                        creature(
-                        'hungry bear', 
-                        7, 
-                        5, 
-                        [item('claw')],
-                        'A large 7ft 8 brown bear that looks hungry',
-                        'A %*CYAN*%hungry%*RESET*% bear attacks you!',
-                        ),
                     ],
                     'info': 'You are in the kitchen, there are several trashed %*RED*%cupboards%*RESET*%, one of them has a knotted cord sticking out, and a fireplace.',
                     'map': '''

{neelthee_mansion-2.4.4 → neelthee_mansion-3.1.0}/neelthee_mansion/creatures.py

@@ -229,7 +229,7 @@ class base_ability:
     
     def Tick(self):
         self.current_cooldown += 1
-        self.check_cooldown
+        self.check_cooldown()
     
     def check_cooldown(self):
         if self.current_cooldown >= self.cooldown_time:

{neelthee_mansion-2.4.4 → neelthee_mansion-3.1.0}/neelthee_mansion/utils.py

@@ -18,6 +18,8 @@ try:
     import inspect
     import threading
     import json
+    import ast
+    import builtins
     import requests
     import keyboard
     import pandas as pd
@@ -234,10 +236,22 @@ def clamp(value, min = 0, max = 0):
     return value
 
 def is_executable(code_str):
+    code_str = code_str.strip()
+    if not code_str:  # Check for empty or whitespace-only string
+        return False
     try:
-        compile(code_str, '<string>')
+        # Parse the code to ensure it is syntactically correct
+        tree = ast.parse(code_str, mode='exec')
+        
+        # Walk through the AST to find undefined names
+        for node in ast.walk(tree):
+            if isinstance(node, ast.Name) and isinstance(node.ctx, ast.Load):
+                # Check if the name is a built-in, defined locally in code, or globally available
+                if node.id not in dir(builtins) and node.id not in globals() and node.id not in locals():
+                    return False  # Name is not defined
+        
         return True
-    except SyntaxError:
+    except (SyntaxError, TypeError):
         return False
 
 def play_sound(sound_file):

{neelthee_mansion-2.4.4 → neelthee_mansion-3.1.0}/neelthee_mansion.egg-info/PKG-INFO

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

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