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

Replace redundant call label with a scene statement

Browse Source
This commit is contained in:
LoafyLemon 2024-05-16 15:13:23 +01:00
parent ac10302a69
commit 8f8b9f2f80
52 changed files with 198 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
game/scripts/characters/astoria/chibi.rpy
View File

@ -22,7 +22,7 @@ label ast_chibi(action=None, xpos=None, ypos=None, flip=False):
return
label ast_walk(xpos=None, ypos=None, speed=1.0, action=None, reduce=False, path=None, flip=False):
call hide_characters
scene onlayer dolls
hide screen bld1
hide screen blktone
with d3

4
game/scripts/characters/astoria/events/intro.rpy
View File

@ -91,7 +91,7 @@ label astoria_intro_E1:
pause.2
# Tonks walks over.
call hide_characters
scene onlayer dolls
hide screen bld1
show screen blkfade
with d3
@ -778,7 +778,7 @@ label astoria_intro_E3:
# Astoria leaves.
stop music fadeout 1
call hide_characters
scene onlayer dolls
call ast_chibi("stand","desk","base", flip=True)
hide screen bld1
with d3

26
game/scripts/characters/astoria/events/spells/imperio_susan.rpy
View File

File diff suppressed because it is too large Load Diff

38
game/scripts/characters/astoria/events/spells/imperio_tonks.rpy
View File

File diff suppressed because it is too large Load Diff

2
game/scripts/characters/cho/chibi.rpy
View File

@ -22,7 +22,7 @@ label cho_chibi(action=None, xpos=None, ypos=None, flip=False):
return
label cho_walk(xpos=None, ypos=None, speed=1.0, action=None, reduce=False, path=None, flip=False):
call hide_characters
scene onlayer dolls
hide screen bld1
hide screen blktone
with d3

16
game/scripts/characters/cho/events/favors/inspect_her_body_tier2.rpy
View File

@ -417,7 +417,7 @@ label cc_pf_strip_T2_intro_E2:
cho "Like I said, I'd go to any lengths just to please my trainer..." ("soft", "narrow", "base", "mid")
# Climbs desk.
call hide_characters
scene onlayer dolls
show screen blkfade
with d5
play sound "sounds/08_hop_on_desk.ogg"
@ -691,7 +691,7 @@ label cc_pf_strip_T2_intro_E2:
gen "That's great news, and hey..." ("base", xpos="far_left", ypos="head")
gen "If distracting doesn't work, you could just crush your opponents with those thighs of yours." ("base", xpos="far_left", ypos="head")
cho "That's true..." ("smile", "narrow", "base", "mid")
call hide_characters
scene onlayer dolls
hide screen bld1
show screen blkfade
with d5
@ -710,7 +710,7 @@ label cc_pf_strip_T2_intro_E2:
gen "I doubt you'll have any problems distracting anyone with a body like that." ("base", xpos="far_left", ypos="head")
gen "You're dismissed." ("base", xpos="far_left", ypos="head")
cho "Thank you, [name_genie_cho]." ("base", "happyCl", "base", "mid")
call hide_characters
scene onlayer dolls
hide screen bld1
with d3
pause .1
@ -865,7 +865,7 @@ label cc_pf_strip_T2_intro_E3:
gen "Aren't you scared that Snape might walk in on you too?" ("base", xpos="far_left", ypos="head")
cho "*Hmm*..." ("annoyed", "base", "base", "R")
call hide_characters
scene onlayer dolls
show screen blkfade
with d3
play sound "sounds/08_hop_on_desk.ogg"
@ -900,7 +900,7 @@ label cc_pf_strip_T2_intro_E3:
cho @ cheeks heavy_blush "What if Professor McGonagall stumbles in here while...{w} while I--" ("angry", "happyCl", "worried", "mid")
call hide_characters
scene onlayer dolls
show screen blkfade
with d3
pause 1.0
@ -1091,7 +1091,7 @@ label cc_pf_strip_T2_E3_repeat:
$ d_flag_01 = True
cho "Good idea, [name_genie_cho]!" ("base", "happyCl", "base", "mid")
call hide_characters
scene onlayer dolls
show screen blkfade
with d3
play sound "sounds/08_hop_on_desk.ogg"
@ -1106,7 +1106,7 @@ label cc_pf_strip_T2_E3_repeat:
cho "How is the view down there, Sir?" ("base", "narrow", "base", "down")
gen "Couldn't be any better!" ("grin", xpos="far_left", ypos="head")
call hide_characters
scene onlayer dolls
hide screen bld1
with d3
pause .2
@ -1129,7 +1129,7 @@ label cc_pf_strip_T2_E3_repeat:
cho "(...)" ("annoyed", "narrow", "angry", "L")
gen "(...)" ("base", xpos="far_left", ypos="head")
call hide_characters
scene onlayer dolls
hide screen bld1
with d3
pause .5

2
game/scripts/characters/cho/events/favors/inspect_her_body_tier2_hermione.rpy
View File

@ -241,7 +241,7 @@ label cc_pf_strip_T2_E3_hermione_choices:
call her_walk(action="leave")
# Cho stands close to your desk.
call hide_characters
scene onlayer dolls
show screen blkfade
call cho_chibi("stand", "desk", "base", flip=True)
with d3

34
game/scripts/characters/cho/events/favors/inspect_her_body_tier3.rpy
View File

File diff suppressed because it is too large Load Diff

12
game/scripts/characters/cho/events/favors/inspect_her_body_tier3_tonks.rpy
View File

@ -4,7 +4,7 @@
label cc_pf_strip_T3_tonks:
# Setup
call hide_characters
scene onlayer dolls
hide screen bld1
show screen blkfade
with d5
@ -66,7 +66,7 @@ label cc_pf_strip_T3_tonks:
cho "Yes, [name_genie_cho]." ("base", "base", "base", "mid")
stop music fadeout 1
call hide_characters
scene onlayer dolls
hide screen bld1
with d3
pause .2
@ -140,7 +140,7 @@ label cc_pf_strip_T3_tonks:
stop music fadeout 1
# Cho and Tonks hop onto the desk.
call hide_characters
scene onlayer dolls
hide screen bld1
with d3
pause .2
@ -205,7 +205,7 @@ label .strip_cho:
ton @ hair horny "Move between us, Cho." ("soft", "narrow", "shocked", "L")
ton @ hair horny "That way the headmaster can see you better." ("base", "narrow", "base", "mid")
cho @ cheeks blush "Yes, Professor." ("smile", "narrow", "base", "L")
call hide_characters
scene onlayer dolls
hide screen bld1
with d5
pause .2
@ -487,7 +487,7 @@ label .strip_tonks:
ton @ hair horny "I'd like to give the headmaster a better view of my body." ("base", "narrow", "base", "mid")
cho @ cheeks blush "Not at all, Professor." ("smile", "narrow", "base", "L")
ton @ hair horny "Thank you, [name_cho_tonks]." ("soft", "narrow", "shocked", "L")
call hide_characters
scene onlayer dolls
hide screen bld1
with d5
pause .2
@ -1389,7 +1389,7 @@ label .end_event:
# Fade to black.
stop music fadeout 1
call hide_characters
scene onlayer dolls
hide screen bld1
show screen blkfade
with d5

12
game/scripts/characters/cho/events/favors/talk_to_me.rpy
View File

@ -566,7 +566,7 @@ label cc_pf_talk_T1_E3:
gen "*Fuck!* {size=-4}(That did it!!!){/size}" ("angry", xpos="far_left", ypos="head")
# Genie cums.
call hide_characters
scene onlayer dolls
hide screen bld1
with d3
@ -583,7 +583,7 @@ label cc_pf_talk_T1_E3:
gen "{size=-4}(I bet you are so wet right now too!){/size}" ("angry", xpos="far_left", ypos="head")
# Genie finished.
call hide_characters
scene onlayer dolls
call gen_chibi("cum_behind_desk_done")
with d3
pause .8
@ -785,7 +785,7 @@ label cc_pf_talk_T2_intro_E1:
# Genie cums.
gen "{size=-4}(Yes! Yes!{w=0.6} It's coming!){/size}" ("angry", xpos="far_left", ypos="head")
call hide_characters
scene onlayer dolls
call cum_block
call gen_chibi("cum_behind_desk")
@ -993,7 +993,7 @@ label cc_pf_talk_T2_intro_E2:
# Genie cums.
gen "{size=-2}Yes, yes! You nasty slut!{/size}" ("angry", xpos="far_left", ypos="head")
call hide_characters
scene onlayer dolls
hide screen bld1
with d3
@ -1021,7 +1021,7 @@ label cc_pf_talk_T2_intro_E2:
gen "{size=-4}(I'm busted!){/size}" ("angry", xpos="far_left", ypos="head")
# Genie stops.
call hide_characters
scene onlayer dolls
hide screen bld1
with d3
pause .2
@ -1226,7 +1226,7 @@ label cc_pf_talk_T2_E3:
gen "*Fuck!* {size=-4}(Come on! Unload! Before it's too late!!!){/size}" ("angry", xpos="far_left", ypos="head")
# Genie cums.
call hide_characters
scene onlayer dolls
hide screen bld1
with d3

8
game/scripts/characters/cho/events/intro.rpy
View File

@ -188,7 +188,7 @@ label cho_intro_E1:
# Hermione walks in
stop music fadeout 1.0
call hide_characters
scene onlayer dolls
play sound "sounds/door.ogg"
call her_chibi("stand", "door", "base")
@ -224,7 +224,7 @@ label cho_intro_E1:
# Choice to start jerking off
menu:
"\"(I will jerk off a little while they talk.)\"":
call hide_characters
scene onlayer dolls
with d3
pause .2
@ -281,7 +281,7 @@ label cho_intro_E1:
gen "{size=-4}You fucking sluts!{/size}" ("angry", xpos="far_left", ypos="head")
# Genie cums
call hide_characters
scene onlayer dolls
with d3
call cum_block
@ -332,7 +332,7 @@ label cho_intro_E1:
gen "(I guess I'll just have to wait this one out...)" ("base", xpos="far_left", ypos="head")
# Black screen
call hide_characters
scene onlayer dolls
call blkfade
pause 2

2
game/scripts/characters/cho/events/quidditch/hufflepuff_match.rpy
View File

@ -84,7 +84,7 @@ label hufflepuff_match:
gen "Well... I wouldn't mind that." ("base", xpos="far_left", ypos="head")
sna "I'm sure you wouldn't..." ("snape_06")
sna "Good thing though is that we'll be able to bring a little something to keep us occupied." ("snape_20")
call hide_characters
scene onlayer dolls
with d3
# Show wine

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

@ -635,7 +635,7 @@ label cho_quid_E7:
her "[name_genie_hermione], you can't do this!" ("open", "base", "angry", "mid")
gen "Sure I can." ("grin", xpos="far_left", ypos="head")
call hide_characters
scene onlayer dolls
nar "You telepathically call Cho into your office."
if states.her.tier < 4: # Hermione changes into her school outfit

36
game/scripts/characters/cho/events/quidditch/slytherin_match.rpy
View File

File diff suppressed because it is too large Load Diff

4
game/scripts/characters/cho/events/quidditch/training.rpy
View File

@ -21,7 +21,7 @@ label cho_training:
# Setup
show screen blkfade
call hide_characters
scene onlayer dolls
with d5
$ cho_outfit_last.save()
@ -409,7 +409,7 @@ label cho_tactics:
# Menu
label .choices:
call hide_characters
scene onlayer dolls
call bld
menu (menu_yalign=.74):

2
game/scripts/characters/genie/chibi.rpy
View File

@ -77,7 +77,7 @@ label gen_chibi(action=None, xpos=None, ypos=None, flip=True, pic=None):
return
label gen_walk(xpos=None, ypos=None, speed=1.0, action=None, reduce=False, path=None, flip=False):
call hide_characters
scene onlayer dolls
hide screen bld1
hide screen blktone
with d3

4
game/scripts/characters/hermione/chibi.rpy
View File

@ -25,7 +25,7 @@ label her_chibi(action=None, xpos=None, ypos=None, flip=False, pic=None):
return
label her_walk(xpos=None, ypos=None, speed=1.0, action=None, reduce=False, path=None, flip=False):
call hide_characters
scene onlayer dolls
hide screen bld1
hide screen blktone
with d3
@ -148,7 +148,7 @@ init python:
# Sets up a chibi scene with Hermione and Genie in it
label her_chibi_scene(action="reset", xpos="mid", ypos="base", trans=None):
if trans is not None:
call hide_characters
scene onlayer dolls
hide screen bld1
hide screen blkfade

14
game/scripts/characters/hermione/events/favors/dance_for_me.rpy
View File

@ -21,7 +21,7 @@ label end_hg_pf_strip:
# Setup
stop music fadeout 1.0
call hide_characters
scene onlayer dolls
show screen blkfade
with d3
@ -439,7 +439,7 @@ label hg_pf_strip_T3_intro_E2:
gen ".............." ("base", xpos="far_left", ypos="head")
her "Ha! Might as well do this the proper way!" ("angry", "base", "angry", "mid")
call hide_characters
scene onlayer dolls
with d3
pause.2
@ -685,7 +685,7 @@ label hg_pf_strip_T3_intro_E2:
sna "Miss Granger..." ("snape_13")
her "................................." ("angry", "happyCl", "worried", "mid")
call hide_characters
scene onlayer dolls
with fade
pause.2
@ -764,7 +764,7 @@ label hg_pf_strip_T3_E2:
pass
# Locks Door.
call hide_characters
scene onlayer dolls
with d3
pause.5
@ -913,7 +913,7 @@ label hg_pf_strip_T3_watch:
call her_chibi("sit_naked","on_desk","on_desk")
call hide_characters
scene onlayer dolls
hide screen blkfade
with d5
call ctc
@ -1069,7 +1069,7 @@ label hg_pf_strip_T4:
else:
her "(How boring...)" ("annoyed", "narrow", "annoyed", "R")
call hide_characters
scene onlayer dolls
with d3
pause.5
@ -1342,7 +1342,7 @@ label hg_pf_strip_T4_watch:
nar "Completely exhausted, Hermione slumps down onto her butt."
nar "You watch her in silence for a couple of moments, until she's finally managed to catch her breath..."
call hide_characters
scene onlayer dolls
hide screen blkfade
with d5
call ctc

16
game/scripts/characters/hermione/events/favors/dance_for_me_snape.rpy
View File

@ -425,7 +425,7 @@ label hg_pf_strip_T4_snape_masturbate:
$ _masturbate = True
play music "music/(Orchestral) Playful Tension by Shadow16nh.ogg" fadein 1 if_changed
call hide_characters
scene onlayer dolls
show screen blkfade
with d5
pause.2
@ -461,7 +461,7 @@ label hg_pf_strip_T4_snape_masturbate:
with d3
pause.2
sna "I see Miss Granger has managed to remain exceptionally stubborn in every situation..." ("snape_03")
call hide_characters
scene onlayer dolls
with d5
call gen_chibi("sit_behind_desk")
@ -477,7 +477,7 @@ label hg_pf_strip_T4_snape_masturbate:
her @ cheeks blush "...{w}...{w}{nw}" ("angry", "happyCl", "worried", "mid")
her @ cheeks blush "......{fast} No, I can't! This is just not worth it!" ("disgust", "happyCl", "worried", "stare")
call hide_characters
scene onlayer dolls
show screen blkfade
with d5
@ -521,7 +521,7 @@ label hg_pf_strip_T4_snape_masturbate:
her @ cheeks blush "I do not mind it at all..." ("soft", "closed", "worried", "mid", emote="sweat")
sna "Right..." ("snape_01")
call hide_characters
scene onlayer dolls
play sound "sounds/MaleClearThroat.ogg"
gen "*clears throat*"
@ -588,7 +588,7 @@ label hg_pf_strip_T4_snape_masturbate:
call her_chibi("sit_naked","on_desk","on_desk")
call hide_characters
scene onlayer dolls
hide screen blkfade
with d5
call ctc
@ -658,7 +658,7 @@ label hg_pf_strip_T4_snape_masturbate:
her "I cannot believe this!" ("clench", "base", "angry", "mid", emote="angry")
pause.5
call hide_characters
scene onlayer dolls
show screen blkfade
with d5
@ -770,7 +770,7 @@ label hg_pf_strip_T4_snape_watch:
call her_chibi("sit_naked","on_desk","on_desk")
call hide_characters
scene onlayer dolls
hide screen blkfade
with d5
call ctc
@ -823,7 +823,7 @@ label hg_pf_strip_T4_snape_results:
$ hermione.set_cum(None)
$ hermione.wear("all")
call hide_characters
scene onlayer dolls
call her_chibi("stand","desk","base", flip=False)

14
game/scripts/characters/hermione/events/favors/give_me_a_handy.rpy
View File

@ -24,7 +24,7 @@ label end_hg_pf_handjob:
# Setup
stop music fadeout 1.0
call hide_characters
scene onlayer dolls
show screen blkfade
with d3
@ -306,7 +306,7 @@ label hg_pf_handjob_T5_repeat:
label hg_pf_handjob_1:
$ states.her.status.handjob = True
stop music fadeout 4.0
call hide_characters
scene onlayer dolls
show screen blkfade
with d3
@ -662,7 +662,7 @@ label hg_pf_handjob_1:
her "What other choice do I have?" ("angry", "narrow", "base", "down")
call hide_characters
scene onlayer dolls
show screen blkfade
with d5
@ -708,7 +708,7 @@ label hg_pf_handjob_1:
her "......................." ("angry", "wide", "base", "stare")
gen "Finally...{w=0.4} I Feel so much better now..." ("base", xpos="far_left", ypos="head")
call hide_characters
scene onlayer dolls
show screen blkfade
with d5
@ -753,7 +753,7 @@ label hg_pf_handjob_1:
label hg_pf_handjob_2:
stop music fadeout 4.0
call hide_characters
scene onlayer dolls
show screen blkfade
with d3
@ -1173,7 +1173,7 @@ label hg_pf_handjob_2_cumming:
her ".............." ("base", "narrow", "worried", "down")
call ctc
call hide_characters
scene onlayer dolls
show screen blkfade
with d5
@ -1244,7 +1244,7 @@ label hg_pf_handjob_2_cumming:
her @ cheeks blush ".............." ("base", "narrow", "worried", "down")
call ctc
call hide_characters
scene onlayer dolls
show screen blkfade
with d5

Some files were not shown because too many files have changed in this diff Show More