diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 6a27d9e664..2ada4a317c 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -3,6 +3,7 @@ - Improved: [#21767] RCT Classic for macOS can now be used as the source game. - Improved: [#23982] The scenario objective window has been merged into the scenario options window. - Change: [#23803] Lightning strikes and thunder happen at the same frequency independently of the game speed. +- Change: [#23857] Replace display options tab with custom sprites. - Change: [#24069] [Plugin] Plugins are now available in the scenario editor and track designer. - Change: [#24135] Compress Emscripten js/wasm files. - Fix: [#21919] Non-recolourable cars still show colour picker. diff --git a/resources/g2/icons/monitor_0.png b/resources/g2/icons/monitor_0.png new file mode 100644 index 0000000000..8686638ed4 Binary files /dev/null and b/resources/g2/icons/monitor_0.png differ diff --git a/resources/g2/icons/monitor_1.png b/resources/g2/icons/monitor_1.png new file mode 100644 index 0000000000..5973a4c17a Binary files /dev/null and b/resources/g2/icons/monitor_1.png differ diff --git a/resources/g2/icons/monitor_10.png b/resources/g2/icons/monitor_10.png new file mode 100644 index 0000000000..148ffd1e03 Binary files /dev/null and b/resources/g2/icons/monitor_10.png differ diff --git a/resources/g2/icons/monitor_11.png b/resources/g2/icons/monitor_11.png new file mode 100644 index 0000000000..e3363ad952 Binary files /dev/null and b/resources/g2/icons/monitor_11.png differ diff --git a/resources/g2/icons/monitor_12.png b/resources/g2/icons/monitor_12.png new file mode 100644 index 0000000000..e0c0a0a981 Binary files /dev/null and b/resources/g2/icons/monitor_12.png differ diff --git a/resources/g2/icons/monitor_13.png b/resources/g2/icons/monitor_13.png new file mode 100644 index 0000000000..d1d2fb2e90 Binary files /dev/null and b/resources/g2/icons/monitor_13.png differ diff --git a/resources/g2/icons/monitor_14.png b/resources/g2/icons/monitor_14.png new file mode 100644 index 0000000000..e6583380e5 Binary files /dev/null and b/resources/g2/icons/monitor_14.png differ diff --git a/resources/g2/icons/monitor_15.png b/resources/g2/icons/monitor_15.png new file mode 100644 index 0000000000..d6da7419c3 Binary files /dev/null and b/resources/g2/icons/monitor_15.png differ diff --git a/resources/g2/icons/monitor_2.png b/resources/g2/icons/monitor_2.png new file mode 100644 index 0000000000..c282fdb4b6 Binary files /dev/null and b/resources/g2/icons/monitor_2.png differ diff --git a/resources/g2/icons/monitor_3.png b/resources/g2/icons/monitor_3.png new file mode 100644 index 0000000000..28a76ae250 Binary files /dev/null and b/resources/g2/icons/monitor_3.png differ diff --git a/resources/g2/icons/monitor_4.png b/resources/g2/icons/monitor_4.png new file mode 100644 index 0000000000..4882d78808 Binary files /dev/null and b/resources/g2/icons/monitor_4.png differ diff --git a/resources/g2/icons/monitor_5.png b/resources/g2/icons/monitor_5.png new file mode 100644 index 0000000000..ab4abba54b Binary files /dev/null and b/resources/g2/icons/monitor_5.png differ diff --git a/resources/g2/icons/monitor_6.png b/resources/g2/icons/monitor_6.png new file mode 100644 index 0000000000..777332d37c Binary files /dev/null and b/resources/g2/icons/monitor_6.png differ diff --git a/resources/g2/icons/monitor_7.png b/resources/g2/icons/monitor_7.png new file mode 100644 index 0000000000..6bc5b97f54 Binary files /dev/null and b/resources/g2/icons/monitor_7.png differ diff --git a/resources/g2/icons/monitor_8.png b/resources/g2/icons/monitor_8.png new file mode 100644 index 0000000000..9649ee699e Binary files /dev/null and b/resources/g2/icons/monitor_8.png differ diff --git a/resources/g2/icons/monitor_9.png b/resources/g2/icons/monitor_9.png new file mode 100644 index 0000000000..b11225556b Binary files /dev/null and b/resources/g2/icons/monitor_9.png differ diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index 2631c7ea90..6ec51e4eb9 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -363,6 +363,86 @@ "path": "icons/weather_blizzard.png", "x": 1 }, + { + "path": "icons/monitor_0.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_1.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_2.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_3.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_4.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_5.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_6.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_7.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_8.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_9.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_10.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_11.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_12.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_13.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_14.png", + "x": 3, + "y": 3 + }, + { + "path": "icons/monitor_15.png", + "x": 3, + "y": 3 + }, { "path": "logo_mono_dithered.png" }, diff --git a/src/openrct2-ui/windows/Options.cpp b/src/openrct2-ui/windows/Options.cpp index db58b3a210..d88c8b1329 100644 --- a/src/openrct2-ui/windows/Options.cpp +++ b/src/openrct2-ui/windows/Options.cpp @@ -2140,7 +2140,7 @@ namespace OpenRCT2::Ui::Windows void DrawTabImages(DrawPixelInfo& dpi) { - DrawTabImage(dpi, WINDOW_OPTIONS_PAGE_DISPLAY, SPR_TAB_PAINT_0); + DrawTabImage(dpi, WINDOW_OPTIONS_PAGE_DISPLAY, SPR_G2_MONITOR_TAB_START); DrawTabImage(dpi, WINDOW_OPTIONS_PAGE_RENDERING, SPR_G2_TAB_TREE); DrawTabImage(dpi, WINDOW_OPTIONS_PAGE_CULTURE, SPR_TAB_TIMER_0); DrawTabImage(dpi, WINDOW_OPTIONS_PAGE_AUDIO, SPR_TAB_MUSIC_0); @@ -2245,13 +2245,13 @@ namespace OpenRCT2::Ui::Windows }; static constexpr int32_t TabAnimationFrames[] = { - 8, // WINDOW_OPTIONS_PAGE_DISPLAY, - 1, // WINDOW_OPTIONS_PAGE_RENDERING, - 8, // WINDOW_OPTIONS_PAGE_CULTURE, - 16, // WINDOW_OPTIONS_PAGE_AUDIO, - 4, // WINDOW_OPTIONS_PAGE_CONTROLS_AND_INTERFACE, - 16, // WINDOW_OPTIONS_PAGE_MISC, - 16, // WINDOW_OPTIONS_PAGE_ADVANCED, + SPR_G2_MONITOR_TAB_END - SPR_G2_MONITOR_TAB_START, // WINDOW_OPTIONS_PAGE_DISPLAY, + 1, // WINDOW_OPTIONS_PAGE_RENDERING, + 8, // WINDOW_OPTIONS_PAGE_CULTURE, + 16, // WINDOW_OPTIONS_PAGE_AUDIO, + 4, // WINDOW_OPTIONS_PAGE_CONTROLS_AND_INTERFACE, + 16, // WINDOW_OPTIONS_PAGE_MISC, + 16, // WINDOW_OPTIONS_PAGE_ADVANCED, }; }; diff --git a/src/openrct2/SpriteIds.h b/src/openrct2/SpriteIds.h index c5a860d5db..c716f98d2f 100644 --- a/src/openrct2/SpriteIds.h +++ b/src/openrct2/SpriteIds.h @@ -983,11 +983,14 @@ enum : ImageIndex SPR_G2_WEATHER_SNOW, SPR_G2_WEATHER_HEAVY_SNOW, SPR_G2_WEATHER_BLIZZARD, + SPR_G2_MONITOR_TAB_START, + SPR_G2_MONITOR_TAB_END = SPR_G2_MONITOR_TAB_START + 15, SPR_G2_LOGO_MONO_DITHERED, // G2 Loading progress - SPR_G2_LOADER_HYBRID_SUPPORTS, + SPR_G2_LOADER_START = SPR_G2_LOGO_MONO_DITHERED + 1, + SPR_G2_LOADER_HYBRID_SUPPORTS = SPR_G2_LOADER_START, SPR_G2_LOADER_HYBRID_TRACK, SPR_G2_LOADER_HYBRID_VEHICLE, SPR_G2_LOADER_STEEL_SUPPORTS, diff --git a/src/openrct2/scripting/IconNames.hpp b/src/openrct2/scripting/IconNames.hpp index 80f0f65205..ede22c6b15 100644 --- a/src/openrct2/scripting/IconNames.hpp +++ b/src/openrct2/scripting/IconNames.hpp @@ -169,6 +169,8 @@ namespace OpenRCT2::Scripting { "selection_edge_se", SPR_G2_SELECTION_EDGE_SE }, { "palette_invisible", SPR_G2_ICON_PALETTE_INVISIBLE }, { "palette_invisible_pressed", SPR_G2_ICON_PALETTE_INVISIBLE_PRESSED }, + { "monitor_start", SPR_G2_MONITOR_TAB_START }, + { "monitor_end", SPR_G2_MONITOR_TAB_END }, }; // Maps legacy G2 icons sprite indices to new sprite indices