Merge remote-tracking branch 'origin/Monster-Update-6' into lazysnake/feature/ISSUE-3_CG_Gallery

This commit is contained in:
2021-07-11 10:51:29 +10:00
20 changed files with 214 additions and 112 deletions

View File

@ -30,7 +30,7 @@ define gui.idle_color = '#FFFE00'
## The small color is used for small text, which needs to be brighter/darker to
## achieve the same effect.
define gui.idle_small_color = '#0001FF'
define gui.idle_small_color = '#00E1FF'
## The color that is used for buttons and bars that are hovered.
define gui.hover_color = '#00FF03'
@ -47,10 +47,19 @@ define gui.insensitive_color = '#8888887f'
define gui.muted_color = '#3d1466'
define gui.hover_muted_color = '#5b1e99'
## The colors used for dialogue and menu choice text.
## The colors used for dialogue and menu choice text
define gui.text_color = '#ffffff'
#define gui.text_color_outline = '#00000000'
define gui.interface_text_color = '#ffffff'
## Default font outline color
define gui.default_outline = '#000'
## Namebox outline color
define gui.name_outline = '#000000dd'
define gui.main_menu_color = '#FFF'
## Fonts and Font Sizes ########################################################
@ -64,31 +73,41 @@ define gui.name_text_font = "gui/FallingSky.otf"
define gui.interface_text_font = "gui/FallingSky.otf"
## The size of normal dialogue text.
define gui.text_size = 40
define gui.text_size = 42
#define gui.text_outlines = [ (absolute(0.5), gui.text_color_outline, 0, 0) ]
## The size of character names.
define gui.name_text_size = 45
define gui.name_text_outlines = [ (absolute(1.5), gui.name_outline, 0, 0) ]
## The size of text in the game's user interface.
define gui.interface_text_size = 33
define gui.interface_text_outlines = [ (1, gui.default_outline, 0, 0) ]
## The size of labels in the game's user interface.
define gui.label_text_size = 36
define gui.label_text_outlines = [ (2, gui.default_outline, 0, 0) ]
## The size of text on the notify screen.
define gui.notify_text_size = 24
#define gui.notify_text_outlines = [ (2, gui.default_outline, 0, 0) ]
## The size of the game's title.
define gui.title_text_size = 75
#define gui.title_text_outlines = [ (2, gui.default_outline, 0, 0) ]
define gui.main_menu_text_size = 60
## Main and Game Menus #########################################################
## 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"
<<<<<<< HEAD
define gui.extras_submenu_background = "gui/overlay/extras_submenu.png"
define gui.extras_submenu_panel = "gui/overlay/extras_submenu_panel.png"
=======
>>>>>>> origin/Monster-Update-6
## Dialogue ####################################################################
##
@ -105,12 +124,14 @@ define gui.textbox_yalign = 1.0
## The placement of the speaking character's name, relative to the textbox.
## These can be a whole number of pixels from the left or top, or 0.5 to center.
define gui.name_xpos = 285
define gui.name_ypos = -90
define gui.name_xpos = 350
define gui.name_ypos = -85
define gui.name_large_xpos = 395
## The horizontal alignment of the character's name. This can be 0.0 for left-
## aligned, 0.5 for centered, and 1.0 for right-aligned.
define gui.name_xalign = 0.0
define gui.name_xalign = 0.5
## The width, height, and borders of the box containing the character's name, or
## None to automatically size it.
@ -125,21 +146,21 @@ define gui.namebox_borders = Borders(5, 5, 5, 5)
## background of the namebox will be scaled.
define gui.namebox_tile = False
## The placement of dialogue relative to the textbox. These can be a whole
## number of pixels relative to the left or top side of the textbox, or 0.5 to
## center.
#To make the text with the characters align to the normal text, I set this to match up and make it "just werk". It is a horrible, hacky fix, but werks none the less. I hope this fix is so bad that I never get to write gui code ever again.
define gui.dialogue_xpos = 365
define gui.dialogue_ypos = 47
## The maximum width of dialogue text, in pixels.
define gui.dialogue_width = 1116
#It's still bad but it could be legitmately worse
define gui.dialogue_ypos = 20
define gui.dialogue_xpos = 220
define gui.dialogue_width = 1460
## The horizontal alignment of the dialogue text. This can be 0.0 for left-
## aligned, 0.5 for centered, and 1.0 for right-aligned.
define gui.dialogue_text_xalign = 0.0
define gui.window_yoffset = 0
define gui.input_yoffset = 0
## Buttons #####################################################################
##
@ -428,18 +449,23 @@ init python:
if renpy.variant("small"):
## Font sizes.
gui.text_size = 45
gui.name_text_size = 54
gui.text_size = 44
gui.name_text_size = 48
gui.notify_text_size = 38
gui.interface_text_size = 45
gui.button_text_size = 45
gui.label_text_size = 51
## Namebox
gui.name_xpos = 345
gui.name_ypos = -85
## Adjust the location of the textbox.
gui.textbox_height = 360
gui.name_xpos = 120
gui.text_xpos = 135
gui.text_width = 1650
gui.dialogue_ypos = 20
gui.dialogue_xpos = 240
gui.dialogue_width = 1460
gui.window_yoffset = -75
## Change the size and spacing of various things.
gui.slider_size = 54
@ -453,10 +479,6 @@ init python:
gui.quick_button_text_size = 30
## File button layout.
gui.file_slot_cols = 2
gui.file_slot_rows = 2
## NVL-mode.
gui.nvl_height = 255
@ -474,4 +496,7 @@ init python:
gui.nvl_button_xpos = 30
## Input, OSK, very specific
if renpy.variant("small") or renpy.variant("touch"):
gui.input_yoffset = -625