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)

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_yalign=0.7):
-            menu:
                 "\"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")
@@ -1720,7 +1719,6 @@ label ag_st_imperio_E5:
                 "\"You're nothing more than a whore!\"":
                     ton @ hair horny "Yes!" ("mad", "base", "worried", "mid")
                     ton @ hair horny "I'm nothing but a cheap,{w=0.6} {b}fucking{/b}{w=0.4} whore!" ("open_wide_tongue", "closed", "worried", "mid")
-            call reset_menu_position
 
             ton "... {w}This is what I want!" ("mad", "wide", "annoyed", "down")
             gen "Good, you're doing this for yourself, and nobody else..." ("base", xpos="far_left", ypos="head")

game/scripts/characters/astoria/summon.rpy

@@ -14,8 +14,6 @@ label summon_astoria:
 
     label astoria_requests:
 
-    # Reset
-    call reset_menu_position
     ast "" (xpos="base",ypos="base")
 
     menu:

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

@@ -147,8 +147,6 @@ label cc_ht_talk:
         call cho_chibi("stand", "mid", "base")
         call gen_chibi("sit_behind_desk")
 
-        call reset_menu_position
-
         hide screen blkfade
         cho "" ("base", "base", "base", "mid", xpos="base", ypos="base", trans=fade)
 

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

@@ -194,17 +194,16 @@ label cho_quid_E2:
     with d3
 
     # Tutorial menu
-    $ _selected = [False, False, False]
+    $ renpy.dynamic(__chosen1=set())
-    $ menu_y = 0.8
 
     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]:
+            "\"Fly in front of me.\"":
-                $ _selected[0] = True
                 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]:
+            "\"Fly above me.\"":
-                $ _selected[1] = True
                 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]:
+            "\"Fly close to me.\"":
-                $ _selected[2] = True
                 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]:
+        "\"Astoria\"" if states.ast.unlocked:
-            $ _selected[0] = True
-
             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]:
+        "\"Luna\"" if states.lun.unlocked:
-            $ _selected[1] = True
-
             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

@@ -398,8 +398,6 @@ label cho_training:
             call cho_chibi("stand", "mid", "base")
             call gen_chibi("sit_behind_desk")
 
-            call reset_menu_position
-
             hide screen blkfade
             cho "" ("base", "base", "base", "mid", xpos="base", ypos="base", trans=fade)
             jump cho_requests
@@ -414,9 +412,7 @@ label cho_tactics:
     call hide_characters
     call bld
 
-    $ menu_y = 0.74
+    menu (menu_yalign=.74):
-
-    menu:
         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/cho/summon.rpy

@@ -32,8 +32,6 @@ label summon_cho:
 
     label cho_requests:
 
-    # Reset
-    call reset_menu_position
     cho "" (xpos="base", ypos="base")
 
     menu:
@@ -195,4 +193,3 @@ label cho_favor_menu:
 label not_available:
     $ TBA_message("This feature is currently not available as of version %s." % config.version)
     return
-

game/scripts/characters/hermione/events/favors/hg_pf_T3a_look_at_ass_INCOMPLETE.txt

@@ -4,8 +4,6 @@
 
 label hg_pf_look_at_ass: #LV.3 (Whoring = 9 - 11)
 
-    call reset_menu_position
-
     if hg_pf_look_at_ass.points == 0:
         gen "{size=-4}(I feel like checking out that ass.){/size}" ("base", xpos="far_left", ypos="head")
     else:

game/scripts/characters/hermione/summon.rpy

@@ -18,8 +18,6 @@ label summon_hermione:
 
     label hermione_requests:
 
-    # Reset
-    call reset_menu_position
     her "" (xpos="base",ypos="base")
 
     menu:

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",
+    elif action in (
-         "inspect_grope_vagina_naked", "inspect_lean_grope_breasts_naked", "inspect_lean_grope_vagina_naked"):
+        "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/luna/summon.rpy

@@ -22,8 +22,6 @@ label summon_luna:
 
     label luna_requests:
 
-    # Reset
-    call reset_menu_position
     lun "" (xpos="base",ypos="base")
 
     menu:

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")
 

game/scripts/characters/tonks/summon.rpy

@@ -18,8 +18,6 @@ label summon_tonks:
 
     label tonks_requests:
 
-    # Reset
-    call reset_menu_position
     ton "" (xpos="base",ypos="base")
 
     menu:

game/scripts/events/variables.rpy

@@ -3,7 +3,6 @@ default states.active_girl = None
 default states.last_girl = None
 
 default states.room = "main_room"
-default states.menu_pos = (0.5, 0.5)
 
 default states.map.unlocked = False
 default states.map.seventh_floor.unlocked = False

game/scripts/gui/say.rpy

@@ -122,7 +122,7 @@ style quick_button_text is default:
 #
 # https://www.renpy.org/doc/html/screen_special.html#choice
 
-screen choice(items):
+screen choice(items, menu_yalign=.6):
     tag menu
     modal True
     zorder 30
@@ -138,7 +138,7 @@ screen choice(items):
 
     window at fade_show_hide(0.15):
         style "empty"
-        align states.menu_pos
+        yalign menu_yalign
 
         vbox:
             spacing 0

game/scripts/interface/letter.rpy

@@ -210,14 +210,10 @@ label letter(text, lbl):
     show screen letter(text)
     with d3
 
-    $ states.menu_pos = (0.5, 0.9)
+    menu (menu_yalign=.9):
-
-    menu:
         "-Done reading-":
             pass
 
-    call reset_menu_position
-
     hide screen letter
     hide screen blktone
     hide screen bld1

game/scripts/rooms/main_room/init.rpy

@@ -55,7 +55,6 @@ screen main_room():
 
 label main_room:
     call room("main_room", stop_sound=False)
-    call reset_menu_position
     call gen_walk(action="enter", xpos="desk", ypos="base", speed=1.5)
     call gen_chibi("sit_behind_desk")
     with d3
@@ -71,8 +70,6 @@ label main_room_menu:
     hide screen bld1
     with d3
 
-    call reset_menu_position
-
     if game.daytime:
         jump day_resume
     else:

game/scripts/rooms/seventh_floor/init.rpy

@@ -29,7 +29,6 @@ screen seventh_floor():
 
 label seventh_floor:
     call room("seventh_floor")
-    call reset_menu_position
     play music "music/the-chamber-by-kevin-macleod.ogg" fadein 1 fadeout 3 if_changed
     call gen_chibi("stand", -100, "base")
     call gen_walk(xpos="left_mid", ypos="base", speed=1.5)

game/scripts/utility/common_labels.rpy

@@ -11,13 +11,6 @@ label hide_characters:
     # Do not add transitions. Use one after return.
     return
 
-# Reset menu
-label reset_menu_position:
-
-    $ states.menu_pos = (0.5, 0.6)
-
-    return
-
 label bld(action=None):
     if action == "hide":
         hide screen bld1
@@ -90,13 +83,11 @@ label music_block:
 
 label unlock_clothing(text="", item="interface/icons/box_blue_1.webp"):
 
-    $ states.menu_pos = (0.5, 0.75)
-
     show screen clothing_unlock(item)
     show screen blktone
     with d3
 
-    menu:
+    menu (menu_yalign=.75):
         "[text]"
         "-Done Reading-":
             pass
@@ -107,8 +98,6 @@ label unlock_clothing(text="", item="interface/icons/box_blue_1.webp"):
 
     $ item.unlock()
 
-    call reset_menu_position
-
     return