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

# Conflicts:
#	game/script.rpy
This commit is contained in:
2021-07-04 16:37:03 +01:00
19 changed files with 188 additions and 113 deletions

View File

@ -103,35 +103,42 @@ image ctc_mid_marker:
# 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 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 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",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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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
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', 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', 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', 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', 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 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
#siloettes