diff --git a/game/audio/effects/Ear-Ringing-Sound-Effect.ogg b/game/audio/effects/Ear-Ringing-Sound-Effect.ogg deleted file mode 100644 index 15713ab..0000000 Binary files a/game/audio/effects/Ear-Ringing-Sound-Effect.ogg and /dev/null differ diff --git a/game/audio/effects/carSuspension1.ogg b/game/audio/effects/carSuspension1.ogg new file mode 100644 index 0000000..b0188f0 Binary files /dev/null and b/game/audio/effects/carSuspension1.ogg differ diff --git a/game/images/backgrounds/roof fog.jpg b/game/images/backgrounds/roof fog.jpg deleted file mode 100644 index 84c9bd9..0000000 Binary files a/game/images/backgrounds/roof fog.jpg and /dev/null differ diff --git a/game/images/cgs/a10.jpg b/game/images/cgs/a10.jpg deleted file mode 100644 index facc0d6..0000000 Binary files a/game/images/cgs/a10.jpg and /dev/null differ diff --git a/game/images/cgs/a14.jpg b/game/images/cgs/a14.jpg index 65d0dc5..4afca86 100644 Binary files a/game/images/cgs/a14.jpg and b/game/images/cgs/a14.jpg differ diff --git a/game/images/cgs/roofshooter.jpg b/game/images/cgs/roofshooter.jpg new file mode 100644 index 0000000..4dc3d95 Binary files /dev/null and b/game/images/cgs/roofshooter.jpg differ diff --git a/game/images/trish/trish sad notears.png b/game/images/trish/trish sad notears.png new file mode 100644 index 0000000..6dced31 Binary files /dev/null and b/game/images/trish/trish sad notears.png differ diff --git a/game/script.rpy b/game/script.rpy index fbff22b..a8631bc 100644 --- a/game/script.rpy +++ b/game/script.rpy @@ -279,6 +279,7 @@ image fang a prom considering flip = im.Flip("fang/prom sets/fang a prom conside image reed considering flip = im.Flip("reed/reed considering.png", horizontal=True) image naser considering flip = im.Flip("naser/naser considering.png", horizontal=True) image naomi considering flip = im.Flip("naomi/naomi considering.png", horizontal=True) +image naomi prom considering flip = im.Flip("naomi/naomi prom considering.png", horizontal=True) image rosa considering flip = im.Flip("rosa/rosa considering.png", horizontal=True) image trish considering flip = im.Flip("trish/trish considering.png", horizontal=True) image stella considering flip = im.Flip("stella/stella considering.png", horizontal=True) @@ -336,6 +337,7 @@ image naser unimpressed flip = im.Flip("naser/naser unimpressed.png", horizontal image naser prom unimpressed flip = im.Flip("naser/naser prom unimpressed.png", horizontal=True) image trish unimpressed flip = im.Flip("trish/trish unimpressed.png", horizontal=True) image naomi unimpressed flip = im.Flip("naomi/naomi unimpressed.png", horizontal=True) +image naomi prom unimpressed flip = im.Flip("naomi/naomi prom unimpressed.png", horizontal=True) image stella unimpressed flip = im.Flip("stella/stella unimpressed.png", horizontal=True) image trish future unimpressed flip = im.Flip("trish/trish future unimpressed.png", horizontal=True) image fangdad unimpressed flip = im.Flip("fangparents/fangdad unimpressed.png", horizontal=True) @@ -359,6 +361,7 @@ image trish indignant flip = im.Flip("trish/trish indignant.png", horizontal=Tru #surprised flip image fang surprised flip = im.Flip("fang/basic set/fang surprised.png", horizontal=True) image trish surprised flip = im.Flip("trish/trish surprised.png", horizontal=True) +image trish prom surprised flip = im.Flip("trish/trish prom surprised.png", horizontal=True) image naser surprised flip = im.Flip("naser/naser surprised.png", horizontal=True) #other flips diff --git a/game/script/13A.fang-loses-it-after-losing-prom-queen.rpy b/game/script/13A.fang-loses-it-after-losing-prom-queen.rpy index 95c9e21..7e52e01 100644 --- a/game/script/13A.fang-loses-it-after-losing-prom-queen.rpy +++ b/game/script/13A.fang-loses-it-after-losing-prom-queen.rpy @@ -60,7 +60,10 @@ label chapter_13A: N "Oh, Fang{cps=*.1}...{/cps}" - N "That’s an{cps=*.1}...{/cps} Interesting outfit you’re wearing." + N "That’s an{cps=*.1}...{/cps}{nw}" + show naomi prom considering + extend "Interesting outfit you’re wearing." + show naomi prom unimpressed with dissolve "Naomi side-eyes me a dagger." @@ -129,14 +132,14 @@ label chapter_13A: window auto pause .5 - + scene black with Dissolve(1) scene kitchen show dimmer_lighter show anon prom neutral flip: yalign 0.1 xalign 0.5 show naomi prom angry: yalign 0.0 xalign 0.0 - with Fade(1, 0, 1) + with Dissolve(1) pause 1 "She gives me a death stare for what seems like a solid minute before she begins yelling at me." @@ -185,6 +188,7 @@ label chapter_13A: show anon: pause .75 easein_back 1 xalign 0.65 + show naomi prom unimpressed with dissolve "Naomi sighs and walks away, shoving into my shoulder on the way out, completely disregarding my presence." show anon prom neutral with dissolve @@ -246,7 +250,7 @@ label chapter_13A: "Naomi’s leaned against a wall next to the entry to that hall." - show naomi prom angry flip with dissolve + show naomi prom unimpressed flip with dissolve "She turns to me, with an expression of very intently restrained rage on her face." "Did I really do this, Naomi?" @@ -259,6 +263,8 @@ label chapter_13A: show fang a prom considering with dissolve "Fang looked ready to set her house on fire until she caught me in the corner of her eye." + window hide + window auto pause .5 stop music fadeout 4 @@ -274,6 +280,7 @@ label chapter_13A: pause .2 hide anon hide fang + show naomi prom considering flip with dissolve "Without a word she grabbed me by the wrist and dragged me through the front door, guitar in her other hand." @@ -282,12 +289,13 @@ label chapter_13A: pause .5 play ambient 'audio/effects/nightLoop.ogg' fadein 3 + scene black with Dissolve(1) scene home fang outside night show fang a prom considering: yalign 0.0 xalign 0.8 show anon prom neutral: yalign 0.1 xalign 0.3 - with Fade(1, 0, 1) + with Dissolve(1) pause .5 F "{cps=*.1}...{/cps}’mme call a taxi or something." @@ -304,7 +312,8 @@ label chapter_13A: pause .5 stop ambient fadeout 4 - scene taxi night with Fade(1, 0, 1) + scene black with Dissolve(1) + scene taxi night with Dissolve(1) pause .5 D "Ay, it’s my favorite couple again! How’s the leg, skinnie?" @@ -366,12 +375,14 @@ label chapter_13A: pause .5 play ambient 'audio/effects/nightLoop.ogg' fadein 3 + play ambient1 'audio/effects/teenageCrowdMurmurLoop.ogg' fadein 3 + scene black with Dissolve(1) scene outside school night show fang a prom neutral: yalign 0.0 xalign -0.1 show anon prom neutral: yalign 0.1 xalign -0.25 - with Fade(1, 0, 1) + with Dissolve(1) pause .5 "Eventually the cab pulls up to the school gymnasium, illuminated by the celebratory decorative string lights." @@ -400,6 +411,7 @@ label chapter_13A: pause .5 stop ambient fadeout 4 + stop ambient1 fadeout 4 play music 'audio/OST/ballad_of_the_boot.ogg' fadein 1.0 show fang: @@ -452,7 +464,8 @@ label chapter_13A: hide anon with dissolve pause .5 - scene prom with Fade(1, 0, 1) + scene black with Dissolve(1) + scene prom with Dissolve(1) "The two of us go up to the entrance, the room filled with seniors, strobe lights and a very suspicious smelling fog." show reed sunglasses flip: @@ -501,6 +514,8 @@ label chapter_13A: window auto pause .5 + scene black with Dissolve(1) + pause 0.5 scene bandroom show fang a prom neutral: yalign 0.0 xalign 0.9 @@ -510,15 +525,24 @@ label chapter_13A: yalign 0.1 xalign -0.6 show trish prom neutral flip: yalign 0.0 xalign 1.2 - with fade + with Dissolve(1) "We hauled ass to Mr.Jingo’s room, where the band had stored their gear." "Reed’s drumset was in pieces and I helped him reassemble it while Trish and Fang tuned their guitars." + window hide + window auto pause .5 stop music play sound 'audio/effects/stringsnap.ogg' # CC0 - "{i}*TWANG*{/i}" + show fang: + easein_cubic 0.5 xalign 0.88 + show fang a prom shock + show trish prom surprised flip + + pause 1 + + #"{i}*TWANG*{/i}" show fang: easein_back 0.5 xalign 1.0 @@ -608,13 +632,15 @@ label chapter_13A: "I didn’t even want to be here in the first place, but{cps=*.1}...{/cps}" "But I’m following Moe’s advice and supporting Fang, right?" + window hide + window auto pause .5 play music "audio/effects/promChatterLoop2.ogg" fadein 3 scene prom show anon prom neutral: yalign 0.1 xalign 0.3 - with Fade(1, 0, 1) + with Dissolve(2) "The music slams into me as I reenter the room, grating on my ears and thrumming roughly in my chest." @@ -790,7 +816,9 @@ label chapter_13A: Sp "{cps=*.3}Naaaaaser aaaaand Naaaaoooomiiiiii!{/cps}" - play ambient 'audio/effects/teenageCrowdFarLoop.ogg' fadein 1 + play ambient 'audio/effects/crowdCheerLoop.ogg' fadein 1 + play ambient1 'audio/effects/teenageCrowdFarLoop.ogg' fadein 2 + $ renpy.music.set_volume(0.4, 0, 'ambient1') "He tosses the paper over his shoulder and yanks out the crowns from a pocket inside his jacket." window hide window auto @@ -822,6 +850,9 @@ label chapter_13A: "Spears offers the crowns to Naomi, who puts the larger one on Naser’s crest to droop off, and then dons the tiara{cps=*.1}...{/cps}" "The whole moment is picturesque, just like Naomi wanted." + + stop ambient fadeout 4 + $ renpy.music.set_volume(1, 4, 'ambient1') pause .5 show naomi prom happy flip with dissolve @@ -839,7 +870,7 @@ label chapter_13A: window hide window auto - show naomi prom neutral flip with dissolve + show naomi prom unimpressed flip with dissolve pause .5 show naomi: @@ -893,7 +924,7 @@ label chapter_13A: "And then Fang comes on with her bass as well." pause .5 - stop ambient fadeout 3 + stop ambient1 fadeout 3 play music 'audio/OST/you can_t sage here.ogg' fadein 1.0 pause .5 @@ -964,11 +995,6 @@ label chapter_13A: scene prom fang freak out a ending with Dissolve(1) "Fang stays a moment longer, the despair on her face manifesting through hot streams of tears." - window hide - window auto - pause 1 - - scene prom with fade pause .5 "She turns to leave as well, trying to maintain a calm composure." @@ -977,6 +1003,12 @@ label chapter_13A: pause .5 "It splashes against her head, drenching her suit in red dye and making her smash onto the floor." + window hide + window auto + pause 1 + + scene prom with Dissolve(1) + pause .5 "A few more food articles follow while Fang scrambles to get up." @@ -1068,6 +1100,7 @@ label chapter_13A: show trish: easein_quart 1.5 xalign 0.65 + show trish prom surprised flip with dissolve T "I, whu-" A "I don’t care, I need to find Fang. Now." diff --git a/game/script/14A.KO_OP-ending.rpy b/game/script/14A.KO_OP-ending.rpy index 62d2f0e..0895d24 100644 --- a/game/script/14A.KO_OP-ending.rpy +++ b/game/script/14A.KO_OP-ending.rpy @@ -1,4 +1,3 @@ -image fangfog = im.Blur(im.MatrixColor("fang/emotive set/fang anguish.png",im.matrix.brightness(-1)), 1.5) image red = "#ff0000" label chapter_14A: @@ -723,11 +722,7 @@ label chapter_14A: $ renpy.music.set_volume(1, 0, 'ambient') $ renpy.music.set_volume(0, 0, 'ambient1') #policeSirenReverbLoop $ renpy.music.set_volume(1, 0, 'ambient3') - scene roof fog - show fangfog: - yanchor 0.5 xanchor 0.5 - ypos 0.6 xpos 0.5 - alpha 0.25 zoom 0.25 + scene roofshooter play ambient "audio/effects/windShooterLoop.ogg" fadein 5 volume 0.7 play ambient3 "audio/effects/radioChatterLoop.ogg" fadein 5 volume 0.3 @@ -817,7 +812,7 @@ label chapter_14A: hide red with Dissolve(0.4) hide fang flash blurred with Dissolve(2) - pause 2 + pause 3 A "{i}ARGH!{/i}" pause .5 @@ -828,18 +823,19 @@ label chapter_14A: $ renpy.music.set_volume(1, 0, 'ambient3') "Hot, searing pain." - + pause .5 "My left leg crumples under me." pause 1 "As I fall I see Fang’s beautiful amber eyes." + pause .5 "They’re red and puffy, with makeup-less tears running freely down her cheeks." - stop sound fadeout 5 + stop sound fadeout 4 window hide window auto - pause 1 + pause 1.5 play audio 'audio/effects/shooterWitnessed.ogg' volume 0.6 play ambient1 'audio/effects/hungrybeast.ogg' volume 0.05 fadein 2 @@ -1175,7 +1171,11 @@ label chapter_14A: pause 2 scene black with Dissolve(1) - pause .5 + pause 1 + A "{i}Fang!{/i}" + window hide + window auto + pause 1 $ renpy.music.set_volume(0, 3, 'ambient1') scene shooterroof: @@ -1183,20 +1183,25 @@ label chapter_14A: #xanchor 0.5 yanchor 0.5 xpos 0.5 ypos 0.5 #zoom 1.12 with Dissolve(3) - stop ambient1 - pause 1 - $ renpy.music.set_volume(1, 0, 'ambient1') - "She jumps." - pause .5 + play ambient 'audio/effects/windShooterLoop.ogg' volume 0.2 fadein 2 + $ renpy.music.set_volume(1, 1.5, 'ambient1') + pause 0.5 - A "{i}Fang!{/i}" + #"She jumps." + #pause .5 - window hide - window auto play sound 'audio/effects/shooterFangJumps.ogg' volume 0.7 + + $ renpy.music.set_volume(0, 0.6, 'ambient1') + $ renpy.music.set_volume(0, 0.6, 'ambient') pause 6 + stop ambient + stop ambient1 + $ renpy.music.set_volume(1, 0, 'ambient1') + $ renpy.music.set_volume(1, 0, 'ambient') + "I can’t look over." pause .5 @@ -1305,15 +1310,23 @@ label chapter_14A: stop ambient fadeout 5 play ambient1 "audio/effects/drizzleLoop.ogg" fadein 3 play ambient2 "audio/effects/windLightLoop.ogg" fadein 3 - scene a15 with Fade(2, .5, 2) + + scene black with Dissolve(2) + pause 0.5 + scene a15 with Dissolve(2) pause 2 "The alternations of footsteps and the crutch make me feel more mechanical than human." + pause 0.5 "Then again, that may be true regardless of having a crutch." - window hide window auto + pause 0.5 + + play ambient "audio/effects/windShooterLoop.ogg" fadein 5 + $ renpy.music.set_volume(0.3, 4, 'ambient') + scene a14 with Dissolve(2) pause 2 "The two graves are right next to each other." @@ -1376,14 +1389,14 @@ label chapter_14A: stop ambient1 fadeout 10 stop ambient2 fadeout 20 - play ambient "audio/effects/windShooterLoop.ogg" fadein 20 + $ renpy.music.set_volume(1, 20, 'ambient') "{i}{cps=*.3}Don’t leave me alone.{/cps}{/i}" pause 1 "I just feel completely and utterly and hopelessly alone." - $ renpy.music.set_volume(0, 3, 'ambient1') + $ renpy.music.set_volume(0, 6, 'ambient1') window hide window auto pause 3 @@ -1412,7 +1425,8 @@ label chapter_14A: $ quick_menu = False window hide - stop ambient fadeout 20 + stop ambient fadeout 25 + $ renpy.music.set_volume(0, 25, 'ambient') pause 7 @@ -1427,4 +1441,5 @@ label chapter_14A: scene black with Dissolve(17.0) pause 5 + $ renpy.music.set_volume(1, 0, 'ambient') return diff --git a/game/script/x3-PTA-meeting.rpy b/game/script/x3-PTA-meeting.rpy index 81c0be0..1446efd 100644 --- a/game/script/x3-PTA-meeting.rpy +++ b/game/script/x3-PTA-meeting.rpy @@ -65,8 +65,8 @@ label chapter_x3: ease_cubic 0.8 xalign 0.8 show farnsworth: - ease_cubic 0.5 yalign 0.1 - ease_cubic 0.5 yalign 0.0 + easein_cubic 0.4 yalign 0.1 + easeout_cubic 0.4 yalign 0.0 Drf "Huhwha. Oh! Why are you in my attic?" window hide @@ -74,7 +74,8 @@ label chapter_x3: show farnsworth: ease_cubic 2.25 xalign 0.625 - easeout_cubic 1.5 xalign 0.35 + easeout_cubic 1.2 xalign 0.4 + easein_cubic 0.3 xalign 0.35 pause 2.95 show spears: @@ -101,8 +102,8 @@ label chapter_x3: show farnsworth behind fangmom with dissolve show jingo flip: - ease_cubic 0.5 yalign 0.1 - ease_cubic 0.5 yalign 0.0 + easein_cubic 0.5 yalign 0.1 + easeout_cubic 0.5 yalign 0.0 jingo "Yes I am the music head." show fangmom: @@ -110,8 +111,6 @@ label chapter_x3: pause .5 FM "And I am the parent ambassador." - window hide - window auto show fangmom: ease_cubic 1.5 xalign 1.3 @@ -119,8 +118,6 @@ label chapter_x3: pause 0.3 show fangmom neutral flip with dissolve - pause .5 - Sp "Now, onto the subject of this meeting." show spears: @@ -168,11 +165,8 @@ label chapter_x3: unknown "YOU HAVE NO PROOF THAT MY EUGENE WAS INVOLVED!" show carldelewski with dissolve - Sp "If we could foc-" + Sp "If we could foc-{w=.5}{nw}" - show fangmom: - ease_cubic 0.5 yalign 0.2 - ease_cubic 0.5 yalign 0.1 FM "Now now. I think we really should address the parents’ concerns, sir." unknown "YEAH! Like who let an {i}APE{/i} be around my precious Megan!" @@ -273,8 +267,10 @@ label chapter_x3: pause 1 + #Who the hell decided that jin shouldn't have a consistent naming scheme show jinflip behind spears at scenter: xalign 0.5 + hide jin with dissolve pause 0.5 @@ -290,14 +286,14 @@ label chapter_x3: pause 0.5 show carldelewski: - ease_cubic 0.5 yalign 0.1 - ease_cubic 0.5 yalign 0.0 + easein_cubic 0.4 yalign 0.1 + easeout_cubic 0.4 yalign 0.0 ease_cubic 0.5 xalign 0.8 carl "I KNEWS YOU WERE FAKIN’ IT!" show jinflip: - ease_cubic 0.5 xalign 0.3 + easein_cubic 1 xalign 0.3 Tsuki "Aye habbu no curue watto yo meano." window hide window auto diff --git a/game/script/x7-naomi-tribulations.rpy b/game/script/x7-naomi-tribulations.rpy index 3653d43..a83001c 100644 --- a/game/script/x7-naomi-tribulations.rpy +++ b/game/script/x7-naomi-tribulations.rpy @@ -1020,7 +1020,7 @@ label chapter_x7: pause 0.75 show trish: ease_cubic 1 xalign 0.0 - show trish sad with Dissolve(.25) + show trish sad notears with Dissolve(.25) pause .25 "Oh no, not the sad eyes." @@ -2087,6 +2087,6 @@ label chapter_x7: stop ambient fadeout 3.0 stop music fadeout 3.0 scene black with Dissolve(2) - pause 1 + pause 2 return \ No newline at end of file