From 2956afe75a1e3bf6f2b3f4f5a8ae597694b092ef Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Sat, 17 Dec 2022 21:57:06 +0000 Subject: [PATCH] Bug Fixes * Fixed decoration menu page swap arrow position * Fixed room and title screen animations restarting with every interaction --- game/scripts/animations/common.rpy | 4 +++ game/scripts/interface/inventory.rpy | 4 +-- game/scripts/rooms/main_room/images.rpy | 25 +++++++++++++++++++ .../rooms/main_room/objects/weather.rpy | 9 ++++++- 4 files changed, 39 insertions(+), 3 deletions(-) diff --git a/game/scripts/animations/common.rpy b/game/scripts/animations/common.rpy index f1f0cb96..e02d1135 100644 --- a/game/scripts/animations/common.rpy +++ b/game/scripts/animations/common.rpy @@ -267,6 +267,7 @@ image sur: # Main title background animation image title_ani: contains: + animation zoom 0.5 "images/title/00.webp" pause 3 @@ -318,6 +319,7 @@ image title_ani: "candle_fire_01" contains: + animation xpos -255 ypos 100 zoom 0.8 @@ -341,6 +343,7 @@ image title_ani: #sparkle contains: + animation xpos 798 ypos 200 xanchor 0.5 @@ -354,6 +357,7 @@ image title_ani: #shine silver (synchronized) contains: + animation xpos 848 ypos 230 xanchor 0.5 diff --git a/game/scripts/interface/inventory.rpy b/game/scripts/interface/inventory.rpy index 916f294b..515519a6 100644 --- a/game/scripts/interface/inventory.rpy +++ b/game/scripts/interface/inventory.rpy @@ -308,9 +308,9 @@ screen inventory_menuitem(xx, yy): action Return("dec") imagebutton: - idle Transform(gui.format("interface/frames/{}/arrow_up.webp"), xzoom=-1) + idle Transform(gui.format("interface/frames/{}/arrow_up.webp"), yzoom=-1) if current_page < math.ceil((menu_items_length-1)/items_shown): - hover Transform(image_hover(gui.format("interface/frames/{}/arrow_up.webp")), xzoom=-1) + hover Transform(image_hover(gui.format("interface/frames/{}/arrow_up.webp")), yzoom=-1) action Return("inc") # Add items diff --git a/game/scripts/rooms/main_room/images.rpy b/game/scripts/rooms/main_room/images.rpy index 24d8fe53..8b719696 100644 --- a/game/scripts/rooms/main_room/images.rpy +++ b/game/scripts/rooms/main_room/images.rpy @@ -1,5 +1,6 @@ image fireplace_fire: + animation offset (-24, -6) "images/rooms/objects/fireplace/fireplace_fire_01.webp" pause.1 @@ -20,6 +21,7 @@ image fireplace_fire: repeat image glow_effect: + animation "images/animation/glow_effect/glow_1.webp" pause.1 "images/animation/glow_effect/glow_2.webp" @@ -51,6 +53,7 @@ image glow_effect_fireplace: "glow_effect" image candle_fire_01: + animation "images/rooms/objects/candles/fire_01.webp" pause.1 "images/rooms/objects/candles/fire_02.webp" @@ -79,6 +82,7 @@ image candle_fire_01: repeat image candle_fire_02: + animation "images/rooms/objects/candles/fire_01.webp" pause.1 "images/rooms/objects/candles/fire_04.webp" @@ -107,6 +111,7 @@ image candle_fire_02: repeat image phoenix_idle: + animation zoom 0.5 "images/rooms/objects/phoenix/phoenix_01.webp" @@ -135,6 +140,7 @@ image phoenix_hover: "images/rooms/objects/phoenix/phoenix_hover.webp" image phoenix_feather: + animation zoom 0.5 pause 10 alpha 1.0 @@ -208,6 +214,7 @@ image fireplace_hover: "images/rooms/objects/fireplace/fireplace_hover.webp" image owl_idle: + animation zoom 0.5 "images/rooms/objects/mail/owl_idle_01.webp" @@ -223,6 +230,7 @@ image owl_idle: repeat image owl_letter: + animation zoom 0.5 "images/rooms/objects/mail/owl_01.webp" @@ -272,6 +280,7 @@ image candle_right: "images/rooms/objects/candles/candle.webp" image candle_fire: #Candle fire. + animation "images/rooms/objects/candles/fire_01.webp" pause.1 "images/rooms/objects/candles/fire_04.webp" @@ -337,6 +346,7 @@ image desk_dumbledore: "images/rooms/main_room/dum.webp" image halloween_chandelier: + animation contains: anchor (0.5, 0.0) @@ -364,6 +374,7 @@ image halloween_fireplace_jackolanterns: "images/rooms/objects/decorations/halloween_fireplace2.webp" image halloween_window_monster: + animation "images/rooms/objects/decorations/halloween_monster/0.webp" pause 3 "images/rooms/objects/decorations/halloween_monster/1.webp" @@ -409,6 +420,7 @@ image halloween_lamp_left_glow: offset (-111, -81) contains: + animation alpha 0.9 "images/rooms/objects/decorations/halloween_lamp/glow.webp" @@ -431,6 +443,7 @@ image halloween_lamp_right_glow: offset (-111, -81) contains: + animation alpha 0.9 "images/rooms/objects/decorations/halloween_lamp/glow.webp" @@ -553,6 +566,7 @@ image xmas_lights_alternate: "images/rooms/objects/decorations/xmas_lights/underlay.webp" contains: + animation alpha 1.0 "xmas_lights_set1_bulbs" linear 0.5 alpha 0.5 @@ -560,6 +574,7 @@ image xmas_lights_alternate: repeat contains: + animation alpha 0.5 "xmas_lights_set2_bulbs" linear 0.5 alpha 1.0 @@ -570,6 +585,7 @@ image xmas_lights_alternate: "images/rooms/objects/decorations/xmas_lights/base.webp" contains: + animation alpha 1.0 "xmas_lights_set1_glow" linear 0.5 alpha 0.0 @@ -577,6 +593,7 @@ image xmas_lights_alternate: repeat contains: + animation alpha 0.0 "xmas_lights_set2_glow" linear 0.5 alpha 1.0 @@ -589,12 +606,14 @@ image xmas_lights_cycle: "images/rooms/objects/decorations/xmas_lights/underlay.webp" contains: + animation matrixcolor HueMatrix(0) "xmas_lights_set1_bulbs" linear 18.0 matrixcolor HueMatrix(360) repeat contains: + animation matrixcolor HueMatrix(0) "xmas_lights_set2_bulbs" linear 18.0 matrixcolor HueMatrix(360) @@ -604,12 +623,14 @@ image xmas_lights_cycle: "images/rooms/objects/decorations/xmas_lights/base.webp" contains: + animation matrixcolor HueMatrix(0) "xmas_lights_set1_glow" linear 18.0 matrixcolor HueMatrix(360) repeat contains: + animation matrixcolor HueMatrix(0) "xmas_lights_set2_glow" linear 18.0 matrixcolor HueMatrix(360) @@ -621,6 +642,7 @@ image xmas_lights_pulse: "images/rooms/objects/decorations/xmas_lights/underlay.webp" contains: + animation alpha 1.0 "xmas_lights_set1_bulbs" easeout 3.5 alpha 0.0 @@ -630,6 +652,7 @@ image xmas_lights_pulse: repeat contains: + animation alpha 1.0 "xmas_lights_set2_bulbs" easeout 3.5 alpha 0.0 @@ -642,6 +665,7 @@ image xmas_lights_pulse: "images/rooms/objects/decorations/xmas_lights/base.webp" contains: + animation alpha 1.0 "xmas_lights_set1_glow" easeout 3.5 alpha 0.0 @@ -651,6 +675,7 @@ image xmas_lights_pulse: repeat contains: + animation alpha 1.0 "xmas_lights_set2_glow" easeout 3.5 alpha 0.0 diff --git a/game/scripts/rooms/main_room/objects/weather.rpy b/game/scripts/rooms/main_room/objects/weather.rpy index ac342830..487e9f9c 100644 --- a/game/scripts/rooms/main_room/objects/weather.rpy +++ b/game/scripts/rooms/main_room/objects/weather.rpy @@ -59,6 +59,7 @@ image weather_cloudy_clouds = ConditionSwitch( ) image weather_cloudy_fx: + animation "weather_cloudy_clouds" choice: pos (-100, 0) @@ -74,6 +75,7 @@ image weather_cloudy_fx: image weather_cloudy = Fixed("weather_clear", "weather_cloudy_fx", fit_first=True) image weather_rain_fx: + animation "images/rooms/_weather_/rain_01.webp" pause.1 "images/rooms/_weather_/rain_02.webp" @@ -85,6 +87,7 @@ image weather_rain_fx: image weather_rain = Fixed("weather_overcast", "weather_rain_fx", fit_first=True) image weather_snow_fx: + animation "images/rooms/_weather_/snow_01.webp" pause.07 "images/rooms/_weather_/snow_02.webp" @@ -110,6 +113,7 @@ image weather_snow_fx: image weather_snow = Fixed("weather_overcast", "weather_snow_fx", fit_first=True) image weather_blizzard_fx: + animation "images/rooms/_weather_/blizzard_01.webp" pause.05 "images/rooms/_weather_/blizzard_02.webp" @@ -135,8 +139,10 @@ image weather_blizzard_fx: image weather_blizzard= Fixed("weather_overcast", "weather_blizzard_fx", fit_first=True) image weather_storm_fx: + animation parallel: + animation pause 20 "images/rooms/_weather_/lightning_01.webp" pause.1 @@ -159,6 +165,7 @@ image weather_storm_fx: repeat parallel: + animation "images/rooms/_weather_/rain_01.webp" pause.1 "images/rooms/_weather_/rain_02.webp" @@ -167,4 +174,4 @@ image weather_storm_fx: pause.1 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)