Merge branch 'Monster-Update-6' into chapter-5-choreo

# Conflicts:
#	game/script.rpy
#	game/script/1.first-two-days-anon-meets-fang.rpy
#	game/script/2.fourth-day-of-school.rpy
#	game/script/5.fang-and-anon-cut-class-to-talk-on-the-roof.rpy
This commit is contained in:
2021-08-02 14:38:11 +01:00
37 changed files with 2464 additions and 1943 deletions

View File

@ -13,24 +13,30 @@
#Why yes all my code was formerly in one massive file called "script" thats 28k lines long, how could you tell?
#Licensed under the GNU AGPL v3, for more information check snootgame.xyz or the LICENSE file that should have came with this work.
init -1 python:
# Modding Support variables
# All mod rpy files must run a small init python script
mod_dir = "mods/";
mod_menu_access = [];
init python:
import random
import webbrowser
#function for insult layers
def showCG():
import random
import webbrowser
#function for insult layers
def showCG():
files = ["text0", "text1", "text2", "text3", "text4", "text5", "text6", "text7", "text8", "text9"]
length = len(files)
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:
# 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:
@ -111,35 +117,33 @@ define long_textbox = { "window_background": long_textbox_img, 'namebox_style':
#Characters
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
define A = Character ('Anon', base, color="#36E12D", who_outlines=[(1, '#0C300A')]) # Light Green
define F = Character ('Fang', base, color="#B4D4CE", who_outlines=[(1, '#112D27')]) # Light Cyan
define Lucy = Character ('Lucy', base, color="#B4D4CE", who_outlines=[(1, '#112D27')]) # Light Cyan
define Ro = Character ('Rosa', base, color="#FE712B", who_outlines=[(1, '#3D1809')]) # Red-Orange
define St = Character ('Stella', base, color="#D2FFAA", who_outlines=[(1, '#203011')]) # Light Green
define N = Character ('Naomi', base, color="#F8B9A0", who_outlines=[(1, '#291A1B')]) # Peach
define Nas = Character ('Naser', base, color="#F89E38", who_outlines=[(1, '#2D2D2D')]) # Orange
define T = Character ('Trish', base, color="#B675E6", who_outlines=[(1, '#1F0632')]) # Purple
define Attendant = Character ('Attendant', base, color="#8A0036", who_outlines=[(1, '#FFFFFF')]) # Maroon
define Sp = Character ('Spears', base, color="#C4C3C3", who_outlines=[(1, '#272727')]) # Light Grey
define Re = Character ('Reed', base, color="#ED4C5B", who_outlines=[(1, '#361013')]) # Bright Red
define D = Character ('Driver', base, color="#FFC63A", who_outlines=[(1, '#4D280A')]) # Yellow-Orange
define FM = Character ('Fangs Mom', base, color="#FFD8F6", who_outlines=[(1, '#361730')]) # Bright Pink
define FD = Character ('Fangs Dad', base, color="#D8A09A", who_outlines=[(1, '#190E0F')]) # Desaturated Orange
define Tsuki = Character ('Mr. Tsuki', base, color="#A7F2A2", who_outlines=[(1, '#320E3B')]) # Pear Green
define unknown = Character ('(???)', base, color="#000000", who_outlines=[(1, '#FFFFFF')]) # Black
define jingo = Character ('Mr. Jingo', base, color="#CD8283", who_outlines=[(1, '#0F0D49')]) # Desaturated Red
define MaitD = Character ('Maitre D', base, color="#241630", who_outlines=[(1, '#241630')]) # Cobalt Blue
define Moe = Character('Moe', base, color="#A5BEED", who_outlines=[(1, '#342210')]) # Desaturated Blue
define Vince = Character ('Vince', base, color="#FFC63A", who_outlines=[(1, '#4D280A')]) # Yellow-Orange
define Waitress = Character ('Waitress', base, color="#F691C8", who_outlines=[(1, '#402E3A')]) # Pink
#long TB chars
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)
define AnonAndFang = Character('Anon and Fang', base, color="72DFA8", who_outlines=[(1, '#113623')])
define SV = Character ('Street Vendor', base, color="#F8E120", who_outlines=[(1, '#361504')])
define carl = Character ('Mr. Carldewskii', base, color="#E19E40", who_outlines=[(1, '#03223B')])
define Drf = Character ('Dr. Fernsworth', base, color="#253354", who_outlines=[(1, '#334573')])
define FRT = Character ('Fang Reed & Trish', base, color="#4963A5", who_outlines=[(1, '#FFFFFF')])
#Extra image translations
#siloettes
@ -334,6 +338,13 @@ image dimmer_darker = "#00000088"
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