Fix weather storm and create the weather image tag

This commit is contained in:
Asriel Senna 2023-11-18 15:41:23 +01:00
parent da6b7d11ae
commit d124579be4
2 changed files with 11 additions and 18 deletions

View File

@ -30,7 +30,7 @@ screen main_room():
if room_menu_active and game.day > 1 and not renpy.android: if room_menu_active and game.day > 1 and not renpy.android:
use hotkeys_main use hotkeys_main
add "weather_[game.weather]" xycenter (430, 218) add "weather [game.weather]" xycenter (430, 218)
# Walls # Walls
if game.daytime: if game.daytime:

View File

@ -26,13 +26,13 @@ transform cloud_move:
pause 7 pause 7
repeat repeat
image weather_clear = ConditionSwitch( # final image weather clear = ConditionSwitch( # final
"game.daytime", "images/rooms/main_room/weather/sky.webp", "game.daytime", "images/rooms/main_room/weather/sky.webp",
"game.moon", "images/rooms/main_room/weather/night_sky_moon.webp", "game.moon", "images/rooms/main_room/weather/night_sky_moon.webp",
"True", "images/rooms/main_room/weather/night_sky.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.daytime", "images/rooms/main_room/weather/sky_overcast.webp",
"game.moon", "images/rooms/main_room/weather/night_sky_moon_overcast.webp", "game.moon", "images/rooms/main_room/weather/night_sky_moon_overcast.webp",
"True", "images/rooms/main_room/weather/night_sky_overcast.webp", "True", "images/rooms/main_room/weather/night_sky_overcast.webp",
@ -71,7 +71,7 @@ image weather_cloudy_fx:
pause 2 pause 2
repeat 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: image weather_rain_fx:
animation animation
@ -83,7 +83,7 @@ image weather_rain_fx:
pause.1 pause.1
repeat 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: image weather_snow_fx:
animation animation
@ -109,7 +109,7 @@ image weather_snow_fx:
pause.07 pause.07
repeat 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: image weather_blizzard_fx:
animation animation
@ -135,12 +135,12 @@ image weather_blizzard_fx:
pause.05 pause.05
repeat 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: image weather_storm_fx:
animation animation
parallel: contains:
animation animation
pause 20 pause 20
Null() Null()
@ -163,14 +163,7 @@ image weather_storm_fx:
pause 20 pause 20
repeat repeat
parallel: contains:
animation "weather_rain_fx"
"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
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