fixed my unfixes

Reviewed-on: https://git.snootgame.xyz/Bowie/SnootGame/pulls/2

game/gui.rpy

@@ -87,8 +87,7 @@ define gui.title_text_size = 75
 ## The images used for the main and game menus.
 define gui.main_menu_background = "gui/main_menu.png"
 define gui.game_menu_background = "gui/game_menu.png"
-define gui.extras_submenu_background = "gui/overlay/extras_submenu.png"
+
-define gui.extras_submenu_panel = "gui/overlay/extras_submenu_panel.png"
 
 ## Dialogue ####################################################################
 ##

game/screens.rpy

@@ -1,25 +1,10 @@
-###Updater Python stuff###
+################################################################################
-init python:
- if persistent.updateresult is None:
-  persistent.updateresult = "No new version is available"
- if persistent.autoup is None:
-  persistent.autoup = False
- if persistent.updateWebServer is None:
-  persistent.updateWebServer = "http://updates.snootgame.xyz/updates.json"
-    
- def UpdateCheck():
-  pendingVersion = updater.UpdateVersion(persistent.updateWebServer)
-  if pendingVersion == None:
-    persistent.updateresult = "No new version is available"
-  else:
-    persistent.updateresult = pendingVersion
-
-################################################################################
 ## Initialization
 ################################################################################
 
 init offset = -1
 
+
 ################################################################################
 ## Styles
 ################################################################################
@@ -397,9 +382,17 @@ screen main_menu():
      imagebutton auto "gui/button/menubuttons/startbutton_%s.png" action Start()
      imagebutton auto "gui/button/menubuttons/loadbutton_%s.png" action ShowMenu("load")
      imagebutton auto "gui/button/menubuttons/optionsbutton_%s.png" action ShowMenu("preferences")
-     imagebutton auto "gui/button/menubuttons/extrasbutton_%s.png" action ShowMenu("extras")
+     imagebutton auto "gui/button/menubuttons/helpbutton_%s.png" action ShowMenu("extras")
      imagebutton auto "gui/button/menubuttons/quitbutton_%s.png" action Quit(confirm=not main_menu)
 
+    
+#    if gui.show_name:
+#
+#        vbox:
+#            text "[config.version]":
+#                style "main_menu_version"
+
+
 style main_menu_frame is empty
 style main_menu_vbox is vbox
 style main_menu_text is gui_text
@@ -567,61 +560,36 @@ style return_button:
 screen about():
 
     tag menu
-    style_prefix "main_menu"
 
-    add gui.main_menu_background
+    ## This use statement includes the game_menu screen inside this one. The
-    add gui.extras_submenu_panel
+    ## vbox child is then included inside the viewport inside the game_menu
+    ## screen.
+    use game_menu(_("About"), scroll="viewport"):
 
-    ## This empty frame darkens the main menu.
+        style_prefix "about"
-    frame:
-        pass
 
-    ## The use statement includes another screen inside this one. The actual
+        vbox:
-    ## contents of the main menu are in the navigation screen.
 
-    vbox:
+            label "[config.name!t]"
-        xpos 1240
+            text _("Version [config.version!t]\n")
-        ## yalign 0.03
-        ypos 800
-        label "[config.name!t]"
-        text _("Version [config.version!t]\n")
 
-        ## gui.about is usually set in options.rpy.
+            ## gui.about is usually set in options.rpy.
-        if gui.about:
+            if gui.about:
-            text "[gui.about!t]\n"
+                text "[gui.about!t]\n"
 
-        text _("{size=24}Made with {a=https://www.renpy.org/}Ren'Py{/a} [renpy.version_only].\n\n[renpy.license!t]\nTo find more information about the game (and its source code) please visit {a=https://www.snootgame.xyz/}our website{/a}.{/size}")
+            text _("Made with {a=https://www.renpy.org/}Ren'Py{/a} [renpy.version_only].\n\n[renpy.license!t]\nTo find more information about the game (and its source code) please visit {a=https://www.snootgame.xyz/}our website{/a}.")
-        textbutton "Back to Extras" action ShowMenu("extras")
+            textbutton "Back to Extras" action ShowMenu("extras")
-    vbox:
-        xpos 1942
-        # xalign 1.0
-        yalign 0.95
-        use extrasnavigation
 
-style main_menu_frame is empty
+## This is redefined in options.rpy to add text to the about screen.
-style main_menu_vbox is vbox
+define gui.about = ""
-style main_menu_text is gui_text
-style main_menu_title is main_menu_text
-style main_menu_version is main_menu_text
 
-style main_menu_frame:
-    xsize 420
-    yfill True
 
-    background "gui/overlay/main_menu.png"
+style about_label is gui_label
+style about_label_text is gui_label_text
+style about_text is gui_text
 
-style main_menu_vbox:
+style about_label_text:
-    xalign 1.0
+    size gui.label_text_size
-    xoffset -30
-    xmaximum 1200
-    yalign 1.0
-    yoffset -30
-
-style main_menu_text:
-    properties gui.text_properties("main_menu", accent=True)
-
-style main_menu_title:
-    properties gui.text_properties("title")
 
 ## Gallery screen ################################################################
 ##
@@ -631,78 +599,29 @@ style main_menu_title:
 screen gallery():
 
     tag menu
+
     ## This use statement includes the game_menu screen inside this one. The
     ## vbox child is then included inside the viewport inside the game_menu
     ## screen.
-    style_prefix "main_menu"
+    use game_menu(_("Gallery"), scroll="viewport"):
 
-    add gui.main_menu_background
+        style_prefix "gallery"
-    add gui.extras_submenu_panel
 
-    frame:
+        vbox:
-        pass
 
-    vbox:
+            label "[config.name!t]"
-        xpos 500
+            text _("Version [config.version!t]\n")
-        yalign 0.2
-        textbutton "Back to Extras" action ShowMenu("extras")
 
-    vbox:
+            text _("Placeholder for gallery.")
-        viewport id "gallery": 
+            textbutton "Back to Extras" action ShowMenu("extras")
-            xpos 700
-            ypos 1000
-            style_prefix "gallery"
-            use images
-        text _("") ## Not sure why, but this keeps the vbox below working ... Renpy quirk? Does it kill scrolling in the viewport? Tune in when we have the gallery populated in the images screen.           
 
 
+style gallery_label is gui_label
+style gallery_label_text is gui_label_text
+style gallery_text is gui_text
 
-    vbox:
+style gallery_label_text:
-        xpos 1942
+    size gui.label_text_size
-        # xalign 1.0
-        yalign 0.95
-        use extrasnavigation
-
-style main_menu_frame is empty
-style main_menu_vbox is vbox
-style main_menu_text is gui_text
-style main_menu_title is main_menu_text
-style main_menu_version is main_menu_text
-
-style main_menu_frame:
-    xsize 420
-    yfill True
-
-    background "gui/overlay/main_menu.png"
-
-style main_menu_vbox:
-    xalign 1.0
-    xoffset -30
-    xmaximum 1200
-    yalign 1.0
-    yoffset -30
-
-style main_menu_text:
-    properties gui.text_properties("main_menu", accent=True)
-
-style main_menu_title:
-    properties gui.text_properties("title")
-
-
-## Images Screen ################################################################
-##
-## This is the screen that actually houses the images of the gallery
-screen images():
-    tag menu 
-    style_prefix "main_menu"
-    
-    frame:
-        pass
-    vbox:
-        xpos 600
-        ypos 600
-        text _("Placeholder for gallery.")
-
 
 
 ## Updates screen ################################################################
@@ -714,62 +633,41 @@ screen updates():
 
     tag menu
 
-    style_prefix "main_menu"
+    ## This use statement includes the game_menu screen inside this one. The
+    ## vbox child is then included inside the viewport inside the game_menu
+    ## screen.
+    use game_menu(_("Updates"), scroll="viewport"):
 
-    add gui.main_menu_background
+        style_prefix "updates"
-    add gui.extras_submenu_background
 
-    ## This empty frame darkens the main menu.
+        vbox:
-    frame:
-        pass
 
-    ## The use statement includes another screen inside this one. The actual
+            label "[config.name!t]"
-    ## contents of the main menu are in the navigation screen.
+            text _("Your Version is [config.version!t]\n")
+            textbutton "[update]" ##action Update()
+            textbutton "Back to Extras" action ShowMenu("extras")
 
-    vbox:
-        xpos 1140
-        ypos 800
-        #text _("UPDATES")
-        label "[config.name!t]"
-        text _("Your Version is [config.version!t]\n")
-        ##style_prefix "check"
-        textbutton _("Enable Automatic Updates") action [Notify("Toggling Automatic Updates..."), ToggleVariable("persistent.autoup", True, False)]
-        text _("Automatic Updates: [persistent.autoup!t]\n")
-        textbutton _("Check for Update!") action [Notify("Checking for update..."), Function(UpdateCheck)]
-        label _("Update Check Result:\n")
-        text _("[persistent.updateresult!t]\n")
-        textbutton _("Update Now!") action updater.Update(persistent.updateWebServer, force=True)
-        textbutton "Back to Extras" action ShowMenu("extras")
-    vbox:
-        xpos 1942
-        # xalign 1.0
-        yalign 0.95
-        use extrasnavigation
 
-style main_menu_frame is empty
-style main_menu_vbox is vbox
-style main_menu_text is gui_text
-style main_menu_title is main_menu_text
-style main_menu_version is main_menu_text
 
-style main_menu_frame:
+## This is redefined in options.rpy to add text to the about screen.
-    xsize 420
+define gui.update = ""
-    yfill True
 
-    background "gui/overlay/main_menu.png"
 
-style main_menu_vbox:
+style update_label is gui_label
-    xalign 1.0
+style update_label_text is gui_label_text
-    xoffset -30
+style update_text is gui_text
-    xmaximum 1200
+style page_button is gui_button
-    yalign 1.0
+style page_button_text is gui_button_text
-    yoffset -30
 
-style main_menu_text:
-    properties gui.text_properties("main_menu", accent=True)
 
-style main_menu_title:
+style update_label_text:
-    properties gui.text_properties("title")
+    size gui.label_text_size
+
+style update_button:
+    properties gui.button_properties("page_button")
+
+style update_button_text:
+    properties gui.button_text_properties("page_button")
 
 ## Load and Save screens #######################################################
 ##
@@ -1168,100 +1066,14 @@ style history_label_text:
 ## A screen that combines help, about, updates, gallery,
 screen extras():
     tag menu
-
-    style_prefix "main_menu"
-
-    add gui.main_menu_background
-
-    
-    ## This empty frame darkens the main menu.
-    frame:
-        pass
-
-    ## The use statement includes another screen inside this one. The actual
-    ## contents of the main menu are in the navigation screen.
-    # vbox:
-#         xpos 1940
-#         yalign 0.03
-#         if persistent.splashtype == 1:
-#             add "gui/sneedgame.png"
-#         else:
-#             add "gui/snootgame.png"
-#     vbox:
-#         spacing 25
-#         xpos 1885
-#         yalign 0.9
-#         imagebutton auto "gui/button/menubuttons/helpbutton_%s.png" action ShowMenu("help")
-#         imagebutton auto "gui/button/menubuttons/aboutbutton_%s.png" action ShowMenu("about")
-#         imagebutton auto "gui/button/menubuttons/updatesbutton_%s.png" action ShowMenu("updates")
-#         imagebutton auto "gui/button/menubuttons/gallerybutton_%s.png" action ShowMenu("gallery")
-#         imagebutton auto "gui/button/menubuttons/returnbutton_%s.png" action ShowMenu("main_menu")
-        
-
-    
-# #    if gui.show_name:
-# #
-# #        vbox:
-# #            text "[config.version]":
-
-# #                style "main_menu_version"
     vbox:
-        xpos 1942
+            textbutton _("Help") action ShowMenu("help")
-        # xalign 1.0
+            textbutton _("About") action ShowMenu("about")
-        yalign 0.95
+            textbutton _("Updates") action ShowMenu("updates")
-        use extrasnavigation
+            textbutton _("Gallery") action ShowMenu("gallery")
+            textbutton _("Return") action ShowMenu("main_menu")
 
 
-style main_menu_frame is empty
-style main_menu_vbox is vbox
-style main_menu_text is gui_text
-style main_menu_title is main_menu_text
-style main_menu_version is main_menu_text
-
-style main_menu_frame:
-    xsize 420
-    yfill True
-
-    background "gui/overlay/main_menu.png"
-
-style main_menu_vbox:
-    xalign 1.0
-    xoffset -30
-    xmaximum 1200
-    yalign 1.0
-    yoffset -30
-
-style main_menu_text:
-    properties gui.text_properties("main_menu", accent=True)
-
-style main_menu_title:
-    properties gui.text_properties("title")
-
-
-##Extras Navigation Screen #####################################################
-##
-##This screen is to be reused in
-screen extrasnavigation():    
-    vbox:
-        #xalign 1.0
-        xpos 665
-        ypos 270
-        
-        if persistent.splashtype == 1:
-            add "gui/sneedgame.png"
-        else:
-            add "gui/snootgame.png"
-    vbox:
-        spacing 25
-        # xpos 590
-        xalign 0.79
-        yalign 1.0 #0.9
-        imagebutton auto "gui/button/menubuttons/helpbutton_%s.png" action ShowMenu('help')
-        imagebutton auto "gui/button/menubuttons/aboutbutton_%s.png" action ShowMenu('about')
-        imagebutton auto "gui/button/menubuttons/updatesbutton_%s.png" action ShowMenu('updates')
-        imagebutton auto "gui/button/menubuttons/gallerybutton_%s.png" action ShowMenu('gallery')
-        imagebutton auto "gui/button/menubuttons/returnbutton_%s.png" action ShowMenu('main_menu')
-        
 
 ## Help screen #################################################################
 ##
@@ -1273,57 +1085,33 @@ screen help():
 
     tag menu
 
-    style_prefix "main_menu"
-
-    add gui.main_menu_background
-    add gui.extras_submenu_panel
-    
-    ## This empty frame darkens the main menu.
-    frame:
-        pass
-
     default device = "keyboard"
 
-    # vbox:
+    use game_menu(_("Help"), scroll="viewport"):
-    #     xpos 1100
-    #     ## ypos 1000
-    #     yalign 0.4
-    #     spacing 23
 
-    hbox:
-        xpos 200
-        ## ypos 1000
-        yalign 0.3
-        spacing 23
         style_prefix "help"
-        textbutton _("Keyboard") action SetScreenVariable("device", "keyboard")
-        textbutton _("Mouse") action SetScreenVariable("device", "mouse")
-        if GamepadExists():
-            textbutton _("Gamepad") action SetScreenVariable("device", "gamepad")
-        textbutton "Back to Extras" action ShowMenu("extras")
 
-    vbox:
+        vbox:
-        xpos 1100
+            spacing 23
-        ypos 1000
-        # yalign 0.4
-        if device == "keyboard":
-            use keyboard_help
-        elif device == "mouse":
-            use mouse_help
-        elif device == "gamepad":
-            use gamepad_help
-    text _("") ## again in here to keep vbox in check
 
-    vbox:
+            hbox:
-        xpos 1942
-        # xalign 1.0
-        yalign 0.95
-        use extrasnavigation
 
+                textbutton _("Keyboard") action SetScreenVariable("device", "keyboard")
+                textbutton _("Mouse") action SetScreenVariable("device", "mouse")
+                textbutton "Back to Extras" action ShowMenu("extras")
+                if GamepadExists():
+                    textbutton _("Gamepad") action SetScreenVariable("device", "gamepad")
+
+            if device == "keyboard":
+                use keyboard_help
+            elif device == "mouse":
+                use mouse_help
+            elif device == "gamepad":
+                use gamepad_help
 
 
 screen keyboard_help():
-    style_prefix "help"
+
     hbox:
         label _("Enter")
         text _("Advances dialogue and activates the interface.")
@@ -1370,7 +1158,7 @@ screen keyboard_help():
 
 
 screen mouse_help():
-    style_prefix "help"
+
     hbox:
         label _("Left Click")
         text _("Advances dialogue and activates the interface.")
@@ -1393,7 +1181,7 @@ screen mouse_help():
 
 
 screen gamepad_help():
-    style_prefix "help"
+
     hbox:
         label _("Right Trigger\nA/Bottom Button")
         text _("Advances dialogue and activates the interface.")
@@ -1421,7 +1209,7 @@ screen gamepad_help():
 
     textbutton _("Calibrate") action GamepadCalibrate()
 
-#this bit is might need trimming or rework
+
 style help_button is gui_button
 style help_button_text is gui_button_text
 style help_label is gui_label
@@ -1445,30 +1233,6 @@ style help_label_text:
     text_align 1.0
 
 
-style main_menu_frame is empty
-# style main_menu_vbox is vbox
-# style main_menu_text is gui_text
-# style main_menu_title is main_menu_text
-# style main_menu_version is main_menu_text
-
-style main_menu_frame:
-    xsize 420
-    yfill True
-
-    background "gui/overlay/main_menu.png"
-
-style main_menu_vbox:
-    xalign 1.0
-    xoffset -30
-    xmaximum 1200
-    yalign 1.0
-    yoffset -30
-
-style main_menu_text:
-    properties gui.text_properties("main_menu", accent=True)
-
-style main_menu_title:
-    properties gui.text_properties("title")
 
 ################################################################################
 ## Additional screens

game/script.rpy

@@ -23,6 +23,8 @@ init python:
         picked = random.randint(0,length - 1)
         fileName = files[picked]
         renpy.show(fileName, at_list=[randPosition])
+      # allows playing looped ambience alongside music
+      renpy.music.register_channel("ambient","sfx",True,tight=True)
       #for issue #13 not finalized
       #if persistent.scroll == True:
       #   config.keymap['dismiss'].append('mousedown_5')
@@ -81,34 +83,67 @@ transform randPosition:
 #    attribute guitar:
 #         "guitar.webp"
 
+# Click-to-continue icons / animations
+# TODO: these are sucky placeholders and need to be graced by an artfriend
+image ctc_end_marker:
+   "pickicon2"
+   xalign 0.5 yalign 0.98
+   alpha 0
+   linear 0.5 alpha 1
+   linear 0.5 alpha 0
+   repeat
+image ctc_mid_marker:
+   "pickicon2"
+   xalign 0.5 yalign 0.98
+   alpha 0
+   linear 0.5 alpha 1
+   linear 0.5 alpha 0
+   repeat
+
+# image ctc_end_marker:
+#    "pickicon"
+#    xalign 0.9 yalign 0.98
+#    pause 0.5
+#    xalign 0.92
+#    pause 0.5
+#    repeat
+# image ctc_mid_marker:
+#    "pickicon"
+#    xalign 0.9 yalign 0.98
+#    pause 0.5
+#    xalign 0.92
+#    pause 0.5
+#    repeat
 
 #Characters
-define A = Character ('Anon',color="#36E12D",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-120,who_ypos=110) #Light Green
+define base = Character (ctc="ctc_end_marker", ctc_pause="ctc_mid_marker", ctc_timedpause=Null(), ctc_position="fixed") # try to remember some of the basics of CTC
-define F = Character ('Fang',color="#7E2DE1",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-125,who_ypos=111) #Purple
+define I = Character(kind=base) # for internal dialogue i.e narration. Required for CTC indicators working with Anon's thoughts
-define Lucy = Character ('Lucy',color="#7E2DE1",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-125,who_ypos=111) #Purple
+define A = Character ('Anon', base, color="#36E12D",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-120,who_ypos=110) #Light Green
-define Ro = Character ('Rosa',color="#E12D36",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-125,who_ypos=111) #Red
+define F = Character ('Fang', base, color="#7E2DE1",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-125,who_ypos=111) #Purple
-define St = Character ('Stella',color="#E17E2D",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-125,who_ypos=111) #orang
+define Lucy = Character ('Lucy', base, color="#7E2DE1",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-125,who_ypos=111) #Purple
-define N = Character ('Naomi',color="#2D36E1",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-125,who_ypos=111) #Blue
+define Ro = Character ('Rosa', base, color="#E12D36",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-125,who_ypos=111) #Red
-define Nas = Character ('Naser',color="#501D5E",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-125,who_ypos=111) #Dark Purple
+define St = Character ('Stella', base, color="#E17E2D",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-125,who_ypos=111) #orang
-define T = Character ('Trish',color="#8A0036",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-125,who_ypos=111) #Maroon
+define N = Character ('Naomi', base, color="#2D36E1",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-125,who_ypos=111) #Blue
-define Attendant = Character ('Attendant',color="#8A0036",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-155,who_ypos=111) #Maroon
+define Nas = Character ('Naser', base, color="#501D5E",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-125,who_ypos=111) #Dark Purple
-define Sp = Character ('Spears',color="#7B8A00",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-125,who_ypos=111) #Dark Yellow
+define T = Character ('Trish', base, color="#8A0036",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-125,who_ypos=111) #Maroon
-define Re = Character ('Reed',color="#368A00",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-125,who_ypos=111) #Dark Green
+define Attendant = Character ('Attendant', base, color="#8A0036",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-155,who_ypos=111) #Maroon
-define D = Character ('Driver',color="#098A00",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-125,who_ypos=111)
+define Sp = Character ('Spears', base, color="#7B8A00",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-125,who_ypos=111) #Dark Yellow
-define FM = Character ('Fangs Mom',color="#EA1A84",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-170,who_ypos=108)
+define Re = Character ('Reed', base, color="#368A00",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-125,who_ypos=111) #Dark Green
-define FD = Character ('Fangs Dad',color="#1A1CEA",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-170,who_ypos=108)
+define D = Character ('Driver', base, color="#098A00",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-125,who_ypos=111)
-define Tsuki = Character ('Mr. Tsuki',color="#CEAF23",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-150,who_ypos=111)
+define FM = Character ('Fangs Mom', base, color="#EA1A84",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-170,who_ypos=108)
-define unknown = Character ('    (???)',color="#000000",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-170,who_ypos=110)
+define FD = Character ('Fangs Dad', base, color="#1A1CEA",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-170,who_ypos=108)
-define jingo = Character ('Mr. Jingo',color="#42C053",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-170,who_ypos=110)
+define Tsuki = Character ('Mr. Tsuki', base, color="#CEAF23",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-150,who_ypos=111)
-define MaitD = Character ('Maitre D',color="#42C053",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-170,who_ypos=110)
+define unknown = Character ('    (???)', base, color="#000000",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-170,who_ypos=110)
-define Moe = Character('    Moe',color="#42C053",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-170,who_ypos=110)
+define jingo = Character ('Mr. Jingo', base, color="#42C053",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-170,who_ypos=110)
-define Vince = Character ('Vince',color="#3C770D",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-125,who_ypos=111) #Dark Green
+define MaitD = Character ('Maitre D', base, color="#42C053",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-170,who_ypos=110)
-define Waitress = Character ('Waitress',color="#C89B19",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-140,who_ypos=111) #Gold
+define Moe = Character('    Moe', base, color="#42C053",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-170,who_ypos=110)
+define Vince = Character ('Vince', base, color="#3C770D",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-125,who_ypos=111) #Dark Green
+define Waitress = Character ('Waitress', base, color="#C89B19",window_background="gui/textbox.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-140,who_ypos=111) #Gold
 #long TB chars
-define AnonAndFang = Character('  Anon and Fang',color="34F313",window_background="gui/textbox_long.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-170,who_ypos=110)
+define AnonAndFang = Character('  Anon and Fang', base, color="34F313",window_background="gui/textbox_long.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-170,who_ypos=110)
-define SV = Character ('Street Vendor',color="#420046",window_background="gui/textbox_long.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-145,who_ypos=110)
+define SV = Character ('Street Vendor', base, color="#420046",window_background="gui/textbox_long.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-145,who_ypos=110)
-define carl = Character ('Mr. Carldewskii',color="#4963A5",window_background="gui/textbox_long.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-170,who_ypos=110)
+define carl = Character ('Mr. Carldewskii', base, color="#4963A5",window_background="gui/textbox_long.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-170,who_ypos=110)
-define Drf = Character ('  Dr. Fernsworth',color="#4963A5",window_background="gui/textbox_long.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-170,who_ypos=110)
+define Drf = Character ('  Dr. Fernsworth', base, color="#4963A5",window_background="gui/textbox_long.png",window_xoffset=120,window_yoffset=-79,what_xpos=245,what_ypos=125,who_xpos=-170,who_ypos=110)
 
 #Extra image translations
 #siloettes
@@ -116,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))
 
@@ -265,6 +301,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)
@@ -285,20 +322,15 @@ 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)
 
-
+# vfx
 image black = "#000"
+image dimmer_light = "#00000066"
+image dimmer_darker = "#00000088"
 
 #WAOH ITS THE TITLE SCREEN!!!!
 label splashscreen:
   $ persistent.splashtype = random.randint(0,2000 - 1)
   $ renpy.movie_cutscene("images/intros/CaveManonProductions.webm")
-
-  if persistent.autoup:
-    python:
-      UpdateCheck()
-      if persistent.updateresult != "No new version is available":
-        updater.update(persistent.updateWebServer, force=True)
-    
   stop sound
   return
 

game/script/13D.fang-plays-well,-naomi-jealous,-fang-talks-to-anon-to-break-up-while-she-thinks-about-her-life.rpy

@@ -1853,6 +1853,8 @@ label chapter_13D:
 
     "Curled up around my pillow, suckling on her thumb."
 
+    "And my present to her still hung around securely on her neck."
+
     "I go back to the scrapbook, enjoying the memories I’ve shared with my friends."
 
     "And to think I wanted to stay a loner when I first got here."

game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy

@@ -502,7 +502,7 @@ label chapter_5:
 
     F "{i}Uuuuughhhhh…{/i}"
 
-    F "...Alright, whatever."
+    F "...Allright, whatever."
 
     Ro "Go, go now! And no more tripping!"
 

game/script/6.anon-helps-fang-find-a-venue-for-band.rpy

@@ -2598,7 +2598,7 @@ label chapter_6:
 
     A "Like… Like her passion, Naser. She adores music. Adores {i}playing{/i} music."
 
-    A "And she has these… moments where I can see the softer side of her."
+    A "And she has theses… moments where I can see the softer side of her."
 
     "The pop of knuckles from Naser tells me I should rephrase that."
 

game/script/7.concert-day.rpy

@@ -812,7 +812,7 @@ label chapter_7:
 
     "Rosa wanted to stay and help clean buuut…"
 
-    Ro "{i}I am so sorry Stella! Come, I shall nurse you back at my home!{/i}"
+    "{i}Ro I am so sorry Stella! Come, I shall nurse you back at my home!{/i}"
 
     "I’d feel more sorry for Stella but Rosa looked capable of helping her."
 

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