SilverStudioGames/WTS
SilverStudioGames/WTS
2
0
Fork 1
Code Issues Pull Requests Wiki Activity

Re-enable some menu yaligns and reimplement menu sets

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
game/scripts/characters/astoria/events/spells/imperio_tonks.rpy
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")

42
game/scripts/characters/cho/events/quidditch/intros.rpy
View File

File diff suppressed because it is too large Load Diff

4
game/scripts/characters/cho/events/quidditch/training.rpy
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

7
game/scripts/characters/luna/chibi.rpy
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

3
game/scripts/characters/tonks/chibi.rpy
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")