fix spinner changes

the previous change to fix spinners broke this one :/

`.Value` is some sort of common getter, but it's invalid when trying to get on the next tick. it forwards to `.mValue` or `.mChoice` - so we now check each

Author: apple1417

src/willow1_mod_menu/options.py

@@ -191,7 +191,7 @@ def get_selected_idx(menu: WillowGFxMenu) -> int | None:
         return None
 
 
-slider_spinner_next_tick_info: tuple[WeakPointer, str, Populator, int] | None = None
+slider_next_tick_info: tuple[WeakPointer, str, Populator, int] | None = None
 
 
 # Similarly to the lobby menu, we need to use sounds to detect when you click an option/adjust a
@@ -217,42 +217,52 @@ def play_sound(
         populator.on_activate(obj, idx)
         return
 
+    # The same sound is used for both sliders and spinners.
+    # This variable is only defined on spinners, so should be NaN if we've selected a slider.
+    choice: float = obj.GetVariableNumber((focused := find_focused_item(obj)) + ".mChoice")
+    if math.isfinite(choice):
+        # It's a spinner
+        populator.on_spinner_change(obj, idx, int(choice))
+        return
+
+    # It's a slider.
     # Sliders have the same problem as in the lobby movie, for kb input they plays the sound after
     # updating the value, and we could run our callbacks here, but for mouse input they play the
-    # sound before. Wait for next tick before updating.
+    # sound before.
+    # Save a bunch of data we already have, then wait for next tick.
 
-    # Save a bunch of data we already have
-    global slider_spinner_next_tick_info
-    slider_spinner_next_tick_info = (
+    global slider_next_tick_info
+    slider_next_tick_info = (
         WeakPointer(obj),
-        find_focused_item(obj) + ".mValue",
+        focused + ".mValue",
         populator,
         idx,
     )
 
-    slider_spinner_next_tick.enable()
+    slider_next_tick.enable()
 
 
 @hook("WillowGame.WillowUIInteraction:TickImp")
-def slider_spinner_next_tick(*_: Any) -> None:
-    slider_spinner_next_tick.disable()
+def slider_next_tick(*_: Any) -> None:
+    slider_next_tick.disable()
 
-    global slider_spinner_next_tick_info
-    if slider_spinner_next_tick_info is None:
+    global slider_next_tick_info
+    if slider_next_tick_info is None:
         return
-    weak_menu, path, populator, idx = slider_spinner_next_tick_info
-    slider_spinner_next_tick_info = None
+    weak_menu, path, populator, idx = slider_next_tick_info
+    slider_next_tick_info = None
 
     if (menu := weak_menu()) is None:
         return
     value = menu.GetVariableNumber(path)
 
-    if math.isnan(value):
-        # We really don't want to set an option's value to NaN since it becomes essentially
-        # unrecoverable without manually editing settings
-        logging.error("Got NaN after changing spinner/slide!")
+    if not math.isfinite(value):
+        # If something's become invalid, we'll have gotten a NaN back. We really don't want to set
+        # an option's value to NaN or inf, since it becomes essentially unrecoverable without
+        # manually editing settings
+        logging.error(f"Got {value} after changing spinner/slider!")
     else:
-        populator.on_slider_spinner_change(menu, idx, value)
+        populator.on_slider_change(menu, idx, value)
 
 
 @hook("WillowGame.WillowGFxMenuScreenGeneric:Screen_Deactivate", immediately_enable=True)

src/willow1_mod_menu/populators/__init__.py

@@ -182,14 +182,14 @@ def on_activate(self, menu: WillowGFxMenu, idx: int) -> None:
 
         self.handle_activate(menu, option)
 
-    def on_slider_spinner_change(self, menu: WillowGFxMenu, idx: int, value: float) -> None:
+    def on_spinner_change(self, menu: WillowGFxMenu, idx: int, choice_idx: int) -> None:
         """
-        Handles a raw slider or spinner change event.
+        Handles a raw spinner change.
 
         Args:
             menu: The currently open menu.
             idx: The index of the item which was activated.
-            value: The option's new value.
+            choice_idx: The newly selected choice's index.
         """
         _ = menu
         try:
@@ -200,25 +200,48 @@ def on_slider_spinner_change(self, menu: WillowGFxMenu, idx: int, value: float)
 
         match option:
             case BoolOption():
-                option.value = bool(value)
+                option.value = bool(choice_idx)
             case DropdownOption() | SpinnerOption():
-                option.value = option.choices[int(value)]
-            case SliderOption():
-                if option.is_integer:
-                    value = round(value)
-                option.value = value
-
-                menu.SetVariableString(
-                    find_focused_item(menu) + ".mLabel.text",
-                    self.format_slider_label(option),
-                )
-
+                option.value = option.choices[choice_idx]
             case _:
                 logging.error(
-                    f"Option '{option.identifier}' of unknown type {type(option)} unexpectedly got"
-                    f" a slider/spinner change event",
+                    f"Option '{option.identifier}' got a spinner change event despite not being a"
+                    " spinner",
                 )
 
+    def on_slider_change(self, menu: WillowGFxMenu, idx: int, value: float) -> None:
+        """
+        Handles a raw slider change.
+
+        Args:
+            menu: The currently open menu.
+            idx: The index of the item which was activated.
+            value: The new value of the slider.
+        """
+        _ = menu
+        try:
+            option = self.drawn_options[idx]
+        except IndexError:
+            logging.error(f"Can't find option which was changed at index {idx}")
+            return
+
+        if not isinstance(option, SliderOption):
+            logging.error(
+                f"Option '{option.identifier}' got a spinner change event despite not being a"
+                " spinner",
+            )
+            return
+
+        if option.is_integer:
+            value = round(value)
+
+        option.value = value
+
+        menu.SetVariableString(
+            find_focused_item(menu) + ".mLabel.text",
+            self.format_slider_label(option),
+        )
+
     def draw_keybind(
         self,
         kb_frame: WillowGFxMenuScreenFrameKeyBinds,