Gouvernathor/WTS
1
0
Fork 0
forked from SilverStudioGames/WTS
Code Pull Requests Activity

Bug fixes

Browse Source 
* Fixed a regression in music playback
* Unexposed monkey-patched engine functions to avoid issues
This commit is contained in:
LoafyLemon 2023-03-16 22:55:14 +00:00
parent 8df4960a1b
commit 8ad59d1421
102 changed files with 486 additions and 485 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
game/scripts/characters/astoria/events/clothing.rpy
View File

@ -17,7 +17,7 @@ label astoria_summon_setup:
with d3
#Astoria greeting.
play music "music/KMcL_OpenThoseBrightEyes.ogg" fadein 1
play music "music/KMcL_OpenThoseBrightEyes.ogg" fadein 1 if_changed
if ast_mood > 0:
if 5 > ast_mood >= 1:

20
game/scripts/characters/astoria/events/imperio_practice.rpy
View File

@ -97,7 +97,7 @@ label ag_se_imperio_sb_E1:
call sus_walk(action="enter")
play music "music/KMcL_OpenThoseBrightEyes.ogg" fadein 1
play music "music/KMcL_OpenThoseBrightEyes.ogg" fadein 1 if_changed
ast "Hey [name_susan_astoria]!" ("grin", "narrow", "base", "L", xpos="right", ypos="base")
sus "Astoria? What are you doing here?" ("angry", "wide", "shocked", "left", xpos="base", ypos="base")
ast "Oh, don't mind me..." ("base", "base", "base", "R")
@ -133,7 +133,7 @@ label ag_se_imperio_sb_E1:
with hpunch
pause.8
play music "music/Under-the-Radar by PhobyAk.ogg" fadein 1
play music "music/Under-the-Radar by PhobyAk.ogg" fadein 1 if_changed
sus "W-what{w=0.3} are{w=0.3} y{w=0.1}o{w=0.1}u--" ("soft", "base", "base", "stare")
nar "Susan's eyes flicker and a blank expression spreads across her face."
sus "..." ("soft", "narrow", "base", "stare")
@ -240,7 +240,7 @@ label ag_se_imperio_sb_E1:
with d3
pause.1
play music "music/KMcL_OpenThoseBrightEyes.ogg" fadein 1
play music "music/KMcL_OpenThoseBrightEyes.ogg" fadein 1 if_changed
gen "(Damn it! Why did she do that?)" ("angry", xpos="far_left", ypos="head")
sus "..." ("soft", "narrow", "base", "stare")
ast "Put your clothes on, Suzy." ("smile", "base", "base", "mid")
@ -338,7 +338,7 @@ label ag_se_imperio_sb_E2:
sus "You wanted to see me, sir?" ("soft", "base", "base", "mid", xpos="base", ypos="base")
sus "Astoria? Why are you here?" ("angry", "wide", "base", "left")
play music "music/KMcL_OpenThoseBrightEyes.ogg" fadein 1
play music "music/KMcL_OpenThoseBrightEyes.ogg" fadein 1 if_changed
ast "Oh... no reason..." ("annoyed", "base", "base", "down", xpos="right", ypos="base")
gen "Come up here for a moment Miss Bones..." ("base", xpos="far_left", ypos="head")
sus "Okay..." ("open", "base", "base", "mid")
@ -386,7 +386,7 @@ label ag_se_imperio_sb_E2:
with hpunch
pause.8
play music "music/Under-the-Radar by PhobyAk.ogg" fadein 1
play music "music/Under-the-Radar by PhobyAk.ogg" fadein 1 if_changed
sus "..." ("soft", "happy", "shocked", "stare")
ast "*ha-ha-ha-ha!*" ("grin", "closed", "base", "mid")
ast "Her face was priceless when you said milk duds..." ("grin", "base", "base", "L")
@ -600,7 +600,7 @@ label ag_se_imperio_sb_E2:
with d3
pause.5
play music "music/KMcL_OpenThoseBrightEyes.ogg" fadein 1
play music "music/KMcL_OpenThoseBrightEyes.ogg" fadein 1 if_changed
ast "Come on Suzy, time to give professor Tonks another visit." ("open", "base", "base", "L")
sus "*Hmm*... Another visit..." ("soft", "narrow", "sad", "downL")
@ -658,7 +658,7 @@ label ag_se_imperio_sb_E3:
gen "..." ("base", xpos="far_left", ypos="head")
sus "*Ehm... Can I help you with--" ("soft", "narrow", "base", "downL", xpos="right", ypos="base")
play music "music/KMcL_OpenThoseBrightEyes.ogg" fadein 1
play music "music/KMcL_OpenThoseBrightEyes.ogg" fadein 1 if_changed
call ast_chibi("wand",530,"base")
ast "Blah, blah, blah..." ("open", "base", "base", "R", xpos="base", ypos="base")
@ -681,7 +681,7 @@ label ag_se_imperio_sb_E3:
with hpunch
pause.8
play music "music/Under-the-Radar by PhobyAk.ogg" fadein 1
play music "music/Under-the-Radar by PhobyAk.ogg" fadein 1 if_changed
sus "Wait, what--" ("soft", "base", "base", "stare")
sus "" ("soft", "narrow", "base", "stare")
gen "Couldn't even wait this time?" ("base", xpos="far_left", ypos="head")
@ -812,7 +812,7 @@ label ag_se_imperio_sb_E3:
ast "Time for you to wake up..." ("grin", "narrow", "angry", "down")
sus "..."
play music "music/teddy-bear-waltz-by-kevin-macleod.ogg" fadein 1
play music "music/teddy-bear-waltz-by-kevin-macleod.ogg" fadein 1 if_changed
hide screen blktone
hide screen bld1
with d3
@ -938,7 +938,7 @@ label ag_se_imperio_sb_E3:
sus "..." ("soft", "narrow", "low", "mid", cheeks="blush", xpos="right", ypos="base", trans=fade)
play music "music/KMcL_OpenThoseBrightEyes.ogg" fadein 1
play music "music/KMcL_OpenThoseBrightEyes.ogg" fadein 1 if_changed
ast "Oh my god! He absolutely covered you!" ("scream", "base", "base", "mid",xpos="base",ypos="base")
sus "..." ("annoyed", "closed", "annoyed", "right", cheeks="blush")
ast "I didn't know you had it in you, sir!" ("clench", "base", "base", "mid")

40
game/scripts/characters/astoria/events/imperio_training.rpy
View File

File diff suppressed because it is too large Load Diff

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

@ -30,14 +30,14 @@ label astoria_intro_E1:
# Tonks walks in.
call ton_walk(action="enter", xpos="desk", ypos="base")
play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1
play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1 if_changed
ton "Good evening, [name_genie_tonks]." ("base", "base", "base", "mid", xpos="mid", ypos="base")
gen "[name_tonks_genie]..." ("base", xpos="far_left", ypos="head")
ton "I'm terribly sorry for bursting in like this!" ("open", "base", "raised", "R")
gen "What in the world got you so flustered?" ("base", xpos="far_left", ypos="head")
ton "We might be in big trouble, [name_genie_tonks]!" ("open", "base", "worried", "mid")
play music "music/(Orchestral) Playful Tension by Shadow16nh.ogg" fadein 1
play music "music/(Orchestral) Playful Tension by Shadow16nh.ogg" fadein 1 if_changed
gen "Miss Tonks... Have you been a bad girl?" ("grin", xpos="far_left", ypos="head")
ton "I'm not joking, [name_genie_tonks]!" ("soft", "base", "annoyed", "mid")
ton "Something terrible has happened at school today!" ("open", "closed", "annoyed", "R")
@ -480,7 +480,7 @@ label astoria_intro_E3:
call her_walk(action="enter", xpos="500", ypos="base")
play music "music/Chipper Doodle v2.ogg" fadein 1
play music "music/Chipper Doodle v2.ogg" fadein 1 if_changed
her "Hello sir." ("normal", "happy", "base", "mid", xpos="mid", ypos="base")
gen "I thought you said you weren't alone?" ("base", xpos="far_left", ypos="head")
her "I'm not." ("annoyed", "narrow", "base", "R_soft")
@ -512,7 +512,7 @@ label astoria_intro_E3:
# Astoria enters.
call ast_walk("desk", "base")
play music "music/(Orchestral) Playful Tension by Shadow16nh.ogg" fadein 1
play music "music/(Orchestral) Playful Tension by Shadow16nh.ogg" fadein 1 if_changed
$ astoria.set_face(mouth="base", eyes="base", eyebrows="base", pupils="mid")
$ hermione.set_face(mouth="normal", eyes="closed", eyebrows="base", pupils="mid")
@ -644,7 +644,7 @@ label astoria_intro_E3:
$ snape_chibi.zorder = 4 # In front of Astoria
call sna_walk(action="enter", xpos="mid", ypos="base")
play music "music/Dark Fog.ogg" fadein 1
play music "music/Dark Fog.ogg" fadein 1 if_changed
ast "" ("annoyed", "base", "worried", "R")
sna "You wanted to see me?" ("snape_09", xpos=600, ypos="base")
ast "..." ("annoyed", "narrow", "worried", "L")
@ -725,7 +725,7 @@ label astoria_intro_E3:
call ast_chibi("stand","desk","base", flip=False)
with d3
play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1
play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1 if_changed
pause.1
ast "" ("annoyed", "base", "base", "mid", trans=dissolve)
ton "Hello, Professor." ("base", "base", "base", "mid", hair="neutral", xpos="base", ypos="base", trans=dissolve)
@ -821,7 +821,7 @@ label astoria_intro_E3:
call ton_walk("desk","base")
play music "music/(Orchestral) Playful Tension by Shadow16nh.ogg" fadein 1
play music "music/(Orchestral) Playful Tension by Shadow16nh.ogg" fadein 1 if_changed
ton "She's {size=+5}so cute!{/size} Isn't she? {heart}" ("base", "base", "raised", "R", xpos="mid", ypos="base")
if d_flag_01:
@ -1019,7 +1019,7 @@ label astoria_intro_E4:
call ast_walk("desk","base")
pause.2
play music "music/KMcL_OpenThoseBrightEyes.ogg" fadein 1
play music "music/KMcL_OpenThoseBrightEyes.ogg" fadein 1 if_changed
ast "Hello, Professor." ("smile", "base", "base", "mid", xpos="mid", ypos="base")
ast "Professor Tonks told me to talk to you, Sir." ("open", "base", "base", "R")
gen "....................." ("base", xpos="far_left", ypos="head")

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

@ -86,7 +86,7 @@ label cc_pf_strip_T2_intro_E1:
stop music fadeout 1
cho "!!!" ("soft", "wide", "base", "mid", cheeks="blush")
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
gen "Go on, girl. Start with the top..." ("base", xpos="far_left", ypos="head")
cho "No!" ("scream", "happyCl", "angry", "mid", cheeks="blush", trans=hpunch)
cho "Why are you even asking me to do such a thing?!" ("angry", "narrow", "angry", "mid")
@ -418,7 +418,7 @@ label cc_pf_strip_T2_intro_E2:
cho "After all, I promised I'd do anything to win that Quidditch cup..." ("soft", "narrow", "angry", "mid")
cho "If stripping for you is what it takes, then..." ("soft", "base", "angry", "down")
play music "music/GrapeSodaIsFuckingRawbyjrayteam6.ogg" fadein 1
play music "music/GrapeSodaIsFuckingRawbyjrayteam6.ogg" fadein 1 if_changed
cho "Then..." ("angry", "base", "worried", "down")
cho "I-I'll do it..." ("soft", "narrow", "worried", "down", cheeks="blush")
gen "(Shit. Is she crying?)" ("base", xpos="far_left", ypos="head")
@ -447,7 +447,7 @@ label cc_pf_strip_T2_intro_E2:
gen "Of course!{w=0.2} I always did!" ("grin", xpos="far_left", ypos="head")
cho "I may not like it. But this is all just part of my training..." ("soft", "base", "worried", "R", cheeks="blush")
gen "*Uhhhh*... Sure..." ("base", xpos="far_left", ypos="head")
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
cho "It's one of many challenges I have to face before I can call myself a Quidditch champion!" ("soft", "closed", "angry", "mid")
cho "This is just about facing my inner demons, isn't it?" ("soft", "narrow", "angry", "mid")
cho "Overcoming my fears..." ("soft", "narrow", "angry", "R")
@ -467,7 +467,7 @@ label cc_pf_strip_T2_intro_E2:
cho "You can't do that!" ("scream", "narrow", "angry", "mid", trans=hpunch)
cho "" ("angry", "narrow", "angry", "mid")
gen "Didn't you just beg me to do just that?" ("angry", xpos="far_left", ypos="head")
play music "music/GrapeSodaIsFuckingRawbyjrayteam6.ogg" fadein 1
play music "music/GrapeSodaIsFuckingRawbyjrayteam6.ogg" fadein 1 if_changed
cho "I begged you to help me win the Quidditch cup!" ("clench", "narrow", "angry", "mid")
cho "And to be my trainer!{w} To be a {b}good{/b} trainer!" ("soft", "narrow", "angry", "mid")
cho "How can I overcome my fear of losing if I can't even do... this!" ("annoyed", "base", "worried", "down", cheeks="blush")
@ -487,7 +487,7 @@ label cc_pf_strip_T2_intro_E2:
menu:
gen "First, I'd like you to..." ("base", xpos="far_left", ypos="head")
"\"Show me those big, juicy \"Quaffles\" of yours!\"":
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
cho "*uhhh*..." ("upset", "wide", "base", "mid", cheeks="blush")
gen "Those two mean, hearty \"bludgers\"!" ("grin", xpos="far_left", ypos="head")
cho "Sir? Could it be that you are talking about my breasts?" ("soft", "narrow", "worried", "mid", cheeks="heavy_blush")
@ -553,7 +553,7 @@ label cc_pf_strip_T2_intro_E2:
gen "I stopped counting halfway through..." ("base", xpos="far_left", ypos="head")
"\"Let me catch sight of that 'Snitch!'\"":
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
cho "Don't you mean \"Snatch,\" Sir?" ("annoyed", "narrow", "angry", "mid")
gen "Potato, Potato!" ("grin", xpos="far_left", ypos="head")
cho "Your motives were nothing but for your own perverted gains, weren't they? From the very start." ("soft", "narrow", "base", "mid") # Annoyed

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

@ -16,7 +16,7 @@ label cc_pf_strip_T2_E3_hermione:
her "...{w=0.4}{nw}" ("soft", "base", "worried", "L")
her "...{fast}Cho?!" ("clench", "wide", "worried", "shocked")
play music "music/deadly-roulette-by-kevin-macleod.ogg" fadein 1 fadeout 1
play music "music/deadly-roulette-by-kevin-macleod.ogg" fadein 1 fadeout 1 if_changed
cho "Hey there, Granger!" ("horny", "narrow", "angry", "mid") # Grinning
her "What? Why are you--" ("disgust", "wide", "worried", "shocked")

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

File diff suppressed because it is too large Load Diff

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

@ -85,7 +85,7 @@ label cc_pf_strip_T3_tonks:
# Tonks walks next to Cho.
call ton_walk(540, "base")
play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1
play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1 if_changed
cho "" ("base", "narrow", "worried", "L", cheeks="blush", xpos="left", ypos="base", flip=True)
ton "Hello, Professor." ("soft", "narrow", "base", "mid", xpos="right", ypos="base", flip=False)
ton "Miss Chang." ("base", "narrow", "raised", "L")
@ -164,7 +164,7 @@ label cc_pf_strip_T3_tonks:
with d5
pause .8
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
$ cho.zorder = 16 # in front of Tonks # Default is 15.
$ tonks.zorder = 15 # reset to default.
cho "" ("base", "narrow", "base", "L", cheeks="heavy_blush", xpos=280, ypos="base", flip=True)
@ -1005,7 +1005,7 @@ label .succubus_E2:
ton "" ("horny", "narrow", "base", "mid", trans=flash)
call ctc
play music "music/Under-the-Radar by PhobyAk.ogg" fadein 1
play music "music/Under-the-Radar by PhobyAk.ogg" fadein 1 if_changed
ton "{heart}{heart}{heart}"
gen "Marvellous!" ("grin", xpos="far_left", ypos="head")
cho "..." ("horny", "narrow", "raised", "down", cheeks="blush") # blush
@ -1226,7 +1226,7 @@ label .hermione_E1:
cho "" ("horny", "narrow", "worried", "L", cheeks="heavy_blush")
call ctc
play music "music/Under-the-Radar by PhobyAk.ogg" fadein 1
play music "music/Under-the-Radar by PhobyAk.ogg" fadein 1 if_changed
her "Well then, here she is..." ("smile", "narrow", "angry", "mid")
her "Feel free to touch me, Cho." ("base", "narrow", "annoyed", "R")
her "Unlike Hermione I won't bite you... Probably. {heart}" ("smile", "narrow", "annoyed", "down")
@ -1351,7 +1351,7 @@ label .hermione_E1:
$ hermione.strip("clothes")
with d5
play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1
play music "music/scheming-weasel-slower-version-by-kevin-macleod.ogg" fadein 1 if_changed
her "*Mmmh*... How I love masturbating in a body that I'm not quite familiar with..." ("smile", "happyCl", "base", "mid")
her "It's like flying a new broom... There's nothing quite like the first test ride..." ("base", "narrow", "base", "mid")
cho "..." ("grin", "narrow", "base", "downR", cheeks="heavy_blush")

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

@ -48,7 +48,7 @@ label cc_pf_talk_T1_intro_E1:
cho "Very well..." ("soft", "base", "base", "R")
call cho_walk("desk", "base")
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
cho "" (face="happy", xpos="mid", ypos="base", trans=d3)
call ctc
@ -276,7 +276,7 @@ label cc_pf_talk_T1_intro_E2:
cho "..." ("annoyed", "base", "base", "down")
call cho_walk("desk", "base")
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
cho "" ("annoyed", "narrow", "angry", "mid", xpos="mid", ypos="base", trans=d3)
pause .5
@ -467,7 +467,7 @@ label cc_pf_talk_T1_E3:
gen "First, come closer. Let me have a good look at you!" ("base", xpos="far_left", ypos="head")
cho "Yes, Sir." ("base", "base", "base", "mid")
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
cho "" ("base", "base", "base", "mid", xpos="mid", ypos="base", trans=fade)
pause .5
@ -671,7 +671,7 @@ label cc_pf_talk_T2_intro_E1:
gen "Please come a bit closer..." ("base", xpos="far_left", ypos="head")
cho "Yes, Sir." ("base", "base", "base", "mid")
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
cho "" ("base", "base", "base", "mid", xpos="mid", ypos="base", trans=fade)
pause .5
@ -827,7 +827,7 @@ label cc_pf_talk_T2_intro_E2:
cho "Of course not, [name_genie_cho]!" ("smile", "base", "base", "mid")
gen "Come closer then..." ("base", xpos="far_left", ypos="head")
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
cho "" ("base", "base", "base", "mid", xpos="mid", ypos="base", trans=fade)
pause .5
@ -1048,7 +1048,7 @@ label cc_pf_talk_T2_intro_E2:
label cc_pf_talk_T2_E3:
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
cho "" ("annoyed", face="neutral", xpos="mid", ypos="base", trans=fade)
pause .5

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

@ -48,7 +48,7 @@ label cho_intro_E1:
# Cho enters your office for the first time.
call cho_walk("desk", "base", action="enter")
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
$ cho.set_face(mouth="base", eyes="base", eyebrows="base", pupils="mid")
$ camera.set_imagepath("common/")
@ -202,7 +202,7 @@ label cho_intro_E1:
call her_chibi("stand",570,"base")
pause .5
play music "music/deadly-roulette-by-kevin-macleod.ogg" fadein 1 fadeout 1
play music "music/deadly-roulette-by-kevin-macleod.ogg" fadein 1 fadeout 1 if_changed
cho "" ("annoyed", "narrow", "angry", "downR", xpos="mid", ypos="base")
her "Cho...{w=0.5} How nice to see you here..." ("open", "closed", "base", "mid")
@ -439,7 +439,7 @@ label cho_intro_E2:
gen "Miss Chang! My favourite student!" ("grin", xpos="far_left", ypos="head")
gen "I'm so glad to see you. Is there something I can--" ("grin", xpos="far_left", ypos="head")
play music "music/hitman.ogg" fadein 1
play music "music/hitman.ogg" fadein 1 if_changed
cho "Cut the crap, Professor!{w=0.6} I know you've told her!" ("soft", "narrow", "angry", "mid")
gen "{size=-4}Please don't hurt me.{/size}" ("angry", xpos="far_left", ypos="head")
cho "How could you have done this?{w=0.6} Sending this dim-witted Gryffindor tramp after me?" ("open", "narrow", "angry", "mid")
@ -481,7 +481,7 @@ label cho_intro_E2:
gen "I suppose..." ("base", xpos="far_left", ypos="head")
# Back to cheerful.
play music "music/Music for Manatees.ogg" fadein 1
play music "music/Music for Manatees.ogg" fadein 1 if_changed
cho "Good." ("base", "base", "base", "mid")
gen "(...)" ("base", xpos="far_left", ypos="head")
cho "Have a nice evening, Professor." ("smile", "closed", "base", "mid")
@ -898,7 +898,7 @@ label cho_intro_E3:
call cho_walk(580, 450, action="enter")
pause 1
play music "music/deadly-roulette-by-kevin-macleod.ogg" fadein 1 fadeout 1
play music "music/deadly-roulette-by-kevin-macleod.ogg" fadein 1 fadeout 1 if_changed
cho "Hello, Sir.{w=0.6} You've called for me?" ("soft", "narrow", "raised", "L", xpos="base", ypos="base")
her "" ("normal", "closed", "base", "mid", xpos=450, ypos="base")
@ -955,7 +955,7 @@ label cho_intro_E3:
gen "..." ("base", xpos="far_left", ypos="head")
cho "Sorry, sir... I've already taken up enough of your time... Surely you've got more important things--" ("open", "narrow", "base", "R")
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 fadeout 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 fadeout 1 if_changed
gen "Why don't I coach you?" ("base", xpos="far_left", ypos="head")
cho "Sorry?" ("clench", "narrow", "base", "mid")

4
game/scripts/characters/cho/events/panties.rpy
View File

@ -8,7 +8,7 @@ label cho_panties_response_T2:
call cho_chibi("stand","mid","base")
with d3
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
cho "Hello, [name_genie_cho]." ("soft", "narrow", "worried", "mid", xpos="right", ypos="base")
gen "Sup..." ("base", xpos="far_left", ypos="head")
cho "*Uhm*..." ("annoyed", "narrow", "worried", "R")
@ -104,7 +104,7 @@ label cho_panties_response_T3:
call cho_chibi("stand","mid","base")
with d3
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
cho "Hello, [name_genie_cho]." ("base", "narrow", "base", "downR", cheeks="blush", xpos="right", ypos="base")
gen "[name_cho_genie]..." ("base", xpos="far_left", ypos="head")
cho "I believe I left you something of mine..." ("open", "narrow", "base", "down", cheeks="blush")

18
game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy
View File

@ -155,7 +155,7 @@ label gryffindor_match:
$ hermione_chibi.zorder = 6
$ genie_chibi.zorder = 5
play music "music/Brittle Rille.ogg" fadein 1
play music "music/Brittle Rille.ogg" fadein 1 if_changed
gen "*Yawn*" ("base", xpos="far_left", ypos="head")
@ -163,7 +163,7 @@ label gryffindor_match:
cho "(Oh coach...)"
cho "(I should have pushed harder on the broom being an issue earlier...)"
play music "music/marty-gots-a-plan-by-kevin-macleod.ogg" fadein 1 fadeout 1
play music "music/marty-gots-a-plan-by-kevin-macleod.ogg" fadein 1 fadeout 1 if_changed
cho "(How do I tell him that his plan isn't going to work?)"
cho "(But... What if he's got a backup plan?)"
@ -188,7 +188,7 @@ label gryffindor_match:
gen "(Hold on...)" ("base", xpos="far_left", ypos="head")
play music "music/marty-gots-a-plan-by-kevin-macleod.ogg" fadein 1 fadeout 1
play music "music/marty-gots-a-plan-by-kevin-macleod.ogg" fadein 1 fadeout 1 if_changed
gen "(The final match...)" ("base", xpos="far_left", ypos="head")
gen "{size=-4}*Murmur*...{w=0.4} I feel like I've forgotten something...{/size}" ("base", xpos="far_left", ypos="head")
@ -672,7 +672,7 @@ label gryffindor_match:
#Whistle sound
play sound "sounds/referee.ogg"
play background "sounds/crowd_very_low.ogg" fadein 5 fadeout 5
play music "music/machinations-by-kevin-macleod.ogg" fadein 1 fadeout 1
play music "music/machinations-by-kevin-macleod.ogg" fadein 1 fadeout 1 if_changed
pause .4
hide hermione_main
@ -1812,7 +1812,7 @@ label gryffindor_match_return:
with d3
pause 0.5
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
cho "Sorry for the wait, I just had to take a few victory laps." ("smile", "narrow", "base", "mid", xpos="mid", ypos="base", trans=d3)
gen "!!!" ("angry", xpos="far_left", ypos="head")
@ -1847,7 +1847,7 @@ label gryffindor_match_return:
cho "" ("clench", "wide", "base", "mid", cheeks="heavy_blush") #wide eyed
play music "music/Under-the-Radar by PhobyAk.ogg"
play music "music/Under-the-Radar by PhobyAk.ogg" if_changed
ton "We've got a situation--{w=0.2}" ("mad", "base", "base", "R", hair="upset", xpos="base", ypos="base")
@ -2202,7 +2202,7 @@ label gryffindor_match_return:
cho "{size=-4}The potion would let me know if this wasn't what he wanted...{/size}" ("soft", "narrow", "base", "downR", cheeks="heavy_blush")
gen "*Huh*?" ("base", xpos="far_left", ypos="head")
gen "What are you mumbling--" ("base", xpos="far_left", ypos="head")
play music "music/marty-gots-a-plan-by-kevin-macleod.ogg" fadeout 3 fadein 1.0
play music "music/marty-gots-a-plan-by-kevin-macleod.ogg" fadeout 3 fadein 1.0 if_changed
cho "[name_genie_cho], Why don't you take your clothes off and get on that desk for me?" ("soft", "narrow", "base", "mid", cheeks="blush") #smirk
if _in_replay:
@ -2238,7 +2238,7 @@ label gryffindor_match_return:
show screen blkfade
with d5
play music "music/(Orchestral) Playful Tension by Shadow16nh.ogg" fadein 1 # SEX THEME.
play music "music/(Orchestral) Playful Tension by Shadow16nh.ogg" fadein 1 # SEX THEME. if_changed
play sound "sounds/giggle.ogg"
cho "*giggles*" ("base", "base", "base", "mid")
@ -2538,7 +2538,7 @@ label gryffindor_match_return:
gen "Uh-Oh..." ("angry", xpos="far_left", ypos="head")
cho "...{w=0.8}{nw}" ("annoyed", "narrow", "angry", "mid", cheeks="heavy_blush")
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
cho "...{fast}" ("grin", "narrow", "base", "mid", cheeks="heavy_blush") #smirks
gen "*Heh-Heh*..." ("grin", xpos="far_left", ypos="head")

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

@ -59,7 +59,7 @@ label hufflepuff_match:
call sna_walk(action="enter", xpos="mid", ypos="base")
pause .5
play music "music/Dark Fog.ogg" fadein 1
play music "music/Dark Fog.ogg" fadein 1 if_changed
sna "Are you ready to go?" ("snape_03", xpos="base", ypos="base")
gen "Can't you bloody knock?!" ("angry", xpos="far_left", ypos="head")
sna "Should I?{w=0.3} I was sure you were already waiting for me..." ("snape_05")
@ -304,7 +304,7 @@ label hufflepuff_match:
her "Thank you..." ("open", "happy", "base", "mid_soft")
her "L-let's begin!" ("base", "base", "base", "mid")
play music "music/machinations-by-kevin-macleod.ogg" fadein 1 fadeout 1
play music "music/machinations-by-kevin-macleod.ogg" fadein 1 fadeout 1 if_changed
her "Hufflepuff versus Ravenclaw!" ("smile", "base", "base", "mid_soft")
@ -559,7 +559,7 @@ label hufflepuff_match:
hide genie
with d3
play music "music/machinations-by-kevin-macleod.ogg" fadein 1 fadeout 1
play music "music/machinations-by-kevin-macleod.ogg" fadein 1 fadeout 1 if_changed
play background "sounds/crowd_low.ogg" fadein 3 fadeout 2
play sound "sounds/crowd_cheer.ogg"
@ -695,7 +695,7 @@ label hufflepuff_match:
# Start of the game
play sound "sounds/referee.ogg"
play music "music/machinations-by-kevin-macleod.ogg" fadein 1 fadeout 1
play music "music/machinations-by-kevin-macleod.ogg" fadein 1 fadeout 1 if_changed
nar "A fit looking woman then throws the quaffle into the air -- which signals the start of the match -- and the players quickly take off!"
her "Oh, wow... They're going quite f-fast..." ("normal", "wide", "worried", "shocked", flip=True, xpos=290, ypos="base", trans=d3)
@ -786,7 +786,7 @@ label hufflepuff_match:
with d3
# Back to commentating
play music "music/machinations-by-kevin-macleod.ogg" fadein 1 fadeout 1
play music "music/machinations-by-kevin-macleod.ogg" fadein 1 fadeout 1 if_changed
play background "sounds/crowd_low.ogg" fadein 0.5 fadeout 0.5
her "..." ("normal", "squint", "angry", "mid", flip=True, xpos=290, ypos="base", trans=d3)
her "Oh, apparently Ravenclaw scored during that... \"captivating\" bit of distraction..." ("open", "narrow", "annoyed", "mid")
@ -1108,7 +1108,7 @@ label hufflepuff_match_return:
gen "Of course I am!" ("angry", xpos="far_left", ypos="head")
cho "..." ("annoyed", "narrow", "raised", "R")
cho "If you say so..." ("annoyed", "narrow", "base", "mid")
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
cho "I can't believe that we've broken our six year dry streak and won a real game!" ("smile", "happyCl", "base", "mid")
cho "We could actually win the cup!" ("open", "wide", "base", "mid")
gen "And you weren't embarrassed?" ("base", xpos="far_left", ypos="head")

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

@ -59,7 +59,7 @@ label cc_ht_return:
cho "I bet you were probably in on it..." ("upset", "narrow", "angry", "mid")
gen "Now now, you know I'd never resort to any sort of foul play like that..." ("base", xpos="far_left", ypos="head")
gen "More importantly, how did the game go?" ("base", xpos="far_left", ypos="head")
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
cho "{size=+10}I got it!!!{/size}" ("scream", "base", "base", "mid")
cho "I caught the snitch!" ("smile", "happyCl", "base", "mid")
gen "Congratulations..." ("base", xpos="far_left", ypos="head")

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

@ -310,7 +310,7 @@ label cho_quid_E3:
cho "[name_genie_cho], there's been a disaster!" ("scream", "closed", "angry", "mid", xpos="mid", ypos="base", trans=hpunch)
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
gen "Off to a good start..." ("base", xpos="far_left", ypos="head")
cho "[name_genie_cho], something terrible happened to Lee Jordan!" ("soft", "narrow", "worried", "mid")
@ -372,7 +372,7 @@ label cho_quid_E3:
cho "{size=-4}Probably anyone at this point...{/size}" ("annoyed", "base", "raised", "R")
stop music fadeout 1
cho "(Wait a minute...)" ("annoyed", "wide", "raised", "mid")
play music "music/marty-gots-a-plan-by-kevin-macleod.ogg" fadein 1.0
play music "music/marty-gots-a-plan-by-kevin-macleod.ogg" fadein 1.0 if_changed
cho "No..." ("smile", "base", "base", "mid") #Mischievous smile
gen "I'll ask her... What's the worst that could happen..." ("grin", xpos="far_left", ypos="head")
cho "Yeah, actually you're probably right..." ("grin", "narrow", "angry", "mid")
@ -464,7 +464,7 @@ label cho_quid_E5:
gen "The future?" ("base", xpos="far_left", ypos="head")
gen "You didn't get pregnant during your little celebration event, did you?" ("base", xpos="far_left", ypos="head")
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
cho "WHAT?!" ("clench", "wide", "base", "mid", cheeks="heavy_blush") # Upset/whatthefuck face
cho "Sir, why would you even suggest that?!" ("angry", "narrow", "angry", "mid", cheeks="blush") # upset
gen "Then what is it?" ("base", xpos="far_left", ypos="head")
@ -512,7 +512,7 @@ label cho_quid_E6:
her "I can't believe her..." ("clench", "closed", "angry", "mid", trans=hpunch) # angry
gen "Good day to you too..." ("base", xpos="far_left", ypos="head")
play music "music/Chipper Doodle v2.ogg" fadein 1
play music "music/Chipper Doodle v2.ogg" fadein 1 if_changed
her "That bitch has been walking around saying that I quit the commentator job." ("open", "base", "angry", "mid")
gen "Who did?" ("base", xpos="far_left", ypos="head")
@ -1227,7 +1227,7 @@ label cho_quid_E12:
gen "(Mamma mia!)" ("grin", xpos="far_left", ypos="head")
#Hooch theme
play music "music/march-of-the-spoons-by-kevin-macleod-from-filmmusic-io.ogg" fadein 1 fadeout 1
play music "music/march-of-the-spoons-by-kevin-macleod-from-filmmusic-io.ogg" fadein 1 fadeout 1 if_changed
#Hooch doll fades in
hoo "Professor Dumbledore, Miss Chang, what can I do you for?" ("base", "base", "base", "L", xpos=100, ypos="base", flip=True, trans=d3) # "what can I do you for" is a form of a joke, fits next line perfectly.

6
game/scripts/characters/cho/events/quidditch/quiz.rpy
View File

@ -68,7 +68,7 @@ label cho_quiz:
cho "I can't really see how, but I'm sure you know what you're talking about..." ("open", "base", "base", "mid")
gen "Alright, so..." ("base", xpos="far_left", ypos="head")
play music "music/ominous_music.ogg"
play music "music/ominous_music.ogg" if_changed
stop weather
$ confidence_meter = 50
@ -203,7 +203,7 @@ label cho_quiz:
$ renpy.music.set_volume(1.0)
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
call weather_sound
@ -325,7 +325,7 @@ label cho_quiz_checkpoint:
$ confidence_meter = 50
show screen meter(confidence_meter)
play music "music/determined_pursuit_loop.ogg"
play music "music/determined_pursuit_loop.ogg" if_changed
stop weather
# Intro

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/slytherin_practice.rpy
View File

@ -90,7 +90,7 @@ label cc_st_return:
menu:
gen "..." ("base", xpos="far_left", ypos="head")
"\"Are you mocking me for taking a nap?\"":
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
cho "No, sir." ("soft", "base", "base", "mid")
gen "..." ("base", xpos="far_left", ypos="head")
@ -98,7 +98,7 @@ label cc_st_return:
"\"Brats like you need to be punished!\"":
$ cho_mood += 2
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
cho "Punished? For what?" ("soft", "narrow", "angry", "mid") # angry
gen "For being a pain in my ass!" ("angry", xpos="far_left", ypos="head")

10
game/scripts/characters/cho/events/requests/manipulate_boys.rpy
View File

@ -736,14 +736,14 @@ label cc_pr_manipulate_boys_T3_twins:
menu:
"\"*Ha-ha-ha-ha*\"":
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
gen "{i}I'm blue, daba dee bada die, {size=-2}daba dee daba die,{/size} {size=-4}daba dee bada die,{/size} {size=-6}daba dee daba die........{/size}{/i}" ("grin", xpos="far_left", ypos="head")
cho "*grr*." ("clench", "wide", "angry", "mid")
gen "*Ahem*...{w=0.4} I mean... Oh, no... What happened?" ("base", xpos="far_left", ypos="head")
"\"Feeling blue today?\"":
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
cho "Oh? What gave it away?" ("soft", "base", "angry", "mid")
cho "My face?" ("clench", "base", "angry", "mid")
@ -751,7 +751,7 @@ label cc_pr_manipulate_boys_T3_twins:
gen "So, what happened?" ("base", xpos="far_left", ypos="head")
"\"What the hell happened?\"":
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
gen "Didn't expect to see a talking blueberry today!" ("grin", xpos="far_left", ypos="head")
gen "Or are you a bilberry?" ("base", xpos="far_left", ypos="head")
@ -954,7 +954,7 @@ label cc_pr_manipulate_boys_twins_branch:
stop music fadeout 1
centered "{size=+7}{color=#cbcbcb}{cps=7}...{/cps}{/color}{/size}{w=1.0}{nw}"
call room("clothing_store")
play music "music/clothing_store.ogg" fadein 1
play music "music/clothing_store.ogg" fadein 1 if_changed
call hide_blkfade
if not clothing_store_intro_done:
@ -1098,7 +1098,7 @@ label cc_pr_manipulate_boys_twins_branch:
gen "I'm back!" ("base", xpos="far_left", ypos="head")
call gen_walk("mid", "base")
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
cho "Finally..." ("annoyed", "base", "angry", "mid", trans=d3)
if not fire_in_fireplace:

2
game/scripts/characters/cho/events/summon.rpy
View File

@ -20,7 +20,7 @@ label cho_summon_setup:
with d3
#Cho greeting.
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1 if_changed
if cho_mood > 0:
if 5 > cho_mood >= 1:

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