Merge fix
This commit is contained in:
parent
d4726d3be2
commit
606c9c55e0
@ -40,40 +40,53 @@ image weather overcast = ConditionSwitch( # final
|
|||||||
"True", "images/rooms/main_room/weather/night_sky_overcast.webp",
|
"True", "images/rooms/main_room/weather/night_sky_overcast.webp",
|
||||||
)
|
)
|
||||||
|
|
||||||
image weather_cloudy_clouds_night = Composite(
|
transform cloud_move:
|
||||||
(155, 230),
|
subpixel True
|
||||||
(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"
|
|
||||||
choice:
|
choice:
|
||||||
pos (-100, 0)
|
yoffset 0
|
||||||
choice:
|
choice:
|
||||||
pos (-100, 15)
|
yoffset 15
|
||||||
choice:
|
choice:
|
||||||
pos (-100, 30)
|
yoffset 30
|
||||||
|
xoffset -120
|
||||||
ease 15.0 xpos 120
|
choice:
|
||||||
pause 2
|
linear 12 xoffset 100
|
||||||
|
choice:
|
||||||
|
linear 15 xoffset 100
|
||||||
|
choice:
|
||||||
|
linear 18 xoffset 100
|
||||||
repeat
|
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:
|
image weather_rain_fx:
|
||||||
animation
|
animation
|
||||||
@ -168,4 +181,4 @@ image weather_storm_fx:
|
|||||||
contains:
|
contains:
|
||||||
"weather_rain_fx"
|
"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
|
Loading…
Reference in New Issue
Block a user