diff --git a/desktop/asset-work/ego/suspended.png b/desktop/asset-work/ego/suspended.png index ca4d17eb..c1794896 100644 Binary files a/desktop/asset-work/ego/suspended.png and b/desktop/asset-work/ego/suspended.png differ diff --git a/desktop/asset-work/ego/suspended.pxa/0.pxi b/desktop/asset-work/ego/suspended.pxa/0.pxi index be4cd190..7d217c92 100644 Binary files a/desktop/asset-work/ego/suspended.pxa/0.pxi and b/desktop/asset-work/ego/suspended.pxa/0.pxi differ diff --git a/desktop/asset-work/ego/suspended.pxa/1.pxi b/desktop/asset-work/ego/suspended.pxa/1.pxi index 117c1033..16f00072 100644 Binary files a/desktop/asset-work/ego/suspended.pxa/1.pxi and b/desktop/asset-work/ego/suspended.pxa/1.pxi differ diff --git a/desktop/asset-work/ego/suspended.pxa/2.pxi b/desktop/asset-work/ego/suspended.pxa/2.pxi index ceffb877..acaf9790 100644 Binary files a/desktop/asset-work/ego/suspended.pxa/2.pxi and b/desktop/asset-work/ego/suspended.pxa/2.pxi differ diff --git a/desktop/asset-work/ego/suspended.pxa/3.pxi b/desktop/asset-work/ego/suspended.pxa/3.pxi index dc242963..e3c521bf 100644 Binary files a/desktop/asset-work/ego/suspended.pxa/3.pxi and b/desktop/asset-work/ego/suspended.pxa/3.pxi differ diff --git a/desktop/asset-work/ego/suspended.pxa/4.pxi b/desktop/asset-work/ego/suspended.pxa/4.pxi index 1d1994bb..48ce58e7 100644 Binary files a/desktop/asset-work/ego/suspended.pxa/4.pxi and b/desktop/asset-work/ego/suspended.pxa/4.pxi differ diff --git a/desktop/asset-work/ego/suspended.pxa/5.pxi b/desktop/asset-work/ego/suspended.pxa/5.pxi index 6d01fee0..455034b1 100644 Binary files a/desktop/asset-work/ego/suspended.pxa/5.pxi and b/desktop/asset-work/ego/suspended.pxa/5.pxi differ diff --git a/desktop/asset-work/ego/suspended.pxa/6.pxi b/desktop/asset-work/ego/suspended.pxa/6.pxi index 531b56ac..86ec1208 100644 Binary files a/desktop/asset-work/ego/suspended.pxa/6.pxi and b/desktop/asset-work/ego/suspended.pxa/6.pxi differ diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas index 4583f140..67f8196b 100644 --- a/desktop/resources/packed/pack.atlas +++ b/desktop/resources/packed/pack.atlas @@ -677,7 +677,7 @@ behindhouse/fg2 index: -1 behindhouse/stick rotate: false - xy: 998, 317 + xy: 956, 261 size: 24, 42 orig: 24, 42 offset: 0, 0 @@ -689,13 +689,6 @@ castle-gate/coinflip orig: 50, 10 offset: 0, 0 index: -1 -castle-gate/goon-2 - rotate: false - xy: 998, 283 - size: 24, 32 - orig: 24, 32 - offset: 0, 0 - index: -1 castle-gate/goon-2-flip rotate: false xy: 973, 873 @@ -726,7 +719,7 @@ cat-tree/brush-l index: -1 cat-tree/cat-stand rotate: false - xy: 329, 6 + xy: 346, 6 size: 198, 11 orig: 198, 11 offset: 0, 0 @@ -747,21 +740,21 @@ close index: -1 cloud rotate: false - xy: 1006, 10 + xy: 312, 2 size: 15, 15 orig: 15, 15 offset: 0, 0 index: -1 space/cloud rotate: false - xy: 1006, 10 + xy: 312, 2 size: 15, 15 orig: 15, 15 offset: 0, 0 index: -1 cloudy rotate: false - xy: 998, 261 + xy: 977, 366 size: 20, 20 orig: 20, 20 offset: 0, 0 @@ -794,11 +787,18 @@ dream/fairy-godfather orig: 567, 77 offset: 0, 0 index: -1 -dream/island +dream/shovel rotate: false - xy: 814, 431 - size: 30, 20 - orig: 30, 20 + xy: 956, 362 + size: 19, 64 + orig: 19, 64 + offset: 0, 0 + index: -1 +dream/sword + rotate: false + xy: 1006, 5 + size: 15, 38 + orig: 15, 38 offset: 0, 0 index: -1 ego/Untitled @@ -857,6 +857,13 @@ ego/ida orig: 54, 70 offset: 0, 0 index: -1 +ego/idea + rotate: false + xy: 706, 261 + size: 54, 70 + orig: 54, 70 + offset: 0, 0 + index: -1 ego/in-love rotate: false xy: 2, 992 @@ -864,6 +871,13 @@ ego/in-love orig: 570, 30 offset: 0, 0 index: -1 +ego/pant + rotate: false + xy: 956, 305 + size: 62, 36 + orig: 62, 36 + offset: 0, 0 + index: -1 ego/shock rotate: false xy: 646, 211 @@ -885,6 +899,13 @@ ego/standup orig: 225, 55 offset: 0, 0 index: -1 +ego/suspended + rotate: false + xy: 706, 415 + size: 140, 36 + orig: 140, 36 + offset: 0, 0 + index: -1 ego/talk rotate: false xy: 866, 476 @@ -906,16 +927,9 @@ held/background orig: 320, 240 offset: 0, 0 index: -1 -held/flesh - rotate: false - xy: 706, 264 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 inside-antique/portrait rotate: false - xy: 786, 268 + xy: 798, 264 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -929,7 +943,7 @@ inside-antique/shopkeep index: -1 inside-antique/teddy rotate: false - xy: 1006, 27 + xy: 816, 264 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -941,11 +955,11 @@ inside-cafeteria/doorway orig: 14, 113 offset: 0, 0 index: -1 -inside-cafeteria/knights +inside-cafeteria/ladder rotate: false - xy: 922, 262 - size: 74, 97 - orig: 74, 97 + xy: 977, 388 + size: 29, 38 + orig: 29, 38 offset: 0, 0 index: -1 inside-cafeteria/ladder-guard-2 @@ -971,7 +985,7 @@ inside-castle/books index: -1 inside-castle/door rotate: false - xy: 922, 377 + xy: 762, 282 size: 84, 49 orig: 84, 49 offset: 0, 0 @@ -983,13 +997,6 @@ inside-castle/hands-1 orig: 104, 104 offset: 0, 0 index: -1 -inside-castle/magic - rotate: false - xy: 728, 264 - size: 20, 20 - orig: 20, 20 - offset: 0, 0 - index: -1 inside-castle/pull-sword rotate: false xy: 324, 261 @@ -1004,6 +1011,13 @@ inside-castle/roof orig: 57, 57 offset: 0, 0 index: -1 +inside-castle/trophy + rotate: false + xy: 956, 343 + size: 64, 16 + orig: 64, 16 + offset: 0, 0 + index: -1 inside-house/candle-aura rotate: false xy: 464, 854 @@ -1039,13 +1053,27 @@ outside-castle/brush-bl orig: 60, 60 offset: 0, 0 index: -1 +outside-castle/brush-br + rotate: false + xy: 706, 333 + size: 130, 80 + orig: 130, 80 + offset: 0, 0 + index: -1 outside-castle/note rotate: false - xy: 846, 435 + xy: 848, 435 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 +outside-jail/axe + rotate: false + xy: 729, 9 + size: 22, 33 + orig: 22, 33 + offset: 0, 0 + index: -1 outside-jail/bent-bar-window rotate: false xy: 1005, 781 @@ -1076,7 +1104,7 @@ outsidehouse/lamb-walk index: -1 outsidehouse/note rotate: false - xy: 750, 268 + xy: 762, 264 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1090,7 +1118,7 @@ outsidehouse/sheep index: -1 pathfind-test rotate: false - xy: 768, 268 + xy: 780, 264 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -1104,26 +1132,19 @@ space/Blergh index: -1 space/blergh-flex rotate: false - xy: 706, 286 + xy: 848, 261 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-stand rotate: false - xy: 706, 286 + xy: 848, 261 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-talk - rotate: false - xy: 814, 261 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-1 rotate: false xy: 646, 44 size: 106, 165 @@ -1167,14 +1188,21 @@ space/broken-jewel index: -1 talk-bg rotate: false - xy: 706, 2 + xy: 982, 263 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 +talk-bg-2 + rotate: false + xy: 706, 2 + size: 21, 40 + orig: 21, 40 + offset: 0, 0 + index: -1 testscreen/subject rotate: false - xy: 312, 2 + xy: 329, 2 size: 15, 15 orig: 15, 15 offset: 0, 0 @@ -1201,14 +1229,14 @@ filter: Nearest,Nearest repeat: none black rotate: false - xy: 973, 479 + xy: 986, 163 size: 32, 24 orig: 32, 24 offset: 0, 0 index: -1 -castle-gate/goon-2-talk +castle-gate/goon-2 rotate: false - xy: 986, 129 + xy: 986, 81 size: 24, 32 orig: 24, 32 offset: 0, 0 @@ -1269,11 +1297,11 @@ dream/fairy-godfather-magic orig: 500, 77 offset: 0, 0 index: -1 -dream/sword +dream/island rotate: false - xy: 986, 6 - size: 15, 38 - orig: 15, 38 + xy: 986, 115 + size: 30, 20 + orig: 30, 20 offset: 0, 0 index: -1 ego/burnt @@ -1283,53 +1311,60 @@ ego/burnt orig: 480, 46 offset: 0, 0 index: -1 -ego/idea +ego/georgia rotate: false - xy: 958, 858 - size: 54, 70 - orig: 54, 70 + xy: 853, 81 + size: 90, 30 + orig: 90, 30 offset: 0, 0 index: -1 ego/love-1 rotate: false - xy: 968, 661 + xy: 968, 757 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-2 rotate: false - xy: 968, 405 + xy: 968, 685 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-3 rotate: false - xy: 968, 333 + xy: 968, 405 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-4 rotate: false - xy: 968, 261 + xy: 968, 333 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-5 + rotate: false + xy: 968, 261 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/love-6 rotate: false xy: 968, 189 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 -ego/pant +ego/squat rotate: false - xy: 958, 968 - size: 62, 36 - orig: 62, 36 + xy: 853, 113 + size: 126, 36 + orig: 126, 36 offset: 0, 0 index: -1 ending-castle/duke @@ -1381,6 +1416,13 @@ held/bloodclot-head-6 orig: 114, 82 offset: 0, 0 index: -1 +held/flesh + rotate: false + xy: 975, 11 + size: 20, 20 + orig: 20, 20 + offset: 0, 0 + index: -1 inside-antique/background rotate: false xy: 2, 658 @@ -1395,13 +1437,6 @@ inside-cafeteria/background orig: 320, 240 offset: 0, 0 index: -1 -inside-cafeteria/ladder - rotate: false - xy: 991, 621 - size: 29, 38 - orig: 29, 38 - offset: 0, 0 - index: -1 inside-cafeteria/ladder-guard rotate: false xy: 85, 85 @@ -1416,11 +1451,11 @@ inside-castle/background orig: 320, 240 offset: 0, 0 index: -1 -inside-castle/trophy +inside-castle/magic rotate: false - xy: 958, 1006 - size: 64, 16 - orig: 64, 16 + xy: 997, 11 + size: 20, 20 + orig: 20, 20 offset: 0, 0 index: -1 inside-house/background @@ -1444,9 +1479,16 @@ inside-jail/chest-top orig: 44, 32 offset: 0, 0 index: -1 +inside-jail/chest-top-open + rotate: false + xy: 973, 480 + size: 44, 32 + orig: 44, 32 + offset: 0, 0 + index: -1 inside-jail/moveable-bars rotate: false - xy: 968, 765 + xy: 958, 861 size: 53, 91 orig: 53, 91 offset: 0, 0 @@ -1472,6 +1514,20 @@ inside-stash/background orig: 320, 240 offset: 0, 0 index: -1 +outside-castle/Untitled + rotate: false + xy: 853, 151 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +outside-castle/peddler-talk + rotate: false + xy: 853, 151 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 outside-castle/background rotate: false xy: 646, 235 @@ -1481,32 +1537,11 @@ outside-castle/background index: -1 outside-castle/balloons rotate: false - xy: 958, 930 + xy: 958, 986 size: 60, 36 orig: 60, 36 offset: 0, 0 index: -1 -outside-castle/brush-br - rotate: false - xy: 853, 107 - size: 130, 80 - orig: 130, 80 - offset: 0, 0 - index: -1 -outside-castle/peddler - rotate: false - xy: 1003, 8 - size: 18, 36 - orig: 18, 36 - offset: 0, 0 - index: -1 -outside-jail/axe - rotate: false - xy: 986, 94 - size: 22, 33 - orig: 22, 33 - offset: 0, 0 - index: -1 outside-jail/background rotate: false xy: 324, 81 @@ -1516,7 +1551,7 @@ outside-jail/background index: -1 outside-jail/closed-stash rotate: false - xy: 968, 733 + xy: 968, 829 size: 52, 30 orig: 52, 30 offset: 0, 0 @@ -1535,44 +1570,44 @@ outsidehouse/sheep-anim orig: 429, 21 offset: 0, 0 index: -1 -space/bloodclot-explode-2 +space/bloodclot-explode-1 rotate: false xy: 526, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 -space/bloodclot-explode-3 +space/bloodclot-explode-2 rotate: false xy: 634, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 -space/bloodclot-explode-4 +space/bloodclot-explode-3 rotate: false xy: 742, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 -space/bloodclot-explode-5 +space/bloodclot-explode-4 rotate: false xy: 850, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 -talk-bg-2 +title/balloon rotate: false - xy: 968, 619 - size: 21, 40 - orig: 21, 40 + xy: 958, 954 + size: 60, 30 + orig: 60, 30 offset: 0, 0 index: -1 white rotate: false - xy: 986, 163 + xy: 986, 137 size: 32, 24 orig: 32, 24 offset: 0, 0 @@ -1586,35 +1621,42 @@ wizard/cloud index: -1 wizard/experiment-4 rotate: false - xy: 277, 117 + xy: 968, 628 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-5 rotate: false - xy: 973, 562 + xy: 277, 117 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-6 rotate: false - xy: 973, 505 + xy: 973, 571 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-7 + rotate: false + xy: 973, 514 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/stand rotate: false - xy: 986, 46 + xy: 986, 33 size: 20, 46 orig: 20, 46 offset: 0, 0 index: -1 wizard rotate: false - xy: 986, 46 + xy: 986, 33 size: 20, 46 orig: 20, 46 offset: 0, 0 @@ -1646,6 +1688,13 @@ castle-gate/goon-2-search orig: 192, 32 offset: 0, 0 index: -1 +castle-gate/goon-2-talk + rotate: false + xy: 598, 942 + size: 24, 32 + orig: 24, 32 + offset: 0, 0 + index: -1 castle-gate/throw-walkie-3 rotate: false xy: 2, 78 @@ -1667,100 +1716,93 @@ castle-gate/throw-walkie-5 orig: 205, 136 offset: 0, 0 index: -1 -dream/shovel - rotate: false - xy: 623, 150 - size: 19, 64 - orig: 19, 64 - offset: 0, 0 - index: -1 ego/love-10 rotate: false - xy: 968, 612 + xy: 968, 684 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-11 rotate: false - xy: 968, 540 + xy: 968, 612 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-12 rotate: false - xy: 968, 468 + xy: 968, 540 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-13 rotate: false - xy: 968, 396 + xy: 968, 468 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-14 rotate: false - xy: 968, 324 + xy: 968, 396 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-15 rotate: false - xy: 968, 252 + xy: 968, 324 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-16 rotate: false - xy: 968, 180 + xy: 968, 252 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-17 rotate: false - xy: 968, 108 + xy: 968, 180 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-18 rotate: false - xy: 968, 36 + xy: 968, 108 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 -ego/love-6 +ego/love-19 rotate: false - xy: 968, 900 + xy: 968, 36 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-7 rotate: false - xy: 968, 828 + xy: 968, 900 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-8 rotate: false - xy: 968, 756 + xy: 968, 828 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-9 rotate: false - xy: 968, 684 + xy: 968, 756 size: 50, 70 orig: 50, 70 offset: 0, 0 @@ -1835,13 +1877,6 @@ inside-jail/bars- orig: 320, 240 offset: 0, 0 index: -1 -inside-jail/chest-top-open - rotate: false - xy: 598, 942 - size: 44, 32 - orig: 44, 32 - offset: 0, 0 - index: -1 outside-castle/background-sunrise rotate: false xy: 324, 458 @@ -1856,6 +1891,13 @@ outside-castle/blanket orig: 103, 46 offset: 0, 0 index: -1 +outside-castle/peddler + rotate: false + xy: 623, 178 + size: 18, 36 + orig: 18, 36 + offset: 0, 0 + index: -1 outside-castle/steer rotate: false xy: 176, 41 @@ -1960,65 +2002,58 @@ ego/frustrated-talk orig: 96, 36 offset: 0, 0 index: -1 -ego/love-19 +ego/love-20 rotate: false xy: 968, 952 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 -ego/love-20 +ego/love-21 rotate: false xy: 968, 880 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 -ego/love-21 +ego/love-22 rotate: false xy: 968, 808 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 -ego/love-22 +ego/love-23 rotate: false xy: 968, 736 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 -ego/love-23 +ego/love-24 rotate: false xy: 968, 664 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 -ego/love-24 +ego/love-25 rotate: false xy: 968, 592 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 -ego/love-25 +ego/love-26 rotate: false xy: 968, 520 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 -ego/love-26 +ego/stand rotate: false - xy: 968, 448 - size: 50, 70 - orig: 50, 70 - offset: 0, 0 - index: -1 -ego/squat - rotate: false - xy: 777, 18 + xy: 649, 18 size: 126, 36 orig: 126, 36 offset: 0, 0 @@ -2079,20 +2114,6 @@ inside-house/desk orig: 320, 240 offset: 0, 0 index: -1 -outside-castle/Untitled - rotate: false - xy: 649, 18 - size: 126, 36 - orig: 126, 36 - offset: 0, 0 - index: -1 -outside-castle/peddler-talk - rotate: false - xy: 649, 18 - size: 126, 36 - orig: 126, 36 - offset: 0, 0 - index: -1 outside-jail/candle rotate: false xy: 202, 3 @@ -2121,6 +2142,13 @@ space/bullet orig: 192, 24 offset: 0, 0 index: -1 +space/susp + rotate: false + xy: 777, 18 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 title/banner rotate: false xy: 396, 12 @@ -2137,42 +2165,56 @@ title/clouds index: -1 wizard/experiment-10 rotate: false - xy: 968, 220 + xy: 968, 349 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-11 rotate: false - xy: 968, 163 + xy: 968, 292 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-12 rotate: false - xy: 968, 106 + xy: 968, 235 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-7 +wizard/experiment-13 rotate: false - xy: 968, 391 + xy: 968, 178 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-14 + rotate: false + xy: 968, 121 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-15 + rotate: false + xy: 968, 64 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-8 rotate: false - xy: 968, 334 + xy: 968, 463 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-9 rotate: false - xy: 968, 277 + xy: 968, 406 size: 45, 55 orig: 45, 55 offset: 0, 0 @@ -2192,7 +2234,35 @@ behindhouse/house index: -1 cat-tree/grandma-cry-5 rotate: false - xy: 960, 11 + xy: 704, 12 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-6 + rotate: false + xy: 764, 12 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-7 + rotate: false + xy: 824, 12 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-8 + rotate: false + xy: 884, 12 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-9 + rotate: false + xy: 944, 11 size: 58, 40 orig: 58, 40 offset: 0, 0 @@ -2213,42 +2283,35 @@ outside-jail/fountain index: -1 ego/grow rotate: false - xy: 612, 16 + xy: 356, 16 size: 90, 36 orig: 90, 36 offset: 0, 0 index: -1 ego/jump-straight rotate: false - xy: 704, 4 + xy: 448, 4 size: 90, 48 orig: 90, 48 offset: 0, 0 index: -1 ego/scared-walk rotate: false - xy: 514, 16 + xy: 258, 16 size: 96, 36 orig: 96, 36 offset: 0, 0 index: -1 -ego/stand +ego/thorw rotate: false xy: 2, 16 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 -ego/thorw - rotate: false - xy: 258, 16 - size: 126, 36 - orig: 126, 36 - offset: 0, 0 - index: -1 ego/throw rotate: false - xy: 386, 16 + xy: 130, 16 size: 126, 36 orig: 126, 36 offset: 0, 0 @@ -2323,133 +2386,119 @@ outsidehouse/foreground orig: 320, 240 offset: 0, 0 index: -1 -space/susp - rotate: false - xy: 130, 16 - size: 126, 36 - orig: 126, 36 - offset: 0, 0 - index: -1 -ego/suspended - rotate: false - xy: 130, 16 - size: 126, 36 - orig: 126, 36 - offset: 0, 0 - index: -1 -wizard/experiment-13 +wizard/experiment-16 rotate: false xy: 968, 965 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-14 +wizard/experiment-17 rotate: false xy: 968, 908 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-15 +wizard/experiment-18 rotate: false xy: 968, 851 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-16 +wizard/experiment-19 rotate: false xy: 968, 794 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-17 +wizard/experiment-20 rotate: false xy: 968, 737 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-18 +wizard/experiment-21 rotate: false xy: 968, 680 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-19 +wizard/experiment-22 rotate: false xy: 968, 623 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-20 +wizard/experiment-23 rotate: false xy: 968, 566 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-21 +wizard/experiment-24 rotate: false xy: 968, 509 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-22 +wizard/experiment-25 rotate: false xy: 968, 452 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-23 +wizard/experiment-26 rotate: false xy: 968, 395 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-24 +wizard/experiment-27 rotate: false xy: 968, 338 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-25 +wizard/experiment-28 rotate: false xy: 968, 281 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-26 +wizard/experiment-29 rotate: false xy: 968, 224 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-27 +wizard/experiment-30 rotate: false xy: 968, 167 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-28 +wizard/experiment-31 rotate: false xy: 968, 110 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-29 +wizard/experiment-32 rotate: false xy: 968, 53 size: 45, 55 @@ -2458,14 +2507,14 @@ wizard/experiment-29 index: -1 wizard/talk rotate: false - xy: 878, 6 + xy: 622, 6 size: 80, 46 orig: 80, 46 offset: 0, 0 index: -1 wizard/talk-angry rotate: false - xy: 796, 2 + xy: 540, 2 size: 80, 50 orig: 80, 50 offset: 0, 0 @@ -2478,98 +2527,77 @@ filter: Nearest,Nearest repeat: none cat-tree/grandma-cry-10 rotate: false - xy: 396, 2 + xy: 2, 2 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-11 rotate: false - xy: 456, 2 + xy: 62, 2 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-12 rotate: false - xy: 516, 2 + xy: 122, 2 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-13 rotate: false - xy: 576, 2 + xy: 182, 2 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-14 rotate: false - xy: 636, 2 + xy: 242, 2 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-15 rotate: false - xy: 696, 2 + xy: 302, 2 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-16 rotate: false - xy: 756, 2 + xy: 362, 2 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-17 rotate: false - xy: 816, 2 + xy: 422, 2 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-18 rotate: false - xy: 876, 2 + xy: 482, 2 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-19 rotate: false - xy: 936, 2 + xy: 542, 2 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 -cat-tree/grandma-cry-6 +cat-tree/grandma-cry-20 rotate: false - xy: 156, 2 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-7 - rotate: false - xy: 216, 2 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-8 - rotate: false - xy: 276, 2 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-9 - rotate: false - xy: 336, 2 + xy: 602, 2 size: 58, 40 orig: 58, 40 offset: 0, 0 @@ -2588,13 +2616,6 @@ dream/pedestals orig: 320, 240 offset: 0, 0 index: -1 -ego/georgia - rotate: false - xy: 2, 12 - size: 90, 30 - orig: 90, 30 - offset: 0, 0 - index: -1 inside-antique/open-blinds rotate: false xy: 324, 528 @@ -2658,13 +2679,6 @@ title orig: 320, 240 offset: 0, 0 index: -1 -title/balloon - rotate: false - xy: 94, 12 - size: 60, 30 - orig: 60, 30 - offset: 0, 0 - index: -1 title/logo rotate: false xy: 2, 286 @@ -2672,72 +2686,51 @@ title/logo orig: 320, 240 offset: 0, 0 index: -1 -wizard/experiment-30 +wizard/experiment-33 rotate: false xy: 968, 955 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-31 +wizard/experiment-34 rotate: false xy: 968, 898 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-32 +wizard/experiment-35 rotate: false xy: 968, 841 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-33 +wizard/experiment-36 rotate: false xy: 968, 784 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-34 +wizard/experiment-37 rotate: false xy: 968, 727 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-35 +wizard/experiment-38 rotate: false xy: 968, 670 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-36 - rotate: false - xy: 968, 613 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-37 - rotate: false - xy: 968, 556 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-38 - rotate: false - xy: 968, 499 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 wizard/experiment-39 rotate: false - xy: 968, 442 + xy: 968, 613 size: 45, 55 orig: 45, 55 offset: 0, 0 @@ -2750,301 +2743,308 @@ filter: Nearest,Nearest repeat: none castle-gate/throw-walkie-6 rotate: false - xy: 646, 877 + xy: 324, 307 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-7 rotate: false - xy: 2, 151 + xy: 381, 2 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-8 rotate: false - xy: 324, 393 + xy: 531, 307 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-9 rotate: false - xy: 646, 739 + xy: 588, 2 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 -cat-tree/grandma-cry-20 - rotate: false - xy: 961, 973 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 cat-tree/tree-and-rock rotate: false - xy: 324, 773 + xy: 646, 779 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 dream/corner-l rotate: false - xy: 2, 2 + xy: 795, 550 size: 112, 59 orig: 112, 59 offset: 0, 0 index: -1 dream/corner-r rotate: false - xy: 649, 136 + xy: 795, 489 size: 112, 59 orig: 112, 59 offset: 0, 0 index: -1 held/bloodclot-head-7 rotate: false - xy: 853, 764 + xy: 265, 44 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-8 rotate: false - xy: 432, 232 + xy: 795, 695 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-9 rotate: false - xy: 533, 113 + xy: 795, 611 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/title rotate: false - xy: 2, 773 + xy: 2, 779 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 +inside-cafeteria/knights + rotate: false + xy: 2, 29 + size: 74, 97 + orig: 74, 97 + offset: 0, 0 + index: -1 inside-castle/way-back-tree rotate: false - xy: 324, 531 + xy: 2, 295 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outside-castle/walk-behind rotate: false - xy: 2, 289 + xy: 2, 537 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outside-jail/rope rotate: false - xy: 2, 63 + xy: 78, 40 size: 185, 86 orig: 185, 86 offset: 0, 0 index: -1 outsidehouse/fgtest rotate: false - xy: 785, 7 + xy: 842, 150 size: 75, 75 orig: 75, 75 offset: 0, 0 index: -1 space/bloodclot-explode-10 rotate: false - xy: 531, 364 + xy: 326, 140 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-11 rotate: false - xy: 324, 226 + xy: 434, 140 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-12 rotate: false - xy: 317, 59 + xy: 432, 612 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-13 rotate: false - xy: 862, 597 + xy: 432, 445 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-14 rotate: false - xy: 639, 364 + xy: 542, 140 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-15 rotate: false - xy: 747, 405 + xy: 650, 140 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-16 rotate: false - xy: 425, 59 + xy: 911, 612 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-17 rotate: false - xy: 855, 405 + xy: 540, 445 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-18 rotate: false - xy: 548, 197 + xy: 540, 612 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-19 rotate: false - xy: 656, 197 + xy: 648, 445 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-20 rotate: false - xy: 764, 238 + xy: 648, 612 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-5 + rotate: false + xy: 2, 128 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-6 rotate: false - xy: 853, 848 + xy: 110, 128 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-7 rotate: false - xy: 646, 572 + xy: 218, 128 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-8 rotate: false - xy: 754, 572 + xy: 324, 612 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-9 rotate: false - xy: 209, 122 + xy: 324, 445 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-head-talk-10 rotate: false - xy: 617, 36 + xy: 758, 181 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-11 rotate: false - xy: 701, 59 + xy: 842, 304 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-12 rotate: false - xy: 785, 84 + xy: 926, 304 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-13 rotate: false - xy: 848, 161 + xy: 842, 227 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-14 rotate: false - xy: 869, 84 + xy: 926, 227 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-4 rotate: false - xy: 432, 316 + xy: 911, 535 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-5 rotate: false - xy: 872, 328 + xy: 909, 458 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-6 rotate: false - xy: 872, 251 + xy: 795, 412 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-7 rotate: false - xy: 533, 36 + xy: 738, 335 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-8 rotate: false - xy: 764, 161 + xy: 879, 381 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-9 rotate: false - xy: 189, 45 + xy: 758, 258 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 title-overlay rotate: false - xy: 2, 531 + xy: 324, 779 size: 320, 240 orig: 320, 240 offset: 0, 0 diff --git a/desktop/resources/packed/pack2.png b/desktop/resources/packed/pack2.png index 41035b68..000db347 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 7c3208fc..4a6d76b2 100644 Binary files a/desktop/resources/packed/pack3.png and b/desktop/resources/packed/pack3.png differ diff --git a/desktop/resources/packed/pack4.png b/desktop/resources/packed/pack4.png index 3bdfc513..17d63e46 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 242dac69..9262680b 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 5456a8d1..463f474e 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 25320c79..644cb308 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 3bbd3496..8c77f15d 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/scene.clj b/desktop/src-common/advent/screens/scene.clj index eecbcf3b..5bbd97e8 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -532,8 +532,8 @@ void main () love (utils/make-anim-seq "ego/love" [50 70] 0.1 (flatten [0 0 1 1 2 2 3 3 4 4 5 5 6 6 (repeat 10 7) (repeat 5 8) (repeat 5 7) (repeat 5 8) (repeat 5 7) (repeat 10 [23 24 25 24]) (repeat 30 9) 10 11 12 13 14 15 16 17 18 19 20 21 21 21 22 22 22 21 21 21 21 21 21 21 21 22 22 22 22 22 21 21 21 21 22 22 22 22 22 22 21 21 21 21 21 6 6 5 5 4 4 3 3 2 2 1 1 0])) axe (utils/make-anim "ego/axe.png" [60 70] 0.10 (flatten [1 1 1 1 1 0 0 0 1 1 1 1 1 0 0 0 0 (range 7)])) axe-wood (utils/make-anim "ego/axe-wood.png" [60 70] 0.10 (flatten [1 1 1 1 1 0 0 0 1 1 1 1 1 0 0 0 0 (range 11)])) - suspended (utils/make-anim "ego/suspended.png" [18 36] 0.10 [0]) - suspended-talk (utils/make-anim "ego/suspended.png" [18 36] 0.20 (range 7)) + suspended (utils/make-anim "ego/suspended.png" [20 36] 0.10 [0]) + suspended-talk (utils/make-anim "ego/suspended.png" [20 36] 0.20 (range 7)) crawl (utils/make-anim "ego/crawl.png" [39 25] 0.2 (range 4)) crawl-stand (utils/make-anim "ego/crawl.png" [39 25] 0.2 [0]) crawl-hide (utils/make-anim "ego/crawl.png" [39 25] 0.1 (flatten [(repeat 10 3) (range 4 7) (repeat 50 6) (reverse (range 4 7) ) (repeat 20 3)]))