From 26b1e7f0515b0d7f7ab071f4d0135ecd5f5366bb Mon Sep 17 00:00:00 2001
From: LoafyLemon <loafylemon@gmail.com>
Date: Sun, 24 Mar 2024 17:54:06 +0000
Subject: [PATCH] Fix weather storm and create the weather image tag (by
 Gouvernathor)

---
 game/scripts/rooms/main_room/init.rpy         |  2 +-
 .../rooms/main_room/objects/weather.rpy       | 27 +++++++------------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/game/scripts/rooms/main_room/init.rpy b/game/scripts/rooms/main_room/init.rpy
index 44ac03d3..d293bf00 100644
--- a/game/scripts/rooms/main_room/init.rpy
+++ b/game/scripts/rooms/main_room/init.rpy
@@ -30,7 +30,7 @@ screen main_room():
     if room_menu_active and game.day > 1 and not renpy.android:
         use hotkeys_main
 
-    add "weather_[game.weather]" xycenter (430, 218)
+    add "weather [game.weather]" xycenter (430, 218)
 
     # Walls
     if game.daytime:
diff --git a/game/scripts/rooms/main_room/objects/weather.rpy b/game/scripts/rooms/main_room/objects/weather.rpy
index 3a65ade5..b609c637 100644
--- a/game/scripts/rooms/main_room/objects/weather.rpy
+++ b/game/scripts/rooms/main_room/objects/weather.rpy
@@ -28,13 +28,13 @@ transform cloud_move:
     pause 7
     repeat
 
-image weather_clear = ConditionSwitch( # final
+image weather clear = ConditionSwitch( # final
     "game.daytime", "images/rooms/main_room/weather/sky.webp",
     "game.moon", "images/rooms/main_room/weather/night_sky_moon.webp",
     "True", "images/rooms/main_room/weather/night_sky.webp",
     )
 
-image weather_overcast = ConditionSwitch( # final
+image weather overcast = ConditionSwitch( # final
     "game.daytime", "images/rooms/main_room/weather/sky_overcast.webp",
     "game.moon", "images/rooms/main_room/weather/night_sky_moon_overcast.webp",
     "True", "images/rooms/main_room/weather/night_sky_overcast.webp",
@@ -73,7 +73,7 @@ image weather_cloudy_fx:
     pause 2
     repeat
 
-image weather_cloudy = Fixed("weather_clear", "weather_cloudy_fx", fit_first=True) # final
+image weather cloudy = Fixed("weather clear", "weather_cloudy_fx", fit_first=True) # final
 
 image weather_rain_fx:
     animation
@@ -85,7 +85,7 @@ image weather_rain_fx:
     pause.1
     repeat
 
-image weather_rain = Fixed("weather_overcast", "weather_rain_fx", fit_first=True) # final
+image weather rain = Fixed("weather overcast", "weather_rain_fx", fit_first=True) # final
 
 image weather_snow_fx:
     animation
@@ -111,7 +111,7 @@ image weather_snow_fx:
     pause.07
     repeat
 
-image weather_snow = Fixed("weather_overcast", "weather_snow_fx", fit_first=True) # final
+image weather snow = Fixed("weather overcast", "weather_snow_fx", fit_first=True) # final
 
 image weather_blizzard_fx:
     animation
@@ -137,12 +137,12 @@ image weather_blizzard_fx:
     pause.05
     repeat
 
-image weather_blizzard = Fixed("weather_overcast", "weather_blizzard_fx", fit_first=True) # final
+image weather blizzard = Fixed("weather overcast", "weather_blizzard_fx", fit_first=True) # final
 
 image weather_storm_fx:
     animation
 
-    parallel:
+    contains:
         animation
         pause 20
         Null()
@@ -165,14 +165,7 @@ image weather_storm_fx:
         pause 20
         repeat
 
-    parallel:
-        animation
-        "images/rooms/main_room/weather/rain_01.webp"
-        pause.1
-        "images/rooms/main_room/weather/rain_02.webp"
-        pause.1
-        "images/rooms/main_room/weather/rain_03.webp"
-        pause.1
-        repeat
+    contains:
+        "weather_rain_fx"
 
-image weather_storm = Fixed("weather_overcast", "weather_storm_fx", fit_first=True) # final
+image weather storm = Fixed("weather overcast", "weather_storm_fx", fit_first=True) # final