diff --git a/game/scripts/rooms/main_room/objects/weather.rpy b/game/scripts/rooms/main_room/objects/weather.rpy index b609c637..cb5aa46e 100644 --- a/game/scripts/rooms/main_room/objects/weather.rpy +++ b/game/scripts/rooms/main_room/objects/weather.rpy @@ -40,40 +40,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 @@ -168,4 +181,4 @@ image weather_storm_fx: 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 \ No newline at end of file