From 42c3804b666cdf8e07a667f8a9f53585cbfc8c06 Mon Sep 17 00:00:00 2001
From: Asriel Senna <aanonyme.personne@hotmail.fr>
Date: Sat, 18 Nov 2023 17:06:40 +0100
Subject: [PATCH] Improve weather in different ways

make the move subpixel
remove the old unused cloud_move
separate the three clouds' moves, both the yoffset, the x speed and the x start time (with a time offset)
---
 .../rooms/main_room/objects/weather.rpy       | 88 +++++++++----------
 1 file changed, 42 insertions(+), 46 deletions(-)

diff --git a/game/scripts/rooms/main_room/objects/weather.rpy b/game/scripts/rooms/main_room/objects/weather.rpy
index cf137c86..5c64df2a 100644
--- a/game/scripts/rooms/main_room/objects/weather.rpy
+++ b/game/scripts/rooms/main_room/objects/weather.rpy
@@ -9,23 +9,6 @@ label weather_sound:
         stop weather fadeout 0.5
     return
 
-transform cloud_move:
-    xpos 520
-    choice:
-        ypos 150
-    choice:
-        ypos 160
-    choice:
-        ypos 170
-    choice:
-        ypos 190
-    choice:
-        ypos 200
-
-    linear 15.0 xpos 237
-    pause 7
-    repeat
-
 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",
@@ -38,40 +21,53 @@ image weather overcast = ConditionSwitch( # final
     "True", "images/rooms/main_room/weather/night_sky_overcast.webp",
     )
 
-image weather_cloudy_clouds_night = Composite(
-    (155, 230),
-    (40, 40), "images/rooms/main_room/weather/night_cloud_01.webp",
-    (60, 60), "images/rooms/main_room/weather/night_cloud_02.webp",
-    (80, 80), "images/rooms/main_room/weather/night_cloud_03.webp",
-    )
-
-image weather_cloudy_clouds_day = Composite(
-    (155, 230),
-    (40, 40), "images/rooms/main_room/weather/day_cloud_01.webp",
-    (60, 60), "images/rooms/main_room/weather/day_cloud_02.webp",
-    (80, 80), "images/rooms/main_room/weather/day_cloud_03.webp",
-    )
-
-image weather_cloudy_clouds = ConditionSwitch(
-    "game.daytime", "weather_cloudy_clouds_day",
-    "True", "weather_cloudy_clouds_night",
-    )
-
-image weather_cloudy_fx:
-    animation
-    "weather_cloudy_clouds"
+transform cloud_move:
+    subpixel True
     choice:
-        pos (-100, 0)
+        yoffset 0
     choice:
-        pos (-100, 15)
+        yoffset 15
     choice:
-        pos (-100, 30)
-
-    ease 15.0 xpos 120
-    pause 2
+        yoffset 30
+    xoffset -120
+    choice:
+        linear 12 xoffset 100
+    choice:
+        linear 15 xoffset 100
+    choice:
+        linear 18 xoffset 100
     repeat
 
-image weather cloudy = Fixed("weather clear", "weather_cloudy_fx", fit_first=True) # final
+transform weather_cloudy_clouds(tim):
+    # tim is either "day" or "night"
+    xysize (155, 230)
+
+    contains:
+        animation
+        pos (40, 40)
+        pause 10
+        "images/rooms/main_room/weather/"+tim+"_cloud_01.webp"
+        cloud_move
+
+    contains:
+        animation
+        pos (60, 60)
+        pause 5
+        "images/rooms/main_room/weather/"+tim+"_cloud_02.webp"
+        cloud_move
+
+    contains:
+        animation
+        pos (80, 80)
+        "images/rooms/main_room/weather/"+tim+"_cloud_03.webp"
+        cloud_move
+
+image weather_cloudy_clouds = ConditionSwitch(
+    "game.daytime", weather_cloudy_clouds("day"),
+    "True", weather_cloudy_clouds("night"),
+)
+
+image weather cloudy = Fixed("weather clear", "weather_cloudy_clouds", fit_first=True) # final
 
 image weather_rain_fx:
     animation