diff --git a/desktop/asset-work/outside-castle/flies.png b/desktop/asset-work/outside-castle/flies.png index 6e5b5bdb..12a0dfed 100644 Binary files a/desktop/asset-work/outside-castle/flies.png and b/desktop/asset-work/outside-castle/flies.png differ diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas index 2647bc54..6201e299 100644 --- a/desktop/resources/packed/pack.atlas +++ b/desktop/resources/packed/pack.atlas @@ -27,14 +27,14 @@ behindhouse/fg2 index: -1 behindhouse/stick rotate: false - xy: 2013, 375 + xy: 1767, 65 size: 24, 42 orig: 24, 42 offset: 0, 0 index: -1 butterfly rotate: false - xy: 1867, 1471 + xy: 1952, 1220 size: 14, 7 orig: 14, 7 offset: 0, 0 @@ -55,39 +55,53 @@ castle-gate/coinflip index: -1 castle-gate/frankie-walk-1 rotate: false - xy: 2013, 259 + xy: 2013, 303 size: 24, 35 orig: 24, 35 offset: 0, 0 index: -1 castle-gate/frankie-walk-2 rotate: false - xy: 2013, 222 + xy: 2013, 266 size: 24, 35 orig: 24, 35 offset: 0, 0 index: -1 castle-gate/frankie-walk-3 rotate: false - xy: 2013, 185 + xy: 2013, 229 size: 24, 35 orig: 24, 35 offset: 0, 0 index: -1 castle-gate/frankie-walk-4 rotate: false - xy: 2013, 148 + xy: 2013, 192 size: 24, 35 orig: 24, 35 offset: 0, 0 index: -1 castle-gate/frankie-walk-5 + rotate: false + xy: 2013, 155 + 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/frankie-walk-7 + rotate: false + xy: 2021, 60 + size: 24, 35 + orig: 24, 35 + offset: 0, 0 + index: -1 castle-gate/goon-1 rotate: false xy: 2020, 1723 @@ -118,14 +132,14 @@ castle-gate/stash-closed index: -1 cat-tree/Untitled rotate: false - xy: 1767, 89 + xy: 390, 2 size: 28, 18 orig: 28, 18 offset: 0, 0 index: -1 cat-tree/pounce rotate: false - xy: 1767, 89 + xy: 390, 2 size: 28, 18 orig: 28, 18 offset: 0, 0 @@ -286,32 +300,18 @@ close index: -1 cloud rotate: false - xy: 1679, 2 + xy: 2031, 1953 size: 15, 15 orig: 15, 15 offset: 0, 0 index: -1 space/cloud rotate: false - xy: 1679, 2 + xy: 2031, 1953 size: 15, 15 orig: 15, 15 offset: 0, 0 index: -1 -cloudy - rotate: false - xy: 2021, 50 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -cursorr - rotate: false - xy: 461, 4 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 dbh rotate: false xy: 2, 1086 @@ -370,7 +370,7 @@ dream/island index: -1 dream/plaque1 rotate: false - xy: 1787, 76 + xy: 1274, 1055 size: 8, 11 orig: 8, 11 offset: 0, 0 @@ -384,7 +384,7 @@ dream/plaque2 index: -1 dream/plaque3 rotate: false - xy: 1274, 1055 + xy: 1274, 1042 size: 8, 11 orig: 8, 11 offset: 0, 0 @@ -552,14 +552,7 @@ ego/whistle-2 index: -1 ego/whistle-3 rotate: false - xy: 2021, 110 - size: 16, 36 - orig: 16, 36 - offset: 0, 0 - index: -1 -ego/whistle-4 - rotate: false - xy: 2021, 72 + xy: 2017, 12 size: 16, 36 orig: 16, 36 offset: 0, 0 @@ -692,35 +685,35 @@ inside-antique/beard index: -1 inside-antique/bowl rotate: false - xy: 2031, 1955 + xy: 1650, 4 size: 14, 13 orig: 14, 13 offset: 0, 0 index: -1 inside-antique/bowl-0 rotate: false - xy: 2031, 1955 + xy: 1650, 4 size: 14, 13 orig: 14, 13 offset: 0, 0 index: -1 inside-antique/bowl-1 rotate: false - xy: 1696, 4 + xy: 1666, 4 size: 14, 13 orig: 14, 13 offset: 0, 0 index: -1 inside-antique/bowl-2 rotate: false - xy: 1712, 4 + xy: 1682, 4 size: 14, 13 orig: 14, 13 offset: 0, 0 index: -1 inside-antique/bowl-3 rotate: false - xy: 1728, 4 + xy: 1698, 4 size: 14, 13 orig: 14, 13 offset: 0, 0 @@ -825,7 +818,7 @@ inside-castle/background index: -1 inside-castle/bookstack rotate: false - xy: 2013, 296 + xy: 2013, 382 size: 27, 35 orig: 27, 35 offset: 0, 0 @@ -874,7 +867,7 @@ inside-castle/sign-1 index: -1 inside-castle/trophy rotate: false - xy: 634, 814 + xy: 324, 4 size: 64, 16 orig: 64, 16 offset: 0, 0 @@ -907,13 +900,6 @@ inside-house/flask orig: 16, 21 offset: 0, 0 index: -1 -inside-house/frog-legs - rotate: false - xy: 442, 4 - size: 17, 16 - orig: 17, 16 - offset: 0, 0 - index: -1 inside-house/inputed-key rotate: false xy: 498, 122 @@ -935,13 +921,6 @@ inside-jail/background orig: 320, 240 offset: 0, 0 index: -1 -inside-jail/ball-n-chain - rotate: false - xy: 402, 4 - size: 38, 16 - orig: 38, 16 - offset: 0, 0 - index: -1 inside-jail/moveable-bars rotate: false xy: 1988, 1387 @@ -949,13 +928,6 @@ inside-jail/moveable-bars orig: 53, 91 offset: 0, 0 index: -1 -inside-jail/window - rotate: false - xy: 1767, 58 - size: 18, 29 - orig: 18, 29 - offset: 0, 0 - index: -1 inside-stash/background rotate: false xy: 1188, 517 @@ -972,7 +944,7 @@ inside-stash/candle index: -1 inside-stash/lid rotate: false - xy: 1842, 1471 + xy: 472, 13 size: 23, 7 orig: 23, 7 offset: 0, 0 @@ -986,28 +958,21 @@ outside-castle/background index: -1 outside-castle/bird rotate: false - xy: 700, 828 + xy: 2044, 684 size: 2, 2 orig: 2, 2 offset: 0, 0 index: -1 outside-castle/flies rotate: false - xy: 1632, 2 - size: 45, 15 - orig: 45, 15 - offset: 0, 0 - index: -1 -outside-castle/note - rotate: false - xy: 479, 4 - size: 16, 16 - orig: 16, 16 + xy: 634, 809 + size: 63, 21 + orig: 63, 21 offset: 0, 0 index: -1 outside-castle/peddler rotate: false - xy: 2017, 12 + xy: 2021, 97 size: 18, 36 orig: 18, 36 offset: 0, 0 @@ -1021,7 +986,7 @@ outside-jail/Untitled index: -1 outside-jail/alarm-clock rotate: false - xy: 1106, 840 + xy: 1632, 6 size: 16, 11 orig: 16, 11 offset: 0, 0 @@ -1091,28 +1056,28 @@ outsidehouse/cauldron index: -1 outsidehouse/charcoal-1 rotate: false - xy: 1952, 1122 + xy: 420, 2 size: 24, 18 orig: 24, 18 offset: 0, 0 index: -1 outsidehouse/charcoal-2 rotate: false - xy: 324, 2 + xy: 446, 2 size: 24, 18 orig: 24, 18 offset: 0, 0 index: -1 outsidehouse/charcoal-3 rotate: false - xy: 350, 2 + xy: 1952, 1122 size: 24, 18 orig: 24, 18 offset: 0, 0 index: -1 outsidehouse/charcoal-4 rotate: false - xy: 376, 2 + xy: 2013, 135 size: 24, 18 orig: 24, 18 offset: 0, 0 @@ -1259,7 +1224,7 @@ space/broken-jewel index: -1 talk-bg-2 rotate: false - xy: 2013, 333 + xy: 2013, 340 size: 21, 40 orig: 21, 40 offset: 0, 0 @@ -1294,14 +1259,14 @@ title/quill index: -1 title/save-indicator rotate: false - xy: 2039, 410 + xy: 1106, 844 size: 7, 7 orig: 7, 7 offset: 0, 0 index: -1 title/save-indicator-active rotate: false - xy: 1883, 1471 + xy: 1972, 636 size: 7, 7 orig: 7, 7 offset: 0, 0 @@ -1384,7 +1349,7 @@ behindhouse/house-cover index: -1 black rotate: false - xy: 1864, 7 + xy: 1884, 7 size: 32, 24 orig: 32, 24 offset: 0, 0 @@ -1396,30 +1361,23 @@ castle-gate/frankie orig: 312, 35 offset: 0, 0 index: -1 -castle-gate/frankie-walk-6 +castle-gate/frankie-walk-8 rotate: false xy: 2018, 880 size: 24, 35 orig: 24, 35 offset: 0, 0 index: -1 -castle-gate/frankie-walk-7 - rotate: false - xy: 2018, 843 - size: 24, 35 - orig: 24, 35 - offset: 0, 0 - index: -1 -castle-gate/frankie-walk-8 - rotate: false - xy: 2022, 1103 - size: 24, 35 - orig: 24, 35 - offset: 0, 0 - index: -1 castle-gate/goon-2 rotate: false - xy: 1900, 610 + xy: 2018, 846 + size: 24, 32 + orig: 24, 32 + offset: 0, 0 + index: -1 +castle-gate/goon-2-talk + rotate: false + xy: 2022, 1106 size: 24, 32 orig: 24, 32 offset: 0, 0 @@ -1445,6 +1403,20 @@ cat-tree/tree-and-rock orig: 320, 240 offset: 0, 0 index: -1 +cloudy + rotate: false + xy: 940, 272 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 +cursorr + rotate: false + xy: 1588, 399 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 dawn rotate: false xy: 326, 1322 @@ -1538,7 +1510,7 @@ ego/crowbar index: -1 ego/frustrated-talk rotate: false - xy: 862, 86 + xy: 862, 95 size: 96, 36 orig: 96, 36 offset: 0, 0 @@ -1585,9 +1557,16 @@ ego/pant orig: 62, 36 offset: 0, 0 index: -1 +ego/poke + rotate: false + xy: 1928, 3 + size: 80, 50 + orig: 80, 50 + offset: 0, 0 + index: -1 ego/scared-walk rotate: false - xy: 862, 48 + xy: 862, 57 size: 96, 36 orig: 96, 36 offset: 0, 0 @@ -1655,20 +1634,6 @@ georgia/kick-5 orig: 40, 43 offset: 0, 0 index: -1 -georgia/kick-6 - rotate: false - xy: 862, 3 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-7 - rotate: false - xy: 904, 3 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 goon-2-walk rotate: false xy: 1872, 1283 @@ -1734,7 +1699,7 @@ held/bloodclot-head-8 index: -1 held/flesh rotate: false - xy: 940, 272 + xy: 938, 215 size: 20, 20 orig: 20, 20 offset: 0, 0 @@ -1797,7 +1762,7 @@ inside-antique/open-blinds index: -1 inside-antique/portrait rotate: false - xy: 1584, 399 + xy: 1682, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1811,7 +1776,7 @@ inside-antique/shopkeep index: -1 inside-antique/teddy rotate: false - xy: 1898, 15 + xy: 1718, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1923,7 +1888,7 @@ inside-castle/hands-1 index: -1 inside-castle/magic rotate: false - xy: 938, 215 + xy: 938, 193 size: 20, 20 orig: 20, 20 offset: 0, 0 @@ -1977,6 +1942,13 @@ inside-house/desk orig: 320, 240 offset: 0, 0 index: -1 +inside-house/frog-legs + rotate: false + xy: 2022, 1088 + size: 17, 16 + orig: 17, 16 + offset: 0, 0 + index: -1 inside-house/glow rotate: false xy: 970, 1077 @@ -1998,6 +1970,13 @@ inside-house/sillhoute orig: 320, 240 offset: 0, 0 index: -1 +inside-jail/ball-n-chain + rotate: false + xy: 1548, 399 + size: 38, 16 + orig: 38, 16 + offset: 0, 0 + index: -1 inside-jail/bars rotate: false xy: 2, 1564 @@ -2014,7 +1993,7 @@ inside-jail/bars- index: -1 inside-jail/candle rotate: false - xy: 1782, 6 + xy: 1802, 6 size: 80, 25 orig: 80, 25 offset: 0, 0 @@ -2054,9 +2033,16 @@ inside-jail/warden orig: 258, 58 offset: 0, 0 index: -1 +inside-jail/window + rotate: false + xy: 1900, 613 + size: 18, 29 + orig: 18, 29 + offset: 0, 0 + index: -1 inside-jail/window-bent rotate: false - xy: 938, 184 + xy: 1782, 2 size: 18, 29 orig: 18, 29 offset: 0, 0 @@ -2110,6 +2096,13 @@ outside-castle/crowd-right orig: 116, 135 offset: 0, 0 index: -1 +outside-castle/note + rotate: false + xy: 1900, 595 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 outside-castle/steer rotate: false xy: 1612, 607 @@ -2154,7 +2147,7 @@ outsidehouse/background-trees index: -1 outsidehouse/door rotate: false - xy: 862, 124 + xy: 862, 133 size: 96, 58 orig: 96, 58 offset: 0, 0 @@ -2189,7 +2182,7 @@ outsidehouse/lamb-walk index: -1 outsidehouse/note rotate: false - xy: 1548, 399 + xy: 1646, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2203,14 +2196,14 @@ outsidehouse/sheep-walk index: -1 pathfind-test rotate: false - xy: 1566, 399 + xy: 1664, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 save rotate: false - xy: 2022, 1085 + xy: 1700, 7 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2315,7 +2308,7 @@ title/logo index: -1 wizard/Untitled rotate: false - xy: 1928, 3 + xy: 862, 5 size: 80, 50 orig: 80, 50 offset: 0, 0 @@ -2361,13 +2354,6 @@ castle-gate/goon-2-search orig: 192, 32 offset: 0, 0 index: -1 -castle-gate/goon-2-talk - rotate: false - xy: 1085, 12 - size: 24, 32 - orig: 24, 32 - offset: 0, 0 - index: -1 castle-gate/throw-walkie-1 rotate: false xy: 260, 304 @@ -2454,28 +2440,28 @@ cat-tree/eye-6 index: -1 cat-tree/eye-10 rotate: false - xy: 1438, 184 + xy: 1832, 414 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-11 rotate: false - xy: 1438, 134 + xy: 1832, 364 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-12 rotate: false - xy: 1438, 84 + xy: 1878, 414 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-13 rotate: false - xy: 1483, 284 + xy: 1878, 364 size: 44, 48 orig: 44, 48 offset: 0, 0 @@ -2489,119 +2475,119 @@ cat-tree/eye-2 index: -1 cat-tree/eye-3 rotate: false - xy: 1408, 453 + xy: 1648, 348 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-4 rotate: false - xy: 1872, 384 + xy: 1694, 348 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-5 rotate: false - xy: 1437, 284 + xy: 1740, 347 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-7 rotate: false - xy: 1437, 284 + xy: 1740, 347 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-8 rotate: false - xy: 1445, 334 + xy: 1786, 414 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/eye-9 rotate: false - xy: 1438, 234 + xy: 1786, 364 size: 44, 48 orig: 44, 48 offset: 0, 0 index: -1 cat-tree/grandma-cry-10 rotate: false - xy: 1770, 454 + xy: 1240, 300 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-11 rotate: false - xy: 1921, 441 + xy: 1300, 292 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-12 rotate: false - xy: 1921, 399 + xy: 1507, 439 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-13 rotate: false - xy: 1381, 7 + xy: 1601, 470 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-14 rotate: false - xy: 1710, 413 + xy: 1708, 455 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-15 rotate: false - xy: 1770, 412 + xy: 1299, 250 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-16 rotate: false - xy: 1918, 357 + xy: 1359, 250 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-17 rotate: false - xy: 1978, 327 + xy: 1360, 292 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-18 rotate: false - xy: 1484, 242 + xy: 1379, 334 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-19 rotate: false - xy: 1484, 200 + xy: 1792, 464 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-20 rotate: false - xy: 1484, 158 + xy: 1852, 464 size: 58, 40 orig: 58, 40 offset: 0, 0 @@ -2615,21 +2601,21 @@ cat-tree/grandma-cry-6 index: -1 cat-tree/grandma-cry-7 rotate: false - xy: 1304, 391 + xy: 1792, 506 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-8 rotate: false - xy: 1606, 470 + xy: 1852, 506 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-9 rotate: false - xy: 1710, 455 + xy: 1319, 334 size: 58, 40 orig: 58, 40 offset: 0, 0 @@ -2671,14 +2657,14 @@ ego/grow-talk index: -1 ego/hand-hold rotate: false - xy: 1568, 500 + xy: 1519, 214 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 ending-castle/hand-hold rotate: false - xy: 1568, 500 + xy: 1519, 214 size: 36, 36 orig: 36, 36 offset: 0, 0 @@ -2776,35 +2762,35 @@ ego/love-21 index: -1 ego/love-22 rotate: false - xy: 1921, 483 + xy: 1309, 505 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-23 rotate: false - xy: 1973, 483 + xy: 1361, 505 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-24 rotate: false - xy: 1309, 505 + xy: 1309, 433 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-25 rotate: false - xy: 1361, 505 + xy: 1361, 433 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-26 rotate: false - xy: 1309, 433 + xy: 1257, 374 size: 50, 70 orig: 50, 70 offset: 0, 0 @@ -2851,13 +2837,6 @@ ego/love-9 orig: 50, 70 offset: 0, 0 index: -1 -ego/poke - rotate: false - xy: 1710, 497 - size: 80, 50 - orig: 80, 50 - offset: 0, 0 - index: -1 ego/reach rotate: false xy: 1101, 385 @@ -2930,11 +2909,18 @@ ego/throw index: -1 ego/warden rotate: false - xy: 1253, 2 + xy: 1786, 321 size: 42, 41 orig: 42, 41 offset: 0, 0 index: -1 +ego/whistle-4 + rotate: false + xy: 1768, 459 + size: 16, 36 + orig: 16, 36 + offset: 0, 0 + index: -1 ending-castle/frankie-fall-1 rotate: false xy: 1091, 321 @@ -2944,179 +2930,193 @@ ending-castle/frankie-fall-1 index: -1 ending-castle/frankie-fall-10 rotate: false - xy: 1533, 353 + xy: 1519, 103 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-11 rotate: false - xy: 1529, 316 + xy: 1504, 300 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-12 rotate: false - xy: 1581, 433 + xy: 1525, 66 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-2 rotate: false - xy: 1484, 76 + xy: 1419, 252 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-3 rotate: false - xy: 1526, 76 + xy: 1435, 80 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-4 rotate: false - xy: 1441, 2 + xy: 1461, 252 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-5 rotate: false - xy: 1497, 427 + xy: 1477, 80 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-6 rotate: false - xy: 1497, 390 + xy: 1523, 345 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-7 rotate: false - xy: 1491, 353 + xy: 1503, 252 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-8 rotate: false - xy: 1539, 427 + xy: 1519, 177 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-9 rotate: false - xy: 1539, 390 + xy: 1519, 140 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/warden-2 rotate: false - xy: 1830, 453 + xy: 1830, 321 size: 42, 41 orig: 42, 41 offset: 0, 0 index: -1 georgia/kick-10 rotate: false - xy: 1049, 322 + xy: 1435, 207 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-11 rotate: false - xy: 1297, 2 + xy: 1435, 162 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-12 rotate: false - xy: 1339, 2 + xy: 1435, 117 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-13 rotate: false - xy: 1830, 408 + xy: 1441, 35 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-14 rotate: false - xy: 1484, 113 + xy: 1462, 289 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-15 rotate: false - xy: 1526, 113 + xy: 1477, 207 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-16 rotate: false - xy: 1441, 39 + xy: 1477, 162 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-17 rotate: false - xy: 1483, 31 + xy: 1477, 117 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-18 rotate: false - xy: 1525, 31 + xy: 1483, 35 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-19 rotate: false - xy: 1454, 458 + xy: 1874, 319 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-20 rotate: false - xy: 1455, 413 + xy: 1481, 337 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 -georgia/kick-8 +georgia/kick-6 rotate: false xy: 683, 315 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 -georgia/kick-9 +georgia/kick-7 rotate: false xy: 2006, 668 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 +georgia/kick-8 + rotate: false + xy: 1049, 322 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-9 + rotate: false + xy: 1420, 289 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 held/bloodclot-head-9 rotate: false xy: 1137, 721 @@ -3245,7 +3245,7 @@ inside-castle/roof index: -1 inside-castle/walkie-talkie rotate: false - xy: 1538, 464 + xy: 1525, 30 size: 35, 34 orig: 35, 34 offset: 0, 0 @@ -3280,21 +3280,21 @@ open-inventory-1 index: -1 open-inventory-11 rotate: false - xy: 1253, 45 + xy: 1391, 134 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-12 rotate: false - xy: 1411, 395 + xy: 1391, 76 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-13 rotate: false - xy: 1666, 454 + xy: 1742, 397 size: 42, 56 orig: 42, 56 offset: 0, 0 @@ -3315,49 +3315,49 @@ open-inventory-3 index: -1 open-inventory-4 rotate: false - xy: 1205, 247 + xy: 1256, 71 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-5 rotate: false - xy: 1206, 189 + xy: 1303, 21 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-6 rotate: false - xy: 1206, 131 + xy: 1347, 192 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-7 rotate: false - xy: 1209, 73 + xy: 1347, 134 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-8 rotate: false - xy: 1209, 15 + xy: 1347, 76 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-10 rotate: false - xy: 1209, 15 + xy: 1347, 76 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory-9 rotate: false - xy: 1253, 103 + xy: 1391, 192 size: 42, 56 orig: 42, 56 offset: 0, 0 @@ -3791,14 +3791,14 @@ space/susp index: -1 talk-bg rotate: false - xy: 1496, 464 + xy: 1439, 334 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 title/balloon rotate: false - xy: 1506, 506 + xy: 1257, 342 size: 60, 30 orig: 60, 30 offset: 0, 0 @@ -3833,210 +3833,210 @@ wizard/experiment-11 index: -1 wizard/experiment-12 rotate: false - xy: 1257, 389 + xy: 1413, 503 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-13 rotate: false - xy: 1364, 391 + xy: 1413, 446 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-14 rotate: false - xy: 1257, 332 + xy: 1460, 453 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-15 rotate: false - xy: 1304, 334 + xy: 1507, 481 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-16 rotate: false - xy: 1351, 334 + xy: 1554, 481 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-17 rotate: false - xy: 1398, 334 + xy: 1661, 455 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-18 rotate: false - xy: 1249, 275 + xy: 1205, 243 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-19 rotate: false - xy: 1250, 218 + xy: 1252, 243 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-2 rotate: false - xy: 1874, 491 + xy: 1309, 376 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-20 rotate: false - xy: 1250, 161 + xy: 1206, 186 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-21 rotate: false - xy: 1413, 503 + xy: 1206, 129 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-22 rotate: false - xy: 1874, 434 + xy: 1253, 186 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-23 rotate: false - xy: 1981, 426 + xy: 1253, 129 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-24 rotate: false - xy: 1981, 369 + xy: 1209, 72 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-25 rotate: false - xy: 1296, 275 + xy: 1209, 15 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-26 rotate: false - xy: 1297, 218 + xy: 1256, 14 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-27 rotate: false - xy: 1297, 161 + xy: 1300, 193 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-28 rotate: false - xy: 1297, 104 + xy: 1300, 136 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-29 rotate: false - xy: 1297, 47 + xy: 1300, 79 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-3 rotate: false - xy: 1361, 448 + xy: 1356, 376 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-30 rotate: false - xy: 1343, 277 + xy: 1347, 19 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-31 rotate: false - xy: 1390, 277 + xy: 1403, 376 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-32 rotate: false - xy: 1344, 220 + xy: 1394, 19 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-33 rotate: false - xy: 1344, 163 + xy: 1460, 396 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-34 rotate: false - xy: 1344, 106 + xy: 1507, 382 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-35 rotate: false - xy: 1344, 49 + xy: 1554, 382 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-36 rotate: false - xy: 1391, 220 + xy: 1601, 413 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-37 rotate: false - xy: 1391, 163 + xy: 1601, 356 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-38 rotate: false - xy: 1391, 106 + xy: 1648, 398 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-39 rotate: false - xy: 1391, 49 + xy: 1695, 398 size: 45, 55 orig: 45, 55 offset: 0, 0 @@ -4085,7 +4085,7 @@ wizard/experiment-9 index: -1 wizard/talk-angry rotate: false - xy: 1792, 496 + xy: 1710, 497 size: 80, 50 orig: 80, 50 offset: 0, 0 diff --git a/desktop/resources/packed/pack.png b/desktop/resources/packed/pack.png index ca8c3488..157a3ad6 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 cc3b93dc..4196564a 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 eab2bd30..ce4973a2 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/outside_castle.clj b/desktop/src-common/advent/screens/rooms/outside_castle.clj index 75e58b25..475dcdc0 100644 --- a/desktop/src-common/advent/screens/rooms/outside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/outside_castle.clj @@ -339,7 +339,7 @@ steer-sheet (texture! (utils/get-texture "outside-castle/steer.png") :split 50 35) steer-stand (animation 0.2 (for [i [0 0 0 0 0 0 0 0 0 1 0 2 0 1 0 2 0 1 0 2 0 0 0 0 0 0 0 0 0 0 0 0 0 3 3 3 3 3 3 3 3 3 0 0 0 0]] (aget steer-sheet 0 i))) - flies-stand (utils/make-anim "outside-castle/flies.png" [15 15] 0.075 (flatten (repeat 2 [0 1 2 1])))] + flies-stand (utils/make-anim "outside-castle/flies.png" [21 21] 0.075 (flatten (repeat 2 [0 1 2 1])))] (rooms/make :music {:day :town-2 :night :night :sunrise :night} :name "Outside castle" :interactions @@ -428,7 +428,7 @@ :peddler "No, I have no use for it.")))) :stand) - :steer (actions/start-animation screen (assoc (animation->texture screen steer-stand) :x 203 :y 155 :baseline 80 + :steer (actions/start-animation screen (assoc (animation->texture screen steer-stand) :x 203 :y 151 :baseline 80 :label "Angus, the buff bull" :cursor :hand :stand steer-stand @@ -480,7 +480,7 @@ :outside-particles (common/make-outside-particles) :flies (assoc (animation->texture screen flies-stand) :x 201 - :y 175 + :y 178 :label "Flies" :cursor :look :anim flies-stand