Re-enable some menu yaligns and reimplement menu sets

these menu yaligns had been disabled for a long time (the menu_y variable was never read)

(cherry picked from commit eae844ef0b)

game/scripts/characters/astoria/events/spells/imperio_tonks.rpy

@@ -1709,8 +1709,7 @@ label ag_st_imperio_E5:
             ton "I..." ("open", "base", "worried", "down")
             gen "Say it!" ("angry", xpos="far_left", ypos="head")
 
-            $ menu_y = 0.7
-            menu:
+            menu (menu_yalign=0.7):
                 "\"You're a selfish slut!\"":
                     ton @ hair horny "Yes!" ("mad", "wide", "shocked", "stare")
                     ton @ hair horny "I'm a selfish slut!" ("open_wide_tongue", "closed", "worried", "mid")

game/scripts/characters/cho/events/quidditch/intros.rpy

@@ -194,17 +194,16 @@ label cho_quid_E2:
     with d3
 
     # Tutorial menu
-    $ _selected = [False, False, False]
-    $ menu_y = 0.8
+    $ renpy.dynamic(__chosen1=set())
 
     label .choices:
 
-    if not all(x == True for x in _selected): # Has selected every position once? Loop if the answer is no.
+    if len(__chosen1) < 3: # needed because of the bld
         call bld
-        menu:
+        menu (menu_yalign=.8):
+            set __chosen1
             gen "Could you..." ("base", xpos="far_left", ypos="head")
-            "\"Fly in front of me.\"" if not _selected[0]:
-                $ _selected[0] = True
+            "\"Fly in front of me.\"":
                 call bld("hide")
 
                 if not cho_chibi.action == "fly":
@@ -224,8 +223,7 @@ label cho_quid_E2:
 
                 jump cho_quid_E2.choices
 
-            "\"Fly above me.\"" if not _selected[1]:
-                $ _selected[1] = True
+            "\"Fly above me.\"":
                 call bld("hide")
 
                 if not cho_chibi.action == "fly":
@@ -239,8 +237,7 @@ label cho_quid_E2:
 
                 jump cho_quid_E2.choices
 
-            "\"Fly close to me.\"" if not _selected[2]:
-                $ _selected[2] = True
+            "\"Fly close to me.\"":
                 call bld("hide")
 
                 if not cho_chibi.action == "fly":
@@ -254,8 +251,6 @@ label cho_quid_E2:
                 cho "..." ("soft", "narrow", "raised", "mid", ypos="head", flip=False)
 
                 jump cho_quid_E2.choices
-    else:
-        pass
 
     gen "That should be enough..." ("base", xpos="far_left", ypos="head")
     gen "I presume you're able to hold these positions during movement?" ("base", xpos="far_left", ypos="head")
@@ -323,17 +318,16 @@ label cho_quid_E3:
     cho "No... Someone has to announce the points after all." ("annoyed", "narrow", "base", "mid")
     gen "I see..." ("base", xpos="far_left", ypos="head")
 
-    $ _selected = [False, False]
+    $ renpy.dynamic(__chosen2=set())
 
     label .choices:
     menu:
+        set __chosen2
         gen "How about we ask..." ("base", xpos="far_left", ypos="head")
         "\"Hermione\"":
             pass
 
-        "\"Astoria\"" if states.ast.unlocked and not _selected[0]:
-            $ _selected[0] = True
-
+        "\"Astoria\"" if states.ast.unlocked:
             cho "That mischievous little..." ("clench", "wide", "raised", "mid")
             cho "Not a chance!" ("open", "closed", "angry", "mid")
             cho "Besides, [name_genie_cho]. Did you forget that she's a Slytherin?" ("open", "narrow", "angry", "mid")
@@ -342,9 +336,7 @@ label cho_quid_E3:
 
             jump cho_quid_E3.choices
 
-        "\"Luna\"" if states.lun.unlocked and not _selected[1]:
-            $ _selected[1] = True
-
+        "\"Luna\"" if states.lun.unlocked:
             cho "Luna? Luna Lovegood, [name_genie_cho]?" ("open", "narrow", "raised", "mid")
             gen "Yes?" ("base", xpos="far_left", ypos="head")
             cho "Surely{w=0.3}, nobody in their right mind would let Luna Lovegood commentate." ("grin", "happyCl", "base", "mid") # Book quote.

game/scripts/characters/cho/events/quidditch/training.rpy

@@ -412,9 +412,7 @@ label cho_tactics:
     call hide_characters
     call bld
 
-    $ menu_y = 0.74
-
-    menu:
+    menu (menu_yalign=.74):
         gen "(What directions should I give her?)" ("base", xpos="far_left", ypos="head")
         "\"Fly in front of me.\"" if states.cho.ev.quidditch.position != "front":
             jump cho_tactics.change_front

game/scripts/characters/luna/chibi.rpy

@@ -100,15 +100,16 @@ label lun_chibi_scene(action="reset", xpos="mid", ypos="base"):
         $ chair_left_OBJ.hidden = True
 
     if action == "reset":
-        $ menu_y = 0.5
         call lun_chibi("stand", xpos, ypos)
         call gen_chibi("sit_behind_desk")
 
     elif action in ("sit_on_lap", "sit_on_lap_grope"):
         show screen luna_chibi_scene("ch_lun_scene " + action, pos=(218, 205))
 
-    elif action in ("inspect_idle", "inspect_idle_naked", "inspect_lean_idle_naked", "inspect_grope_breasts_naked",
-         "inspect_grope_vagina_naked", "inspect_lean_grope_breasts_naked", "inspect_lean_grope_vagina_naked"):
+    elif action in (
+        "inspect_idle", "inspect_idle_naked", "inspect_lean_idle_naked", "inspect_grope_breasts_naked",
+        "inspect_grope_vagina_naked", "inspect_lean_grope_breasts_naked", "inspect_lean_grope_vagina_naked"
+    ):
         show screen luna_chibi_scene("ch_lun_scene " + action, pos=(218, 205))
 
     return

game/scripts/characters/tonks/chibi.rpy

@@ -157,10 +157,7 @@ label ton_chibi_scene(action="reset", xpos="mid", ypos="base", trans=None):
     call ton_chibi("hide")
     call gen_chibi("hide")
 
-    $ menu_y = 0.75
-
     if action == "reset":
-        $ menu_y = 0.5
         call ton_chibi("stand", xpos, ypos)
         call gen_chibi("sit_behind_desk")