diff --git a/desktop/asset-work/inside-castle/monocle.png b/desktop/asset-work/inside-castle/monocle.png index b61fd6cb..0520adfc 100644 Binary files a/desktop/asset-work/inside-castle/monocle.png and b/desktop/asset-work/inside-castle/monocle.png differ diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas index 06930a08..c37c0dd7 100644 --- a/desktop/resources/packed/pack.atlas +++ b/desktop/resources/packed/pack.atlas @@ -25,13 +25,6 @@ behindhouse/fg2 orig: 183, 360 offset: 0, 0 index: -1 -behindhouse/house-cover - rotate: false - xy: 1634, 877 - size: 20, 21 - orig: 20, 21 - offset: 0, 0 - index: -1 behindhouse/stick rotate: false xy: 1282, 763 @@ -39,9 +32,16 @@ behindhouse/stick orig: 24, 42 offset: 0, 0 index: -1 +black + rotate: false + xy: 2013, 134 + size: 32, 24 + orig: 32, 24 + offset: 0, 0 + index: -1 butterfly rotate: false - xy: 1897, 1471 + xy: 1867, 1471 size: 14, 7 orig: 14, 7 offset: 0, 0 @@ -62,16 +62,51 @@ castle-gate/coinflip index: -1 castle-gate/frankie-walk-1 rotate: false - xy: 2013, 168 + xy: 2013, 234 size: 24, 35 orig: 24, 35 offset: 0, 0 index: -1 -castle-gate/goon-2 +castle-gate/frankie-walk-2 rotate: false - xy: 2013, 134 - size: 24, 32 - orig: 24, 32 + xy: 2013, 197 + size: 24, 35 + orig: 24, 35 + offset: 0, 0 + index: -1 +castle-gate/frankie-walk-3 + rotate: false + xy: 2013, 160 + size: 24, 35 + orig: 24, 35 + offset: 0, 0 + index: -1 +castle-gate/frankie-walk-4 + rotate: false + xy: 2021, 97 + size: 24, 35 + orig: 24, 35 + offset: 0, 0 + index: -1 +castle-gate/frankie-walk-5 + rotate: false + xy: 2021, 60 + size: 24, 35 + orig: 24, 35 + offset: 0, 0 + index: -1 +castle-gate/frankie-walk-6 + rotate: false + xy: 2020, 1665 + size: 24, 35 + orig: 24, 35 + offset: 0, 0 + index: -1 +castle-gate/goon-1 + rotate: false + xy: 2020, 1723 + size: 26, 33 + orig: 26, 33 offset: 0, 0 index: -1 castle-gate/goon-2-flip @@ -144,27 +179,6 @@ cat-tree/dot orig: 1, 1 offset: 0, 0 index: -1 -title/dot - rotate: false - xy: 704, 916 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 -inside-jail/dot - rotate: false - xy: 704, 916 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 -ego/dot - rotate: false - xy: 704, 916 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 inside-antique/dot rotate: false xy: 704, 916 @@ -179,7 +193,21 @@ wizard/dot orig: 1, 1 offset: 0, 0 index: -1 -dream/dot +ego/dot + rotate: false + xy: 704, 916 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +title/dot + rotate: false + xy: 704, 916 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +inside-jail/dot rotate: false xy: 704, 916 size: 1, 1 @@ -200,6 +228,13 @@ inside-house/dot orig: 1, 1 offset: 0, 0 index: -1 +dream/dot + rotate: false + xy: 704, 916 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 cat-tree/grandma rotate: false xy: 1228, 839 @@ -363,21 +398,14 @@ dream/plaque3 index: -1 dream/shovel rotate: false - xy: 2013, 347 + xy: 1999, 1669 size: 19, 64 orig: 19, 64 offset: 0, 0 index: -1 -dream/sign - rotate: false - xy: 1999, 1698 - size: 41, 58 - orig: 41, 58 - offset: 0, 0 - index: -1 dream/sword rotate: false - xy: 1491, 442 + xy: 2031, 20 size: 15, 38 orig: 15, 38 offset: 0, 0 @@ -398,14 +426,14 @@ ego/axe-wood index: -1 ego/base rotate: false - xy: 2021, 96 + xy: 1491, 444 size: 16, 36 orig: 16, 36 offset: 0, 0 index: -1 ego/whistle-1 rotate: false - xy: 2021, 96 + xy: 1491, 444 size: 16, 36 orig: 16, 36 offset: 0, 0 @@ -461,7 +489,7 @@ ego/glad index: -1 ego/hold-hand rotate: false - xy: 2021, 58 + xy: 1491, 406 size: 16, 36 orig: 16, 36 offset: 0, 0 @@ -515,13 +543,6 @@ ego/swing-shovel orig: 630, 70 offset: 0, 0 index: -1 -ego/whistle-2 - rotate: false - xy: 1491, 404 - size: 16, 36 - orig: 16, 36 - offset: 0, 0 - index: -1 ending-castle/Untitled rotate: false xy: 1767, 109 @@ -564,13 +585,6 @@ ending-castle/ending-castle2-assets/foreground orig: 344, 109 offset: 0, 0 index: -1 -ending-castle/frankie-fall-1 - rotate: false - xy: 1999, 1661 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 ending-castle/guard-1 rotate: false xy: 2007, 512 @@ -678,21 +692,21 @@ inside-antique/bowl-1 index: -1 inside-antique/bowl-2 rotate: false - xy: 1696, 4 + xy: 2031, 5 size: 14, 13 orig: 14, 13 offset: 0, 0 index: -1 inside-antique/bowl-3 rotate: false - xy: 1712, 4 + xy: 1696, 4 size: 14, 13 orig: 14, 13 offset: 0, 0 index: -1 inside-antique/shopkeep-talk rotate: false - xy: 1560, 877 + xy: 1944, 1735 size: 72, 21 orig: 72, 21 offset: 0, 0 @@ -748,7 +762,7 @@ inside-cafeteria/knights-stand index: -1 inside-cafeteria/ladder rotate: false - xy: 2013, 284 + xy: 2013, 350 size: 29, 38 orig: 29, 38 offset: 0, 0 @@ -790,7 +804,7 @@ inside-castle/background index: -1 inside-castle/bookstack rotate: false - xy: 2013, 247 + xy: 2013, 313 size: 27, 35 orig: 27, 35 offset: 0, 0 @@ -811,9 +825,9 @@ inside-castle/hands-fight index: -1 inside-castle/monocle rotate: false - xy: 1842, 1471 - size: 28, 7 - orig: 28, 7 + xy: 1560, 879 + size: 76, 19 + orig: 76, 19 offset: 0, 0 index: -1 inside-castle/pull-sword @@ -851,20 +865,6 @@ inside-castle/sign-2 orig: 44, 20 offset: 0, 0 index: -1 -inside-castle/sign3 - rotate: false - xy: 1944, 1736 - size: 44, 20 - orig: 44, 20 - offset: 0, 0 - index: -1 -inside-castle/sign-3 - rotate: false - xy: 1944, 1736 - size: 44, 20 - orig: 44, 20 - offset: 0, 0 - index: -1 inside-castle/trophy rotate: false xy: 634, 814 @@ -874,7 +874,7 @@ inside-castle/trophy index: -1 inside-castle/watch rotate: false - xy: 1952, 1219 + xy: 2021, 50 size: 8, 8 orig: 8, 8 offset: 0, 0 @@ -893,6 +893,13 @@ inside-house/candle-aura orig: 108, 27 offset: 0, 0 index: -1 +inside-house/flask + rotate: false + xy: 1638, 877 + size: 16, 21 + orig: 16, 21 + offset: 0, 0 + index: -1 inside-house/frog-legs rotate: false xy: 444, 4 @@ -965,7 +972,7 @@ inside-stash/candle index: -1 inside-stash/lid rotate: false - xy: 1872, 1471 + xy: 1842, 1471 size: 23, 7 orig: 23, 7 offset: 0, 0 @@ -1089,9 +1096,16 @@ outsidehouse/charcoal-4 orig: 18, 18 offset: 0, 0 index: -1 +outsidehouse/lamb + rotate: false + xy: 2020, 1702 + size: 26, 19 + orig: 26, 19 + offset: 0, 0 + index: -1 outsidehouse/sheep rotate: false - xy: 2013, 324 + xy: 2013, 390 size: 33, 21 orig: 33, 21 offset: 0, 0 @@ -1210,7 +1224,7 @@ space/broken-jewel index: -1 talk-bg-2 rotate: false - xy: 2013, 205 + xy: 2013, 271 size: 21, 40 orig: 21, 40 offset: 0, 0 @@ -1245,14 +1259,14 @@ title/quill index: -1 title/save-indicator rotate: false - xy: 1990, 1749 + xy: 1883, 1471 size: 7, 7 orig: 7, 7 offset: 0, 0 index: -1 title/save-indicator-active rotate: false - xy: 1913, 1471 + xy: 1892, 1471 size: 7, 7 orig: 7, 7 offset: 0, 0 @@ -1333,11 +1347,11 @@ behindhouse/house orig: 320, 240 offset: 0, 0 index: -1 -black +behindhouse/house-cover rotate: false - xy: 832, 43 - size: 32, 24 - orig: 32, 24 + xy: 1590, 473 + size: 20, 21 + orig: 20, 21 offset: 0, 0 index: -1 castle-gate/frankie @@ -1347,58 +1361,30 @@ castle-gate/frankie orig: 312, 35 offset: 0, 0 index: -1 -castle-gate/frankie-walk-2 +castle-gate/frankie-walk-7 rotate: false xy: 2022, 468 size: 24, 35 orig: 24, 35 offset: 0, 0 index: -1 -castle-gate/frankie-walk-3 +castle-gate/frankie-walk-8 rotate: false xy: 2022, 431 size: 24, 35 orig: 24, 35 offset: 0, 0 index: -1 -castle-gate/frankie-walk-4 +castle-gate/goon-2 rotate: false - xy: 2022, 394 - size: 24, 35 - orig: 24, 35 - offset: 0, 0 - index: -1 -castle-gate/frankie-walk-5 - rotate: false - xy: 2022, 357 - size: 24, 35 - orig: 24, 35 - offset: 0, 0 - index: -1 -castle-gate/frankie-walk-6 - rotate: false - xy: 2022, 320 - size: 24, 35 - orig: 24, 35 - offset: 0, 0 - index: -1 -castle-gate/frankie-walk-7 - rotate: false - xy: 2022, 283 - size: 24, 35 - orig: 24, 35 - offset: 0, 0 - index: -1 -castle-gate/frankie-walk-8 - rotate: false - xy: 2022, 246 - size: 24, 35 - orig: 24, 35 + xy: 2022, 397 + size: 24, 32 + orig: 24, 32 offset: 0, 0 index: -1 castle-gate/goon-2-talk rotate: false - xy: 2022, 212 + xy: 2022, 363 size: 24, 32 orig: 24, 32 offset: 0, 0 @@ -1426,14 +1412,14 @@ cat-tree/tree-and-rock index: -1 cloudy rotate: false - xy: 1590, 474 + xy: 1590, 451 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 cursorr rotate: false - xy: 2030, 661 + xy: 2030, 646 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1578,20 +1564,27 @@ ego/swing orig: 288, 75 offset: 0, 0 index: -1 -ego/whistle-3 +ego/whistle-2 rotate: false xy: 2030, 740 size: 16, 36 orig: 16, 36 offset: 0, 0 index: -1 -ego/whistle-4 +ego/whistle-3 rotate: false xy: 2030, 702 size: 16, 36 orig: 16, 36 offset: 0, 0 index: -1 +ego/whistle-4 + rotate: false + xy: 2030, 664 + size: 16, 36 + orig: 16, 36 + offset: 0, 0 + index: -1 ending-castle/ending-castle2-assets/collision rotate: false xy: 324, 1322 @@ -1601,7 +1594,7 @@ ending-castle/ending-castle2-assets/collision index: -1 held/flesh rotate: false - xy: 1590, 452 + xy: 592, 13 size: 20, 20 orig: 20, 20 offset: 0, 0 @@ -1664,21 +1657,21 @@ inside-antique/open-blinds index: -1 inside-antique/portrait rotate: false - xy: 2030, 589 + xy: 2030, 574 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 inside-antique/shopkeep rotate: false - xy: 2022, 85 + xy: 2022, 236 size: 18, 21 orig: 18, 21 offset: 0, 0 index: -1 inside-antique/teddy rotate: false - xy: 2030, 553 + xy: 684, 13 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1790,7 +1783,7 @@ inside-castle/hands-1 index: -1 inside-castle/magic rotate: false - xy: 592, 13 + xy: 878, 47 size: 20, 20 orig: 20, 20 offset: 0, 0 @@ -1802,6 +1795,20 @@ inside-castle/pedestal-overlay orig: 320, 240 offset: 0, 0 index: -1 +inside-castle/sign3 + rotate: false + xy: 832, 47 + size: 44, 20 + orig: 44, 20 + offset: 0, 0 + index: -1 +inside-castle/sign-3 + rotate: false + xy: 832, 47 + size: 44, 20 + orig: 44, 20 + offset: 0, 0 + index: -1 inside-castle/way-back-tree rotate: false xy: 968, 112 @@ -1816,13 +1823,6 @@ inside-house/desk orig: 320, 240 offset: 0, 0 index: -1 -inside-house/flask - rotate: false - xy: 2030, 679 - size: 16, 21 - orig: 16, 21 - offset: 0, 0 - index: -1 inside-house/glow rotate: false xy: 968, 1080 @@ -1881,7 +1881,7 @@ inside-jail/warden index: -1 inside-jail/window-bent rotate: false - xy: 2022, 108 + xy: 2022, 259 size: 18, 29 orig: 18, 29 offset: 0, 0 @@ -1909,14 +1909,14 @@ outside-castle/brush-bl index: -1 outside-castle/note rotate: false - xy: 2030, 643 + xy: 2030, 628 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 outside-castle/peddler rotate: false - xy: 2022, 139 + xy: 2022, 290 size: 18, 36 orig: 18, 36 offset: 0, 0 @@ -1930,7 +1930,7 @@ outside-castle/walk-behind index: -1 outside-jail/axe rotate: false - xy: 2022, 177 + xy: 2022, 328 size: 22, 33 orig: 22, 33 offset: 0, 0 @@ -1984,16 +1984,9 @@ outsidehouse/house orig: 320, 240 offset: 0, 0 index: -1 -outsidehouse/lamb - rotate: false - xy: 650, 10 - size: 26, 19 - orig: 26, 19 - offset: 0, 0 - index: -1 outsidehouse/note rotate: false - xy: 2030, 625 + xy: 2030, 610 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2007,14 +2000,14 @@ outsidehouse/sheep-walk index: -1 pathfind-test rotate: false - xy: 2030, 607 + xy: 2030, 592 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 save rotate: false - xy: 2030, 571 + xy: 2030, 556 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2154,7 +2147,7 @@ title/logo index: -1 white rotate: false - xy: 866, 43 + xy: 650, 5 size: 32, 24 orig: 32, 24 offset: 0, 0 @@ -2186,13 +2179,6 @@ castle-gate/Untitled orig: 192, 35 offset: 0, 0 index: -1 -castle-gate/goon-1 - rotate: false - xy: 1291, 561 - size: 26, 33 - orig: 26, 33 - offset: 0, 0 - index: -1 castle-gate/goon-2-search rotate: false xy: 218, 85 @@ -2279,28 +2265,28 @@ cat-tree/eye-6 index: -1 cat-tree/eye-10 rotate: false - xy: 1939, 533 + xy: 1130, 281 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-11 rotate: false - xy: 1985, 533 + xy: 1144, 231 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-12 rotate: false - xy: 1913, 483 + xy: 1176, 281 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-13 rotate: false - xy: 1959, 483 + xy: 1190, 231 size: 44, 48 orig: 44, 48 offset: 0, 0 @@ -2321,35 +2307,35 @@ cat-tree/eye-3 index: -1 cat-tree/eye-4 rotate: false - xy: 1674, 402 + xy: 1572, 502 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-5 rotate: false - xy: 1687, 345 + xy: 1618, 502 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-7 rotate: false - xy: 1687, 345 + xy: 1618, 502 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-8 rotate: false - xy: 1122, 37 + xy: 1815, 315 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-9 rotate: false - xy: 1893, 535 + xy: 1084, 281 size: 44, 48 orig: 44, 48 offset: 0, 0 @@ -2391,42 +2377,42 @@ cat-tree/grandma-cry-14 index: -1 cat-tree/grandma-cry-15 rotate: false - xy: 381, 37 + xy: 1986, 600 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-16 rotate: false - xy: 1572, 510 + xy: 1986, 558 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-17 rotate: false - xy: 1773, 494 + xy: 381, 37 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-18 rotate: false - xy: 1486, 346 + xy: 729, 55 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-19 rotate: false - xy: 1593, 297 + xy: 724, 13 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-20 rotate: false - xy: 1710, 452 + xy: 789, 43 size: 58, 40 orig: 58, 40 offset: 0, 0 @@ -2454,7 +2440,7 @@ cat-tree/grandma-cry-9 index: -1 cat-tree/inventory rotate: false - xy: 1100, 238 + xy: 1664, 507 size: 42, 42 orig: 42, 42 offset: 0, 0 @@ -2480,6 +2466,13 @@ dream/corner-r orig: 112, 59 offset: 0, 0 index: -1 +dream/sign + rotate: false + xy: 1939, 669 + size: 41, 58 + orig: 41, 58 + offset: 0, 0 + index: -1 ego/cat-toy rotate: false xy: 518, 640 @@ -2503,7 +2496,7 @@ ego/grow index: -1 ego/grow-talk rotate: false - xy: 1833, 498 + xy: 830, 2 size: 36, 36 orig: 36, 36 offset: 0, 0 @@ -2776,7 +2769,7 @@ ego/throw index: -1 ego/warden rotate: false - xy: 1911, 440 + xy: 1708, 508 size: 42, 41 orig: 42, 41 offset: 0, 0 @@ -2788,226 +2781,233 @@ ending-castle/crowd-right orig: 116, 135 offset: 0, 0 index: -1 -ending-castle/frankie-fall-10 - rotate: false - xy: 1168, 18 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -ending-castle/frankie-fall-11 - rotate: false - xy: 2005, 451 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -ending-castle/frankie-fall-12 - rotate: false - xy: 1165, 380 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -ending-castle/frankie-fall-2 +ending-castle/frankie-fall-1 rotate: false xy: 1089, 201 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 +ending-castle/frankie-fall-10 + rotate: false + xy: 1299, 163 + size: 40, 35 + orig: 40, 35 + offset: 0, 0 + index: -1 +ending-castle/frankie-fall-11 + rotate: false + xy: 1256, 126 + size: 40, 35 + orig: 40, 35 + offset: 0, 0 + index: -1 +ending-castle/frankie-fall-12 + rotate: false + xy: 1298, 126 + size: 40, 35 + orig: 40, 35 + offset: 0, 0 + index: -1 +ending-castle/frankie-fall-2 + rotate: false + xy: 1173, 194 + size: 40, 35 + orig: 40, 35 + offset: 0, 0 + index: -1 ending-castle/frankie-fall-3 rotate: false - xy: 1131, 201 + xy: 1215, 194 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-4 rotate: false - xy: 1871, 498 + xy: 1674, 299 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-5 rotate: false - xy: 1908, 358 + xy: 1165, 380 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-6 rotate: false - xy: 1950, 358 + xy: 1207, 380 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-7 rotate: false - xy: 1992, 358 + xy: 1249, 380 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-8 rotate: false - xy: 1700, 251 + xy: 1081, 344 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-9 rotate: false - xy: 1169, 55 + xy: 1257, 163 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/warden-2 rotate: false - xy: 1955, 440 + xy: 1100, 238 size: 42, 41 orig: 42, 41 offset: 0, 0 index: -1 georgia/kick-1 rotate: false - xy: 1908, 395 + xy: 849, 40 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-10 rotate: false - xy: 1207, 372 + xy: 1165, 335 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-11 rotate: false - xy: 1249, 372 + xy: 1207, 335 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-12 rotate: false - xy: 771, 8 + xy: 1249, 335 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-13 rotate: false - xy: 813, 40 + xy: 1222, 290 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-14 rotate: false - xy: 855, 39 + xy: 1264, 290 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-15 rotate: false - xy: 897, 39 + xy: 1236, 245 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-16 rotate: false - xy: 1123, 337 + xy: 1278, 245 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-17 rotate: false - xy: 1165, 335 + xy: 1257, 200 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-18 rotate: false - xy: 1207, 327 + xy: 1299, 200 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-19 rotate: false - xy: 1249, 327 + xy: 1986, 513 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-2 rotate: false - xy: 1950, 395 + xy: 1172, 149 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-4 rotate: false - xy: 1950, 395 + xy: 1172, 149 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-20 rotate: false - xy: 1126, 282 + xy: 1122, 81 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-3 rotate: false - xy: 2005, 488 + xy: 1214, 149 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-5 rotate: false - xy: 1992, 395 + xy: 1861, 320 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-6 rotate: false - xy: 1079, 329 + xy: 1861, 275 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-7 rotate: false - xy: 1084, 284 + xy: 1081, 381 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-8 rotate: false - xy: 1081, 381 + xy: 1123, 382 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-9 rotate: false - xy: 1123, 382 + xy: 1123, 337 size: 40, 43 orig: 40, 43 offset: 0, 0 @@ -3217,14 +3217,14 @@ inside-house/candle index: -1 inside-jail/chest-top rotate: false - xy: 1664, 460 + xy: 784, 9 size: 44, 32 orig: 44, 32 offset: 0, 0 index: -1 inside-jail/chest-top-open rotate: false - xy: 675, 63 + xy: 1815, 281 size: 44, 32 orig: 44, 32 offset: 0, 0 @@ -3287,7 +3287,7 @@ outside-castle/steer index: -1 outside-jail/closed-stash rotate: false - xy: 1939, 583 + xy: 675, 65 size: 52, 30 orig: 52, 30 offset: 0, 0 @@ -3700,14 +3700,14 @@ space/susp index: -1 talk-bg rotate: false - xy: 1622, 453 + xy: 1122, 39 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 title/balloon rotate: false - xy: 1986, 699 + xy: 1986, 642 size: 60, 30 orig: 60, 30 offset: 0, 0 @@ -3721,77 +3721,77 @@ wizard/Untitled index: -1 wizard/cloud rotate: false - xy: 721, 65 + xy: 1131, 199 size: 40, 30 orig: 40, 30 offset: 0, 0 index: -1 wizard/experiment-10 rotate: false - xy: 1993, 585 + xy: 677, 8 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-11 rotate: false - xy: 1478, 502 + xy: 891, 27 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-12 rotate: false - xy: 1525, 502 + xy: 1478, 502 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-13 rotate: false - xy: 1481, 445 + xy: 1525, 502 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-14 rotate: false - xy: 1528, 445 + xy: 1481, 445 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-15 rotate: false - xy: 1575, 453 + xy: 1528, 445 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-16 rotate: false - xy: 1486, 388 + xy: 1575, 445 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-17 rotate: false - xy: 1533, 388 + xy: 1622, 445 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-18 rotate: false - xy: 1580, 396 + xy: 1486, 388 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-19 rotate: false - xy: 1632, 495 + xy: 1533, 388 size: 45, 55 orig: 45, 55 offset: 0, 0 @@ -3805,70 +3805,70 @@ wizard/experiment-2 index: -1 wizard/experiment-20 rotate: false - xy: 1679, 494 + xy: 1580, 388 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-21 rotate: false - xy: 1726, 494 + xy: 1627, 388 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-22 rotate: false - xy: 1627, 396 + xy: 1486, 331 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-23 rotate: false - xy: 1546, 331 + xy: 1533, 331 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-24 rotate: false - xy: 1593, 339 + xy: 1580, 331 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-25 rotate: false - xy: 1640, 339 + xy: 1627, 331 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-26 rotate: false - xy: 1653, 282 + xy: 1669, 450 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-27 rotate: false - xy: 1770, 437 + xy: 1674, 393 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-28 rotate: false - xy: 1817, 437 + xy: 1674, 336 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-29 rotate: false - xy: 1083, 144 + xy: 1716, 451 size: 45, 55 orig: 45, 55 offset: 0, 0 @@ -3882,70 +3882,70 @@ wizard/experiment-3 index: -1 wizard/experiment-30 rotate: false - xy: 677, 6 + xy: 1721, 394 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-31 rotate: false - xy: 724, 8 + xy: 1721, 337 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-32 rotate: false - xy: 1720, 395 + xy: 1083, 144 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-33 rotate: false - xy: 1767, 380 + xy: 1763, 479 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-34 rotate: false - xy: 1814, 380 + xy: 1810, 479 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-35 rotate: false - xy: 1700, 288 + xy: 1768, 422 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-36 rotate: false - xy: 1861, 380 + xy: 1768, 365 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-37 rotate: false - xy: 1864, 441 + xy: 1815, 422 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-38 rotate: false - xy: 1130, 144 + xy: 1815, 365 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-39 rotate: false - xy: 1122, 87 + xy: 1768, 308 size: 45, 55 orig: 45, 55 offset: 0, 0 @@ -3973,28 +3973,28 @@ wizard/experiment-6 index: -1 wizard/experiment-7 rotate: false - xy: 1939, 672 + xy: 1939, 612 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-8 rotate: false - xy: 1939, 615 + xy: 1982, 674 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-9 rotate: false - xy: 1986, 642 + xy: 1939, 555 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/magic-hands rotate: false - xy: 1169, 92 + xy: 1130, 147 size: 40, 50 orig: 40, 50 offset: 0, 0 diff --git a/desktop/resources/packed/pack.png b/desktop/resources/packed/pack.png index 054c26e0..fb4e4cb5 100644 Binary files a/desktop/resources/packed/pack.png and b/desktop/resources/packed/pack.png differ diff --git a/desktop/resources/packed/pack2.png b/desktop/resources/packed/pack2.png index e8b1c9bf..43a0c7d1 100644 Binary files a/desktop/resources/packed/pack2.png and b/desktop/resources/packed/pack2.png differ diff --git a/desktop/resources/packed/pack3.png b/desktop/resources/packed/pack3.png index 2fb55f3c..6a09af78 100644 Binary files a/desktop/resources/packed/pack3.png and b/desktop/resources/packed/pack3.png differ diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index e6f08798..f0974546 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -376,7 +376,7 @@ (aget game-player-talk-sheet 0 i))) trophy (utils/make-anim "inside-castle/trophy.png" [16 16] 0.1 (flatten [(repeat 50 0) 1 2 3 3 3 3 2 1])) pull-sword-anim (utils/make-anim "inside-castle/pull-sword.png" [95 190] 0.10 (flatten [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 2 2 2 2 2 2 2 2 3 2 3 2 3 3 2 3 2 2 3 3 2 3 2 3 2 3 2 3 2 3 2 2 3 3 3 2 3 2 3 3 2 3 2 3 2 2 2 2 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 ])) - monocle (utils/make-anim "inside-castle/monocle.png" [7 7] 0.05 (flatten [(repeat 70 0) 1 2 3 3 3 2 1])) + monocle (utils/make-anim "inside-castle/monocle.png" [19 19] 0.05 (flatten [(repeat 70 0) 1 2 3 3 3 2 1])) door (utils/make-anim "inside-castle/door.png" [21 49] 0.15 (flatten [(range 4) 3 3 3 3 3 3 3])) ] (rooms/make :music {:day :town-1 :night :night :sunrise :night} @@ -652,6 +652,7 @@ :flex game-player-flex)} :monocle (rooms/make-entity :monocle (assoc (animation->texture screen monocle) :x 209 :y 160 :baseline 240 + :origin-x 9 :anim monocle :anim-start 0 :night-profile :none