neelthee-mansion 3.23.10__tar.gz → 3.23.12__tar.gz

{neelthee_mansion-3.23.10 → neelthee_mansion-3.23.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: neelthee_mansion
-Version: 3.23.10
+Version: 3.23.12
 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.10 → neelthee_mansion-3.23.12}/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, 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 = {
@@ -387,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, 
@@ -422,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 = ""
+    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, font=("Courier", 12), width=100, height=40)
+    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
@@ -439,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"])
@@ -775,8 +807,8 @@ def select_target(chooser, targets: list):
 
 
 def command():
-        global player
-    #try:
+    global player
+    try:
         ShouldBreak = False
 
         while True:
@@ -807,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):
@@ -1127,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)
@@ -1270,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()
@@ -1377,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.12/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.10 → neelthee_mansion-3.23.12}/neelthee_mansion.egg-info/PKG-INFO

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

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

neelthee_mansion-3.23.10/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")