* Added `sound` sfx channel
* Refactored and unified sound & music calls
* Fixed missing sounds in astoria events
* Removed hide_screens label (Redundant)
* Removed play_music, play_sound call labels
This commit is contained in:
LoafyLemon 2023-03-11 22:01:39 +00:00
parent b2e7c44b2e
commit dc212e80d1
147 changed files with 2307 additions and 2480 deletions

View File

@ -8,7 +8,7 @@ label ast_chibi(action=None, xpos=None, ypos=None, flip=False):
hide astoria_main
hide screen bld1
hide screen blktone
call play_sound("door")
play sound "sounds/door.ogg"
$ astoria_chibi.hide()
with d3
pause .5
@ -28,7 +28,7 @@ label ast_walk(xpos=None, ypos=None, speed=1.0, action=None, reduce=False, path=
with d3
if action == "enter":
call play_sound("door")
play sound "sounds/door.ogg"
call ast_chibi(None, "door", "base", flip)
with d3
if xpos or ypos:
@ -36,7 +36,7 @@ label ast_walk(xpos=None, ypos=None, speed=1.0, action=None, reduce=False, path=
elif action == "leave":
$ astoria_chibi.show()
$ astoria_chibi.move(("door", "base"), speed, reduce)
call play_sound("door")
play sound "sounds/door.ogg"
$ astoria_chibi.hide()
with d3
pause .5

View File

@ -12,12 +12,12 @@ label astoria_summon_setup:
if astoria_outfits_schedule:
$ astoria.equip_random_outfit()
call play_sound("door")
play sound "sounds/door.ogg"
call ast_chibi("stand","mid","base")
with d3
#Astoria greeting.
call play_music("astoria")
play music "music/KMcL_OpenThoseBrightEyes.ogg" fadein 1
if ast_mood > 0:
if 5 > ast_mood >= 1:

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -67,7 +67,7 @@ label summon_astoria:
else:
ast "Oh, alright. Good night, [name_genie_astoria]." ( face="neutral")
call play_sound("door")
play sound "sounds/door.ogg"
jump end_astoria_event

View File

@ -109,7 +109,7 @@ label ast_reaction_touch_fail(what):
$ mouse_slap()
ast "Don't! Do! That!{fast} Again!" ("scream", "closed", "angry", "mid")
$ mouse_slap()
call play_sound("kick")
play sound "sounds/kick.ogg"
with hpunch
pause 1.0
gen "(Ouch, that hurt!)" ("angry", xpos="far_left", ypos="head")
@ -192,9 +192,9 @@ label ast_reaction_unequip_fail(item):
show screen blkfade
with d5
$ renpy.sound.play("sounds/zipper.ogg")
play sound "sounds/zipper.ogg"
ast "W-What are you doing?!" ("scream", "narrow", "angry", "L")
call play_sound("thump")
play sound "sounds/kick.ogg"
with hpunch
pause 0.5
ast "Oh my god-- is that...?!" ("upset", "narrow", "base", "mid")

View File

@ -8,7 +8,7 @@ label cho_chibi(action=None, xpos=None, ypos=None, flip=False):
hide cho_main
hide screen bld1
hide screen blktone
call play_sound("door")
play sound "sounds/door.ogg"
$ cho_chibi.hide()
with d3
pause .5
@ -28,7 +28,7 @@ label cho_walk(xpos=None, ypos=None, speed=1.0, action=None, reduce=False, path=
with d3
if action == "enter":
call play_sound("door")
play sound "sounds/door.ogg"
call cho_chibi(None, "door", "base", flip)
with d3
if xpos or ypos:
@ -36,7 +36,7 @@ label cho_walk(xpos=None, ypos=None, speed=1.0, action=None, reduce=False, path=
elif action == "leave":
$ cho_chibi.show()
$ cho_chibi.move(("door", "base"), speed, reduce)
call play_sound("door")
play sound "sounds/door.ogg"
$ cho_chibi.hide()
with d3
pause .5

View File

@ -6,7 +6,7 @@ label cc_pf_strip_T2_E3_hermione:
$ hermione.equip(her_outfit_default) #Equip Hermione default clothing.
# Summon Hermione.
call play_sound("door")
play sound "sounds/door.ogg"
call her_chibi("stand", "door", "base")
with d3
pause .5
@ -93,13 +93,13 @@ label cc_pf_strip_T2_E3_hermione_choices:
# Hermione picks them up and runs off.
call bld("hide")
pause .2
call play_sound("equip")
play sound "sounds/cloth_sound.ogg"
hide screen cho_cloth_pile
pause .5
cho "My clothes!" ("open", "wide", "base", "L")
call play_sound("running")
play sound "sounds/run_03.ogg"
call her_walk("door", "base", speed=2)
call her_chibi(flip=False)
with d3
@ -120,7 +120,7 @@ label cc_pf_strip_T2_E3_hermione_choices:
# Cho runs out the door.
if d_flag_01: # On desk
call play_sound("climb_desk")
play sound "sounds/08_hop_on_desk.ogg"
show screen blkfade
with d3
pause 1
@ -139,7 +139,7 @@ label cc_pf_strip_T2_E3_hermione_choices:
cho "{size=+4}Give them back, you bitch!{/size}" ("scream", "narrow", "angry", "L", ypos="head", flip=True, trans=hpunch)
call play_sound("running")
play sound "sounds/run_03.ogg"
call cho_walk(action="leave", speed=2)
call bld
@ -181,7 +181,7 @@ label cc_pf_strip_T2_E3_hermione_choices:
her "Here..." ("base", "narrow", "base", "mid_soft")
# Hermione shows her breasts.
# $ renpy.sound.play("sounds/boing02.ogg")
# play sound "sounds/boing02.ogg"
$ hermione.strip("top", "bra")
with d3
pause .5
@ -210,7 +210,7 @@ label cc_pf_strip_T2_E3_hermione_choices:
gen "For exposing those magnificent breasts." ("grin", xpos="far_left", ypos="head")
# $ renpy.sound.play("sounds/cloth_sound3.ogg")
# play sound "sounds/cloth_sound3.ogg"
$ hermione.wear("all")
with d3
pause .5
@ -265,7 +265,7 @@ label cc_pf_strip_T2_E3_hermione_choices:
gen "Well, that is yet to be seen." ("grin", xpos="far_left", ypos="head")
# Cho gets dressed.
call play_sound("equip")
play sound "sounds/cloth_sound.ogg"
show screen blkfade
with d5
$ cho.wear("all")
@ -277,7 +277,7 @@ label cc_pf_strip_T2_E3_hermione_choices:
cho "" ("annoyed", "narrow", "angry", "mid", cheeks="blush")
pause .5
gen "Give me just a moment..." ("base", xpos="far_left", ypos="head")
$ renpy.sound.play("sounds/sniff.ogg")
play sound "sounds/sniff.ogg"
nar "You give Cho's panties one last sniff before handing them back to the girl."
gen "There." ("angry", xpos="far_left", ypos="head")
cho "(Pervert...)" ("annoyed", "narrow", "angry", "R", cheeks="blush")
@ -374,7 +374,7 @@ label cc_pf_strip_T2_E3_hermione_choices:
pause .4
# Cho gets dressed.
call play_sound("equip")
play sound "sounds/cloth_sound.ogg"
$ cho.wear("all")
hide screen cho_cloth_pile
with d3
@ -410,7 +410,7 @@ label cc_pf_strip_T2_E3_hermione_repeat:
$ hermione.equip(her_outfit_default) #Equip Hermione default clothing.
# Hermione enters.
call play_sound("door")
play sound "sounds/door.ogg"
call her_chibi("stand", "door", "base")
with d3
pause .5

View File

@ -93,7 +93,7 @@ label cc_pf_blowjob_T3_intro_E1:
cho "Okay, then... I'm ready." ("angry", "narrow", "base", "mid", cheeks="blush")
gen "(At last!)" ("angry", xpos="far_left", ypos="head")
$ renpy.sound.play("sounds/zipper.ogg")
play sound "sounds/zipper.ogg"
hide screen bld1
hide cho_main
call gen_chibi("jerk_off_behind_desk")
@ -715,7 +715,7 @@ label cc_pf_blowjob_T3_E2:
cho "Okay..." #Blushes #moves back to base position
#Takes off shirt
$ renpy.sound.play("sounds/cloth_sound3.ogg")
play sound "sounds/cloth_sound3.ogg"
$ camera.set_image("topless_mid", trans=Fade(0.5, 2.0, 0.5))
gen "Excellent... Now continue stroking, [name_cho_genie]."
@ -1044,7 +1044,7 @@ label cc_pf_blowjob_T3_E2:
gen "At least let m--" ("base", xpos="far_left", ypos="head")
call cho_walk(action="leave")
$ renpy.play('sounds/door_down.ogg')
play sound "sounds/door_down.ogg"
with hpunch
pause 1.0
@ -1058,14 +1058,14 @@ label cc_pf_blowjob_T3_E2:
gen "Don't say I didn't try to--" ("base", xpos="far_left", ypos="head")
cho "Shut... up!" ("angry", "base", "angry", "mid", cheeks="blush", trans=d3)
$ renpy.sound.play("sounds/cloth_sound2.ogg")
play sound "sounds/cloth_sound2.ogg"
$ cho.wear("all")
with fade
pause 1.0
call cho_walk("door", "base")
call cho_walk(action="leave")
$ renpy.play('sounds/door_down.ogg')
play sound "sounds/door_down.ogg"
with hpunch
gen "..." ("base", xpos="far_left", ypos="head")
@ -1188,7 +1188,7 @@ label cc_pf_blowjob_T3_E2:
gen "Your top..." ("base", xpos="far_left", ypos="head")
cho "Oh... Of course!" ("clench", "happyCl", "base", "mid", cheeks="blush") #Blush
$ renpy.sound.play("sounds/cloth_sound2.ogg")
play sound "sounds/cloth_sound2.ogg"
$ cho.wear("all")
with fade
@ -1285,7 +1285,7 @@ label cc_pf_blowjob_T3_E2:
cho "Oh, of course!" ("clench", "base", "base", "down", cheeks="blush") #Wide eyed
#Cho puts on her shirt
$ renpy.sound.play("sounds/cloth_sound2.ogg")
play sound "sounds/cloth_sound2.ogg"
$ cho.wear("all")
with fade
@ -1348,7 +1348,7 @@ label cc_pf_blowjob_T3_E2:
cho "For a first blowjob?! It is not!"
gen "I mean...{w=0.4} wait did you say first... does that mean you still want to do--"
$ cho.wear("all")
$ renpy.sound.play("sounds/cloth_sound2.ogg")
play sound "sounds/cloth_sound2.ogg"
cho "I can't believe you..."
hide screen animatedCG
@ -1432,7 +1432,7 @@ label cc_pf_blowjob_T3_E3:
cho "In that case...{w=0.4} Just relax [name_genie_cho] and I'll take care of you..."
$ renpy.sound.play("sounds/cloth_sound3.ogg")
play sound "sounds/cloth_sound3.ogg"
$ camera.set_image("topless_mid_dreamy", trans=Fade(0.5, 2.0, 0.5))
#Cho moves up closer
@ -1667,7 +1667,7 @@ label cc_pf_blowjob_T3_E3:
$ camera.set_image("topless_mid_full_angry")
pause 1
call play_sound("gulp")
play sound "sounds/gulp.ogg"
$ camera.set_image("topless_mid_full_swallowed2", trans=d5)
pause 1.5
$ camera.set_image("topless_mid_full_swallowed")
@ -1704,7 +1704,7 @@ label cc_pf_blowjob_T3_E3:
gen "For now..." ("base", xpos="far_left", ypos="head")
cho "Okay then..." ("soft", "base", "base", "mid", cheeks="blush")
$ renpy.sound.play("sounds/cloth_sound2.ogg")
play sound "sounds/cloth_sound2.ogg"
$ cho.wear("all")
$ cho.set_cum(None)
with fade

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")
call play_music("cho")
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
cho "" (face="happy", xpos="mid", ypos="base", trans=d3)
call ctc
@ -278,7 +278,7 @@ label cc_pf_talk_T1_intro_E2:
cho "..." ("annoyed", "base", "base", "down")
call cho_walk("desk", "base")
call play_music("cho")
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
cho "" ("annoyed", "narrow", "angry", "mid", xpos="mid", ypos="base", trans=d3)
pause .5
@ -444,7 +444,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")
call play_music("cho")
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
cho "" ("base", "base", "base", "mid", xpos="mid", ypos="base", trans=fade)
pause .5
@ -648,7 +648,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")
call play_music("cho")
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
cho "" ("base", "base", "base", "mid", xpos="mid", ypos="base", trans=fade)
pause .5
@ -810,7 +810,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")
call play_music("cho")
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
cho "" ("base", "base", "base", "mid", xpos="mid", ypos="base", trans=fade)
pause .5
@ -1032,7 +1032,7 @@ label cc_pf_talk_T2_intro_E2:
label cc_pf_talk_T2_E3:
call play_music("cho")
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
cho "" ("annoyed", face="neutral", xpos="mid", ypos="base", trans=fade)
pause .5

File diff suppressed because it is too large Load Diff

View File

@ -4,11 +4,11 @@
label cho_panties_response_T2:
$ has_cho_panties = False
call play_sound("door")
play sound "sounds/door.ogg"
call cho_chibi("stand","mid","base")
with d3
call play_music("cho")
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
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")
@ -21,7 +21,7 @@ label cho_panties_response_T2:
call give_reward("> You hand over the panties...", "interface/icons/panties_cum.webp")
$ renpy.sound.play("sounds/cloth_sound3.ogg")
play sound "sounds/cloth_sound3.ogg"
pause .4
cho "(...)" ("annoyed", "narrow", "angry", "mid", xpos="mid", ypos="base", trans=fade) # Evil stare.
@ -72,7 +72,7 @@ label cho_panties_response_T2:
else:
gen "Your panties, that's right!{w} I've got them right here..." ("grin", xpos="far_left", ypos="head")
$ renpy.sound.play("sounds/sniff.ogg")
play sound "sounds/sniff.ogg"
nar "You bring the panties to your nose and give them one last sniff."
gen "*Aaahhh*!{w} Wonderful!" ("angry", xpos="far_left", ypos="head")
@ -82,7 +82,7 @@ label cho_panties_response_T2:
call cho_walk("desk", "base")
pause .8
$ renpy.sound.play("sounds/cloth_sound3.ogg")
play sound "sounds/cloth_sound3.ogg"
pause .4
call cho_walk("mid", "base")
@ -100,11 +100,11 @@ label cho_panties_response_T2:
label cho_panties_response_T3:
$ has_cho_panties = False
call play_sound("door")
play sound "sounds/door.ogg"
call cho_chibi("stand","mid","base")
with d3
call play_music("cho")
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
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")
@ -136,7 +136,7 @@ label cho_panties_response_T3:
else:
$ renpy.sound.play("sounds/sniff.ogg")
play sound "sounds/sniff.ogg"
nar "You bring the panties to your nose and give them one last sniff."
gen "*Aaahhh*!{w} Wonderful!" ("angry", xpos="far_left", ypos="head")
@ -146,7 +146,7 @@ label cho_panties_response_T3:
call cho_walk("desk", "base")
pause .8
$ renpy.sound.play("sounds/cloth_sound3.ogg")
play sound "sounds/cloth_sound3.ogg"
pause .4
call cho_walk("mid", "base")

View File

@ -35,7 +35,7 @@ label cc_gt_start:
jump end_cho_event
label cc_gt_return:
call play_sound("knocking")
play sound "sounds/knocking.ogg"
call bld
"*Knock-knock-knock*"
@ -77,7 +77,7 @@ label cc_gt_return:
$ _gold = num_to_word(_gold)
cho "[_gold]!" ("clench", "closed", "base", "mid")
$ renpy.play('sounds/gulp.ogg')
play sound "sounds/gulp.ogg"
gen "*Gulp*..." ("angry", xpos="far_left", ypos="head")
gen "Surely there must be some spare brooms around the castle." ("angry", xpos="far_left", ypos="head")
cho "I assure you... Even the brooms provided for flying lessons are terrible." ("disgust", "narrow", "angry", "mid")

View File

@ -35,7 +35,7 @@ label cc_ht_start:
label cc_ht_return:
# Cho enters.
call play_sound("knocking")
play sound "sounds/knocking.ogg"
call bld
"*Knock-knock-knock*"
@ -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")
call play_music("cho")
play music "music/fuzzball-parade-by-kevin-macleod.ogg" fadein 1
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")

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