diff --git a/game/audio/effects/fireAlarmReverbLoop.ogg b/game/audio/effects/fireAlarmReverbLoop.ogg index 10f4c56..49aedbe 100644 Binary files a/game/audio/effects/fireAlarmReverbLoop.ogg and b/game/audio/effects/fireAlarmReverbLoop.ogg differ diff --git a/game/images/anon/Other/fanganoncarry.png b/game/images/anon/Other/fanganoncarry.png index 460ba8d..8f0d342 100644 Binary files a/game/images/anon/Other/fanganoncarry.png and b/game/images/anon/Other/fanganoncarry.png differ diff --git a/game/images/fang/fullbody/fang flash.png b/game/images/fang/fullbody/fang flash.png deleted file mode 100644 index 2280f05..0000000 Binary files a/game/images/fang/fullbody/fang flash.png and /dev/null differ diff --git a/game/images/fang/fullbody/fang shoot.png b/game/images/fang/fullbody/fang shoot.png deleted file mode 100644 index 6f174c8..0000000 Binary files a/game/images/fang/fullbody/fang shoot.png and /dev/null differ diff --git a/game/images/fang/fullbody/fangarm.png b/game/images/fang/fullbody/fangarm.png index 3f43c3e..bfcc737 100644 Binary files a/game/images/fang/fullbody/fangarm.png and b/game/images/fang/fullbody/fangarm.png differ diff --git a/game/images/fang/fullbody/kissu1.png b/game/images/fang/fullbody/kissu1.png index 627163c..a778954 100644 Binary files a/game/images/fang/fullbody/kissu1.png and b/game/images/fang/fullbody/kissu1.png differ diff --git a/game/images/naomi/naomi slapped.png b/game/images/naomi/naomi slapped.png index 00d7807..ce1df55 100644 Binary files a/game/images/naomi/naomi slapped.png and b/game/images/naomi/naomi slapped.png differ diff --git a/game/images/other/anonfacecloseup.png b/game/images/other/anonfacecloseup.png deleted file mode 100644 index b81421c..0000000 Binary files a/game/images/other/anonfacecloseup.png and /dev/null differ diff --git a/game/images/other/elliot_raptor.png b/game/images/other/elliot_raptor.png deleted file mode 100644 index 0cbb541..0000000 Binary files a/game/images/other/elliot_raptor.png and /dev/null differ diff --git a/game/images/other/orangeslice.png b/game/images/other/orangeslice.png index aa009d4..428f653 100644 Binary files a/game/images/other/orangeslice.png and b/game/images/other/orangeslice.png differ diff --git a/game/images/other/pocky.png b/game/images/other/pocky.png index 41432ec..d97effe 100644 Binary files a/game/images/other/pocky.png and b/game/images/other/pocky.png differ diff --git a/game/images/other/sodacan.png b/game/images/other/sodacan.png index 2859c4d..fd3bf69 100644 Binary files a/game/images/other/sodacan.png and b/game/images/other/sodacan.png differ diff --git a/game/images/rosa/rosa hug.png b/game/images/rosa/rosa hug.png index 05d985a..e8264f0 100644 Binary files a/game/images/rosa/rosa hug.png and b/game/images/rosa/rosa hug.png differ diff --git a/game/images/trish/trish and anon cuck fang.png b/game/images/trish/trish and anon cuck fang.png index 9ceb07f..86fd84c 100644 Binary files a/game/images/trish/trish and anon cuck fang.png and b/game/images/trish/trish and anon cuck fang.png differ diff --git a/game/images/vfx/fang shoot flash.png b/game/images/vfx/fang shoot flash.png new file mode 100644 index 0000000..2e3d283 Binary files /dev/null and b/game/images/vfx/fang shoot flash.png differ diff --git a/game/images/vfx/naserelbowflash.png b/game/images/vfx/naserelbowflash.png deleted file mode 100644 index 689e38f..0000000 Binary files a/game/images/vfx/naserelbowflash.png and /dev/null differ diff --git a/game/images/vfx/pickicon.png b/game/images/vfx/pickicon.png deleted file mode 100644 index aeb64c6..0000000 Binary files a/game/images/vfx/pickicon.png and /dev/null differ diff --git a/game/images/vfx/pickicon2.png b/game/images/vfx/pickicon2.png deleted file mode 100644 index f3a0f4e..0000000 Binary files a/game/images/vfx/pickicon2.png and /dev/null differ diff --git a/game/mods_example/template/chapter2_redo.rpy b/game/mods_example/template/chapter2_redo.rpy deleted file mode 100644 index f3fa127..0000000 --- a/game/mods_example/template/chapter2_redo.rpy +++ /dev/null @@ -1,36 +0,0 @@ - - -label chapter_2_new: - show template_sample at scenter - "Sample Text" - - hide template_sample - play music 'audio/OST/Those Other Two Weirdos.ogg' - show anon neutral flip at aright with dissolve - A "Sample Text" - F "Sample Text" - Lucy "Sample Text" - Ro "Sample Text" - St "Sample Text" - N "Sample Text" - Nas "Sample Text" - T "Sample Text" - Attendant "Sample Text" - Sp "Sample Text" - Re "Sample Text" - D "Sample Text" - FM "Sample Text" - FD "Sample Text" - Tsuki "Sample Text" - unknown "Sample Text" - jingo "Sample Text" - MaitD "Sample Text" - Moe "Sample Text" - Vince "Sample Text" - Waitress "Sample Text" - AnonAndFang "Sample Text" - SV "Sample Text" - carl "Sample Text" - Drf "Sample Text" - FRT "Sample Text" - return diff --git a/game/mods_example/template/img/sample.png b/game/mods_example/template/img/sample.png deleted file mode 100644 index a90472f..0000000 Binary files a/game/mods_example/template/img/sample.png and /dev/null differ diff --git a/game/mods_example/template/storyline_ex.rpy b/game/mods_example/template/storyline_ex.rpy deleted file mode 100644 index ab3f492..0000000 --- a/game/mods_example/template/storyline_ex.rpy +++ /dev/null @@ -1,15 +0,0 @@ - -init python: - # Modding Support variables - # All mod rpy files must have title of their mod (this shows up on a button) - # and finally the label that controls the flow of dialogue - - mod_menu_access += [{ - 'Name': "Example Mod Name", - 'Label': "storyline_ex" - }]; - -image template_sample = Image("mods_example/template/img/sample.png") - -label storyline_ex: - call chapter_2_new diff --git a/game/script.rpy b/game/script.rpy index a103677..f896af8 100644 --- a/game/script.rpy +++ b/game/script.rpy @@ -302,6 +302,15 @@ screen textscroll(): add "fang phone" +# Naser's position when helping Anon get up +transform nmidright: + xalign 1.5 yalign 0.08 + +# Naomi's position when handing the brochure to Anon +transform scloserleft: + xalign 0.1 yalign 0.0 + + label start: $ fangscore = 0 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 16b841e..85001a0 100644 --- a/game/script/1.first-two-days-anon-meets-fang.rpy +++ b/game/script/1.first-two-days-anon-meets-fang.rpy @@ -1,19 +1,6 @@ -# Naser and Naomi reacting to Anon landing on his ass -image naser silo = im.Flip(im.MatrixColor("naser/naser neutral.png",im.matrix.brightness(-1)), horizontal=True) -image naomi silo = im.MatrixColor("naomi/naomi neutral.png",im.matrix.brightness(-1)) -image naser silo shocked = im.Flip(im.MatrixColor("naser/naser shocked.png",im.matrix.brightness(-1)), horizontal=True) -image naomi silo shocked = im.MatrixColor("naomi/naomi shocked.png",im.matrix.brightness(-1)) - -# Naser's position when helping Anon get up -transform nmidright: - xalign 1.5 yalign 0.08 - -# Naomi's position when handing the brochure to Anon -transform scloserleft: - xalign 0.1 yalign 0.0 - label chapter_1: #First Day of School + scene black with Dissolve(1) stop music fadeout 3 play ambient 'audio/effects/outdoorLoop.ogg' fadein 3 pause 2.5 @@ -168,7 +155,6 @@ label chapter_1: "Not like I'll ever be a part of one anyway." scene stairs at Pan((553,169), (553, 169), 0) with None # snap here if the player is advancing the dialogue quickly - image iris = im.FactorScale(im.MatrixColor("vfx/iris.png",im.matrix.opacity(0.9)), 4.5) window hide show iris: xalign 0.99 yalign 0.75 @@ -1517,6 +1503,9 @@ label chapter_1: pause .5 + show black with Dissolve(1) + pause 0.5 + play ambient 'audio/effects/teenageCrowdFarLoop.ogg' fadein 3 scene auditorium show anon neutral flip at aright @@ -1524,7 +1513,7 @@ label chapter_1: show tablesmash behind anon, naser show tablesmashpizzas behind anon, naser, tablesmash show tablesmashpizza behind anon, naser, tablesmashpizzas - with Fade(1, 0, 1) + with Dissolve(1) pause .5 "Naser leads me and the large crowd into the shitty school theater." @@ -2020,6 +2009,8 @@ label chapter_1: stop music1 fadeout 2 $ renpy.music.set_volume(1, 0, 'ambient') play ambient 'audio/effects/teenageCrowdFarLoop.ogg' fadein 2 + show anon: + easeout_cubic 1 xalign 1.4 hide anon with Dissolve(1) pause .5 @@ -2038,12 +2029,14 @@ label chapter_1: window hide window auto + pause 1 + show black with Dissolve(1) pause 1 play ambient 'audio/effects/schoolLoop.ogg' fadein 5 scene hallway show anon neutral at acenter - with Fade(1, 1, 1) + with Dissolve(1) pause .5 "Back in the foyer I see some boxes of partially finished pizza left." @@ -2054,11 +2047,12 @@ label chapter_1: window auto pause .5 - play ambient "audio/effects/outdoorNatureLoop.ogg" fadeout 1.5 fadein 1.5 + show black with Dissolve(1) + scene outside school show anon neutral at acenter - with Fade(1, 0, 1) + with Dissolve(1) pause .5 "The sun is starting to set now as I make my way home." @@ -2316,7 +2310,9 @@ label chapter_1: pause 0.5 stop music fadeout 6 - scene hallway with Fade(1, 1, 1) + scene black with Dissolve(1) + pause 1 + scene hallway with Dissolve(1) pause .5 "After what feels like a space decade of walking, or really just half an hour I find the crippled pteradon being accosted by a {cps=*0.1}VERY{/cps} pissed off purple midget." @@ -2574,6 +2570,8 @@ label chapter_1: window hide window auto + pause 0.5 + show black with Dissolve(1) pause 0.5 stop ambient fadeout 3 @@ -2582,7 +2580,7 @@ label chapter_1: show naomi unimpressed at sleft show reed neutral flip behind naomi: yalign 0.1 xalign 1.2 - with Fade(1, 0, 1) + with Dissolve(1) "Just as I reach the office the sound of clinking glass draws my attention to the apricot asspain and some pink raptor." @@ -2723,7 +2721,9 @@ label chapter_1: pause .5 stop music fadeout 4 - scene hallway with Fade(1, 1, 1) + scene black with Dissolve(1) + pause 1 + scene hallway with Dissolve(1) pause 0.5 A "How the fuck did I end up here?" @@ -2881,7 +2881,8 @@ label chapter_1: label lspears_office: play music 'audio/OST/we just turned on the microphone in our programmers_ house.ogg' fadein 3 - scene office spears with Fade(1, 0, 1) + show black with Dissolve(1) + scene office spears with Dissolve(1) pause .5 "I open the door to the cramped office, expecting to see a gruff cave of a workspace." @@ -3200,10 +3201,12 @@ label chapter_1: window hide window auto pause .5 + show black with Dissolve(0.5) + pause 1 scene hallway show anon neutral flip at acenter - with Fade(0.5, 1, 1) + with Dissolve(1) pause .5 A "That happen often{cps=*0.1}...?{/cps}" @@ -3310,30 +3313,20 @@ label chapter_1: Nas "Weird guy." pause .5 - A "Uh, Naser{w}, {cps=*.4}I actually wanted to talk to-{/cps}{w=.3}{nw}" - - #What the fuck are these doing here - #stop ambient fadeout 0.69 - pause 0.6 - - $ renpy.music.set_volume(0, 0.2, 'music') - stop music fadeout 0.2 + A "Uh,{w=0.4} Naser,{w=0.4} {cps=*.7}I actually wanted to talk to-{/cps}{w=.6}{nw}" + $ renpy.music.set_volume(0.2, 0.05, "music") #pause 0.1 play sound 'audio/effects/schoolBell.ogg' - "{cps=*20}{i}DING-{w=0.7}DONG {w=0.7}BING-{w=0.7}BONG{/i}{/cps}" + #"{cps=*20}{i}DING-{w=0.7}DONG {w=0.7}BING-{w=0.7}BONG{/i}{/cps}" - window hide - window auto - pause 0.5 - stop sound fadeout 0.69 - - show naser considering flip: + pause 1.0 + show naser: easein_quad 0.5 xalign 1.7 - pause .5 + show naser considering flip with dissolve - $ renpy.music.set_volume(1, 0, 'music') - play music 'audio/ost/west_coast_kicking.ogg' fadein 1 + stop sound fadeout 4 + $ renpy.music.set_volume(1.0, 4, "music") Nas "Crap, can’t miss my homeroom today." @@ -3412,17 +3405,18 @@ label chapter_1: "Then they went right back to talking about me." - "{cps=*.1}...{/cps} No use feeling bad about the past." + "{cps=*.1}...{/cps}No use feeling bad about the past." window hide window auto pause .5 - stop ambient fadeout 3 + show black with Dissolve(1) + scene cafeteria show anon neutral at acenter play ambient1 'audio/effects/teenageCafeteriaLoop.ogg' fadein 3 - with Fade(1, 0, 1) + with Dissolve(1) pause .5 "I’m here now." @@ -3477,12 +3471,14 @@ label chapter_1: window auto pause .5 + show black with Dissolve(1) + scene cafeteria show anon neutral at aleft show naomi neutral flip at sright show naser sad flip behind naomi: xalign 0.7 yalign -0.1 - with Fade(1, 0, 1) + with Dissolve(1) pause 0.5 show naomi explanatory flip diff --git a/game/script/11.school-assignment-and-route-lock.rpy b/game/script/11.school-assignment-and-route-lock.rpy index a1ac7db..22f1272 100644 --- a/game/script/11.school-assignment-and-route-lock.rpy +++ b/game/script/11.school-assignment-and-route-lock.rpy @@ -236,15 +236,13 @@ label chapter_11: A "I told Fang I like her!" pause 0.25 - $ renpy.music.set_volume(0, 0.02, 'music') - stop music fadeout 0.2 + stop music fadeout 0.02 pause .75 "Shit, I said that out loud." window hide window auto - $ renpy.music.set_volume(1, 0, 'music') pause .5 show naser: @@ -287,24 +285,38 @@ label chapter_11: show anon: easeout_back 1 xalign 2.8 pause .5 + stop ambient fadeout 0.1 + + show naser: + xalign 0.6 + show anon: + xalign 0.9 + pause 0 hide anon - scene naserelbowflash - pause 0.01 + scene black + show naser elbow: + xalign 0.9 + matrixcolor BrightnessMatrix(1) + pause 0 scene hallway show naser elbow: - easein_elastic 0.5 xalign 1.1 + matrixcolor BrightnessMatrix(-1) + parallel: + easein_elastic 0.5 xalign 1.1 + parallel: + linear 0.25 matrixcolor BrightnessMatrix(0) show white: linear 0.25 alpha 0 hide dimmer_darker - stop ambient fadeout 0.2 play sound 'audio/effects/lockerAnonsDead.ogg' with hpunch A "{b}FUCK!{/b}{fast}" pause .5 - play ambient 'audio/effects/schoolLoop.ogg' fadein 3 + $ renpy.music.set_volume(1, 0, 'ambient') + play ambient 'audio/effects/schoolLoop.ogg' fadein 3 volume 0.5 "A few students start turning their heads." pause .5 @@ -318,8 +330,9 @@ label chapter_11: window auto pause .5 - play sound 'audio/effects/slapstickwipe.ogg' + play sound [ "", 'audio/effects/slapstickwipe.ogg'] show naser angry: + matrixcolor BrightnessMatrix(0) # For some reason skipping misses this, so force it back on so naser isn't black easein_cubic 1 xalign 0.9 yalign 0.1 show anon fear flip: yalign 0.1 xalign 1.4 @@ -1390,7 +1403,7 @@ label chapter_11: A "You gonna stay for dinner Naser?" pause .5 - Nas "{cps=*.6}I want to but-{/cps}{w=.4}{nw}" + Nas "{cps=*.6}I want to but-{/cps}{w=.7}{nw}" window hide Dissolve(0.0001) window auto @@ -1422,7 +1435,7 @@ label chapter_11: pause .5 show anon neutral flip with dissolve - stop ambient fadeout 5 + stop ambient fadeout 4 $ renpy.music.set_volume(1, 2, 'music') "I turn back to Fang." pause .5 @@ -3759,6 +3772,7 @@ label chapter_11: "As soon as I set the cup down a pair of arms wrap around my head." + $ renpy.mark_image_seen('fullbody_rosahug') hide rosa hide anon show rosa hug @@ -3766,7 +3780,12 @@ label chapter_11: pause .5 "Oh god oh fuck Rosa is actually gonna kill me." - pause 1 + pause 0.5 + + #python: + # if renpy.seen_image("moes pizza"): + # renpy.show('fang angry') + Ro "You stupid boys. Always hiding away your own pain." @@ -4350,8 +4369,6 @@ label chapter_11: "I hear Reed’s footsteps get further away, and stop for a split second." window hide window auto - $ renpy.music.set_volume(0, 0, 'ambient') - play ambient "audio/effects/firealarmreverbloop.ogg" loop show anon neutral: yalign 0.1 xalign 0.0 @@ -4365,25 +4382,13 @@ label chapter_11: window auto pause .5 + $ renpy.music.set_volume(0, 0.0, 'ambient') + play ambient "audio/effects/firealarmreverbloop.ogg" loop $ renpy.music.set_volume(0, 0.1, 'music') - $ renpy.music.set_volume(1, 0.1, 'ambient') - pause .5 + $ renpy.music.set_volume(1, 0.05, 'ambient') + pause .75 show anon ohshit with Dissolve(.25) - pause 0.5 - - image sprinkler: - "sprinkler 1" - pause 0.066 - "sprinkler 2" - pause 0.066 - block: - "sprinkler 3" - pause 0.066 - "sprinkler 4" - pause 0.066 - "sprinkler 5" - pause 0.066 - repeat + pause 0.25 # TODO: SFX play ambient1 'audio/effects/fireAlarmExtinguishersLoop.ogg' volume 0.9 @@ -4415,14 +4420,6 @@ label chapter_11: show dimmer_darker behind anon with dissolve - # general chaos - image teacher1 = im.MatrixColor("other/carldelewski.png",im.matrix.brightness(-1)) - image teacher2 = im.MatrixColor("other/farnsworth.png",im.matrix.brightness(-1)) - image teacher3 = im.Flip(im.MatrixColor("other/jin.png",im.matrix.brightness(-1)), horizontal=True) - image teacher4 = im.MatrixColor("other/jingo.png",im.matrix.brightness(-1)) - image student1 = im.MatrixColor("stella/chadshark.png",im.matrix.brightness(-1)) # obligatory Chadshark cameo - image student2 = im.Flip(im.MatrixColor("stella/stella neutral.png",im.matrix.brightness(-1)), horizontal=True) - image student3 = im.Flip(im.MatrixColor("rosa/rosa shocked.png",im.matrix.brightness(-1)), horizontal=True) show teacher1: alpha 0.5 yalign 0.0 xalign 2.0 @@ -4506,8 +4503,8 @@ label chapter_11: hide anon with dissolve pause .5 - stop ambient fadeout 3 - stop ambient1 fadeout 3 + stop ambient fadeout 5 + stop ambient1 fadeout 1.5 stop ambient2 fadeout 5 $ renpy.music.set_volume(1, 3, 'ambient') $ renpy.music.set_volume(1, 3, 'ambient1') @@ -4573,6 +4570,9 @@ label chapter_11: window auto pause .5 + scene black with Dissolve(1) + pause 0.5 + play music 'audio/OST/ballad_of_the_boot.ogg' fadein 1.0 scene auditorium show dimmer_light @@ -4580,7 +4580,7 @@ label chapter_11: yalign 0.0 xalign 0.1 show fang very sad flip: yalign 0.0 xalign 0.9 - with Fade(1, 0, 1) + with Dissolve(1) pause 1 T "{i}WHY{/i} don't you want to talk about it?" @@ -5272,7 +5272,7 @@ label chapter_11: A "Well, I hold one of these," show pocky: - ypos .175 xpos .395 zoom .65 rotate 10 + ypos .175 xpos .395 rotate 10 with dissolve "I take one of the green sugary sticks from the box and hold the plain end by my teeth." diff --git a/game/script/11D.anon-gets-fangs'-pronouns-right-and-she-teases-him-while-carrying-herself-with-more-confidence.rpy b/game/script/11D.anon-gets-fangs'-pronouns-right-and-she-teases-him-while-carrying-herself-with-more-confidence.rpy index f4a4685..d0ab3a3 100644 --- a/game/script/11D.anon-gets-fangs'-pronouns-right-and-she-teases-him-while-carrying-herself-with-more-confidence.rpy +++ b/game/script/11D.anon-gets-fangs'-pronouns-right-and-she-teases-him-while-carrying-herself-with-more-confidence.rpy @@ -255,7 +255,7 @@ label chapter_11D: xalign -0.8 easein_cubic 1.5 xalign 0.0 with None - pause 0.0001 + show anon neutral flip behind fang show fang surprised flip show spears neutral diff --git a/game/script/12C.anon-fang-lovey-dovey.rpy b/game/script/12C.anon-fang-lovey-dovey.rpy index f83db0a..6369d0f 100644 --- a/game/script/12C.anon-fang-lovey-dovey.rpy +++ b/game/script/12C.anon-fang-lovey-dovey.rpy @@ -480,7 +480,7 @@ label chapter_12C: easein_cubic 1.5 xalign -0.2 show rosa behind anon: easein_cubic 1.5 xalign 0.2 - pause 0.0001 + with None show stella neutral flip: xalign 1.4 easein_cubic 1.5 xalign 1.0 diff --git a/game/script/12D.aquarium.rpy b/game/script/12D.aquarium.rpy index 5fb9e18..60a89b3 100644 --- a/game/script/12D.aquarium.rpy +++ b/game/script/12D.aquarium.rpy @@ -124,7 +124,6 @@ label chapter_12D: ease_cubic 1.5 xalign 0.225 show fang: - pause 0.0001 "fang very happy" with Dissolve(0.2) block: parallel: @@ -219,7 +218,7 @@ label chapter_12D: show fang: easein_cubic 0.3 xalign 1.25 - pause 0.0001 + with None show fang_adorable_flip_hack behind anon: xalign 0.5 easein_cubic 0.3 xalign 0.0 diff --git a/game/script/13C.fang-and-anon-go-to-beach-and-prom.rpy b/game/script/13C.fang-and-anon-go-to-beach-and-prom.rpy index 6a82bb8..a650d2f 100644 --- a/game/script/13C.fang-and-anon-go-to-beach-and-prom.rpy +++ b/game/script/13C.fang-and-anon-go-to-beach-and-prom.rpy @@ -180,7 +180,7 @@ label chapter_13C: easein_cubic 1 xalign -0.6 show naser: easein_cubic 1 xalign 0.6 - pause 0.0001 + with None show naomi prom angry flip: xalign 1.7 easein_cubic 1 xalign 1.3 @@ -211,11 +211,11 @@ label chapter_13C: easeout_cubic 1.5 xalign 0.4 show anon: easeout_cubic 1.5 xalign 0.0 - pause 0.0001 + with None show anon prom neutral flip show naomi prom unimpressed flip with dissolve - pause 0.5 + pause 0.4 hide naomi hide anon with dissolve @@ -453,7 +453,7 @@ label chapter_13C: easeout_cubic 1 xalign 1.2 show anon: easeout_cubic 1 xalign 1.2 - pause 0.0001 + with None show fang c prom happy show anon prom neutral with dissolve @@ -593,7 +593,7 @@ label chapter_13C: easein_cubic 1 xalign 0.0 show fang: easein_cubic 1 xalign 1.7 - pause 0.0001 + with None show naser prom unimpressed show naomi prom neutral show fang c prom neutral flip @@ -791,7 +791,7 @@ label chapter_13C: easein_cubic 1 xalign -0.2 show fang: easein_cubic 1 xalign 0.0 - pause 0.0001 + with None show naser prom neutral flip: xalign 1.5 yalign 0.1 easein_cubic 1 xalign 1.0 @@ -934,7 +934,7 @@ label chapter_13C: easein_cubic 1 xalign 0.6 show fang: easein_cubic 1 xalign 1.2 - pause 0.0001 + with None show spears neutral: xalign -0.5 easein_cubic 1 xalign 0.0 @@ -1010,7 +1010,7 @@ label chapter_13C: easein_cubic 1 xalign 0.2 show fang: easein_cubic 1 xalign 0.3 - pause 0.0001 + with None show trish prom bass flip: xalign 1.5 easein_cubic 1.5 xalign 1.0 @@ -1033,7 +1033,7 @@ label chapter_13C: easein_cubic 1 xalign 0.05 show fang: easein_cubic 1 xalign 0.2 - pause 0.0001 + with None show anon prom shock show fang c prom surprised behind anon with dissolve @@ -1139,7 +1139,7 @@ label chapter_13C: with Dissolve(.25) show trish: easein_cubic 1 xalign 0.9 - pause 0.0001 + with None stop music fadeout 3.0 show trish prom indignant flip show rosa prom closed flip @@ -1370,7 +1370,7 @@ label chapter_13C: easein_cubic 1 xalign 0.55 show fang: easein_cubic 1 xalign -0.9 - pause 0.00001 + with None show stella prom sad flip behind anon: xalign 1.05 easein_cubic 1 xalign 0.85 @@ -2360,7 +2360,7 @@ label chapter_13C: easein_cubic 1 xalign 0.8 show fang: easein_cubic 1 xalign 0.4 - pause 0.0001 + with None show fang blacklight neutral show anon prom blacklight neutral flip with dissolve @@ -2541,7 +2541,7 @@ label chapter_13C: show chillicheesefries: rotate 130 xalign 0.5 yalign 0.4 xpos 0.77 ypos 0.425 easein_cubic 1 xpos 0.795 - pause 0.0001 + with None show naser rstained surprised hide chillicheesefries @@ -2630,7 +2630,7 @@ label chapter_13C: easein_cubic 1 xalign 1.85 show chillicheesefries: easein_cubic 1 xpos 0.88 - pause 0.0001 + with None show naser fullystained shocked hide chillicheesefries @@ -2682,7 +2682,7 @@ label chapter_13C: easein_cubic 1 xalign 0.25 show naser: easein_cubic 1 xalign 1.75 - pause 0.0001 + with None show anon neutral show naser fullystained angry @@ -2702,11 +2702,9 @@ label chapter_13C: "A familiar voice, chock-full of cheeky energy, alerts me to her and her food cart's arrival." window hide window auto - pause 0.5 + pause 0.25 - pause 0.0001 - - show tracy neutral flip: + show tracy neutral flip with dissolve: xalign -0.6 easein_cubic 1 xalign -0.3 show fang neutral flip behind anon @@ -2714,7 +2712,6 @@ label chapter_13C: show anon neutral flip: xalign 0.7 with dissolve - pause 0.5 SV "Well, if it isn't my favorite high school sweethearts! Haven't seen the two of you in quite a spell now!" @@ -3214,7 +3211,7 @@ label chapter_13C: show anon: easein_cubic 1 xalign 0.275 - pause 0.0001 + with None show anon grin flip show fang surprised with dissolve @@ -4118,7 +4115,7 @@ label chapter_13C: easein_cubic 1 xalign -0.35 show anon: easein_cubic 1 xalign 0.425 - pause 0.00001 + with None show fang anguish show anon concerned flip diff --git a/game/script/13D.fang-plays-well,-naomi-jealous,-fang-talks-to-anon-to-break-up-while-she-thinks-about-her-life.rpy b/game/script/13D.fang-plays-well,-naomi-jealous,-fang-talks-to-anon-to-break-up-while-she-thinks-about-her-life.rpy index 0a8f80a..0cb7935 100644 --- a/game/script/13D.fang-plays-well,-naomi-jealous,-fang-talks-to-anon-to-break-up-while-she-thinks-about-her-life.rpy +++ b/game/script/13D.fang-plays-well,-naomi-jealous,-fang-talks-to-anon-to-break-up-while-she-thinks-about-her-life.rpy @@ -340,26 +340,13 @@ label chapter_13D: N "Oh, really? That’s grea-" - $ renpy.music.set_volume(0, 0.02, 'music') - stop music fadeout 0.1 + stop music fadeout 0.02 A "And how does that make you feel, Fang?" window hide window auto pause 0.25 - image naomi prom alaska: - "naomi prom shocked flip" - matrixcolor SaturationMatrix(0, (0.40, 0.40, 0.40)) - #easeout_cubic 0.3 matrixcolor TintMatrix(Color((1.2*255, 1.2*255, 1.2*255))) - #easeout_cubic 1.80 matrixcolor TintMatrix(Color((255, 255, 255))) - #matrixcolor SaturationMatrix(1, (0.34, 0.34, 0.34)) #how the fuck does this work? - #ease_cubic 0.4 matrixcolor SaturationMatrix(0, (0.40, 0.40, 0.40)) - #pause 1.0 - #ease_cubic 1.0 matrixcolor SaturationMatrix(1, (0.40, 0.40, 0.40)) - #ease_cubic 0.3 matrixcolor SaturationMatrix(0, (1.0, 1.0, 1.0)) - - show fang d prom happy flip at sright with dissolve: xalign 1.7 easein_cubic 1 xalign 1.3 @@ -373,7 +360,6 @@ label chapter_13D: pause 1 - $ renpy.music.set_volume(1, 0, 'music') play music "audio/OST/punk_revamp.ogg" fadein 1.0 #"Naomi goes white as a sheet." @@ -440,8 +426,8 @@ label chapter_13D: show white hide anon hide fang - show naomi slapped: - xalign 0.5 yalign 0.4 + $ renpy.mark_image_seen('fullbody_naomislap') + show naomi slapped show white: linear 0.2 alpha 0 with hpunch @@ -520,7 +506,7 @@ label chapter_13D: easein_cubic 1 xalign 1.0 show fangmom: easein_cubic 1 xalign 1.3 - pause 0.0001 + with None show anon prom neutral flip show fangdad unimpressed: @@ -1185,7 +1171,7 @@ label chapter_13D: show anon: easein_cubic 1 rotate 0 xalign 1.0 yalign 0.1 - pause 0.0001 + with None show anon prom neutral flip with dissolve @@ -1231,7 +1217,6 @@ label chapter_13D: window auto show fang: - pause 0.00001 "fang d prom happy" with dissolve ease_cubic 1 xalign 0.45 pause .4 @@ -1240,7 +1225,6 @@ label chapter_13D: easeout_cubic 1.6 xalign 3.5 show anon behind fang: - pause 0.00001 #"anon prom happy flip" with dissolve ease_cubic 1 xalign 0.725 pause .425 @@ -1580,9 +1564,11 @@ label chapter_13D: window auto pause 0.5 + $ renpy.mark_image_seen('trish and anon cuck fang') + $ renpy.mark_image_seen('fullbody_anontrishdance') scene prom show trish and anon cuck fang: - xalign 0.5 yalign 0.5 + xalign 0.5 pause 3 with Dissolve(1) pause 0.5 @@ -1601,7 +1587,7 @@ label chapter_13D: T "Now just step to your left." show trish and anon cuck fang: - ease_cubic 1.0 xalign 0.9 yalign 0.5 + ease_cubic 1.0 xalign 0.9 pause 0.5 "My left foot moves left." @@ -1643,7 +1629,7 @@ label chapter_13D: pause .5 show trish and anon cuck fang: - ease_cubic 1 xalign 0.5 yalign 0.5 + ease_cubic 1 xalign 0.5 pause 1 stop music fadeout 1 @@ -1852,7 +1838,7 @@ label chapter_13D: show stella prom neutral flip behind anonphone: xalign 0.65 alpha 0 linear 0.5 alpha 1 - pause 0.0001 + with None hide anonphone with easeoutbottom pause 0.5 @@ -2305,7 +2291,7 @@ label chapter_13D: window auto pause .5 - scene park_night with Dissolve(2) + scene park night with Dissolve(2) pause .5 play music "audio/OST/she_fucks_human_men.ogg" fadein 2.0 @@ -2673,8 +2659,8 @@ label chapter_13D: easein_cubic 1.5 xalign 0.25 show anon neutral with Dissolve(.25) + with None - pause 0.0001 show rosa neutral flip: xalign 1.5 easein_cubic 1 xalign 1.05 @@ -2754,7 +2740,7 @@ label chapter_13D: easein_cubic 1 xalign 1.3 show stella: easein_cubic 1 xalign 1.2 - pause 0.0001 + with None show fang neutral flip behind anon: xalign 1.5 diff --git a/game/script/14A.KO_OP-ending.rpy b/game/script/14A.KO_OP-ending.rpy index 31eea3a..ab07da7 100644 --- a/game/script/14A.KO_OP-ending.rpy +++ b/game/script/14A.KO_OP-ending.rpy @@ -1,5 +1,3 @@ -image red = "#ff0000" - label chapter_14A: #Bowling for Volcano High window auto @@ -746,6 +744,7 @@ label chapter_14A: $ renpy.music.set_volume(1, 5, 'ambient1') #policeSirenReverbLoop $ renpy.mark_image_seen("shooterroof") $ renpy.mark_image_seen("shooterroof_gallery") + $ renpy.mark_image_seen("fullbody_fang_silo1") scene shooterroof: size(1920, 1080) show fang silo1 @@ -793,11 +792,13 @@ label chapter_14A: pause 1.5 hide fang silo1 + $ renpy.mark_image_seen("fullbody_fang_silo2") show fang silo2 with Dissolve(.75) pause .5 hide fang silo2 + $ renpy.mark_image_seen("fullbody_fang_silo3") show fang silo3 with Dissolve(.25) @@ -809,8 +810,8 @@ label chapter_14A: show red show white hide white with Dissolve(0.06) - show fang flash blurred: - alpha 0.3 + show fang flash blurred: # Stupid renpy making the blur different so I can't just make a straight image out of it + alpha 0.1 hide red with Dissolve(0.4) hide fang flash blurred with Dissolve(2) @@ -894,9 +895,10 @@ label chapter_14A: ypos 0 xanchor 0.5 yanchor 0.396 xpos 0.5 ypos 0.5 ease 1 zoom 1.04 - pause 1 + pause 1.15 show fang shooter: + subpixel True ypos 0 xanchor 0.5 yanchor 0.396 xpos 0.5 ypos 0.5 ease 1 zoom 1 @@ -926,9 +928,10 @@ label chapter_14A: ypos 0 xanchor 0.5 yanchor 0.396 xpos 0.5 ypos 0.5 ease 1 zoom 1.04 - pause 1 + pause 1.15 show fang shooter: + subpixel True ypos 0 xanchor 0.5 yanchor 0.396 xpos 0.5 ypos 0.5 ease 1 zoom 1 @@ -1064,9 +1067,10 @@ label chapter_14A: ypos 0 xanchor 0.5 yanchor 0.396 xpos 0.5 ypos 0.5 ease 1 zoom 1.04 - pause 1 + pause 1.15 show fang shooter blurred: + subpixel True ypos 0 xanchor 0.5 yanchor 0.396 xpos 0.5 ypos 0.5 ease 1 zoom 1 diff --git a/game/script/14C.good-ending.rpy b/game/script/14C.good-ending.rpy index 8718db4..ed6c5fb 100644 --- a/game/script/14C.good-ending.rpy +++ b/game/script/14C.good-ending.rpy @@ -360,7 +360,7 @@ label chapter_14C: show fang: easein_cubic 1 xalign 0.75 - pause 0.0001 + with None show fang c sad3 flip show anon c sad #PAIN with dissolve diff --git a/game/script/14D.gold-ending.rpy b/game/script/14D.gold-ending.rpy index 694a62a..ab7ba66 100644 --- a/game/script/14D.gold-ending.rpy +++ b/game/script/14D.gold-ending.rpy @@ -417,8 +417,8 @@ label chapter_14D: easein_cubic 1 xalign 1.45 show trish: easein_cubic 1 xalign 0.875 + with None - pause 0.0001 hide reed show reed_future_neutral_flip_hack behind trish, rosa: xalign 0.5 yalign 0.1 diff --git a/game/script/2.fourth-day-of-school.rpy b/game/script/2.fourth-day-of-school.rpy index 70be38b..dc7ea64 100644 --- a/game/script/2.fourth-day-of-school.rpy +++ b/game/script/2.fourth-day-of-school.rpy @@ -2270,8 +2270,8 @@ label chapter_2: pause .5 - $ renpy.music.set_volume(0, 0.02, 'ambient') - $ renpy.music.set_volume(0, 0.02, 'music') + stop ambient fadeout 0.02 + stop music fadeout 0.02 show reed shocked flip: easein_quart 1 xalign 0.54 @@ -2280,8 +2280,6 @@ label chapter_2: show trish surprised flip: easein_quart 1 xalign 1.155 pause .5 - stop ambient - stop music "The three stop in their tracks and look back at me." pause .5 @@ -2291,8 +2289,6 @@ label chapter_2: show fang neutral flip with Dissolve(.25) F "How could you tell?" - $ renpy.music.set_volume(1, 0, 'ambient') - $ renpy.music.set_volume(1, 0, 'music') play music 'audio/OST/Bayside Bumming it.ogg' show trish neutral flip diff --git a/game/script/3.showing-up-at-band-practice-and-giving-feedback.rpy b/game/script/3.showing-up-at-band-practice-and-giving-feedback.rpy index 75947fa..51a28d8 100644 --- a/game/script/3.showing-up-at-band-practice-and-giving-feedback.rpy +++ b/game/script/3.showing-up-at-band-practice-and-giving-feedback.rpy @@ -1138,7 +1138,7 @@ label chapter_3: A "The au--" # TODO: cheesy record scratch? - $ renpy.music.set_volume(0, 0.02, 'music') + stop music fadeout 0.02 "Uhp." @@ -1151,7 +1151,6 @@ label chapter_3: F "What was that?" pause .5 - $ renpy.music.set_volume(1, 0, 'music') play music 'audio/OST/fighter.ogg' fadein 1.0 A "{cps=*.2}Nuthin’{/cps}" diff --git a/game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy b/game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy index b60e3e0..b9c1835 100644 --- a/game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy +++ b/game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy @@ -556,7 +556,6 @@ label chapter_5: A "FANG!" with vpunch stop music fadeout 3 - image fang tail = Movie(play="animations/fang tail.webm",loop=True) play ambient 'audio/effects/clipLoop.ogg' fadein 1 play ambient1 'audio/effects/outdoorNatureLoop.ogg' fadein 1 @@ -2892,7 +2891,7 @@ label chapter_5: show orangeslice: xanchor 0.5 yanchor 0.5 - xpos 0.55 ypos 0.5 zoom 0.3 + xpos 0.55 ypos 0.5 linear 0.2 align (.3, .1) knot (0.4, 0.1) rotate 150 pause .2 play sound 'audio/effects/orange.ogg' @@ -2901,7 +2900,7 @@ label chapter_5: show anon: easein_cubic 0.5 xalign -0.05 pause 0.5 - play sound 'audio/effects/slapstickWipe.ogg' volume 0.7 + play sound [ "", 'audio/effects/slapstickWipe.ogg'] volume 0.7 show orangeslice: easeout_cubic 0.65 ypos 0.19 rotate 160 easeout_cubic 1 ypos 1.1 rotate 360 diff --git a/game/script/7.concert-day.rpy b/game/script/7.concert-day.rpy index 40055cc..84b24a4 100644 --- a/game/script/7.concert-day.rpy +++ b/game/script/7.concert-day.rpy @@ -968,7 +968,7 @@ label chapter_7: easein_cubic 1 xalign -0.2 show anon: easein_cubic 1 xalign 0.7 - pause 0.0001 + with None show moe alt with dissolve: xalign 2.0 diff --git a/game/script/8.anon-and-fang-study-together.rpy b/game/script/8.anon-and-fang-study-together.rpy index b1fe09d..bed421d 100644 --- a/game/script/8.anon-and-fang-study-together.rpy +++ b/game/script/8.anon-and-fang-study-together.rpy @@ -108,7 +108,7 @@ label chapter_8: show reed: easein_cubic 1 xalign 0.7 - pause 0.0001 + with None show reed sunglasses flip show anon neutral: xalign -0.4 yalign 0.1 @@ -1188,7 +1188,7 @@ label chapter_8: easein_cubic 1 xalign 1.5 show anon: easein_cubic 1 xalign 0.65 - pause 0.0001 + with None show fang shocked flip show anon neutral flip with Dissolve(0.25) @@ -1211,22 +1211,22 @@ label chapter_8: play sound 'audio/effects/whoosh.ogg' pause 0.1 - scene fangroom: - linear 0.2 zoom 3.2432432432432432432432432432432 xpos -2510 ypos -146 - show fang shocked flip: - xpos 762 - linear 0.2 zoom 3.2432432432432432432432432432432 xpos -42 ypos -149 - show anon neutral flip behind fang: - xpos 558 ypos -42 - linear 0.2 zoom 3.2432432432432432432432432432432 xpos -704 ypos -285 - show fangdad neutral: - linear 0.2 zoom 3.2432432432432432432432432432432 xpos -2510 ypos -146 - show anonfacecloseup: - size(1920,1080) - zoom 0.30833333333333333333333333333333665 xpos 774 ypos 45 - linear 0.2 zoom 1 xpos 0 ypos 0 + camera: + perspective True + linear 0.2 zoom 3.243 xpos 2510 ypos 246 + #xpos 774 ypos 45 + with None - pause 0.5 + scene fangroom blurred + show anon neutral megatex flip: + zoom 0.52631578947368421052631578947368 xalign 0.65 yalign 0.1 # zoom calculated with scaled sprite divided height by unscaled sprite height + show fang shocked flip: + xalign 1.5 + show fangdad neutral: + xalign 0.0 + with Dissolve(0.2) + + pause 0.3 play music 'audio/OST/you can_t sage here.ogg' fadein 1.0 @@ -1261,23 +1261,21 @@ label chapter_8: play sound 'audio/effects/whoosh.ogg' pause 0.1 - scene fangroom: - zoom 3.2432432432432432432432432432432 xpos -2510 ypos -146 - linear 0.2 zoom 1 xpos 0 ypos 0 - show fang shocked flip: - zoom 3.2432432432432432432432432432432 xpos -42 ypos -149 - linear 0.2 zoom 1 xpos 762 ypos 0 - show anon neutral flip behind fang: - zoom 3.2432432432432432432432432432432 xpos -704 ypos -285 - linear 0.2 zoom 1 xpos 558 ypos -42 - show fangdad neutral: - zoom 3.2432432432432432432432432432432 xpos -2510 ypos -146 - linear 0.2 zoom 1 xpos 0 ypos 0 - show anonfacecloseup: - size(1920,1080) - linear 0.2 zoom 0.30833333333333333333333333333333 xpos 774 ypos 45 + camera: + perspective True + linear 0.2 zoom 1.0 xpos 0 ypos 0 + with None - pause 0.5 + scene fangroom + show anon neutral flip: + xalign 0.65 yalign 0.1 + show fang shocked flip: + xalign 1.5 + show fangdad neutral: + xalign 0.0 + with Dissolve(0.2) + + pause 0.3 hide anonfacecloseup @@ -1298,7 +1296,7 @@ label chapter_8: easein_back 1 xalign 0.2 show anon: easein_back 1 xalign 0.5 - pause 0.0001 + with None show anon concerned show fang sad flip with dissolve @@ -1308,7 +1306,7 @@ label chapter_8: easeout_cubic 1 xalign -0.5 show anon: easeout_cubic 1 xalign -0.2 - pause 0.0001 + with None show fangdad neutral flip behind anon show anon concerned flip @@ -1832,7 +1830,7 @@ label chapter_8: easein_cubic 1 xalign 0.4 show fang surprised flip - pause 0.0001 + with None show fangmom neutral: xalign -0.5 easein_cubic 1.0 xalign -0.2 @@ -2043,8 +2041,7 @@ label chapter_8: show anon: easein_cubic 1 xalign 0.8 - - pause 0.0001 + with None show anon neutral flip show tracy neutral flip: xalign -0.3 diff --git a/game/script/9.anons'-dirty-laundry-gets-put-up-to-air.rpy b/game/script/9.anons'-dirty-laundry-gets-put-up-to-air.rpy index ab925b3..24c84c2 100644 --- a/game/script/9.anons'-dirty-laundry-gets-put-up-to-air.rpy +++ b/game/script/9.anons'-dirty-laundry-gets-put-up-to-air.rpy @@ -379,8 +379,7 @@ label chapter_9: window hide Dissolve(0.001) window auto - $ renpy.music.set_volume(0, 0.02, 'music') - stop music fadeout 0.2 + stop music fadeout 0.02 scene projector7 with Dissolve(.25) pause 2 @@ -393,7 +392,6 @@ label chapter_9: window auto pause 2 - $ renpy.music.set_volume(1, 0, 'music') play music 'audio/OST/you can_t sage here.ogg' fadein 1.0 "{i}What the fuck-{/i}" @@ -1836,10 +1834,10 @@ label chapter_9: play ambient 'audio/effects/hungrybeast.ogg' fadein 1 volume 0.3 - show sodacan blurred: + show sodacan: + blur 2 yalign -0.2 xalign -0.1 - zoom 0.25 easeout_cubic 0.3 xalign 0.15 yalign 0.12 rotate 60 play sound 'audio/effects/whoosh.ogg' show dimmer_darker behind anon, sodacan with Dissolve(.25) @@ -1863,25 +1861,24 @@ label chapter_9: show dimmer_darker: linear 0.5 alpha 0 - show sodacan blurred: - linear 0.15 xalign 0.22 yalign 0.22 rotate 90 + show sodacan: + linear 0.1 xalign 0.22 yalign 0.22 rotate 90 play sound "audio/effects/anonDink.ogg" volume 0.5 pause 0.1 show anon: easein_cubic 1 xalign 0.2 - show sodacan blurred: + show sodacan: xalign 0.22 yalign 0.22 linear 0.4 align (.05, 1.5) knot (0, 0.25) rotate -270 - hide sodacan blurred with dissolve + hide sodacan with dissolve #show sodacan blurred: # ease_cubic 0.1 xalign 0.3 yalign 0.22 rotate 90 # ease_cubic 0.5 xalign 0.5 yalign 1.7 rotate 60 pause .2 - play ambient 'audio/effects/hungrybeast.ogg' fadein 0.69 volume 0.3 show dimmer_darker: linear 0.5 alpha 1 @@ -2005,6 +2002,7 @@ label chapter_9: stop ambient fadeout 5 play music 'audio/OST/west_coast_kicking.ogg' fadein 3 + $ renpy.mark_image_seen('fullbody_fanganoncarry') show schooloutside blurred show fangcarriesanon with Dissolve(2) diff --git a/game/script/x10-raymbas-observations.rpy b/game/script/x10-raymbas-observations.rpy index 0eb862e..0fb3219 100644 --- a/game/script/x10-raymbas-observations.rpy +++ b/game/script/x10-raymbas-observations.rpy @@ -1041,12 +1041,6 @@ label chapter_x10: window auto pause 0.5 - image big blending = Composite( - (1920, 1080), - (0, 0), "big ending", - (0, 1080-126), "the ending" - ) - scene big ending with Dissolve(1) scene big blending with Dissolve(1) pause 6 diff --git a/game/script/x2-the-mous-pad.rpy b/game/script/x2-the-mous-pad.rpy index 249dbbf..78a137d 100644 --- a/game/script/x2-the-mous-pad.rpy +++ b/game/script/x2-the-mous-pad.rpy @@ -69,6 +69,8 @@ label chapter_x2: window auto pause .5 + show black with Dissolve(1) + scene room anon day alt show viewfinder show rec: @@ -79,7 +81,7 @@ label chapter_x2: alpha 0 pause .5 repeat - with Fade(1, 0, 1) + with Dissolve(1) pause .5 F "What’s so ‘grand’ about a one-room apartment? My bedroom is bigger than this!" diff --git a/game/script/x3-PTA-meeting.rpy b/game/script/x3-PTA-meeting.rpy index 1446efd..88a115b 100644 --- a/game/script/x3-PTA-meeting.rpy +++ b/game/script/x3-PTA-meeting.rpy @@ -258,8 +258,8 @@ label chapter_x3: easein_cubic 1 xalign 1.45 show jingo flip: easein_cubic 1 xalign 1.35 + with None - pause 0.01 show farnsworth concerned show fangmom unimpressed flip show carldelewski diff --git a/game/script/x7-naomi-tribulations.rpy b/game/script/x7-naomi-tribulations.rpy index ed00be5..7ab6dba 100644 --- a/game/script/x7-naomi-tribulations.rpy +++ b/game/script/x7-naomi-tribulations.rpy @@ -424,7 +424,7 @@ label chapter_x7: easein_cubic 1 xalign 0.05 show fang: easein_cubic 1 xalign 0.5 - pause 0.001 + with None show trish surprised show fang nonxmas pendant surprised with dissolve @@ -699,7 +699,7 @@ label chapter_x7: ease_cubic 2 xalign -0.5 show trish: ease_cubic 1 xalign 0.25 - pause 0.0001 + with None show stella neutral: zoom 1 yalign 0.0 xalign 0.15 @@ -912,8 +912,7 @@ label chapter_x7: show fangmom unimpressed flip: zoom 1.3 xpos 1475 ease_cubic 1 zoom 1 xpos 1200 xanchor 0 - - pause 0.0001 + with None play ambient "audio/effects/teenageCrowdInteriorLoop.ogg" fadein 2.0 volume 0.5 play music "audio/OST/west_coast_kicking.ogg" fadein 2.0 @@ -987,7 +986,7 @@ label chapter_x7: show fang: easein_cubic 1 xalign 0.5 - pause 0.0001 + with None show fang phappy flip show trish neutral with dissolve @@ -1247,8 +1246,8 @@ label chapter_x7: easein_cubic 1.5 xalign -0.2 parallel: linear 0.5 alpha 1 + with None - pause 0.0001 show trish surprised flip show fang pneutral flip with dissolve @@ -1503,7 +1502,7 @@ label chapter_x7: block: easein_cubic 0.2 yalign 0.45 easeout_cubic 0.3 yalign 0.2 - pause 0.0001 + with None show trish smile flip show fangdad neutral flip @@ -1683,7 +1682,7 @@ label chapter_x7: ease_cubic 0.5 xalign 2.0 show naser: ease_cubic 0.5 xalign 1.85 - pause 0.0001 + with None stop music fadeout 3.0 show trish smile flip @@ -1799,7 +1798,7 @@ label chapter_x7: easein_cubic 1.5 xalign -0.75 parallel: linear 1 alpha 0 - pause 0.0001 + with None show chadshark: yalign -0.3 xalign 2.0 @@ -1861,12 +1860,11 @@ label chapter_x7: window auto show naomi considering flip with Dissolve(.4) - image sodaproj = im.FactorScale("images/other/sodacan.png", 0.2) - show sodaproj: + show sodacan: rotate 90 xalign 1.3 - yalign 0.26 + yalign 0.245 easeout_cubic 0.35 xalign 0.42 pause .03 block: @@ -1908,7 +1906,7 @@ label chapter_x7: easein_cubic 1.5 xalign -0.2 show naomi: easein_cubic 1.5 xalign 1.4 - pause 0.0001 + with None show dimmer_darker behind chadshark, naser show naomi shocked flip hide stella @@ -1952,7 +1950,7 @@ label chapter_x7: easein_cubic 0.3 yalign 0.1 easeout_cubic 0.3 yalign 0.0 repeat - pause 0.0001 + with None show stella sad: xalign -0.2 hide stella_hack @@ -2018,7 +2016,7 @@ label chapter_x7: easein_cubic 1 xalign -0.1 show fangdad: easein_cubic 1 xalign 0.4 - pause 0.0001 + with None show stella explanatory show fangdad happy flip show naomi sad flip @@ -2053,7 +2051,7 @@ label chapter_x7: easein_cubic 1.5 xalign 0.4 parallel: linear 1 alpha 1 - pause 0.0001 + with None hide stella hide chadshark hide fangdad diff --git a/game/script/x8-naomi-tribulations.rpy b/game/script/x8-naomi-tribulations.rpy index ddce58a..815e4ac 100644 --- a/game/script/x8-naomi-tribulations.rpy +++ b/game/script/x8-naomi-tribulations.rpy @@ -23,7 +23,7 @@ label chapter_x8: show naomi: easein_cubic 1 xalign 0.9 - pause 0.0001 + with None show fang nonxmas pendant neutral at sleft: xzoom -1.0 diff --git a/game/script/x9-naomi-tribulations.rpy b/game/script/x9-naomi-tribulations.rpy index 1a44b38..9c24190 100644 --- a/game/script/x9-naomi-tribulations.rpy +++ b/game/script/x9-naomi-tribulations.rpy @@ -604,7 +604,7 @@ label chapter_x9: show naomi: easein_cubic 1.5 xalign 0.8 - pause 0.00001 + with None show naomi unimpressed show fang nonxmas pendant unimpressed with dissolve diff --git a/game/src/credits.rpy b/game/src/credits.rpy index e982aca..9679ead 100644 --- a/game/src/credits.rpy +++ b/game/src/credits.rpy @@ -154,11 +154,6 @@ init python: # - - - -#slack: 2000 - label test_credits: scene black stop ambient @@ -220,9 +215,8 @@ image d_credits_text = Composite( ) -label .ending: +label lending: call get_ending - #I know, horrifying copy and paste if _return == 4: pause 0.5 show snootgame_big with dissolve: # Renpy not allowing you to grab images from the gui folder is serious bullshit @@ -243,11 +237,11 @@ label .ending: hide snootgame_big with dissolve - show credits_base at Pan((0, -1080),(0, 8100), 5): + show credits_base at Pan((0, -1080),(0, 8100), 65): subpixel True - show d_credits_text at Pan((0, 0),(0, 12155), 5): + show d_credits_text at Pan((0, 0),(0, 12155), 65): subpixel True - show credits_coverup at Pan((0, 0),(0, 12155), 5): + show credits_coverup at Pan((0, 0),(0, 12155), 65): subpixel True elif _return == 3: play music "audio/OST/Dino Destiny Reader.ogg" diff --git a/game/src/definitions.rpy b/game/src/definitions.rpy index 9e58882..80a22aa 100644 --- a/game/src/definitions.rpy +++ b/game/src/definitions.rpy @@ -1,7 +1,5 @@ - # Gallery stuff needs to be initialized like this or else it fails to display in it init 1 python: - ### BACKGROUNDS renpy.image('door auditorium', Composite( @@ -260,12 +258,6 @@ init 1 python: (0, 0), 'images/fang/fullbody/hallpass.png') ) - renpy.image('fullbody_hallpass', Composite( - (1920, 1080), - (0, 0), 'images/backgrounds/roof day.png', - (0, 0), 'images/fang/fullbody/hallpass.png') - ) - renpy.image('fullbody_fangguitar', Composite( (1920, 1080), (0, 0), 'fangroom', @@ -297,7 +289,7 @@ init 1 python: renpy.image('fullbody_kissu1', Composite( (1920, 1080), (0, 0), 'images/backgrounds/room anon night.png', - (0, 0), Transform('images/fang/fullbody/kissu1.png', crop=(49, 0, 1920, 1080))) + (0, 0), 'images/fang/fullbody/kissu1.png') ) renpy.image('fullbody_kissu2', Composite( @@ -306,11 +298,23 @@ init 1 python: (213, 0), 'images/fang/fullbody/kissu2.png') ) + renpy.image('fullbody_rosahug', Composite( + (1920, 1080), + (0, 0), 'images/backgrounds/moes pizza.png', + (0, 0), 'images/rosa/rosa hug.png') + ) + + renpy.image('fullbody_fanganoncarry', Composite( + (1920, 1080), + (0, 0), 'schooloutside blurred', + (0, 0), 'images/anon/Other/fanganoncarry.png') + ) + # ENDING 4 renpy.image('fullbody_dpromdance', Composite( (1920, 1080), - (0, 0), 'images/backgrounds/park_night.png', + (0, 0), 'images/backgrounds/park night.png', (0, 0), 'images/anon/Other/dpromdance.png') ) @@ -320,6 +324,18 @@ init 1 python: (0, 0), 'images/anon/Other/anonchristmasmorning.png') ) + renpy.image('fullbody_naomislap', Composite( + (1920, 1080), + (0, 0), 'images/backgrounds/kitchen.png', + (0, 0), 'images/naomi/naomi slapped.png') + ) + + renpy.image('fullbody_anontrishdance', Composite( + (1920, 1080), + (0, 0), 'images/backgrounds/prom.png', + (500, 0), 'images/trish/trish and anon cuck fang.png') + ) + # ENDING 3 renpy.image('fullbody_c06', Composite( @@ -347,6 +363,21 @@ init 1 python: (0, 0), Transform('images/backgrounds/shooterroof.png', xsize=1920, fit='cover'), (0, 0), Transform('images/fang/fullbody/fang shooter.png', crop=(0,0,1920,1080))) ) + renpy.image('fullbody_fang_silo1', Composite( + (1920, 1080), + (0, 0), Transform('images/backgrounds/shooterroof.png', xsize=1920, fit='cover'), + (0, 0), 'images/fang/fullbody/fang silo1.png') + ) + renpy.image('fullbody_fang_silo2', Composite( + (1920, 1080), + (0, 0), Transform('images/backgrounds/shooterroof.png', xsize=1920, fit='cover'), + (0, 0), 'images/fang/fullbody/fang silo2.png') + ) + renpy.image('fullbody_fang_silo3', Composite( + (1920, 1080), + (0, 0), Transform('images/backgrounds/shooterroof.png', xsize=1920, fit='cover'), + (0, 0), 'images/fang/fullbody/fang silo3.png') + ) # aight, time for the stuff that isn't gallery required. @@ -386,6 +417,10 @@ image ctc_mid_marker: # linear 0.5 alpha 0 # repeat + +# megatext flips +image anon neutral megatex flip = im.Flip("images/highres/anon neutral megatex unblur.png", horizontal=True) + #neutral flips image anon neutral flip = im.Flip("images/anon/base set/anon neutral.png", horizontal=True) image anon d neutral flip = im.Flip("images/anon/ending sets/anon d neutral.png", horizontal=True) @@ -634,6 +669,7 @@ image prom mirrored = im.Flip("images/backgrounds/prom.png", horizontal=True) image black = "#000" image white = "#FFF" image blue = "#BECBFF" +image red = "#ff0000" image dimmer_lighter = "#00000033" image dimmer_light = "#00000066" image dimmer_darker = "#00000088" @@ -648,18 +684,23 @@ image door blurred flip = im.Flip(im.Blur("images/other/door.png", 1.5), horizon image guitarpick = "images/other/pickthrown.png" image projector9 blurred = Composite( (1920, 1080), - (0, 0), im.Blur('images/cgs/projector base.png', 1.5), - (0, 0), im.Blur('images/cgs/projector9 part.png', 1.5), - (0, 0), im.Blur('images/cgs/projector naomishock.png', 1.5) + (0, 0), im.Blur('images/cgs/projector base.png', 1.0), + (0, 0), im.Blur('images/cgs/projector9 part.png', 1.0), + (0, 0), im.Blur('images/cgs/projector naomishock.png', 1.0) ) image projector9 normal = "projector9" image schooloutside normal = 'outside school' image schooloutside blurred = Composite( (1920, 1080), (0, 0), im.Blur('images/backgrounds/outside school base.png', 1.8), - (0, 0), im.Blur('images/backgrounds/outside school text.png', 1.8) + (0, 0), Transform('images/backgrounds/outside school text.png', blur=10) +) +image fangroom blurred = Composite( + (1920, 1080), + (0, 0), im.Blur('images/backgrounds/fangroom base.png', 0.3), + (0, 0), Transform('images/backgrounds/fangroom nbflag.png', blur=20), # The "better" blur function. Really, tom? + (0, 0), Transform('images/backgrounds/fangroom text.png', blur=20) ) -image sodacan blurred = im.Blur("images/other/sodacan.png", 1.8) image lighter = "images/other/lighter.png" image amberpendant = "images/other/amberpendant1.png" image fangphonelayer1 = "images/other/fangphonelayer1.png" @@ -1057,27 +1098,6 @@ image schooloutside_blur: repeat -#Shooter ending blurs -image fang flash blurred = im.Blur('images/fang/fullbody/fang silo3.png', 8.0) -image shooterroof blurred = im.Blur('images/backgrounds/shooterroof.png', 3) -image shooterroof normal = "images/backgrounds/shooterroof.png" -image fang shooter blurred = im.Blur('images/fang/fullbody/fang shooter.png', 3) -image fang shooter normal = "images/fang/fullbody/fang shooter.png" - -image blurring_shooterroof: - "shooterroof blurred" with Dissolve(2.5) - pause 2.5 - "shooterroof normal" with Dissolve(2.5) - pause 2.5 - repeat - -image blurring_shooter: - "fang shooter blurred" with Dissolve(2.5) - pause 2.5 - "fang shooter normal" with Dissolve(2.5) - pause 2.5 - repeat - #phone bgs for video calls #caller bgs @@ -1409,7 +1429,6 @@ image flashbacktitlecard = Composite( image fanganonhug_moving = im.Crop("images/fang/fullbody/fanganonhug.png", 300, 0, 1320, 1080) #additional BGs -image park_night = "images/backgrounds/park night.png" image home_fang_dim = "images/backgrounds/home fang dim.png" image bus_stop = "images/backgrounds/Bus_Stop.png" image hotellobby = "images/backgrounds/hotellobby.png" @@ -1417,6 +1436,101 @@ image airport = "images/backgrounds/airport.png" image fromairplane = "images/backgrounds/fromairplane.png" +# CHAPTER 1 + +# Naser and Naomi reacting to Anon landing on his ass +image naser silo = im.Flip(im.MatrixColor("naser/naser neutral.png",im.matrix.brightness(-1)), horizontal=True) +image naomi silo = im.MatrixColor("naomi/naomi neutral.png",im.matrix.brightness(-1)) +image naser silo shocked = im.Flip(im.MatrixColor("naser/naser shocked.png",im.matrix.brightness(-1)), horizontal=True) +image naomi silo shocked = im.MatrixColor("naomi/naomi shocked.png",im.matrix.brightness(-1)) + +image iris = im.FactorScale(im.MatrixColor("vfx/iris.png",im.matrix.opacity(0.9)), 4.5) + + +# CHAPTER 5 + +image fang tail = Movie(play="animations/fang tail.webm",loop=True) + + +# CHAPTER 11 + +image sprinkler: + "sprinkler 1" + pause 0.066 + "sprinkler 2" + pause 0.066 + block: + "sprinkler 3" + pause 0.066 + "sprinkler 4" + pause 0.066 + "sprinkler 5" + pause 0.066 + repeat + +# general chaos +image teacher1 = im.MatrixColor("other/carldelewski.png",im.matrix.brightness(-1)) +image teacher2 = im.MatrixColor("other/farnsworth.png",im.matrix.brightness(-1)) +image teacher3 = im.Flip(im.MatrixColor("other/jin.png",im.matrix.brightness(-1)), horizontal=True) +image teacher4 = im.MatrixColor("other/jingo.png",im.matrix.brightness(-1)) +image student1 = im.MatrixColor("stella/chadshark.png",im.matrix.brightness(-1)) # obligatory Chadshark cameo +image student2 = im.Flip(im.MatrixColor("stella/stella neutral.png",im.matrix.brightness(-1)), horizontal=True) +image student3 = im.Flip(im.MatrixColor("rosa/rosa shocked.png",im.matrix.brightness(-1)), horizontal=True) + + +# CHAPTER 13D + +image naomi prom alaska: + "naomi prom shocked flip" + matrixcolor SaturationMatrix(0, (0.40, 0.40, 0.40)) + #easeout_cubic 0.3 matrixcolor TintMatrix(Color((1.2*255, 1.2*255, 1.2*255))) + #easeout_cubic 1.80 matrixcolor TintMatrix(Color((255, 255, 255))) + #matrixcolor SaturationMatrix(1, (0.34, 0.34, 0.34)) #how the fuck does this work? + #ease_cubic 0.4 matrixcolor SaturationMatrix(0, (0.40, 0.40, 0.40)) + #pause 1.0 + #ease_cubic 1.0 matrixcolor SaturationMatrix(1, (0.40, 0.40, 0.40)) +#ease_cubic 0.3 matrixcolor SaturationMatrix(0, (1.0, 1.0, 1.0)) + + + + +# CHAPTER 14A + +#Shooter ending blurs +image fang silo3 blurred = im.Blur('images/fang/fullbody/fang silo3.png', 8.0) +image fang flash blurred: + "fang silo3 blurred" + matrixcolor BrightnessMatrix(1) +image fang flash: + "fang silo3" + matrixcolor BrightnessMatrix(1) +image shooterroof blurred = im.Blur('images/backgrounds/shooterroof.png', 3) +image shooterroof normal = "images/backgrounds/shooterroof.png" +image fang shooter blurred = im.Blur('images/fang/fullbody/fang shooter.png', 3) +image fang shooter normal = "images/fang/fullbody/fang shooter.png" + +image blurring_shooterroof: + "shooterroof blurred" with Dissolve(2.5) + pause 2.5 + "shooterroof normal" with Dissolve(2.5) + pause 2.5 + repeat + +image blurring_shooter: + "fang shooter blurred" with Dissolve(2.5) + pause 2.5 + "fang shooter normal" with Dissolve(2.5) + pause 2.5 + repeat + +image fang shoot = Composite( + (1920, 1080), + (0, 0), "black", + (0, 0), "fang flash", + (0, 0), "images/vfx/fang shoot flash.png" +) + + # PHONE SCROLLING @@ -1491,4 +1605,11 @@ image raymba4s = Composite( (1500, 1500), (0, 0), "raymbashadow", (0, 0), "raymba4") -image noir = "#0c054288" \ No newline at end of file +image noir = "#0c054288" + + +image big blending = Composite( + (1920, 1080), + (0, 0), "big ending", + (0, 1080-126), "the ending" +) \ No newline at end of file diff --git a/game/src/gallery_dataset.json b/game/src/gallery_dataset.json index d2faff6..c712b28 100644 --- a/game/src/gallery_dataset.json +++ b/game/src/gallery_dataset.json @@ -126,9 +126,16 @@ { "tab_name": "Fullbody", "items": [ + { "name": "rosa hug", "image": "fullbody_rosahug" }, { "name": "hallpass", "image": "fullbody_hallpass" }, { "name": "fangguitar", "image": "fullbody_fangguitar" }, { "name": "fangshooter", "image": "fullbody_fang_shooter" }, + { "name": "fang silo1", "image": "fullbody_fang_silo1" }, + { "name": "fang silo2", "image": "fullbody_fang_silo2" }, + { "name": "fang silo3", "image": "fullbody_fang_silo3" }, + { "name": "fullbody_naomislap", "image": "fullbody_naomislap" }, + { "name": "fullbody_anontrishdance", "image": "fullbody_anontrishdance" }, + { "name": "fullbody_fanganoncarry", "image": "fullbody_fanganoncarry" }, { "name": "fanganonhug", "image": "fullbody_fanganonhug" }, { "name": "fanganonguitar", "image": "fullbody_fanganonguitar" }, { "name": "fangarm", "image": "fullbody_fangarm" }, @@ -137,7 +144,8 @@ { "name": "c06", "image": "fullbody_c06" }, { "name": "c07", "image": "fullbody_c07" }, { "name": "c09", "image": "fullbody_c09" }, - { "name": "anonchristmasmorning", "image": "fullbody_christmas" } + { "name": "c09", "image": "fullbody_dpromdance" }, + { "name": "fullbody_christmas", "image": "fullbody_christmas" } ] }, { diff --git a/game/storyline.rpy b/game/storyline.rpy index c224fc9..bd7851a 100644 --- a/game/storyline.rpy +++ b/game/storyline.rpy @@ -51,5 +51,5 @@ label storyline: $ ending_image() $ renpy.quit() $ ending_image() - call .ending + call lending return \ No newline at end of file