Add Glass Palettes

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

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"
     }
 ]

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];

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,