diff --git a/desktop/asset-work/georgia/stand.png b/desktop/asset-work/georgia/stand.png index 72f2aa8c..928df803 100644 Binary files a/desktop/asset-work/georgia/stand.png and b/desktop/asset-work/georgia/stand.png differ diff --git a/desktop/asset-work/georgia/stand.pxa/CelData.plist b/desktop/asset-work/georgia/stand.pxa/CelData.plist index 4749afb9..1ff35422 100644 --- a/desktop/asset-work/georgia/stand.pxa/CelData.plist +++ b/desktop/asset-work/georgia/stand.pxa/CelData.plist @@ -14,5 +14,13 @@ duration 1 + + duration + 1 + + + duration + 1 + diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas index 38291ec9..b639c3a7 100644 --- a/desktop/resources/packed/pack.atlas +++ b/desktop/resources/packed/pack.atlas @@ -32,13 +32,6 @@ behindhouse/stick orig: 24, 42 offset: 0, 0 index: -1 -black - rotate: false - xy: 503, 3 - size: 32, 24 - orig: 32, 24 - offset: 0, 0 - index: -1 butterfly rotate: false xy: 414, 348 @@ -111,7 +104,7 @@ cat-tree/cat index: -1 cat-tree/cat-stand rotate: false - xy: 537, 11 + xy: 538, 11 size: 198, 11 orig: 198, 11 offset: 0, 0 @@ -340,11 +333,46 @@ ending-castle/ending-castle2-assets/foreground orig: 344, 109 offset: 0, 0 index: -1 +georgia/kick-1 + rotate: false + xy: 370, 2 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-2 + rotate: false + xy: 412, 2 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-4 + rotate: false + xy: 412, 2 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-3 + rotate: false + xy: 454, 2 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-5 + rotate: false + xy: 496, 2 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 georgia/stand rotate: false - xy: 441, 2 - size: 60, 43 - orig: 60, 43 + xy: 268, 2 + size: 100, 43 + orig: 100, 43 offset: 0, 0 index: -1 held/dot @@ -370,7 +398,7 @@ space/dot index: -1 held/flesh rotate: false - xy: 773, 2 + xy: 774, 2 size: 20, 20 orig: 20, 20 offset: 0, 0 @@ -433,7 +461,7 @@ inside-cafeteria/warriors-stand index: -1 inside-castle/books rotate: false - xy: 737, 3 + xy: 738, 3 size: 34, 19 orig: 34, 19 offset: 0, 0 @@ -447,7 +475,7 @@ inside-castle/hands-fight index: -1 inside-castle/magic rotate: false - xy: 795, 2 + xy: 796, 2 size: 20, 20 orig: 20, 20 offset: 0, 0 @@ -515,13 +543,6 @@ inside-house/safe-screen orig: 200, 75 offset: 0, 0 index: -1 -inside-jail/ball-n-chain - rotate: false - xy: 503, 29 - size: 38, 16 - orig: 38, 16 - offset: 0, 0 - index: -1 inside-jail/chest-top rotate: false xy: 916, 232 @@ -573,7 +594,7 @@ outside-castle/brush-bl index: -1 outside-castle/flies rotate: false - xy: 817, 7 + xy: 818, 7 size: 45, 15 orig: 45, 15 offset: 0, 0 @@ -683,13 +704,6 @@ space/broken-jewel orig: 10, 14 offset: 0, 0 index: -1 -title/banner - rotate: false - xy: 268, 3 - size: 171, 42 - orig: 171, 42 - offset: 0, 0 - index: -1 title/banner-back rotate: false xy: 2, 134 @@ -738,6 +752,13 @@ behindhouse/abc orig: 320, 62 offset: 0, 0 index: -1 +black + rotate: false + xy: 608, 43 + size: 32, 24 + orig: 32, 24 + offset: 0, 0 + index: -1 castle-gate/background rotate: false xy: 2, 311 @@ -941,7 +962,7 @@ ending-castle/guard-1 orig: 27, 56 offset: 0, 0 index: -1 -georgia/kick-1 +georgia/kick-6 rotate: false xy: 634, 892 size: 40, 43 @@ -962,13 +983,6 @@ inside-antique/background orig: 320, 240 offset: 0, 0 index: -1 -inside-antique/shopkeep - rotate: false - xy: 988, 184 - size: 18, 21 - orig: 18, 21 - offset: 0, 0 - index: -1 inside-antique/shopkeep-talk rotate: false xy: 504, 637 @@ -1132,7 +1146,7 @@ talk-bg-2 index: -1 white rotate: false - xy: 608, 43 + xy: 988, 181 size: 32, 24 orig: 32, 24 offset: 0, 0 @@ -1403,287 +1417,357 @@ filter: Nearest,Nearest repeat: none behindhouse/brush rotate: false - xy: 2, 538 + xy: 324, 782 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 behindhouse/fgleft rotate: false - xy: 2, 2 + xy: 324, 4 size: 161, 50 orig: 161, 50 offset: 0, 0 index: -1 +cat-tree/tree-r + rotate: false + xy: 655, 10 + size: 65, 240 + orig: 65, 240 + offset: 0, 0 + index: -1 close rotate: false - xy: 977, 2 + xy: 846, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cursorr rotate: false - xy: 995, 2 + xy: 864, 2 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dawn rotate: false - xy: 646, 780 + xy: 654, 494 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 dream/clouds1 rotate: false - xy: 324, 780 + xy: 2, 252 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 dream/far rotate: false - xy: 333, 54 + xy: 324, 56 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -ego/grow - rotate: false - xy: 884, 258 - size: 90, 36 - orig: 90, 36 - offset: 0, 0 - index: -1 -ego/jump-straight - rotate: false - xy: 333, 4 - size: 90, 48 - orig: 90, 48 - offset: 0, 0 - index: -1 ego/love-16 rotate: false - xy: 968, 950 + xy: 968, 952 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-17 rotate: false - xy: 968, 878 + xy: 968, 880 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-18 rotate: false - xy: 968, 806 + xy: 968, 808 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-19 rotate: false - xy: 968, 734 + xy: 968, 736 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-20 rotate: false - xy: 968, 662 + xy: 968, 379 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-21 rotate: false - xy: 968, 590 + xy: 968, 307 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 -ego/pant +ego/love-22 rotate: false - xy: 587, 16 - size: 62, 36 - orig: 62, 36 + xy: 968, 235 + size: 50, 70 + orig: 50, 70 offset: 0, 0 index: -1 ending-castle/ending-castle2-assets/collision rotate: false - xy: 324, 538 + xy: 2, 10 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -georgia/kick-2 +georgia/kick-10 rotate: false - xy: 842, 251 + xy: 290, 737 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 -georgia/kick-4 +georgia/kick-11 rotate: false - xy: 842, 251 + xy: 654, 737 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-12 + rotate: false + xy: 696, 737 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-13 + rotate: false + xy: 738, 737 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-14 + rotate: false + xy: 780, 737 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-15 + rotate: false + xy: 822, 737 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-16 + rotate: false + xy: 864, 737 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-7 + rotate: false + xy: 164, 737 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-8 + rotate: false + xy: 206, 737 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-9 + rotate: false + xy: 248, 737 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 inside-antique/closed-blinds rotate: false - xy: 2, 296 + xy: 646, 782 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-antique/darken rotate: false - xy: 333, 296 + xy: 332, 540 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-antique/desk rotate: false - xy: 646, 538 + xy: 324, 298 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-castle/Untitled rotate: false - xy: 425, 8 + xy: 2, 736 size: 160, 44 orig: 160, 44 offset: 0, 0 index: -1 inside-castle/door rotate: false - xy: 247, 3 + xy: 569, 5 size: 84, 49 orig: 84, 49 offset: 0, 0 index: -1 inside-house/desk rotate: false - xy: 655, 296 + xy: 646, 252 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 +inside-jail/ball-n-chain + rotate: false + xy: 806, 2 + size: 38, 16 + orig: 38, 16 + offset: 0, 0 + index: -1 inside-jail/bars- rotate: false - xy: 2, 780 + xy: 2, 782 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -outside-castle/blanket +outside-castle/balloons rotate: false - xy: 655, 248 - size: 103, 46 - orig: 103, 46 + xy: 906, 744 + size: 60, 36 + orig: 60, 36 offset: 0, 0 index: -1 -outsidehouse/fence +outside-castle/note rotate: false - xy: 655, 6 - size: 320, 240 - orig: 320, 240 + xy: 882, 2 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +outsidehouse/fg1 + rotate: false + xy: 806, 20 + size: 128, 63 + orig: 128, 63 + offset: 0, 0 + index: -1 +outsidehouse/note + rotate: false + xy: 900, 2 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +pathfind-test + rotate: false + xy: 918, 2 + size: 16, 16 + orig: 16, 16 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-1 + rotate: false + xy: 936, 158 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-2 + rotate: false + xy: 936, 81 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-3 + rotate: false + xy: 722, 4 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-4 + rotate: false + xy: 936, 4 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-stand + rotate: false + xy: 722, 85 + size: 212, 165 + orig: 212, 165 offset: 0, 0 index: -1 title/clouds rotate: false - xy: 2, 54 + xy: 2, 494 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -wizard/experiment-10 - rotate: false - xy: 977, 77 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-11 - rotate: false - xy: 977, 20 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 wizard/experiment-2 rotate: false - xy: 977, 533 + xy: 976, 679 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-3 rotate: false - xy: 977, 476 + xy: 976, 622 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-4 rotate: false - xy: 977, 419 + xy: 976, 565 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-5 rotate: false - xy: 977, 362 + xy: 976, 508 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-6 rotate: false - xy: 977, 305 + xy: 976, 451 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-7 - rotate: false - xy: 977, 248 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-8 - rotate: false - xy: 977, 191 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-9 - rotate: false - xy: 977, 134 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/talk - rotate: false - xy: 760, 248 - size: 80, 46 - orig: 80, 46 - offset: 0, 0 - index: -1 wizard/talk-angry rotate: false - xy: 165, 2 + xy: 487, 4 size: 80, 50 orig: 80, 50 offset: 0, 0 @@ -1696,322 +1780,301 @@ filter: Nearest,Nearest repeat: none behindhouse/fg rotate: false - xy: 2, 782 + xy: 2, 539 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outsidehouse/fg rotate: false - xy: 2, 782 + xy: 2, 539 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 castle-gate/Untitled rotate: false - xy: 2, 19 + xy: 2, 18 size: 192, 35 orig: 192, 35 offset: 0, 0 index: -1 castle-gate/goon-2-search rotate: false - xy: 196, 22 + xy: 196, 21 size: 192, 32 orig: 192, 32 offset: 0, 0 index: -1 +cat-tree/grandma-cry-1 + rotate: false + xy: 963, 9 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 dream/fountain rotate: false - xy: 324, 298 + xy: 646, 539 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outside-jail/fountain rotate: false - xy: 324, 298 + xy: 646, 539 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -ego/love-22 - rotate: false - xy: 968, 952 - size: 50, 70 - orig: 50, 70 - offset: 0, 0 - index: -1 ego/love-23 rotate: false - xy: 968, 880 + xy: 968, 951 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-24 rotate: false - xy: 968, 808 + xy: 968, 879 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-25 rotate: false - xy: 968, 736 + xy: 968, 807 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-26 rotate: false - xy: 968, 664 + xy: 968, 735 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 -goon-2-walk - rotate: false - xy: 790, 20 - size: 168, 34 - orig: 168, 34 - offset: 0, 0 - index: -1 -castle-gate/goon-2-walk - rotate: false - xy: 790, 20 - size: 168, 34 - orig: 168, 34 - offset: 0, 0 - index: -1 inside-antique/antique-sigh rotate: false - xy: 390, 33 + xy: 390, 32 size: 198, 21 orig: 198, 21 offset: 0, 0 index: -1 inside-antique/fg rotate: false - xy: 2, 540 + xy: 324, 781 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-antique/glow rotate: false - xy: 646, 540 + xy: 324, 55 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-antique/portrait rotate: false - xy: 766, 15 + xy: 732, 14 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +inside-antique/shopkeep + rotate: false + xy: 694, 9 + size: 18, 21 + orig: 18, 21 + offset: 0, 0 + index: -1 inside-antique/teddy rotate: false - xy: 802, 2 + xy: 768, 14 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 inside-cafeteria/fg rotate: false - xy: 324, 782 + xy: 2, 297 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-cafeteria/fight rotate: false - xy: 324, 540 + xy: 646, 781 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-cafeteria/glow rotate: false - xy: 324, 56 + xy: 646, 297 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-castle/fight-1 rotate: false - xy: 646, 782 + xy: 2, 55 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-house/flask rotate: false - xy: 694, 10 + xy: 714, 9 size: 16, 21 orig: 16, 21 offset: 0, 0 index: -1 inside-house/glow rotate: false - xy: 646, 298 + xy: 646, 55 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-jail/fg rotate: false - xy: 2, 298 + xy: 324, 539 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -inside-jail/glow +outsidehouse/fence rotate: false - xy: 646, 56 + xy: 2, 781 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -outside-castle/note - rotate: false - xy: 712, 15 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 outsidehouse/foreground rotate: false - xy: 2, 56 + xy: 324, 297 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outsidehouse/lamb-walk rotate: false - xy: 584, 3 + xy: 584, 2 size: 108, 28 orig: 108, 28 offset: 0, 0 index: -1 -outsidehouse/note - rotate: false - xy: 730, 15 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 outsidehouse/sheep-walk rotate: false - xy: 590, 33 + xy: 590, 32 size: 198, 21 orig: 198, 21 offset: 0, 0 index: -1 -pathfind-test - rotate: false - xy: 748, 15 - size: 16, 16 - orig: 16, 16 - offset: 0, 0 - index: -1 save rotate: false - xy: 784, 2 + xy: 750, 14 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 space/bullet rotate: false - xy: 390, 7 + xy: 390, 6 size: 192, 24 orig: 192, 24 offset: 0, 0 index: -1 -title/balloon +title/banner rotate: false - xy: 960, 5 - size: 60, 30 - orig: 60, 30 + xy: 790, 11 + size: 171, 42 + orig: 171, 42 + offset: 0, 0 + index: -1 +wizard/experiment-10 + rotate: false + xy: 968, 507 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-11 + rotate: false + xy: 968, 450 + size: 45, 55 + orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-12 rotate: false - xy: 968, 607 + xy: 968, 393 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-13 rotate: false - xy: 968, 550 + xy: 968, 336 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-14 rotate: false - xy: 968, 493 + xy: 968, 279 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-15 rotate: false - xy: 968, 436 + xy: 968, 222 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-16 rotate: false - xy: 968, 379 + xy: 968, 165 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-17 rotate: false - xy: 968, 322 + xy: 968, 108 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-18 rotate: false - xy: 968, 265 + xy: 968, 51 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-19 +wizard/experiment-7 rotate: false - xy: 968, 208 + xy: 968, 678 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-20 +wizard/experiment-8 rotate: false - xy: 968, 151 + xy: 968, 621 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-21 +wizard/experiment-9 rotate: false - xy: 968, 94 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-22 - rotate: false - xy: 968, 37 + xy: 968, 564 size: 45, 55 orig: 45, 55 offset: 0, 0 @@ -2024,266 +2087,336 @@ filter: Nearest,Nearest repeat: none behindhouse/house rotate: false - xy: 324, 772 + xy: 2, 531 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 +castle-gate/stash-closed + rotate: false + xy: 214, 4 + size: 70, 41 + orig: 70, 41 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-10 + rotate: false + xy: 854, 5 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-11 + rotate: false + xy: 914, 5 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-2 + rotate: false + xy: 374, 5 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-3 + rotate: false + xy: 434, 5 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-4 + rotate: false + xy: 494, 5 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-5 + rotate: false + xy: 554, 5 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-6 + rotate: false + xy: 614, 5 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-7 + rotate: false + xy: 674, 5 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-8 + rotate: false + xy: 734, 5 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-9 + rotate: false + xy: 794, 5 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 cat-tree/inventory rotate: false - xy: 922, 2 + xy: 170, 3 size: 42, 42 orig: 42, 42 offset: 0, 0 index: -1 -cat-tree/owl - rotate: false - xy: 2, 14 - size: 168, 30 - orig: 168, 30 - offset: 0, 0 - index: -1 cat-tree/sillhoute rotate: false - xy: 646, 288 + xy: 652, 47 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 dream/pedestals rotate: false - xy: 324, 46 + xy: 330, 56 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -ego/hold-up-to-window +ego/warden rotate: false - xy: 812, 8 - size: 108, 36 - orig: 108, 36 + xy: 286, 4 + size: 42, 41 + orig: 42, 41 offset: 0, 0 index: -1 -ego/squat +ending-castle/warden-2 rotate: false - xy: 172, 8 - size: 126, 36 - orig: 126, 36 + xy: 330, 4 + size: 42, 41 + orig: 42, 41 offset: 0, 0 index: -1 -ego/stand +georgia/kick-17 rotate: false - xy: 300, 8 - size: 126, 36 - orig: 126, 36 + xy: 2, 2 + size: 40, 43 + orig: 40, 43 offset: 0, 0 index: -1 -ego/thorw +georgia/kick-18 rotate: false - xy: 556, 8 - size: 126, 36 - orig: 126, 36 + xy: 44, 2 + size: 40, 43 + orig: 40, 43 offset: 0, 0 index: -1 -ego/throw +georgia/kick-19 rotate: false - xy: 684, 8 - size: 126, 36 - orig: 126, 36 + xy: 86, 2 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-20 + rotate: false + xy: 128, 2 + size: 40, 43 + orig: 40, 43 offset: 0, 0 index: -1 held/hand rotate: false - xy: 2, 772 + xy: 324, 782 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 held/head rotate: false - xy: 2, 530 + xy: 646, 782 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-antique/open-blinds rotate: false - xy: 324, 288 + xy: 330, 298 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-castle/pedestal-overlay rotate: false - xy: 646, 530 + xy: 652, 289 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -inside-house/sillhoute +inside-jail/glow rotate: false - xy: 646, 46 + xy: 2, 782 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inventory-overlay rotate: false - xy: 324, 530 + xy: 2, 47 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outsidehouse/house rotate: false - xy: 2, 288 + xy: 2, 289 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 space/later rotate: false - xy: 646, 772 + xy: 330, 540 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -space/susp - rotate: false - xy: 428, 8 - size: 126, 36 - orig: 126, 36 - offset: 0, 0 - index: -1 title/logo rotate: false - xy: 2, 46 + xy: 652, 531 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 title/screenshot-backdrop rotate: false - xy: 966, 5 + xy: 968, 984 size: 48, 38 orig: 48, 38 offset: 0, 0 index: -1 +title/screenshot-backdrop-active + rotate: false + xy: 968, 944 + size: 48, 38 + orig: 48, 38 + offset: 0, 0 + index: -1 +wizard/experiment-19 + rotate: false + xy: 968, 887 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-20 + rotate: false + xy: 968, 830 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-21 + rotate: false + xy: 968, 773 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-22 + rotate: false + xy: 974, 716 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 wizard/experiment-23 rotate: false - xy: 968, 957 + xy: 974, 659 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-24 rotate: false - xy: 968, 900 + xy: 974, 602 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-25 rotate: false - xy: 968, 843 + xy: 974, 545 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-26 rotate: false - xy: 968, 786 + xy: 974, 488 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-27 rotate: false - xy: 968, 729 + xy: 974, 431 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-28 rotate: false - xy: 968, 672 + xy: 974, 374 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-29 rotate: false - xy: 968, 615 + xy: 974, 317 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-30 rotate: false - xy: 968, 558 + xy: 974, 260 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-31 rotate: false - xy: 968, 501 + xy: 974, 203 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-32 rotate: false - xy: 968, 444 + xy: 974, 146 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-33 rotate: false - xy: 968, 387 + xy: 974, 89 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-34 rotate: false - xy: 968, 330 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-35 - rotate: false - xy: 968, 273 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-36 - rotate: false - xy: 968, 216 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-37 - rotate: false - xy: 968, 159 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-38 - rotate: false - xy: 968, 102 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-39 - rotate: false - xy: 968, 45 + xy: 974, 32 size: 45, 55 orig: 45, 55 offset: 0, 0 @@ -2296,326 +2429,312 @@ filter: Nearest,Nearest repeat: none castle-gate/goon-2-talk rotate: false - xy: 531, 264 + xy: 990, 528 size: 24, 32 orig: 24, 32 offset: 0, 0 index: -1 castle-gate/throw-walkie-1 rotate: false - xy: 2, 160 + xy: 449, 402 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-2 rotate: false - xy: 324, 402 + xy: 646, 886 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-3 rotate: false - xy: 646, 719 + xy: 646, 748 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-4 rotate: false - xy: 2, 22 + xy: 656, 268 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-5 rotate: false - xy: 646, 581 + xy: 324, 235 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-6 rotate: false - xy: 324, 264 + xy: 324, 97 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-7 rotate: false - xy: 317, 126 + xy: 647, 130 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 -castle-gate/throw-walkie-8 - rotate: false - xy: 646, 443 - size: 205, 136 - orig: 205, 136 - offset: 0, 0 - index: -1 -castle-gate/throw-walkie-9 - rotate: false - xy: 598, 305 - size: 205, 136 - orig: 205, 136 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-1 - rotate: false - xy: 956, 186 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-10 - rotate: false - xy: 961, 647 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-11 - rotate: false - xy: 961, 605 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 cat-tree/grandma-cry-12 rotate: false - xy: 961, 563 + xy: 281, 14 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-13 rotate: false - xy: 961, 521 + xy: 961, 882 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-14 rotate: false - xy: 961, 479 + xy: 961, 840 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-15 rotate: false - xy: 961, 437 + xy: 961, 798 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-16 rotate: false - xy: 961, 395 + xy: 962, 167 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 -cat-tree/grandma-cry-2 +cat-tree/grandma-cry-17 rotate: false - xy: 780, 19 + xy: 962, 125 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 -cat-tree/grandma-cry-3 +cat-tree/grandma-cry-18 rotate: false - xy: 956, 144 + xy: 962, 83 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 -cat-tree/grandma-cry-4 +cat-tree/owl rotate: false - xy: 956, 102 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-5 - rotate: false - xy: 956, 60 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-6 - rotate: false - xy: 961, 815 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-7 - rotate: false - xy: 961, 773 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-8 - rotate: false - xy: 961, 731 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-9 - rotate: false - xy: 961, 689 - size: 58, 40 - orig: 58, 40 + xy: 853, 956 + size: 168, 30 + orig: 168, 30 offset: 0, 0 index: -1 cat-tree/tree-and-rock rotate: false - xy: 324, 782 + xy: 2, 56 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -cat-tree/tree-r +dream/broom rotate: false - xy: 531, 298 - size: 65, 240 - orig: 65, 240 + xy: 324, 472 + size: 15, 66 + orig: 15, 66 + offset: 0, 0 + index: -1 +dream/cliff + rotate: false + xy: 341, 8 + size: 81, 87 + orig: 81, 87 offset: 0, 0 index: -1 dream/corner-l rotate: false - xy: 607, 12 + xy: 521, 5 size: 112, 59 orig: 112, 59 offset: 0, 0 index: -1 +dream/shovel + rotate: false + xy: 500, 31 + size: 19, 64 + orig: 19, 64 + offset: 0, 0 + index: -1 dream/sky rotate: false - xy: 2, 782 + xy: 2, 540 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 +dream/sword + rotate: false + xy: 324, 432 + size: 15, 38 + orig: 15, 38 + offset: 0, 0 + index: -1 ego/frog rotate: false - xy: 598, 267 + xy: 990, 562 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 -ego/georgia +ego/jump-straight rotate: false - xy: 317, 25 - size: 90, 30 - orig: 90, 30 + xy: 2, 6 + size: 90, 48 + orig: 90, 48 offset: 0, 0 index: -1 -ego/reach +ego/pant rotate: false - xy: 409, 19 - size: 72, 36 - orig: 72, 36 + xy: 959, 4 + size: 62, 36 + orig: 62, 36 + offset: 0, 0 + index: -1 +ego/squat + rotate: false + xy: 646, 543 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +ego/stand + rotate: false + xy: 853, 751 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +ego/thorw + rotate: false + xy: 715, 92 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +ego/throw + rotate: false + xy: 831, 4 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +ending-castle/crowd-left + rotate: false + xy: 656, 406 + size: 116, 135 + orig: 116, 135 offset: 0, 0 index: -1 ending-castle/frankie-fall-1 rotate: false - xy: 968, 857 + xy: 970, 600 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-2 rotate: false - xy: 961, 358 + xy: 971, 266 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 -georgia/kick-10 +ending-castle/frankie-fall-3 rotate: false - xy: 805, 308 - size: 40, 43 - orig: 40, 43 + xy: 982, 229 + size: 40, 35 + orig: 40, 35 offset: 0, 0 index: -1 -georgia/kick-3 +ending-castle/frankie-fall-4 rotate: false - xy: 598, 495 - size: 40, 43 - orig: 40, 43 + xy: 962, 46 + size: 40, 35 + orig: 40, 35 offset: 0, 0 index: -1 -georgia/kick-5 +goon-2-walk rotate: false - xy: 805, 398 - size: 40, 43 - orig: 40, 43 + xy: 853, 988 + size: 168, 34 + orig: 168, 34 offset: 0, 0 index: -1 -georgia/kick-6 +castle-gate/goon-2-walk rotate: false - xy: 968, 939 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-7 - rotate: false - xy: 598, 450 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-8 - rotate: false - xy: 805, 353 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-9 - rotate: false - xy: 968, 894 - size: 40, 43 - orig: 40, 43 + xy: 853, 988 + size: 168, 34 + orig: 168, 34 offset: 0, 0 index: -1 held/bloodclot-head-1 rotate: false - xy: 491, 13 + xy: 531, 318 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 -inside-cafeteria/hands-fight-2 +held/bloodclot-head-2 rotate: false - xy: 209, 23 - size: 106, 106 - orig: 106, 106 + xy: 531, 234 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-3 + rotate: false + xy: 531, 150 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-4 + rotate: false + xy: 531, 66 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-5 + rotate: false + xy: 715, 8 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +inside-cafeteria/ladder-guard + rotate: false + xy: 424, 8 + size: 74, 87 + orig: 74, 87 offset: 0, 0 index: -1 inside-cafeteria/warriors rotate: false - xy: 956, 228 + xy: 647, 2 size: 66, 126 orig: 66, 126 offset: 0, 0 index: -1 -inside-castle/roof - rotate: false - xy: 721, 2 - size: 57, 57 - orig: 57, 57 - offset: 0, 0 - index: -1 inside-castle/way-back-tree rotate: false xy: 324, 540 @@ -2623,137 +2742,158 @@ inside-castle/way-back-tree orig: 320, 240 offset: 0, 0 index: -1 -outside-castle/balloons +inside-house/sillhoute rotate: false - xy: 956, 22 - size: 60, 36 - orig: 60, 36 - offset: 0, 0 - index: -1 -outside-castle/walk-behind - rotate: false - xy: 2, 298 + xy: 2, 782 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -outside-jail/guard-sleep +outside-castle/blanket rotate: false - xy: 317, 57 - size: 172, 67 - orig: 172, 67 + xy: 94, 8 + size: 103, 46 + orig: 103, 46 offset: 0, 0 index: -1 -outsidehouse/fg1 +outside-castle/walk-behind rotate: false - xy: 632, 73 - size: 128, 63 - orig: 128, 63 + xy: 324, 782 + size: 320, 240 + orig: 320, 240 offset: 0, 0 index: -1 space/Blergh rotate: false - xy: 860, 857 + xy: 341, 373 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-flex rotate: false - xy: 853, 690 + xy: 646, 581 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-stand rotate: false - xy: 853, 690 + xy: 646, 581 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-talk rotate: false - xy: 209, 131 + xy: 754, 581 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-1 rotate: false - xy: 853, 523 + xy: 853, 789 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-2 rotate: false - xy: 853, 356 + xy: 774, 414 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-3 rotate: false - xy: 524, 97 + xy: 862, 584 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-4 rotate: false - xy: 632, 138 + xy: 863, 247 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-5 rotate: false - xy: 740, 138 + xy: 882, 417 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-6 rotate: false - xy: 848, 189 + xy: 854, 42 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 -space/bloodclot-explode-7 +space/susp rotate: false - xy: 848, 22 - size: 106, 165 - orig: 106, 165 + xy: 854, 209 + size: 126, 36 + orig: 126, 36 offset: 0, 0 index: -1 -space/bloodclot-head-talk-1 +talk-bg rotate: false - xy: 762, 61 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-stand - rotate: false - xy: 646, 857 - size: 212, 165 - orig: 212, 165 + xy: 981, 756 + size: 40, 40 + orig: 40, 40 offset: 0, 0 index: -1 the-end rotate: false - xy: 2, 540 + xy: 2, 298 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -title/screenshot-backdrop-active +title/balloon rotate: false - xy: 968, 984 - size: 48, 38 - orig: 48, 38 + xy: 961, 924 + size: 60, 30 + orig: 60, 30 + offset: 0, 0 + index: -1 +wizard/experiment-35 + rotate: false + xy: 970, 694 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-36 + rotate: false + xy: 970, 637 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-37 + rotate: false + xy: 971, 360 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-38 + rotate: false + xy: 971, 303 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/talk + rotate: false + xy: 199, 8 + size: 80, 46 + orig: 80, 46 offset: 0, 0 index: -1 @@ -2762,584 +2902,444 @@ size: 1024,1024 format: RGBA8888 filter: Nearest,Nearest repeat: none -castle-gate/stash-closed +castle-gate/throw-walkie-8 rotate: false - xy: 326, 425 - size: 70, 41 - orig: 70, 41 + xy: 2, 877 + size: 205, 136 + orig: 205, 136 offset: 0, 0 index: -1 -cat-tree/grandma-cry-17 +castle-gate/throw-walkie-9 rotate: false - xy: 502, 232 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-18 - rotate: false - xy: 502, 190 - size: 58, 40 - orig: 58, 40 + xy: 2, 739 + size: 205, 136 + orig: 205, 136 offset: 0, 0 index: -1 cat-tree/grandma-cry-19 rotate: false - xy: 570, 479 + xy: 897, 729 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-20 rotate: false - xy: 570, 437 + xy: 332, 43 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 -dream/broom - rotate: false - xy: 744, 835 - size: 15, 66 - orig: 15, 66 - offset: 0, 0 - index: -1 -dream/cliff - rotate: false - xy: 226, 59 - size: 81, 87 - orig: 81, 87 - offset: 0, 0 - index: -1 dream/corner-r rotate: false - xy: 402, 505 + xy: 218, 45 size: 112, 59 orig: 112, 59 offset: 0, 0 index: -1 -dream/shovel +ego/georgia rotate: false - xy: 998, 943 - size: 19, 64 - orig: 19, 64 + xy: 639, 732 + size: 90, 30 + orig: 90, 30 offset: 0, 0 index: -1 -dream/sword +ego/grow rotate: false - xy: 626, 724 - size: 15, 38 - orig: 15, 38 + xy: 731, 726 + size: 90, 36 + orig: 90, 36 + offset: 0, 0 + index: -1 +ego/hold-up-to-window + rotate: false + xy: 434, 618 + size: 108, 36 + orig: 108, 36 + offset: 0, 0 + index: -1 +ego/reach + rotate: false + xy: 823, 726 + size: 72, 36 + orig: 72, 36 offset: 0, 0 index: -1 ego/scared rotate: false - xy: 110, 9 + xy: 334, 85 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 ego/spear rotate: false - xy: 110, 131 + xy: 326, 530 size: 90, 100 orig: 90, 100 offset: 0, 0 index: -1 -ego/warden - rotate: false - xy: 766, 882 - size: 42, 41 - orig: 42, 41 - offset: 0, 0 - index: -1 -ending-castle/crowd-left - rotate: false - xy: 542, 872 - size: 116, 135 - orig: 116, 135 - offset: 0, 0 - index: -1 ending-castle/frankie-fall-10 rotate: false - xy: 626, 675 + xy: 586, 628 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-11 rotate: false - xy: 668, 675 + xy: 586, 591 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-12 rotate: false - xy: 634, 638 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -ending-castle/frankie-fall-3 - rotate: false - xy: 562, 188 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -ending-castle/frankie-fall-4 - rotate: false - xy: 938, 888 + xy: 586, 554 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-5 rotate: false - xy: 761, 845 + xy: 176, 34 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-6 rotate: false - xy: 803, 845 + xy: 544, 618 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-7 rotate: false - xy: 845, 843 + xy: 965, 862 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-8 rotate: false - xy: 643, 712 + xy: 218, 8 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-9 rotate: false - xy: 685, 712 + xy: 260, 8 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 -ending-castle/warden-2 - rotate: false - xy: 810, 882 - size: 42, 41 - orig: 42, 41 - offset: 0, 0 - index: -1 -georgia/kick-11 - rotate: false - xy: 184, 2 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-12 - rotate: false - xy: 226, 14 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-13 - rotate: false - xy: 268, 14 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-14 - rotate: false - xy: 586, 392 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-15 - rotate: false - xy: 586, 347 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-16 - rotate: false - xy: 579, 302 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-17 - rotate: false - xy: 318, 149 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-18 - rotate: false - xy: 360, 149 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-19 - rotate: false - xy: 562, 225 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-20 - rotate: false - xy: 854, 880 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -held/bloodclot-head-2 - rotate: false - xy: 766, 925 - size: 114, 82 - orig: 114, 82 - offset: 0, 0 - index: -1 -held/bloodclot-head-3 - rotate: false - xy: 882, 925 - size: 114, 82 - orig: 114, 82 - offset: 0, 0 - index: -1 -held/bloodclot-head-4 - rotate: false - xy: 218, 316 - size: 114, 82 - orig: 114, 82 - offset: 0, 0 - index: -1 -held/bloodclot-head-5 - rotate: false - xy: 218, 232 - size: 114, 82 - orig: 114, 82 - offset: 0, 0 - index: -1 held/bloodclot-head-6 rotate: false - xy: 434, 650 + xy: 639, 764 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-7 rotate: false - xy: 434, 566 + xy: 755, 764 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-8 rotate: false - xy: 202, 148 + xy: 218, 106 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-9 rotate: false - xy: 110, 47 + xy: 434, 656 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 +inside-cafeteria/hands-fight-2 + rotate: false + xy: 209, 740 + size: 106, 106 + orig: 106, 106 + offset: 0, 0 + index: -1 inside-cafeteria/hands-fight-3 rotate: false - xy: 110, 233 + xy: 317, 740 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-4 rotate: false - xy: 218, 400 + xy: 218, 298 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-5 rotate: false - xy: 326, 567 + xy: 425, 740 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-6 rotate: false - xy: 434, 734 + xy: 326, 632 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-7 rotate: false - xy: 542, 764 + xy: 218, 190 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/knights rotate: false - xy: 326, 468 + xy: 326, 431 size: 74, 97 orig: 74, 97 offset: 0, 0 index: -1 -inside-cafeteria/ladder-guard - rotate: false - xy: 550, 675 - size: 74, 87 - orig: 74, 87 - offset: 0, 0 - index: -1 inside-castle/hands-1 rotate: false - xy: 660, 903 + xy: 533, 742 size: 104, 104 orig: 104, 104 offset: 0, 0 index: -1 +inside-castle/roof + rotate: false + xy: 965, 956 + size: 57, 57 + orig: 57, 57 + offset: 0, 0 + index: -1 +outside-jail/guard-sleep + rotate: false + xy: 2, 2 + size: 172, 67 + orig: 172, 67 + offset: 0, 0 + index: -1 outsidehouse/fgtest rotate: false - xy: 502, 274 + xy: 802, 649 size: 75, 75 orig: 75, 75 offset: 0, 0 index: -1 space/bloodclot-explode-10 rotate: false - xy: 110, 842 + xy: 2, 405 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-11 rotate: false - xy: 2, 508 + xy: 425, 848 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-12 rotate: false - xy: 110, 675 + xy: 2, 238 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-13 rotate: false - xy: 218, 842 + xy: 533, 848 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-14 rotate: false - xy: 2, 341 + xy: 2, 71 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-15 rotate: false - xy: 110, 508 + xy: 641, 848 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-16 rotate: false - xy: 218, 675 + xy: 749, 848 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-17 rotate: false - xy: 326, 842 + xy: 857, 848 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-18 rotate: false - xy: 2, 174 + xy: 110, 572 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-19 rotate: false - xy: 110, 341 + xy: 110, 405 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-20 rotate: false - xy: 218, 508 + xy: 110, 238 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-21 rotate: false - xy: 326, 675 + xy: 110, 71 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-22 rotate: false - xy: 434, 842 + xy: 218, 573 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-23 rotate: false - xy: 2, 7 + xy: 218, 406 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-7 + rotate: false + xy: 209, 848 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-8 rotate: false - xy: 2, 842 + xy: 2, 572 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-9 rotate: false - xy: 2, 675 + xy: 317, 848 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-head-talk-10 rotate: false - xy: 418, 274 + xy: 334, 123 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-11 rotate: false - xy: 334, 194 + xy: 418, 541 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-12 rotate: false - xy: 418, 197 + xy: 502, 541 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-13 rotate: false - xy: 486, 428 + xy: 634, 655 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-14 rotate: false - xy: 502, 351 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-2 - rotate: false - xy: 550, 598 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-3 - rotate: false - xy: 402, 428 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-4 - rotate: false - xy: 550, 521 + xy: 718, 649 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-5 rotate: false - xy: 660, 826 + xy: 871, 771 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-6 rotate: false - xy: 650, 749 + xy: 550, 665 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-7 rotate: false - xy: 334, 348 + xy: 326, 354 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-8 rotate: false - xy: 334, 271 + xy: 326, 277 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-9 rotate: false - xy: 418, 351 + xy: 326, 200 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 -talk-bg - rotate: false - xy: 896, 883 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 wizard/cloud rotate: false - xy: 579, 270 + xy: 176, 2 size: 40, 30 orig: 40, 30 offset: 0, 0 index: -1 +wizard/experiment-39 + rotate: false + xy: 965, 899 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 diff --git a/desktop/resources/packed/pack.png b/desktop/resources/packed/pack.png index fcaa85ec..ff31038e 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 22c27984..7cab553e 100644 Binary files a/desktop/resources/packed/pack2.png and b/desktop/resources/packed/pack2.png differ diff --git a/desktop/resources/packed/pack4.png b/desktop/resources/packed/pack4.png index 6a4a4667..3412b4a5 100644 Binary files a/desktop/resources/packed/pack4.png and b/desktop/resources/packed/pack4.png differ diff --git a/desktop/resources/packed/pack5.png b/desktop/resources/packed/pack5.png index 938ac13d..b0be28b8 100644 Binary files a/desktop/resources/packed/pack5.png and b/desktop/resources/packed/pack5.png differ diff --git a/desktop/resources/packed/pack6.png b/desktop/resources/packed/pack6.png index 99c27a9c..07c7ad54 100644 Binary files a/desktop/resources/packed/pack6.png and b/desktop/resources/packed/pack6.png differ diff --git a/desktop/resources/packed/pack7.png b/desktop/resources/packed/pack7.png index e60d2bb5..4f2e4668 100644 Binary files a/desktop/resources/packed/pack7.png and b/desktop/resources/packed/pack7.png differ diff --git a/desktop/resources/packed/pack8.png b/desktop/resources/packed/pack8.png index 37084751..63112177 100644 Binary files a/desktop/resources/packed/pack8.png and b/desktop/resources/packed/pack8.png differ diff --git a/desktop/src-common/advent/screens/rooms/common.clj b/desktop/src-common/advent/screens/rooms/common.clj index 0c22d9c0..c24df444 100644 --- a/desktop/src-common/advent/screens/rooms/common.clj +++ b/desktop/src-common/advent/screens/rooms/common.clj @@ -550,6 +550,7 @@ (actions/walk-straight-to entities :georgia [131 40] :anim :stand :speed 1.0) (actions/play-animation entities :frankie :fall :stop? false) (actions/do-dialogue entities :georgia "Let's go, Sir Hunk.") + (actions/play-animation entities :georgia :hand-hold :stop? false) (fade-out entities) (on-gl (set-screen! @(resolve 'advent.core/advent) @(resolve 'advent.screens.credits/credits)))) diff --git a/desktop/src-common/advent/screens/rooms/ending.clj b/desktop/src-common/advent/screens/rooms/ending.clj index b4a904a5..fa64de77 100644 --- a/desktop/src-common/advent/screens/rooms/ending.clj +++ b/desktop/src-common/advent/screens/rooms/ending.clj @@ -37,6 +37,7 @@ duke-knight (utils/make-anim "ending-castle/duke.png" [40 48] 0.23 [8 9 10 9 8]) georgia-stand (utils/make-anim "georgia/stand.png" [20 43] 0.2 (flatten [(repeat 20 0) 1 (repeat 10 0) 1])) + georgia-hand-hold (utils/make-anim "georgia/stand.png" [20 43] 0.2 (flatten [(repeat 3 0) 3 4])) georgia-talk (utils/make-anim "georgia/stand.png" [20 43] 0.2 (flatten [0 2 0 2 0 1 0 0 2])) georgia-kick (utils/make-anim-seq "georgia/kick" [40 43] 0.1 (flatten [(repeat 10 0) (repeat 7 1) (repeat 7 2) 3 4 5 6 7 8 9 10 11 12 13 (repeat 10 14) @@ -62,7 +63,9 @@ :stand georgia-stand :talk georgia-talk :kick georgia-kick + :hand-hold georgia-hand-hold :anim-merges {georgia-stand {:origin-x 10 :origin-y 1} + :default {:origin-x 10 :origin-y 1} georgia-kick {:origin-x 19 :origin-y 0}})) :entities {:peddler (assoc (animation->texture screen peddler-stand) :x 245 :y 46 :baseline 200