Merge branch 'master' into Monster-Update-6

Move mod_menu into it's own file in src/
This commit is contained in:
2021-07-22 21:28:18 +10:00
29 changed files with 2230 additions and 1904 deletions

View File

@ -86,38 +86,35 @@ transform randPosition:
# attribute guitar:
# "guitar.webp"
#Raw Image & kwargs for long textboxes
#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 A = Character ('Anon',color="#36E12D", who_outlines=[(1, '#0C300A')]) # Light Green
define F = Character ('Fang',color="#B4D4CE", who_outlines=[(1, '#112D27')]) # Light Cyan
define Lucy = Character ('Lucy',color="#B4D4CE", who_outlines=[(1, '#112D27')]) # Light Cyan
define Ro = Character ('Rosa',color="#FE712B", who_outlines=[(1, '#3D1809')]) # Red-Orange
define St = Character ('Stella',color="#D2FFAA", who_outlines=[(1, '#203011')]) # Light Green
define N = Character ('Naomi',color="#F8B9A0", who_outlines=[(1, '#291A1B')]) # Peach
define Nas = Character ('Naser',color="#F89E38", who_outlines=[(1, '#2D2D2D')]) # Orange
define T = Character ('Trish',color="#B675E6", who_outlines=[(1, '#1F0632')]) # Purple
define Attendant = Character ('Attendant',color="#8A0036", who_outlines=[(1, '#FFFFFF')]) # Maroon
define Sp = Character ('Spears',color="#C4C3C3", who_outlines=[(1, '#272727')]) # Light Grey
define Re = Character ('Reed',color="#ED4C5B", who_outlines=[(1, '#361013')]) # Bright Red
define D = Character ('Driver',color="#FFC63A", who_outlines=[(1, '#4D280A')]) # Yellow-Orange
define FM = Character ('Fangs Mom',color="#FFD8F6", who_outlines=[(1, '#361730')]) # Bright Pink
define FD = Character ('Fangs Dad',color="#D8A09A", who_outlines=[(1, '#190E0F')]) # Desaturated Orange
define Tsuki = Character ('Mr. Tsuki',color="#A7F2A2", who_outlines=[(1, '#320E3B')]) # Pear Green
define unknown = Character ('(???)',color="#000000", who_outlines=[(1, '#FFFFFF')]) # Black
define jingo = Character ('Mr. Jingo',color="#CD8283", who_outlines=[(1, '#0F0D49')]) # Desaturated Red
define MaitD = Character ('Maitre D',color="#241630", who_outlines=[(1, '#241630')]) # Cobalt Blue
define Moe = Character('Moe',color="#A5BEED", who_outlines=[(1, '#342210')]) # Desaturated Blue
define Vince = Character ('Vince',color="#FFC63A", who_outlines=[(1, '#4D280A')]) # Yellow-Orange
define Waitress = Character ('Waitress',color="#F691C8", who_outlines=[(1, '#402E3A')]) # Pink
#long TB chars
define AnonAndFang = Character('Anon and Fang',color="34F313")
define SV = Character ('Street Vendor',color="#420046")
define carl = Character ('Mr. Carldewskii',color="#4963A5")
define Drf = Character ('Dr. Fernsworth',color="#4963A5")
define FRT = Character ('Fang Reed & Trish',color="#4963A5")
define AnonAndFang = Character('Anon and Fang',color="72DFA8", who_outlines=[(1, '#113623')])
define SV = Character ('Street Vendor',color="#F8E120", who_outlines=[(1, '#361504')])
define carl = Character ('Mr. Carldewskii',color="#E19E40", who_outlines=[(1, '#03223B')])
define Drf = Character ('Dr. Fernsworth',color="#253354", who_outlines=[(1, '#334573')])
define FRT = Character ('Fang Reed & Trish',color="#4963A5", who_outlines=[(1, '#FFFFFF')])
#Extra image translations
#siloettes
@ -301,6 +298,13 @@ image black = "#000"
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