neelthee-mansion 2.4.0__tar.gz → 2.4.2__tar.gz

{neelthee_mansion-2.4.0 → neelthee_mansion-2.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: neelthee_mansion
-Version: 2.4.0
+Version: 2.4.2
 Summary: A text-based adventure game set in Neel-thee’s mansion.
 Home-page: https://github.com/Flameblade375/neelthee_mansion
 Author: Alexander.E.F
@@ -31,7 +31,8 @@ Description-Content-Type: text/markdown
 
 ## Installation
 
-You can install **Neel-thee's Mansion of Amnesia** using `pip` from the Python Package Index (PyPI). Run the following command (worning! make sure you are using command line and even then sometimes it doesn't work. Please use Visual Studio Code or have turned off colour coding or it will brake):
+You can install **Neel-thee's Mansion of Amnesia** using `pip` from the Python Package Index (PyPI). Run the following commands. You need wheel installed before you can install **Neel-thee's Mansion of Amnesia**. (worning! make sure you are using command line and even then sometimes it doesn't work. Please use Visual Studio Code or have turned off colour coding or it will brake):
 
 ```bash
+pip install wheel
 pip install --no-cache-dir neelthee_mansion

{neelthee_mansion-2.4.0 → neelthee_mansion-2.4.2}/README.md

@@ -11,7 +11,8 @@
 
 ## Installation
 
-You can install **Neel-thee's Mansion of Amnesia** using `pip` from the Python Package Index (PyPI). Run the following command (worning! make sure you are using command line and even then sometimes it doesn't work. Please use Visual Studio Code or have turned off colour coding or it will brake):
+You can install **Neel-thee's Mansion of Amnesia** using `pip` from the Python Package Index (PyPI). Run the following commands. You need wheel installed before you can install **Neel-thee's Mansion of Amnesia**. (worning! make sure you are using command line and even then sometimes it doesn't work. Please use Visual Studio Code or have turned off colour coding or it will brake):
 
 ```bash
+pip install wheel
 pip install --no-cache-dir neelthee_mansion

{neelthee_mansion-2.4.0 → neelthee_mansion-2.4.2}/neelthee_mansion/Mansion_of_Amnesia.py

@@ -67,10 +67,12 @@ charactersList = [
     {'name': 'Lucas', 'age': 28, 'height': Height('5ft 10'), 'weight(LBs)': 170},
     {'name': 'Ava', 'age': 22, 'height': Height('5ft 5'), 'weight(LBs)': 130},
     {'name': 'Lily', 'age': 26, 'height': Height('5ft 6'), 'weight(LBs)': 135},
-    {'name': 'Grace', 'age': 29, 'height': Height('5ft 7'), 'weight(LBs)': 140}
+    {'name': 'Grace', 'age': 29, 'height': Height('5ft 7'), 'weight(LBs)': 140},
+    {'name': 'Josh', 'age': 26, 'height': Height('5ft 6'), 'weight(LBs)': 135},
+    {'name': 'Luka', 'age': 29, 'height': Height('5ft 7'), 'weight(LBs)': 140},
 ]
-    
-    
+
+
 evil_mage = PC(
     'Neel-thee Contozt', 
     19836, 
@@ -385,44 +387,53 @@ def display_directions(text):
 
     return text
 
-def battle(player: PC, monster: creature, last_room):
+def battle(player: PC, good_guys: list, bad_guys: list, last_room):
     """
-    Simulate a battle between the player and a monster.
+    Simulate a battle between the player (and allies) and monsters.
 
     Args:
         player (PC): The player character.
-        monster (creature): The monster to battle.
+        good_guys (list): The list of allies to help the player.
+        bad_guys (list): The list of monsters to battle the player.
         last_room: The previous room before the battle.
 
     Returns:
-        The monster if it is still alive, None otherwise.
+        None if all bad guys are defeated, else the remaining bad guys.
     """
-    while player.hp > 0 and monster.hp > 0:
+    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 monster
+            return None, bad_guys
 
-        player_turn(player, monster)
-        
-        if monster.hp <= 0:
-            handle_victory(player, monster)
-            return None
+        # Player and good guys' turn
+        for ally in [player] + good_guys:
+            if all(monster.hp <= 0 for monster in bad_guys):
+                handle_victory(player, bad_guys)
+                return good_guys, None
+
+            target = select_target(bad_guys)
+            player_turn(ally, target)
+
+        # Bad guys' turn
+        for monster in bad_guys:
+            if monster.hp > 0:
+                target = select_target([player] + good_guys)
+                monster_turn(target, monster)
 
-        monster_turn(player, monster)
-        
         if player.hp <= 0:
-            End(f'The %*CYAN*%{monster.name}%*RESET*% defeats you!', win=False)
-            return monster
+            End(f'The monsters defeat you!', win=False)
+            return good_guys, bad_guys
+
+    return good_guys, bad_guys
 
-    return monster
 
 def player_turn(player: PC, monster: creature):
     """
-    Handle the player's turn during the battle.
+    Handle a character's turn during the battle.
 
     Args:
-        player (PC): The player character.
-        monster (creature): The monster to battle.
+        player (PC): The player or ally.
+        monster (creature): The monster being fought.
     """
     player_action = loop_til_valid_input(
         "Choose your action: (attack/defend/special): ", 
@@ -438,57 +449,53 @@ def player_turn(player: PC, monster: creature):
     elif player_action == "special":
         use_special_ability(player, monster)
 
+
 def monster_turn(player: PC, monster: creature):
     """
-    Handle the monster's turn during the battle.
+    Handle a monster's turn during the battle.
 
     Args:
-        player (PC): The player character.
-        monster (creature): The monster to battle.
+        player (PC): The player or ally.
+        monster (creature): The monster attacking.
     """
     type_text(f"The %*CYAN*%{monster.name}%*RESET*% attacks!", colorTrue=color_coding)
     damage = calculate_damage(monster, player)
-    
     player.take_damage(damage)
 
+
 def perform_attack(attacker: PC, defender: creature):
-    global player
     """
     Perform an attack action.
 
     Args:
         attacker (PC): The attacking character.
         defender (creature): The defending monster.
-    global player
     """
     damage = calculate_damage(attacker, defender)
-    global player
     defender.take_damage(damage)
-    global player
 
-def handle_victory(player: PC, monster: creature):
+
+def handle_victory(player: PC, monsters: list):
     """
-    Handle the logic when the player defeats the monster.
-    global player
+    Handle the logic when the player and allies defeat all monsters.
 
     Args:
         player (PC): The player character.
-        monster (creature): The defeated monster.
-    global player
+        monsters (list): The list of defeated monsters.
     """
-    type_text(f"You defeat the %*CYAN*%{monster.name}%*RESET*%!", colorTrue=color_coding)
-    player.inventory_add(monster.dropped_items)
+    type_text("You have defeated all the enemies!", colorTrue=color_coding)
+    for monster in monsters:
+        if monster.hp <= 0:
+            player.inventory_add(monster.dropped_items)
+
 
 def calculate_damage(attacker, defender) -> int:
-    global player
     """
     Calculate the damage inflicted by the attacker on the defender.
-    global player
 
     Args:
         attacker: The attacking character.
         defender: The defending character.
-    global player
 
     Returns:
         int: The calculated damage.
@@ -507,8 +514,8 @@ def calculate_damage(attacker, defender) -> int:
     
     return damage
 
+
 def calculate_damage_range(atpw: int) -> tuple[int, int]:
-    global player
     """
     Calculate the damage range based on attack power.
 
@@ -516,7 +523,7 @@ def calculate_damage_range(atpw: int) -> tuple[int, int]:
         atpw (int): Attack power of the combatant.
 
     Returns:
-        Tuple[int, int]: Minimum and maximum damage range.
+        tuple[int, int]: Minimum and maximum damage range.
     """
     damage_max_range = randint(1, 3)
     damage_min_range = randint(1, 3)
@@ -524,6 +531,7 @@ def calculate_damage_range(atpw: int) -> tuple[int, int]:
     damage_max = atpw + damage_max_range
     return damage_min, damage_max
 
+
 def use_special_ability(player: PC, monster: creature):
     """
     Allow the player to use a special ability during combat.
@@ -540,6 +548,22 @@ 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):
+    """
+    Select a target from a list of characters.
+
+    Args:
+        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
+
+
 def command():
     global player
     try:
@@ -693,7 +717,7 @@ def handle_hungry_bear(player: PC, enemy: creature):
             del player.inventory[player.inventory.index('potion')]
             type_text(f'You throw the potion at the bear and it explodes into a puff of magic smoke that stuns the bear!', colorTrue=color_coding)
     if enemy_reacting:
-        return battle(player, enemy, player.LASTROOM)
+        return [enemy, enemy_reacting]
 
 def handle_grumpy_pig(player: PC, enemy: creature):
     enemy_reacting = True
@@ -720,7 +744,7 @@ def handle_grumpy_pig(player: PC, enemy: creature):
             player.xp += 15
 
     if enemy_reacting:
-        return battle(player, enemy, player.LASTROOM)
+        return [enemy, enemy_reacting]
 
 def handle_greedy_goblin(player: PC, enemy: creature):
     enemy_reacting = True
@@ -731,7 +755,7 @@ def handle_greedy_goblin(player: PC, enemy: creature):
             player.money -= 15
             enemy.dropped_items[1].value += 15
     if enemy_reacting:
-        return battle(player, enemy, player.LASTROOM)
+        return [enemy, enemy_reacting]
 
 commands = {
     'go': handle_go_command,
@@ -791,7 +815,7 @@ def handle_wolf(player: PC, wolf: Guard):
             wolf.frendly = True
             return wolf
     if enemy_reacting:
-        return battle(player, wolf, player.LASTROOM)
+        return [wolf, enemy_reacting]
 
 def handle_guard_action(guard):
     # Dynamically build the function name
@@ -896,6 +920,8 @@ must navigate the mansion and uncover the truth behind your captivity, all while
     while True:
         command()
 
+        enemy_REFs = []
+
         # Move guards
         for guard in guards:
             if isinstance(guard, Guard):
@@ -903,62 +929,85 @@ must navigate the mansion and uncover the truth behind your captivity, all while
 
         # Check for detection
         for guard in guards:
-            #try:
-                if isinstance(guard, Guard):
-                    if guard.check_detection(player.CURRENTROOM):
-                        guard_handled = handle_guard_action(guard)
-                        if not isinstance(guard_handled, list):
-                            guard_handled = [guard_handled]
-                        if not guard_handled[0]:
-                            guard.type_text_flavor_text()
-                            guards[guards.index(guard)] = battle(player, guard, player.LASTROOM)
+            if isinstance(guard, Guard):
+                if guard.check_detection(player.CURRENTROOM):
+                    guard_handled = handle_guard_action(guard)
+                    if not isinstance(guard_handled, list):
+                        guard_handled = [guard_handled]
+
+                    # Get is_reacting from guard_handled
+                    is_reacting = guard_handled[1][1]
+
+                    # Only update guard if the guard is reacting
+                    if is_reacting:
+                        if guard.frendly:
+                            good_guys.append(guard)
                         else:
-                            guards[guards.index(guard)] = guard_handled[1]
-            #except:
-            #    guard.type_text_flavor_text()
-            #    guards[guards.index(guard)] = battle(player, guard, player.LASTROOM)
-        
-        # player loses if they enter a room with a monster, unless they can fight it.
+                            bad_guys.append(guard)
+
+                    if guard_handled[0]:
+                        guards[guards.index(guard)] = guard_handled[1][0]
+
+        # Handle creatures in the current room
         if 'creatures stats' in ROOMS[player.CURRENTROOM]:
+            is_reactings = []
             enemies = ROOMS[player.CURRENTROOM]['creatures stats']
             if not isinstance(enemies, list):
                 enemies = [enemies]  # Ensure enemies is a list even if there's only one creature
 
+            good_guys = []
+            bad_guys = []
 
             for enemy in enemies:
                 if isinstance(enemy, creature):
                     enemy.type_text_flavor_text()
 
+                    # Handle specific creatures
                     if enemy.name == 'hungry bear':
                         enemy_REF = handle_hungry_bear(player, enemy)
-                        enemies[enemies.index(enemy)] = enemy_REF
                     elif enemy.name == 'grumpy pig':
                         enemy_REF = handle_grumpy_pig(player, enemy)
-                        enemies[enemies.index(enemy)] = enemy_REF
                     elif enemy.name == 'greedy goblin':
                         enemy_REF = handle_greedy_goblin(player, enemy)
-                        enemies[enemies.index(enemy)] = enemy_REF
                     else:
-                        enemy_REF = battle(player, enemy, player.LASTROOM)
-                        enemies[enemies.index(enemy)] = enemy_REF
+                        enemy_REF = enemy
+
+                    if isinstance(enemy_REF, list):
+                        enemy_REF = enemy_REF[0]
+                        is_reacting = enemy_REF[1]
+                        is_reactings.append(is_reacting)
+
+                    enemies[enemies.index(enemy)] = enemy_REF
+
+                    # Add to good or bad lists if reacting
+                    if is_reacting:
+                        if enemy_REF.frendly:
+                            good_guys.append(enemy_REF)
+                        else:
+                            bad_guys.append(enemy_REF)
 
             if all_same_value(enemies, False):
                 del ROOMS[player.CURRENTROOM]['creatures stats']
             else:
                 ROOMS[player.CURRENTROOM]['creatures stats'] = enemies
-        
+
+        # Execute battle with separated good and bad guys
+        if bad_guys:
+            good_guys, bad_guys = battle(player, good_guys, bad_guys, player.LASTROOM)
+
+        # Handle NPC interactions
         if 'NPCs' in ROOMS[player.CURRENTROOM]:
             for npcname, npcstats in ROOMS[player.CURRENTROOM]['NPCs'].items():
                 if ask_for_consent("Do you want to interact with this NPC") or npcstats.aggressive:
-                    npcstats.interact
+                    npcstats.interact()
                     if npcstats.aggressive:
-                        ROOMS[player.CURRENTROOM]['NPCs'][npcname] = battle(player, npcstats)
-        
+                        ROOMS[player.CURRENTROOM]['NPCs'][npcname] = battle(player, [], [npcstats], player.LASTROOM)[1]
+
         player.special_ability.Tick()
-        quest_manager.update_objective(f"Kill {GameState['Enemys killed']} creatures")
-        for ___ in GameState['collected items']:
-            if isinstance(___, item):
-                quest_manager.update_objective(f"Colect {___.name}")
+        quest_manager.update_objective(f"Kill {GameState['Enemies killed']} creatures")
+        for Item in GameState['collected items']:
+            if isinstance(Item, item):
+                quest_manager.update_objective(f"Collect {Item.name}")
 
 
 

{neelthee_mansion-2.4.0 → neelthee_mansion-2.4.2}/neelthee_mansion/Rooms.py

@@ -160,6 +160,14 @@ 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.0 → neelthee_mansion-2.4.2}/neelthee_mansion/creatures.py

@@ -106,7 +106,7 @@ class creature(base_character):
         crit_chance (float): The chance of the creature landing a critical hit.
     """
 
-    def __init__(self, name: str, hp: int, atpw: int, dropped_items: list[str] = [], description: str = None, flavor_text: str = None, type: creature_type = creature_type('beast'), crit_chance: float = 0.05):
+    def __init__(self, name: str, hp: int, atpw: int, dropped_items: list[str] = [], description: str = None, flavor_text: str = None, type: creature_type = creature_type('beast'), crit_chance: float = 0.05, frendly_text: str = ""):
         """
         Initializes a new creature instance.
 
@@ -130,6 +130,8 @@ class creature(base_character):
         self.flavor_text = flavor_text if flavor_text else f'You see a %*CYAN*%{self.name}%*RESET*%!'
         self.type = type
         self.crit_chance = crit_chance
+        self.frendly = False
+        self.frendly_text = frendly_text
     
     def type_text_flavor_text(self):
         """
@@ -169,12 +171,10 @@ class Guard(creature):
             patrol_route (list[str], optional): The list of rooms the guard patrols through. Defaults to None.
             patrol_type (str): The type of patrol the guard is doing. Defaults to normal.
         """
-        super().__init__(name, hp, atpw, dropped_items, description, flavor_text, type, crit_chance)
+        super().__init__(name, hp, atpw, dropped_items, description, flavor_text, type, crit_chance, frendly_text)
         self.current_room = current_room
         self.patrol_route = patrol_route or []
         self.patrol_type = patrol_type
-        self.frendly = False
-        self.frendly_text = frendly_text
 
     def move(self, ROOMS, player):
         """

{neelthee_mansion-2.4.0 → neelthee_mansion-2.4.2}/neelthee_mansion.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: neelthee-mansion
-Version: 2.4.0
+Version: 2.4.2
 Summary: A text-based adventure game set in Neel-thee’s mansion.
 Home-page: https://github.com/Flameblade375/neelthee_mansion
 Author: Alexander.E.F
@@ -31,7 +31,8 @@ Description-Content-Type: text/markdown
 
 ## Installation
 
-You can install **Neel-thee's Mansion of Amnesia** using `pip` from the Python Package Index (PyPI). Run the following command (worning! make sure you are using command line and even then sometimes it doesn't work. Please use Visual Studio Code or have turned off colour coding or it will brake):
+You can install **Neel-thee's Mansion of Amnesia** using `pip` from the Python Package Index (PyPI). Run the following commands. You need wheel installed before you can install **Neel-thee's Mansion of Amnesia**. (worning! make sure you are using command line and even then sometimes it doesn't work. Please use Visual Studio Code or have turned off colour coding or it will brake):
 
 ```bash
+pip install wheel
 pip install --no-cache-dir neelthee_mansion

{neelthee_mansion-2.4.0 → neelthee_mansion-2.4.2}/setup.py

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