Compare commits

..

No commits in common. "eae844ef0ba31c67b6c2ae5a5a5bd1e33da67b58" and "c3f753a460dda577fa3bad4724673b58c7956c92" have entirely different histories.

18 changed files with 83 additions and 32 deletions

View File

@ -1709,7 +1709,8 @@ label ag_st_imperio_E5:
ton "I..." ("open", "base", "worried", "down")
gen "Say it!" ("angry", xpos="far_left", ypos="head")
menu (menu_yalign=0.7):
$ menu_y = 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")
@ -1719,6 +1720,7 @@ 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")

View File

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

View File

@ -147,6 +147,8 @@ 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)

View File

@ -194,16 +194,17 @@ label cho_quid_E2:
with d3
# Tutorial menu
$ renpy.dynamic(__chosen1=set())
$ _selected = [False, False, False]
$ menu_y = 0.8
label .choices:
if len(__chosen1) < 3: # needed because of the bld
if not all(x == True for x in _selected): # Has selected every position once? Loop if the answer is no.
call bld
menu (menu_yalign=.8):
set __chosen1
menu:
gen "Could you..." ("base", xpos="far_left", ypos="head")
"\"Fly in front of me.\"":
"\"Fly in front of me.\"" if not _selected[0]:
$ _selected[0] = True
call bld("hide")
if not cho_chibi.action == "fly":
@ -223,7 +224,8 @@ label cho_quid_E2:
jump cho_quid_E2.choices
"\"Fly above me.\"":
"\"Fly above me.\"" if not _selected[1]:
$ _selected[1] = True
call bld("hide")
if not cho_chibi.action == "fly":
@ -237,7 +239,8 @@ label cho_quid_E2:
jump cho_quid_E2.choices
"\"Fly close to me.\"":
"\"Fly close to me.\"" if not _selected[2]:
$ _selected[2] = True
call bld("hide")
if not cho_chibi.action == "fly":
@ -251,6 +254,8 @@ 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")
@ -318,16 +323,17 @@ 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")
$ renpy.dynamic(__chosen2=set())
$ _selected = [False, False]
label .choices:
menu:
set __chosen2
gen "How about we ask..." ("base", xpos="far_left", ypos="head")
"\"Hermione\"":
pass
"\"Astoria\"" if states.ast.unlocked:
"\"Astoria\"" if states.ast.unlocked and not _selected[0]:
$ _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")
@ -336,7 +342,9 @@ label cho_quid_E3:
jump cho_quid_E3.choices
"\"Luna\"" if states.lun.unlocked:
"\"Luna\"" if states.lun.unlocked and not _selected[1]:
$ _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.

View File

@ -398,6 +398,8 @@ 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
@ -412,7 +414,9 @@ label cho_tactics:
call hide_characters
call bld
menu (menu_yalign=.74):
$ menu_y = 0.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

View File

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

View File

@ -4,6 +4,8 @@
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:

View File

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

View File

@ -100,16 +100,15 @@ 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

View File

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

View File

@ -157,7 +157,10 @@ 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")

View File

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

View File

@ -3,6 +3,7 @@ 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

View File

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

View File

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

View File

@ -55,6 +55,7 @@ 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
@ -70,6 +71,8 @@ label main_room_menu:
hide screen bld1
with d3
call reset_menu_position
if game.daytime:
jump day_resume
else:

View File

@ -29,6 +29,7 @@ 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)

View File

@ -11,6 +11,13 @@ 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
@ -83,11 +90,13 @@ 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_yalign=.75):
menu:
"[text]"
"-Done Reading-":
pass
@ -98,6 +107,8 @@ label unlock_clothing(text="", item="interface/icons/box_blue_1.webp"):
$ item.unlock()
call reset_menu_position
return