diff --git a/desktop/asset-work/ending-castle/crowd-left.png b/desktop/asset-work/ending-castle/crowd-left.png new file mode 100644 index 00000000..690a02c6 Binary files /dev/null and b/desktop/asset-work/ending-castle/crowd-left.png differ diff --git a/desktop/asset-work/ending-castle/crowd-left.pxi b/desktop/asset-work/ending-castle/crowd-left.pxi new file mode 100644 index 00000000..322deb48 Binary files /dev/null and b/desktop/asset-work/ending-castle/crowd-left.pxi differ diff --git a/desktop/asset-work/ending-castle/guard-1.png b/desktop/asset-work/ending-castle/guard-1.png new file mode 100644 index 00000000..f68fc698 Binary files /dev/null and b/desktop/asset-work/ending-castle/guard-1.png differ diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas index e68f0a7a..38291ec9 100644 --- a/desktop/resources/packed/pack.atlas +++ b/desktop/resources/packed/pack.atlas @@ -123,14 +123,14 @@ cat-tree/dot orig: 1, 1 offset: 0, 0 index: -1 -inside-antique/dot +ego/dot rotate: false xy: 846, 784 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 -title/dot +inside-antique/dot rotate: false xy: 846, 784 size: 1, 1 @@ -144,7 +144,7 @@ outsidehouse/dot orig: 1, 1 offset: 0, 0 index: -1 -inside-jail/dot +dream/dot rotate: false xy: 846, 784 size: 1, 1 @@ -158,14 +158,7 @@ inside-house/dot 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 +title/dot rotate: false xy: 846, 784 size: 1, 1 @@ -179,6 +172,13 @@ wizard/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 cat-tree/monocle rotate: false xy: 992, 839 @@ -354,14 +354,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 @@ -773,6 +773,20 @@ cat-tree/grandma orig: 275, 36 offset: 0, 0 index: -1 +cloud + rotate: false + xy: 993, 708 + size: 15, 15 + orig: 15, 15 + offset: 0, 0 + index: -1 +space/cloud + rotate: false + xy: 993, 708 + size: 15, 15 + orig: 15, 15 + offset: 0, 0 + index: -1 dream/background rotate: false xy: 324, 311 @@ -801,13 +815,6 @@ dream/fairy-godfather-magic orig: 500, 77 offset: 0, 0 index: -1 -dream/shovel - rotate: false - xy: 993, 717 - size: 19, 64 - orig: 19, 64 - offset: 0, 0 - index: -1 dream/sign rotate: false xy: 981, 927 @@ -927,6 +934,13 @@ ending-castle/ending-castle2-assets/background orig: 320, 240 offset: 0, 0 index: -1 +ending-castle/guard-1 + rotate: false + xy: 993, 725 + size: 27, 56 + orig: 27, 56 + offset: 0, 0 + index: -1 georgia/kick-1 rotate: false xy: 634, 892 @@ -1157,20 +1171,6 @@ size: 1024,1024 format: RGBA8888 filter: Nearest,Nearest repeat: none -cloud - rotate: false - xy: 611, 2 - size: 15, 15 - orig: 15, 15 - offset: 0, 0 - index: -1 -space/cloud - rotate: false - xy: 611, 2 - size: 15, 15 - orig: 15, 15 - offset: 0, 0 - index: -1 ego/cat-toy rotate: false xy: 404, 4 @@ -2296,168 +2296,203 @@ filter: Nearest,Nearest repeat: none castle-gate/goon-2-talk rotate: false - xy: 500, 443 + xy: 531, 264 size: 24, 32 orig: 24, 32 offset: 0, 0 index: -1 -castle-gate/stash-closed - rotate: false - xy: 2, 13 - size: 70, 41 - orig: 70, 41 - offset: 0, 0 - index: -1 castle-gate/throw-walkie-1 rotate: false - xy: 324, 477 + xy: 2, 160 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-2 rotate: false - xy: 531, 402 + xy: 324, 402 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-3 rotate: false - xy: 500, 264 + xy: 646, 719 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-4 rotate: false - xy: 707, 239 + xy: 2, 22 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-5 rotate: false - xy: 500, 126 + xy: 646, 581 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-6 rotate: false - xy: 707, 101 + xy: 324, 264 + size: 205, 136 + orig: 205, 136 + offset: 0, 0 + index: -1 +castle-gate/throw-walkie-7 + rotate: false + xy: 317, 126 + size: 205, 136 + orig: 205, 136 + offset: 0, 0 + index: -1 +castle-gate/throw-walkie-8 + rotate: false + xy: 646, 443 + size: 205, 136 + orig: 205, 136 + offset: 0, 0 + index: -1 +castle-gate/throw-walkie-9 + rotate: false + xy: 598, 305 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 cat-tree/grandma-cry-1 rotate: false - xy: 440, 307 + xy: 956, 186 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-10 rotate: false - xy: 851, 59 + xy: 961, 647 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-11 rotate: false - xy: 851, 17 + xy: 961, 605 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-12 + rotate: false + xy: 961, 563 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-13 + rotate: false + xy: 961, 521 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-14 + rotate: false + xy: 961, 479 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-15 + rotate: false + xy: 961, 437 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-16 + rotate: false + xy: 961, 395 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-2 rotate: false - xy: 440, 265 + xy: 780, 19 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-3 rotate: false - xy: 440, 223 + xy: 956, 144 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-4 rotate: false - xy: 964, 648 + xy: 956, 102 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-5 rotate: false - xy: 440, 181 + xy: 956, 60 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-6 rotate: false - xy: 954, 510 + xy: 961, 815 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-7 rotate: false - xy: 954, 468 + xy: 961, 773 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-8 rotate: false - xy: 954, 426 + xy: 961, 731 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-9 rotate: false - xy: 438, 62 + xy: 961, 689 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/tree-and-rock rotate: false - xy: 2, 298 + xy: 324, 782 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 cat-tree/tree-r rotate: false - xy: 538, 540 + xy: 531, 298 size: 65, 240 orig: 65, 240 offset: 0, 0 index: -1 -dream/broom - rotate: false - xy: 820, 789 - size: 15, 66 - orig: 15, 66 - offset: 0, 0 - index: -1 -dream/cliff - rotate: false - xy: 768, 12 - size: 81, 87 - orig: 81, 87 - offset: 0, 0 - index: -1 dream/corner-l rotate: false - xy: 324, 81 + xy: 607, 12 size: 112, 59 orig: 112, 59 offset: 0, 0 @@ -2469,366 +2504,240 @@ dream/sky orig: 320, 240 offset: 0, 0 index: -1 -dream/sword - rotate: false - xy: 693, 543 - size: 15, 38 - orig: 15, 38 - offset: 0, 0 - index: -1 ego/frog rotate: false - xy: 440, 143 + xy: 598, 267 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 ego/georgia rotate: false - xy: 605, 583 + xy: 317, 25 size: 90, 30 orig: 90, 30 offset: 0, 0 index: -1 ego/reach rotate: false - xy: 911, 5 + xy: 409, 19 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 -ego/spear +ending-castle/frankie-fall-1 rotate: false - xy: 929, 690 - size: 90, 100 - orig: 90, 100 + xy: 968, 857 + size: 40, 35 + orig: 40, 35 offset: 0, 0 index: -1 -ego/warden +ending-castle/frankie-fall-2 rotate: false - xy: 605, 540 - size: 42, 41 - orig: 42, 41 - offset: 0, 0 - index: -1 -ending-castle/warden-2 - rotate: false - xy: 649, 540 - size: 42, 41 - orig: 42, 41 + xy: 961, 358 + size: 40, 35 + orig: 40, 35 offset: 0, 0 index: -1 georgia/kick-10 rotate: false - xy: 880, 636 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-11 - rotate: false - xy: 922, 636 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-12 - rotate: false - xy: 970, 979 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-13 - rotate: false - xy: 970, 934 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-14 - rotate: false - xy: 970, 889 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-15 - rotate: false - xy: 954, 381 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-16 - rotate: false - xy: 608, 4 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-17 - rotate: false - xy: 650, 4 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-18 - rotate: false - xy: 410, 17 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-19 - rotate: false - xy: 452, 17 + xy: 805, 308 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-3 rotate: false - xy: 74, 11 + xy: 598, 495 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-5 rotate: false - xy: 116, 11 + xy: 805, 398 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-6 rotate: false - xy: 158, 11 + xy: 968, 939 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-7 rotate: false - xy: 200, 11 + xy: 598, 450 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-8 rotate: false - xy: 242, 11 + xy: 805, 353 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-9 rotate: false - xy: 284, 11 + xy: 968, 894 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 held/bloodclot-head-1 rotate: false - xy: 324, 226 - size: 114, 82 - orig: 114, 82 - offset: 0, 0 - index: -1 -held/bloodclot-head-2 - rotate: false - xy: 324, 142 - size: 114, 82 - orig: 114, 82 - offset: 0, 0 - index: -1 -held/bloodclot-head-3 - rotate: false - xy: 881, 552 + xy: 491, 13 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-2 rotate: false - xy: 821, 681 + xy: 209, 23 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 -inside-cafeteria/hands-fight-3 - rotate: false - xy: 500, 18 - size: 106, 106 - orig: 106, 106 - offset: 0, 0 - index: -1 -inside-cafeteria/knights - rotate: false - xy: 692, 2 - size: 74, 97 - orig: 74, 97 - offset: 0, 0 - index: -1 inside-cafeteria/warriors rotate: false - xy: 432, 349 + xy: 956, 228 size: 66, 126 orig: 66, 126 offset: 0, 0 index: -1 inside-castle/roof rotate: false - xy: 821, 622 + xy: 721, 2 size: 57, 57 orig: 57, 57 offset: 0, 0 index: -1 inside-castle/way-back-tree rotate: false - xy: 324, 782 + xy: 324, 540 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outside-castle/balloons rotate: false - xy: 438, 104 + xy: 956, 22 size: 60, 36 orig: 60, 36 offset: 0, 0 index: -1 outside-castle/walk-behind rotate: false - xy: 2, 56 + xy: 2, 298 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outside-jail/guard-sleep rotate: false - xy: 646, 788 + xy: 317, 57 size: 172, 67 orig: 172, 67 offset: 0, 0 index: -1 outsidehouse/fg1 rotate: false - xy: 837, 792 + xy: 632, 73 size: 128, 63 orig: 128, 63 offset: 0, 0 index: -1 space/Blergh rotate: false - xy: 324, 310 + xy: 860, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-flex rotate: false - xy: 605, 615 + xy: 853, 690 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-stand rotate: false - xy: 605, 615 + xy: 853, 690 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-talk rotate: false - xy: 646, 857 + xy: 209, 131 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-1 rotate: false - xy: 754, 857 + xy: 853, 523 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-2 rotate: false - xy: 713, 621 + xy: 853, 356 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-3 rotate: false - xy: 738, 377 + xy: 524, 97 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-4 rotate: false - xy: 862, 857 + xy: 632, 138 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-5 rotate: false - xy: 846, 377 + xy: 740, 138 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-6 rotate: false - xy: 914, 210 + xy: 848, 189 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-7 rotate: false - xy: 914, 43 + xy: 848, 22 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-head-talk-1 rotate: false - xy: 713, 544 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-2 - rotate: false - xy: 797, 544 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-3 - rotate: false - xy: 326, 4 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-4 - rotate: false - xy: 608, 49 + xy: 762, 61 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-stand rotate: false - xy: 324, 615 + xy: 646, 857 size: 212, 165 orig: 212, 165 offset: 0, 0 @@ -2842,490 +2751,595 @@ the-end index: -1 title/screenshot-backdrop-active rotate: false - xy: 967, 817 + xy: 968, 984 size: 48, 38 orig: 48, 38 offset: 0, 0 index: -1 -wizard/cloud - rotate: false - xy: 970, 857 - size: 40, 30 - orig: 40, 30 - offset: 0, 0 - index: -1 pack8.png size: 1024,1024 format: RGBA8888 filter: Nearest,Nearest repeat: none -castle-gate/throw-walkie-7 +castle-gate/stash-closed rotate: false - xy: 2, 886 - size: 205, 136 - orig: 205, 136 - offset: 0, 0 - index: -1 -castle-gate/throw-walkie-8 - rotate: false - xy: 2, 748 - size: 205, 136 - orig: 205, 136 - offset: 0, 0 - index: -1 -castle-gate/throw-walkie-9 - rotate: false - xy: 209, 886 - size: 205, 136 - orig: 205, 136 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-12 - rotate: false - xy: 956, 982 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-13 - rotate: false - xy: 956, 940 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-14 - rotate: false - xy: 956, 898 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-15 - rotate: false - xy: 956, 856 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-16 - rotate: false - xy: 770, 777 - size: 58, 40 - orig: 58, 40 + xy: 326, 425 + size: 70, 41 + orig: 70, 41 offset: 0, 0 index: -1 cat-tree/grandma-cry-17 rotate: false - xy: 844, 815 + xy: 502, 232 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-18 rotate: false - xy: 763, 735 + xy: 502, 190 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-19 rotate: false - xy: 763, 693 + xy: 570, 479 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-20 rotate: false - xy: 200, 19 + xy: 570, 437 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 +dream/broom + rotate: false + xy: 744, 835 + size: 15, 66 + orig: 15, 66 + offset: 0, 0 + index: -1 +dream/cliff + rotate: false + xy: 226, 59 + size: 81, 87 + orig: 81, 87 + offset: 0, 0 + index: -1 dream/corner-r rotate: false - xy: 2, 19 + xy: 402, 505 size: 112, 59 orig: 112, 59 offset: 0, 0 index: -1 +dream/shovel + rotate: false + xy: 998, 943 + size: 19, 64 + orig: 19, 64 + offset: 0, 0 + index: -1 +dream/sword + rotate: false + xy: 626, 724 + size: 15, 38 + orig: 15, 38 + offset: 0, 0 + index: -1 ego/scared rotate: false - xy: 770, 819 + xy: 110, 9 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 -ending-castle/frankie-fall-1 +ego/spear rotate: false - xy: 946, 819 - size: 40, 35 - orig: 40, 35 + xy: 110, 131 + size: 90, 100 + orig: 90, 100 + offset: 0, 0 + index: -1 +ego/warden + rotate: false + xy: 766, 882 + size: 42, 41 + orig: 42, 41 + offset: 0, 0 + index: -1 +ending-castle/crowd-left + rotate: false + xy: 542, 872 + size: 116, 135 + orig: 116, 135 offset: 0, 0 index: -1 ending-castle/frankie-fall-10 rotate: false - xy: 432, 629 + xy: 626, 675 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-11 rotate: false - xy: 432, 592 + xy: 668, 675 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-12 rotate: false - xy: 474, 629 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -ending-castle/frankie-fall-2 - rotate: false - xy: 830, 778 + xy: 634, 638 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-3 rotate: false - xy: 434, 666 + xy: 562, 188 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-4 rotate: false - xy: 476, 666 + xy: 938, 888 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-5 rotate: false - xy: 518, 666 + xy: 761, 845 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-6 rotate: false - xy: 560, 666 + xy: 803, 845 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-7 rotate: false - xy: 602, 666 + xy: 845, 843 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-8 rotate: false - xy: 644, 666 + xy: 643, 712 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-9 rotate: false - xy: 686, 666 + xy: 685, 712 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 -georgia/kick-20 +ending-castle/warden-2 rotate: false - xy: 904, 812 + xy: 810, 882 + size: 42, 41 + orig: 42, 41 + offset: 0, 0 + index: -1 +georgia/kick-11 + rotate: false + xy: 184, 2 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 +georgia/kick-12 + rotate: false + xy: 226, 14 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-13 + rotate: false + xy: 268, 14 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-14 + rotate: false + xy: 586, 392 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-15 + rotate: false + xy: 586, 347 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-16 + rotate: false + xy: 579, 302 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-17 + rotate: false + xy: 318, 149 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-18 + rotate: false + xy: 360, 149 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-19 + rotate: false + xy: 562, 225 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-20 + rotate: false + xy: 854, 880 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +held/bloodclot-head-2 + rotate: false + xy: 766, 925 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-3 + rotate: false + xy: 882, 925 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 held/bloodclot-head-4 rotate: false - xy: 326, 499 + xy: 218, 316 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-5 rotate: false - xy: 326, 415 + xy: 218, 232 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-6 rotate: false - xy: 326, 331 + xy: 434, 650 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-7 rotate: false - xy: 326, 247 + xy: 434, 566 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-8 rotate: false - xy: 326, 163 + xy: 202, 148 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-9 rotate: false - xy: 326, 79 + xy: 110, 47 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 +inside-cafeteria/hands-fight-3 + rotate: false + xy: 110, 233 + size: 106, 106 + orig: 106, 106 + offset: 0, 0 + index: -1 inside-cafeteria/hands-fight-4 rotate: false - xy: 209, 778 + xy: 218, 400 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-5 rotate: false - xy: 218, 169 + xy: 326, 567 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-6 rotate: false - xy: 218, 61 + xy: 434, 734 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-7 rotate: false - xy: 326, 689 + xy: 542, 764 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 +inside-cafeteria/knights + rotate: false + xy: 326, 468 + size: 74, 97 + orig: 74, 97 + offset: 0, 0 + index: -1 inside-cafeteria/ladder-guard rotate: false - xy: 317, 797 + xy: 550, 675 size: 74, 87 orig: 74, 87 offset: 0, 0 index: -1 inside-castle/hands-1 rotate: false - xy: 326, 583 + xy: 660, 903 size: 104, 104 orig: 104, 104 offset: 0, 0 index: -1 outsidehouse/fgtest rotate: false - xy: 686, 703 + xy: 502, 274 size: 75, 75 orig: 75, 75 offset: 0, 0 index: -1 space/bloodclot-explode-10 rotate: false - xy: 2, 247 + xy: 110, 842 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-11 rotate: false - xy: 2, 80 + xy: 2, 508 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-12 rotate: false - xy: 110, 581 + xy: 110, 675 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-13 rotate: false - xy: 110, 414 + xy: 218, 842 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-14 rotate: false - xy: 110, 247 + xy: 2, 341 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-15 rotate: false - xy: 110, 80 + xy: 110, 508 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-16 rotate: false - xy: 416, 857 + xy: 218, 675 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-17 rotate: false - xy: 524, 857 + xy: 326, 842 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-18 rotate: false - xy: 632, 857 + xy: 2, 174 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-19 rotate: false - xy: 740, 857 + xy: 110, 341 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-20 rotate: false - xy: 848, 857 + xy: 218, 508 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-21 rotate: false - xy: 218, 611 + xy: 326, 675 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-22 rotate: false - xy: 218, 444 + xy: 434, 842 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-23 rotate: false - xy: 218, 277 + xy: 2, 7 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-8 rotate: false - xy: 2, 581 + xy: 2, 842 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-9 rotate: false - xy: 2, 414 + xy: 2, 675 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-head-talk-10 rotate: false - xy: 518, 780 + xy: 418, 274 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-11 rotate: false - xy: 518, 703 + xy: 334, 194 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-12 rotate: false - xy: 602, 780 + xy: 418, 197 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-13 rotate: false - xy: 602, 703 + xy: 486, 428 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-14 rotate: false - xy: 686, 780 + xy: 502, 351 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-2 + rotate: false + xy: 550, 598 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-3 + rotate: false + xy: 402, 428 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-4 + rotate: false + xy: 550, 521 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-5 rotate: false - xy: 326, 2 + xy: 660, 826 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-6 rotate: false - xy: 410, 2 + xy: 650, 749 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-7 rotate: false - xy: 116, 3 + xy: 334, 348 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-8 rotate: false - xy: 434, 780 + xy: 334, 271 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-9 rotate: false - xy: 434, 703 + xy: 418, 351 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 talk-bg rotate: false - xy: 260, 19 + xy: 896, 883 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 +wizard/cloud + rotate: false + xy: 579, 270 + 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 4b7ed0dd..22c27984 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 4c352f15..7f04665b 100644 Binary files a/desktop/resources/packed/pack3.png and b/desktop/resources/packed/pack3.png differ diff --git a/desktop/resources/packed/pack7.png b/desktop/resources/packed/pack7.png index 456f9a19..e60d2bb5 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 17e0920e..37084751 100644 Binary files a/desktop/resources/packed/pack8.png and b/desktop/resources/packed/pack8.png differ diff --git a/desktop/src-common/advent/screens/rooms/common.clj b/desktop/src-common/advent/screens/rooms/common.clj index 5b54a8fe..0c22d9c0 100644 --- a/desktop/src-common/advent/screens/rooms/common.clj +++ b/desktop/src-common/advent/screens/rooms/common.clj @@ -541,7 +541,7 @@ :georgia "My hero!" :frankie "Wait a hot second!") (Thread/sleep 500) - (actions/walk-straight-to entities :frankie [85 24] :anim :stand) + (actions/walk-straight-to entities :frankie [95 23] :anim :stand) (actions/do-dialogue entities :frankie "Come along, Georgia." :frankie "No sense in thanking Dipstick.") diff --git a/desktop/src-common/advent/screens/rooms/ending.clj b/desktop/src-common/advent/screens/rooms/ending.clj index dbd617c4..b4a904a5 100644 --- a/desktop/src-common/advent/screens/rooms/ending.clj +++ b/desktop/src-common/advent/screens/rooms/ending.clj @@ -43,7 +43,7 @@ 15 16 17 18 19 (repeat 10 0)])) frankie-fall (utils/make-anim-seq "ending-castle/frankie-fall" [40 35] 0.1 (flatten [(range 8) (repeat 20 7) 8 9 10 11 7])) frankie-down (utils/make-anim-seq "ending-castle/frankie-fall" [40 35] 0.1 [0]) - scaler (utils/scaler-fn-with-baseline 20 0.01 1.20)] + scaler (utils/scaler-fn-with-baseline 20 1.2 1.20)] (rooms/make :music :dream :name "Ending" :interactions {} @@ -52,7 +52,7 @@ :apply-state (fn [screen e] (update-in e [:room :entities :ego] dissoc :talk-override )) :georgia (rooms/make-entity :georgia (assoc (animation->texture screen georgia-stand) - :x 101 :y 23 :baseline 217 + :x 111 :y 22 :baseline 218 :scale-x 1.2 :scale-y 1.2 :talk-color (Color/valueOf "ffabe0ff") @@ -69,12 +69,7 @@ :anim peddler-stand :anim-start 0 :scaled true) - :warden (assoc (animation->texture screen warden-stand) - :x 40 :y 50 :baseline (- 240 50) - :anim warden-stand - :anim-start 0 - :scale-x 1.1 - :scale-y 1.1) + :frankie (assoc (common/make-frankie screen) :x 28 :y 21 :baseline 200 :fall frankie-fall @@ -93,6 +88,8 @@ (particle-effect! :set-position 215 130)) :duke (assoc (animation->texture screen duke-stand) :x 117 :y 50 :baseline (- 240 50) + :scale-x 1.2 + :scale-y 1.2 :anim duke-stand :anim-start 0 :talk-color (color 0.4 0.5 0.94 1.0) @@ -101,23 +98,11 @@ :reach duke-reach :reach-talk duke-reach-talk :knight duke-knight) - :magic-frog-particle (doto (assoc (particle-effect "particles/magic-frog") :x 91 :y 23 + :magic-frog-particle (doto (assoc (particle-effect "particles/magic-frog") :x 101 :y 23 :baseline 241) - (particle-effect! :set-position 91 23)) - :ladder-guard-1 (assoc (animation->texture screen ladder-guard-stand-1) - :x 75 :y 69 :baseline (- 240 69) - :anim ladder-guard-stand-1 - :anim-start 0 - :scaled true - :scale-x (scaler [71 150]) - :scale-y (scaler [71 150])) - :ladder-guard-2 (assoc (animation->texture screen ladder-guard-stand-2) - :x 179 :y 69 :baseline (- 240 69) - :anim ladder-guard-stand-2 - :anim-start 0 - :scaled true - :scale-x (scaler [179 150]) - :scale-y (scaler [179 150])) + (particle-effect! :set-position 101 23)) + + :game-player (assoc (animation->texture screen game-player-stand) :x 216 :y 69 :baseline (- 240 69) :anim game-player-stand @@ -125,20 +110,24 @@ :scale-x (scaler [179 69]) :scale-y (scaler [179 69]) :scaled true) - :grandma (assoc (animation->texture screen grandma-stand) - :x 56 :y 77 :baseline (- 240 77) - :anim grandma-stand - :anim-start 0 - :scale-x (scaler [56 77]) - :scale-y (scaler [56 77]) - :scaled true) + :cat (assoc (animation->texture screen cat-stand) :x 73 :y 194 :baseline (- 240 195) :anim cat-stand :anim-start 0 :scale-x 0.65 :scale-y 0.65 - :scaled true)} + :scaled true) + :crowd (assoc (utils/get-texture "ending-castle/crowd-left.png") + :x 0 :y 0 + :scale-x 1.2 + :scale-y 1.2 + :baseline 239) + :guard-1 (assoc (utils/get-texture "ending-castle/guard-1.png") + :x 91 :y 73 + :scale-x 0.9 + :scale-y 0.9 + :baseline 140)} :collision "ending-castle/ending-castle2-assets/collision.png" :scale-fn scaler :start-pos [165 49])))