diff --git a/worlds/messenger/archipelago.json b/worlds/messenger/archipelago.json new file mode 100644 index 0000000000..86aefc42a8 --- /dev/null +++ b/worlds/messenger/archipelago.json @@ -0,0 +1,4 @@ +{ + "game": "The Messenger", + "authors": ["alwaysintreble"] +} \ No newline at end of file diff --git a/worlds/messenger/client_setup.py b/worlds/messenger/client_setup.py index 3ef1df75cc..02fd299a6c 100644 --- a/worlds/messenger/client_setup.py +++ b/worlds/messenger/client_setup.py @@ -28,6 +28,8 @@ def create_yes_no_popup(title: str, text: str, callback: Callable[[str], None]) def launch_game(*args) -> None: """Check the game installation, then launch it""" + prompt: ButtonsPrompt | None = None + def courier_installed() -> bool: """Check if Courier is installed""" assembly_path = os.path.join(game_folder, "TheMessenger_Data", "Managed", "Assembly-CSharp.dll") @@ -190,7 +192,7 @@ def launch_game(*args) -> None: def launch(answer: str | None = None) -> None: """Launch the game.""" - nonlocal args + nonlocal args, prompt if prompt: prompt.dismiss() @@ -256,3 +258,5 @@ def launch_game(*args) -> None: prompt = create_yes_no_popup("Launch Game", "Mod installed and up to date. Would you like to launch the game now?", launch) + else: + launch() diff --git a/worlds/messenger/rules.py b/worlds/messenger/rules.py index 2d5ee1b8a9..7f17232cfb 100644 --- a/worlds/messenger/rules.py +++ b/worlds/messenger/rules.py @@ -1,7 +1,7 @@ from typing import TYPE_CHECKING -from BaseClasses import CollectionState -from worlds.generic.Rules import CollectionRule, add_rule, allow_self_locking_items +from BaseClasses import CollectionState, CollectionRule +from worlds.generic.Rules import add_rule, allow_self_locking_items from .constants import NOTES, PHOBEKINS from .options import MessengerAccessibility