hook menus together

Author: apple1417

src/willow1_mod_menu/lobby.py

@@ -11,8 +11,6 @@
 
 from .util import find_focused_item
 
-# from .options import create_mod_options_menu
-
 type WillowGFxLobbyMultiplayer = UObject
 type WillowGFxMenuFrontend = UObject
 
@@ -27,6 +25,25 @@
 drawn_mods: list[Mod] = []
 
 
+def open_lobby_mods_menu(frontend: WillowGFxMenuFrontend) -> None:
+    """
+    Opens the multiplayer lobby-based mods menu.
+
+    Args:
+        frontend: The frontend movie to open under.
+    """
+    block_search_delegate.enable()
+    init_content.enable()
+    play_sound.enable()
+    menu_close.enable()
+
+    frontend.OpenMP()
+
+
+# Avoid circular import
+from .options import create_mod_options_menu  # noqa: E402
+
+
 # This is called when the movie is first started, to start looking for online games. We just want to
 # completely block it
 @hook("WillowGame.WillowGFxLobbyMultiplayer:UpdateSearchDelegate")
@@ -177,7 +194,12 @@ def play_sound(
             if (menu := current_menu()) is None:
                 return
             mod = get_focused_mod(menu)
-            print("selected", None if mod is None else mod.name)
+            if mod is None:
+                return
+
+            menu.Close()
+            frontend = menu.PlayerOwner.GFxUIManager.GetPlayingMovie()
+            create_mod_options_menu(frontend, mod)
         case _:
             return
 
@@ -211,18 +233,3 @@ def menu_close(
     global current_menu
     current_menu = WeakPointer()
     drawn_mods.clear()
-
-
-def open_lobby_mods_menu(frontend: WillowGFxMenuFrontend) -> None:
-    """
-    Opens the multiplayer lobby-based mods menu.
-
-    Args:
-        frontend: The frontend movie to open under.
-    """
-    block_search_delegate.enable()
-    init_content.enable()
-    play_sound.enable()
-    menu_close.enable()
-
-    frontend.OpenMP()

src/willow1_mod_menu/options.py

@@ -10,33 +10,61 @@
 
 from mods_base import Mod, NestedOption, hook, html_to_plain_text
 
+from .lobby import open_lobby_mods_menu
 from .util import find_focused_item
 
 if TYPE_CHECKING:
     from .populators import Populator
     from .util import WillowGFxMenu
 
 CUSTOM_OPTIONS_MENU_TAG = "willow1-mod-menu:custom-option"
-RE_SELECTED_IDX = re.compile(r"^_level\d+\.menu\.selections\.mMenu\.mList\.item(\d+)$")
+RE_SELECTED_IDX = re.compile(r"^_level\d+\.(menu\.selections|content)\.mMenu\.mList\.item(\d+)$")
 
 populator_stack: list[Populator] = []
 
 
+def create_mod_list_options_menu(menu: WillowGFxMenu) -> None:
+    """
+    Creates a new menu holding the full mods list.
+
+    Args:
+        menu: The current menu to create the new one under.
+    """
+    populator_stack.append(ModListPopulator("Mods"))
+    open_new_generic_menu(menu)
+
+
 def create_mod_options_menu(menu: WillowGFxMenu, mod: Mod) -> None:
-    populator_stack.append(OptionPopulator(mod.name, mod.options))
+    """
+    Creates a new menu holding a single mod's options.
+
+    Args:
+        menu: The current menu to create the new one under.
+        mod: The mod to create the options menu for.
+    """
+    populator_stack.append(ModOptionPopulator(mod.name, mod.options, mod))
     open_new_generic_menu(menu)
 
 
 def create_nested_options_menu(menu: WillowGFxMenu, option: NestedOption) -> None:
+    """
+    Creates a new menu holding a nested option's children.
+
+    Args:
+        menu: The current menu to create the new one under.
+        option: The options whose children to create a menu for.
+    """
     populator_stack.append(OptionPopulator(option.display_name, option.children))
     open_new_generic_menu(menu)
 
 
+# ==================================================================================================
+
 # Avoid circular imports
+from .populators.mod_list import ModListPopulator  # noqa: E402
+from .populators.mod_options import ModOptionPopulator  # noqa: E402
 from .populators.options import OptionPopulator  # noqa: E402
 
-# ==================================================================================================
-
 
 def open_new_generic_menu(menu: WillowGFxMenu) -> None:
     if len(populator_stack) == 1:
@@ -82,7 +110,7 @@ def get_selected_idx(menu: WillowGFxMenu) -> int | None:
         return None
 
     try:
-        return int(match.group(1))
+        return int(match.group(2))
     except ValueError:
         return None
 
@@ -145,15 +173,19 @@ def generic_screen_deactivate(
     _ret: Any,
     _func: BoundFunction,
 ) -> None:
-    if obj.MenuTag == CUSTOM_OPTIONS_MENU_TAG:
-        populator_stack.pop()
-        # TODO: save mod settings
+    if obj.MenuTag == CUSTOM_OPTIONS_MENU_TAG and populator_stack:
+        last_populator = populator_stack.pop()
+        if isinstance(last_populator, ModOptionPopulator):
+            last_populator.mod.save_settings()
 
     if not populator_stack:
         custom_menu_activate.disable()
         custom_menu_spinner_change.disable()
         custom_menu_slider_change.disable()
 
+        if (owner := obj.MenuOwner).Class.Name == "WillowGFxMenuFrontend":
+            open_lobby_mods_menu(owner)
+
 
 # ==================================================================================================
 # experimental

src/willow1_mod_menu/pause.py

@@ -1,11 +1,13 @@
-# ruff: noqa: D103, T201, TD002, TD003, TD004, TD005, FIX002
+# ruff: noqa: D103
 from typing import Any
 
 from unrealsdk.hooks import Block, Type
 from unrealsdk.unreal import BoundFunction, UObject, WrappedStruct
 
 from mods_base import hook
 
+from .options import create_mod_list_options_menu
+
 MODS_MENU_TAG = "willow1-mod-menu:mods-pause"
 
 
@@ -41,9 +43,14 @@ def open_pause_post(*_: Any) -> None:
 
 
 @hook("WillowGame.WillowGFxMenuPause:extMainDebug", immediately_enable=True)
-def pause_activate(*_: Any) -> type[Block]:
+def pause_activate(
+    obj: UObject,
+    _args: WrappedStruct,
+    _ret: Any,
+    _func: BoundFunction,
+) -> type[Block]:
     # We don't seem to be able to open the multiplayer lobby menu from in game - even if we force
     # load it's definition - so instead just open a standard options list showing each mod
-    print("OPEN SIMPLE MODS MENU")  # TODO
+    create_mod_list_options_menu(obj)
 
     return Block

src/willow1_mod_menu/populators/mod_list.py

@@ -0,0 +1,36 @@
+from dataclasses import dataclass
+from types import EllipsisType
+from typing import override
+
+from mods_base import JSON, BaseOption, get_ordered_mod_list, html_to_plain_text
+from willow1_mod_menu.options import create_mod_options_menu
+
+from . import Populator, WillowGFxLobbyTools, WillowGFxMenu
+
+
+@dataclass
+class ModProxyOption(BaseOption):
+    @override
+    def _to_json(self) -> EllipsisType:
+        return ...
+
+    @override
+    def _from_json(self, value: JSON) -> None:
+        pass
+
+
+@dataclass
+class ModListPopulator(Populator):
+    @override
+    def populate(self, tools: WillowGFxLobbyTools) -> None:
+        self.drawn_options.clear()
+
+        for mod in get_ordered_mod_list():
+            opt = ModProxyOption(mod.name)
+            opt.mod = mod
+            self.draw_text(tools, html_to_plain_text(mod.name), opt)
+
+    @override
+    def handle_activate(self, menu: WillowGFxMenu, option: BaseOption) -> None:
+        assert option.mod is not None
+        create_mod_options_menu(menu, option.mod)

src/willow1_mod_menu/populators/mod_options.py

@@ -0,0 +1,10 @@
+from dataclasses import dataclass
+
+from mods_base import Mod
+
+from .options import OptionPopulator
+
+
+@dataclass
+class ModOptionPopulator(OptionPopulator):
+    mod: Mod