Clarify and simplify weather (by
Gouvernathor) remove two blank images (useless and slower than Null()) clarify in weather.rpy which are images directly shown on the screen and not just ingredients for the others simplify the screen code
This commit is contained in:
parent
47da88a59e
commit
2ef20d57da
BIN
game/images/rooms/main_room/weather/lightning_01.webp
(Stored with Git LFS)
BIN
game/images/rooms/main_room/weather/lightning_01.webp
(Stored with Git LFS)
Binary file not shown.
BIN
game/images/rooms/main_room/weather/lightning_05.webp
(Stored with Git LFS)
BIN
game/images/rooms/main_room/weather/lightning_05.webp
(Stored with Git LFS)
Binary file not shown.
@ -25,13 +25,12 @@ screen main_room():
|
|||||||
sensitive room_menu_active
|
sensitive room_menu_active
|
||||||
|
|
||||||
default objects = sorted(main_room.objects, key=lambda x: x.zorder)
|
default objects = sorted(main_room.objects, key=lambda x: x.zorder)
|
||||||
default weather = "weather_[game.weather]"
|
|
||||||
|
|
||||||
# Hotkeys
|
# Hotkeys
|
||||||
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 pos (430, 218) anchor (0.5, 0.5)
|
add "weather_[game.weather]" xycenter (430, 218)
|
||||||
|
|
||||||
# Walls
|
# Walls
|
||||||
if game.daytime:
|
if game.daytime:
|
||||||
|
@ -28,13 +28,13 @@ transform cloud_move:
|
|||||||
pause 7
|
pause 7
|
||||||
repeat
|
repeat
|
||||||
|
|
||||||
image weather_clear = ConditionSwitch(
|
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(
|
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",
|
||||||
@ -73,7 +73,7 @@ image weather_cloudy_fx:
|
|||||||
pause 2
|
pause 2
|
||||||
repeat
|
repeat
|
||||||
|
|
||||||
image weather_cloudy = Fixed("weather_clear", "weather_cloudy_fx", fit_first=True)
|
image weather_cloudy = Fixed("weather_clear", "weather_cloudy_fx", fit_first=True) # final
|
||||||
|
|
||||||
image weather_rain_fx:
|
image weather_rain_fx:
|
||||||
animation
|
animation
|
||||||
@ -85,7 +85,7 @@ image weather_rain_fx:
|
|||||||
pause.1
|
pause.1
|
||||||
repeat
|
repeat
|
||||||
|
|
||||||
image weather_rain = Fixed("weather_overcast", "weather_rain_fx", fit_first=True)
|
image weather_rain = Fixed("weather_overcast", "weather_rain_fx", fit_first=True) # final
|
||||||
|
|
||||||
image weather_snow_fx:
|
image weather_snow_fx:
|
||||||
animation
|
animation
|
||||||
@ -111,7 +111,7 @@ image weather_snow_fx:
|
|||||||
pause.07
|
pause.07
|
||||||
repeat
|
repeat
|
||||||
|
|
||||||
image weather_snow = Fixed("weather_overcast", "weather_snow_fx", fit_first=True)
|
image weather_snow = Fixed("weather_overcast", "weather_snow_fx", fit_first=True) # final
|
||||||
|
|
||||||
image weather_blizzard_fx:
|
image weather_blizzard_fx:
|
||||||
animation
|
animation
|
||||||
@ -137,7 +137,7 @@ image weather_blizzard_fx:
|
|||||||
pause.05
|
pause.05
|
||||||
repeat
|
repeat
|
||||||
|
|
||||||
image weather_blizzard= Fixed("weather_overcast", "weather_blizzard_fx", fit_first=True)
|
image weather_blizzard = Fixed("weather_overcast", "weather_blizzard_fx", fit_first=True) # final
|
||||||
|
|
||||||
image weather_storm_fx:
|
image weather_storm_fx:
|
||||||
animation
|
animation
|
||||||
@ -145,7 +145,7 @@ image weather_storm_fx:
|
|||||||
parallel:
|
parallel:
|
||||||
animation
|
animation
|
||||||
pause 20
|
pause 20
|
||||||
"images/rooms/main_room/weather/lightning_01.webp"
|
Null()
|
||||||
pause.1
|
pause.1
|
||||||
"images/rooms/main_room/weather/lightning_02.webp"
|
"images/rooms/main_room/weather/lightning_02.webp"
|
||||||
pause.1
|
pause.1
|
||||||
@ -153,15 +153,15 @@ image weather_storm_fx:
|
|||||||
pause.1
|
pause.1
|
||||||
"images/rooms/main_room/weather/lightning_04.webp"
|
"images/rooms/main_room/weather/lightning_04.webp"
|
||||||
pause.1
|
pause.1
|
||||||
"images/rooms/main_room/weather/lightning_05.webp"
|
Null()
|
||||||
pause.1
|
pause.1
|
||||||
"images/rooms/main_room/weather/lightning_06.webp"
|
"images/rooms/main_room/weather/lightning_06.webp"
|
||||||
pause.1
|
pause.1
|
||||||
"images/rooms/main_room/weather/lightning_05.webp"
|
Null()
|
||||||
pause.1
|
pause.1
|
||||||
"images/rooms/main_room/weather/lightning_06.webp"
|
"images/rooms/main_room/weather/lightning_06.webp"
|
||||||
pause.1
|
pause.1
|
||||||
"images/rooms/main_room/weather/lightning_05.webp"
|
Null()
|
||||||
pause 20
|
pause 20
|
||||||
repeat
|
repeat
|
||||||
|
|
||||||
@ -175,4 +175,4 @@ image weather_storm_fx:
|
|||||||
pause.1
|
pause.1
|
||||||
repeat
|
repeat
|
||||||
|
|
||||||
image weather_storm = Fixed("weather_overcast", "weather_storm_fx", fit_first=True)
|
image weather_storm = Fixed("weather_overcast", "weather_storm_fx", fit_first=True) # final
|
||||||
|
Loading…
Reference in New Issue
Block a user