From b95247974245ac00ec12a328a3edf90e54b86754 Mon Sep 17 00:00:00 2001 From: LoafyLemon Date: Sat, 18 May 2024 19:00:32 +0100 Subject: [PATCH] Fix decorations --- .../main_room/decorations/agrabah_poster.webp | 4 +- .../main_room/decorations/crest_trophy.webp | 4 +- .../decorations/gryffindor_poster.webp | 4 +- .../decorations/halloween_cupboard.webp | 4 +- .../decorations/halloween_fireplace.webp | 4 +- .../decorations/halloween_phoenix.webp | 4 +- .../main_room/decorations/halloween_rug.webp | 4 +- .../main_room/decorations/harlot_poster.webp | 4 +- .../main_room/decorations/hat_fireplace.webp | 4 +- .../rooms/main_room/decorations/hat_owl.webp | 4 +- .../main_room/decorations/hat_phoenix.webp | 4 +- .../decorations/hermione_poster.webp | 4 +- .../decorations/hufflepuff_poster.webp | 4 +- .../decorations/ravenclaw_poster.webp | 4 +- .../decorations/santas_naughty_list.webp | 4 +- .../decorations/slytherin_poster.webp | 4 +- .../main_room/decorations/stag_trophy.webp | 4 +- .../decorations/stripper_poster.webp | 4 +- .../main_room/decorations/tonks_poster.webp | 4 +- .../main_room/decorations/wanted_poster.webp | 4 +- .../main_room/decorations/xmas_cupboard.webp | 4 +- .../main_room/decorations/xmas_door.webp | 4 +- .../main_room/decorations/xmas_fireplace.webp | 4 +- .../main_room/decorations/xmas_garland.webp | 4 +- .../rooms/main_room/decorations/xmas_owl.webp | 4 +- .../main_room/decorations/xmas_phoenix.webp | 4 +- game/scripts/chibis/classes.rpy | 2 +- game/scripts/inventory/decorations.rpy | 2 +- game/scripts/rooms/main_room/images.rpy | 56 +++++++++++++------ game/scripts/rooms/main_room/init.rpy | 2 +- 30 files changed, 93 insertions(+), 73 deletions(-) diff --git a/game/images/rooms/main_room/decorations/agrabah_poster.webp b/game/images/rooms/main_room/decorations/agrabah_poster.webp index 0abf2baa..c54056fc 100644 --- a/game/images/rooms/main_room/decorations/agrabah_poster.webp +++ b/game/images/rooms/main_room/decorations/agrabah_poster.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4b0f8770cdb2a3e82129990f7a522dcef4ca35547462a3b269f2898e7b311273 -size 16986 +oid sha256:8ce27860e6e933f969c4007bf0e98b986f5b73819b0c6b24c8730c8940727f59 +size 68834 diff --git a/game/images/rooms/main_room/decorations/crest_trophy.webp b/game/images/rooms/main_room/decorations/crest_trophy.webp index af1347e7..b51b17e1 100644 --- a/game/images/rooms/main_room/decorations/crest_trophy.webp +++ b/game/images/rooms/main_room/decorations/crest_trophy.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3dbfa3a68d6920720fba79170df33aa79bf600615763f828c8c224bd00cc15de -size 18384 +oid sha256:8879e23c959060e343c585c600267cbc3869d0849947c02a8811d1865d15c394 +size 43770 diff --git a/game/images/rooms/main_room/decorations/gryffindor_poster.webp b/game/images/rooms/main_room/decorations/gryffindor_poster.webp index 3a06eac8..440e4265 100644 --- a/game/images/rooms/main_room/decorations/gryffindor_poster.webp +++ b/game/images/rooms/main_room/decorations/gryffindor_poster.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8be273803f0fcdde33ec832bebda47dbc1ae1d7d8a8cdd9e72c92716ff90cbcc -size 8172 +oid sha256:43f4fcbbfd54b3659277943a249ca555393dcd77de136169aecffaad1d71452c +size 36942 diff --git a/game/images/rooms/main_room/decorations/halloween_cupboard.webp b/game/images/rooms/main_room/decorations/halloween_cupboard.webp index e03acf1b..28432140 100644 --- a/game/images/rooms/main_room/decorations/halloween_cupboard.webp +++ b/game/images/rooms/main_room/decorations/halloween_cupboard.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c4a51ccfdaf2703e65378e0e399669967ab092ec39e8387bd35a157209087f0e -size 15510 +oid sha256:edf8c1cf68724b7475f93a3f24ceeb60d11ce4ffd0f2a4569bc872f94c2ef4c8 +size 66692 diff --git a/game/images/rooms/main_room/decorations/halloween_fireplace.webp b/game/images/rooms/main_room/decorations/halloween_fireplace.webp index 332bca10..7f98a88f 100644 --- a/game/images/rooms/main_room/decorations/halloween_fireplace.webp +++ b/game/images/rooms/main_room/decorations/halloween_fireplace.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:55941d196ed2591dff3960393d404ee79266a9106c1889a7068099d769c31358 -size 12132 +oid sha256:bf9a28fc0c958c14ae33b291fb403bf549f87777b9225e991c5d577dbe1b02ad +size 49168 diff --git a/game/images/rooms/main_room/decorations/halloween_phoenix.webp b/game/images/rooms/main_room/decorations/halloween_phoenix.webp index cc4b1c45..80109453 100644 --- a/game/images/rooms/main_room/decorations/halloween_phoenix.webp +++ b/game/images/rooms/main_room/decorations/halloween_phoenix.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fffd1a5a79efb3f14ddef8748cf8ec8692600da37d4508a712dda8d293b61f7c -size 11616 +oid sha256:2a408c8857fc2a17dfff28313308429d1a4e62f508d2114adfbda7123d7a1b18 +size 33884 diff --git a/game/images/rooms/main_room/decorations/halloween_rug.webp b/game/images/rooms/main_room/decorations/halloween_rug.webp index bf3eb57c..6fc2233e 100644 --- a/game/images/rooms/main_room/decorations/halloween_rug.webp +++ b/game/images/rooms/main_room/decorations/halloween_rug.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:025718823236f15d1ad843d3100892edec78bff09baeaf2417de7f90dc68f116 -size 33198 +oid sha256:f03506acc97e7912799a2c4be138a61fb07ff848cb1c6167a54043a05a3fc43b +size 187098 diff --git a/game/images/rooms/main_room/decorations/harlot_poster.webp b/game/images/rooms/main_room/decorations/harlot_poster.webp index fd9ef1c8..a2759488 100644 --- a/game/images/rooms/main_room/decorations/harlot_poster.webp +++ b/game/images/rooms/main_room/decorations/harlot_poster.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8f96ca6bfe3447f5c12fb8de0452539d1e795096d4349f94110fd0d1643649e8 -size 19728 +oid sha256:d9134a70d2485682cde413a355520f83125f7e8c483589fd9bf873c35ca00088 +size 70704 diff --git a/game/images/rooms/main_room/decorations/hat_fireplace.webp b/game/images/rooms/main_room/decorations/hat_fireplace.webp index ebfe1bd4..a21e82eb 100644 --- a/game/images/rooms/main_room/decorations/hat_fireplace.webp +++ b/game/images/rooms/main_room/decorations/hat_fireplace.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fab5c54c390167bfc87fd92fa5354bbc7b3fa101932510f1c33b5dba94cabc19 -size 4348 +oid sha256:4f79488fedba186bf10a128d988a38fd3e4ac17e2ec2ce0be06f164a95e3cb1b +size 10836 diff --git a/game/images/rooms/main_room/decorations/hat_owl.webp b/game/images/rooms/main_room/decorations/hat_owl.webp index c1e456f1..78839149 100644 --- a/game/images/rooms/main_room/decorations/hat_owl.webp +++ b/game/images/rooms/main_room/decorations/hat_owl.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b350d3773adb338dbb0343a927376c721d1f0bf8b744f02c552ee7d546aba7cc -size 4504 +oid sha256:59619a535ef7b184116cf484aa73542407cd97bf592144c1d942b5d4d1c8b4c1 +size 12516 diff --git a/game/images/rooms/main_room/decorations/hat_phoenix.webp b/game/images/rooms/main_room/decorations/hat_phoenix.webp index ab1eb88f..f95093df 100644 --- a/game/images/rooms/main_room/decorations/hat_phoenix.webp +++ b/game/images/rooms/main_room/decorations/hat_phoenix.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d1a48476963bada498c4437b141ed8218a7781678573e5f7cf24c06db257a99 -size 5048 +oid sha256:894a5dd6e648b18cb2a009b905ac9e703ab5106059660b2a72d32accd2c9df41 +size 12158 diff --git a/game/images/rooms/main_room/decorations/hermione_poster.webp b/game/images/rooms/main_room/decorations/hermione_poster.webp index 1d20fe79..bde58101 100644 --- a/game/images/rooms/main_room/decorations/hermione_poster.webp +++ b/game/images/rooms/main_room/decorations/hermione_poster.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd4bd7d669f727f812b8fd9d9e37594e7414afac9b71a7f60fbddfab129ea7ef -size 17770 +oid sha256:9124d3fcd4f77774901d991c521581535aa77fb4b8d6bb8f439d59f2e04ed2ae +size 63854 diff --git a/game/images/rooms/main_room/decorations/hufflepuff_poster.webp b/game/images/rooms/main_room/decorations/hufflepuff_poster.webp index 8b858837..b15eb1ca 100644 --- a/game/images/rooms/main_room/decorations/hufflepuff_poster.webp +++ b/game/images/rooms/main_room/decorations/hufflepuff_poster.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:579b70c14cfe05ab53c3759ed9d3e1ffd9d50ce0c1d2404914c061c6149e4f3f -size 9142 +oid sha256:02816ed71bd3a85f34d8fdfdb5aee8644502e07f5a71fffce163faf425bb437b +size 34900 diff --git a/game/images/rooms/main_room/decorations/ravenclaw_poster.webp b/game/images/rooms/main_room/decorations/ravenclaw_poster.webp index 7df2bba6..301b16d3 100644 --- a/game/images/rooms/main_room/decorations/ravenclaw_poster.webp +++ b/game/images/rooms/main_room/decorations/ravenclaw_poster.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41c07a79905e27a6732120b3940ed7162666e02641f4453c6df4f01e627f3ec9 -size 7624 +oid sha256:724e27be288930e1bc8eb72b86c1928b97045f922f4ca642431e2203e5172e57 +size 26792 diff --git a/game/images/rooms/main_room/decorations/santas_naughty_list.webp b/game/images/rooms/main_room/decorations/santas_naughty_list.webp index 7ac85aac..508d8012 100644 --- a/game/images/rooms/main_room/decorations/santas_naughty_list.webp +++ b/game/images/rooms/main_room/decorations/santas_naughty_list.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de4cf6a132b8785348d4222653898871a1cd332bcc3f1fddd7ccfb1cfd06e00e -size 16630 +oid sha256:ff719c66a4b33f84c15a50b4428fec489de0e07179baac24194f1d0f2fd46e26 +size 69810 diff --git a/game/images/rooms/main_room/decorations/slytherin_poster.webp b/game/images/rooms/main_room/decorations/slytherin_poster.webp index 0e9755a4..4d0c23e8 100644 --- a/game/images/rooms/main_room/decorations/slytherin_poster.webp +++ b/game/images/rooms/main_room/decorations/slytherin_poster.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f57e1ea0c5f4f2215995281b907fe03caf87934ff99136977a2c1eb2a3fd5d97 -size 9178 +oid sha256:a3fa162503ea8cab3eec468dbe00915b23a6ba74b9037400751e1f3ccd907325 +size 36668 diff --git a/game/images/rooms/main_room/decorations/stag_trophy.webp b/game/images/rooms/main_room/decorations/stag_trophy.webp index 51c2ab42..e778d522 100644 --- a/game/images/rooms/main_room/decorations/stag_trophy.webp +++ b/game/images/rooms/main_room/decorations/stag_trophy.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1973ff755a4d4a718a0bc8095d11236b1e12717531b192771c8e1ea79bf170b0 -size 16932 +oid sha256:3804376bde862da969c0d1eeb4fdc87cee83d9a025763f0e1e4657dae99eaf0e +size 42288 diff --git a/game/images/rooms/main_room/decorations/stripper_poster.webp b/game/images/rooms/main_room/decorations/stripper_poster.webp index 3ec28e01..2c545231 100644 --- a/game/images/rooms/main_room/decorations/stripper_poster.webp +++ b/game/images/rooms/main_room/decorations/stripper_poster.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d43ba382ffcf36edfd5312868853318bc2e2a77884394e66c21c35958c1c8056 -size 15154 +oid sha256:29c0ceaabde49592af3b95816ca2db90c050d430c60a88498c5a4444010ea7d6 +size 62726 diff --git a/game/images/rooms/main_room/decorations/tonks_poster.webp b/game/images/rooms/main_room/decorations/tonks_poster.webp index dd91f080..151d0230 100644 --- a/game/images/rooms/main_room/decorations/tonks_poster.webp +++ b/game/images/rooms/main_room/decorations/tonks_poster.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62ff440e9c2fcf8172413eaac12ffd54193903bfe7afad8fece3647aea9bf23c -size 19392 +oid sha256:5468c5f7e5149a502303641f7a353468dbcb007d2382d3a3a62a5f2cc12fd17d +size 66306 diff --git a/game/images/rooms/main_room/decorations/wanted_poster.webp b/game/images/rooms/main_room/decorations/wanted_poster.webp index cb8c990b..07c22132 100644 --- a/game/images/rooms/main_room/decorations/wanted_poster.webp +++ b/game/images/rooms/main_room/decorations/wanted_poster.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67f16052782ac4ca177e13a0be595bc8ff6559b5551ce1c2bb5658473d40c19e -size 16640 +oid sha256:ea9800bfacba6f68eebb36bfa991a515ff4f64eecb5aa828669c669e07f5ddc1 +size 61598 diff --git a/game/images/rooms/main_room/decorations/xmas_cupboard.webp b/game/images/rooms/main_room/decorations/xmas_cupboard.webp index ae08d828..9f58945d 100644 --- a/game/images/rooms/main_room/decorations/xmas_cupboard.webp +++ b/game/images/rooms/main_room/decorations/xmas_cupboard.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a6e6aeedb25d515f8deb9cae8202f9bc76bdb2dc84a46f8aba086e543d2d66a7 -size 4854 +oid sha256:d65457819aad8d1cc2164cc7d8f948837f71473c0d8ef0abf57a28f78c98f9ff +size 13362 diff --git a/game/images/rooms/main_room/decorations/xmas_door.webp b/game/images/rooms/main_room/decorations/xmas_door.webp index a55d548b..b9796dbc 100644 --- a/game/images/rooms/main_room/decorations/xmas_door.webp +++ b/game/images/rooms/main_room/decorations/xmas_door.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:30d9ce2ea10ad79a08d6566656641add4300279b0209e41156ce4d9b6f49e6bf -size 2098 +oid sha256:c31f1ebf0140a63ce238288ebe85fa429ff514438fdefab45a3b6b97673b65e7 +size 5958 diff --git a/game/images/rooms/main_room/decorations/xmas_fireplace.webp b/game/images/rooms/main_room/decorations/xmas_fireplace.webp index b1a30589..c6c6ff90 100644 --- a/game/images/rooms/main_room/decorations/xmas_fireplace.webp +++ b/game/images/rooms/main_room/decorations/xmas_fireplace.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5884657e7775ab85b786a2b6c010093e30c3a709c35d496164d19c5e125c0726 -size 21796 +oid sha256:fed1ad23cf35b9ab7da6cedb3e14e248cae7feba6f73e3746c2f1f9956c3b167 +size 62364 diff --git a/game/images/rooms/main_room/decorations/xmas_garland.webp b/game/images/rooms/main_room/decorations/xmas_garland.webp index c34cda20..8e6d8a6a 100644 --- a/game/images/rooms/main_room/decorations/xmas_garland.webp +++ b/game/images/rooms/main_room/decorations/xmas_garland.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4a088606912fde5ad7728aa8c53eee8693d6787b1e3b454228fe0edd3c9813a4 -size 234868 +oid sha256:46a017ee0c8ff923983c11c646a30021bf53a50ea216b79e9c6e8b77c7a1cef9 +size 689818 diff --git a/game/images/rooms/main_room/decorations/xmas_owl.webp b/game/images/rooms/main_room/decorations/xmas_owl.webp index 9f02873d..1d40c31d 100644 --- a/game/images/rooms/main_room/decorations/xmas_owl.webp +++ b/game/images/rooms/main_room/decorations/xmas_owl.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:066b3dfbf85fa19f448bf13068eaa6238bf7fb4a8cf7ba165aa53fc9bfec8688 -size 2806 +oid sha256:2573748bc8c88cfa287756765d15ff7d1ca5966ca39dc1c055d473221f6502b5 +size 7622 diff --git a/game/images/rooms/main_room/decorations/xmas_phoenix.webp b/game/images/rooms/main_room/decorations/xmas_phoenix.webp index e3d4d0c5..372ad4aa 100644 --- a/game/images/rooms/main_room/decorations/xmas_phoenix.webp +++ b/game/images/rooms/main_room/decorations/xmas_phoenix.webp @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74c63e4885b26981002bbd82ded547044c2980be84cb1883bdb98c0d940d1bf7 -size 8676 +oid sha256:52dde086a9f869a46c1bd80a0b25993365092d8088987ada573aa79bdd05cee7 +size 26200 diff --git a/game/scripts/chibis/classes.rpy b/game/scripts/chibis/classes.rpy index 9e7c78ee..0bcd3f4f 100644 --- a/game/scripts/chibis/classes.rpy +++ b/game/scripts/chibis/classes.rpy @@ -108,7 +108,7 @@ init -1 python: "wand": (True, "chibi_wand", "walk"), } - def __init__(self, tag, layers, update_callback, zorder=3, speed=100, image_path=None, actions=None, places=None): + def __init__(self, tag, layers, update_callback, zorder=3, speed=200, image_path=None, actions=None, places=None): self.tag = tag # Use a tuple/list to specify the order of layers in a dict diff --git a/game/scripts/inventory/decorations.rpy b/game/scripts/inventory/decorations.rpy index d6b41d76..e806c3fd 100644 --- a/game/scripts/inventory/decorations.rpy +++ b/game/scripts/inventory/decorations.rpy @@ -45,5 +45,5 @@ default small_owl_ITEM = Decoration("small_owl", "decoration", _("Small Owl"), o default xmas_lights_ITEM = Decoration("xmas_lights", "decoration", _("Christmas Lights"), chandelier_OBJ, 5, _("A programmable set of LED lights. Remote control batteries not included."), replaces=True, room_image="xmas_lights_alternate", replace_action=Jump("xmas_lights_settings"), replace_anchor=(0.0, 0.0), replace_pos=(0, 0)) default xmas_wreaths_ITEM = Decoration("xmas_wreaths", "decoration", _("Christmas Wreaths"), door_OBJ, 5, _("Chrismtas Wreaths to spread the christmas cheer."), room_image="xmas_wreaths") default xmas_giftchair_ITEM = Decoration("xmas_giftchair", "decoration", _("Christmas Wreaths"), chair_OBJ, 5, _("A baby-sized gift-wrapped box. I wonder what's inside?"), room_image="xmas_giftchair") -default xmas_garland_ITEM = Decoration("xmas_garland", "decoration", _("Christmas Garland"), chandelier_OBJ, 5, _("A ever-so-green enchanted garland to get you into christmas spirit!"), replace_anchor=(0.0, 0.0), replace_pos=(0, 0)) +default xmas_garland_ITEM = Decoration("xmas_garland", "decoration", _("Christmas Garland"), chandelier_OBJ, 5, _("A ever-so-green enchanted garland to get you into christmas spirit!"), room_image="xmas_garland", replace_anchor=(0.0, 0.0), replace_pos=(0, 0)) default xmas_window_santa_ITEM = Decoration("xmas_window_santa", "decoration", _("Christmas Window Enchantement"), window_OBJ, 5, _("A window enchantment that will make you think twice before saying \"I don't believe in Santa\" ever again."), room_image="xmas_window_santa", replace_anchor=(0.0, 0.0), replace_pos=(0,0)) diff --git a/game/scripts/rooms/main_room/images.rpy b/game/scripts/rooms/main_room/images.rpy index 0d30dc10..e83d48cb 100644 --- a/game/scripts/rooms/main_room/images.rpy +++ b/game/scripts/rooms/main_room/images.rpy @@ -2,7 +2,7 @@ image fireplace_fire: animation zoom 2.0 - offset (-24, -6) + offset (-48, -12) "images/rooms/main_room/fireplace/fireplace_fire_01.webp" pause.1 "images/rooms/main_room/fireplace/fireplace_fire_02.webp" @@ -47,8 +47,9 @@ image glow_effect: image glow_effect_fireplace: align (0.5, 0.5) - offset (0, 30) + offset (0, 60) alpha 0.5 + zoom 2.0 "glow_effect" @@ -264,6 +265,7 @@ image candle_right: "images/rooms/main_room/candles/candle.webp" image candle_fire: #Candle fire. + zoom 2.0 animation "images/rooms/main_room/candles/fire_01.webp" pause.1 @@ -326,18 +328,19 @@ image halloween_chandelier: contains: anchor (0.5, 0.0) + zoom 2.0 "images/rooms/main_room/decorations/halloween_chandelier.webp" contains: - offset (-266, 6) + offset (-532, 12) "candle_fire_01" contains: - offset (-102, 51) + offset (-204, 102) "candle_fire_02" contains: - offset (62, 4) + offset (124, 8) "candle_fire_02" ease_quad 6.0 rotate 18 @@ -346,10 +349,12 @@ image halloween_chandelier: repeat image halloween_fireplace_jackolanterns: - offset (36, 78) + zoom 2.0 + offset (72, 156) "images/rooms/main_room/decorations/halloween_fireplace2.webp" image halloween_window_monster: + zoom 2.0 animation "images/rooms/main_room/decorations/halloween_monster/0.webp" pause 3 @@ -375,24 +380,28 @@ image halloween_window_monster: repeat image halloween_cupboard_caskets: - offset (12, 318) + offset (24, 636) + zoom 2.0 "images/rooms/main_room/decorations/halloween_cupboard2.webp" image halloween_chair_caskets: - offset (55, 105) + offset (110, 210) + zoom 2.0 "images/rooms/main_room/decorations/halloween_chair.webp" image halloween_bats_trophy: - offset (-74, -34) + offset (-148, -68) + zoom 2.0 "images/rooms/main_room/decorations/bats_trophy.webp" image halloween_lamp_left: - offset (-10, -6) + offset (-10, 0) + zoom 2.0 "images/rooms/main_room/decorations/halloween_lamp/left.webp" image halloween_lamp_left_glow: - offset (-111, -81) + offset (-212, -162) contains: animation @@ -410,11 +419,12 @@ image halloween_lamp_left_glow: "images/rooms/main_room/decorations/halloween_lamp/filament.webp" image halloween_lamp_right: - offset (-10, -6) + zoom 2.0 + offset (-10, 0) "images/rooms/main_room/decorations/halloween_lamp/right.webp" image halloween_lamp_right_glow: - offset (-111, -81) + offset (-212, -162) contains: animation @@ -508,6 +518,7 @@ image small_owl_letter_hover: "images/rooms/main_room/decorations/small_owl/letter_hover.webp" image xmas_lights_static: + zoom 2.0 contains: alpha 0.5 @@ -529,6 +540,8 @@ image xmas_lights_static: "xmas_lights_set2_glow" image xmas_lights_alternate: + zoom 2.0 + contains: alpha 0.5 "images/rooms/main_room/decorations/xmas_lights/underlay.webp" @@ -569,6 +582,8 @@ image xmas_lights_alternate: repeat image xmas_lights_cycle: + zoom 2.0 + contains: alpha 0.5 "images/rooms/main_room/decorations/xmas_lights/underlay.webp" @@ -605,6 +620,8 @@ image xmas_lights_cycle: repeat image xmas_lights_pulse: + zoom 2.0 + contains: alpha 0.5 "images/rooms/main_room/decorations/xmas_lights/underlay.webp" @@ -653,12 +670,14 @@ image xmas_lights_pulse: repeat image xmas_wreaths: - pos (35, -65) + pos (70, -130) + zoom 2.0 "images/rooms/main_room/decorations/xmas_wreaths.webp" image xmas_giftchair: - pos (35, 108) + pos (70, 216) + zoom 2.0 "images/rooms/main_room/decorations/xmas_giftchair.webp" @@ -668,7 +687,8 @@ image xmas_window_santa_doodle: animation size (240, 108) subpixel True - offset (640, 460) + offset (1280, 920) + zoom 2.0 contains: fit "fill" @@ -682,8 +702,8 @@ image xmas_window_santa_doodle: linear 0.5 alpha 1.0 repeat - linear 10.0 xoffset 1000 + linear 10.0 xoffset 2000 pause 10.0 repeat -image xmas_window_santa = AlphaMask("xmas_window_santa_doodle", "xmas_window_santa_mask") +image xmas_window_santa = AlphaMask("xmas_window_santa_doodle", Transform("xmas_window_santa_mask", zoom=2.0)) diff --git a/game/scripts/rooms/main_room/init.rpy b/game/scripts/rooms/main_room/init.rpy index 21e73d64..02ba5c93 100644 --- a/game/scripts/rooms/main_room/init.rpy +++ b/game/scripts/rooms/main_room/init.rpy @@ -70,7 +70,7 @@ default desk_OBJ = RoomObject( tooltip="Desk", zorder=1 ) -default poster_OBJ = RoomObject(main_room, "poster", pos=(728, 570), idle=Null(127, 166), action=Jump("enlarge_poster"), zorder=-1) +default poster_OBJ = RoomObject(main_room, "poster", pos=(728, 570), idle=Null(254, 332), action=Jump("enlarge_poster"), zorder=-1) default trophy_OBJ = RoomObject(main_room, "trophy", pos=(1300, 240), idle=Null(), action=None, zorder=-1) default chair_OBJ = RoomObject(main_room, "chair", pos=(1586, 600), idle="chair_right", action=None, zorder=0) default chair_left_OBJ = RoomObject(main_room, "chair", pos=(666, 600), idle="chair_left", action=None, zorder=0, hidden=True)