Merge pull request 'Choreography update for chapters 1-5' (#67) from Bowie/SnootGame:chapter-5-choreo into Monster-Update-6

Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/67

LICENSE

@@ -6,3 +6,5 @@ WoodSnap.wav - "Snapping, Wooden Fence, N.wav" by InspectorJ (www.jshaw.co.uk) o
 firealarm.ogg - "School Fire Alarm" by Cullen Card 
 shot.ogg - "38 Caliber Gun Shot 5x" by Mike Koenig
 wind.wav - "Wind" by Mark DiAngelo
+punch.ogg - "Strong Punch" by Mike Koenig
+menacing.ogg - "Scaryscape 01" by Suonho (soundcloud.com/suonho) of Freesound.org

game/script.rpy

@@ -29,10 +29,16 @@ init python:
         picked = random.randint(0,length - 1)
         fileName = files[picked]
         renpy.show(fileName, at_list=[randPosition])
+    # extra music channel so we can do crossfade instead of fadeout followed by fadein
+    # TODO: function for stopping both channels with optional fadeout so we don't have to keep track of which channel is playing
+    renpy.music.register_channel("music1","music",True,tight=True)
+    # allows playing looped ambience alongside music
+    renpy.music.register_channel("ambient","sfx",True,tight=True)
+    renpy.music.register_channel("ambient1","sfx",True,tight=True)
+    renpy.music.register_channel("ambient2","sfx",True,tight=True)
     if persistent.scroll == True:
         config.keymap['dismiss'].append('mousedown_4')
 
-
 transform randPosition:
   alpha 0.0
   xalign random.uniform(0.2,0.8)
@@ -87,35 +93,57 @@ transform randPosition:
 #    attribute guitar:
 #         "guitar.webp"
 
+# Click-to-continue icons / animations
+# TODO: settle on a position/animation that people like
+image ctc_end_marker:
+   "pickicon_smaller"
+   # xalign 0.925 yalign 0.98
+   alpha 0
+   linear 0.25 alpha 1
+#    linear 0.5 alpha 0
+#    repeat
+image ctc_mid_marker:
+   "pickicon2"
+   # xalign 0.925 yalign 0.98
+   alpha 0
+   linear 0.25 alpha 1
+#    linear 0.5 alpha 0
+#    repeat
+
+#Raw Image & kwargs for long textboxes
+define long_textbox_img = Image("gui/textbox_long.png", xalign=0.5, yalign=1.0)
+define long_textbox = { "window_background": long_textbox_img, 'namebox_style': "namebox_large" }
 
 #Characters
-define A = Character ('Anon',color="#36E12D", who_outlines=[(gui.name_text_thickness, '#0C300A')]) # Light Green
-define F = Character ('Fang',color="#B4D4CE", who_outlines=[(gui.name_text_thickness, '#0F3930')]) # Light Cyan
-define Lucy = Character ('Lucy',color="#B4D4CE", who_outlines=[(gui.name_text_thickness, '#0F3930')]) # Light Cyan
-define Ro = Character ('Rosa',color="#FE712B", who_outlines=[(gui.name_text_thickness, '#54230F')]) # Red-Orange
-define St = Character ('Stella',color="#D5FFAE", who_outlines=[(gui.name_text_thickness, '#294211')]) # Light Green
-define N = Character ('Naomi',color="#FDD2C1", who_outlines=[(gui.name_text_thickness, '#462628')]) # Peach
-define Nas = Character ('Naser',color="#FFB561", who_outlines=[(gui.name_text_thickness, '#512322')]) # Orange
-define T = Character ('Trish',color="#B675E6", who_outlines=[(gui.name_text_thickness, '#3A0C5D')]) # Purple
-define Attendant = Character ('Attendant',color="#5BF0F8", who_outlines=[(gui.name_text_thickness, '#121C68')]) # Aqua
-define Sp = Character ('Spears',color="#C7C7C7", who_outlines=[(gui.name_text_thickness, '#272727')]) # Light Grey
-define Re = Character ('Reed',color="#ED4C5B", who_outlines=[(gui.name_text_thickness, '#421014')]) # Bright Red
-define D = Character ('Driver',color="#FFECBC", who_outlines=[(gui.name_text_thickness, '#563010')]) # Yellow-Orange
-define FM = Character ("Fang's Mom",color="#FFD8F6", who_outlines=[(gui.name_text_thickness, '#521947')]) # Bright Pink
-define FD = Character ("Fang's Dad",color="#D8A09A", who_outlines=[(gui.name_text_thickness, '#461B1F')]) # Desaturated Orange
-define Tsuki = Character ('Mr. Tsuki',color="#A7F2A2", who_outlines=[(gui.name_text_thickness, '#471054')]) # Pear Green
-define unknown = Character ('(???)',color="#FFF", who_outlines=[(gui.name_text_thickness, '#000')]) # White
-define jingo = Character ('Mr. Jingo',color="#CD8283", who_outlines=[(gui.name_text_thickness, '#0F0D49')]) # Desaturated Red
-define MaitD = Character ('Maitre D',color="#AF9EFF", who_outlines=[(gui.name_text_thickness, '#241630')]) # Cobalt Blue
-define Moe = Character('Moe',color="#A5BEED", who_outlines=[(gui.name_text_thickness, '#1F253B')]) # Desaturated Blue
-define Vince = Character ('Vince',color="#FFECBC", who_outlines=[(gui.name_text_thickness, '#563010')]) # Yellow-Orange
-define Waitress = Character ('Waitress',color="#F691C8", who_outlines=[(gui.name_text_thickness, '#512040')]) # Pink
+define base = Character (ctc="ctc_end_marker", ctc_pause="ctc_mid_marker", ctc_timedpause=Null(), ctc_position="nestled") # try to remember some of the basics of CTC
+define narrator = Character(kind=base)
+define A = Character ('Anon', base, color="#36E12D", who_outlines=[(gui.name_text_thickness, '#0C300A')]) # Light Green
+define F = Character ('Fang', base, color="#B4D4CE", who_outlines=[(gui.name_text_thickness, '#0F3930')]) # Light Cyan
+define Lucy = Character ('Lucy', base, color="#B4D4CE", who_outlines=[(gui.name_text_thickness, '#0F3930')]) # Light Cyan
+define Ro = Character ('Rosa', base, color="#FE712B", who_outlines=[(gui.name_text_thickness, '#54230F')]) # Red-Orange
+define St = Character ('Stella', base, color="#D5FFAE", who_outlines=[(gui.name_text_thickness, '#294211')]) # Light Green
+define N = Character ('Naomi', base, color="#FDD2C1", who_outlines=[(gui.name_text_thickness, '#462628')]) # Peach
+define Nas = Character ('Naser', base, color="#FFB561", who_outlines=[(gui.name_text_thickness, '#512322')]) # Orange
+define T = Character ('Trish', base, color="#B675E6", who_outlines=[(gui.name_text_thickness, '#3A0C5D')]) # Purple
+define Attendant = Character ('Attendant', base, color="#5BF0F8", who_outlines=[(gui.name_text_thickness, '#121C68')]) # Aqua
+define Sp = Character ('Spears', base, color="#C7C7C7", who_outlines=[(gui.name_text_thickness, '#272727')]) # Light Grey
+define Re = Character ('Reed', base, color="#ED4C5B", who_outlines=[(gui.name_text_thickness, '#421014')]) # Bright Red
+define D = Character ('Driver', base, color="#FFECBC", who_outlines=[(gui.name_text_thickness, '#563010')]) # Yellow-Orange
+define FM = Character ("Fang's Mom", base, color="#FFD8F6", who_outlines=[(gui.name_text_thickness, '#521947')]) # Bright Pink
+define FD = Character ("Fang's Dad", base, color="#D8A09A", who_outlines=[(gui.name_text_thickness, '#461B1F')]) # Desaturated Orange
+define Tsuki = Character ('Mr. Tsuki', base, color="#A7F2A2", who_outlines=[(gui.name_text_thickness, '#471054')]) # Pear Green
+define unknown = Character ('(???)', base, color="#FFF", who_outlines=[(gui.name_text_thickness, '#000')]) # White
+define jingo = Character ('Mr. Jingo', base, color="#CD8283", who_outlines=[(gui.name_text_thickness, '#0F0D49')]) # Desaturated Red
+define MaitD = Character ('Maitre D', base, color="#AF9EFF", who_outlines=[(gui.name_text_thickness, '#241630')]) # Cobalt Blue
+define Moe = Character('Moe', base, color="#A5BEED", who_outlines=[(gui.name_text_thickness, '#1F253B')]) # Desaturated Blue
+define Vince = Character ('Vince', base, color="#FFECBC", who_outlines=[(gui.name_text_thickness, '#563010')]) # Yellow-Orange
+define Waitress = Character ('Waitress', base, color="#F691C8", who_outlines=[(gui.name_text_thickness, '#512040')]) # Pink
 #long TB chars
-define AnonAndFang = Character('Anon and Fang',color="72DFA8", who_outlines=[(gui.name_text_thickness, '#113623')]) # Cyan
-define SV = Character ('Street Vendor',color="#F8E120", who_outlines=[(gui.name_text_thickness, '#58260C')]) # Yellow
-define carl = Character ('Mr. Carldewskii',color="#EECB99", who_outlines=[(gui.name_text_thickness, '#082337')]) #Puke Orange
-define Drf = Character ('Dr. Fernsworth',color="#DCEEF5", who_outlines=[(gui.name_text_thickness, '#253354')]) #Yellow-Orange
-define FRT = Character ('Fang Reed & Trish',color="#DCBBF7",  who_outlines=[(gui.name_text_thickness, '#191C78')]) #Light Purple
+define AnonAndFang = Character('Anon and Fang', base, color="72DFA8", who_outlines=[(gui.name_text_thickness, '#113623')]) # Cyan
+define SV = Character ('Street Vendor', base, color="#F8E120", who_outlines=[(gui.name_text_thickness, '#58260C')]) # Yellow
+define carl = Character ('Mr. Carldewskii', base, color="#EECB99", who_outlines=[(gui.name_text_thickness, '#082337')]) #Puke Orange
+define Drf = Character ('Dr. Fernsworth', base, color="#DCEEF5", who_outlines=[(gui.name_text_thickness, '#253354')]) #Yellow-Orange
+define FRT = Character ('Fang Reed & Trish', base, color="#DCBBF7",  who_outlines=[(gui.name_text_thickness, '#191C78')]) #Light Purple
 
 #Extra image translations
 #siloettes
@@ -123,6 +151,7 @@ image stellaSilo = im.Flip(im.MatrixColor("stella/stella neutral.png",im.matrix.
 image rosaSilo = im.MatrixColor("rosa/rosa neutral.png",im.matrix.brightness(-1))
 image naomiSilo = im.MatrixColor("naomi/naomi neutral.png",im.matrix.brightness(-1))
 image naserSilo = im.Flip(im.MatrixColor("naser/naser neutral.png",im.matrix.brightness(-1)), horizontal=True)
+image naserSiloShocked = im.Flip(im.MatrixColor("naser/naser shocked.png",im.matrix.brightness(-1)), horizontal=True)
 image fangSilo = im.MatrixColor("fang/basic set/fang neutral.png",im.matrix.brightness(-1))
 image fangAngrySilo = im.MatrixColor("fang/basic set/fang angry.png",im.matrix.brightness(-1))
 
@@ -198,6 +227,7 @@ image reed sad flip = im.Flip("reed/reed sad.png", horizontal=True)
 
 #shocked flips
 image anon shocked flip = im.Flip("anon/emotive set/anon shocked.png", horizontal=True)
+image anon ohshit flip = im.Flip("anon/base set/anon ohshit.png", horizontal=True)
 image fang shocked flip = im.Flip("fang/emotive set/fang shocked.png", horizontal=True)
 image fang c shocked flip = im.Flip("fang/future sets/fang c shocked.png", horizontal=True)
 image reed shocked flip = im.Flip("reed/reed shocked.png", horizontal=True)
@@ -211,6 +241,8 @@ image reed considering flip = im.Flip("reed/reed considering.png", horizontal=Tr
 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 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)
 
 #happy flips
 image fang happy flip = im.Flip("fang/basic set/fang happy.png", horizontal=True)
@@ -227,6 +259,8 @@ image naomi prom happy flip = im.Flip("naomi/naomi prom happy.png", horizontal=T
 image reed happy flip = im.Flip("reed/reed happy.png", horizontal=True)
 image reed happy sunglasses flip = im.Flip("reed/reed happy sunglasses.png", horizontal=True)
 image anon face happy flip = im.Flip("anon/base set/anon face happy.png", horizontal=True)
+image anon happy flip = im.Flip("anon/emotive set/anon happy.png", horizontal=True)
+image anon grin flip = im.Flip("anon/base set/anon grin.png", horizontal=True)
 image trish future smug flip = im.Flip("trish/trish future smug.png", horizontal=True)
 image trish prom happy flip = im.Flip("trish/trish prom happy.png", horizontal=True)
 image stella happy flip = im.Flip("stella/stella happy.png", horizontal=True)
@@ -258,7 +292,7 @@ image stella unimpressed flip = im.Flip("stella/stella unimpressed.png", horizon
 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)
 image fangmom unimpressed flip = im.Flip("fangparents/fangmom unimpressed.png", horizontal=True)
-
+image rosa unimpressed flip = im.Flip("rosa/rosa unimpressed.png", horizontal=True)
 
 #annoyed flip
 image naser annoyed flip = im.Flip("naser/naser annoyed.png", horizontal=True)
@@ -272,9 +306,11 @@ image fang hiding flip = im.Flip("fang/emotive set/fang hiding.png", horizontal=
 
 #indignant flip
 image trish prom indignant flip = im.Flip("trish/trish prom indignant.png", horizontal=True)
+image trish indignant flip = im.Flip("trish/trish indignant.png", horizontal=True)
 
 #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)
 
 
 #other flips
@@ -291,9 +327,13 @@ 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"
+image dimmer_lighter = "#00000033"
+image dimmer_light = "#00000066"
+image dimmer_darker = "#00000088"
 
 #WAOH ITS THE TITLE SCREEN!!!!
 label splashscreen:

game/utility.rpy

@@ -0,0 +1,12 @@
+## Utility functions for game setup, debugging etc.
+
+   
+label initstats(anon=0, fang=0, trad=False):
+    # Sets various game-related global variables
+    # :param int anon:  Anon's score
+    # :param int fang:  Fang's score
+    # :param bool trad: Tradwife ending flag
+    $ anonscore = anon
+    $ fangscore = fang
+    $ tradwife = trad
+    return