diff --git a/desktop/asset-work/ego/Untitled.png b/desktop/asset-work/ego/Untitled.png index 0793a607..9bd914f5 100644 Binary files a/desktop/asset-work/ego/Untitled.png and b/desktop/asset-work/ego/Untitled.png differ diff --git a/desktop/asset-work/ego/squat-talk.png b/desktop/asset-work/ego/squat-talk.png new file mode 100644 index 00000000..342984ed Binary files /dev/null and b/desktop/asset-work/ego/squat-talk.png differ diff --git a/desktop/asset-work/ego/squat-talk.pxa/0.pxi b/desktop/asset-work/ego/squat-talk.pxa/0.pxi new file mode 100644 index 00000000..994d25b7 Binary files /dev/null and b/desktop/asset-work/ego/squat-talk.pxa/0.pxi differ diff --git a/desktop/asset-work/ego/squat-talk.pxa/1.pxi b/desktop/asset-work/ego/squat-talk.pxa/1.pxi new file mode 100644 index 00000000..7b5ca611 Binary files /dev/null and b/desktop/asset-work/ego/squat-talk.pxa/1.pxi differ diff --git a/desktop/asset-work/ego/squat-talk.pxa/2.pxi b/desktop/asset-work/ego/squat-talk.pxa/2.pxi new file mode 100644 index 00000000..6f1c605d Binary files /dev/null and b/desktop/asset-work/ego/squat-talk.pxa/2.pxi differ diff --git a/desktop/asset-work/ego/squat-talk.pxa/3.pxi b/desktop/asset-work/ego/squat-talk.pxa/3.pxi new file mode 100644 index 00000000..3e44493a Binary files /dev/null and b/desktop/asset-work/ego/squat-talk.pxa/3.pxi differ diff --git a/desktop/asset-work/ego/squat-talk.pxa/CelData.plist b/desktop/asset-work/ego/squat-talk.pxa/CelData.plist new file mode 100644 index 00000000..f0b74d60 --- /dev/null +++ b/desktop/asset-work/ego/squat-talk.pxa/CelData.plist @@ -0,0 +1,22 @@ + + + + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + duration + 1 + + + diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas index d38544f5..fc9e7577 100644 --- a/desktop/resources/packed/pack.atlas +++ b/desktop/resources/packed/pack.atlas @@ -109,20 +109,6 @@ title/dot orig: 1, 1 offset: 0, 0 index: -1 -inside-jail/dot - rotate: false - xy: 846, 784 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 -dream/dot - rotate: false - xy: 846, 784 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 ego/dot rotate: false xy: 846, 784 @@ -130,14 +116,7 @@ ego/dot orig: 1, 1 offset: 0, 0 index: -1 -inside-antique/dot - rotate: false - xy: 846, 784 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 -wizard/dot +dream/dot rotate: false xy: 846, 784 size: 1, 1 @@ -158,6 +137,27 @@ inside-house/dot orig: 1, 1 offset: 0, 0 index: -1 +wizard/dot + rotate: false + xy: 846, 784 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +inside-jail/dot + rotate: false + xy: 846, 784 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 +inside-antique/dot + rotate: false + xy: 846, 784 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 cat-tree/monocle rotate: false xy: 992, 839 @@ -284,14 +284,14 @@ held/dot orig: 1, 1 offset: 0, 0 index: -1 -space/dot +outside-jail/dot rotate: false xy: 849, 784 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 -outside-jail/dot +space/dot rotate: false xy: 849, 784 size: 1, 1 @@ -745,6 +745,20 @@ dream/sign orig: 41, 58 offset: 0, 0 index: -1 +ego/Untitled + rotate: false + xy: 176, 126 + size: 144, 36 + orig: 144, 36 + offset: 0, 0 + index: -1 +ego/talk + rotate: false + xy: 176, 126 + size: 144, 36 + orig: 144, 36 + offset: 0, 0 + index: -1 ego/axe rotate: false xy: 324, 572 @@ -761,7 +775,7 @@ ego/base index: -1 ego/crowbar rotate: false - xy: 176, 126 + xy: 176, 88 size: 144, 36 orig: 144, 36 offset: 0, 0 @@ -816,13 +830,6 @@ ego/shock offset: 0, 0 index: -1 ego/shoot - rotate: false - xy: 176, 88 - size: 144, 36 - orig: 144, 36 - offset: 0, 0 - index: -1 -ego/talk rotate: false xy: 864, 606 size: 144, 36 @@ -1520,13 +1527,6 @@ dream/clouds1 orig: 320, 240 offset: 0, 0 index: -1 -ego/Untitled - rotate: false - xy: 372, 2 - size: 80, 50 - orig: 80, 50 - offset: 0, 0 - index: -1 ego/cat-toy rotate: false xy: 2, 2 @@ -1534,9 +1534,23 @@ ego/cat-toy orig: 205, 50 offset: 0, 0 index: -1 +ego/hand-hold + rotate: false + xy: 983, 16 + size: 36, 36 + orig: 36, 36 + offset: 0, 0 + index: -1 +ending-castle/hand-hold + rotate: false + xy: 983, 16 + size: 36, 36 + orig: 36, 36 + offset: 0, 0 + index: -1 ego/jump-straight rotate: false - xy: 786, 4 + xy: 704, 4 size: 90, 48 orig: 90, 48 offset: 0, 0 @@ -1585,18 +1599,11 @@ ego/love-19 index: -1 ego/poke rotate: false - xy: 536, 2 + xy: 454, 2 size: 80, 50 orig: 80, 50 offset: 0, 0 index: -1 -ego/suspended - rotate: false - xy: 878, 16 - size: 140, 36 - orig: 140, 36 - offset: 0, 0 - index: -1 ending-castle/ending-castle2-assets/collision rotate: false xy: 694, 296 @@ -1620,7 +1627,7 @@ inside-antique/darken index: -1 inside-castle/door rotate: false - xy: 700, 3 + xy: 618, 3 size: 84, 49 orig: 84, 49 offset: 0, 0 @@ -1653,6 +1660,13 @@ inside-jail/bars- orig: 320, 240 offset: 0, 0 index: -1 +outside-castle/blanket + rotate: false + xy: 796, 6 + size: 103, 46 + orig: 103, 46 + offset: 0, 0 + index: -1 outsidehouse/background-trees rotate: false xy: 2, 296 @@ -1690,7 +1704,7 @@ title/screenshot-backdrop-active index: -1 wizard/Untitled rotate: false - xy: 454, 2 + xy: 372, 2 size: 80, 50 orig: 80, 50 offset: 0, 0 @@ -1751,9 +1765,16 @@ wizard/experiment-8 orig: 45, 55 offset: 0, 0 index: -1 +wizard/talk + rotate: false + xy: 901, 6 + size: 80, 46 + orig: 80, 46 + offset: 0, 0 + index: -1 wizard/talk-angry rotate: false - xy: 618, 2 + xy: 536, 2 size: 80, 50 orig: 80, 50 offset: 0, 0 @@ -1766,245 +1787,252 @@ filter: Nearest,Nearest repeat: none behindhouse/fg rotate: false - xy: 324, 535 + xy: 324, 780 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outsidehouse/fg rotate: false - xy: 324, 535 + xy: 324, 780 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 +castle-gate/goon-2-flip + rotate: false + xy: 973, 116 + size: 48, 32 + orig: 48, 32 + offset: 0, 0 + index: -1 +castle-gate/throw-walkie-2 + rotate: false + xy: 766, 12 + size: 205, 136 + orig: 205, 136 + offset: 0, 0 + index: -1 dream/far rotate: false - xy: 324, 777 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -dream/fountain - rotate: false - xy: 646, 51 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -outside-jail/fountain - rotate: false - xy: 646, 51 + xy: 2, 296 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 ego/climb rotate: false - xy: 2, 3 + xy: 2, 6 size: 242, 46 orig: 242, 46 offset: 0, 0 index: -1 ego/fire rotate: false - xy: 246, 13 + xy: 546, 16 size: 216, 36 orig: 216, 36 offset: 0, 0 index: -1 +ego/flying + rotate: false + xy: 246, 8 + size: 34, 44 + orig: 34, 44 + offset: 0, 0 + index: -1 ego/love-20 rotate: false - xy: 968, 947 + xy: 968, 950 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-21 rotate: false - xy: 968, 875 + xy: 968, 878 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-22 rotate: false - xy: 968, 803 + xy: 968, 806 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-23 rotate: false - xy: 968, 731 + xy: 968, 734 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-24 rotate: false - xy: 968, 659 + xy: 968, 662 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 ego/love-25 rotate: false - xy: 968, 587 + xy: 968, 590 size: 50, 70 orig: 50, 70 offset: 0, 0 index: -1 -ego/love-26 +georgia/kick-1 rotate: false - xy: 968, 515 - size: 50, 70 - orig: 50, 70 + xy: 968, 545 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/stand + rotate: false + xy: 444, 9 + size: 100, 43 + orig: 100, 43 + offset: 0, 0 + index: -1 +georgia/walk + rotate: false + xy: 282, 9 + size: 160, 43 + orig: 160, 43 + offset: 0, 0 + index: -1 +held/bloodclot-head-1 + rotate: false + xy: 324, 454 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-2 + rotate: false + xy: 324, 370 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-3 + rotate: false + xy: 324, 286 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-4 + rotate: false + xy: 324, 202 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-5 + rotate: false + xy: 324, 118 + size: 114, 82 + orig: 114, 82 offset: 0, 0 index: -1 inside-antique/desk rotate: false - xy: 2, 777 + xy: 2, 780 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-antique/fg rotate: false - xy: 646, 777 + xy: 324, 538 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-cafeteria/fg rotate: false - xy: 2, 51 + xy: 444, 296 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-cafeteria/fight rotate: false - xy: 646, 535 + xy: 646, 538 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 +inside-cafeteria/fight-new-assets/fight-4 + rotate: false + xy: 766, 344 + size: 256, 192 + orig: 256, 192 + offset: 0, 0 + index: -1 +inside-cafeteria/fight-new-assets/fight-5 + rotate: false + xy: 766, 150 + size: 256, 192 + orig: 256, 192 + offset: 0, 0 + index: -1 inside-castle/fight-1 rotate: false - xy: 324, 51 + xy: 444, 54 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-house/desk rotate: false - xy: 2, 535 + xy: 2, 538 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-jail/fg rotate: false - xy: 324, 293 + xy: 646, 780 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -outside-castle/blanket +outside-castle/brush-bl rotate: false - xy: 868, 3 - size: 103, 46 - orig: 103, 46 - offset: 0, 0 - index: -1 -outside-castle/steer - rotate: false - xy: 666, 14 - size: 200, 35 - orig: 200, 35 - offset: 0, 0 - index: -1 -outsidehouse/cauldron - rotate: false - xy: 464, 11 - size: 200, 38 - orig: 200, 38 + xy: 324, 56 + size: 60, 60 + orig: 60, 60 offset: 0, 0 index: -1 outsidehouse/fence rotate: false - xy: 2, 293 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -outsidehouse/foreground - rotate: false - xy: 646, 293 + xy: 2, 54 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 wizard/experiment-10 rotate: false - xy: 968, 401 + xy: 973, 2 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-11 rotate: false - xy: 968, 344 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-12 - rotate: false - xy: 968, 287 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-13 - rotate: false - xy: 968, 230 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-14 - rotate: false - xy: 968, 173 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-15 - rotate: false - xy: 968, 116 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-16 - rotate: false - xy: 968, 59 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-17 - rotate: false - xy: 973, 2 + xy: 386, 61 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-9 rotate: false - xy: 968, 458 + xy: 973, 59 size: 45, 55 orig: 45, 55 offset: 0, 0 @@ -2017,436 +2045,289 @@ filter: Nearest,Nearest repeat: none behindhouse/house rotate: false - xy: 384, 298 + xy: 646, 540 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -castle-gate/goon-2-flip +castle-gate/Untitled rotate: false - xy: 968, 990 - size: 48, 32 - orig: 48, 32 + xy: 608, 19 + size: 192, 35 + orig: 192, 35 offset: 0, 0 index: -1 -cat-tree/grandma-cry-1 - rotate: false - xy: 324, 498 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-10 - rotate: false - xy: 324, 120 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-11 - rotate: false - xy: 324, 78 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-12 - rotate: false - xy: 964, 438 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-13 - rotate: false - xy: 964, 396 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-14 - rotate: false - xy: 964, 354 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-15 - rotate: false - xy: 964, 312 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-16 - rotate: false - xy: 964, 270 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-17 - rotate: false - xy: 964, 228 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-18 - rotate: false - xy: 964, 186 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-19 - rotate: false - xy: 964, 144 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-2 - rotate: false - xy: 324, 456 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-20 - rotate: false - xy: 964, 102 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-3 - rotate: false - xy: 324, 414 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-4 - rotate: false - xy: 324, 372 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-5 - rotate: false - xy: 324, 330 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-6 - rotate: false - xy: 324, 288 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-7 - rotate: false - xy: 324, 246 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-8 - rotate: false - xy: 324, 204 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-9 - rotate: false - xy: 324, 162 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -dream/sword - rotate: false - xy: 1001, 2 - size: 15, 38 - orig: 15, 38 - offset: 0, 0 - index: -1 -ego/flying - rotate: false - xy: 84, 10 - size: 34, 44 - orig: 34, 44 - offset: 0, 0 - index: -1 -georgia/kick-1 - rotate: false - xy: 557, 11 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-2 - rotate: false - xy: 599, 11 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-4 - rotate: false - xy: 599, 11 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-3 - rotate: false - xy: 641, 11 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-5 - rotate: false - xy: 683, 11 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-6 - rotate: false - xy: 968, 546 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/stand - rotate: false - xy: 282, 11 - size: 100, 43 - orig: 100, 43 - offset: 0, 0 - index: -1 -georgia/walk - rotate: false - xy: 120, 11 - size: 160, 43 - orig: 160, 43 - offset: 0, 0 - index: -1 -held/bloodclot-head-1 - rotate: false - xy: 801, 8 - size: 114, 82 - orig: 114, 82 - offset: 0, 0 - index: -1 -held/hand - rotate: false - xy: 324, 782 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -held/head - rotate: false - xy: 324, 540 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -inside-antique/glow - rotate: false - xy: 2, 782 - size: 320, 240 - orig: 320, 240 - offset: 0, 0 - index: -1 -inside-cafeteria/fight-new-assets/fight-4 - rotate: false - xy: 706, 286 - size: 256, 192 - orig: 256, 192 - offset: 0, 0 - index: -1 -inside-cafeteria/fight-new-assets/fight-5 - rotate: false - xy: 706, 92 - size: 256, 192 - orig: 256, 192 - offset: 0, 0 - index: -1 -inside-cafeteria/glow +dream/fountain rotate: false xy: 2, 540 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -inside-cafeteria/ladder-guard +outside-jail/fountain rotate: false - xy: 725, 3 - size: 74, 87 - orig: 74, 87 - offset: 0, 0 - index: -1 -inside-castle/sign3 - rotate: false - xy: 324, 56 - size: 44, 20 - orig: 44, 20 - offset: 0, 0 - index: -1 -inside-castle/sign-3 - rotate: false - xy: 324, 56 - size: 44, 20 - orig: 44, 20 - offset: 0, 0 - index: -1 -inside-house/glow - rotate: false - xy: 2, 298 + xy: 2, 540 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -inside-jail/glow +ego/love-26 + rotate: false + xy: 968, 952 + size: 50, 70 + orig: 50, 70 + offset: 0, 0 + index: -1 +ego/scoot + rotate: false + xy: 406, 24 + size: 200, 30 + orig: 200, 30 + offset: 0, 0 + index: -1 +held/hand rotate: false xy: 2, 56 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -inside-jail/warden +held/head rotate: false - xy: 706, 480 - size: 258, 58 - orig: 258, 58 - offset: 0, 0 - index: -1 -inventory-overlay - rotate: false - xy: 646, 540 + xy: 324, 298 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -outsidehouse/charcoal-2 +inside-antique/glow rotate: false - xy: 1001, 82 - size: 18, 18 - orig: 18, 18 + xy: 324, 782 + size: 320, 240 + orig: 320, 240 offset: 0, 0 index: -1 -outsidehouse/charcoal-3 +inside-cafeteria/glow rotate: false - xy: 1001, 62 - size: 18, 18 - orig: 18, 18 + xy: 2, 298 + size: 320, 240 + orig: 320, 240 offset: 0, 0 index: -1 -outsidehouse/charcoal-4 +inside-castle/sign3 rotate: false - xy: 1001, 42 - size: 18, 18 - orig: 18, 18 + xy: 406, 2 + size: 44, 20 + orig: 44, 20 offset: 0, 0 index: -1 -outsidehouse/house +inside-castle/sign-3 + rotate: false + xy: 406, 2 + size: 44, 20 + orig: 44, 20 + offset: 0, 0 + index: -1 +inside-house/glow + rotate: false + xy: 324, 540 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +inside-jail/chest-top + rotate: false + xy: 968, 63 + size: 44, 32 + orig: 44, 32 + offset: 0, 0 + index: -1 +inside-jail/glow rotate: false xy: 646, 782 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -space/bloodclot-head-talk-4 +inventory-overlay rotate: false - xy: 917, 15 - size: 82, 75 - orig: 82, 75 + xy: 646, 298 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outside-castle/steer + rotate: false + xy: 204, 19 + size: 200, 35 + orig: 200, 35 + offset: 0, 0 + index: -1 +outsidehouse/cauldron + rotate: false + xy: 2, 16 + size: 200, 38 + orig: 200, 38 + offset: 0, 0 + index: -1 +outsidehouse/charcoal-2 + rotate: false + xy: 452, 4 + size: 18, 18 + orig: 18, 18 + offset: 0, 0 + index: -1 +outsidehouse/charcoal-3 + rotate: false + xy: 472, 4 + size: 18, 18 + orig: 18, 18 + offset: 0, 0 + index: -1 +outsidehouse/charcoal-4 + rotate: false + xy: 492, 4 + size: 18, 18 + orig: 18, 18 + offset: 0, 0 + index: -1 +outsidehouse/foreground + rotate: false + xy: 2, 782 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +outsidehouse/house + rotate: false + xy: 324, 56 + size: 320, 240 + orig: 320, 240 offset: 0, 0 index: -1 space/later rotate: false - xy: 384, 56 + xy: 646, 56 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 title/banner rotate: false - xy: 384, 12 + xy: 802, 12 size: 171, 42 orig: 171, 42 offset: 0, 0 index: -1 +wizard/experiment-12 + rotate: false + xy: 968, 895 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-13 + rotate: false + xy: 968, 838 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-14 + rotate: false + xy: 968, 781 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-15 + rotate: false + xy: 968, 724 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-16 + rotate: false + xy: 968, 667 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-17 + rotate: false + xy: 968, 610 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 wizard/experiment-18 rotate: false - xy: 966, 483 + xy: 968, 553 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-19 rotate: false - xy: 968, 933 + xy: 968, 496 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-20 rotate: false - xy: 968, 876 + xy: 968, 439 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-21 rotate: false - xy: 968, 819 + xy: 968, 382 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-22 rotate: false - xy: 968, 762 + xy: 968, 325 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-23 rotate: false - xy: 968, 705 + xy: 968, 268 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-24 rotate: false - xy: 968, 648 + xy: 968, 211 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-25 rotate: false - xy: 968, 591 + xy: 968, 154 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/talk +wizard/experiment-26 rotate: false - xy: 2, 8 - size: 80, 46 - orig: 80, 46 + xy: 968, 97 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-27 + rotate: false + xy: 975, 6 + size: 45, 55 + orig: 45, 55 offset: 0, 0 index: -1 @@ -2455,352 +2336,387 @@ size: 1024,1024 format: RGBA8888 filter: Nearest,Nearest repeat: none +castle-gate/frankie-walk-1 + rotate: false + xy: 986, 700 + size: 24, 35 + orig: 24, 35 + offset: 0, 0 + index: -1 +castle-gate/frankie-walk-2 + rotate: false + xy: 986, 663 + size: 24, 35 + orig: 24, 35 + offset: 0, 0 + index: -1 +castle-gate/frankie-walk-3 + rotate: false + xy: 986, 626 + size: 24, 35 + orig: 24, 35 + offset: 0, 0 + index: -1 +castle-gate/frankie-walk-4 + rotate: false + xy: 986, 589 + size: 24, 35 + orig: 24, 35 + offset: 0, 0 + index: -1 +castle-gate/frankie-walk-5 + rotate: false + xy: 986, 552 + size: 24, 35 + orig: 24, 35 + offset: 0, 0 + index: -1 +castle-gate/frankie-walk-6 + rotate: false + xy: 986, 515 + size: 24, 35 + orig: 24, 35 + offset: 0, 0 + index: -1 +castle-gate/frankie-walk-7 + rotate: false + xy: 986, 478 + size: 24, 35 + orig: 24, 35 + offset: 0, 0 + index: -1 +castle-gate/goon-2-search + rotate: false + xy: 450, 20 + size: 192, 32 + orig: 192, 32 + offset: 0, 0 + index: -1 castle-gate/stash-closed rotate: false - xy: 2, 739 + xy: 2, 737 size: 70, 41 orig: 70, 41 offset: 0, 0 index: -1 -cat-tree/inventory +cat-tree/grandma-cry-1 rotate: false - xy: 324, 656 - size: 42, 42 - orig: 42, 42 + xy: 162, 738 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-2 + rotate: false + xy: 222, 738 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-3 + rotate: false + xy: 282, 738 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-4 + rotate: false + xy: 664, 738 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-5 + rotate: false + xy: 724, 738 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-6 + rotate: false + xy: 784, 738 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-7 + rotate: false + xy: 844, 738 + size: 58, 40 + orig: 58, 40 offset: 0, 0 index: -1 cat-tree/sillhoute rotate: false - xy: 2, 255 + xy: 2, 253 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 cat-tree/tree-and-rock rotate: false - xy: 366, 298 + xy: 324, 296 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 cat-tree/tree-r rotate: false - xy: 688, 13 + xy: 646, 8 size: 65, 240 orig: 65, 240 offset: 0, 0 index: -1 dream/pedestals rotate: false - xy: 2, 497 + xy: 2, 495 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 dream/sky rotate: false - xy: 368, 540 + xy: 342, 538 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 +dream/sword + rotate: false + xy: 324, 660 + size: 15, 38 + orig: 15, 38 + offset: 0, 0 + index: -1 ego/hold-hand rotate: false - xy: 946, 744 + xy: 324, 700 size: 16, 36 orig: 16, 36 offset: 0, 0 index: -1 -ego/sigh +ego/pant rotate: false - xy: 204, 744 - size: 162, 36 - orig: 162, 36 + xy: 904, 742 + size: 62, 36 + orig: 62, 36 offset: 0, 0 index: -1 -ego/squat +ego/standup rotate: false - xy: 690, 744 - size: 126, 36 - orig: 126, 36 - offset: 0, 0 - index: -1 -ego/stand - rotate: false - xy: 818, 744 - size: 126, 36 - orig: 126, 36 + xy: 713, 196 + size: 225, 55 + orig: 225, 55 offset: 0, 0 index: -1 ego/warden rotate: false - xy: 74, 739 + xy: 74, 737 size: 42, 41 orig: 42, 41 offset: 0, 0 index: -1 ending-castle/warden-2 rotate: false - xy: 118, 739 + xy: 118, 737 size: 42, 41 orig: 42, 41 offset: 0, 0 index: -1 -georgia/kick-10 +georgia/kick-2 rotate: false - xy: 324, 476 + xy: 324, 9 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 -georgia/kick-11 +georgia/kick-4 rotate: false - xy: 324, 431 + xy: 324, 9 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 -georgia/kick-12 +georgia/kick-3 rotate: false - xy: 324, 386 + xy: 366, 9 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 -georgia/kick-13 +georgia/kick-5 rotate: false - xy: 324, 341 + xy: 408, 9 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 -georgia/kick-14 +held/bloodclot-head-6 rotate: false - xy: 324, 296 - size: 40, 43 - orig: 40, 43 + xy: 821, 112 + size: 114, 82 + orig: 114, 82 offset: 0, 0 index: -1 -georgia/kick-15 +held/bloodclot-head-7 rotate: false - xy: 324, 251 - size: 40, 43 - orig: 40, 43 + xy: 821, 28 + size: 114, 82 + orig: 114, 82 offset: 0, 0 index: -1 -georgia/kick-16 +inside-antique/beard rotate: false - xy: 324, 206 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-17 - rotate: false - xy: 324, 161 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-18 - rotate: false - xy: 324, 116 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-19 - rotate: false - xy: 324, 71 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-20 - rotate: false - xy: 324, 26 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-7 - rotate: false - xy: 324, 611 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-8 - rotate: false - xy: 324, 566 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-9 - rotate: false - xy: 324, 521 - size: 40, 43 - orig: 40, 43 + xy: 937, 117 + size: 84, 54 + orig: 84, 54 offset: 0, 0 index: -1 inside-antique/open-blinds rotate: false - xy: 324, 782 + xy: 324, 780 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-antique/shopkeep-talk rotate: false - xy: 324, 3 + xy: 713, 173 size: 72, 21 orig: 72, 21 offset: 0, 0 index: -1 -inside-cafeteria/fight-new-assets/fight-6 - rotate: false - xy: 755, 61 - size: 256, 192 - orig: 256, 192 - offset: 0, 0 - index: -1 inside-castle/pedestal-overlay rotate: false - xy: 646, 782 + xy: 646, 780 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -inside-castle/roof - rotate: false - xy: 755, 2 - size: 57, 57 - orig: 57, 57 - offset: 0, 0 - index: -1 inside-castle/way-back-tree rotate: false - xy: 366, 56 + xy: 324, 54 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-house/sillhoute rotate: false - xy: 2, 13 + xy: 2, 11 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -inventory - rotate: false - xy: 324, 700 - size: 42, 42 - orig: 42, 42 - offset: 0, 0 - index: -1 outside-castle/walk-behind rotate: false - xy: 688, 255 + xy: 646, 253 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 +space/bloodclot-explode-1 + rotate: false + xy: 713, 6 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-4 + rotate: false + xy: 940, 173 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-5 + rotate: false + xy: 937, 40 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 space/bullet rotate: false - xy: 366, 30 + xy: 821, 2 size: 192, 24 orig: 192, 24 offset: 0, 0 index: -1 -space/susp - rotate: false - xy: 560, 18 - size: 126, 36 - orig: 126, 36 - offset: 0, 0 - index: -1 -talk-bg - rotate: false - xy: 162, 740 - size: 40, 40 - orig: 40, 40 - offset: 0, 0 - index: -1 the-end rotate: false - xy: 690, 497 + xy: 664, 495 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 title/logo rotate: false - xy: 2, 782 + xy: 2, 780 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -wizard/experiment-26 - rotate: false - xy: 968, 967 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-27 - rotate: false - xy: 968, 910 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 wizard/experiment-28 rotate: false - xy: 968, 853 + xy: 968, 965 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-29 rotate: false - xy: 968, 796 + xy: 968, 908 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-30 rotate: false - xy: 968, 739 + xy: 968, 851 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-31 rotate: false - xy: 814, 4 + xy: 968, 794 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-32 rotate: false - xy: 861, 4 + xy: 968, 737 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-33 rotate: false - xy: 908, 4 + xy: 968, 421 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-34 rotate: false - xy: 955, 4 + xy: 968, 364 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-35 + rotate: false + xy: 968, 307 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-36 + rotate: false + xy: 968, 250 size: 45, 55 orig: 45, 55 offset: 0, 0 @@ -2811,569 +2727,450 @@ size: 1024,1024 format: RGBA8888 filter: Nearest,Nearest repeat: none -castle-gate/Untitled - rotate: false - xy: 110, 10 - size: 192, 35 - orig: 192, 35 - offset: 0, 0 - index: -1 -castle-gate/frankie-walk-1 - rotate: false - xy: 983, 948 - size: 24, 35 - orig: 24, 35 - offset: 0, 0 - index: -1 -castle-gate/frankie-walk-2 - rotate: false - xy: 983, 911 - size: 24, 35 - orig: 24, 35 - offset: 0, 0 - index: -1 -castle-gate/frankie-walk-3 - rotate: false - xy: 983, 874 - size: 24, 35 - orig: 24, 35 - offset: 0, 0 - index: -1 -castle-gate/frankie-walk-4 - rotate: false - xy: 983, 837 - size: 24, 35 - orig: 24, 35 - offset: 0, 0 - index: -1 -castle-gate/frankie-walk-5 - rotate: false - xy: 983, 800 - size: 24, 35 - orig: 24, 35 - offset: 0, 0 - index: -1 -castle-gate/frankie-walk-6 - rotate: false - xy: 983, 763 - size: 24, 35 - orig: 24, 35 - offset: 0, 0 - index: -1 -castle-gate/frankie-walk-7 - rotate: false - xy: 983, 726 - size: 24, 35 - orig: 24, 35 - offset: 0, 0 - index: -1 castle-gate/frankie-walk-8 rotate: false - xy: 983, 689 + xy: 234, 927 size: 24, 35 orig: 24, 35 offset: 0, 0 index: -1 castle-gate/goon-2 rotate: false - xy: 983, 655 + xy: 234, 893 size: 24, 32 orig: 24, 32 offset: 0, 0 index: -1 -castle-gate/goon-2-search - rotate: false - xy: 304, 16 - size: 192, 32 - orig: 192, 32 - offset: 0, 0 - index: -1 castle-gate/goon-2-talk rotate: false - xy: 983, 621 + xy: 987, 12 size: 24, 32 orig: 24, 32 offset: 0, 0 index: -1 -castle-gate/throw-walkie-2 - rotate: false - xy: 776, 885 - size: 205, 136 - orig: 205, 136 - offset: 0, 0 - index: -1 castle-gate/throw-walkie-3 rotate: false - xy: 776, 747 + xy: 518, 525 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-4 rotate: false - xy: 776, 609 + xy: 518, 387 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-5 rotate: false - xy: 518, 497 + xy: 594, 82 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-6 rotate: false - xy: 772, 471 + xy: 801, 82 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-7 rotate: false - xy: 772, 333 + xy: 725, 525 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-8 rotate: false - xy: 518, 359 + xy: 776, 719 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-9 rotate: false - xy: 2, 303 + xy: 725, 387 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 -cat-tree/owl +cat-tree/grandma-cry-8 rotate: false - xy: 704, 160 - size: 168, 30 - orig: 168, 30 + xy: 927, 4 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/inventory + rotate: false + xy: 883, 2 + size: 42, 42 + orig: 42, 42 offset: 0, 0 index: -1 dream/corner-l rotate: false - xy: 498, 7 - size: 112, 59 - orig: 112, 59 - offset: 0, 0 - index: -1 -dream/corner-r - rotate: false - xy: 612, 15 + xy: 94, 5 size: 112, 59 orig: 112, 59 offset: 0, 0 index: -1 ego/georgia rotate: false - xy: 896, 44 + xy: 932, 418 size: 90, 30 orig: 90, 30 offset: 0, 0 index: -1 ego/get-sick rotate: false - xy: 874, 167 + xy: 818, 681 size: 108, 36 orig: 108, 36 offset: 0, 0 index: -1 -ego/hand-hold +ego/grow rotate: false - xy: 983, 985 - size: 36, 36 - orig: 36, 36 + xy: 932, 450 + size: 90, 36 + orig: 90, 36 offset: 0, 0 index: -1 -ending-castle/hand-hold +ego/reach rotate: false - xy: 983, 985 - size: 36, 36 - orig: 36, 36 + xy: 518, 260 + size: 72, 36 + orig: 72, 36 offset: 0, 0 index: -1 -ego/scoot +ego/scared rotate: false - xy: 502, 160 - size: 200, 30 - orig: 200, 30 + xy: 518, 222 + size: 72, 36 + orig: 72, 36 + offset: 0, 0 + index: -1 +ego/sigh + rotate: false + xy: 94, 66 + size: 162, 36 + orig: 162, 36 offset: 0, 0 index: -1 ego/spear rotate: false - xy: 110, 201 + xy: 2, 2 size: 90, 100 orig: 90, 100 offset: 0, 0 index: -1 -ego/standup +ego/squat-talk rotate: false - xy: 194, 50 - size: 225, 55 - orig: 225, 55 + xy: 518, 184 + size: 72, 36 + orig: 72, 36 offset: 0, 0 index: -1 -ego/thorw +georgia/kick-6 rotate: false - xy: 726, 2 - size: 126, 36 - orig: 126, 36 - offset: 0, 0 - index: -1 -ego/throw - rotate: false - xy: 854, 2 - size: 126, 36 - orig: 126, 36 - offset: 0, 0 - index: -1 -ending-castle/frankie-fall-1 - rotate: false - xy: 979, 572 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -ending-castle/frankie-fall-10 - rotate: false - xy: 982, 276 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -ending-castle/frankie-fall-11 - rotate: false - xy: 982, 239 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -ending-castle/frankie-fall-2 - rotate: false - xy: 979, 535 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -ending-castle/frankie-fall-3 - rotate: false - xy: 979, 498 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -ending-castle/frankie-fall-4 - rotate: false - xy: 979, 461 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -ending-castle/frankie-fall-5 - rotate: false - xy: 979, 424 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -ending-castle/frankie-fall-6 - rotate: false - xy: 979, 387 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -ending-castle/frankie-fall-7 - rotate: false - xy: 979, 350 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -ending-castle/frankie-fall-8 - rotate: false - xy: 979, 313 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -ending-castle/frankie-fall-9 - rotate: false - xy: 982, 7 - size: 40, 35 - orig: 40, 35 + xy: 776, 674 + size: 40, 43 + orig: 40, 43 offset: 0, 0 index: -1 goon-2-walk rotate: false - xy: 726, 40 + xy: 839, 46 size: 168, 34 orig: 168, 34 offset: 0, 0 index: -1 castle-gate/goon-2-walk rotate: false - xy: 726, 40 + xy: 839, 46 size: 168, 34 orig: 168, 34 offset: 0, 0 index: -1 -held/bloodclot-head-2 +held/bloodclot-head-8 rotate: false - xy: 551, 76 + xy: 2, 880 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 -held/bloodclot-head-3 +held/bloodclot-head-9 rotate: false - xy: 667, 76 - size: 114, 82 - orig: 114, 82 - offset: 0, 0 - index: -1 -held/bloodclot-head-4 - rotate: false - xy: 783, 76 - size: 114, 82 - orig: 114, 82 - offset: 0, 0 - index: -1 -held/bloodclot-head-5 - rotate: false - xy: 899, 83 + xy: 118, 880 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 inside-cafeteria/fight-new-assets/fight-10 rotate: false - xy: 2, 635 + xy: 2, 298 size: 256, 192 orig: 256, 192 offset: 0, 0 index: -1 inside-cafeteria/fight-new-assets/fight-11 rotate: false - xy: 260, 635 + xy: 260, 275 size: 256, 192 orig: 256, 192 offset: 0, 0 index: -1 inside-cafeteria/fight-new-assets/fight-12 rotate: false - xy: 518, 635 + xy: 2, 104 size: 256, 192 orig: 256, 192 offset: 0, 0 index: -1 inside-cafeteria/fight-new-assets/fight-13 rotate: false - xy: 2, 441 + xy: 260, 81 size: 256, 192 orig: 256, 192 offset: 0, 0 index: -1 inside-cafeteria/fight-new-assets/fight-14 rotate: false - xy: 260, 441 + xy: 518, 663 + size: 256, 192 + orig: 256, 192 + offset: 0, 0 + index: -1 +inside-cafeteria/fight-new-assets/fight-6 + rotate: false + xy: 2, 686 size: 256, 192 orig: 256, 192 offset: 0, 0 index: -1 inside-cafeteria/fight-new-assets/fight-7 rotate: false - xy: 2, 829 + xy: 260, 663 size: 256, 192 orig: 256, 192 offset: 0, 0 index: -1 inside-cafeteria/fight-new-assets/fight-8 rotate: false - xy: 260, 829 + xy: 2, 492 size: 256, 192 orig: 256, 192 offset: 0, 0 index: -1 inside-cafeteria/fight-new-assets/fight-9 rotate: false - xy: 518, 829 + xy: 260, 469 size: 256, 192 orig: 256, 192 offset: 0, 0 index: -1 -inside-cafeteria/hands-fight-3 +inside-cafeteria/ladder-guard rotate: false - xy: 2, 28 - size: 106, 106 - orig: 106, 106 + xy: 518, 298 + size: 74, 87 + orig: 74, 87 offset: 0, 0 index: -1 -inside-cafeteria/hands-fight-4 +inside-castle/hands-1 rotate: false - xy: 874, 205 - size: 106, 106 - orig: 106, 106 + xy: 918, 281 + size: 104, 104 + orig: 104, 104 offset: 0, 0 index: -1 -inside-cafeteria/hands-fight-5 +inside-castle/roof rotate: false - xy: 725, 208 - size: 106, 106 - orig: 106, 106 + xy: 518, 87 + size: 57, 57 + orig: 57, 57 offset: 0, 0 index: -1 -inside-jail/chest-top +inside-jail/warden rotate: false - xy: 725, 316 - size: 44, 32 - orig: 44, 32 + xy: 2, 964 + size: 258, 58 + orig: 258, 58 offset: 0, 0 index: -1 -outsidehouse/fg1 +inventory rotate: false - xy: 421, 68 - size: 128, 63 - orig: 128, 63 + xy: 839, 2 + size: 42, 42 + orig: 42, 42 offset: 0, 0 index: -1 -space/bloodclot-explode-1 +outside-castle/balloons rotate: false - xy: 209, 274 + xy: 518, 146 + size: 60, 36 + orig: 60, 36 + offset: 0, 0 + index: -1 +outsidehouse/fgtest + rotate: false + xy: 762, 5 + size: 75, 75 + orig: 75, 75 + offset: 0, 0 + index: -1 +space/bloodclot-explode-10 + rotate: false + xy: 910, 857 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-11 + rotate: false + xy: 810, 220 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-2 rotate: false - xy: 2, 136 + xy: 262, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-3 rotate: false - xy: 317, 274 + xy: 370, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-4 rotate: false - xy: 509, 192 + xy: 478, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-5 rotate: false - xy: 617, 192 + xy: 586, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-6 rotate: false - xy: 202, 107 + xy: 694, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-7 rotate: false - xy: 310, 107 + xy: 594, 220 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-8 + rotate: false + xy: 702, 220 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-9 + rotate: false + xy: 802, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-head-talk-10 rotate: false - xy: 418, 133 + xy: 932, 642 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 -space/bloodclot-head-talk-5 +space/bloodclot-head-talk-11 rotate: false - xy: 425, 364 + xy: 932, 565 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-12 + rotate: false + xy: 932, 488 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-13 + rotate: false + xy: 594, 5 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-14 + rotate: false + xy: 678, 5 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-6 rotate: false - xy: 425, 287 + xy: 258, 4 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-7 rotate: false - xy: 425, 210 + xy: 342, 4 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-8 rotate: false - xy: 110, 124 + xy: 426, 4 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-9 rotate: false - xy: 110, 47 + xy: 510, 4 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 -wizard/cloud - rotate: false - xy: 982, 207 - size: 40, 30 - orig: 40, 30 - offset: 0, 0 - index: -1 -wizard/experiment-35 - rotate: false - xy: 725, 578 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-36 - rotate: false - xy: 725, 521 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 wizard/experiment-37 rotate: false - xy: 725, 464 + xy: 208, 9 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-38 rotate: false - xy: 725, 407 + xy: 918, 224 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-39 rotate: false - xy: 725, 350 + xy: 965, 224 size: 45, 55 orig: 45, 55 offset: 0, 0 @@ -3384,276 +3181,486 @@ size: 1024,1024 format: RGBA8888 filter: Nearest,Nearest repeat: none -ego/grow +cat-tree/grandma-cry-10 rotate: false - xy: 619, 844 - size: 90, 36 - orig: 90, 36 + xy: 2, 39 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-11 + rotate: false + xy: 110, 206 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-12 + rotate: false + xy: 326, 707 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-13 + rotate: false + xy: 218, 289 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-14 + rotate: false + xy: 434, 832 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-15 + rotate: false + xy: 110, 164 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-16 + rotate: false + xy: 326, 665 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-17 + rotate: false + xy: 434, 790 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-18 + rotate: false + xy: 110, 122 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-19 + rotate: false + xy: 326, 623 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-20 + rotate: false + xy: 218, 247 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-9 + rotate: false + xy: 434, 874 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/owl + rotate: false + xy: 542, 992 + size: 168, 30 + orig: 168, 30 + offset: 0, 0 + index: -1 +dream/corner-r + rotate: false + xy: 218, 521 + size: 112, 59 + orig: 112, 59 offset: 0, 0 index: -1 ego/hold-up-to-window rotate: false - xy: 619, 882 + xy: 218, 331 size: 108, 36 orig: 108, 36 offset: 0, 0 index: -1 -ego/pant +ego/squat rotate: false - xy: 729, 882 - size: 62, 36 - orig: 62, 36 + xy: 854, 986 + size: 126, 36 + orig: 126, 36 offset: 0, 0 index: -1 -ego/reach +ego/stand rotate: false - xy: 218, 280 - size: 72, 36 - orig: 72, 36 + xy: 218, 483 + size: 126, 36 + orig: 126, 36 offset: 0, 0 index: -1 -ego/scared +ego/suspended rotate: false - xy: 326, 449 - size: 72, 36 - orig: 72, 36 + xy: 712, 986 + size: 140, 36 + orig: 140, 36 offset: 0, 0 index: -1 -ending-castle/frankie-fall-12 +ego/thorw rotate: false - xy: 218, 243 + xy: 218, 407 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +ego/throw + rotate: false + xy: 218, 369 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +ending-castle/frankie-fall-1 + rotate: false + xy: 2, 2 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 -held/bloodclot-head-6 +ending-castle/frankie-fall-10 rotate: false - xy: 542, 920 - size: 114, 82 - orig: 114, 82 + xy: 128, 2 + size: 40, 35 + orig: 40, 35 offset: 0, 0 index: -1 -held/bloodclot-head-7 +ending-castle/frankie-fall-11 rotate: false - xy: 658, 920 - size: 114, 82 - orig: 114, 82 + xy: 170, 2 + size: 40, 35 + orig: 40, 35 offset: 0, 0 index: -1 -held/bloodclot-head-8 +ending-castle/frankie-fall-12 rotate: false - xy: 774, 920 - size: 114, 82 - orig: 114, 82 + xy: 188, 39 + size: 40, 35 + orig: 40, 35 offset: 0, 0 index: -1 -held/bloodclot-head-9 +ending-castle/frankie-fall-2 rotate: false - xy: 890, 920 - size: 114, 82 - orig: 114, 82 + xy: 44, 2 + size: 40, 35 + orig: 40, 35 offset: 0, 0 index: -1 -inside-antique/beard +ending-castle/frankie-fall-3 rotate: false - xy: 434, 704 - size: 84, 54 - orig: 84, 54 + xy: 86, 2 + size: 40, 35 + orig: 40, 35 + offset: 0, 0 + index: -1 +ending-castle/frankie-fall-4 + rotate: false + xy: 170, 121 + size: 40, 35 + orig: 40, 35 + offset: 0, 0 + index: -1 +ending-castle/frankie-fall-5 + rotate: false + xy: 386, 622 + size: 40, 35 + orig: 40, 35 + offset: 0, 0 + index: -1 +ending-castle/frankie-fall-6 + rotate: false + xy: 212, 120 + size: 40, 35 + orig: 40, 35 + offset: 0, 0 + index: -1 +ending-castle/frankie-fall-7 + rotate: false + xy: 104, 40 + size: 40, 35 + orig: 40, 35 + offset: 0, 0 + index: -1 +ending-castle/frankie-fall-8 + rotate: false + xy: 496, 757 + size: 40, 35 + orig: 40, 35 + offset: 0, 0 + index: -1 +ending-castle/frankie-fall-9 + rotate: false + xy: 146, 39 + size: 40, 35 + orig: 40, 35 + offset: 0, 0 + index: -1 +georgia/kick-10 + rotate: false + xy: 170, 203 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-11 + rotate: false + xy: 494, 871 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-12 + rotate: false + xy: 386, 659 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-13 + rotate: false + xy: 170, 158 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-14 + rotate: false + xy: 494, 826 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-15 + rotate: false + xy: 110, 77 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-16 + rotate: false + xy: 278, 241 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-17 + rotate: false + xy: 212, 202 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-18 + rotate: false + xy: 212, 157 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-19 + rotate: false + xy: 332, 544 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-20 + rotate: false + xy: 152, 76 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-7 + rotate: false + xy: 982, 979 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-8 + rotate: false + xy: 386, 704 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-9 + rotate: false + xy: 278, 286 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +inside-cafeteria/hands-fight-3 + rotate: false + xy: 218, 582 + size: 106, 106 + orig: 106, 106 + offset: 0, 0 + index: -1 +inside-cafeteria/hands-fight-4 + rotate: false + xy: 326, 749 + size: 106, 106 + orig: 106, 106 + offset: 0, 0 + index: -1 +inside-cafeteria/hands-fight-5 + rotate: false + xy: 434, 916 + size: 106, 106 + orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-6 rotate: false - xy: 110, 228 + xy: 2, 81 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-7 rotate: false - xy: 218, 395 + xy: 110, 248 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 -inside-castle/hands-1 - rotate: false - xy: 326, 564 - size: 104, 104 - orig: 104, 104 - offset: 0, 0 - index: -1 inside-jail/chest-top-open rotate: false - xy: 110, 55 + xy: 326, 589 size: 44, 32 orig: 44, 32 offset: 0, 0 index: -1 -outside-castle/balloons +outsidehouse/fg1 rotate: false - xy: 711, 844 - size: 60, 36 - orig: 60, 36 - offset: 0, 0 - index: -1 -outside-castle/brush-bl - rotate: false - xy: 110, 89 - size: 60, 60 - orig: 60, 60 - offset: 0, 0 - index: -1 -outsidehouse/fgtest - rotate: false - xy: 542, 843 - size: 75, 75 - orig: 75, 75 - offset: 0, 0 - index: -1 -space/bloodclot-explode-10 - rotate: false - xy: 110, 837 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-11 - rotate: false - xy: 2, 503 - size: 106, 165 - orig: 106, 165 + xy: 542, 927 + size: 128, 63 + orig: 128, 63 offset: 0, 0 index: -1 space/bloodclot-explode-12 rotate: false - xy: 110, 670 + xy: 2, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-13 rotate: false - xy: 218, 837 + xy: 2, 690 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-14 rotate: false - xy: 2, 336 + xy: 110, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-15 rotate: false - xy: 110, 503 + xy: 2, 523 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-16 rotate: false - xy: 218, 670 + xy: 110, 690 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-17 rotate: false - xy: 326, 837 + xy: 218, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-18 rotate: false - xy: 2, 169 + xy: 2, 356 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-19 rotate: false - xy: 110, 336 + xy: 110, 523 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-20 rotate: false - xy: 218, 503 + xy: 218, 690 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-21 rotate: false - xy: 326, 670 + xy: 326, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-22 rotate: false - xy: 434, 837 + xy: 2, 189 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-23 rotate: false - xy: 2, 2 + xy: 110, 356 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 -space/bloodclot-explode-8 +space/susp rotate: false - xy: 2, 837 - size: 106, 165 - orig: 106, 165 + xy: 218, 445 + size: 126, 36 + orig: 126, 36 offset: 0, 0 index: -1 -space/bloodclot-explode-9 +talk-bg rotate: false - xy: 2, 670 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-11 - rotate: false - xy: 434, 760 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-12 - rotate: false - xy: 110, 151 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-13 - rotate: false - xy: 218, 318 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-14 - rotate: false - xy: 326, 487 - size: 82, 75 - orig: 82, 75 + xy: 62, 39 + size: 40, 40 + orig: 40, 40 offset: 0, 0 index: -1 title/balloon rotate: false - xy: 434, 672 + xy: 434, 758 size: 60, 30 orig: 60, 30 offset: 0, 0 index: -1 +wizard/cloud + rotate: false + xy: 494, 794 + size: 40, 30 + orig: 40, 30 + offset: 0, 0 + index: -1 diff --git a/desktop/resources/packed/pack2.png b/desktop/resources/packed/pack2.png index 1badc457..7e031dc4 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 65f93ce9..aead9777 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 266b39c1..28e48585 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 42758d8a..56d74526 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 756168dd..1803c3e9 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 6a1c6ba7..7dc1f34f 100644 Binary files a/desktop/resources/packed/pack8.png and b/desktop/resources/packed/pack8.png differ diff --git a/desktop/resources/packed/pack9.png b/desktop/resources/packed/pack9.png index 433c30f5..f433729f 100644 Binary files a/desktop/resources/packed/pack9.png and b/desktop/resources/packed/pack9.png differ diff --git a/desktop/src-common/advent/actions.clj b/desktop/src-common/advent/actions.clj index e53e652e..42098601 100644 --- a/desktop/src-common/advent/actions.clj +++ b/desktop/src-common/advent/actions.clj @@ -957,3 +957,10 @@ (constantly (get-in @entities [:cam :zoom])) nil (* 0.01 (inc n))))) + +(defn squat-talk [entities & msgs] + (when (seq msgs) + (do + (actions/talk entities :ego (first msgs) :anim :squat-talk :stop? false) + (Thread/sleep 200) + (recur entities (rest msgs))))) diff --git a/desktop/src-common/advent/screens/rooms/dream.clj b/desktop/src-common/advent/screens/rooms/dream.clj index 17f212f7..8de5eb69 100644 --- a/desktop/src-common/advent/screens/rooms/dream.clj +++ b/desktop/src-common/advent/screens/rooms/dream.clj @@ -84,17 +84,21 @@ (actions/do-stop entities :ego :face :left) (actions/do-stop entities :ego :face :right))) + + (defn read-sword-plaque [entities] (actions/walk-to entities :ego [168 76] :face :left) (if-not (get-in @entities [:state :plaques-read :sword]) (do (actions/talk entities :ego "There's a plaque here.") - (actions/play-animation entities :ego :squat) + (actions/play-animation entities :ego :start-squat-2 :stop? false) + (actions/squat-talk entities + "\"A noble choice to be a knight.\nStrength and valor guard thee from fright." + "There’s no need to shove\nTo find thy true love," + "'Cause maidens swoon for guys with might.\"") + (actions/play-animation entities :ego :end-squat) (actions/do-dialogue entities - :ego "\"A noble choice to be a knight.\nStrength and valor guard thee from fright." - :ego "There’s no need to shove\nTo find thy true love," - :ego "'Cause maidens swoon for guys with might.\"" :ego "Awesome!" :ego "If I become a knight, maybe Georgia McGorgeous will love me!") (actions/in-love entities)) @@ -112,14 +116,17 @@ :fairy-godfather "And you're just not cut out for it!")) (actions/update-state entities #(update-in % [:plaques-read] conj :sword))) + + (defn read-broom-plaque [entities] (actions/walk-to entities :ego [267 70] :face :right) (actions/talk entities :ego "There's a plaque here.") - (actions/play-animation entities :ego :squat) - (actions/do-dialogue entities - :ego "\"Grab thy broom, son, and sweep that dirt!\nSweep and mop till thy armpits hurt." - :ego "Thou smell like a hog,\nWith stench like a fog," - :ego "So with thou no cute babes wouldst flirt.\"") + (actions/play-animation entities :ego :start-squat-2 :stop? false) + (actions/squat-talk entities + "\"Grab thy broom, son, and sweep that dirt!\nSweep and mop till thy armpits hurt." + "Thou smell like a hog,\nWith stench like a fog," + "So with thou no cute babes wouldst flirt.\"") + (actions/play-animation entities :ego :end-squat) (actions/play-animation entities :ego :sigh) (when-not (get-in @entities [:room :entities :fairy-godfather :distracted?]) @@ -136,11 +143,12 @@ (defn read-shovel-plaque [entities] (actions/walk-to entities :ego [61 72] :face :left) (actions/talk entities :ego "There's a plaque here.") - (actions/play-animation entities :ego :squat) - (actions/do-dialogue entities - :ego "\"With thy shovel thou will enroll\nFor the dead man a resting hole." - :ego "Thou doth own the night\nBut beware the plight:" - :ego "Thou will not wed, if twas thy goal.\"") + (actions/play-animation entities :ego :start-squat-2 :stop? false) + (actions/squat-talk entities + "\"With thy shovel thou will enroll\nFor the dead man a resting hole." + "Thou doth own the night\nBut beware the plight:" + "Thou will not wed, if twas thy goal.\"") + (actions/play-animation entities :ego :end-squat) (actions/play-animation entities :ego :sigh) (when-not (get-in @entities [:room :entities :fairy-godfather :distracted?]) (face-fairy entities) diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index 7be2ac46..18623706 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -314,11 +314,12 @@ (actions/do-dialogue entities :ego "I can't pull it out!" :ego "It looks like there's an inscription here.") - (actions/play-animation entities :ego :squat) - (actions/do-dialogue entities - :ego "\"In the day when I shall be pulled,\nWith much strength a knight will take hold." - :ego "Courage will he need,\nWisdom he shall heed." - :ego "A final test remains, behold!\"") + (actions/play-animation entities :ego :start-squat-2 :stop? false) + (actions/squat-talk entities + "\"In the day when I shall be pulled,\nWith much strength a knight will take hold." + "Courage will he need,\nWisdom he shall heed." + "A final test remains, behold!\"") + (actions/play-animation entities :ego :end-squat) (if (= 3 (count missing-items)) (do (actions/walk-to entities :ego [115 54]) diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index a768b750..0a540ea1 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -513,6 +513,7 @@ void main () (texture (aget fire-sheet 0 i)))) grow (animation 0.1 (for [i [0 1 1 1 1 1 1 1 1 1 1 0 0 0 0 3 0 0 0 0 3 0 0 0 3 3 0 0 0 2 2 0 0 2 0 0 2 0 2 0 2 0 2 0 2 0 2 3 2 3 2 3 2 3 2 4 3 4 3 4 3 4]] (texture (aget grow-sheet 0 i)))) + squat-talk (utils/make-anim "ego/squat-talk.png" [18 36] 0.2 [0 1 0 2 1 0 3]) frog (utils/make-anim "ego/frog.png" [16 36] 0.1 [0]) frog-nod (utils/make-anim "ego/frog.png" [16 36] 0.2 [0 1 0 1 0 1 0 1]) hold-up-to-window (utils/make-anim "ego/hold-up-to-window.png" [18 36] 0.1 [0 1 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 2 1 0 0 0 0 0 0]) @@ -563,6 +564,7 @@ void main () :stand stand-anim :talk talk-anim :squat squat-anim + :squat-talk squat-talk :start-squat start-squat :start-squat-2 start-squat-2 :end-squat end-squat @@ -621,6 +623,7 @@ void main () :left {:walk (utils/flip walk-right) :stand (utils/flip stand-anim) :talk (utils/flip talk-anim) + :squat-talk (utils/flip squat-talk) :start-squat (utils/flip start-squat) :start-squat-2 (utils/flip start-squat-2) :end-squat (utils/flip end-squat)