neelthee-mansion 3.23.9__tar.gz → 3.23.11__tar.gz

{neelthee_mansion-3.23.9 → neelthee_mansion-3.23.11}/PKG-INFO

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

@@ -17,10 +17,12 @@ GameState = {
 Neel-thee's Mansion of Amnesia
 """
 
-global player, evil_mage, commands, NOTE_NUM, credits, color_coding, quest_manager, revealer, CHARACTERSLIST, BACKGROUNDS, info_text_area
+global player, evil_mage, commands, NOTE_NUM, credits, quest_manager, revealer, CHARACTERSLIST, BACKGROUNDS, info_text_area, map_root, map_label, player_info_root, player_info_label
 
 player_info_root = None
 player_info_label = None
+map_root = None
+map_label = None
 info_text_area = None
 
 BACKGROUNDS = {
@@ -33,8 +35,6 @@ revealer = KeyRevealer()
 
 quest_manager = QuestManager()
 
-color_coding = False
-
 credits = """
 Made by: Alexander.E.F
 AI assisted the creation"""
@@ -349,7 +349,7 @@ def Move(move):
     def move_to_room():
         global player
         player.LASTROOM = player.CURRENTROOM
-        if "descovered" in ROOMS[newRoom] and not ROOMS[newRoom]["descovered"]:
+        if "descovered" in ROOMS[newRoom]:
             ROOMS[newRoom]["descovered"] = True
         if move == "0":
             return attempt_charter()
@@ -389,7 +389,7 @@ def Move(move):
 def start():
     global player, info_text_area
     # Wait until info_text_area is initialized
-    while info_text_area is None:
+    while info_text_area is None or map_label is None:
         sleep(0.1)
     # shows the main menu
     add_text_to_textbox(info_text_area, 
@@ -424,10 +424,39 @@ def update_player_info():
         info_text = get_inventory_text()
         player_info_root.after(0, lambda: player_info_label.config(text=info_text))
 
+def get_map():
+    text = f"\n---------------------------"
+    if "map" in ROOMS[player.CURRENTROOM]:
+        text += f'\n\nKey: {"; ".join(KEY)}\n'
+        text += f'\n{ROOMS[player.CURRENTROOM]["map"]}\n'
+    else:
+        text += f"\nNo map available for this room."
+    return text
+
+def show_map():
+    global map_root, map_label
+    map_root = tk.Tk()
+    map_root.title("Map")
+
+    map_text = get_map()
+    map_label = tk.Label(map_root, text=map_text)
+    map_label.pack()
+
+    map_root.mainloop()
+
+def update_map():
+    global map_root, map_label
+    if map_root and map_label:
+        map_text = get_map()
+        map_root.after(0, lambda: map_label.config(text=map_text))
+
 def start_tkinter_thread():
     player_info_thread = threading.Thread(target=show_player_info)
     player_info_thread.daemon = True
     player_info_thread.start()
+    map_thread = threading.Thread(target=show_map)
+    map_thread.daemon = True
+    map_thread.start()
 
 def showStatus():
     global player
@@ -441,10 +470,11 @@ def showStatus():
     # Display possible directions of travel
     text = display_directions(text)
 
-    # Display the map if available
-    if "map" in ROOMS[player.CURRENTROOM]:
-        text += f'\n\nKey: {"; ".join(KEY)}\n'
-        text += f'\n{ROOMS[player.CURRENTROOM]["map"]}\n'
+    ## Display the map if available
+    #if "map" in ROOMS[player.CURRENTROOM]:
+    #    text += f'\n\nKey: {"; ".join(KEY)}\n'
+    #    text += f'\n{ROOMS[player.CURRENTROOM]["map"]}\n'
+    update_map()
 
     # Display the description of the current room
     text += "\n" + str(ROOMS[player.CURRENTROOM]["info"])
@@ -777,8 +807,8 @@ def select_target(chooser, targets: list):
 
 
 def command():
-        global player
-    #try:
+    global player
+    try:
         ShouldBreak = False
 
         while True:
@@ -809,12 +839,12 @@ def command():
                         ShouldBreak = True
             if ShouldBreak:
                 return
-    #except KeyError as e:
-    #   add_text_to_textbox(info_text_area, f"KeyError: {e} - This might be due to an undefined command or incorrect arguments.")
-    #except ValueError as e:
-    #   add_text_to_textbox(info_text_area, f"ValueError: {e} - This might be due to incorrect arguments provided.")
-    #except Exception as e:
-    #   add_text_to_textbox(info_text_area, f"Unexpected Error: {e}")
+    except KeyError as e:
+       add_text_to_textbox(info_text_area, f"KeyError: {e} - This might be due to an undefined command or incorrect arguments.")
+    except ValueError as e:
+       add_text_to_textbox(info_text_area, f"ValueError: {e} - This might be due to incorrect arguments provided.")
+    except Exception as e:
+       add_text_to_textbox(info_text_area, f"Unexpected Error: {e}")
 
 
 def handle_sleep_command(player: PC):
@@ -894,13 +924,10 @@ def handle_search_command(player, *Args):
 def search_container(player: PC, Container):
     ContainerName = Container
     Container = ROOMS[player.CURRENTROOM]["containers"][Container]
-    print("Got to if staitment")
     if isinstance(Container, container):
-        print("got past if statement")
         if isinstance(Container.lock, Lock):
             key = PickKey(Container.lock)
             Container.Unlock(key, player)
-        print("Adding text now")
         add_text_to_textbox(info_text_area, 
             f"You search the{' secret' if Container.secret else ''} {ContainerName} and find a ",
             newline=False
@@ -1132,7 +1159,7 @@ def handle_guard_action(guard):
 def create_info_textbox():
     global info_text_area
     root = tk.Tk()
-    root.title("Text Box with Scrollbar")
+    root.title("Main Window")
 
     info_text_area = scrolledtext.ScrolledText(root, wrap=tk.WORD, width=120, height=40)
     info_text_area.pack(padx=10, pady=10)
@@ -1230,19 +1257,6 @@ def initializer():
             # I will add more logic for starting the game later
             root.destroy()
 
-        def ask_color_coding():
-            color_window = tk.Toplevel(root)
-            color_window.title("Color Coding")
-            tk.Label(color_window, text="Do you want color coding?").pack()
-            tk.Button(color_window, text="Yes", command=lambda: set_color_coding(True)).pack()
-            tk.Button(color_window, text="No", command=lambda: set_color_coding(False)).pack()
-
-        def set_color_coding(choice):
-            global color_coding
-            color_coding = choice
-            # Add your logic for enabling/disabling color coding here
-            choose_background()
-
         root = tk.Tk()
         root.title("Character Creation")
 
@@ -1288,12 +1302,12 @@ def main():
     # this is the initializer
     initializer()
 
-    # shows the instructions
-    start()
-
     # starts the tkinter thread that shows the player's stats
     start_tkinter_thread()
 
+    # shows the instructions
+    start()
+
     # loop forever while the player wants to play
     while True:
         command()
@@ -1395,19 +1409,6 @@ def main():
         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()
-                    if npcstats.aggressive:
-                        ROOMS[player.CURRENTROOM]["NPCs"][npcname] = battle(
-                            player, [], [npcstats], player.LASTROOM
-                        )[1]
-
         player.special_ability.Tick(info_text_area)
         quest_manager.update_objective(f"Kill {GameState['Enemies killed']} creatures")
         for Item in GameState["collected items"]:

{neelthee_mansion-3.23.9 → neelthee_mansion-3.23.11}/neelthee_mansion/Rooms.py

@@ -92,8 +92,8 @@ def SetMapsAndPosiitionsDicts(map_dict, positions):
 
     positions = {}
     for RoomName, RoomItem in ROOMS.items():
-        if "discovered" in RoomItem and "position" in RoomItem and "map" in RoomItem:
-            if RoomItem["discovered"]:
+        if "descovered" in RoomItem and "position" in RoomItem and "map" in RoomItem:
+            if RoomItem["descovered"]:
                 map_dict[RoomName] = string_to_2d_list(RoomItem["map"])
                 positions[RoomName] = RoomItem["position"]
     return map_dict, positions
@@ -164,7 +164,7 @@ ROOMS = {
     "Hall": {
         "room type": "house",
         "position": (0, 8, 0),
-        "discovered": True,
+        "descovered": True,
         "directions": {
             "south": Door("Kitchen"),
             "east": Door("Dining Room"),
@@ -253,7 +253,7 @@ smash from the south.",
     "Kitchen": {
         "room type": "house",
         "position": (0, 16, 0),
-        "discovered": False,
+        "descovered": False,
         "directions": {
             "north": Door("Hall"),
             "east": Door("Garden"),
@@ -303,7 +303,7 @@ smash from the south.",
     "Dining Room": {
         "room type": "house",
         "position": (0, 8, 8),
-        "discovered": False,
+        "descovered": False,
         "directions": {
             "west": Door("Hall"),
             "south": Door("Garden"),
@@ -335,7 +335,7 @@ ripping from the north.",
     "Garden": {
         "room type": "house",
         "position": (0, 16, 8),
-        "discovered": False,
+        "descovered": False,
         "directions": {
             "north": Door("Dining Room"),
             "west": Door("Kitchen"),
@@ -364,7 +364,7 @@ ripping from the north.",
     "Armoury": {
         "room type": "house",
         "position": (0, 0, 0),
-        "discovered": False,
+        "descovered": False,
         "directions": {
             "south": Door("Hall"),
             "east": Door("Sitting Room"),
@@ -396,7 +396,7 @@ You notice a "
     "Sitting Room": {
         "room type": "house",
         "position": (0, 0, 8),
-        "discovered": False,
+        "descovered": False,
         "directions": {
             "west": Door("Armoury"),
             "south": Door("Dining Room"),
@@ -435,7 +435,7 @@ You notice a "
     "Landing": {
         "room type": "house",
         "position": (1, 8, 0),
-        "discovered": False,
+        "descovered": False,
         "directions": {
             "down": Door("Hall"),
             "north": Door("Tower Bottom"),
@@ -461,7 +461,7 @@ You notice a "
     "Bedroom": {
         "room type": "house",
         "position": (1, 8, 8),
-        "discovered": False,
+        "descovered": False,
         "directions": {
             "west": Door("Landing"),
             "north": Door("Office"),
@@ -492,7 +492,7 @@ You notice a "
     "Office": {
         "room type": "house",
         "position": (1, 0, 8),
-        "discovered": False,
+        "descovered": False,
         "directions": {
             "south": Door("Bedroom"),
             "west": Door("Tower Bottom"),
@@ -528,7 +528,7 @@ You notice a "
     "Balcony": {
         "room type": "house",
         "position": (1, 16, 0),
-        "discovered": False,
+        "descovered": False,
         "directions": {
             "north": Door("Landing"),
         },
@@ -550,7 +550,7 @@ You notice a "
     "Tower Bottom": {
         "room type": "house",
         "position": (1, 0, 0),
-        "discovered": False,
+        "descovered": False,
         "directions": {
             "south": Door("Landing"),
             "east": Door("Office"),
@@ -578,7 +578,7 @@ You notice a "
     "Tower Middle": {
         "room type": "house",
         "position": (2, 0, 0),
-        "discovered": False,
+        "descovered": False,
         "directions": {
             "down": Door("Tower Bottom"),
             "up": Door("Tower Top"),
@@ -609,7 +609,7 @@ You notice a "
     "Tower Top": {
         "room type": "house",
         "position": (3, 0, 0),
-        "discovered": False,
+        "descovered": False,
         "directions": {
             "down": Door("Tower Middle"),
             "teleport": Door("Teleportation Deck"),
@@ -643,7 +643,7 @@ You notice a "
     "Basement Armoury": {
         "room type": "house",
         "position": (-1, 0, 0),
-        "discovered": False,
+        "descovered": False,
         "directions": {
             "south": Door("Basement 3"),
             "east": Door("Basement 1"),
@@ -676,7 +676,7 @@ rack-1 has damaged bows and rack-2 has damaged spears.",
     "Basement 1": {
         "room type": "house",
         "position": (-1, 0, 8),
-        "discovered": False,
+        "descovered": False,
         "directions": {
             "south": Door("Basement 2"),
             "west": Door("Basement Armoury"),
@@ -704,7 +704,7 @@ rack-1 has damaged bows and rack-2 has damaged spears.",
     "Basement 2": {
         "room type": "house",
         "position": (-1, 8, 8),
-        "discovered": False,
+        "descovered": False,
         "directions": {
             "north": Door("Basement 1"),
             "west": Door("Basement 3"),
@@ -730,7 +730,7 @@ rack-1 has damaged bows and rack-2 has damaged spears.",
     "Basement 3": {
         "room type": "house",
         "position": (-1, 8, 0),
-        "discovered": False,
+        "descovered": False,
         "directions": {
             "south": Door("Basement 4"),
             "east": Door("Basement 2"),
@@ -754,7 +754,7 @@ rack-1 has damaged bows and rack-2 has damaged spears.",
     "Basement 4": {
         "room type": "house",
         "position": (-1, 16, 0),
-        "discovered": False,
+        "descovered": False,
         "directions": {
             "north": Door("Basement 3"),
             "east": Door("Library"),
@@ -781,7 +781,7 @@ rack-1 has damaged bows and rack-2 has damaged spears.",
     "Library": {
         "room type": "house",
         "position": (-1, 16, 8),
-        "discovered": False,
+        "descovered": False,
         "directions": {
             "west": Door("Room name"),
             "bookcase": Door("Cavern 3"),
@@ -808,7 +808,7 @@ rack-1 has damaged bows and rack-2 has damaged spears.",
                 'DND': {
                     'room type': 'type',
                     'position': (-1, -8, 0),
-                    'discovered': False,
+                    'descovered': False,
                     'directions': {
                         'north': Door('Room name'),
                         'south': Door("Basement Armoury"),
@@ -867,7 +867,7 @@ Oh and before I forget, If you go through the door to the north, there wil be no
     "Cavern 1": {
         "room type": "cavern",
         "position": (-2, 0, 0),
-        "discovered": False,
+        "descovered": False,
         "directions": {
             "up": Door("Basement 4"),
             "down": Door("Cavern 2"),
@@ -890,7 +890,7 @@ Oh and before I forget, If you go through the door to the north, there wil be no
     "Cavern 2": {
         "room type": "cavern",
         "position": (-3, 0, 0),
-        "discovered": False,
+        "descovered": 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 get back now!'",
         "map": """
@@ -911,7 +911,7 @@ Oh and before I forget, If you go through the door to the north, there wil be no
     "Cavern 3": {
         "room type": "cavern",
         "position": (-2, 8, 0),
-        "discovered": False,
+        "descovered": False,
         "directions": {
             "down": Door("Cavern 2"),
             "bookcase": Door("Library"),

neelthee_mansion-3.23.11/neelthee_mansion/all_game_utils.py

@@ -0,0 +1,12 @@
+from .utils import *
+from re import *
+
+
+def ask_for_consent(text: str, text_area) -> bool:
+    while True:
+        add_text_to_textbox(text_area, f"{text}? Y/N")
+        anser = loop_til_valid_input("", "That wasn't Y or N", Y_N).Value
+        if anser == "y":
+            return True
+        elif anser == "n":
+            return False

{neelthee_mansion-3.23.9 → neelthee_mansion-3.23.11}/neelthee_mansion/utils.py

@@ -47,6 +47,10 @@ These utilities aim to simplify development processes, promote code reuse, and i
 """
 
 
+def debug(text: str):
+    print(f"DEBUG: {text}")
+
+
 # a function that adds text to a text box and scrolls to the bottom and updates it
 def add_text_to_textbox(text_area: scrolledtext.ScrolledText, text, newline=True):
     # Enable the text box to insert text

{neelthee_mansion-3.23.9 → neelthee_mansion-3.23.11}/neelthee_mansion.egg-info/PKG-INFO

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

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="neelthee_mansion",
-    version="3.23.9",  # Update version number for each release
+    version="3.23.11",  # Update version number for each release
     packages=find_packages(),  # Automatically finds all packages and modules
     install_requires=[
         "wheel",

neelthee_mansion-3.23.9/neelthee_mansion/all_game_utils.py

@@ -1,14 +0,0 @@
-from .utils import *
-from re import *
-
-
-def ask_for_consent(text: str) -> bool:
-    while True:
-        type_text(f"{text}? Y/N")
-        anser = str(input(">")).lower().strip()
-        if anser == "y":
-            return True
-        elif anser == "n":
-            return False
-        else:
-            type_text("That wasn't Y or N")