Add W and Y with circumflex

distribution/changelog.txt

@@ -11,6 +11,7 @@
 - Feature: [objects#229] Port RCT1 go karts with helmets.
 - Improved: [#11473] Hot reload for plug-ins now works on macOS.
 - Improved: [#12466] RCT1 parks now use RCT1’s interest calculation algorithm.
+- Improved: [#14635] Scenery window now shows up to 255 scenery groups.
 - Improved: [#17288] Reorganise the order of shortcut keys in the Shortcut Keys window.
 - Improved: [#18706] Ability to view the list of contributors in-game.
 - Improved: [#18749] Ability to have 4 active awards for more than one month in a row.
@@ -23,7 +24,7 @@
 - Improved: [#19253] Queue junctions drawn properly when using regular paths as queue.
 - Improved: [#19067] New Ride window now allows filtering similarly to Object Selection.
 - Improved: [#19272] Scenery window now allows filtering similarly to Object Selection.
-- Improved: [#14635] Scenery window now shows up to 255 scenery groups.
+- Improved: [#19463] Added W and Y with circumflex to sprite font (for Welsh).
 - Change: [#19018] Renamed actions to fit the naming scheme.
 - Change: [#19091] [Plugin] Add game action information to callback arguments of custom actions.
 - Change: [#19233] Reduce lift speed minimum and maximum values for “Classic Wooden Coaster”.

resources/g2/sprites.json

@@ -805,6 +805,30 @@
         "palette": "keep",
         "forceBmp": true
     },
+    {
+        "path": "font/latin/w-circumflex-uc-small.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/w-circumflex-small.png",
+        "y_offset": 0,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/y-circumflex-uc-small.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/y-circumflex-small.png",
+        "y_offset": 0,
+        "palette": "keep",
+        "forceBmp": true
+    },
     {
         "path": "font/latin/z-caron-uc-small.png",
         "y_offset": -1,
@@ -1410,6 +1434,31 @@
         "palette": "keep",
         "forceBmp": true
     },
+
+    {
+        "path": "font/latin/w-circumflex-uc-bold.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/w-circumflex-bold.png",
+        "y_offset": 0,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/y-circumflex-uc-bold.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/y-circumflex-bold.png",
+        "y_offset": 0,
+        "palette": "keep",
+        "forceBmp": true
+    },
     {
         "path": "font/latin/z-caron-uc-bold.png",
         "y_offset": -1,
@@ -2023,6 +2072,30 @@
         "palette": "keep",
         "forceBmp": true
     },
+    {
+        "path": "font/latin/w-circumflex-uc-tiny.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/w-circumflex-tiny.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/y-circumflex-uc-tiny.png",
+        "y_offset": -1,
+        "palette": "keep",
+        "forceBmp": true
+    },
+    {
+        "path": "font/latin/y-circumflex-tiny.png",
+        "y_offset": 0,
+        "palette": "keep",
+        "forceBmp": true
+    },
     {
         "path": "font/latin/z-caron-uc-tiny.png",
         "y_offset": -1,

src/openrct2/drawing/Font.cpp

@@ -86,6 +86,10 @@ static const std::unordered_map<char32_t, int32_t> codepointOffsetMap = {
     { UnicodeChar::u_ring, SPR_G2_U_RING_LOWER - SPR_CHAR_START },
     { UnicodeChar::u_double_acute_uc, SPR_G2_U_DOUBLE_ACUTE_UPPER - SPR_CHAR_START },
     { UnicodeChar::u_double_acute, SPR_G2_U_DOUBLE_ACUTE_LOWER - SPR_CHAR_START },
+    { UnicodeChar::w_circumflex_uc, SPR_G2_W_CIRCUMFLEX_UPPER - SPR_CHAR_START },
+    { UnicodeChar::w_circumflex, SPR_G2_W_CIRCUMFLEX_LOWER - SPR_CHAR_START },
+    { UnicodeChar::y_circumflex_uc, SPR_G2_Y_CIRCUMFLEX_UPPER - SPR_CHAR_START },
+    { UnicodeChar::y_circumflex, SPR_G2_Y_CIRCUMFLEX_LOWER - SPR_CHAR_START },
     { UnicodeChar::z_acute_uc, CSChar::z_acute_uc - CS_SPRITE_FONT_OFFSET },
     { UnicodeChar::z_acute, CSChar::z_acute - CS_SPRITE_FONT_OFFSET },
     { UnicodeChar::z_dot_uc, CSChar::z_dot_uc - CS_SPRITE_FONT_OFFSET },

src/openrct2/localisation/FormatCodes.h

@@ -194,6 +194,10 @@ namespace UnicodeChar
     constexpr char32_t u_ring = 0x16F;
     constexpr char32_t u_double_acute_uc = 0x170;
     constexpr char32_t u_double_acute = 0x171;
+    constexpr char32_t w_circumflex_uc = 0x174;
+    constexpr char32_t w_circumflex = 0x175;
+    constexpr char32_t y_circumflex_uc = 0x176;
+    constexpr char32_t y_circumflex = 0x177;
     constexpr char32_t z_acute_uc = 0x179;
     constexpr char32_t z_acute = 0x17A;
     constexpr char32_t z_dot_uc = 0x17B;

src/openrct2/sprites.h

@@ -1082,6 +1082,10 @@ enum
     SPR_G2_T_CARON_LOWER,
     SPR_G2_U_RING_UPPER,
     SPR_G2_U_RING_LOWER,
+    SPR_G2_W_CIRCUMFLEX_UPPER,
+    SPR_G2_W_CIRCUMFLEX_LOWER,
+    SPR_G2_Y_CIRCUMFLEX_UPPER,
+    SPR_G2_Y_CIRCUMFLEX_LOWER,
     SPR_G2_Z_CARON_UPPER,
     SPR_G2_Z_CARON_LOWER,