Refactor states.menu_pos and remove reset_menu_position
(cherry picked from commit fbe8035c43
)
This commit is contained in:
parent
d01f9ec1f1
commit
fa3e1e4450
@ -1720,7 +1720,6 @@ label ag_st_imperio_E5:
|
|||||||
"\"You're nothing more than a whore!\"":
|
"\"You're nothing more than a whore!\"":
|
||||||
ton @ hair horny "Yes!" ("mad", "base", "worried", "mid")
|
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")
|
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")
|
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")
|
gen "Good, you're doing this for yourself, and nobody else..." ("base", xpos="far_left", ypos="head")
|
||||||
|
@ -14,8 +14,6 @@ label summon_astoria:
|
|||||||
|
|
||||||
label astoria_requests:
|
label astoria_requests:
|
||||||
|
|
||||||
# Reset
|
|
||||||
call reset_menu_position
|
|
||||||
ast "" (xpos="base",ypos="base")
|
ast "" (xpos="base",ypos="base")
|
||||||
|
|
||||||
menu:
|
menu:
|
||||||
@ -28,7 +26,7 @@ label summon_astoria:
|
|||||||
call astoria_chitchat
|
call astoria_chitchat
|
||||||
jump astoria_talk
|
jump astoria_talk
|
||||||
|
|
||||||
"-Sexual favours-" (icon="interface/icons/small/condom.webp"): # TODO: add 'if states.ast.favors_unlocked' once her story is looked over again
|
"-Sexual favours-" (icon="interface/icons/small/condom.webp"): # TODO: add 'if states.ast.favors_unlocked' once her story is looked over again
|
||||||
if states.ast.mood != 0:
|
if states.ast.mood != 0:
|
||||||
ast "I don't want to today..." ("annoyed", "narrow", "base", "R")
|
ast "I don't want to today..." ("annoyed", "narrow", "base", "R")
|
||||||
nar "Astoria is upset with you."
|
nar "Astoria is upset with you."
|
||||||
@ -284,7 +282,7 @@ label astoria_favor_menu:
|
|||||||
label .requests:
|
label .requests:
|
||||||
|
|
||||||
call not_available
|
call not_available
|
||||||
|
|
||||||
# $ result = show_events_menu(hermione_requests)
|
# $ result = show_events_menu(hermione_requests)
|
||||||
|
|
||||||
# if result in ("disabled", "noncompliant"):
|
# if result in ("disabled", "noncompliant"):
|
||||||
@ -313,4 +311,4 @@ label astoria_favor_menu:
|
|||||||
$ result.start()
|
$ result.start()
|
||||||
|
|
||||||
"-Never mind-":
|
"-Never mind-":
|
||||||
jump astoria_requests
|
jump astoria_requests
|
||||||
|
@ -147,8 +147,6 @@ label cc_ht_talk:
|
|||||||
call cho_chibi("stand", "mid", "base")
|
call cho_chibi("stand", "mid", "base")
|
||||||
call gen_chibi("sit_behind_desk")
|
call gen_chibi("sit_behind_desk")
|
||||||
|
|
||||||
call reset_menu_position
|
|
||||||
|
|
||||||
hide screen blkfade
|
hide screen blkfade
|
||||||
cho "" ("base", "base", "base", "mid", xpos="base", ypos="base", trans=fade)
|
cho "" ("base", "base", "base", "mid", xpos="base", ypos="base", trans=fade)
|
||||||
|
|
||||||
|
@ -398,8 +398,6 @@ label cho_training:
|
|||||||
call cho_chibi("stand", "mid", "base")
|
call cho_chibi("stand", "mid", "base")
|
||||||
call gen_chibi("sit_behind_desk")
|
call gen_chibi("sit_behind_desk")
|
||||||
|
|
||||||
call reset_menu_position
|
|
||||||
|
|
||||||
hide screen blkfade
|
hide screen blkfade
|
||||||
cho "" ("base", "base", "base", "mid", xpos="base", ypos="base", trans=fade)
|
cho "" ("base", "base", "base", "mid", xpos="base", ypos="base", trans=fade)
|
||||||
jump cho_requests
|
jump cho_requests
|
||||||
|
@ -32,8 +32,6 @@ label summon_cho:
|
|||||||
|
|
||||||
label cho_requests:
|
label cho_requests:
|
||||||
|
|
||||||
# Reset
|
|
||||||
call reset_menu_position
|
|
||||||
cho "" (xpos="base", ypos="base")
|
cho "" (xpos="base", ypos="base")
|
||||||
|
|
||||||
menu:
|
menu:
|
||||||
@ -195,4 +193,3 @@ label cho_favor_menu:
|
|||||||
label not_available:
|
label not_available:
|
||||||
$ TBA_message("This feature is currently not available as of version %s." % config.version)
|
$ TBA_message("This feature is currently not available as of version %s." % config.version)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
@ -4,8 +4,6 @@
|
|||||||
|
|
||||||
label hg_pf_look_at_ass: #LV.3 (Whoring = 9 - 11)
|
label hg_pf_look_at_ass: #LV.3 (Whoring = 9 - 11)
|
||||||
|
|
||||||
call reset_menu_position
|
|
||||||
|
|
||||||
if hg_pf_look_at_ass.points == 0:
|
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")
|
gen "{size=-4}(I feel like checking out that ass.){/size}" ("base", xpos="far_left", ypos="head")
|
||||||
else:
|
else:
|
||||||
|
@ -18,8 +18,6 @@ label summon_hermione:
|
|||||||
|
|
||||||
label hermione_requests:
|
label hermione_requests:
|
||||||
|
|
||||||
# Reset
|
|
||||||
call reset_menu_position
|
|
||||||
her "" (xpos="base",ypos="base")
|
her "" (xpos="base",ypos="base")
|
||||||
|
|
||||||
menu:
|
menu:
|
||||||
@ -262,7 +260,7 @@ label hermione_favor_menu:
|
|||||||
gen "Are you sure it's not within your house best interests?" ("base", xpos="far_left", ypos="head")
|
gen "Are you sure it's not within your house best interests?" ("base", xpos="far_left", ypos="head")
|
||||||
her "What do you mean?" ("soft", "happy", "base", "mid")
|
her "What do you mean?" ("soft", "happy", "base", "mid")
|
||||||
gen "Think about the future..." ("grin", xpos="far_left", ypos="head")
|
gen "Think about the future..." ("grin", xpos="far_left", ypos="head")
|
||||||
|
|
||||||
label .convinced:
|
label .convinced:
|
||||||
|
|
||||||
if states.her.level >=20:
|
if states.her.level >=20:
|
||||||
|
@ -22,8 +22,6 @@ label summon_luna:
|
|||||||
|
|
||||||
label luna_requests:
|
label luna_requests:
|
||||||
|
|
||||||
# Reset
|
|
||||||
call reset_menu_position
|
|
||||||
lun "" (xpos="base",ypos="base")
|
lun "" (xpos="base",ypos="base")
|
||||||
|
|
||||||
menu:
|
menu:
|
||||||
@ -150,7 +148,7 @@ label luna_favor_menu:
|
|||||||
label .requests:
|
label .requests:
|
||||||
|
|
||||||
call not_available
|
call not_available
|
||||||
|
|
||||||
# $ result = show_events_menu(hermione_requests)
|
# $ result = show_events_menu(hermione_requests)
|
||||||
|
|
||||||
# if result in ("disabled", "noncompliant"):
|
# if result in ("disabled", "noncompliant"):
|
||||||
|
@ -18,8 +18,6 @@ label summon_tonks:
|
|||||||
|
|
||||||
label tonks_requests:
|
label tonks_requests:
|
||||||
|
|
||||||
# Reset
|
|
||||||
call reset_menu_position
|
|
||||||
ton "" (xpos="base",ypos="base")
|
ton "" (xpos="base",ypos="base")
|
||||||
|
|
||||||
menu:
|
menu:
|
||||||
|
@ -3,7 +3,6 @@ default states.active_girl = None
|
|||||||
default states.last_girl = None
|
default states.last_girl = None
|
||||||
|
|
||||||
default states.room = "main_room"
|
default states.room = "main_room"
|
||||||
default states.menu_pos = (0.5, 0.5)
|
|
||||||
|
|
||||||
default states.map.unlocked = False
|
default states.map.unlocked = False
|
||||||
default states.map.seventh_floor.unlocked = False
|
default states.map.seventh_floor.unlocked = False
|
||||||
|
@ -153,7 +153,7 @@ style quick_alt_button_text:
|
|||||||
#
|
#
|
||||||
# https://www.renpy.org/doc/html/screen_special.html#choice
|
# https://www.renpy.org/doc/html/screen_special.html#choice
|
||||||
|
|
||||||
screen choice(items):
|
screen choice(items, menu_align=(.5, .6)):
|
||||||
tag menu
|
tag menu
|
||||||
modal True
|
modal True
|
||||||
zorder 30
|
zorder 30
|
||||||
@ -169,7 +169,7 @@ screen choice(items):
|
|||||||
|
|
||||||
window at fade_show_hide(0.15):
|
window at fade_show_hide(0.15):
|
||||||
style "empty"
|
style "empty"
|
||||||
align states.menu_pos
|
align menu_align
|
||||||
|
|
||||||
vbox:
|
vbox:
|
||||||
spacing 0
|
spacing 0
|
||||||
|
@ -210,14 +210,10 @@ label letter(text, lbl):
|
|||||||
show screen letter(text)
|
show screen letter(text)
|
||||||
with d3
|
with d3
|
||||||
|
|
||||||
$ states.menu_pos = (0.5, 0.9)
|
menu (menu_align=(.5, .9)):
|
||||||
|
|
||||||
menu:
|
|
||||||
"-Done reading-":
|
"-Done reading-":
|
||||||
pass
|
pass
|
||||||
|
|
||||||
call reset_menu_position
|
|
||||||
|
|
||||||
hide screen letter
|
hide screen letter
|
||||||
hide screen blktone
|
hide screen blktone
|
||||||
hide screen bld1
|
hide screen bld1
|
||||||
|
@ -55,7 +55,6 @@ screen main_room():
|
|||||||
|
|
||||||
label main_room:
|
label main_room:
|
||||||
call room("main_room", stop_sound=False)
|
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_walk(action="enter", xpos="desk", ypos="base", speed=1.5)
|
||||||
call gen_chibi("sit_behind_desk")
|
call gen_chibi("sit_behind_desk")
|
||||||
with d3
|
with d3
|
||||||
@ -71,8 +70,6 @@ label main_room_menu:
|
|||||||
hide screen bld1
|
hide screen bld1
|
||||||
with d3
|
with d3
|
||||||
|
|
||||||
call reset_menu_position
|
|
||||||
|
|
||||||
if game.daytime:
|
if game.daytime:
|
||||||
jump day_resume
|
jump day_resume
|
||||||
else:
|
else:
|
||||||
|
@ -29,7 +29,6 @@ screen seventh_floor():
|
|||||||
|
|
||||||
label seventh_floor:
|
label seventh_floor:
|
||||||
call room("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
|
play music "music/the-chamber-by-kevin-macleod.ogg" fadein 1 fadeout 3 if_changed
|
||||||
call gen_chibi("stand", -100, "base")
|
call gen_chibi("stand", -100, "base")
|
||||||
call gen_walk(xpos="left_mid", ypos="base", speed=1.5)
|
call gen_walk(xpos="left_mid", ypos="base", speed=1.5)
|
||||||
|
@ -11,13 +11,6 @@ label hide_characters:
|
|||||||
# Do not add transitions. Use one after return.
|
# Do not add transitions. Use one after return.
|
||||||
return
|
return
|
||||||
|
|
||||||
# Reset menu
|
|
||||||
label reset_menu_position:
|
|
||||||
|
|
||||||
$ states.menu_pos = (0.5, 0.6)
|
|
||||||
|
|
||||||
return
|
|
||||||
|
|
||||||
label bld(action=None):
|
label bld(action=None):
|
||||||
if action == "hide":
|
if action == "hide":
|
||||||
hide screen bld1
|
hide screen bld1
|
||||||
@ -90,13 +83,11 @@ label music_block:
|
|||||||
|
|
||||||
label unlock_clothing(text="", item="interface/icons/box_blue_1.webp"):
|
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 clothing_unlock(item)
|
||||||
show screen blktone
|
show screen blktone
|
||||||
with d3
|
with d3
|
||||||
|
|
||||||
menu:
|
menu (menu_align=(.5, .75)):
|
||||||
"[text]"
|
"[text]"
|
||||||
"-Done Reading-":
|
"-Done Reading-":
|
||||||
pass
|
pass
|
||||||
@ -107,8 +98,6 @@ label unlock_clothing(text="", item="interface/icons/box_blue_1.webp"):
|
|||||||
|
|
||||||
$ item.unlock()
|
$ item.unlock()
|
||||||
|
|
||||||
call reset_menu_position
|
|
||||||
|
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user