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

@@ -23,6 +23,12 @@ 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","sfx",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)
       if persistent.scroll == True:
         config.keymap['dismiss'].append('mousedown_4')
 
@@ -80,39 +86,58 @@ transform randPosition:
 #    attribute guitar:
 #         "guitar.webp"
 
+# Click-to-continue icons / animations
+# TODO: settle on a position/animation that people like
+image ctc_end_marker:
+   "pickicon2"
+   # 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") #Light Green
-define F = Character ('Fang',color="#7E2DE1") #Purple
-define Lucy = Character ('Lucy',color="#7E2DE1") #Purple
-define Ro = Character ('Rosa',color="#E12D36") #Red
-define St = Character ('Stella',color="#E17E2D") #orang
-define N = Character ('Naomi',color="#2D36E1") #Blue
-define Nas = Character ('Naser',color="#501D5E") #Dark Purple
-define T = Character ('Trish',color="#8A0036") #Maroon
-define Attendant = Character ('Attendant',color="#8A0036") #Maroon
-define Sp = Character ('Spears',color="#7B8A00") #Dark Yellow
-define Re = Character ('Reed',color="#368A00") #Dark Green
-define D = Character ('Driver',color="#098A00")
-define FM = Character ('Fangs Mom',color="#EA1A84")
-define FD = Character ('Fangs Dad',color="#1A1CEA")
-define Tsuki = Character ('Mr. Tsuki',color="#CEAF23")
-define unknown = Character ('(???)',color="#000000")
-define jingo = Character ('Mr. Jingo',color="#42C053")
-define MaitD = Character ('Maitre D',color="#42C053")
-define Moe = Character('Moe',color="#42C053")
-define Vince = Character ('Vince',color="#3C770D") #Dark Green
-define Waitress = Character ('Waitress',color="#C89B19") #Gold
+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 I = Character(kind=base) # for internal dialogue i.e narration. Required for CTC indicators working with Anon's thoughts
+define A = Character ('Anon', base, color="#36E12D") #Light Green
+define F = Character ('Fang', base, color="#7E2DE1") #Purple
+define Lucy = Character ('Lucy', base, color="#7E2DE1") #Purple
+define Ro = Character ('Rosa', base, color="#E12D36") #Red
+define St = Character ('Stella', base, color="#E17E2D") #orang
+define N = Character ('Naomi', base, color="#2D36E1") #Blue
+define Nas = Character ('Naser', base, color="#501D5E") #Dark Purple
+define T = Character ('Trish', base, color="#8A0036") #Maroon
+define Attendant = Character ('Attendant', base, color="#8A0036") #Maroon
+define Sp = Character ('Spears', base, color="#7B8A00") #Dark Yellow
+define Re = Character ('Reed', base, color="#368A00") #Dark Green
+define D = Character ('Driver', base, color="#098A00")
+define FM = Character ('Fangs Mom', base, color="#EA1A84")
+define FD = Character ('Fangs Dad', base, color="#1A1CEA")
+define Tsuki = Character ('Mr. Tsuki', base, color="#CEAF23")
+define unknown = Character ('(???)', base, color="#000000")
+define jingo = Character ('Mr. Jingo', base, color="#42C053")
+define MaitD = Character ('Maitre D', base, color="#42C053")
+define Moe = Character('Moe', base, color="#42C053")
+define Vince = Character ('Vince', base, color="#3C770D") #Dark Green
+define Waitress = Character ('Waitress', base, color="#C89B19") #Gold
 #long TB chars
 
-define AnonAndFang = Character('Anon and Fang',color="34F313", **long_textbox)
-define SV = Character ('Street Vendor',color="#420046", **long_textbox)
-define carl = Character ('Mr. Carldewskii',color="#4963A5", **long_textbox)
-define Drf = Character ('Dr. Fernsworth',color="#4963A5", **long_textbox)
-define FRT = Character ('Fang Reed & Trish',color="#4963A5", **long_textbox)
+define AnonAndFang = Character('Anon and Fang', base, color="34F313", **long_textbox)
+define SV = Character ('Street Vendor', base, color="#420046", **long_textbox)
+define carl = Character ('Mr. Carldewskii', base, color="#4963A5", **long_textbox)
+define Drf = Character ('Dr. Fernsworth', base, color="#4963A5", **long_textbox)
+define FRT = Character ('Fang Reed & Trish', base, color="#4963A5", **long_textbox)
 
 
 #Extra image translations
@@ -121,6 +146,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))
 
@@ -270,6 +296,7 @@ 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)
@@ -289,9 +316,12 @@ 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_light = "#00000066"
+image dimmer_darker = "#00000088"
 
 #WAOH ITS THE TITLE SCREEN!!!!
 label splashscreen:

game/script/2.fourth-day-of-school.rpy

@@ -1,23 +1,7 @@
 label chapter_2:
-    scene black with fade
 
-    "We finish eating and make small talk until the bell signals us to go to our sixth period."
-
-    "Day two out of however many left is now out of my way."
-
-    "I’m fairly certain that if Naser found out I laughed too I’d need to avoid him."
-
-    "Those cheeto covered claws look like they’d freakin’ hurt, man."
-
-    "With that drama now past me I can just disappear and cheese through the rest of the year like I’m invisible."
-
-    "Oh when June hits it’s gonna be so sweet."
-
-    "Amen to that."
-
-    "..."
-    pause 1
     scene room anon dark with fade
+    
     "-Two Days Later-"
 
     "Alarm is off"

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