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)
This commit is contained in:
Gouvernathor 2023-11-16 02:12:22 +01:00 committed by LoafyLemon
parent 84f3473bf0
commit 675839d28e
5 changed files with 23 additions and 36 deletions

View File

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

View File

@ -194,17 +194,16 @@ label cho_quid_E2:
with d3 with d3
# Tutorial menu # Tutorial menu
$ _selected = [False, False, False] $ renpy.dynamic(__chosen1=set())
$ menu_y = 0.8
label .choices: 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 call bld
menu: menu (menu_yalign=.8):
set __chosen1
gen "Could you..." ("base", xpos="far_left", ypos="head") 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") call bld("hide")
if not cho_chibi.action == "fly": if not cho_chibi.action == "fly":
@ -224,8 +223,7 @@ label cho_quid_E2:
jump cho_quid_E2.choices jump cho_quid_E2.choices
"\"Fly above me.\"" if not _selected[1]: "\"Fly above me.\"":
$ _selected[1] = True
call bld("hide") call bld("hide")
if not cho_chibi.action == "fly": if not cho_chibi.action == "fly":
@ -239,8 +237,7 @@ label cho_quid_E2:
jump cho_quid_E2.choices jump cho_quid_E2.choices
"\"Fly close to me.\"" if not _selected[2]: "\"Fly close to me.\"":
$ _selected[2] = True
call bld("hide") call bld("hide")
if not cho_chibi.action == "fly": if not cho_chibi.action == "fly":
@ -254,8 +251,6 @@ label cho_quid_E2:
cho "..." ("soft", "narrow", "raised", "mid", ypos="head", flip=False) cho "..." ("soft", "narrow", "raised", "mid", ypos="head", flip=False)
jump cho_quid_E2.choices jump cho_quid_E2.choices
else:
pass
gen "That should be enough..." ("base", xpos="far_left", ypos="head") 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") 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") cho "No... Someone has to announce the points after all." ("annoyed", "narrow", "base", "mid")
gen "I see..." ("base", xpos="far_left", ypos="head") gen "I see..." ("base", xpos="far_left", ypos="head")
$ _selected = [False, False] $ renpy.dynamic(__chosen2=set())
label .choices: label .choices:
menu: menu:
set __chosen2
gen "How about we ask..." ("base", xpos="far_left", ypos="head") gen "How about we ask..." ("base", xpos="far_left", ypos="head")
"\"Hermione\"": "\"Hermione\"":
pass 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 "That mischievous little..." ("clench", "wide", "raised", "mid")
cho "Not a chance!" ("open", "closed", "angry", "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") 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 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") cho "Luna? Luna Lovegood, [name_genie_cho]?" ("open", "narrow", "raised", "mid")
gen "Yes?" ("base", xpos="far_left", ypos="head") 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. cho "Surely{w=0.3}, nobody in their right mind would let Luna Lovegood commentate." ("grin", "happyCl", "base", "mid") # Book quote.

View File

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

View File

@ -100,15 +100,16 @@ label lun_chibi_scene(action="reset", xpos="mid", ypos="base"):
$ chair_left_OBJ.hidden = True $ chair_left_OBJ.hidden = True
if action == "reset": if action == "reset":
$ menu_y = 0.5
call lun_chibi("stand", xpos, ypos) call lun_chibi("stand", xpos, ypos)
call gen_chibi("sit_behind_desk") call gen_chibi("sit_behind_desk")
elif action in ("sit_on_lap", "sit_on_lap_grope"): elif action in ("sit_on_lap", "sit_on_lap_grope"):
show screen luna_chibi_scene("ch_lun_scene " + action, pos=(218, 205)) 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)) show screen luna_chibi_scene("ch_lun_scene " + action, pos=(218, 205))
return return

View File

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