From fe0193cfc2459d8f953ff15f1d9e935522fff802 Mon Sep 17 00:00:00 2001 From: Gouvernathor <44340603+Gouvernathor@users.noreply.github.com> Date: Wed, 15 Nov 2023 01:17:07 +0100 Subject: [PATCH] Hasten ConditionSwitch-es (cherry picked from commit 9d52bd9c92edbd7525cfdb27a1d36437cdd6ac76) --- .../scripts/rooms/main_room/objects/weather.rpy | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/game/scripts/rooms/main_room/objects/weather.rpy b/game/scripts/rooms/main_room/objects/weather.rpy index 1657e09f..94e77052 100644 --- a/game/scripts/rooms/main_room/objects/weather.rpy +++ b/game/scripts/rooms/main_room/objects/weather.rpy @@ -1,4 +1,3 @@ - label weather_sound: if game.weather == "blizzard": play weather "sounds/blizzard.ogg" fadeout 0.5 fadein 0.5 if_changed @@ -30,15 +29,15 @@ transform cloud_move: repeat image weather_clear = ConditionSwitch( - "game.daytime == True", "images/rooms/main_room/weather/sky.webp", - "game.moon == True", "images/rooms/main_room/weather/night_sky_moon.webp", - "game.daytime == False", "images/rooms/main_room/weather/night_sky.webp", + "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( - "game.daytime == True", "images/rooms/main_room/weather/sky_overcast.webp", - "game.moon == True", "images/rooms/main_room/weather/night_sky_moon_overcast.webp", - "game.daytime == False", "images/rooms/main_room/weather/night_sky_overcast.webp", + "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", ) image weather_cloudy_clouds_night = Composite( @@ -56,8 +55,8 @@ image weather_cloudy_clouds_day = Composite( ) image weather_cloudy_clouds = ConditionSwitch( - "game.daytime == True", "weather_cloudy_clouds_day", - "game.daytime == False", "weather_cloudy_clouds_night", + "game.daytime", "weather_cloudy_clouds_day", + "True", "weather_cloudy_clouds_night", ) image weather_cloudy_fx: