diff --git a/game/images/rooms/main_room/bg_day.webp b/game/images/rooms/main_room/bg_day.webp new file mode 100644 index 00000000..6d4c60be --- /dev/null +++ b/game/images/rooms/main_room/bg_day.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d24b6d68e23992cd4f6444004f34cae3689265a9d75ae6f39a1e530aac4fdef9 +size 1207198 diff --git a/game/images/rooms/main_room/bg_night.webp b/game/images/rooms/main_room/bg_night.webp new file mode 100644 index 00000000..1eaeb767 --- /dev/null +++ b/game/images/rooms/main_room/bg_night.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f09bf2c7247c91d83bc6ac3c39cf54e7a6cd7bc530e0d7a9ca47df765733df3 +size 932434 diff --git a/game/images/rooms/objects/candles/candle.webp b/game/images/rooms/main_room/candles/candle.webp similarity index 100% rename from game/images/rooms/objects/candles/candle.webp rename to game/images/rooms/main_room/candles/candle.webp diff --git a/game/images/rooms/objects/candles/candleM.webp b/game/images/rooms/main_room/candles/candleM.webp similarity index 100% rename from game/images/rooms/objects/candles/candleM.webp rename to game/images/rooms/main_room/candles/candleM.webp diff --git a/game/images/rooms/objects/candles/fire_01.webp b/game/images/rooms/main_room/candles/fire_01.webp similarity index 100% rename from game/images/rooms/objects/candles/fire_01.webp rename to game/images/rooms/main_room/candles/fire_01.webp diff --git a/game/images/rooms/objects/candles/fire_02.webp b/game/images/rooms/main_room/candles/fire_02.webp similarity index 100% rename from game/images/rooms/objects/candles/fire_02.webp rename to game/images/rooms/main_room/candles/fire_02.webp diff --git a/game/images/rooms/objects/candles/fire_03.webp b/game/images/rooms/main_room/candles/fire_03.webp similarity index 100% rename from game/images/rooms/objects/candles/fire_03.webp rename to game/images/rooms/main_room/candles/fire_03.webp diff --git a/game/images/rooms/objects/candles/fire_04.webp b/game/images/rooms/main_room/candles/fire_04.webp similarity index 100% rename from game/images/rooms/objects/candles/fire_04.webp rename to game/images/rooms/main_room/candles/fire_04.webp diff --git a/game/images/rooms/objects/candles/fire_05.webp b/game/images/rooms/main_room/candles/fire_05.webp similarity index 100% rename from game/images/rooms/objects/candles/fire_05.webp rename to game/images/rooms/main_room/candles/fire_05.webp diff --git a/game/images/rooms/objects/candles/fire_06.webp b/game/images/rooms/main_room/candles/fire_06.webp similarity index 100% rename from game/images/rooms/objects/candles/fire_06.webp rename to game/images/rooms/main_room/candles/fire_06.webp diff --git a/game/images/rooms/objects/candles/fire_07.webp b/game/images/rooms/main_room/candles/fire_07.webp similarity index 100% rename from game/images/rooms/objects/candles/fire_07.webp rename to game/images/rooms/main_room/candles/fire_07.webp diff --git a/game/images/rooms/objects/candles/fire_08.webp b/game/images/rooms/main_room/candles/fire_08.webp similarity index 100% rename from game/images/rooms/objects/candles/fire_08.webp rename to game/images/rooms/main_room/candles/fire_08.webp diff --git a/game/images/rooms/objects/candles/fire_09.webp b/game/images/rooms/main_room/candles/fire_09.webp similarity index 100% rename from game/images/rooms/objects/candles/fire_09.webp rename to game/images/rooms/main_room/candles/fire_09.webp diff --git a/game/images/rooms/objects/candles/fire_10.webp b/game/images/rooms/main_room/candles/fire_10.webp similarity index 100% rename from game/images/rooms/objects/candles/fire_10.webp rename to game/images/rooms/main_room/candles/fire_10.webp diff --git a/game/images/rooms/main_room/chair_left_no_shadow.webp b/game/images/rooms/main_room/chair_left_no_shadow.webp deleted file mode 100644 index a81d86d0..00000000 --- a/game/images/rooms/main_room/chair_left_no_shadow.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:911d0e91420bdd0e043d9037e5ce6ebb1086ba4e0961225c505387073558500a -size 14276 diff --git a/game/images/rooms/objects/cupboard/cupboard_open.webp b/game/images/rooms/main_room/cupboard/cupboard_open.webp similarity index 100% rename from game/images/rooms/objects/cupboard/cupboard_open.webp rename to game/images/rooms/main_room/cupboard/cupboard_open.webp diff --git a/game/images/rooms/objects/cupboard/cupboard_w_shadow.webp b/game/images/rooms/main_room/cupboard/cupboard_w_shadow.webp similarity index 100% rename from game/images/rooms/objects/cupboard/cupboard_w_shadow.webp rename to game/images/rooms/main_room/cupboard/cupboard_w_shadow.webp diff --git a/game/images/rooms/objects/decorations/agrabah_poster.webp b/game/images/rooms/main_room/decorations/agrabah_poster.webp similarity index 100% rename from game/images/rooms/objects/decorations/agrabah_poster.webp rename to game/images/rooms/main_room/decorations/agrabah_poster.webp diff --git a/game/images/rooms/objects/decorations/bats_trophy.webp b/game/images/rooms/main_room/decorations/bats_trophy.webp similarity index 100% rename from game/images/rooms/objects/decorations/bats_trophy.webp rename to game/images/rooms/main_room/decorations/bats_trophy.webp diff --git a/game/images/rooms/objects/decorations/crest_trophy.webp b/game/images/rooms/main_room/decorations/crest_trophy.webp similarity index 100% rename from game/images/rooms/objects/decorations/crest_trophy.webp rename to game/images/rooms/main_room/decorations/crest_trophy.webp diff --git a/game/images/rooms/objects/decorations/gryffindor_poster.webp b/game/images/rooms/main_room/decorations/gryffindor_poster.webp similarity index 100% rename from game/images/rooms/objects/decorations/gryffindor_poster.webp rename to game/images/rooms/main_room/decorations/gryffindor_poster.webp diff --git a/game/images/rooms/objects/decorations/halloween_chair.webp b/game/images/rooms/main_room/decorations/halloween_chair.webp similarity index 100% rename from game/images/rooms/objects/decorations/halloween_chair.webp rename to game/images/rooms/main_room/decorations/halloween_chair.webp diff --git a/game/images/rooms/objects/decorations/halloween_chandelier.webp b/game/images/rooms/main_room/decorations/halloween_chandelier.webp similarity index 100% rename from game/images/rooms/objects/decorations/halloween_chandelier.webp rename to game/images/rooms/main_room/decorations/halloween_chandelier.webp diff --git a/game/images/rooms/objects/decorations/halloween_cupboard.webp b/game/images/rooms/main_room/decorations/halloween_cupboard.webp similarity index 100% rename from game/images/rooms/objects/decorations/halloween_cupboard.webp rename to game/images/rooms/main_room/decorations/halloween_cupboard.webp diff --git a/game/images/rooms/objects/decorations/halloween_cupboard2.webp b/game/images/rooms/main_room/decorations/halloween_cupboard2.webp similarity index 100% rename from game/images/rooms/objects/decorations/halloween_cupboard2.webp rename to game/images/rooms/main_room/decorations/halloween_cupboard2.webp diff --git a/game/images/rooms/objects/decorations/halloween_fireplace.webp b/game/images/rooms/main_room/decorations/halloween_fireplace.webp similarity index 100% rename from game/images/rooms/objects/decorations/halloween_fireplace.webp rename to game/images/rooms/main_room/decorations/halloween_fireplace.webp diff --git a/game/images/rooms/objects/decorations/halloween_fireplace2.webp b/game/images/rooms/main_room/decorations/halloween_fireplace2.webp similarity index 100% rename from game/images/rooms/objects/decorations/halloween_fireplace2.webp rename to game/images/rooms/main_room/decorations/halloween_fireplace2.webp diff --git a/game/images/rooms/objects/decorations/halloween_lamp/filament.webp b/game/images/rooms/main_room/decorations/halloween_lamp/filament.webp similarity index 100% rename from game/images/rooms/objects/decorations/halloween_lamp/filament.webp rename to game/images/rooms/main_room/decorations/halloween_lamp/filament.webp diff --git a/game/images/rooms/objects/decorations/halloween_lamp/glow.webp b/game/images/rooms/main_room/decorations/halloween_lamp/glow.webp similarity index 100% rename from game/images/rooms/objects/decorations/halloween_lamp/glow.webp rename to game/images/rooms/main_room/decorations/halloween_lamp/glow.webp diff --git a/game/images/rooms/objects/decorations/halloween_lamp/left.webp b/game/images/rooms/main_room/decorations/halloween_lamp/left.webp similarity index 100% rename from game/images/rooms/objects/decorations/halloween_lamp/left.webp rename to game/images/rooms/main_room/decorations/halloween_lamp/left.webp diff --git a/game/images/rooms/objects/decorations/halloween_lamp/right.webp b/game/images/rooms/main_room/decorations/halloween_lamp/right.webp similarity index 100% rename from game/images/rooms/objects/decorations/halloween_lamp/right.webp rename to game/images/rooms/main_room/decorations/halloween_lamp/right.webp diff --git a/game/images/rooms/objects/decorations/halloween_monster/0.webp b/game/images/rooms/main_room/decorations/halloween_monster/0.webp similarity index 100% rename from game/images/rooms/objects/decorations/halloween_monster/0.webp rename to game/images/rooms/main_room/decorations/halloween_monster/0.webp diff --git a/game/images/rooms/objects/decorations/halloween_monster/1.webp b/game/images/rooms/main_room/decorations/halloween_monster/1.webp similarity index 100% rename from game/images/rooms/objects/decorations/halloween_monster/1.webp rename to game/images/rooms/main_room/decorations/halloween_monster/1.webp diff --git a/game/images/rooms/objects/decorations/halloween_monster/2.webp b/game/images/rooms/main_room/decorations/halloween_monster/2.webp similarity index 100% rename from game/images/rooms/objects/decorations/halloween_monster/2.webp rename to game/images/rooms/main_room/decorations/halloween_monster/2.webp diff --git a/game/images/rooms/objects/decorations/halloween_monster/3.webp b/game/images/rooms/main_room/decorations/halloween_monster/3.webp similarity index 100% rename from game/images/rooms/objects/decorations/halloween_monster/3.webp rename to game/images/rooms/main_room/decorations/halloween_monster/3.webp diff --git a/game/images/rooms/objects/decorations/halloween_phoenix.webp b/game/images/rooms/main_room/decorations/halloween_phoenix.webp similarity index 100% rename from game/images/rooms/objects/decorations/halloween_phoenix.webp rename to game/images/rooms/main_room/decorations/halloween_phoenix.webp diff --git a/game/images/rooms/objects/decorations/halloween_rug.webp b/game/images/rooms/main_room/decorations/halloween_rug.webp similarity index 100% rename from game/images/rooms/objects/decorations/halloween_rug.webp rename to game/images/rooms/main_room/decorations/halloween_rug.webp diff --git a/game/images/rooms/objects/decorations/harlot_poster.webp b/game/images/rooms/main_room/decorations/harlot_poster.webp similarity index 100% rename from game/images/rooms/objects/decorations/harlot_poster.webp rename to game/images/rooms/main_room/decorations/harlot_poster.webp diff --git a/game/images/rooms/objects/decorations/hat_fireplace.webp b/game/images/rooms/main_room/decorations/hat_fireplace.webp similarity index 100% rename from game/images/rooms/objects/decorations/hat_fireplace.webp rename to game/images/rooms/main_room/decorations/hat_fireplace.webp diff --git a/game/images/rooms/objects/decorations/hat_owl.webp b/game/images/rooms/main_room/decorations/hat_owl.webp similarity index 100% rename from game/images/rooms/objects/decorations/hat_owl.webp rename to game/images/rooms/main_room/decorations/hat_owl.webp diff --git a/game/images/rooms/objects/decorations/hat_phoenix.webp b/game/images/rooms/main_room/decorations/hat_phoenix.webp similarity index 100% rename from game/images/rooms/objects/decorations/hat_phoenix.webp rename to game/images/rooms/main_room/decorations/hat_phoenix.webp diff --git a/game/images/rooms/objects/decorations/hermione_poster.webp b/game/images/rooms/main_room/decorations/hermione_poster.webp similarity index 100% rename from game/images/rooms/objects/decorations/hermione_poster.webp rename to game/images/rooms/main_room/decorations/hermione_poster.webp diff --git a/game/images/rooms/objects/decorations/hufflepuff_poster.webp b/game/images/rooms/main_room/decorations/hufflepuff_poster.webp similarity index 100% rename from game/images/rooms/objects/decorations/hufflepuff_poster.webp rename to game/images/rooms/main_room/decorations/hufflepuff_poster.webp diff --git a/game/images/rooms/objects/decorations/ravenclaw_poster.webp b/game/images/rooms/main_room/decorations/ravenclaw_poster.webp similarity index 100% rename from game/images/rooms/objects/decorations/ravenclaw_poster.webp rename to game/images/rooms/main_room/decorations/ravenclaw_poster.webp diff --git a/game/images/rooms/objects/decorations/santas_naughty_list.webp b/game/images/rooms/main_room/decorations/santas_naughty_list.webp similarity index 100% rename from game/images/rooms/objects/decorations/santas_naughty_list.webp rename to game/images/rooms/main_room/decorations/santas_naughty_list.webp diff --git a/game/images/rooms/objects/decorations/slytherin_poster.webp b/game/images/rooms/main_room/decorations/slytherin_poster.webp similarity index 100% rename from game/images/rooms/objects/decorations/slytherin_poster.webp rename to game/images/rooms/main_room/decorations/slytherin_poster.webp diff --git a/game/images/rooms/objects/decorations/small_owl/idle_0.webp b/game/images/rooms/main_room/decorations/small_owl/idle_0.webp similarity index 100% rename from game/images/rooms/objects/decorations/small_owl/idle_0.webp rename to game/images/rooms/main_room/decorations/small_owl/idle_0.webp diff --git a/game/images/rooms/objects/decorations/small_owl/idle_1.webp b/game/images/rooms/main_room/decorations/small_owl/idle_1.webp similarity index 100% rename from game/images/rooms/objects/decorations/small_owl/idle_1.webp rename to game/images/rooms/main_room/decorations/small_owl/idle_1.webp diff --git a/game/images/rooms/objects/decorations/small_owl/idle_2.webp b/game/images/rooms/main_room/decorations/small_owl/idle_2.webp similarity index 100% rename from game/images/rooms/objects/decorations/small_owl/idle_2.webp rename to game/images/rooms/main_room/decorations/small_owl/idle_2.webp diff --git a/game/images/rooms/objects/decorations/small_owl/letter_0.webp b/game/images/rooms/main_room/decorations/small_owl/letter_0.webp similarity index 100% rename from game/images/rooms/objects/decorations/small_owl/letter_0.webp rename to game/images/rooms/main_room/decorations/small_owl/letter_0.webp diff --git a/game/images/rooms/objects/decorations/small_owl/letter_1.webp b/game/images/rooms/main_room/decorations/small_owl/letter_1.webp similarity index 100% rename from game/images/rooms/objects/decorations/small_owl/letter_1.webp rename to game/images/rooms/main_room/decorations/small_owl/letter_1.webp diff --git a/game/images/rooms/objects/decorations/small_owl/letter_2.webp b/game/images/rooms/main_room/decorations/small_owl/letter_2.webp similarity index 100% rename from game/images/rooms/objects/decorations/small_owl/letter_2.webp rename to game/images/rooms/main_room/decorations/small_owl/letter_2.webp diff --git a/game/images/rooms/objects/decorations/small_owl/letter_hover.webp b/game/images/rooms/main_room/decorations/small_owl/letter_hover.webp similarity index 100% rename from game/images/rooms/objects/decorations/small_owl/letter_hover.webp rename to game/images/rooms/main_room/decorations/small_owl/letter_hover.webp diff --git a/game/images/rooms/objects/decorations/snow_owl/idle_0.webp b/game/images/rooms/main_room/decorations/snow_owl/idle_0.webp similarity index 100% rename from game/images/rooms/objects/decorations/snow_owl/idle_0.webp rename to game/images/rooms/main_room/decorations/snow_owl/idle_0.webp diff --git a/game/images/rooms/objects/decorations/snow_owl/idle_1.webp b/game/images/rooms/main_room/decorations/snow_owl/idle_1.webp similarity index 100% rename from game/images/rooms/objects/decorations/snow_owl/idle_1.webp rename to game/images/rooms/main_room/decorations/snow_owl/idle_1.webp diff --git a/game/images/rooms/objects/decorations/snow_owl/idle_2.webp b/game/images/rooms/main_room/decorations/snow_owl/idle_2.webp similarity index 100% rename from game/images/rooms/objects/decorations/snow_owl/idle_2.webp rename to game/images/rooms/main_room/decorations/snow_owl/idle_2.webp diff --git a/game/images/rooms/objects/decorations/snow_owl/letter_0.webp b/game/images/rooms/main_room/decorations/snow_owl/letter_0.webp similarity index 100% rename from game/images/rooms/objects/decorations/snow_owl/letter_0.webp rename to game/images/rooms/main_room/decorations/snow_owl/letter_0.webp diff --git a/game/images/rooms/objects/decorations/snow_owl/letter_1.webp b/game/images/rooms/main_room/decorations/snow_owl/letter_1.webp similarity index 100% rename from game/images/rooms/objects/decorations/snow_owl/letter_1.webp rename to game/images/rooms/main_room/decorations/snow_owl/letter_1.webp diff --git a/game/images/rooms/objects/decorations/snow_owl/letter_2.webp b/game/images/rooms/main_room/decorations/snow_owl/letter_2.webp similarity index 100% rename from game/images/rooms/objects/decorations/snow_owl/letter_2.webp rename to game/images/rooms/main_room/decorations/snow_owl/letter_2.webp diff --git a/game/images/rooms/objects/decorations/snow_owl/letter_hover.webp b/game/images/rooms/main_room/decorations/snow_owl/letter_hover.webp similarity index 100% rename from game/images/rooms/objects/decorations/snow_owl/letter_hover.webp rename to game/images/rooms/main_room/decorations/snow_owl/letter_hover.webp diff --git a/game/images/rooms/objects/decorations/stag_trophy.webp b/game/images/rooms/main_room/decorations/stag_trophy.webp similarity index 100% rename from game/images/rooms/objects/decorations/stag_trophy.webp rename to game/images/rooms/main_room/decorations/stag_trophy.webp diff --git a/game/images/rooms/objects/decorations/stripper_poster.webp b/game/images/rooms/main_room/decorations/stripper_poster.webp similarity index 100% rename from game/images/rooms/objects/decorations/stripper_poster.webp rename to game/images/rooms/main_room/decorations/stripper_poster.webp diff --git a/game/images/rooms/objects/decorations/tonks_poster.webp b/game/images/rooms/main_room/decorations/tonks_poster.webp similarity index 100% rename from game/images/rooms/objects/decorations/tonks_poster.webp rename to game/images/rooms/main_room/decorations/tonks_poster.webp diff --git a/game/images/rooms/objects/decorations/wanted_poster.webp b/game/images/rooms/main_room/decorations/wanted_poster.webp similarity index 100% rename from game/images/rooms/objects/decorations/wanted_poster.webp rename to game/images/rooms/main_room/decorations/wanted_poster.webp diff --git a/game/images/rooms/objects/decorations/xmas_cupboard.webp b/game/images/rooms/main_room/decorations/xmas_cupboard.webp similarity index 100% rename from game/images/rooms/objects/decorations/xmas_cupboard.webp rename to game/images/rooms/main_room/decorations/xmas_cupboard.webp diff --git a/game/images/rooms/objects/decorations/xmas_door.webp b/game/images/rooms/main_room/decorations/xmas_door.webp similarity index 100% rename from game/images/rooms/objects/decorations/xmas_door.webp rename to game/images/rooms/main_room/decorations/xmas_door.webp diff --git a/game/images/rooms/objects/decorations/xmas_fireplace.webp b/game/images/rooms/main_room/decorations/xmas_fireplace.webp similarity index 100% rename from game/images/rooms/objects/decorations/xmas_fireplace.webp rename to game/images/rooms/main_room/decorations/xmas_fireplace.webp diff --git a/game/images/rooms/objects/decorations/xmas_garland.webp b/game/images/rooms/main_room/decorations/xmas_garland.webp similarity index 100% rename from game/images/rooms/objects/decorations/xmas_garland.webp rename to game/images/rooms/main_room/decorations/xmas_garland.webp diff --git a/game/images/rooms/objects/decorations/xmas_giftchair.webp b/game/images/rooms/main_room/decorations/xmas_giftchair.webp similarity index 100% rename from game/images/rooms/objects/decorations/xmas_giftchair.webp rename to game/images/rooms/main_room/decorations/xmas_giftchair.webp diff --git a/game/images/rooms/objects/decorations/xmas_lights/base.webp b/game/images/rooms/main_room/decorations/xmas_lights/base.webp similarity index 100% rename from game/images/rooms/objects/decorations/xmas_lights/base.webp rename to game/images/rooms/main_room/decorations/xmas_lights/base.webp diff --git a/game/images/rooms/objects/decorations/xmas_lights/bulbset_1.webp b/game/images/rooms/main_room/decorations/xmas_lights/bulbset_1.webp similarity index 100% rename from game/images/rooms/objects/decorations/xmas_lights/bulbset_1.webp rename to game/images/rooms/main_room/decorations/xmas_lights/bulbset_1.webp diff --git a/game/images/rooms/objects/decorations/xmas_lights/bulbset_2.webp b/game/images/rooms/main_room/decorations/xmas_lights/bulbset_2.webp similarity index 100% rename from game/images/rooms/objects/decorations/xmas_lights/bulbset_2.webp rename to game/images/rooms/main_room/decorations/xmas_lights/bulbset_2.webp diff --git a/game/images/rooms/objects/decorations/xmas_lights/glowset_1.webp b/game/images/rooms/main_room/decorations/xmas_lights/glowset_1.webp similarity index 100% rename from game/images/rooms/objects/decorations/xmas_lights/glowset_1.webp rename to game/images/rooms/main_room/decorations/xmas_lights/glowset_1.webp diff --git a/game/images/rooms/objects/decorations/xmas_lights/glowset_2.webp b/game/images/rooms/main_room/decorations/xmas_lights/glowset_2.webp similarity index 100% rename from game/images/rooms/objects/decorations/xmas_lights/glowset_2.webp rename to game/images/rooms/main_room/decorations/xmas_lights/glowset_2.webp diff --git a/game/images/rooms/objects/decorations/xmas_lights/underlay.webp b/game/images/rooms/main_room/decorations/xmas_lights/underlay.webp similarity index 100% rename from game/images/rooms/objects/decorations/xmas_lights/underlay.webp rename to game/images/rooms/main_room/decorations/xmas_lights/underlay.webp diff --git a/game/images/rooms/objects/decorations/xmas_owl.webp b/game/images/rooms/main_room/decorations/xmas_owl.webp similarity index 100% rename from game/images/rooms/objects/decorations/xmas_owl.webp rename to game/images/rooms/main_room/decorations/xmas_owl.webp diff --git a/game/images/rooms/objects/decorations/xmas_phoenix.webp b/game/images/rooms/main_room/decorations/xmas_phoenix.webp similarity index 100% rename from game/images/rooms/objects/decorations/xmas_phoenix.webp rename to game/images/rooms/main_room/decorations/xmas_phoenix.webp diff --git a/game/images/rooms/objects/decorations/xmas_window_santa/xmas_window_santa_base.webp b/game/images/rooms/main_room/decorations/xmas_window_santa/xmas_window_santa_base.webp similarity index 100% rename from game/images/rooms/objects/decorations/xmas_window_santa/xmas_window_santa_base.webp rename to game/images/rooms/main_room/decorations/xmas_window_santa/xmas_window_santa_base.webp diff --git a/game/images/rooms/objects/decorations/xmas_window_santa/xmas_window_santa_light.webp b/game/images/rooms/main_room/decorations/xmas_window_santa/xmas_window_santa_light.webp similarity index 100% rename from game/images/rooms/objects/decorations/xmas_window_santa/xmas_window_santa_light.webp rename to game/images/rooms/main_room/decorations/xmas_window_santa/xmas_window_santa_light.webp diff --git a/game/images/rooms/objects/decorations/xmas_window_santa/xmas_window_santa_mask.webp b/game/images/rooms/main_room/decorations/xmas_window_santa/xmas_window_santa_mask.webp similarity index 100% rename from game/images/rooms/objects/decorations/xmas_window_santa/xmas_window_santa_mask.webp rename to game/images/rooms/main_room/decorations/xmas_window_santa/xmas_window_santa_mask.webp diff --git a/game/images/rooms/objects/decorations/xmas_wreaths.webp b/game/images/rooms/main_room/decorations/xmas_wreaths.webp similarity index 100% rename from game/images/rooms/objects/decorations/xmas_wreaths.webp rename to game/images/rooms/main_room/decorations/xmas_wreaths.webp diff --git a/game/images/rooms/objects/desk/letter.webp b/game/images/rooms/main_room/desk/letter.webp similarity index 100% rename from game/images/rooms/objects/desk/letter.webp rename to game/images/rooms/main_room/desk/letter.webp diff --git a/game/images/rooms/objects/desk/plant.webp b/game/images/rooms/main_room/desk/plant.webp similarity index 100% rename from game/images/rooms/objects/desk/plant.webp rename to game/images/rooms/main_room/desk/plant.webp diff --git a/game/images/rooms/main_room/desk_no_shadow.webp b/game/images/rooms/main_room/desk_no_shadow.webp deleted file mode 100644 index ddaffffa..00000000 --- a/game/images/rooms/main_room/desk_no_shadow.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3276b1dd8437185430b420fe094cce17f341aff398ae49200fb162b2e7dd10ed -size 19246 diff --git a/game/images/rooms/objects/doors/door_hover.webp b/game/images/rooms/main_room/door/door_hover.webp similarity index 100% rename from game/images/rooms/objects/doors/door_hover.webp rename to game/images/rooms/main_room/door/door_hover.webp diff --git a/game/images/rooms/objects/doors/door_hover_night.webp b/game/images/rooms/main_room/door/door_hover_night.webp similarity index 100% rename from game/images/rooms/objects/doors/door_hover_night.webp rename to game/images/rooms/main_room/door/door_hover_night.webp diff --git a/game/images/rooms/objects/doors/door_idle.webp b/game/images/rooms/main_room/door/door_idle.webp similarity index 100% rename from game/images/rooms/objects/doors/door_idle.webp rename to game/images/rooms/main_room/door/door_idle.webp diff --git a/game/images/rooms/objects/doors/door_idle_night.webp b/game/images/rooms/main_room/door/door_idle_night.webp similarity index 100% rename from game/images/rooms/objects/doors/door_idle_night.webp rename to game/images/rooms/main_room/door/door_idle_night.webp diff --git a/game/images/rooms/objects/fireplace/fireplace_fire_01.webp b/game/images/rooms/main_room/fireplace/fireplace_fire_01.webp similarity index 100% rename from game/images/rooms/objects/fireplace/fireplace_fire_01.webp rename to game/images/rooms/main_room/fireplace/fireplace_fire_01.webp diff --git a/game/images/rooms/objects/fireplace/fireplace_fire_02.webp b/game/images/rooms/main_room/fireplace/fireplace_fire_02.webp similarity index 100% rename from game/images/rooms/objects/fireplace/fireplace_fire_02.webp rename to game/images/rooms/main_room/fireplace/fireplace_fire_02.webp diff --git a/game/images/rooms/objects/fireplace/fireplace_fire_03.webp b/game/images/rooms/main_room/fireplace/fireplace_fire_03.webp similarity index 100% rename from game/images/rooms/objects/fireplace/fireplace_fire_03.webp rename to game/images/rooms/main_room/fireplace/fireplace_fire_03.webp diff --git a/game/images/rooms/objects/fireplace/fireplace_fire_04.webp b/game/images/rooms/main_room/fireplace/fireplace_fire_04.webp similarity index 100% rename from game/images/rooms/objects/fireplace/fireplace_fire_04.webp rename to game/images/rooms/main_room/fireplace/fireplace_fire_04.webp diff --git a/game/images/rooms/objects/fireplace/fireplace_fire_05.webp b/game/images/rooms/main_room/fireplace/fireplace_fire_05.webp similarity index 100% rename from game/images/rooms/objects/fireplace/fireplace_fire_05.webp rename to game/images/rooms/main_room/fireplace/fireplace_fire_05.webp diff --git a/game/images/rooms/objects/fireplace/fireplace_fire_06.webp b/game/images/rooms/main_room/fireplace/fireplace_fire_06.webp similarity index 100% rename from game/images/rooms/objects/fireplace/fireplace_fire_06.webp rename to game/images/rooms/main_room/fireplace/fireplace_fire_06.webp diff --git a/game/images/rooms/objects/fireplace/fireplace_fire_07.webp b/game/images/rooms/main_room/fireplace/fireplace_fire_07.webp similarity index 100% rename from game/images/rooms/objects/fireplace/fireplace_fire_07.webp rename to game/images/rooms/main_room/fireplace/fireplace_fire_07.webp diff --git a/game/images/rooms/objects/fireplace/fireplace_fire_08.webp b/game/images/rooms/main_room/fireplace/fireplace_fire_08.webp similarity index 100% rename from game/images/rooms/objects/fireplace/fireplace_fire_08.webp rename to game/images/rooms/main_room/fireplace/fireplace_fire_08.webp diff --git a/game/images/rooms/objects/fireplace/fireplace_hover.webp b/game/images/rooms/main_room/fireplace/fireplace_hover.webp similarity index 100% rename from game/images/rooms/objects/fireplace/fireplace_hover.webp rename to game/images/rooms/main_room/fireplace/fireplace_hover.webp diff --git a/game/images/rooms/objects/fireplace/fireplace_idle.webp b/game/images/rooms/main_room/fireplace/fireplace_idle.webp similarity index 100% rename from game/images/rooms/objects/fireplace/fireplace_idle.webp rename to game/images/rooms/main_room/fireplace/fireplace_idle.webp diff --git a/game/images/rooms/objects/fireplace/fireplace_w_shadow.webp b/game/images/rooms/main_room/fireplace/fireplace_w_shadow.webp similarity index 100% rename from game/images/rooms/objects/fireplace/fireplace_w_shadow.webp rename to game/images/rooms/main_room/fireplace/fireplace_w_shadow.webp diff --git a/game/images/rooms/objects/fireplace/fireplace_xmas.webp b/game/images/rooms/main_room/fireplace/fireplace_xmas.webp similarity index 100% rename from game/images/rooms/objects/fireplace/fireplace_xmas.webp rename to game/images/rooms/main_room/fireplace/fireplace_xmas.webp diff --git a/game/images/rooms/objects/fireplace/fireplace_xmas_hover.webp b/game/images/rooms/main_room/fireplace/fireplace_xmas_hover.webp similarity index 100% rename from game/images/rooms/objects/fireplace/fireplace_xmas_hover.webp rename to game/images/rooms/main_room/fireplace/fireplace_xmas_hover.webp diff --git a/game/images/rooms/objects/fireplace/fireplace_xmas_idle.webp b/game/images/rooms/main_room/fireplace/fireplace_xmas_idle.webp similarity index 100% rename from game/images/rooms/objects/fireplace/fireplace_xmas_idle.webp rename to game/images/rooms/main_room/fireplace/fireplace_xmas_idle.webp diff --git a/game/images/rooms/objects/mail/owl_01.webp b/game/images/rooms/main_room/mail/owl_01.webp similarity index 100% rename from game/images/rooms/objects/mail/owl_01.webp rename to game/images/rooms/main_room/mail/owl_01.webp diff --git a/game/images/rooms/objects/mail/owl_02.webp b/game/images/rooms/main_room/mail/owl_02.webp similarity index 100% rename from game/images/rooms/objects/mail/owl_02.webp rename to game/images/rooms/main_room/mail/owl_02.webp diff --git a/game/images/rooms/objects/mail/owl_03.webp b/game/images/rooms/main_room/mail/owl_03.webp similarity index 100% rename from game/images/rooms/objects/mail/owl_03.webp rename to game/images/rooms/main_room/mail/owl_03.webp diff --git a/game/images/rooms/objects/mail/owl_hover.webp b/game/images/rooms/main_room/mail/owl_hover.webp similarity index 100% rename from game/images/rooms/objects/mail/owl_hover.webp rename to game/images/rooms/main_room/mail/owl_hover.webp diff --git a/game/images/rooms/objects/mail/owl_idle_01.webp b/game/images/rooms/main_room/mail/owl_idle_01.webp similarity index 100% rename from game/images/rooms/objects/mail/owl_idle_01.webp rename to game/images/rooms/main_room/mail/owl_idle_01.webp diff --git a/game/images/rooms/objects/mail/owl_idle_02.webp b/game/images/rooms/main_room/mail/owl_idle_02.webp similarity index 100% rename from game/images/rooms/objects/mail/owl_idle_02.webp rename to game/images/rooms/main_room/mail/owl_idle_02.webp diff --git a/game/images/rooms/objects/mail/owl_idle_03.webp b/game/images/rooms/main_room/mail/owl_idle_03.webp similarity index 100% rename from game/images/rooms/objects/mail/owl_idle_03.webp rename to game/images/rooms/main_room/mail/owl_idle_03.webp diff --git a/game/images/rooms/objects/parcel/idle.webp b/game/images/rooms/main_room/parcel/idle.webp similarity index 100% rename from game/images/rooms/objects/parcel/idle.webp rename to game/images/rooms/main_room/parcel/idle.webp diff --git a/game/images/rooms/objects/phoenix/feather_ani/pho_01.webp b/game/images/rooms/main_room/phoenix/feather_ani/pho_01.webp similarity index 100% rename from game/images/rooms/objects/phoenix/feather_ani/pho_01.webp rename to game/images/rooms/main_room/phoenix/feather_ani/pho_01.webp diff --git a/game/images/rooms/objects/phoenix/feather_ani/pho_02.webp b/game/images/rooms/main_room/phoenix/feather_ani/pho_02.webp similarity index 100% rename from game/images/rooms/objects/phoenix/feather_ani/pho_02.webp rename to game/images/rooms/main_room/phoenix/feather_ani/pho_02.webp diff --git a/game/images/rooms/objects/phoenix/feather_ani/pho_03.webp b/game/images/rooms/main_room/phoenix/feather_ani/pho_03.webp similarity index 100% rename from game/images/rooms/objects/phoenix/feather_ani/pho_03.webp rename to game/images/rooms/main_room/phoenix/feather_ani/pho_03.webp diff --git a/game/images/rooms/objects/phoenix/feather_ani/pho_04.webp b/game/images/rooms/main_room/phoenix/feather_ani/pho_04.webp similarity index 100% rename from game/images/rooms/objects/phoenix/feather_ani/pho_04.webp rename to game/images/rooms/main_room/phoenix/feather_ani/pho_04.webp diff --git a/game/images/rooms/objects/phoenix/feather_ani/pho_05.webp b/game/images/rooms/main_room/phoenix/feather_ani/pho_05.webp similarity index 100% rename from game/images/rooms/objects/phoenix/feather_ani/pho_05.webp rename to game/images/rooms/main_room/phoenix/feather_ani/pho_05.webp diff --git a/game/images/rooms/objects/phoenix/feather_ani/pho_06.webp b/game/images/rooms/main_room/phoenix/feather_ani/pho_06.webp similarity index 100% rename from game/images/rooms/objects/phoenix/feather_ani/pho_06.webp rename to game/images/rooms/main_room/phoenix/feather_ani/pho_06.webp diff --git a/game/images/rooms/objects/phoenix/feather_ani/pho_07.webp b/game/images/rooms/main_room/phoenix/feather_ani/pho_07.webp similarity index 100% rename from game/images/rooms/objects/phoenix/feather_ani/pho_07.webp rename to game/images/rooms/main_room/phoenix/feather_ani/pho_07.webp diff --git a/game/images/rooms/objects/phoenix/feather_ani/pho_08.webp b/game/images/rooms/main_room/phoenix/feather_ani/pho_08.webp similarity index 100% rename from game/images/rooms/objects/phoenix/feather_ani/pho_08.webp rename to game/images/rooms/main_room/phoenix/feather_ani/pho_08.webp diff --git a/game/images/rooms/objects/phoenix/feather_ani/pho_09.webp b/game/images/rooms/main_room/phoenix/feather_ani/pho_09.webp similarity index 100% rename from game/images/rooms/objects/phoenix/feather_ani/pho_09.webp rename to game/images/rooms/main_room/phoenix/feather_ani/pho_09.webp diff --git a/game/images/rooms/objects/phoenix/feather_ani/pho_10.webp b/game/images/rooms/main_room/phoenix/feather_ani/pho_10.webp similarity index 100% rename from game/images/rooms/objects/phoenix/feather_ani/pho_10.webp rename to game/images/rooms/main_room/phoenix/feather_ani/pho_10.webp diff --git a/game/images/rooms/objects/phoenix/feather_ani/pho_11.webp b/game/images/rooms/main_room/phoenix/feather_ani/pho_11.webp similarity index 100% rename from game/images/rooms/objects/phoenix/feather_ani/pho_11.webp rename to game/images/rooms/main_room/phoenix/feather_ani/pho_11.webp diff --git a/game/images/rooms/objects/phoenix/feather_ani/pho_12.webp b/game/images/rooms/main_room/phoenix/feather_ani/pho_12.webp similarity index 100% rename from game/images/rooms/objects/phoenix/feather_ani/pho_12.webp rename to game/images/rooms/main_room/phoenix/feather_ani/pho_12.webp diff --git a/game/images/rooms/objects/phoenix/feather_ani/pho_13.webp b/game/images/rooms/main_room/phoenix/feather_ani/pho_13.webp similarity index 100% rename from game/images/rooms/objects/phoenix/feather_ani/pho_13.webp rename to game/images/rooms/main_room/phoenix/feather_ani/pho_13.webp diff --git a/game/images/rooms/objects/phoenix/feather_ani/pho_14.webp b/game/images/rooms/main_room/phoenix/feather_ani/pho_14.webp similarity index 100% rename from game/images/rooms/objects/phoenix/feather_ani/pho_14.webp rename to game/images/rooms/main_room/phoenix/feather_ani/pho_14.webp diff --git a/game/images/rooms/objects/phoenix/feather_ani/pho_15.webp b/game/images/rooms/main_room/phoenix/feather_ani/pho_15.webp similarity index 100% rename from game/images/rooms/objects/phoenix/feather_ani/pho_15.webp rename to game/images/rooms/main_room/phoenix/feather_ani/pho_15.webp diff --git a/game/images/rooms/objects/phoenix/feather_ani/pho_16.webp b/game/images/rooms/main_room/phoenix/feather_ani/pho_16.webp similarity index 100% rename from game/images/rooms/objects/phoenix/feather_ani/pho_16.webp rename to game/images/rooms/main_room/phoenix/feather_ani/pho_16.webp diff --git a/game/images/rooms/objects/phoenix/feather_ani/pho_17.webp b/game/images/rooms/main_room/phoenix/feather_ani/pho_17.webp similarity index 100% rename from game/images/rooms/objects/phoenix/feather_ani/pho_17.webp rename to game/images/rooms/main_room/phoenix/feather_ani/pho_17.webp diff --git a/game/images/rooms/objects/phoenix/feather_ani/pho_18.webp b/game/images/rooms/main_room/phoenix/feather_ani/pho_18.webp similarity index 100% rename from game/images/rooms/objects/phoenix/feather_ani/pho_18.webp rename to game/images/rooms/main_room/phoenix/feather_ani/pho_18.webp diff --git a/game/images/rooms/objects/phoenix/food.webp b/game/images/rooms/main_room/phoenix/food.webp similarity index 100% rename from game/images/rooms/objects/phoenix/food.webp rename to game/images/rooms/main_room/phoenix/food.webp diff --git a/game/images/rooms/objects/phoenix/phoenix_01.webp b/game/images/rooms/main_room/phoenix/phoenix_01.webp similarity index 100% rename from game/images/rooms/objects/phoenix/phoenix_01.webp rename to game/images/rooms/main_room/phoenix/phoenix_01.webp diff --git a/game/images/rooms/objects/phoenix/phoenix_02.webp b/game/images/rooms/main_room/phoenix/phoenix_02.webp similarity index 100% rename from game/images/rooms/objects/phoenix/phoenix_02.webp rename to game/images/rooms/main_room/phoenix/phoenix_02.webp diff --git a/game/images/rooms/objects/phoenix/phoenix_03.webp b/game/images/rooms/main_room/phoenix/phoenix_03.webp similarity index 100% rename from game/images/rooms/objects/phoenix/phoenix_03.webp rename to game/images/rooms/main_room/phoenix/phoenix_03.webp diff --git a/game/images/rooms/objects/phoenix/phoenix_hover.webp b/game/images/rooms/main_room/phoenix/phoenix_hover.webp similarity index 100% rename from game/images/rooms/objects/phoenix/phoenix_hover.webp rename to game/images/rooms/main_room/phoenix/phoenix_hover.webp diff --git a/game/images/rooms/objects/deco/hogwarts_banner.webp b/game/images/rooms/objects/deco/hogwarts_banner.webp deleted file mode 100644 index 12141b0b..00000000 --- a/game/images/rooms/objects/deco/hogwarts_banner.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f54d1faeecdab55abec00b26cb5c9a4142ec9ce81a0df83e4c619bf8168318f -size 7474 diff --git a/game/images/rooms/objects/deco/owlbasin.webp b/game/images/rooms/objects/deco/owlbasin.webp deleted file mode 100644 index d8d30aaf..00000000 --- a/game/images/rooms/objects/deco/owlbasin.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6e21797a1fb8f972c4984ebeb6392bc1e34a5e00f9d525dc39dd3cb49a2f921c -size 27834 diff --git a/game/images/rooms/room_of_requirement/door_idle_night.webp b/game/images/rooms/room_of_requirement/door_idle_night.webp new file mode 100644 index 00000000..f6251461 --- /dev/null +++ b/game/images/rooms/room_of_requirement/door_idle_night.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:afdf88d8e4e63f2d872e28c8686c6ca59659b92784b579ae68a8e5287c5e4835 +size 86056 diff --git a/game/images/rooms/room_of_requirement/paperandmic.webp b/game/images/rooms/room_of_requirement/paperandmic.webp deleted file mode 100644 index 3d0ae052..00000000 --- a/game/images/rooms/room_of_requirement/paperandmic.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c3b7c80d2362d57f6a06fe48f295f2f2158b143a8a7089c7aabf357929443461 -size 1270 diff --git a/game/interface/room_of_req/quistion_mark.webp b/game/images/rooms/room_of_requirement/qmark.webp similarity index 100% rename from game/interface/room_of_req/quistion_mark.webp rename to game/images/rooms/room_of_requirement/qmark.webp diff --git a/game/interface/room_of_req/astoria_icon.webp b/game/interface/room_of_req/astoria_icon.webp deleted file mode 100644 index 1d5672db..00000000 --- a/game/interface/room_of_req/astoria_icon.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8a0ba414a8a6990d8aed4d1d8157136703e9ffa72d7a0ec816d70cfbbf187b30 -size 2360 diff --git a/game/interface/room_of_req/cho_icon.webp b/game/interface/room_of_req/cho_icon.webp deleted file mode 100644 index 8df878a8..00000000 --- a/game/interface/room_of_req/cho_icon.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b81d42e0ec4f77061718dc0a935f3f606704b8a5ee09409b04f4baf194fc3a5 -size 2060 diff --git a/game/interface/room_of_req/hermione_icon.webp b/game/interface/room_of_req/hermione_icon.webp deleted file mode 100644 index 0030c623..00000000 --- a/game/interface/room_of_req/hermione_icon.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fb83763872c3c41dadbc4e053d4ee6e941ec1cdf69fede1d293959b68d07ee12 -size 2950 diff --git a/game/interface/room_of_req/locked.webp b/game/interface/room_of_req/locked.webp deleted file mode 100644 index 68b399ed..00000000 --- a/game/interface/room_of_req/locked.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7dc49b7dc0dc714676dee8ec245562486ba88b97bdcf6b09c193d7f3ecdf078a -size 2472 diff --git a/game/interface/room_of_req/luna_icon.webp b/game/interface/room_of_req/luna_icon.webp deleted file mode 100644 index 796b032b..00000000 --- a/game/interface/room_of_req/luna_icon.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b8c5404ad88acd0ee23b194cd6a3a88df701837e8cd14665afddbf0556938683 -size 2612 diff --git a/game/interface/room_of_req/mirror_event_item.webp b/game/interface/room_of_req/mirror_event_item.webp deleted file mode 100644 index f2c19198..00000000 --- a/game/interface/room_of_req/mirror_event_item.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:19ed96cc73976b2fae329bd45f6d29861fd006387211969dc0537b55046fb995 -size 160 diff --git a/game/interface/room_of_req/mirror_event_item_hover.webp b/game/interface/room_of_req/mirror_event_item_hover.webp deleted file mode 100644 index f4c0d2d1..00000000 --- a/game/interface/room_of_req/mirror_event_item_hover.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9224c45daf315a82ebb9f102944d843ec31f42119c918c52df13015e3c93fe06 -size 160 diff --git a/game/interface/room_of_req/mirror_event_menu.webp b/game/interface/room_of_req/mirror_event_menu.webp deleted file mode 100644 index 18b9319e..00000000 --- a/game/interface/room_of_req/mirror_event_menu.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ec37a7cc66177bd00282e7c1ccf74c8a7ff1709ba2d37e7a9f3e69fd5a5d791d -size 36630 diff --git a/game/interface/room_of_req/susan_icon.webp b/game/interface/room_of_req/susan_icon.webp deleted file mode 100644 index 1f3bffc2..00000000 --- a/game/interface/room_of_req/susan_icon.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ccf795a78d589b378156f3b9f470859384fbf84d84e3f4ed4a1cd0a319ea4024 -size 2514 diff --git a/game/interface/room_of_req/tonks_icon.webp b/game/interface/room_of_req/tonks_icon.webp deleted file mode 100644 index f507437a..00000000 --- a/game/interface/room_of_req/tonks_icon.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:199a539537d0cf9d437e89d08bfc9dce5999a71a611c1c1957b20e572f6ff2cb -size 2504 diff --git a/game/interface/room_of_req/unlocked.webp b/game/interface/room_of_req/unlocked.webp deleted file mode 100644 index 8b5423f4..00000000 --- a/game/interface/room_of_req/unlocked.webp +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:92126948d6c64a9014707e2253bfc5ad9d02feba23019ac1ae8e27c024c364a9 -size 3884 diff --git a/game/scripts/interface/achievements.rpy b/game/scripts/interface/achievements.rpy index fa680a38..ac00db28 100644 --- a/game/scripts/interface/achievements.rpy +++ b/game/scripts/interface/achievements.rpy @@ -11,16 +11,16 @@ define achievements_dict = { "gold": ["General", "Gold Digger", "Awarded for having 10,000 gold in total.", False, "interface/icons/gold.webp", False], "drunkard": ["General", "Drunken Master", "Awarded for collecting 25 bottles of wine.", False, "interface/icons/wine.webp", True], "workaholic": ["General", "Workaholic", "Awarded for completing five full reports.", False, "interface/icons/generic_scroll.webp", False], - "fireplace": ["General", "Feel the Heat", "Awarded for lighting the fireplace 5 times or more.", False, "images/rooms/objects/fireplace/fireplace_idle.webp", True], - "peta": ["General", "I think I forgot something...", "Awarded for not feeding the bird for 50 days.... \nYou monster.\n{size=-4}Disclaimer: No real nor fictional animals were harmed in the process.{/size}", False, "images/rooms/objects/phoenix/phoenix_01.webp", True], - "petpal": ["General", "Regular stroking", "Awarded for petting the bird 25 times.", False, "images/rooms/objects/phoenix/phoenix_01.webp", False], + "fireplace": ["General", "Feel the Heat", "Awarded for lighting the fireplace 5 times or more.", False, "images/rooms/main_room/fireplace/fireplace_idle.webp", True], + "peta": ["General", "I think I forgot something...", "Awarded for not feeding the bird for 50 days.... \nYou monster.\n{size=-4}Disclaimer: No real nor fictional animals were harmed in the process.{/size}", False, "images/rooms/main_room/phoenix/phoenix_01.webp", True], + "petpal": ["General", "Regular stroking", "Awarded for petting the bird 25 times.", False, "images/rooms/main_room/phoenix/phoenix_01.webp", False], "postman": ["Cardgame", "Poster Boy", "Awarded for buying all posters from the token shop.", False, "interface/icons/agrabah_poster.webp", False], "hats": ["Cardgame", "Mad Hatter", "Awarded for buying all hat decorations from the token shop.", False, "interface/icons/icon_gambler_hat.webp", False], "daddy": ["Characters", "Who's your daddy?", "Awarded for letting Hermione call you a {size=-5}(sugar){/size} daddy.", False, "interface/icons/head/hermione.webp", True], "pantiesfap": ["Characters", "I sneezed on them...", "Awarded for rubbing one out on Hermione's panties.", False, "characters/genie/chibis/jerk_off/02.webp", False], "pantiesfapcho": ["Characters", "Exercise is important", "Awarded for rubbing one out on Cho's panties.", False, "characters/genie/chibis/jerk_off/02.webp", False], "bros": ["Characters", "Bros before hoes", "Awarded for becoming best pals with Snape.", False, "interface/icons/head/snape.webp", False], - "knock": ["Characters", "*Knock* *knock*", "Awarded for telling Hermione to go away during her introductory events.", False, "images/rooms/objects/doors/door_idle.webp", True], + "knock": ["Characters", "*Knock* *knock*", "Awarded for telling Hermione to go away during her introductory events.", False, "images/rooms/main_room/door/door_idle.webp", True], "decorator": ["Cardgame", "Decorator", "Awarded for decorating the office for the first time.", False, "interface/icons/stag_trophy.webp", False], "flashback": ["Cardgame", "Flashback", "Awarded for retelling what actually happened...", False, "interface/icons/cards.webp", True], "start": ["General", "Welcome to Hogwarts!", "Awarded for finishing the intro.", False, "interface/icon.webp", False], diff --git a/game/scripts/inventory/classes.rpy b/game/scripts/inventory/classes.rpy index 9f5a32d5..c0481f3e 100644 --- a/game/scripts/inventory/classes.rpy +++ b/game/scripts/inventory/classes.rpy @@ -103,7 +103,7 @@ init python: def __init__(self, id, type, name, placement, price=0, desc="", unlocked=True, image="default", room_image="default", room_image_hover=None, owned=0, replaces=False, use_action=None, replace_action=None, replace_anchor=None, replace_pos=None): super(Decoration, self).__init__(id, type, name, price, desc, unlocked, None, None, 1, image, False, "tokens", "Apply", owned) - self.room_image = Transform("images/rooms/objects/decorations/{}.webp".format(self.id), zoom=self.room_scale) if room_image == "default" else Transform(room_image, zoom=self.room_scale) + self.room_image = Transform("images/rooms/main_room/decorations/{}.webp".format(self.id), zoom=self.room_scale) if room_image == "default" else Transform(room_image, zoom=self.room_scale) self.room_image_hover = Transform(room_image_hover, zoom=self.room_scale) if room_image_hover else self.room_image self.usable = True self.placement = placement diff --git a/game/scripts/minigames/mirror/events/a_bad_time_to_disrobe.rpy b/game/scripts/minigames/mirror/events/a_bad_time_to_disrobe.rpy index 8617797e..c441d97f 100644 --- a/game/scripts/minigames/mirror/events/a_bad_time_to_disrobe.rpy +++ b/game/scripts/minigames/mirror/events/a_bad_time_to_disrobe.rpy @@ -121,14 +121,16 @@ label a_bad_time_to_disrobe_part_1: show screen blkfade with d3 - show screen quistion_pop_up("{color=#cbcbcb}Hermione will remember that{/color}") + show image Text("{image=images/rooms/room_of_requirement/qmark.webp}{size=+4}{color=#cbcbcb}Hermione will remember that{/color}{/size}") as qmark zorder 100: + pos (10, 10) + nar "Hermione returns the next morning, looking nervous but more determined than yesterday." $ game.daytime = True call update_interface_color call music_block - hide screen quistion_pop_up + hide qmark call her_chibi("stand","desk","base") hide screen blkfade diff --git a/game/scripts/minigames/mirror/events/an_odd_circumstance.rpy b/game/scripts/minigames/mirror/events/an_odd_circumstance.rpy index 0ba08ce1..6b4aee20 100644 --- a/game/scripts/minigames/mirror/events/an_odd_circumstance.rpy +++ b/game/scripts/minigames/mirror/events/an_odd_circumstance.rpy @@ -1,4 +1,13 @@ # Mirror story: An odd circumstance +image dark_overlay: + "images/rooms/room_of_requirement/dark_overlay_1.webp" with d3 + pause 0.4 + "images/rooms/room_of_requirement/dark_overlay_2.webp" with d3 + pause 0.4 + "images/rooms/room_of_requirement/dark_overlay_3.webp" with d3 + pause 0.4 + repeat + label an_odd_circumstance: stop weather @@ -9,7 +18,7 @@ label an_odd_circumstance: $ hermione.equip(her_outfit_default) call room("main_room") stop music fadeout 1 - show screen add_overlay + show image "dark_overlay" zorder 6 as dark_overlay show screen blkfade with d5 @@ -70,13 +79,13 @@ label an_odd_circumstance: "As I was about to open my mouth and speak, a voice that came from no specific direction chimed in before I even got a word out..." play sound "sounds/magic4.ogg" - hide screen add_overlay + hide dark_overlay show screen white with d1 $ hermione_chibi.zorder = desk_zorder - 1 call her_chibi("stand",210, 450, flip=True) hide screen white - show screen add_overlay + show image "dark_overlay" zorder 6 as dark_overlay with d1 her "Silencio." @@ -196,7 +205,7 @@ label an_odd_circumstance: "But it didn't matter, the favour I had just received in return was more than enough to make up for anything I might have assisted her with..." "Or at least that's what I hoped..." - hide screen add_overlay + hide dark_overlay show screen blkfade with d9 diff --git a/game/scripts/minigames/mirror/screens.rpy b/game/scripts/minigames/mirror/screens.rpy deleted file mode 100644 index 678632b4..00000000 --- a/game/scripts/minigames/mirror/screens.rpy +++ /dev/null @@ -1,24 +0,0 @@ -image dark_overlay: - "images/rooms/room_of_requirement/dark_overlay_1.webp" with d3 - pause 0.4 - "images/rooms/room_of_requirement/dark_overlay_2.webp" with d3 - pause 0.4 - "images/rooms/room_of_requirement/dark_overlay_3.webp" with d3 - pause 0.4 - repeat - -screen quistion_pop_up(content=""): - zorder 33 - - add "interface/room_of_req/quistion_mark.webp" xpos 10 ypos 10 zoom 0.5 - text content xpos 40 ypos 15 - -screen day_to_night(): - use blkfade - add "images/rooms/room_of_requirement/day_to_night.webp" xalign 0.5 yalign 0.5 - zorder 5 - -screen add_overlay(): - add "dark_overlay" xpos 0 ypos 0 - zorder 6 - diff --git a/game/scripts/rooms/labels.rpy b/game/scripts/rooms/labels.rpy index 9d5c7861..14ba6309 100644 --- a/game/scripts/rooms/labels.rpy +++ b/game/scripts/rooms/labels.rpy @@ -10,8 +10,10 @@ label room(room=None, hide_screens=True, stop_sound=True): stop background fadeout 0.5 stop weather fadeout 0.5 + $ renpy.stop_predict_screen(current_room) $ renpy.stop_predict("images/rooms/{}/*.webp".format(current_room)) $ current_room = room + $ renpy.start_predict_screen(current_room) $ renpy.start_predict("images/rooms/{}/*.webp".format(current_room)) if room == "main_room": diff --git a/game/scripts/rooms/main_room/images.rpy b/game/scripts/rooms/main_room/images.rpy index 8b719696..8d5c30bc 100644 --- a/game/scripts/rooms/main_room/images.rpy +++ b/game/scripts/rooms/main_room/images.rpy @@ -2,21 +2,21 @@ image fireplace_fire: animation offset (-24, -6) - "images/rooms/objects/fireplace/fireplace_fire_01.webp" + "images/rooms/main_room/fireplace/fireplace_fire_01.webp" pause.1 - "images/rooms/objects/fireplace/fireplace_fire_02.webp" + "images/rooms/main_room/fireplace/fireplace_fire_02.webp" pause.1 - "images/rooms/objects/fireplace/fireplace_fire_03.webp" + "images/rooms/main_room/fireplace/fireplace_fire_03.webp" pause.1 - "images/rooms/objects/fireplace/fireplace_fire_04.webp" + "images/rooms/main_room/fireplace/fireplace_fire_04.webp" pause.1 - "images/rooms/objects/fireplace/fireplace_fire_05.webp" + "images/rooms/main_room/fireplace/fireplace_fire_05.webp" pause.1 - "images/rooms/objects/fireplace/fireplace_fire_06.webp" + "images/rooms/main_room/fireplace/fireplace_fire_06.webp" pause.1 - "images/rooms/objects/fireplace/fireplace_fire_07.webp" + "images/rooms/main_room/fireplace/fireplace_fire_07.webp" pause.1 - "images/rooms/objects/fireplace/fireplace_fire_08.webp" + "images/rooms/main_room/fireplace/fireplace_fire_08.webp" pause.1 repeat @@ -54,25 +54,25 @@ image glow_effect_fireplace: image candle_fire_01: animation - "images/rooms/objects/candles/fire_01.webp" + "images/rooms/main_room/candles/fire_01.webp" pause.1 - "images/rooms/objects/candles/fire_02.webp" + "images/rooms/main_room/candles/fire_02.webp" pause.1 - "images/rooms/objects/candles/fire_03.webp" + "images/rooms/main_room/candles/fire_03.webp" pause.1 - "images/rooms/objects/candles/fire_04.webp" + "images/rooms/main_room/candles/fire_04.webp" pause.1 - "images/rooms/objects/candles/fire_05.webp" + "images/rooms/main_room/candles/fire_05.webp" pause.1 - "images/rooms/objects/candles/fire_06.webp" + "images/rooms/main_room/candles/fire_06.webp" pause.1 - "images/rooms/objects/candles/fire_07.webp" + "images/rooms/main_room/candles/fire_07.webp" pause.1 - "images/rooms/objects/candles/fire_08.webp" + "images/rooms/main_room/candles/fire_08.webp" pause.1 - "images/rooms/objects/candles/fire_09.webp" + "images/rooms/main_room/candles/fire_09.webp" pause.1 - "images/rooms/objects/candles/fire_10.webp" + "images/rooms/main_room/candles/fire_10.webp" choice: pause.1 choice: @@ -83,25 +83,25 @@ image candle_fire_01: image candle_fire_02: animation - "images/rooms/objects/candles/fire_01.webp" + "images/rooms/main_room/candles/fire_01.webp" pause.1 - "images/rooms/objects/candles/fire_04.webp" + "images/rooms/main_room/candles/fire_04.webp" pause.1 - "images/rooms/objects/candles/fire_03.webp" + "images/rooms/main_room/candles/fire_03.webp" pause.1 - "images/rooms/objects/candles/fire_02.webp" + "images/rooms/main_room/candles/fire_02.webp" pause.1 - "images/rooms/objects/candles/fire_08.webp" + "images/rooms/main_room/candles/fire_08.webp" pause.1 - "images/rooms/objects/candles/fire_06.webp" + "images/rooms/main_room/candles/fire_06.webp" pause.1 - "images/rooms/objects/candles/fire_07.webp" + "images/rooms/main_room/candles/fire_07.webp" pause.1 - "images/rooms/objects/candles/fire_05.webp" + "images/rooms/main_room/candles/fire_05.webp" pause.1 - "images/rooms/objects/candles/fire_10.webp" + "images/rooms/main_room/candles/fire_10.webp" pause.1 - "images/rooms/objects/candles/fire_09.webp" + "images/rooms/main_room/candles/fire_09.webp" choice: pause.1 choice: @@ -114,71 +114,71 @@ image phoenix_idle: animation zoom 0.5 - "images/rooms/objects/phoenix/phoenix_01.webp" + "images/rooms/main_room/phoenix/phoenix_01.webp" pause 2 - "images/rooms/objects/phoenix/phoenix_02.webp" + "images/rooms/main_room/phoenix/phoenix_02.webp" pause.15 - "images/rooms/objects/phoenix/phoenix_03.webp" + "images/rooms/main_room/phoenix/phoenix_03.webp" pause.15 - "images/rooms/objects/phoenix/phoenix_02.webp" + "images/rooms/main_room/phoenix/phoenix_02.webp" pause.15 - "images/rooms/objects/phoenix/phoenix_01.webp" + "images/rooms/main_room/phoenix/phoenix_01.webp" pause.15 - "images/rooms/objects/phoenix/phoenix_02.webp" + "images/rooms/main_room/phoenix/phoenix_02.webp" pause.15 - "images/rooms/objects/phoenix/phoenix_03.webp" + "images/rooms/main_room/phoenix/phoenix_03.webp" pause.15 - "images/rooms/objects/phoenix/phoenix_02.webp" + "images/rooms/main_room/phoenix/phoenix_02.webp" pause.15 - "images/rooms/objects/phoenix/phoenix_01.webp" + "images/rooms/main_room/phoenix/phoenix_01.webp" pause 10 repeat image phoenix_hover: zoom 0.5 - "images/rooms/objects/phoenix/phoenix_hover.webp" + "images/rooms/main_room/phoenix/phoenix_hover.webp" image phoenix_feather: animation zoom 0.5 pause 10 alpha 1.0 - "images/rooms/objects/phoenix/feather_ani/pho_01.webp" + "images/rooms/main_room/phoenix/feather_ani/pho_01.webp" pause.15 - "images/rooms/objects/phoenix/feather_ani/pho_02.webp" + "images/rooms/main_room/phoenix/feather_ani/pho_02.webp" pause.15 - "images/rooms/objects/phoenix/feather_ani/pho_03.webp" + "images/rooms/main_room/phoenix/feather_ani/pho_03.webp" pause.15 - "images/rooms/objects/phoenix/feather_ani/pho_04.webp" + "images/rooms/main_room/phoenix/feather_ani/pho_04.webp" pause.15 - "images/rooms/objects/phoenix/feather_ani/pho_05.webp" + "images/rooms/main_room/phoenix/feather_ani/pho_05.webp" pause.15 - "images/rooms/objects/phoenix/feather_ani/pho_06.webp" + "images/rooms/main_room/phoenix/feather_ani/pho_06.webp" pause.15 - "images/rooms/objects/phoenix/feather_ani/pho_07.webp" + "images/rooms/main_room/phoenix/feather_ani/pho_07.webp" pause.15 - "images/rooms/objects/phoenix/feather_ani/pho_08.webp" + "images/rooms/main_room/phoenix/feather_ani/pho_08.webp" pause.15 - "images/rooms/objects/phoenix/feather_ani/pho_09.webp" + "images/rooms/main_room/phoenix/feather_ani/pho_09.webp" pause.15 - "images/rooms/objects/phoenix/feather_ani/pho_10.webp" + "images/rooms/main_room/phoenix/feather_ani/pho_10.webp" pause.15 - "images/rooms/objects/phoenix/feather_ani/pho_11.webp" + "images/rooms/main_room/phoenix/feather_ani/pho_11.webp" pause.15 - "images/rooms/objects/phoenix/feather_ani/pho_12.webp" + "images/rooms/main_room/phoenix/feather_ani/pho_12.webp" pause.15 - "images/rooms/objects/phoenix/feather_ani/pho_13.webp" + "images/rooms/main_room/phoenix/feather_ani/pho_13.webp" pause.15 - "images/rooms/objects/phoenix/feather_ani/pho_14.webp" + "images/rooms/main_room/phoenix/feather_ani/pho_14.webp" pause.15 - "images/rooms/objects/phoenix/feather_ani/pho_15.webp" + "images/rooms/main_room/phoenix/feather_ani/pho_15.webp" pause.15 - "images/rooms/objects/phoenix/feather_ani/pho_16.webp" + "images/rooms/main_room/phoenix/feather_ani/pho_16.webp" pause.15 - "images/rooms/objects/phoenix/feather_ani/pho_17.webp" + "images/rooms/main_room/phoenix/feather_ani/pho_17.webp" pause.15 - "images/rooms/objects/phoenix/feather_ani/pho_18.webp" + "images/rooms/main_room/phoenix/feather_ani/pho_18.webp" pause 10 linear .5 alpha 0.0 repeat @@ -186,46 +186,46 @@ image phoenix_feather: image phoenix_food: zoom 0.5 - "images/rooms/objects/phoenix/food.webp" + "images/rooms/main_room/phoenix/food.webp" image door_idle: zoom 0.5 - "images/rooms/objects/doors/door_idle.webp" + "images/rooms/main_room/door/door_idle.webp" image door_hover: zoom 0.5 - "images/rooms/objects/doors/door_hover.webp" + "images/rooms/main_room/door/door_hover.webp" image fireplace_idle: zoom 0.5 - "images/rooms/objects/fireplace/fireplace_idle.webp" + "images/rooms/main_room/fireplace/fireplace_idle.webp" image fireplace_idle_shadow: zoom 0.5 - "images/rooms/objects/fireplace/fireplace_w_shadow.webp" + "images/rooms/main_room/fireplace/fireplace_w_shadow.webp" image fireplace_hover: zoom 0.5 - "images/rooms/objects/fireplace/fireplace_hover.webp" + "images/rooms/main_room/fireplace/fireplace_hover.webp" image owl_idle: animation zoom 0.5 - "images/rooms/objects/mail/owl_idle_01.webp" + "images/rooms/main_room/mail/owl_idle_01.webp" pause.1 - "images/rooms/objects/mail/owl_idle_02.webp" + "images/rooms/main_room/mail/owl_idle_02.webp" pause.1 - "images/rooms/objects/mail/owl_idle_03.webp" + "images/rooms/main_room/mail/owl_idle_03.webp" pause.15 - "images/rooms/objects/mail/owl_idle_02.webp" + "images/rooms/main_room/mail/owl_idle_02.webp" pause.1 - "images/rooms/objects/mail/owl_idle_01.webp" + "images/rooms/main_room/mail/owl_idle_01.webp" pause 7 repeat @@ -233,73 +233,73 @@ image owl_letter: animation zoom 0.5 - "images/rooms/objects/mail/owl_01.webp" + "images/rooms/main_room/mail/owl_01.webp" pause.1 - "images/rooms/objects/mail/owl_02.webp" + "images/rooms/main_room/mail/owl_02.webp" pause.1 - "images/rooms/objects/mail/owl_03.webp" + "images/rooms/main_room/mail/owl_03.webp" pause.15 - "images/rooms/objects/mail/owl_02.webp" + "images/rooms/main_room/mail/owl_02.webp" pause.1 - "images/rooms/objects/mail/owl_01.webp" + "images/rooms/main_room/mail/owl_01.webp" pause 7 repeat image owl_letter_hover: zoom 0.5 - "images/rooms/objects/mail/owl_hover.webp" + "images/rooms/main_room/mail/owl_hover.webp" image parcel: - "images/rooms/objects/parcel/idle.webp" + "images/rooms/main_room/parcel/idle.webp" image cupboard_idle: zoom 0.5 - "images/rooms/objects/cupboard/cupboard_w_shadow.webp" + "images/rooms/main_room/cupboard/cupboard_w_shadow.webp" image cupboard_open: zoom 0.5 - "images/rooms/objects/cupboard/cupboard_open.webp" + "images/rooms/main_room/cupboard/cupboard_open.webp" image main_room_idle_day: zoom 0.5 - "images/rooms/_bg_/main_room_day.webp" + "images/rooms/main_room/bg_day.webp" image main_room_idle_night: zoom 0.5 - "images/rooms/_bg_/main_room_night.webp" + "images/rooms/main_room/bg_night.webp" image candle_left: zoom 0.5 - "images/rooms/objects/candles/candleM.webp" + "images/rooms/main_room/candles/candleM.webp" image candle_right: zoom 0.5 - "images/rooms/objects/candles/candle.webp" + "images/rooms/main_room/candles/candle.webp" image candle_fire: #Candle fire. animation - "images/rooms/objects/candles/fire_01.webp" + "images/rooms/main_room/candles/fire_01.webp" pause.1 - "images/rooms/objects/candles/fire_04.webp" + "images/rooms/main_room/candles/fire_04.webp" pause.1 - "images/rooms/objects/candles/fire_03.webp" + "images/rooms/main_room/candles/fire_03.webp" pause.1 - "images/rooms/objects/candles/fire_02.webp" + "images/rooms/main_room/candles/fire_02.webp" pause.1 - "images/rooms/objects/candles/fire_08.webp" + "images/rooms/main_room/candles/fire_08.webp" pause.1 - "images/rooms/objects/candles/fire_06.webp" + "images/rooms/main_room/candles/fire_06.webp" pause.1 - "images/rooms/objects/candles/fire_07.webp" + "images/rooms/main_room/candles/fire_07.webp" pause.1 - "images/rooms/objects/candles/fire_05.webp" + "images/rooms/main_room/candles/fire_05.webp" pause.1 - "images/rooms/objects/candles/fire_10.webp" + "images/rooms/main_room/candles/fire_10.webp" pause.1 - "images/rooms/objects/candles/fire_09.webp" + "images/rooms/main_room/candles/fire_09.webp" pause.1 repeat @@ -321,24 +321,24 @@ image chair_left: image letter_on_desk: zoom 0.5 - "/images/rooms/objects/desk/letter.webp" + "/images/rooms/main_room/desk/letter.webp" image plant_on_desk: zoom 0.5 - "/images/rooms/objects/desk/plant.webp" + "/images/rooms/main_room/desk/plant.webp" image letter_and_plant_on_desk: contains: zoom 0.5 - "/images/rooms/objects/desk/letter.webp" + "/images/rooms/main_room/desk/letter.webp" contains: zoom 0.5 - "/images/rooms/objects/desk/plant.webp" + "/images/rooms/main_room/desk/plant.webp" image desk_dumbledore: zoom 0.5 @@ -350,7 +350,7 @@ image halloween_chandelier: contains: anchor (0.5, 0.0) - "images/rooms/objects/decorations/halloween_chandelier.webp" + "images/rooms/main_room/decorations/halloween_chandelier.webp" contains: offset (-266, 6) @@ -371,29 +371,29 @@ image halloween_chandelier: image halloween_fireplace_jackolanterns: offset (36, 78) - "images/rooms/objects/decorations/halloween_fireplace2.webp" + "images/rooms/main_room/decorations/halloween_fireplace2.webp" image halloween_window_monster: animation - "images/rooms/objects/decorations/halloween_monster/0.webp" + "images/rooms/main_room/decorations/halloween_monster/0.webp" pause 3 - "images/rooms/objects/decorations/halloween_monster/1.webp" + "images/rooms/main_room/decorations/halloween_monster/1.webp" pause 0.1 - "images/rooms/objects/decorations/halloween_monster/2.webp" + "images/rooms/main_room/decorations/halloween_monster/2.webp" pause 0.1 - "images/rooms/objects/decorations/halloween_monster/3.webp" + "images/rooms/main_room/decorations/halloween_monster/3.webp" pause 0.25 - "images/rooms/objects/decorations/halloween_monster/2.webp" + "images/rooms/main_room/decorations/halloween_monster/2.webp" pause 0.1 - "images/rooms/objects/decorations/halloween_monster/1.webp" + "images/rooms/main_room/decorations/halloween_monster/1.webp" pause 0.25 - "images/rooms/objects/decorations/halloween_monster/2.webp" + "images/rooms/main_room/decorations/halloween_monster/2.webp" pause 0.1 - "images/rooms/objects/decorations/halloween_monster/3.webp" + "images/rooms/main_room/decorations/halloween_monster/3.webp" pause 0.5 - "images/rooms/objects/decorations/halloween_monster/2.webp" + "images/rooms/main_room/decorations/halloween_monster/2.webp" pause 0.1 - "images/rooms/objects/decorations/halloween_monster/1.webp" + "images/rooms/main_room/decorations/halloween_monster/1.webp" pause 0.1 repeat @@ -401,19 +401,19 @@ image halloween_window_monster: image halloween_cupboard_caskets: offset (12, 318) - "images/rooms/objects/decorations/halloween_cupboard2.webp" + "images/rooms/main_room/decorations/halloween_cupboard2.webp" image halloween_chair_caskets: offset (55, 105) - "images/rooms/objects/decorations/halloween_chair.webp" + "images/rooms/main_room/decorations/halloween_chair.webp" image halloween_bats_trophy: offset (-74, -34) - "images/rooms/objects/decorations/bats_trophy.webp" + "images/rooms/main_room/decorations/bats_trophy.webp" image halloween_lamp_left: offset (-10, -6) - "images/rooms/objects/decorations/halloween_lamp/left.webp" + "images/rooms/main_room/decorations/halloween_lamp/left.webp" image halloween_lamp_left_glow: zoom 0.5 @@ -423,7 +423,7 @@ image halloween_lamp_left_glow: animation alpha 0.9 - "images/rooms/objects/decorations/halloween_lamp/glow.webp" + "images/rooms/main_room/decorations/halloween_lamp/glow.webp" pause 2.0 ease_bounce 3.0 alpha 0.75 @@ -432,11 +432,11 @@ image halloween_lamp_left_glow: repeat contains: - "images/rooms/objects/decorations/halloween_lamp/filament.webp" + "images/rooms/main_room/decorations/halloween_lamp/filament.webp" image halloween_lamp_right: offset (-10, -6) - "images/rooms/objects/decorations/halloween_lamp/right.webp" + "images/rooms/main_room/decorations/halloween_lamp/right.webp" image halloween_lamp_right_glow: zoom 0.5 @@ -446,7 +446,7 @@ image halloween_lamp_right_glow: animation alpha 0.9 - "images/rooms/objects/decorations/halloween_lamp/glow.webp" + "images/rooms/main_room/decorations/halloween_lamp/glow.webp" choice: pause 2.0 @@ -461,21 +461,21 @@ image halloween_lamp_right_glow: repeat contains: - "images/rooms/objects/decorations/halloween_lamp/filament.webp" + "images/rooms/main_room/decorations/halloween_lamp/filament.webp" image snow_owl_idle: zoom 0.5 offset (-3, -3) - "images/rooms/objects/decorations/snow_owl/idle_0.webp" + "images/rooms/main_room/decorations/snow_owl/idle_0.webp" pause.1 - "images/rooms/objects/decorations/snow_owl/idle_1.webp" + "images/rooms/main_room/decorations/snow_owl/idle_1.webp" pause.1 - "images/rooms/objects/decorations/snow_owl/idle_2.webp" + "images/rooms/main_room/decorations/snow_owl/idle_2.webp" pause.15 - "images/rooms/objects/decorations/snow_owl/idle_1.webp" + "images/rooms/main_room/decorations/snow_owl/idle_1.webp" pause.1 - "images/rooms/objects/decorations/snow_owl/idle_0.webp" + "images/rooms/main_room/decorations/snow_owl/idle_0.webp" pause 7 repeat @@ -483,15 +483,15 @@ image snow_owl_letter: zoom 0.5 offset (-3, -3) - "images/rooms/objects/decorations/snow_owl/letter_0.webp" + "images/rooms/main_room/decorations/snow_owl/letter_0.webp" pause.1 - "images/rooms/objects/decorations/snow_owl/letter_1.webp" + "images/rooms/main_room/decorations/snow_owl/letter_1.webp" pause.1 - "images/rooms/objects/decorations/snow_owl/letter_2.webp" + "images/rooms/main_room/decorations/snow_owl/letter_2.webp" pause.15 - "images/rooms/objects/decorations/snow_owl/letter_1.webp" + "images/rooms/main_room/decorations/snow_owl/letter_1.webp" pause.1 - "images/rooms/objects/decorations/snow_owl/letter_0.webp" + "images/rooms/main_room/decorations/snow_owl/letter_0.webp" pause 7 repeat @@ -499,21 +499,21 @@ image snow_owl_letter_hover: zoom 0.5 offset (-3, -3) - "images/rooms/objects/decorations/snow_owl/letter_hover.webp" + "images/rooms/main_room/decorations/snow_owl/letter_hover.webp" image small_owl_idle: zoom 0.5 offset (-1, -3) - "images/rooms/objects/decorations/small_owl/idle_0.webp" + "images/rooms/main_room/decorations/small_owl/idle_0.webp" pause.1 - "images/rooms/objects/decorations/small_owl/idle_1.webp" + "images/rooms/main_room/decorations/small_owl/idle_1.webp" pause.1 - "images/rooms/objects/decorations/small_owl/idle_2.webp" + "images/rooms/main_room/decorations/small_owl/idle_2.webp" pause.15 - "images/rooms/objects/decorations/small_owl/idle_1.webp" + "images/rooms/main_room/decorations/small_owl/idle_1.webp" pause.1 - "images/rooms/objects/decorations/small_owl/idle_0.webp" + "images/rooms/main_room/decorations/small_owl/idle_0.webp" pause 7 repeat @@ -521,15 +521,15 @@ image small_owl_letter: zoom 0.5 offset (-1, -3) - "images/rooms/objects/decorations/small_owl/letter_0.webp" + "images/rooms/main_room/decorations/small_owl/letter_0.webp" pause.1 - "images/rooms/objects/decorations/small_owl/letter_1.webp" + "images/rooms/main_room/decorations/small_owl/letter_1.webp" pause.1 - "images/rooms/objects/decorations/small_owl/letter_2.webp" + "images/rooms/main_room/decorations/small_owl/letter_2.webp" pause.15 - "images/rooms/objects/decorations/small_owl/letter_1.webp" + "images/rooms/main_room/decorations/small_owl/letter_1.webp" pause.1 - "images/rooms/objects/decorations/small_owl/letter_0.webp" + "images/rooms/main_room/decorations/small_owl/letter_0.webp" pause 7 repeat @@ -537,13 +537,13 @@ image small_owl_letter_hover: zoom 0.5 offset (-1, -3) - "images/rooms/objects/decorations/small_owl/letter_hover.webp" + "images/rooms/main_room/decorations/small_owl/letter_hover.webp" image xmas_lights_static: contains: alpha 0.5 - "images/rooms/objects/decorations/xmas_lights/underlay.webp" + "images/rooms/main_room/decorations/xmas_lights/underlay.webp" contains: "xmas_lights_set1_bulbs" @@ -552,7 +552,7 @@ image xmas_lights_static: "xmas_lights_set2_bulbs" contains: - "images/rooms/objects/decorations/xmas_lights/base.webp" + "images/rooms/main_room/decorations/xmas_lights/base.webp" contains: "xmas_lights_set1_glow" @@ -563,7 +563,7 @@ image xmas_lights_static: image xmas_lights_alternate: contains: alpha 0.5 - "images/rooms/objects/decorations/xmas_lights/underlay.webp" + "images/rooms/main_room/decorations/xmas_lights/underlay.webp" contains: animation @@ -582,7 +582,7 @@ image xmas_lights_alternate: repeat contains: - "images/rooms/objects/decorations/xmas_lights/base.webp" + "images/rooms/main_room/decorations/xmas_lights/base.webp" contains: animation @@ -603,7 +603,7 @@ image xmas_lights_alternate: image xmas_lights_cycle: contains: alpha 0.5 - "images/rooms/objects/decorations/xmas_lights/underlay.webp" + "images/rooms/main_room/decorations/xmas_lights/underlay.webp" contains: animation @@ -620,7 +620,7 @@ image xmas_lights_cycle: repeat contains: - "images/rooms/objects/decorations/xmas_lights/base.webp" + "images/rooms/main_room/decorations/xmas_lights/base.webp" contains: animation @@ -639,7 +639,7 @@ image xmas_lights_cycle: image xmas_lights_pulse: contains: alpha 0.5 - "images/rooms/objects/decorations/xmas_lights/underlay.webp" + "images/rooms/main_room/decorations/xmas_lights/underlay.webp" contains: animation @@ -662,7 +662,7 @@ image xmas_lights_pulse: repeat contains: - "images/rooms/objects/decorations/xmas_lights/base.webp" + "images/rooms/main_room/decorations/xmas_lights/base.webp" contains: animation @@ -687,12 +687,12 @@ image xmas_lights_pulse: image xmas_wreaths: pos (35, -65) - "images/rooms/objects/decorations/xmas_wreaths.webp" + "images/rooms/main_room/decorations/xmas_wreaths.webp" image xmas_giftchair: pos (35, 108) - "images/rooms/objects/decorations/xmas_giftchair.webp" + "images/rooms/main_room/decorations/xmas_giftchair.webp" image xmas_window_santa_doodle: size (2160, 1200) diff --git a/game/scripts/rooms/main_room/objects/xmas_lights.rpy b/game/scripts/rooms/main_room/objects/xmas_lights.rpy index 1cc9b9c6..35dd6b14 100644 --- a/game/scripts/rooms/main_room/objects/xmas_lights.rpy +++ b/game/scripts/rooms/main_room/objects/xmas_lights.rpy @@ -87,19 +87,19 @@ label xmas_lights_settings: init python: def xmas_lights_set1_bulbs(st, at): - d = Transform("images/rooms/objects/decorations/xmas_lights/bulbset_1.webp", matrixcolor=HueMatrix(xmas_lights_hue1)*BrightnessMatrix(xmas_lights_brightness)) + d = Transform("images/rooms/main_room/decorations/xmas_lights/bulbset_1.webp", matrixcolor=HueMatrix(xmas_lights_hue1)*BrightnessMatrix(xmas_lights_brightness)) return d, 1.0 def xmas_lights_set2_bulbs(st, at): - d = Transform("images/rooms/objects/decorations/xmas_lights/bulbset_2.webp", matrixcolor=HueMatrix(xmas_lights_hue2)*BrightnessMatrix(xmas_lights_brightness)) + d = Transform("images/rooms/main_room/decorations/xmas_lights/bulbset_2.webp", matrixcolor=HueMatrix(xmas_lights_hue2)*BrightnessMatrix(xmas_lights_brightness)) return d, 1.0 def xmas_lights_set1_glow(st, at): - d = Transform("images/rooms/objects/decorations/xmas_lights/glowset_1.webp", alpha=xmas_lights_alpha, matrixcolor=HueMatrix(xmas_lights_hue1)*BrightnessMatrix(xmas_lights_brightness)) + d = Transform("images/rooms/main_room/decorations/xmas_lights/glowset_1.webp", alpha=xmas_lights_alpha, matrixcolor=HueMatrix(xmas_lights_hue1)*BrightnessMatrix(xmas_lights_brightness)) return d, 1.0 def xmas_lights_set2_glow(st, at): - d = Transform("images/rooms/objects/decorations/xmas_lights/glowset_2.webp", alpha=xmas_lights_alpha, matrixcolor=HueMatrix(xmas_lights_hue2)*BrightnessMatrix(xmas_lights_brightness)) + d = Transform("images/rooms/main_room/decorations/xmas_lights/glowset_2.webp", alpha=xmas_lights_alpha, matrixcolor=HueMatrix(xmas_lights_hue2)*BrightnessMatrix(xmas_lights_brightness)) return d, 1.0 image xmas_lights_set1_bulbs = DynamicDisplayable(xmas_lights_set1_bulbs) diff --git a/game/scripts/rooms/room_of_requirement/images.rpy b/game/scripts/rooms/room_of_requirement/images.rpy index 84426695..fdf8fa3c 100644 --- a/game/scripts/rooms/room_of_requirement/images.rpy +++ b/game/scripts/rooms/room_of_requirement/images.rpy @@ -8,4 +8,4 @@ image mirror_hover: image door_idle_night: zoom 0.5 - "images/rooms/objects/doors/door_idle_night.webp" + "images/rooms/room_of_requirement/door_idle_night.webp"