From 367571fdc6a9ef2f30f356ef3af6439669abbb2a Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Mon, 19 Jun 2023 18:25:44 +0100 Subject: [PATCH] Quidditch Outro QA * Added 3 new sound effects * Fixed gold counter displayable showing in replay scope * Fixed Genie's sprite lack of animation support * Fixed missing hooch's chibi * Fixed audio issues * Improved narration and visuals for the event. --- .../cho/events/quidditch/gryffindor_match.rpy | 51 +++++++++++++-- .../cho/events/quidditch/intros.rpy | 62 ++++++++++++------- .../cho/events/quidditch/retrospection.rpy | 22 ++++--- game/scripts/characters/genie/common.rpy | 7 ++- game/scripts/inventory/game.rpy | 2 +- game/sounds/drooling.ogg | 3 + game/sounds/pickup_item.ogg | 3 + game/sounds/rustling_metal.ogg | 3 + 8 files changed, 115 insertions(+), 38 deletions(-) create mode 100644 game/sounds/drooling.ogg create mode 100644 game/sounds/pickup_item.ogg create mode 100644 game/sounds/rustling_metal.ogg diff --git a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy index 4f7f8016..4da48568 100644 --- a/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy +++ b/game/scripts/characters/cho/events/quidditch/gryffindor_match.rpy @@ -159,6 +159,7 @@ label gryffindor_match: gen "*Yawn*" ("base", xpos="far_left", ypos="head") if _in_replay: + nar "Cho hovers on her broom outside the window, just below Genie's line of sight." cho "(Oh coach...)" cho "(I should have pushed harder on the broom being an issue earlier...)" @@ -598,6 +599,8 @@ label gryffindor_match: call gen_chibi("stand", 168, 326, flip=True) call her_chibi("stand", 300, 400, flip=True) + play background "sounds/crowd_low.ogg" fadein 1 fadeout 5 + hide screen blkfade with d5 @@ -738,6 +741,9 @@ label gryffindor_match: call gen_chibi("stand", 168, 326, flip=True) call her_chibi("stand", 300, 400, flip=True) + play music "music/machinations-by-kevin-macleod.ogg" fadein 1 fadeout 1 if_changed + play background "sounds/crowd_low.ogg" fadein 1 fadeout 5 + hide screen blkfade with d5 @@ -754,6 +760,8 @@ label gryffindor_match: show screen blkfade with d5 + stop background fadeout 1 + nar "Cho gets close to one of the enemy chasers, Katie Bell." cho "Hey Katie!" @@ -765,17 +773,22 @@ label gryffindor_match: #Spank sound play sound "sounds/slap_02.ogg" - "*Smack*!!" + "*Smack*!!" with hpunch nar "Cho smacks Katie on her shapely bum." "Katie" "*Owww*!!" + play sound "sounds/giggle2_loud.ogg" cho "*Imitates Katie's voice* \"Ohh yes Alicia, please spank me harder\"!" "Katie" "H-How--" nar "Cho grins at her briefly, then swiftly flies away." "Katie" "Why you little--" + + play sound "sounds/giggle2.ogg" + nar "Katie dashes after Cho." "Katie" "Come back here, I'm not done with you!" + play background "sounds/crowd_low.ogg" fadein 1 fadeout 5 hide screen blkfade with d3 @@ -796,6 +809,10 @@ label gryffindor_match: nar "Hermione gritting her teeth holds back her anger, and eventually resumes commentating the game." #Shifts to screen of Cho Doll flying in the air + + show screen blkfade + with d5 + nar "Cho is being chased by Katie, but not for long, as Angelina's attention turns to them." "Angelina" "What the hell are you doing, Katie?!" "Katie" "N-Nothing, I'm just--" @@ -807,8 +824,17 @@ label gryffindor_match: cho "(It didn't work!?!)" cho "(Our Plan! What am I supposed to do now?!)" + hide screen blkfade + with d5 + + call chibi_emote("thought", "genie") + call chibi_emote("thought", "snape") + nar "Cho looks down towards her Coach, who appears to be in some sort of argument with Professor Snape." + call chibi_emote("hide", "genie") + call chibi_emote("hide", "snape") + "Hermione" "Another goal for Team Gryffindor!" cho "(Another goal!)" #Worried @@ -818,12 +844,23 @@ label gryffindor_match: cho "(Stupid broom!)" cho "(Now where's that--{w=0.4} Stupid--{w=0.4} snitch!?)" + show screen blkfade + with d5 + nar "Cho begins to feverishly look around for the snitch, her eyes darting around the pitch." nar "Unable to locate it, she looks back towards the commentators' tower for assistance." + call gen_chibi("hide") + + hide screen blkfade + with d5 + cho "(Where did he vanish?!)" "Hermione" "A fantastic--{w=0.4} Hold on...{w=0.4} What's that on the pitch?{fast} Is that--" + + nar "Genie dashes through the pitch with inhuman speed." + cho "(What the--{w=0.4} Where's he going?)" pause 0.3 @@ -831,6 +868,7 @@ label gryffindor_match: call room("quidditch_stands2") call quidditch_stands2(weather="sun_low", crowd=crowd_full) call lun_chibi(xpos=620, ypos=400) + play background "sounds/crowd_low.ogg" fadein 1 fadeout 5 show image Transform("images/misc/redhead.webp", zoom=0.26, pos=(805, 240), xzoom=-1) as redhead zorder 2 show screen blkfade with ComposeTransition(pushleft, before=faderight) @@ -853,6 +891,12 @@ label gryffindor_match: cho "(Is he talking to Gi--)" cho "(Hold on... What's that thing near the balustrade... Is that... Luna?!)" + + lun "*Waves at Cho*" ("grin", "happyCl", "base", "mid") + + $ luna.hide() + with d3 + cho "(What is she wearing?!)" #Genie walks down to Luna. @@ -897,6 +941,7 @@ label gryffindor_match: call lun_chibi(xpos=620, ypos=400) show image Transform("images/misc/redhead.webp", zoom=0.26, pos=(805, 240), xzoom=-1) as redhead zorder 2 call gen_chibi("stand", 650, 430, flip=False) + play background "sounds/crowd_low.ogg" fadein 1 fadeout 5 hide screen blkfade with d5 @@ -925,7 +970,7 @@ label gryffindor_match: with d5 cho "(Yes coach... But what am I supposed to do?)" - gen "Go on, girl. Start with the top..." ("grin", xpos="far_left", ypos="head") # TODO: Add transparency + gen "Go on, girl. Start with the top..." ("grin", xpos="far_left", ypos="head", animation=Transform(alpha=0.5)) cho "(Coach... Please, this isn't the time--)" cho "(Hold on...)" cho "(That's it!!)" #open eyes wide @@ -2132,8 +2177,6 @@ label gryffindor_match_return: $ cho.animation = None $ cho.strip("clothes") - stop music fadeout 1 - call room("main_room") call gen_chibi("sit_behind_desk") call ton_chibi(xpos="mid", ypos="420") diff --git a/game/scripts/characters/cho/events/quidditch/intros.rpy b/game/scripts/characters/cho/events/quidditch/intros.rpy index 6720964e..565ecb13 100644 --- a/game/scripts/characters/cho/events/quidditch/intros.rpy +++ b/game/scripts/characters/cho/events/quidditch/intros.rpy @@ -1520,13 +1520,12 @@ label cho_quid_E12: $ game.weather = "clear" $ hooch_chibi.zoom = 0.38 $ hooch_chibi.zorder = 4 - chibi hooch place ((450, 500)) - chibi hooch place ((450, 500)) call room("quidditch_pitch") call cho_chibi("stand", "right", "base", flip=False) + chibi hooch place ((450, 500)) - #hoo @ cheeks blush "" ("base", "narrow", "base", "R", xpos=100, ypos="base", flip=True) - #cho @ cheeks heavy_blush "" ("horny", "narrow", "base", "mid", xpos=460, ypos="base", flip=False) + hoo @ cheeks blush "" ("base", "narrow", "base", "R", xpos=100, ypos="base", flip=True) + cho @ cheeks heavy_blush "" ("horny", "narrow", "base", "mid", xpos=460, ypos="base", flip=False) hide screen blkfade with d5 @@ -1906,8 +1905,11 @@ label cho_quid_E14: show cho_handjob cho_body_bending as cg with d3 pause 0.75 + + play sound "sounds/drooling.ogg" + show cho_handjob effects_spitting as cg with d3 - pause 0.5 + pause 0.25 show cho_handjob penis_hard_spit_on_tip as cg with d3 pause 0.5 @@ -2037,8 +2039,11 @@ label cho_quid_E14: show cho_handjob cho_body_bending as cg with d3 pause 0.75 + + play sound "sounds/drooling.ogg" + show cho_handjob effects_spitting as cg with d3 - pause 0.5 + pause 0.25 show cho_handjob penis_hard_spit_on_shaft as cg with d3 gen "Although..." @@ -2134,8 +2139,11 @@ label cho_quid_E14: show cho_handjob cho_body_bending as cg with d3 pause 0.75 + + play sound "sounds/drooling.ogg" + show cho_handjob effects_spitting as cg with d3 - pause 0.5 + pause 0.25 gen "Magical conductor, right." @@ -2387,8 +2395,13 @@ label cho_quid_E14: gen "Yeah?" show cho_handjob eyebrows_worried mouth_neutral as cg with d3 + cho "I never drank any of it." gen "I see..." + + stop music fadeout 1.0 + play sound "sounds/scratch.ogg" + gen "{size=+8}Wait what?!{/size}" with vpunch gen "So, that means..." cho "*Sigh*... Yes, what actually happened, is--" @@ -2446,7 +2459,7 @@ label cho_quid_E14: show cho_handjob eyes_open_narrow_forward as cg with d3 cho "Yes, you're completely right [name_genie_cho]..." - cho "Even though I didn't drink it, I lied, and made you believe that I did... Just so I could lose my virginity..." + cho "Even though I didn't drink it, I lied, and made you believe that I did... Just so I could fulfill my desires..." play sound "sounds/boing05.ogg" show cho_handjob penis_hard as cg with vpunch @@ -2463,7 +2476,7 @@ label cho_quid_E14: "-Rip her top off-": $ _no_shirt = True - play sound "sounds/cloth_sound3.ogg" + play sound "sounds/cloth_rip.ogg" show cho_handjob no_shirt as cg with d3 pause .4 @@ -2511,8 +2524,11 @@ label cho_quid_E14: show cho_handjob cho_body_bending as cg with d3 pause 0.75 + + play sound "sounds/drooling.ogg" + show cho_handjob effects_spitting as cg with d3 - pause 0.5 + pause 0.25 show cho_handjob penis_hard_spit_on_tip as cg with d3 pause 0.5 @@ -2598,8 +2614,11 @@ label cho_quid_E14: show cho_handjob cho_body_bending as cg with d3 pause 0.75 + + play sound "sounds/drooling.ogg" + show cho_handjob effects_spitting as cg with d3 - pause 0.5 + pause 0.25 show cho_handjob penis_hard_spit_on_shaft as cg with d3 gen "Good girl..." @@ -2639,22 +2658,16 @@ label cho_quid_E14: # Genies cum shoots past Cho through time, space and reason onto the masturbating Cho CG #Masturbating Cho CG Cums show cho_masturbate_lockers cho_body_fingering_up eyes_narrow_ahegao mouth_ahegao effects_shaking -effects_hand_move as cg2 - show cho_handjob cum_cumshot as cg - with d3 - pause 0.5 + show cho_handjob cum_cumshot as cg with d3 show cho_masturbate_lockers cum_cumshot as cg2 with d3 - call ctc show cho_masturbate_lockers cum_head as cg2 with d3 - call ctc show cho_masturbate_lockers cum_torso cum_mouth_ahegao as cg2 with d3 - call ctc show cho_masturbate_lockers -cum_cumshot cum_stomach as cg2 with d3 - call ctc - + show cho_handjob -cum_cumshot cum_after as cg with d3 show cho_masturbate_lockers -effects_shaking as cg2 with d3 + pause 0.5 - show cho_handjob -cum_cumshot cum_after as cg - with d3 + gen "*Ah*......." show cho_masturbate_lockers mouth_base -cum_mouth_ahegao cum_mouth_base as cg2 @@ -2777,8 +2790,11 @@ label cho_quid_E14.facefuck: show cho_handjob cho_body_bending as cg with d3 pause 0.75 + + play sound "sounds/drooling.ogg" + show cho_handjob effects_spitting as cg with d3 - pause 0.5 + pause 0.25 show cho_handjob penis_hard_spit_on_tip as cg with d3 pause 0.5 @@ -2792,7 +2808,7 @@ label cho_quid_E14.facefuck: pause 0.5 show cho_handjob eyebrows_raised cho_body_stroke_down as cg with d3 - show cho_handjob eyebrows_sad mouth_neutral eyes_open_right -effects_spitting as cg with d3 + show cho_handjob eyebrows_sad mouth_neutral eyes_open_right as cg with d3 cho "Alright, I've done it, but--" gen "Now, get that mouth over here!" diff --git a/game/scripts/characters/cho/events/quidditch/retrospection.rpy b/game/scripts/characters/cho/events/quidditch/retrospection.rpy index 6eabb8dc..926fb788 100644 --- a/game/scripts/characters/cho/events/quidditch/retrospection.rpy +++ b/game/scripts/characters/cho/events/quidditch/retrospection.rpy @@ -16,6 +16,7 @@ label cho_quid_E14_retrospection: cho "(A bottle of...{w=0.3} liquid luck?!)" cho "(Did coach leave this for me?)" + play sound "sounds/pickup_item.ogg" show cho_quidditch_outro bedroom -potion as cg with d3 #Bottle is removed from covers. @@ -47,6 +48,8 @@ label cho_quid_E14_retrospection: #cloth sound #Fade to New CG potion held up into sky + + play sound "sounds/rustling_metal.ogg" show cho_quidditch_outro pitch as cg with fade cho "(Liquid luck...)" @@ -59,15 +62,7 @@ label cho_quid_E14_retrospection: cho "(He must want to help me succeed, like he said from the start...)" cho "(Help me succeed... No matter--{w=0.2} *Yawn*... The cost.)" - show screen blkfade - with d3 - - pause 0.4 - - hide screen blkfade - with d3 - # Show snape's head - show cho_quidditch_outro pitch snape_talk as cg + show cho_quidditch_outro pitch snape_talk as cg with fade #CG goes blurry for a moment and back again as Cho blinks, as the CG comes back, Snape's head appear inside the potion. @@ -121,10 +116,12 @@ label cho_quid_E14_retrospection: play sound "sounds/bottle.ogg" pause .6 play sound "sounds/spill.ogg" + nar "Cho spills the yellow-tinted liquid on the grass." pause .6 #Pouring liquid sound + cho "(It's done... There's no going back now.)" cho "(Hold on... Didn't Snape say luck potion is expensive...)" cho "(Blimey! I could have sold it, and bought a new broom...)" @@ -136,6 +133,13 @@ label cho_quid_E14_retrospection: call gryffindor_match.introspection1 call gryffindor_match.introspection2 + + show screen blkfade + with d5 + + centered "{size=+7}{color=#cbcbcb}Few minutes into the game...{/color}{/size}" + + hide screen blkfade call gryffindor_match.introspection3 call gryffindor_match_return.introspection diff --git a/game/scripts/characters/genie/common.rpy b/game/scripts/characters/genie/common.rpy index 1448de52..87680323 100644 --- a/game/scripts/characters/genie/common.rpy +++ b/game/scripts/characters/genie/common.rpy @@ -28,8 +28,13 @@ init python: renpy.set_tag_attributes(variant) side = "genie" + at_list = [] + + if animation: + at_list.append(animation) + if renpy.showing("genie", layer=layer): - renpy.show(variant, layer=layer, tag="genie") + renpy.show(variant, layer=layer, tag="genie", at_list=at_list) if flip != None: states.gen.image.xzoom = -1 if flip else 1 diff --git a/game/scripts/inventory/game.rpy b/game/scripts/inventory/game.rpy index 14818042..e617ee57 100644 --- a/game/scripts/inventory/game.rpy +++ b/game/scripts/inventory/game.rpy @@ -40,7 +40,7 @@ init python: old = self._gold self._gold = max(0, min(value, 99999)) - if not renpy.in_rollback(): + if not renpy.in_rollback() and not _in_replay: renpy.hide_screen("gold") renpy.show_screen("gold", old, self._gold) diff --git a/game/sounds/drooling.ogg b/game/sounds/drooling.ogg new file mode 100644 index 00000000..be99368c --- /dev/null +++ b/game/sounds/drooling.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:046089801105022871fcc8e39b3f21393137f65d788ea0f5b77c87b186de4e35 +size 60539 diff --git a/game/sounds/pickup_item.ogg b/game/sounds/pickup_item.ogg new file mode 100644 index 00000000..2b80c570 --- /dev/null +++ b/game/sounds/pickup_item.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0416649829831bfe34787b3fdc0e4cb8fe3ecce55808660dfbd3d6ad4797b653 +size 36376 diff --git a/game/sounds/rustling_metal.ogg b/game/sounds/rustling_metal.ogg new file mode 100644 index 00000000..77385fe6 --- /dev/null +++ b/game/sounds/rustling_metal.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1502e91cf0e15f2adfaa56a7b7f8a55d7d43ab63a66c0f55875e841ecb94637b +size 59666