Merge pull request 'updates branch/feature merging into patchy-patch5' (#52) from updates into Patchy-Patch5

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

game/gui.rpy

@@ -87,7 +87,8 @@ 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/script.rpy

@@ -23,8 +23,6 @@ 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')
@@ -83,67 +81,34 @@ 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 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 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 I = Character(kind=base) # for internal dialogue i.e narration. Required for CTC indicators working with Anon's thoughts
+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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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', 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 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 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 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 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 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 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)
+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)
 
 #Extra image translations
 #siloettes
@@ -151,7 +116,6 @@ 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))
 
@@ -301,7 +265,6 @@ 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)
@@ -322,15 +285,20 @@ 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,8 +1853,6 @@ 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 "...Allright, whatever."
+    F "...Alright, whatever."
 
     Ro "Go, go now! And no more tripping!"
 
@@ -2546,4 +2546,4 @@ label chapter_5:
 
     "..."
 
-    return
+    return

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 theses… moments where I can see the softer side of her."
+    A "And she has these… moments where I can see the softer side of her."
 
     "The pop of knuckles from Naser tells me I should rephrase that."
 
@@ -2685,4 +2685,4 @@ label chapter_6:
 
     "..."
 
-    return
+    return

game/script/7.concert-day.rpy

@@ -812,7 +812,7 @@ label chapter_7:
 
     "Rosa wanted to stay and help clean buuut…"
 
-    "{i}Ro I am so sorry Stella! Come, I shall nurse you back at my home!{/i}"
+    Ro "{i}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

@@ -1,12 +0,0 @@
-## 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