From 777d43ae182013b4f959f5d722d865bf04b36d3d Mon Sep 17 00:00:00 2001 From: Michael Steenbeek Date: Thu, 23 Feb 2023 10:56:37 +0100 Subject: [PATCH] Add W and Y with circumflex --- distribution/changelog.txt | 3 +- resources/g2/font/latin/w-circumflex-bold.png | Bin 0 -> 144 bytes .../g2/font/latin/w-circumflex-small.png | Bin 0 -> 144 bytes resources/g2/font/latin/w-circumflex-tiny.png | Bin 0 -> 129 bytes .../g2/font/latin/w-circumflex-uc-bold.png | Bin 0 -> 157 bytes .../g2/font/latin/w-circumflex-uc-small.png | Bin 0 -> 146 bytes .../g2/font/latin/w-circumflex-uc-tiny.png | Bin 0 -> 135 bytes resources/g2/font/latin/y-circumflex-bold.png | Bin 0 -> 139 bytes .../g2/font/latin/y-circumflex-small.png | Bin 0 -> 136 bytes resources/g2/font/latin/y-circumflex-tiny.png | Bin 0 -> 132 bytes .../g2/font/latin/y-circumflex-uc-bold.png | Bin 0 -> 142 bytes .../g2/font/latin/y-circumflex-uc-small.png | Bin 0 -> 142 bytes .../g2/font/latin/y-circumflex-uc-tiny.png | Bin 0 -> 128 bytes resources/g2/sprites.json | 73 ++++++++++++++++++ src/openrct2/drawing/Font.cpp | 4 + src/openrct2/localisation/FormatCodes.h | 4 + src/openrct2/sprites.h | 4 + 17 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 resources/g2/font/latin/w-circumflex-bold.png create mode 100644 resources/g2/font/latin/w-circumflex-small.png create mode 100644 resources/g2/font/latin/w-circumflex-tiny.png create mode 100644 resources/g2/font/latin/w-circumflex-uc-bold.png create mode 100644 resources/g2/font/latin/w-circumflex-uc-small.png create mode 100644 resources/g2/font/latin/w-circumflex-uc-tiny.png create mode 100644 resources/g2/font/latin/y-circumflex-bold.png create mode 100644 resources/g2/font/latin/y-circumflex-small.png create mode 100644 resources/g2/font/latin/y-circumflex-tiny.png create mode 100644 resources/g2/font/latin/y-circumflex-uc-bold.png create mode 100644 resources/g2/font/latin/y-circumflex-uc-small.png create mode 100644 resources/g2/font/latin/y-circumflex-uc-tiny.png diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 63c0600caf..f48d861ae2 100644 --- a/distribution/changelog.txt +++ b/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”. diff --git a/resources/g2/font/latin/w-circumflex-bold.png b/resources/g2/font/latin/w-circumflex-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..3504255e72c94af3ba6cecae3b023ad6a7d5d297 GIT binary patch literal 144 zcmeAS@N?(olHy`uVBq!ia0vp^+(695#0(_m=lKW#DV_kI5ZC|z|93F_|Ig52Z2Z3^ ziq8!w&RO6QS@;K`nmVJFKQPA>SFM8^>bP0l+XkKSm`QK literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/w-circumflex-tiny.png b/resources/g2/font/latin/w-circumflex-tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..ae11cd03b3e806186244974dff34c4b5b9ddf7d2 GIT binary patch literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^>_E)H#0(@ovUsNgDV_kI5ZC|z|93F_|Ig52Z2Z3^ ziq8!w&RO6QSbP0l+XkK!}}v0 literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/w-circumflex-uc-bold.png b/resources/g2/font/latin/w-circumflex-uc-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..0d895b788c8d9992fe26a32d57834b49512b09cb GIT binary patch literal 157 zcmeAS@N?(olHy`uVBq!ia0vp@K+Mg=3?y&fdH)GW@dWsUxc>kDzk}ibe})cYVX3bM5B%#Fv$ITnVILZQV74n z3cva14lJt<7-@)+zKSPJH@&A@6 zJ~yB^XMsm#F#`kN5fEmas?8@26x8u_aSY+Oo}3VI^uPj_E)H#0(@ovUsNgDV_kI5ZC|z|93F_|Ig52Z2Z3^ ziq8!w&RO6QS3h_aI(a*qXuVY d9!^MLVDNv)_H9GhR%f7M22WQ%mvv4FO#shZCglJC literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/y-circumflex-bold.png b/resources/g2/font/latin/y-circumflex-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..a4af07991ea06fbe6f25a6f97ca065af63f62be4 GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^96-#�(^rK8WyvH~~H(uK)l4?_l`_E)T#0(_Q{j0YIQak}ZA+G=b|LAvGM8bg=d#Wzp$Pzwz9d%w literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/y-circumflex-uc-bold.png b/resources/g2/font/latin/y-circumflex-uc-bold.png new file mode 100644 index 0000000000000000000000000000000000000000..30bbaf9ac09f43e2bad49f3759c665f408c3def3 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^AT~D>Gmx}q_|grecmjMvT>t<7-@)+zKSPJH@&A@6 zJ~yB^XMsm#F#`kN5fEmas?8@26x8r^aSY+Oo}3VI;J^aW>jw~k>FVdQ&MBb@070HAf&c&j literal 0 HcmV?d00001 diff --git a/resources/g2/font/latin/y-circumflex-uc-tiny.png b/resources/g2/font/latin/y-circumflex-uc-tiny.png new file mode 100644 index 0000000000000000000000000000000000000000..e6920a1d329198612fa3718c3fc2a80936dd421f GIT binary patch literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^tU%1c#0(^T=HFcbq<8{+LR|m<|KGvz|35>AvGM&t;ucLK6TN6eLLi literal 0 HcmV?d00001 diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index 53b5006c68..cf6c84183d 100644 --- a/resources/g2/sprites.json +++ b/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, diff --git a/src/openrct2/drawing/Font.cpp b/src/openrct2/drawing/Font.cpp index 97149b6971..98b72bc3da 100644 --- a/src/openrct2/drawing/Font.cpp +++ b/src/openrct2/drawing/Font.cpp @@ -86,6 +86,10 @@ static const std::unordered_map 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 }, diff --git a/src/openrct2/localisation/FormatCodes.h b/src/openrct2/localisation/FormatCodes.h index 233f69b430..3ee79d1aac 100644 --- a/src/openrct2/localisation/FormatCodes.h +++ b/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; diff --git a/src/openrct2/sprites.h b/src/openrct2/sprites.h index 48c586b929..8ca7857616 100644 --- a/src/openrct2/sprites.h +++ b/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,