diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index dbe35ec22c..6c12b48fa4 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -3657,7 +3657,7 @@ STR_6551 :Army green STR_6552 :Honeydew STR_6553 :Tan STR_6554 :Maroon -STR_6555 :Coral Pink +STR_6555 :Coral pink STR_6556 :Forest green STR_6557 :Chartreuse STR_6558 :Hunter green @@ -3665,7 +3665,7 @@ STR_6559 :Celadon STR_6560 :Lime green STR_6561 :Sepia STR_6562 :Peach -STR_6563 :Lilac +STR_6563 :Periwinkle STR_6564 :Viridian STR_6565 :Seafoam green STR_6566 :Violet diff --git a/resources/g2/palette_map/palette_map_glass_aqua_dark.png b/resources/g2/palette_map/palette_map_glass_aqua_dark.png new file mode 100644 index 0000000000..9b7d605e5a Binary files /dev/null and b/resources/g2/palette_map/palette_map_glass_aqua_dark.png differ diff --git a/resources/g2/palette_map/palette_map_glass_bordeaux_red_dark.png b/resources/g2/palette_map/palette_map_glass_bordeaux_red_dark.png new file mode 100644 index 0000000000..d5586f2acf Binary files /dev/null and b/resources/g2/palette_map/palette_map_glass_bordeaux_red_dark.png differ diff --git a/resources/g2/palette_map/palette_map_glass_bordeaux_red_light.png b/resources/g2/palette_map/palette_map_glass_bordeaux_red_light.png new file mode 100644 index 0000000000..7025bd1798 Binary files /dev/null and b/resources/g2/palette_map/palette_map_glass_bordeaux_red_light.png differ diff --git a/resources/g2/palette_map/palette_map_glass_dark_olive_dark.png b/resources/g2/palette_map/palette_map_glass_dark_olive_dark.png new file mode 100644 index 0000000000..cdc2a77f8f Binary files /dev/null and b/resources/g2/palette_map/palette_map_glass_dark_olive_dark.png differ diff --git a/resources/g2/palette_map/palette_map_glass_dark_olive_light.png b/resources/g2/palette_map/palette_map_glass_dark_olive_light.png new file mode 100644 index 0000000000..2b3b74fa5a Binary files /dev/null and b/resources/g2/palette_map/palette_map_glass_dark_olive_light.png differ diff --git a/resources/g2/palette_map/palette_map_glass_dull_brown_dark.png b/resources/g2/palette_map/palette_map_glass_dull_brown_dark.png new file mode 100644 index 0000000000..306a3ad790 Binary files /dev/null and b/resources/g2/palette_map/palette_map_glass_dull_brown_dark.png differ diff --git a/resources/g2/palette_map/palette_map_glass_dull_brown_light.png b/resources/g2/palette_map/palette_map_glass_dull_brown_light.png new file mode 100644 index 0000000000..d6d3b94fe2 Binary files /dev/null and b/resources/g2/palette_map/palette_map_glass_dull_brown_light.png differ diff --git a/resources/g2/palette_map/palette_map_glass_dull_green_dark.png b/resources/g2/palette_map/palette_map_glass_dull_green_dark.png new file mode 100644 index 0000000000..5dd90f23c0 Binary files /dev/null and b/resources/g2/palette_map/palette_map_glass_dull_green_dark.png differ diff --git a/resources/g2/palette_map/palette_map_glass_dull_green_light.png b/resources/g2/palette_map/palette_map_glass_dull_green_light.png new file mode 100644 index 0000000000..560f9eb5d9 Binary files /dev/null and b/resources/g2/palette_map/palette_map_glass_dull_green_light.png differ diff --git a/resources/g2/palette_map/palette_map_glass_dull_purple_light.png b/resources/g2/palette_map/palette_map_glass_dull_purple_light.png new file mode 100644 index 0000000000..d2be8e55c1 Binary files /dev/null and b/resources/g2/palette_map/palette_map_glass_dull_purple_light.png differ diff --git a/resources/g2/palette_map/palette_map_glass_grass_green_dark.png b/resources/g2/palette_map/palette_map_glass_grass_green_dark.png new file mode 100644 index 0000000000..de235de19b Binary files /dev/null and b/resources/g2/palette_map/palette_map_glass_grass_green_dark.png differ diff --git a/resources/g2/palette_map/palette_map_glass_grass_green_light.png b/resources/g2/palette_map/palette_map_glass_grass_green_light.png new file mode 100644 index 0000000000..617c8bcdbf Binary files /dev/null and b/resources/g2/palette_map/palette_map_glass_grass_green_light.png differ diff --git a/resources/g2/palette_map/palette_map_glass_invisible.png b/resources/g2/palette_map/palette_map_glass_invisible.png new file mode 100644 index 0000000000..f0861d80e0 Binary files /dev/null and b/resources/g2/palette_map/palette_map_glass_invisible.png differ diff --git a/resources/g2/palette_map/palette_map_glass_magenta_light.png b/resources/g2/palette_map/palette_map_glass_magenta_light.png new file mode 100644 index 0000000000..bf87e91f02 Binary files /dev/null and b/resources/g2/palette_map/palette_map_glass_magenta_light.png differ diff --git a/resources/g2/palette_map/palette_map_glass_olive_dark.png b/resources/g2/palette_map/palette_map_glass_olive_dark.png new file mode 100644 index 0000000000..bfda62a3f4 Binary files /dev/null and b/resources/g2/palette_map/palette_map_glass_olive_dark.png differ diff --git a/resources/g2/palette_map/palette_map_glass_olive_light.png b/resources/g2/palette_map/palette_map_glass_olive_light.png new file mode 100644 index 0000000000..73b86ac9c1 Binary files /dev/null and b/resources/g2/palette_map/palette_map_glass_olive_light.png differ diff --git a/resources/g2/palette_map/palette_map_glass_orange_light.png b/resources/g2/palette_map/palette_map_glass_orange_light.png new file mode 100644 index 0000000000..54b518ba8d Binary files /dev/null and b/resources/g2/palette_map/palette_map_glass_orange_light.png differ diff --git a/resources/g2/palette_map/palette_map_glass_saturated_brown_light.png b/resources/g2/palette_map/palette_map_glass_saturated_brown_light.png new file mode 100644 index 0000000000..04d9ca376c Binary files /dev/null and b/resources/g2/palette_map/palette_map_glass_saturated_brown_light.png differ diff --git a/resources/g2/palette_map/palette_map_glass_saturated_green_light.png b/resources/g2/palette_map/palette_map_glass_saturated_green_light.png new file mode 100644 index 0000000000..7bb97ffa0e Binary files /dev/null and b/resources/g2/palette_map/palette_map_glass_saturated_green_light.png differ diff --git a/resources/g2/palette_map/palette_map_glass_saturated_purple_dark.png b/resources/g2/palette_map/palette_map_glass_saturated_purple_dark.png new file mode 100644 index 0000000000..19234aa46b Binary files /dev/null and b/resources/g2/palette_map/palette_map_glass_saturated_purple_dark.png differ diff --git a/resources/g2/palette_map/palette_map_glass_saturated_purple_light.png b/resources/g2/palette_map/palette_map_glass_saturated_purple_light.png new file mode 100644 index 0000000000..7cbee9fe71 Binary files /dev/null and b/resources/g2/palette_map/palette_map_glass_saturated_purple_light.png differ diff --git a/resources/g2/palette_map/palette_map_glass_tan_dark.png b/resources/g2/palette_map/palette_map_glass_tan_dark.png new file mode 100644 index 0000000000..a1648ba842 Binary files /dev/null and b/resources/g2/palette_map/palette_map_glass_tan_dark.png differ diff --git a/resources/g2/palette_map/palette_map_glass_tan_light.png b/resources/g2/palette_map/palette_map_glass_tan_light.png new file mode 100644 index 0000000000..2f7152e92b Binary files /dev/null and b/resources/g2/palette_map/palette_map_glass_tan_light.png differ diff --git a/resources/g2/palette_map/palette_map_glass_void.png b/resources/g2/palette_map/palette_map_glass_void.png new file mode 100644 index 0000000000..c80ca77e7b Binary files /dev/null and b/resources/g2/palette_map/palette_map_glass_void.png differ diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index 91f727dc09..d47d64bc25 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -20660,5 +20660,77 @@ }, { "path": "palette_map/palette_map_void.png" + }, + { + "path": "palette_map/palette_map_glass_dark_olive_dark.png" + }, + { + "path": "palette_map/palette_map_glass_dark_olive_light.png" + }, + { + "path": "palette_map/palette_map_glass_saturated_brown_light.png" + }, + { + "path": "palette_map/palette_map_glass_bordeaux_red_dark.png" + }, + { + "path": "palette_map/palette_map_glass_bordeaux_red_light.png" + }, + { + "path": "palette_map/palette_map_glass_grass_green_dark.png" + }, + { + "path": "palette_map/palette_map_glass_grass_green_light.png" + }, + { + "path": "palette_map/palette_map_glass_olive_dark.png" + }, + { + "path": "palette_map/palette_map_glass_olive_light.png" + }, + { + "path": "palette_map/palette_map_glass_saturated_green_light.png" + }, + { + "path": "palette_map/palette_map_glass_tan_dark.png" + }, + { + "path": "palette_map/palette_map_glass_tan_light.png" + }, + { + "path": "palette_map/palette_map_glass_dull_purple_light.png" + }, + { + "path": "palette_map/palette_map_glass_dull_green_dark.png" + }, + { + "path": "palette_map/palette_map_glass_dull_green_light.png" + }, + { + "path": "palette_map/palette_map_glass_saturated_purple_dark.png" + }, + { + "path": "palette_map/palette_map_glass_saturated_purple_light.png" + }, + { + "path": "palette_map/palette_map_glass_orange_light.png" + }, + { + "path": "palette_map/palette_map_glass_aqua_dark.png" + }, + { + "path": "palette_map/palette_map_glass_magenta_light.png" + }, + { + "path": "palette_map/palette_map_glass_dull_brown_dark.png" + }, + { + "path": "palette_map/palette_map_glass_dull_brown_light.png" + }, + { + "path": "palette_map/palette_map_glass_invisible.png" + }, + { + "path": "palette_map/palette_map_glass_void.png" } ] diff --git a/src/openrct2/interface/Colour.cpp b/src/openrct2/interface/Colour.cpp index 1c7f6e1039..04981f08c9 100644 --- a/src/openrct2/interface/Colour.cpp +++ b/src/openrct2/interface/Colour.cpp @@ -59,7 +59,7 @@ void ColoursInitMaps() // G2 Palette Init for (int32_t i = COLOUR_NUM_ORIGINAL; i < COLOUR_COUNT; i++) { - const G1Element* g1 = GfxGetG1Element(SPR_G2_PAL_REMAP_BEGIN + i - COLOUR_NUM_ORIGINAL); + const G1Element* g1 = GfxGetG1Element(SPR_G2_PALETTE_BEGIN + i - COLOUR_NUM_ORIGINAL); if (g1 != nullptr) { ColourMapA[i].colour_0 = g1->offset[INDEX_COLOUR_0]; diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index 0dff54916d..2da7fba9d5 100644 --- a/src/openrct2/sprites.h +++ b/src/openrct2/sprites.h @@ -1364,7 +1364,7 @@ enum SPR_G2_ALPINE_LIFT_TRACK_GENTLE_DIAGONAL = SPR_G2_ALPINE_LIFT_TRACK_FLAT_DIAGONAL + 4, SPR_G2_ALPINE_END = SPR_G2_ALPINE_LIFT_TRACK_GENTLE_DIAGONAL + 12, - SPR_G2_PAL_REMAP_BEGIN = SPR_G2_ALPINE_END, + SPR_G2_PALETTE_BEGIN = SPR_G2_ALPINE_END, SPR_G2_PAL_REMAP_DARK_OLIVE_DARK, SPR_G2_PAL_REMAP_DARK_OLIVE_LIGHT, SPR_G2_PAL_REMAP_SATURATED_BROWN_LIGHT, @@ -1389,9 +1389,33 @@ enum SPR_G2_PAL_REMAP_DULL_BROWN_LIGHT, SPR_G2_PAL_REMAP_INVISIBLE, SPR_G2_PAL_REMAP_VOID, - SPR_G2_PAL_REMAP_END = SPR_G2_PAL_REMAP_VOID, + SPR_G2_PAL_GLASS_DARK_OLIVE_DARK, + SPR_G2_PAL_GLASS_DARK_OLIVE_LIGHT, + SPR_G2_PAL_GLASS_SATURATED_BROWN_LIGHT, + SPR_G2_PAL_GLASS_BORDEAUX_RED_DARK, + SPR_G2_PAL_GLASS_BORDEAUX_RED_LIGHT, + SPR_G2_PAL_GLASS_GRASS_GREEN_DARK, + SPR_G2_PAL_GLASS_GRASS_GREEN_LIGHT, + SPR_G2_PAL_GLASS_OLIVE_DARK, + SPR_G2_PAL_GLASS_OLIVE_LIGHT, + SPR_G2_PAL_GLASS_SATURATED_GREEN_LIGHT, + SPR_G2_PAL_GLASS_TAN_DARK, + SPR_G2_PAL_GLASS_TAN_LIGHT, + SPR_G2_PAL_GLASS_DULL_PURPLE_LIGHT, + SPR_G2_PAL_GLASS_DULL_GREEN_DARK, + SPR_G2_PAL_GLASS_DULL_GREEN_LIGHT, + SPR_G2_PAL_GLASS_SATURATED_PURPLE_DARK, + SPR_G2_PAL_GLASS_SATURATED_PURPLE_LIGHT, + SPR_G2_PAL_GLASS_ORANGE_LIGHT, + SPR_G2_PAL_GLASS_AQUA_DARK, + SPR_G2_PAL_GLASS_MAGENTA_LIGHT, + SPR_G2_PAL_GLASS_DULL_BROWN_DARK, + SPR_G2_PAL_GLASS_DULL_BROWN_LIGHT, + SPR_G2_PAL_GLASS_INVISIBLE, + SPR_G2_PAL_GLASS_VOID, + SPR_G2_PALETTE_END = SPR_G2_PAL_GLASS_VOID, - SPR_G2_END = SPR_G2_PAL_REMAP_END, + SPR_G2_END = SPR_G2_PALETTE_END, SPR_CSG_BEGIN = SPR_G2_END, SPR_CSG_END = SPR_CSG_BEGIN + RCT1::Limits::Num_LL_CSG_Entries,