diff --git a/distribution/changelog.txt b/distribution/changelog.txt index f86453f475..c022777632 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -6,6 +6,7 @@ - Improved: [#23720] Text fields now allow cutting to clipboard (Ctrl+X) in addition to copy and paste. - Improved: [#23874] The load/save file browser window now uses icons for its action buttons. - Improved: [#23875] Rides forbidden to be modified or destroyed can now be edited with the All destructible cheat. +- Improved: [#23879] Unique weather icons for snow, heavy snow and blizzard. - Fix: [#1972, #11679] Vehicles passing by toilets can cause them to glitch (original bug). - Fix: [#9999, #10000, #10001, #10002, #10003] Truncated scenario strings when using Catalan, Czech, Japanese, Polish or Russian. - Fix: [#14486] Guests will fall through upwards sloped paths when making their way through a park entrance or ride exit (original bug). diff --git a/resources/g2/icons/weather_blizzard.png b/resources/g2/icons/weather_blizzard.png new file mode 100644 index 0000000000..cf00caf256 Binary files /dev/null and b/resources/g2/icons/weather_blizzard.png differ diff --git a/resources/g2/icons/weather_heavy_snow.png b/resources/g2/icons/weather_heavy_snow.png new file mode 100644 index 0000000000..ba7e1b696e Binary files /dev/null and b/resources/g2/icons/weather_heavy_snow.png differ diff --git a/resources/g2/icons/weather_snow.png b/resources/g2/icons/weather_snow.png new file mode 100644 index 0000000000..b53bd8526b Binary files /dev/null and b/resources/g2/icons/weather_snow.png differ diff --git a/resources/g2/sprites.json b/resources/g2/sprites.json index 275e21e400..d1e343f862 100644 --- a/resources/g2/sprites.json +++ b/resources/g2/sprites.json @@ -351,6 +351,18 @@ "x": 2, "y": 1 }, + { + "path": "icons/weather_snow.png", + "x": 3 + }, + { + "path": "icons/weather_heavy_snow.png", + "x": 1 + }, + { + "path": "icons/weather_blizzard.png", + "x": 1 + }, { "path": "loader/loader_hybrid_supports.png", "y": 10 diff --git a/src/openrct2/SpriteIds.h b/src/openrct2/SpriteIds.h index e4c69f3230..1428221f34 100644 --- a/src/openrct2/SpriteIds.h +++ b/src/openrct2/SpriteIds.h @@ -980,6 +980,9 @@ enum : ImageIndex SPR_G2_FOLDER_DEFAULT, SPR_G2_SYSTEM_BROWSER, SPR_G2_PEEP_ANIMATIONS, + SPR_G2_WEATHER_SNOW, + SPR_G2_WEATHER_HEAVY_SNOW, + SPR_G2_WEATHER_BLIZZARD, // G2 Loading progress diff --git a/src/openrct2/world/Climate.cpp b/src/openrct2/world/Climate.cpp index 638f51308e..3516e6d3cb 100644 --- a/src/openrct2/world/Climate.cpp +++ b/src/openrct2/world/Climate.cpp @@ -477,9 +477,9 @@ const WeatherTrait kClimateWeatherTraits[EnumValue(WeatherType::Count)] = { { -2, WeatherEffectType::Rain, 1, WeatherLevel::Light, SPR_WEATHER_LIGHT_RAIN }, // Rain { -4, WeatherEffectType::Rain, 2, WeatherLevel::Heavy, SPR_WEATHER_HEAVY_RAIN }, // Heavy Rain { 2, WeatherEffectType::Storm, 2, WeatherLevel::Heavy, SPR_WEATHER_STORM }, // Thunderstorm - { -10, WeatherEffectType::Snow, 1, WeatherLevel::Light, SPR_WEATHER_SNOW }, // Snow - { -15, WeatherEffectType::Snow, 2, WeatherLevel::Heavy, SPR_WEATHER_SNOW }, // Heavy Snow - { -20, WeatherEffectType::Blizzard, 2, WeatherLevel::Heavy, SPR_WEATHER_SNOW }, // Blizzard + { -10, WeatherEffectType::Snow, 1, WeatherLevel::Light, SPR_G2_WEATHER_SNOW }, // Snow + { -15, WeatherEffectType::Snow, 2, WeatherLevel::Heavy, SPR_G2_WEATHER_HEAVY_SNOW}, // Heavy Snow + { -20, WeatherEffectType::Blizzard, 2, WeatherLevel::Heavy, SPR_G2_WEATHER_BLIZZARD }, // Blizzard }; // clang-format on