From a8a3432f31d09a1079a90cfb04296a877c9bc179 Mon Sep 17 00:00:00 2001
From: Aaron van Geffen <aaron@aaronweb.net>
Date: Sat, 22 Feb 2025 20:30:26 +0100
Subject: [PATCH] Add new sprites for snow weather types (#23879)

Co-authored-by: ZeeMaji <42477864+ZeeMaji@users.noreply.github.com>
---
 distribution/changelog.txt                |   1 +
 resources/g2/icons/weather_blizzard.png   | Bin 0 -> 347 bytes
 resources/g2/icons/weather_heavy_snow.png | Bin 0 -> 303 bytes
 resources/g2/icons/weather_snow.png       | Bin 0 -> 286 bytes
 resources/g2/sprites.json                 |  12 ++++++++++++
 src/openrct2/SpriteIds.h                  |   3 +++
 src/openrct2/world/Climate.cpp            |   6 +++---
 7 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 resources/g2/icons/weather_blizzard.png
 create mode 100644 resources/g2/icons/weather_heavy_snow.png
 create mode 100644 resources/g2/icons/weather_snow.png

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 0000000000000000000000000000000000000000..cf00caf256142d71efed2aa2697f534a16923f77
GIT binary patch
literal 347
zcmV-h0i^zkP)<h;3K|Lk000e1NJLTq000;O000vR0{{R3y>2}T00003b3#c}2nYz<
z;ZNWI002KwOjJbx000*wBO^02FGE8=Q&UGT4@+ZXTR$ILb8~NlgL`L7gO`_|udlz0
z57(y?@ALEX%NzgaFaPsj|ND>s|HEdD5n%uT00DGTPE!Ct=GbNc006s5L_t&-(`}I3
z62l+}MBRp}6dQ8;|8Fg5634bYWb~};5<=(&guew!zlssOgflR<fq)cQN{&MtqKKiG
zMM~k=6(knsNW`WH)2$#&X3DN)^SfIR{bi9d(d2$zAXm(+=2#Eo{sFtw6n$We=pi=z
zlhPxR4~s+?)^XLi87!Fh^{w@y7ggiydtYbxYBVUcVa2i?hjCRW{;h7tXKa;Qgtl_s
t{DIjbn}tht$HvZser4c1gywuc_y8J;2j)spTXX;b002ovPDHLkV1oSgkwO3f

literal 0
HcmV?d00001

diff --git a/resources/g2/icons/weather_heavy_snow.png b/resources/g2/icons/weather_heavy_snow.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba7e1b696ea8a5c8411870c904972c0d7d146f34
GIT binary patch
literal 303
zcmeAS@N?(olHy`uVBq!ia0vp^5<o1>!VDxU=3U?bQq09po*^6@9Je3(KLB#I0(?ST
zfwZ`?va+$UzO%D^aIm{RzjtzSw7q<EadCcgb9K6R^YrQS*ROy7`SZg1ECrxy#*!ev
zU<QY0H`0KdC7v#hAsp9}6BroX7};0^G+T^WCBn}Oh_q~wls#(vealYgkgm6R#jo!b
z8ws8foNsG<wD|i=%>>O(+2C6-X=m)%9vP&)v)g?9h)S~bjK^lx-_MwB@4G4NDD%BX
zZ1Yv)vMQ^lFC1OFR`1@)J<Z`vng|OM+lsY3d-iN{U^>I}Xty|v0+Yj|cXxM-J1`{#
w9@{O>s>tNPq{1!KAh3yv!`4CHuz`i)XpUK&!Hub>fbM1RboFyt=akR{0O|v0{r~^~

literal 0
HcmV?d00001

diff --git a/resources/g2/icons/weather_snow.png b/resources/g2/icons/weather_snow.png
new file mode 100644
index 0000000000000000000000000000000000000000..b53bd8526b4ed5b635ddc49a8ef534f0bc744d4b
GIT binary patch
literal 286
zcmeAS@N?(olHy`uVBq!ia0vp^B0wz6!VDyn78$ewDdu7)&kzm{j@u9Y9{{;30X`wF
zKw96~Il8zwzqz@2`t<(#?D^~0FP>b#{qW)QhgV;|ef$0A&##P1#enJ<OM?7@862M7
zNCR?adb&7<a9mGLU|@1%WRnokY%yYyNMA1?!gAWGEB$R=G5bov+jE~?+gly3G(mG;
z)m5?ecXv-`XjLs+QnF)x#9rTqM#Jpy@9wHSlT=uC`_<jmm+q9Ui92!N#k`A2X4N<K
z^xfIm90SWs&C3r8OvvnMayX#Cv9W)4w3HL`$9KF;0fGw(r6m-UdUl&PO=)sjkabY$
g5))IwT?H|QJN7zvQcL{JfR1GFboFyt=akR{0NU<sBme*a

literal 0
HcmV?d00001

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