diff --git a/desktop/project.clj b/desktop/project.clj index 0fb99ca0..b01b19f5 100644 --- a/desktop/project.clj +++ b/desktop/project.clj @@ -20,6 +20,7 @@ :source-paths ["src" "src-common"] :javac-options ["-target" "1.7" "-source" "1.7" "-Xlint:-options"] :omit-source true + :aliases {"pack" ["run" "-m" "com.badlogic.gdx.tools.texturepacker.TexturePacker" "asset-work/" "resources/packed/"]} :aot [advent.core.desktop-launcher] :main advent.core.desktop-launcher) diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas index 111a39db..97f5652e 100644 --- a/desktop/resources/packed/pack.atlas +++ b/desktop/resources/packed/pack.atlas @@ -6,217 +6,196 @@ filter: Nearest,Nearest repeat: none behindhouse/abc rotate: false - xy: 516, 902 + xy: 3666, 3545 size: 320, 62 orig: 320, 62 offset: 0, 0 index: -1 behindhouse/background rotate: false - xy: 516, 1450 + xy: 2, 787 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 behindhouse/brush rotate: false - xy: 3498, 3175 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -behindhouse/collision - rotate: false - xy: 1626, 2438 + xy: 1008, 1410 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 behindhouse/fg rotate: false - xy: 1989, 1990 + xy: 1128, 1706 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outsidehouse/fg rotate: false - xy: 1989, 1990 + xy: 1128, 1706 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 behindhouse/fg2 rotate: false - xy: 838, 1330 + xy: 324, 667 size: 183, 360 orig: 183, 360 offset: 0, 0 index: -1 behindhouse/fgleft rotate: false - xy: 1132, 708 + xy: 1690, 3593 size: 161, 50 orig: 161, 50 offset: 0, 0 index: -1 behindhouse/house rotate: false - xy: 1989, 1748 + xy: 1652, 980 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 behindhouse/house-cover rotate: false - xy: 2034, 3756 - size: 20, 21 - orig: 20, 21 - offset: 0, 0 - index: -1 -behindhouse/house-cover copy - rotate: false - xy: 1860, 3128 + xy: 1660, 3557 size: 20, 21 orig: 20, 21 offset: 0, 0 index: -1 behindhouse/stick rotate: false - xy: 690, 414 + xy: 1998, 3673 size: 24, 42 orig: 24, 42 offset: 0, 0 index: -1 bg rotate: false - xy: 516, 2088 + xy: 2, 1833 size: 480, 270 orig: 480, 270 offset: 0, 0 index: -1 bg2 rotate: false - xy: 2, 182 + xy: 2, 1437 size: 360, 202 orig: 360, 202 offset: 0, 0 index: -1 bg3 rotate: false - xy: 1542, 3541 + xy: 2, 1233 size: 360, 202 orig: 360, 202 offset: 0, 0 index: -1 bg4 rotate: false - xy: 516, 1692 + xy: 2, 1029 size: 360, 202 orig: 360, 202 offset: 0, 0 index: -1 bg5 rotate: false - xy: 3176, 3205 + xy: 654, 895 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 black rotate: false - xy: 3277, 2207 + xy: 3328, 3535 size: 32, 24 orig: 32, 24 offset: 0, 0 index: -1 butterfly rotate: false - xy: 1888, 3532 + xy: 827, 2 size: 14, 7 orig: 14, 7 offset: 0, 0 index: -1 castle-gate/Untitled rotate: false - xy: 1132, 587 + xy: 2323, 256 size: 192, 35 orig: 192, 35 offset: 0, 0 index: -1 castle-gate/background rotate: false - xy: 516, 1208 + xy: 2, 545 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 castle-gate/coinflip rotate: false - xy: 758, 673 + xy: 1228, 2904 size: 50, 10 orig: 50, 10 offset: 0, 0 index: -1 -castle-gate/collision - rotate: false - xy: 1704, 2680 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 castle-gate/frankie rotate: false - xy: 1560, 3151 + xy: 646, 374 size: 312, 35 orig: 312, 35 offset: 0, 0 index: -1 castle-gate/goon-1 rotate: false - xy: 1948, 2458 + xy: 1998, 3638 size: 24, 33 orig: 24, 33 offset: 0, 0 index: -1 castle-gate/goon-2 rotate: false - xy: 666, 72 + xy: 1957, 3593 size: 24, 32 orig: 24, 32 offset: 0, 0 index: -1 castle-gate/goon-2-flip rotate: false - xy: 3912, 3184 + xy: 1934, 183 size: 48, 32 orig: 48, 32 offset: 0, 0 index: -1 castle-gate/goon-2-search rotate: false - xy: 758, 570 + xy: 1484, 182 size: 192, 32 orig: 192, 32 offset: 0, 0 index: -1 castle-gate/goon-2-talk rotate: false - xy: 3132, 2848 + xy: 2463, 192 size: 24, 32 orig: 24, 32 offset: 0, 0 index: -1 castle-gate/overlay rotate: false - xy: 2992, 2717 + xy: 2346, 3597 size: 138, 239 orig: 138, 239 offset: 0, 0 index: -1 castle-gate/stash-closed rotate: false - xy: 1912, 1350 + xy: 3916, 3864 size: 70, 41 orig: 70, 41 offset: 0, 0 @@ -230,63 +209,119 @@ castle-gate/throw-walkie index: -1 cat-tree/Untitled rotate: false - xy: 1948, 2438 + xy: 364, 1621 size: 28, 18 orig: 28, 18 offset: 0, 0 index: -1 cat-tree/pounce rotate: false - xy: 1948, 2438 + xy: 364, 1621 size: 28, 18 orig: 28, 18 offset: 0, 0 index: -1 cat-tree/background rotate: false - xy: 516, 966 + xy: 2, 303 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 cat-tree/brush-l rotate: false - xy: 604, 530 + xy: 1730, 3645 size: 152, 70 orig: 152, 70 offset: 0, 0 index: -1 cat-tree/cat rotate: false - xy: 1962, 2922 + xy: 3916, 3851 size: 22, 11 orig: 22, 11 offset: 0, 0 index: -1 cat-tree/cat-stand rotate: false - xy: 1028, 2909 + xy: 1028, 2903 size: 198, 11 orig: 198, 11 offset: 0, 0 index: -1 -cat-tree/collision - rotate: false - xy: 2026, 2716 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 cat-tree/destroy-ladder rotate: false - xy: 1904, 3694 + xy: 2056, 3861 size: 522, 38 orig: 522, 38 offset: 0, 0 index: -1 +cat-tree/dot + rotate: false + xy: 1660, 3508 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +ego/dot + rotate: false + xy: 1660, 3508 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +inside-antique/dot + rotate: false + xy: 1660, 3508 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +inside-house/dot + rotate: false + xy: 1660, 3508 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +inside-jail/dot + rotate: false + xy: 1660, 3508 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +outsidehouse/dot + rotate: false + xy: 1660, 3508 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +title/dot + rotate: false + xy: 1660, 3508 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +dream/dot + rotate: false + xy: 1660, 3508 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +wizard/dot + rotate: false + xy: 1660, 3508 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 cat-tree/grandma rotate: false - xy: 878, 1748 + xy: 1290, 216 size: 275, 36 orig: 275, 36 offset: 0, 0 @@ -300,476 +335,343 @@ cat-tree/grandma-cry index: -1 cat-tree/inventory rotate: false - xy: 3928, 3327 + xy: 905, 34 size: 42, 42 orig: 42, 42 offset: 0, 0 index: -1 cat-tree/monocle rotate: false - xy: 1912, 1303 + xy: 767, 2 size: 28, 7 orig: 28, 7 offset: 0, 0 index: -1 cat-tree/owl rotate: false - xy: 3332, 2691 + xy: 2335, 226 size: 152, 28 orig: 152, 28 offset: 0, 0 index: -1 cat-tree/sillhoute rotate: false - xy: 2633, 1264 + xy: 2296, 1222 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 cat-tree/tree-and-rock rotate: false - xy: 1160, 1103 + xy: 1290, 254 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 cat-tree/tree-r rotate: false - xy: 3814, 2691 + xy: 2256, 254 size: 65, 240 orig: 65, 240 offset: 0, 0 index: -1 close rotate: false - xy: 1542, 3374 + xy: 746, 113 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 cloud rotate: false - xy: 1132, 829 - size: 15, 15 - orig: 15, 15 - offset: 0, 0 - index: -1 -space/cloud - rotate: false - xy: 1132, 829 + xy: 1282, 2432 size: 15, 15 orig: 15, 15 offset: 0, 0 index: -1 cloudy rotate: false - xy: 2034, 3734 + xy: 591, 673 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 -dream/cloudy - rotate: false - xy: 2034, 3734 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -cursor - rotate: false - xy: 2, 2360 - size: 1024, 16 - orig: 1024, 16 - offset: 0, 0 - index: -1 -cursor_light - rotate: false - xy: 1028, 3827 - size: 1024, 16 - orig: 1024, 16 - offset: 0, 0 - index: -1 cursorr rotate: false - xy: 1542, 3356 + xy: 1934, 165 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 dawn rotate: false - xy: 1667, 2196 + xy: 968, 200 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -dot - rotate: false - xy: 1020, 1745 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 -dream/dot - rotate: false - xy: 1020, 1745 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 -cat-tree/dot - rotate: false - xy: 1020, 1745 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 -wizard/dot - rotate: false - xy: 1020, 1745 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 -inside-antique/dot - rotate: false - xy: 1020, 1745 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 -title/dot - rotate: false - xy: 1020, 1745 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 -inside-jail/dot - rotate: false - xy: 1020, 1745 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 -ego/dot - rotate: false - xy: 1020, 1745 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 -outsidehouse/dot - rotate: false - xy: 1020, 1745 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 -inside-house/dot - rotate: false - xy: 1020, 1745 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 dream/background rotate: false - xy: 1382, 2680 + xy: 2, 61 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 dream/broom rotate: false - xy: 4079, 4028 + xy: 3971, 4028 size: 15, 66 orig: 15, 66 offset: 0, 0 index: -1 dream/case rotate: false - xy: 1972, 2156 + xy: 3971, 3988 size: 15, 38 orig: 15, 38 offset: 0, 0 index: -1 dream/cliff rotate: false - xy: 3820, 3059 + xy: 1678, 3170 size: 81, 87 orig: 81, 87 offset: 0, 0 index: -1 dream/clouds1 rotate: false - xy: 3492, 2691 + xy: 646, 411 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 dream/clouds2 rotate: false - xy: 1304, 2438 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -dream/collision - rotate: false - xy: 2348, 2716 + xy: 976, 684 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 dream/corner-l rotate: false - xy: 1864, 1968 + xy: 732, 2150 size: 112, 59 orig: 112, 59 offset: 0, 0 index: -1 dream/corner-r rotate: false - xy: 1804, 1242 + xy: 1884, 3656 size: 112, 59 orig: 112, 59 offset: 0, 0 index: -1 dream/fairy-godfather rotate: false - xy: 2, 602 + xy: 1028, 2988 size: 567, 77 orig: 567, 77 offset: 0, 0 index: -1 dream/fountain rotate: false - xy: 3599, 1723 + xy: 1330, 980 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outside-jail/fountain rotate: false - xy: 3599, 1723 + xy: 1330, 980 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 dream/island rotate: false - xy: 1570, 3009 + xy: 976, 1040 size: 30, 20 orig: 30, 20 offset: 0, 0 index: -1 dream/pedestals rotate: false - xy: 3277, 1481 + xy: 2296, 1464 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 dream/plaque1 rotate: false - xy: 1122, 591 + xy: 3656, 3809 size: 8, 11 orig: 8, 11 offset: 0, 0 index: -1 dream/plaque2 rotate: false - xy: 878, 1692 + xy: 806, 1621 size: 10, 6 orig: 10, 6 offset: 0, 0 index: -1 dream/plaque3 rotate: false - xy: 2016, 2620 + xy: 3940, 3851 size: 8, 11 orig: 8, 11 offset: 0, 0 index: -1 -dream/scale - rotate: false - xy: 3599, 1481 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 dream/shovel rotate: false - xy: 1225, 1356 + xy: 1298, 860 size: 19, 64 orig: 19, 64 offset: 0, 0 index: -1 dream/sign rotate: false - xy: 1306, 769 + xy: 910, 122 size: 41, 58 orig: 41, 58 offset: 0, 0 index: -1 dream/sword rotate: false - xy: 4079, 3988 + xy: 951, 194 size: 15, 38 orig: 15, 38 offset: 0, 0 index: -1 ego/Untitled rotate: false - xy: 634, 386 + xy: 1630, 2919 size: 54, 70 orig: 54, 70 offset: 0, 0 index: -1 ego/axe rotate: false - xy: 1904, 3574 + xy: 324, 111 size: 420, 70 orig: 420, 70 offset: 0, 0 index: -1 ego/axe-wood rotate: false - xy: 2, 458 + xy: 1028, 3580 size: 660, 70 orig: 660, 70 offset: 0, 0 index: -1 ego/base rotate: false - xy: 1542, 3392 + xy: 1298, 822 size: 16, 36 orig: 16, 36 offset: 0, 0 index: -1 ego/burnt rotate: false - xy: 1904, 3646 + xy: 3072, 3853 size: 480, 46 orig: 480, 46 offset: 0, 0 index: -1 ego/cat-toy rotate: false - xy: 3352, 3470 + xy: 2808, 3600 size: 205, 50 orig: 205, 50 offset: 0, 0 index: -1 ego/crawl rotate: false - xy: 1023, 1479 + xy: 364, 1033 size: 273, 25 orig: 273, 25 offset: 0, 0 index: -1 ego/crowbar rotate: false - xy: 1164, 2385 + xy: 1668, 3399 size: 144, 36 orig: 144, 36 offset: 0, 0 index: -1 ego/fire rotate: false - xy: 544, 690 + xy: 1567, 216 size: 216, 36 orig: 216, 36 offset: 0, 0 index: -1 ego/flying rotate: false - xy: 2870, 3688 + xy: 2550, 450 size: 34, 44 orig: 34, 44 offset: 0, 0 index: -1 -ego/font - rotate: false - xy: 2, 1846 - size: 512, 512 - orig: 512, 512 - offset: 0, 0 - index: -1 -ego/font1 - rotate: false - xy: 1028, 3313 - size: 512, 512 - orig: 512, 512 - offset: 0, 0 - index: -1 -ego/font2 - rotate: false - xy: 2, 1332 - size: 512, 512 - orig: 512, 512 - offset: 0, 0 - index: -1 ego/frog rotate: false - xy: 720, 492 + xy: 2312, 3558 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 ego/frustrated-talk rotate: false - xy: 464, 69 + xy: 1860, 3555 size: 96, 36 orig: 96, 36 offset: 0, 0 index: -1 ego/get-sick rotate: false - xy: 1362, 823 + xy: 2730, 3539 size: 108, 36 orig: 108, 36 offset: 0, 0 index: -1 ego/glad rotate: false - xy: 878, 1700 + xy: 3514, 3803 size: 140, 46 orig: 140, 46 offset: 0, 0 index: -1 ego/grow rotate: false - xy: 1600, 816 + xy: 2487, 3823 size: 90, 36 orig: 90, 36 offset: 0, 0 index: -1 ego/grow-talk rotate: false - xy: 3132, 2882 + xy: 1822, 3519 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 ego/hold-up-to-window rotate: false - xy: 336, 31 + xy: 2840, 3539 size: 108, 36 orig: 108, 36 offset: 0, 0 index: -1 ego/ida rotate: false - xy: 664, 458 + xy: 768, 59 size: 54, 70 orig: 54, 70 offset: 0, 0 index: -1 ego/idea rotate: false - xy: 2326, 3574 + xy: 849, 4 size: 54, 70 orig: 54, 70 offset: 0, 0 @@ -783,210 +685,175 @@ ego/love index: -1 ego/pant rotate: false - xy: 1962, 2935 + xy: 2950, 3539 size: 62, 36 orig: 62, 36 offset: 0, 0 index: -1 ego/reach rotate: false - xy: 1806, 1050 + xy: 732, 2112 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 ego/scared rotate: false - xy: 1806, 1012 + xy: 2238, 3558 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 ego/scared-walk rotate: false - xy: 1228, 1810 + xy: 2140, 3558 size: 96, 36 orig: 96, 36 offset: 0, 0 index: -1 ego/scoot rotate: false - xy: 1160, 829 + xy: 1987, 222 size: 200, 30 orig: 200, 30 offset: 0, 0 index: -1 ego/shock rotate: false - xy: 2, 132 + xy: 3554, 3851 size: 360, 48 orig: 360, 48 offset: 0, 0 index: -1 ego/shoot rotate: false - xy: 1730, 2928 + xy: 1668, 3361 size: 144, 36 orig: 144, 36 offset: 0, 0 index: -1 ego/sigh rotate: false - xy: 1132, 624 + xy: 1987, 184 size: 162, 36 orig: 162, 36 offset: 0, 0 index: -1 ego/spear rotate: false - xy: 3820, 3148 + xy: 1678, 3259 size: 90, 100 orig: 90, 100 offset: 0, 0 index: -1 ego/squat rotate: false - xy: 1155, 1748 + xy: 1806, 179 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/stand rotate: false - xy: 566, 106 + xy: 2335, 188 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/standup rotate: false - xy: 1023, 1422 + xy: 2323, 439 size: 225, 55 orig: 225, 55 offset: 0, 0 index: -1 ego/swing rotate: false - xy: 1570, 3074 + xy: 364, 1060 size: 288, 75 orig: 288, 75 offset: 0, 0 index: -1 ego/swing-shovel rotate: false - xy: 2, 386 + xy: 1028, 3508 size: 630, 70 orig: 630, 70 offset: 0, 0 index: -1 ego/talk rotate: false - xy: 958, 530 + xy: 2189, 216 size: 144, 36 orig: 144, 36 offset: 0, 0 index: -1 ego/thorw rotate: false - xy: 1472, 816 + xy: 2474, 3539 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/throw rotate: false - xy: 336, 69 + xy: 2602, 3539 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/warden rotate: false - xy: 3928, 3284 + xy: 1860, 3512 size: 42, 41 orig: 42, 41 offset: 0, 0 index: -1 ending-castle/Untitled rotate: false - xy: 998, 2319 + xy: 1144, 2095 size: 28, 39 orig: 28, 39 offset: 0, 0 index: -1 ending-castle/game-player rotate: false - xy: 998, 2319 + xy: 1144, 2095 size: 28, 39 orig: 28, 39 offset: 0, 0 index: -1 ending-castle/duke rotate: false - xy: 2428, 3684 + xy: 3072, 3803 size: 440, 48 orig: 440, 48 offset: 0, 0 index: -1 -ending-castle/ending-castle2-assets/background - rotate: false - xy: 364, 144 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -ending-castle/ending-castle2-assets/collision - rotate: false - xy: 2670, 2716 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -space/collision - rotate: false - xy: 2670, 2716 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -held/collision - rotate: false - xy: 2670, 2716 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -ending-castle/ending-castle2-assets/foreground - rotate: false - xy: 1542, 3430 - size: 344, 109 - orig: 344, 109 - offset: 0, 0 - index: -1 ending-castle/warden-2 rotate: false - xy: 762, 685 + xy: 1904, 3512 size: 42, 41 orig: 42, 41 offset: 0, 0 index: -1 goon-2-walk rotate: false - xy: 952, 568 + xy: 1690, 3557 size: 168, 34 orig: 168, 34 offset: 0, 0 index: -1 castle-gate/goon-2-walk rotate: false - xy: 952, 568 + xy: 1690, 3557 size: 168, 34 orig: 168, 34 offset: 0, 0 index: -1 held/background rotate: false - xy: 3636, 3659 + xy: 484, 1863 size: 320, 240 orig: 320, 240 offset: 0, 0 @@ -1000,438 +867,389 @@ held/bloodclot-head index: -1 held/dot rotate: false - xy: 1152, 2420 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 -space/dot - rotate: false - xy: 1152, 2420 + xy: 1597, 2988 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 outside-jail/dot rotate: false - xy: 1152, 2420 + xy: 1597, 2988 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +space/dot + rotate: false + xy: 1597, 2988 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 held/flesh rotate: false - xy: 1602, 3009 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 -space/flesh - rotate: false - xy: 1602, 3009 + xy: 2525, 417 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 held/hand rotate: false - xy: 1667, 1712 + xy: 1652, 1464 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 held/head rotate: false - xy: 1667, 1470 + xy: 1652, 1222 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 held/title rotate: false - xy: 3277, 997 + xy: 1942, 496 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-antique/antique-sigh rotate: false - xy: 3352, 3447 + xy: 806, 1629 size: 198, 21 orig: 198, 21 offset: 0, 0 index: -1 inside-antique/background rotate: false - xy: 1560, 3188 + xy: 852, 2136 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-antique/beard rotate: false - xy: 1806, 1188 + xy: 824, 76 size: 78, 52 orig: 78, 52 offset: 0, 0 index: -1 inside-antique/bowl rotate: false - xy: 3552, 3461 + xy: 3008, 3591 size: 12, 7 orig: 12, 7 offset: 0, 0 index: -1 inside-antique/closed-blinds rotate: false - xy: 3498, 2933 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -inside-antique/collision - rotate: false - xy: 2026, 2474 + xy: 1008, 926 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-antique/darken rotate: false - xy: 1345, 2196 + xy: 968, 442 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-antique/desk rotate: false - xy: 1989, 2232 + xy: 1304, 2432 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-antique/fg rotate: false - xy: 2311, 1990 + xy: 1496, 2190 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -inside-antique/fire-particle - rotate: false - xy: 1882, 3424 - size: 4, 4 - orig: 4, 4 - offset: 0, 0 - index: -1 inside-antique/glow rotate: false - xy: 1220, 1954 + xy: 1330, 738 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-antique/open-blinds rotate: false - xy: 2633, 1506 + xy: 1974, 738 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-antique/portrait rotate: false - xy: 1774, 838 + xy: 1298, 804 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 inside-antique/shopkeep rotate: false - xy: 336, 109 + xy: 1276, 2623 size: 18, 21 orig: 18, 21 offset: 0, 0 index: -1 inside-antique/shopkeep-talk rotate: false - xy: 370, 8 + xy: 3096, 3538 size: 72, 21 orig: 72, 21 offset: 0, 0 index: -1 inside-antique/sword rotate: false - xy: 2016, 2633 + xy: 1668, 3343 size: 8, 16 orig: 8, 16 offset: 0, 0 index: -1 inside-castle/sword rotate: false - xy: 2016, 2633 + xy: 1668, 3343 size: 8, 16 orig: 8, 16 offset: 0, 0 index: -1 inside-antique/teddy rotate: false - xy: 1028, 2322 + xy: 1144, 2042 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 inside-cafeteria/background rotate: false - xy: 838, 1088 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -inside-cafeteria/collision - rotate: false - xy: 2348, 2474 + xy: 806, 1894 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-cafeteria/doorway rotate: false - xy: 1276, 2569 + xy: 1128, 2021 size: 14, 113 orig: 14, 113 offset: 0, 0 index: -1 inside-cafeteria/fg rotate: false - xy: 2633, 1990 + xy: 1496, 1948 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-cafeteria/fight rotate: false - xy: 3277, 1965 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -inside-cafeteria/fight copy - rotate: false - xy: 3599, 1965 + xy: 1626, 2432 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-cafeteria/glow rotate: false - xy: 1542, 1954 + xy: 1818, 2190 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-cafeteria/hands-fight rotate: false - xy: 2906, 3795 + xy: 1028, 3739 size: 728, 104 orig: 728, 104 offset: 0, 0 index: -1 inside-cafeteria/knight-a rotate: false - xy: 1028, 2922 + xy: 1028, 3652 size: 700, 85 orig: 700, 85 offset: 0, 0 index: -1 inside-cafeteria/knights rotate: false - xy: 260, 33 + xy: 1676, 3071 size: 74, 97 orig: 74, 97 offset: 0, 0 index: -1 inside-cafeteria/knights-stand rotate: false - xy: 1542, 3745 + xy: 2580, 3819 size: 490, 80 orig: 490, 80 offset: 0, 0 index: -1 inside-cafeteria/ladder rotate: false - xy: 1886, 1202 + xy: 452, 1793 size: 29, 38 orig: 29, 38 offset: 0, 0 index: -1 inside-cafeteria/ladder-guard rotate: false - xy: 3820, 2970 + xy: 833, 182 size: 74, 87 orig: 74, 87 offset: 0, 0 index: -1 inside-cafeteria/ladder-guard-2 rotate: false - xy: 3921, 2132 + xy: 976, 1062 size: 30, 73 orig: 30, 73 offset: 0, 0 index: -1 inside-cafeteria/warriors rotate: false - xy: 1948, 2552 + xy: 384, 1705 size: 66, 126 orig: 66, 126 offset: 0, 0 index: -1 inside-cafeteria/warriors-stand rotate: false - xy: 544, 728 + xy: 1758, 3717 size: 264, 126 orig: 264, 126 offset: 0, 0 index: -1 inside-castle/Untitled rotate: false - xy: 1132, 662 + xy: 1660, 3511 size: 160, 44 orig: 160, 44 offset: 0, 0 index: -1 inside-castle/background rotate: false - xy: 838, 846 + xy: 1382, 2674 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-castle/background-sunrise rotate: false - xy: 2532, 3200 + xy: 484, 1621 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-castle/inside-castle-sunrise rotate: false - xy: 2532, 3200 + xy: 484, 1621 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-castle/books rotate: false - xy: 1228, 1789 + xy: 2550, 429 size: 34, 19 orig: 34, 19 offset: 0, 0 index: -1 inside-castle/bookstack rotate: false - xy: 446, 2 + xy: 617, 960 size: 27, 35 orig: 27, 35 offset: 0, 0 index: -1 inside-castle/brian-working rotate: false - xy: 516, 856 + xy: 2, 15 size: 320, 44 orig: 320, 44 offset: 0, 0 index: -1 -inside-castle/collision - rotate: false - xy: 2670, 2474 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 inside-castle/door rotate: false - xy: 1876, 2922 + xy: 3881, 3907 size: 84, 49 orig: 84, 49 offset: 0, 0 index: -1 inside-castle/fight-1 rotate: false - xy: 2955, 1749 + xy: 1330, 1464 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-castle/game-player-talk rotate: false - xy: 1904, 3505 + xy: 324, 65 size: 400, 44 orig: 400, 44 offset: 0, 0 index: -1 inside-castle/gameplayer rotate: false - xy: 3928, 3371 + xy: 726, 65 size: 40, 44 orig: 40, 44 offset: 0, 0 index: -1 inside-castle/hands-1 rotate: false - xy: 1220, 1848 + xy: 1570, 3068 size: 104, 104 orig: 104, 104 offset: 0, 0 index: -1 inside-castle/hands-fight rotate: false - xy: 2906, 3689 + xy: 2, 2105 size: 728, 104 orig: 728, 104 offset: 0, 0 index: -1 inside-castle/magic rotate: false - xy: 1624, 3009 + xy: 617, 938 size: 20, 20 orig: 20, 20 offset: 0, 0 index: -1 inside-castle/monocle rotate: false - xy: 2386, 3685 + xy: 797, 2 size: 28, 7 orig: 28, 7 offset: 0, 0 index: -1 inside-castle/pedestal-overlay rotate: false - xy: 2955, 1507 + xy: 2094, 1706 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-castle/pull-sword rotate: false - xy: 516, 1896 + xy: 2, 1641 size: 380, 190 orig: 380, 190 offset: 0, 0 index: -1 inside-castle/roof rotate: false - xy: 1948, 2493 + xy: 909, 234 size: 57, 57 orig: 57, 57 offset: 0, 0 index: -1 -inside-castle/scale - rotate: false - xy: 1989, 1264 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 inside-castle/trophy rotate: false xy: 2056, 3911 @@ -1441,588 +1259,504 @@ inside-castle/trophy index: -1 inside-castle/walkie-talkie rotate: false - xy: 2955, 2438 + xy: 617, 997 size: 35, 34 orig: 35, 34 offset: 0, 0 index: -1 inside-castle/watch rotate: false - xy: 810, 846 + xy: 2056, 3901 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 inside-castle/way-back-tree rotate: false - xy: 1482, 1228 + xy: 1934, 254 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-house/background rotate: false - xy: 810, 604 + xy: 324, 425 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-house/candle rotate: false - xy: 562, 72 + xy: 1853, 3593 size: 102, 32 orig: 102, 32 offset: 0, 0 index: -1 inside-house/candle-aura rotate: false - xy: 260, 2 + xy: 1884, 3627 size: 108, 27 orig: 108, 27 offset: 0, 0 index: -1 -inside-house/collision - rotate: false - xy: 2992, 2475 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 inside-house/desk rotate: false - xy: 2311, 2232 + xy: 1174, 2190 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-house/flask rotate: false - xy: 3314, 2694 + xy: 1916, 156 size: 16, 21 orig: 16, 21 offset: 0, 0 index: -1 inside-house/frog-legs rotate: false - xy: 1326, 1901 + xy: 1853, 3627 size: 17, 16 orig: 17, 16 offset: 0, 0 index: -1 inside-house/glow rotate: false - xy: 1345, 1712 + xy: 1818, 1948 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-house/inputed-key rotate: false - xy: 1149, 833 + xy: 1319, 913 size: 9, 11 orig: 9, 11 offset: 0, 0 index: -1 inside-house/safe-lock rotate: false - xy: 3132, 2717 + xy: 364, 1029 size: 198, 2 orig: 198, 2 offset: 0, 0 index: -1 inside-house/safe-screen rotate: false - xy: 1023, 1345 + xy: 2323, 362 size: 200, 75 orig: 200, 75 offset: 0, 0 index: -1 inside-house/sillhoute rotate: false - xy: 2955, 1265 + xy: 2296, 980 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-jail/background rotate: false - xy: 1888, 3215 + xy: 324, 183 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-jail/ball-n-chain rotate: false - xy: 3596, 3671 + xy: 3396, 3543 size: 38, 16 orig: 38, 16 offset: 0, 0 index: -1 inside-jail/bars rotate: false - xy: 2854, 3200 + xy: 686, 1379 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-jail/bars- rotate: false - xy: 2848, 2958 + xy: 686, 1137 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-jail/candle rotate: false - xy: 3888, 3417 + xy: 509, 668 size: 80, 25 orig: 80, 25 offset: 0, 0 index: -1 inside-jail/chest-top rotate: false - xy: 3928, 3250 + xy: 1128, 1987 size: 44, 32 orig: 44, 32 offset: 0, 0 index: -1 inside-jail/chest-top-open rotate: false - xy: 3912, 3150 + xy: 1128, 1953 size: 44, 32 orig: 44, 32 offset: 0, 0 index: -1 -inside-jail/collision - rotate: false - xy: 3314, 2449 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -inside-jail/collision-free - rotate: false - xy: 898, 1846 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -inside-jail/collision-locked - rotate: false - xy: 1023, 1506 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 inside-jail/crowbar rotate: false - xy: 2016, 2651 + xy: 3656, 3822 size: 8, 27 orig: 8, 27 offset: 0, 0 index: -1 inside-jail/fg rotate: false - xy: 2955, 1991 + xy: 1450, 1706 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-jail/glow rotate: false - xy: 1345, 1470 + xy: 1772, 1706 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-jail/moveable-bars rotate: false - xy: 2331, 3458 + xy: 1770, 3268 size: 53, 91 orig: 53, 91 offset: 0, 0 index: -1 inside-jail/warden rotate: false - xy: 878, 1786 + xy: 646, 271 size: 258, 58 orig: 258, 58 offset: 0, 0 index: -1 inside-jail/window rotate: false - xy: 3921, 2101 + xy: 976, 1009 size: 18, 29 orig: 18, 29 offset: 0, 0 index: -1 inside-jail/window-bent rotate: false - xy: 998, 2288 + xy: 452, 1762 size: 18, 29 orig: 18, 29 offset: 0, 0 index: -1 inside-stash/background rotate: false - xy: 1882, 2973 + xy: 2024, 3596 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-stash/candle rotate: false - xy: 1028, 2903 + xy: 3881, 3901 size: 16, 4 orig: 16, 4 offset: 0, 0 index: -1 -inside-stash/collision - rotate: false - xy: 3636, 2449 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 inside-stash/lid rotate: false - xy: 544, 681 + xy: 3022, 3810 size: 23, 7 orig: 23, 7 offset: 0, 0 index: -1 inventory rotate: false - xy: 1806, 936 + xy: 904, 78 size: 42, 42 orig: 42, 42 offset: 0, 0 index: -1 inventory-overlay rotate: false - xy: 2633, 1748 + xy: 1974, 1464 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -mainfont - rotate: false - xy: 2, 818 - size: 512, 512 - orig: 512, 512 - offset: 0, 0 - index: -1 outside-castle/Untitled rotate: false - xy: 1684, 856 + xy: 1678, 178 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 outside-castle/peddler-talk rotate: false - xy: 1684, 856 + xy: 1678, 178 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 outside-castle/background rotate: false - xy: 2386, 3442 + xy: 2486, 3577 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outside-castle/background-sunrise rotate: false - xy: 2204, 2958 + xy: 364, 1379 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outside-castle/balloons rotate: false - xy: 1912, 1312 + xy: 906, 293 size: 60, 36 orig: 60, 36 offset: 0, 0 index: -1 outside-castle/bird rotate: false - xy: 1378, 2732 + xy: 564, 1029 size: 2, 2 orig: 2, 2 offset: 0, 0 index: -1 outside-castle/blanket rotate: false - xy: 3888, 3444 + xy: 1276, 2688 size: 103, 46 orig: 103, 46 offset: 0, 0 index: -1 outside-castle/brush rotate: false - xy: 3176, 2963 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -outside-castle/collision - rotate: false - xy: 2992, 2233 + xy: 1008, 1168 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outside-castle/flies rotate: false - xy: 1298, 1489 + xy: 2189, 199 size: 45, 15 orig: 45, 15 offset: 0, 0 index: -1 outside-castle/note rotate: false - xy: 1542, 3338 + xy: 1958, 3575 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 outside-castle/peddler rotate: false - xy: 878, 1858 + xy: 938, 336 size: 18, 36 orig: 18, 36 offset: 0, 0 index: -1 -outside-castle/scale-map - rotate: false - xy: 2311, 1264 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 outside-castle/steer rotate: false - xy: 364, 107 + xy: 1785, 217 size: 200, 35 orig: 200, 35 offset: 0, 0 index: -1 outside-castle/walk-behind rotate: false - xy: 1160, 861 + xy: 1612, 254 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outside-jail/Untitled rotate: false - xy: 2, 530 + xy: 1028, 2916 size: 600, 70 orig: 600, 70 offset: 0, 0 index: -1 outside-jail/alarm-clock rotate: false - xy: 1986, 2922 + xy: 2, 2 size: 16, 11 orig: 16, 11 offset: 0, 0 index: -1 outside-jail/axe rotate: false - xy: 2955, 2403 + xy: 2489, 221 size: 22, 33 orig: 22, 33 offset: 0, 0 index: -1 outside-jail/background rotate: false - xy: 2708, 3442 + xy: 3022, 3561 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outside-jail/bent-bar-window rotate: false - xy: 1326, 1919 + xy: 1144, 2060 size: 17, 33 orig: 17, 33 offset: 0, 0 index: -1 outside-jail/candle rotate: false - xy: 1692, 829 + xy: 3014, 3534 size: 80, 25 orig: 80, 25 offset: 0, 0 index: -1 outside-jail/candle-aura rotate: false - xy: 1028, 3009 + xy: 1028, 3204 size: 540, 135 orig: 540, 135 offset: 0, 0 index: -1 outside-jail/candle-aura2 rotate: false - xy: 2, 681 + xy: 1028, 3067 size: 540, 135 orig: 540, 135 offset: 0, 0 index: -1 outside-jail/closed-stash rotate: false - xy: 3912, 3218 + xy: 3232, 3529 size: 52, 30 orig: 52, 30 offset: 0, 0 index: -1 -outside-jail/collision - rotate: false - xy: 3314, 2207 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -outside-jail/dither - rotate: false - xy: 1560, 3146 - size: 3, 3 - orig: 3, 3 - offset: 0, 0 - index: -1 outside-jail/guard-sleep rotate: false - xy: 1132, 760 + xy: 2323, 293 size: 172, 67 orig: 172, 67 offset: 0, 0 index: -1 -outside-jail/magic - rotate: false - xy: 1646, 3009 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 outside-jail/open-stash rotate: false - xy: 1570, 3031 + xy: 646, 331 size: 290, 41 orig: 290, 41 offset: 0, 0 index: -1 outside-jail/rope rotate: false - xy: 571, 602 + xy: 646, 183 size: 185, 86 orig: 185, 86 offset: 0, 0 index: -1 outside-jail/spear rotate: false - xy: 1349, 776 + xy: 2497, 309 size: 11, 51 orig: 11, 51 offset: 0, 0 index: -1 outsidehouse/background rotate: false - xy: 3030, 3447 + xy: 3344, 3561 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outsidehouse/background-trees rotate: false - xy: 2526, 2958 + xy: 364, 1137 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outsidehouse/cauldron rotate: false - xy: 1482, 854 + xy: 1128, 1666 size: 200, 38 orig: 200, 38 offset: 0, 0 index: -1 -outsidehouse/collision - rotate: false - xy: 3636, 2207 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 outsidehouse/door rotate: false - xy: 1138, 1786 + xy: 384, 1645 size: 88, 58 orig: 88, 58 offset: 0, 0 index: -1 outsidehouse/fence rotate: false - xy: 2633, 2232 + xy: 1174, 1948 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outsidehouse/fg1 rotate: false - xy: 1730, 2966 + xy: 1152, 2432 size: 128, 63 orig: 128, 63 offset: 0, 0 index: -1 outsidehouse/fg2 rotate: false - xy: 2270, 3442 + xy: 706, 2 size: 59, 61 orig: 59, 61 offset: 0, 0 index: -1 outsidehouse/fgtest rotate: false - xy: 1912, 1393 + xy: 1597, 2991 size: 75, 75 orig: 75, 75 offset: 0, 0 index: -1 outsidehouse/foreground rotate: false - xy: 3277, 1723 + xy: 1330, 1222 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outsidehouse/house rotate: false - xy: 2311, 1748 + xy: 1652, 738 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outsidehouse/lamb rotate: false - xy: 516, 835 + xy: 1730, 3718 size: 26, 19 orig: 26, 19 offset: 0, 0 index: -1 outsidehouse/lamb-walk rotate: false - xy: 446, 39 + xy: 1806, 149 size: 108, 28 orig: 108, 28 offset: 0, 0 index: -1 outsidehouse/note rotate: false - xy: 1542, 3320 + xy: 2489, 203 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -2036,67 +1770,60 @@ outsidehouse/outsidehouse index: -1 outsidehouse/sheep rotate: false - xy: 2335, 3551 + xy: 394, 1622 size: 33, 21 orig: 33, 21 offset: 0, 0 index: -1 outsidehouse/sheep-anim rotate: false - xy: 1904, 3551 + xy: 2056, 3838 size: 429, 21 orig: 429, 21 offset: 0, 0 index: -1 outsidehouse/sheep-walk rotate: false - xy: 758, 521 + xy: 2808, 3577 size: 198, 21 orig: 198, 21 offset: 0, 0 index: -1 pathfind-test rotate: false - xy: 1104, 550 + xy: 3436, 3543 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 player rotate: false - xy: 1152, 2423 + xy: 1668, 3437 size: 144, 72 orig: 144, 72 offset: 0, 0 index: -1 space/Blergh rotate: false - xy: 1864, 2029 + xy: 1560, 3341 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/Untitled rotate: false - xy: 3132, 2920 + xy: 2151, 184 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 space/background rotate: false - xy: 3566, 3417 + xy: 3666, 3609 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -space/beam - rotate: false - xy: 1542, 3313 - size: 12, 5 - orig: 12, 5 - offset: 0, 0 - index: -1 space/blergh-appear rotate: false xy: 2, 2736 @@ -2106,14 +1833,14 @@ space/blergh-appear index: -1 space/blergh-flex rotate: false - xy: 1482, 1061 + xy: 3988, 3929 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-stand rotate: false - xy: 1482, 1061 + xy: 3988, 3929 size: 106, 165 orig: 106, 165 offset: 0, 0 @@ -2127,70 +1854,63 @@ space/blergh-grow index: -1 space/blergh-grow2 rotate: false - xy: 1804, 1303 + xy: 3988, 3762 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-grow3 rotate: false - xy: 1482, 894 + xy: 3988, 3595 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-grow4 rotate: false - xy: 1590, 1061 + xy: 3988, 3428 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-grow5 rotate: false - xy: 1590, 894 + xy: 1570, 3174 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-grow6 rotate: false - xy: 1698, 1061 + xy: 509, 862 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-grow7 rotate: false - xy: 1698, 894 + xy: 509, 695 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-grow8 rotate: false - xy: 3971, 3929 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/blergh-stand copy - rotate: false - xy: 3888, 3492 + xy: 2586, 571 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-swing rotate: false - xy: 1028, 3146 + xy: 1028, 3341 size: 530, 165 orig: 530, 165 offset: 0, 0 index: -1 space/blergh-talk rotate: false - xy: 3820, 3250 + xy: 2586, 404 size: 106, 165 orig: 106, 165 offset: 0, 0 @@ -2211,204 +1931,154 @@ space/bloodclot-head-talk index: -1 space/bloodclot-stand rotate: false - xy: 3352, 3522 + xy: 2808, 3652 size: 212, 165 orig: 212, 165 offset: 0, 0 index: -1 space/bloodclot-talk rotate: false - xy: 2056, 3734 + xy: 2, 2211 size: 848, 165 orig: 848, 165 offset: 0, 0 index: -1 space/broken-jewel rotate: false - xy: 3158, 2866 + xy: 2474, 3581 size: 10, 14 orig: 10, 14 offset: 0, 0 index: -1 space/bullet rotate: false - xy: 758, 544 + xy: 1290, 190 size: 192, 24 orig: 192, 24 offset: 0, 0 index: -1 space/later rotate: false - xy: 1989, 1506 + xy: 1974, 1222 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 space/susp rotate: false - xy: 1028, 2340 + xy: 2346, 3559 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/suspended rotate: false - xy: 1028, 2340 + xy: 2346, 3559 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 talk-bg rotate: false - xy: 1806, 894 + xy: 3286, 3519 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 talk-bg-2 rotate: false - xy: 2306, 3509 + xy: 1276, 2646 size: 21, 40 orig: 21, 40 offset: 0, 0 index: -1 testscreen/subject rotate: false - xy: 1972, 2139 + xy: 824, 59 size: 15, 15 orig: 15, 15 offset: 0, 0 index: -1 testscreen/test rotate: false - xy: 3277, 1239 + xy: 2296, 738 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 the-end rotate: false - xy: 3599, 1239 + xy: 1298, 496 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 title rotate: false - xy: 2955, 1023 + xy: 1620, 496 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 title-overlay rotate: false - xy: 3599, 997 + xy: 2264, 496 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 title/background rotate: false - xy: 2210, 3200 + xy: 806, 1652 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 title/balloon rotate: false - xy: 1806, 980 + xy: 3170, 3529 size: 60, 30 orig: 60, 30 offset: 0, 0 index: -1 -title/cloud1 - rotate: false - xy: 1276, 2684 - size: 100, 50 - orig: 100, 50 - offset: 0, 0 - index: -1 -title/cloud2 - rotate: false - xy: 1276, 2684 - size: 100, 50 - orig: 100, 50 - offset: 0, 0 - index: -1 title/clouds rotate: false - xy: 3170, 2721 + xy: 646, 653 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 title/logo rotate: false - xy: 2311, 1506 + xy: 1974, 980 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -ui/slider - rotate: false - xy: 1668, 3009 - size: 20, 20 - split: 8, 8, 8, 8 - orig: 20, 20 - offset: 0, 0 - index: -1 -ui/slider-bar - rotate: false - xy: 3566, 3659 - size: 28, 28 - orig: 28, 28 - offset: 0, 0 - index: -1 -ui/slider-bar-hover - rotate: false - xy: 3566, 3659 - size: 28, 28 - orig: 28, 28 - offset: 0, 0 - index: -1 -ui/ui - rotate: false - xy: 3820, 2936 - size: 64, 32 - orig: 64, 32 - offset: 0, 0 - index: -1 -uiskin - rotate: false - xy: 2, 2 - size: 256, 128 - orig: 256, 128 - offset: 0, 0 - index: -1 white rotate: false - xy: 3498, 3421 + xy: 3362, 3535 size: 32, 24 orig: 32, 24 offset: 0, 0 index: -1 wizard/Untitled rotate: false - xy: 3881, 3906 + xy: 746, 131 size: 80, 50 orig: 80, 50 offset: 0, 0 index: -1 wizard/cloud rotate: false - xy: 1362, 791 + xy: 905, 2 size: 40, 30 orig: 40, 30 offset: 0, 0 index: -1 wizard/disappear rotate: false - xy: 1888, 3457 + xy: 324, 17 size: 380, 46 orig: 380, 46 offset: 0, 0 @@ -2422,42 +2092,42 @@ wizard/experiment index: -1 wizard/flame rotate: false - xy: 3559, 3510 + xy: 3015, 3640 size: 5, 10 orig: 5, 10 offset: 0, 0 index: -1 wizard/magic-hands rotate: false - xy: 1250, 1427 + xy: 909, 182 size: 40, 50 orig: 40, 50 offset: 0, 0 index: -1 wizard/stand rotate: false - xy: 2034, 3779 + xy: 1282, 2449 size: 20, 46 orig: 20, 46 offset: 0, 0 index: -1 wizard rotate: false - xy: 2034, 3779 + xy: 1282, 2449 size: 20, 46 orig: 20, 46 offset: 0, 0 index: -1 wizard/talk rotate: false - xy: 1806, 1088 + xy: 767, 11 size: 80, 46 orig: 80, 46 offset: 0, 0 index: -1 wizard/talk-angry rotate: false - xy: 1806, 1136 + xy: 828, 130 size: 80, 50 orig: 80, 50 offset: 0, 0 diff --git a/desktop/resources/packed/pack.png b/desktop/resources/packed/pack.png index 67661f76..8c14adcc 100644 Binary files a/desktop/resources/packed/pack.png and b/desktop/resources/packed/pack.png differ diff --git a/desktop/resources/space/Blergh b/desktop/resources/space/Blergh deleted file mode 100644 index 68028d33..00000000 Binary files a/desktop/resources/space/Blergh and /dev/null differ