diff --git a/game/audio/effects/outdoor ambience.ogg b/game/audio/effects/outdoor ambience.ogg new file mode 100644 index 0000000..2f9f525 Binary files /dev/null and b/game/audio/effects/outdoor ambience.ogg differ diff --git a/game/audio/effects/spearYellVoice.wav b/game/audio/effects/spearYellVoice.wav deleted file mode 100644 index d6ad7c0..0000000 Binary files a/game/audio/effects/spearYellVoice.wav and /dev/null differ diff --git a/game/images/naser/naser handout.png b/game/images/naser/naser handout.png new file mode 100644 index 0000000..c5caffc Binary files /dev/null and b/game/images/naser/naser handout.png differ diff --git a/game/script.rpy b/game/script.rpy index 1946c6a..74c127f 100644 --- a/game/script.rpy +++ b/game/script.rpy @@ -321,6 +321,7 @@ image jinflip = im.Flip("other/jin.png", horizontal=True) image farnsworth flip = im.Flip("other/farnsworth.png", horizontal=True) image carldelewski flip = im.Flip("other/carldelewski.png", horizontal=True) image fangdad unimpressed flip = im.Flip("fangparents/fangdad unimpressed.png", horizontal=True) +image naser handout flip = im.Flip("naser/naser handout.png", horizontal=True) # vfx image black = "#000" diff --git a/game/script/1.first-two-days-anon-meets-fang.rpy b/game/script/1.first-two-days-anon-meets-fang.rpy index 3f27f49..f08809d 100644 --- a/game/script/1.first-two-days-anon-meets-fang.rpy +++ b/game/script/1.first-two-days-anon-meets-fang.rpy @@ -185,6 +185,7 @@ label chapter_1: I "On the side of the building is where I find sanctuary" stop music fadeout 1.0 + play ambient 'audio/effects/outdoor ambience.ogg' fadein 0.5 # public domain ###maybe add some ambiance here? scene garden show anon neutral flip at scenter @@ -246,6 +247,10 @@ label chapter_1: I "I lay on the ground,{w=0.4} ass hurt from hitting jagged concrete and splintered wood." I "Thank god for jeans." + + stop ambient fadeout 0.5 + pause 0.5 + ###Maybe a good idea to have this song fade in, the silence from before clashes a bit. Though, I will hold off on implementing to see how the bench scene would feel with ambience. scene pathetic at Pan((0, 1031), (0, 0), 10.0) with dissolve @@ -1060,8 +1065,7 @@ label chapter_1: pause .5 show naser at nleft with MoveTransition(0.4, time_warp=_ease_in_time_warp) - #play sound "audio/effects/Slam.ogg" volume 2.2 - play sound "audio/effects/Slam.ogg" + play sound "audio/effects/Slam.ogg" volume 2.2 show naser table hit behind anon with vpunch pause 0.5 @@ -1187,7 +1191,6 @@ label chapter_1: I "The band doesn’t bother introducing themselves." - ###Here's the garbage that was supposed to play #also im convinced link related is the inspiration of song related #https://www.youtube.com/watch?v=Pbe9DkMyL8k play music 'audio/OST/its_the_piece_of_shit_you_asked_for.ogg' @@ -1224,7 +1227,7 @@ label chapter_1: stop ambient fadeout 1 unknown "{cps=*0.5}PFFFT AHAHAHA{/cps}{w=0.4} THEY STILL FUCKING SUCK!!" - play ambient 'audio/effects/chatter loop.ogg' fadein 1.0 + play ambient 'audio/effects/chatter loop.ogg' volume 2 fadein 1.0 #(In-CG insult layers) window hide @@ -1293,10 +1296,7 @@ label chapter_1: I "Oh God I can’t take this,{w=0.3} I’m gonna grow a 6 pack from laughing so much,{w=0.5} I’m just gonna grab my pizza and leave" - # play ambient fadeout 2.0 - #play ambient 'audio/effects/chatter loop.ogg' volume 1 fadeout 1.0 fadein 0.25 play ambient 'audio/effects/chatter loop.ogg' fadeout 1.0 fadein 0.25 - scene auditorium show anon neutral flip at aright show spears neutral at sleft @@ -1458,8 +1458,7 @@ label chapter_1: I "With practiced movements I execute a proper combat roll from bed,{w=0.4} tackling the floor and headbutting it into submission." - #play sound "audio/effects/Slam.ogg" volume 1.8 - play sound "audio/effects/Slam.ogg" + play sound "audio/effects/Slam.ogg" volume 1.8 I "With practiced movements I execute a proper combat roll from bed, tackling the floor and headbutting it into submission.{fast}{w=0.6} My foe defeated,{w=0.3} I groan in victory." with vpunch @@ -1643,13 +1642,12 @@ label chapter_1: show trish: easein_quart 0.5 xalign -0.05 pause 0.5 - easein_quart 0.5 xalign -0.15 + easein_quart 0.5 xalign -0.175 pause 1.5 I "The diminutive triceratops,{w=0.4} Trish,{w=0.4} bows her head and charges Naser." - # show naser shocked flip behind trish show trish fury with Dissolve(0.25): yanchor 0 ypos 0.35 @@ -1657,10 +1655,10 @@ label chapter_1: pause 0.3 - show naser shocked flip behind trish: + show naser handout flip behind trish: easein_quart 0.2 xalign 1.45 show trish: - easein_quart 0.2 xalign 0.5 + easein_quart 0.2 xalign 0.45 with hpunch pause 1 @@ -1669,20 +1667,20 @@ label chapter_1: # 0.5 show trish: - easeout_quart 0.4 xalign 0.525 - pause 0.2 - easeout_quart 0.4 xalign 0.55 + easeout_quart 0.2 xalign 0.46 pause 0.3 - linear 0.3 xalign 0.49 + easeout_quart 0.2 xalign 0.48 + pause 0.2 + linear 0.5 xalign 0.45 pause 0.4 repeat # 1.45 show naser: - easeout_quart 0.4 xalign 1.475 - pause 0.2 - easeout_quart 0.4 xalign 1.5 + easeout_quart 0.2 xalign 1.475 pause 0.3 - linear 0.3 xalign 1.4 + easeout_quart 0.2 xalign 1.5 + pause 0.2 + linear 0.5 xalign 1.45 pause 0.4 repeat @@ -1708,14 +1706,14 @@ label chapter_1: show naser: xalign 1.6 with ease + show naser neutral flip with dissolve I "She stops trying to gore Naser and throws her arms to her sides." - show naser neutral flip with dissolve pause 0.5 show trish: - easein_quart 1.0 xalign 0.4 + easein_quart 0.6 xalign 0.4 T "Screw you!" @@ -1745,7 +1743,7 @@ label chapter_1: show naomi neutral flip - N "Don’t worry about it,{w=0.3} it’s nothing." + N "Don’t worry about it,{w=0.4} it’s nothing." show naser explanatory flip with Dissolve(0.25) @@ -1766,6 +1764,8 @@ label chapter_1: N "Some concert,{w=0.3} right?" show naomi neutral flip + show naser neutral flip + with dissolve A "Actually,{w=0.5} about that{cps=*0.1}...{/cps}" @@ -2147,8 +2147,7 @@ label chapter_1: pause 0.75 stop music - #play ambient 'audio/effects/tinnitus.ogg' fadein 5 volume 0.25 # TODO: use Spears yell + tinnitus SFX - play ambient 'audio/effects/tinnitus.ogg' fadein 5.0 + play ambient 'audio/effects/tinnitus.ogg' fadein 5.0 # TODO Spears yell w/ tinnitus Sp "{b}NAOMI!!{/b}" with vpunch @@ -2536,8 +2535,7 @@ label chapter_1: I "Looking around for a place to sit I see the aggravating creamsicle waving at me." - #play music 'audio/OST/Summertime Synth.ogg' volume 0.65 fadein 0.05 - play music 'audio/OST/Summertime Synth.ogg' fadein 0.05 + play music 'audio/OST/Summertime Synth.ogg' volume 0.65 fadein 0.05 I "Next to her is Naser with a complicated expression."