diff --git a/desktop/asset-work/ending-castle/crowd-right.png b/desktop/asset-work/ending-castle/crowd-right.png new file mode 100644 index 00000000..0513b9cf Binary files /dev/null and b/desktop/asset-work/ending-castle/crowd-right.png differ diff --git a/desktop/asset-work/ending-castle/crowd-right.pxi b/desktop/asset-work/ending-castle/crowd-right.pxi new file mode 100644 index 00000000..0ec2fec4 Binary files /dev/null and b/desktop/asset-work/ending-castle/crowd-right.pxi differ diff --git a/desktop/asset-work/outside-castle/crowd-right.png b/desktop/asset-work/outside-castle/crowd-right.png new file mode 100644 index 00000000..43791e65 Binary files /dev/null and b/desktop/asset-work/outside-castle/crowd-right.png differ diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas index 5f13df45..cca0b007 100644 --- a/desktop/resources/packed/pack.atlas +++ b/desktop/resources/packed/pack.atlas @@ -109,6 +109,20 @@ cat-tree/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 +wizard/dot + rotate: false + xy: 846, 784 + size: 1, 1 + orig: 1, 1 + offset: 0, 0 + index: -1 ego/dot rotate: false xy: 846, 784 @@ -116,6 +130,20 @@ ego/dot orig: 1, 1 offset: 0, 0 index: -1 +inside-house/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 inside-antique/dot rotate: false xy: 846, 784 @@ -130,20 +158,6 @@ outsidehouse/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 -inside-house/dot - rotate: false - xy: 846, 784 - size: 1, 1 - orig: 1, 1 - offset: 0, 0 - index: -1 title/dot rotate: false xy: 846, 784 @@ -151,20 +165,6 @@ title/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 cat-tree/monocle rotate: false xy: 992, 839 @@ -382,14 +382,14 @@ held/dot orig: 1, 1 offset: 0, 0 index: -1 -outside-jail/dot +space/dot rotate: false xy: 849, 784 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 -space/dot +outside-jail/dot rotate: false xy: 849, 784 size: 1, 1 @@ -2317,518 +2317,518 @@ filter: Nearest,Nearest repeat: none castle-gate/stash-closed rotate: false - xy: 2, 737 + xy: 2, 739 size: 70, 41 orig: 70, 41 offset: 0, 0 index: -1 castle-gate/throw-walkie-1 rotate: false - xy: 324, 265 + xy: 324, 267 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-2 rotate: false - xy: 692, 642 + xy: 692, 644 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-3 rotate: false - xy: 692, 504 + xy: 692, 506 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-4 rotate: false - xy: 531, 266 + xy: 531, 268 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-5 rotate: false - xy: 738, 273 + xy: 738, 275 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 cat-tree/grandma-cry-2 rotate: false - xy: 162, 738 + xy: 162, 740 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-3 rotate: false - xy: 222, 738 + xy: 222, 740 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-4 rotate: false - xy: 282, 738 + xy: 282, 740 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-5 rotate: false - xy: 342, 738 + xy: 342, 740 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-6 rotate: false - xy: 402, 738 + xy: 402, 740 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-7 + rotate: false + xy: 924, 2 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/tree-and-rock rotate: false - xy: 646, 780 + xy: 646, 782 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 cat-tree/tree-r rotate: false - xy: 2, 11 + xy: 2, 13 size: 65, 240 orig: 65, 240 offset: 0, 0 index: -1 dream/cliff rotate: false - xy: 417, 9 + xy: 417, 11 size: 81, 87 orig: 81, 87 offset: 0, 0 index: -1 dream/corner-l rotate: false - xy: 730, 411 + xy: 730, 413 size: 112, 59 orig: 112, 59 offset: 0, 0 index: -1 dream/sky rotate: false - xy: 2, 780 + xy: 2, 782 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 ego/georgia rotate: false - xy: 691, 472 + xy: 691, 474 size: 90, 30 orig: 90, 30 offset: 0, 0 index: -1 ego/grow rotate: false - xy: 931, 235 + xy: 928, 427 size: 90, 36 orig: 90, 36 offset: 0, 0 index: -1 ego/hold-hand rotate: false - xy: 432, 700 + xy: 432, 702 size: 16, 36 orig: 16, 36 offset: 0, 0 index: -1 ego/pant rotate: false - xy: 899, 742 + xy: 899, 744 size: 62, 36 orig: 62, 36 offset: 0, 0 index: -1 ego/reach rotate: false - xy: 945, 394 + xy: 945, 389 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 ego/scared rotate: false - xy: 945, 356 + xy: 945, 351 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 ego/spear rotate: false - xy: 432, 550 + xy: 432, 552 size: 90, 100 orig: 90, 100 offset: 0, 0 index: -1 ego/warden rotate: false - xy: 74, 737 + xy: 74, 739 size: 42, 41 orig: 42, 41 offset: 0, 0 index: -1 ending-castle/crowd-left rotate: false - xy: 899, 600 + xy: 899, 602 + size: 116, 135 + orig: 116, 135 + offset: 0, 0 + index: -1 +ending-castle/crowd-right + rotate: false + xy: 899, 465 size: 116, 135 orig: 116, 135 offset: 0, 0 index: -1 ending-castle/warden-2 rotate: false - xy: 118, 737 + xy: 118, 739 size: 42, 41 orig: 42, 41 offset: 0, 0 index: -1 georgia/kick-10 rotate: false - xy: 945, 273 + xy: 886, 416 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-8 rotate: false - xy: 845, 459 + xy: 845, 461 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-9 rotate: false - xy: 844, 414 + xy: 844, 416 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 held/bloodclot-head-1 rotate: false - xy: 69, 2 + xy: 69, 4 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-2 rotate: false - xy: 185, 2 + xy: 185, 4 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-3 rotate: false - xy: 301, 2 + xy: 301, 4 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-4 rotate: false - xy: 576, 14 + xy: 576, 16 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-5 rotate: false - xy: 899, 516 + xy: 692, 17 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-6 rotate: false - xy: 899, 432 - size: 114, 82 - orig: 114, 82 - offset: 0, 0 - index: -1 -held/bloodclot-head-7 - rotate: false - xy: 692, 15 - size: 114, 82 - orig: 114, 82 - offset: 0, 0 - index: -1 -held/bloodclot-head-8 - rotate: false - xy: 808, 15 + xy: 808, 17 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 inside-cafeteria/knights rotate: false - xy: 531, 681 + xy: 531, 683 size: 74, 97 orig: 74, 97 offset: 0, 0 index: -1 inside-cafeteria/ladder-guard rotate: false - xy: 500, 9 + xy: 500, 11 size: 74, 87 orig: 74, 87 offset: 0, 0 index: -1 inside-cafeteria/warriors rotate: false - xy: 462, 652 + xy: 462, 654 size: 66, 126 orig: 66, 126 offset: 0, 0 index: -1 +inside-castle/roof + rotate: false + xy: 945, 292 + size: 57, 57 + orig: 57, 57 + offset: 0, 0 + index: -1 inside-castle/walkie-talkie rotate: false - xy: 987, 282 + xy: 984, 8 size: 35, 34 orig: 35, 34 offset: 0, 0 index: -1 inside-castle/way-back-tree rotate: false - xy: 2, 253 + xy: 2, 255 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -outside-castle/balloons - rotate: false - xy: 945, 318 - size: 60, 36 - orig: 60, 36 - offset: 0, 0 - index: -1 outside-castle/walk-behind rotate: false - xy: 2, 495 + xy: 2, 497 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outside-jail/guard-sleep rotate: false - xy: 432, 481 + xy: 432, 483 size: 172, 67 orig: 172, 67 offset: 0, 0 index: -1 outsidehouse/fg1 rotate: false - xy: 600, 407 + xy: 600, 409 size: 128, 63 orig: 128, 63 offset: 0, 0 index: -1 outsidehouse/fgtest rotate: false - xy: 530, 604 + xy: 530, 606 size: 75, 75 orig: 75, 75 offset: 0, 0 index: -1 space/Blergh rotate: false - xy: 283, 86 + xy: 283, 88 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-flex rotate: false - xy: 324, 570 + xy: 324, 572 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-stand rotate: false - xy: 324, 570 + xy: 324, 572 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-talk rotate: false - xy: 324, 403 + xy: 324, 405 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-1 rotate: false - xy: 391, 98 + xy: 391, 100 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-2 rotate: false - xy: 499, 98 + xy: 499, 100 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-3 rotate: false - xy: 607, 99 + xy: 607, 101 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-4 rotate: false - xy: 715, 99 + xy: 715, 101 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-5 rotate: false - xy: 823, 106 + xy: 823, 108 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-head-talk-1 rotate: false - xy: 607, 703 + xy: 607, 705 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-2 rotate: false - xy: 607, 626 + xy: 607, 628 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-3 rotate: false - xy: 607, 549 + xy: 607, 551 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-4 rotate: false - xy: 607, 472 + xy: 607, 474 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-5 rotate: false - xy: 432, 404 + xy: 432, 406 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-6 rotate: false - xy: 516, 404 + xy: 516, 406 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-7 rotate: false - xy: 931, 158 + xy: 931, 198 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-8 rotate: false - xy: 931, 81 + xy: 931, 121 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-9 rotate: false - xy: 924, 4 + xy: 931, 44 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-stand rotate: false - xy: 69, 86 + xy: 69, 88 size: 212, 165 orig: 212, 165 offset: 0, 0 index: -1 the-end rotate: false - xy: 324, 780 + xy: 324, 782 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 title/balloon rotate: false - xy: 783, 472 + xy: 783, 474 size: 60, 30 orig: 60, 30 offset: 0, 0 index: -1 wizard/experiment-35 rotate: false - xy: 968, 965 + xy: 968, 967 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-36 rotate: false - xy: 968, 908 + xy: 968, 910 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-37 rotate: false - xy: 968, 851 + xy: 968, 853 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-38 rotate: false - xy: 968, 794 + xy: 968, 796 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-39 rotate: false - xy: 968, 737 + xy: 968, 739 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/talk rotate: false - xy: 524, 556 + xy: 524, 558 size: 80, 46 orig: 80, 46 offset: 0, 0 @@ -2869,98 +2869,91 @@ castle-gate/throw-walkie-9 index: -1 cat-tree/grandma-cry-10 rotate: false - xy: 434, 396 + xy: 326, 253 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-11 rotate: false - xy: 956, 922 + xy: 222, 78 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-12 rotate: false - xy: 535, 706 + xy: 282, 78 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-13 rotate: false - xy: 595, 706 + xy: 284, 36 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-14 rotate: false - xy: 655, 706 + xy: 326, 211 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-15 rotate: false - xy: 715, 706 + xy: 302, 169 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-16 rotate: false - xy: 775, 706 + xy: 386, 247 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-17 rotate: false - xy: 835, 706 + xy: 386, 205 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-18 rotate: false - xy: 895, 706 + xy: 362, 163 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-19 rotate: false - xy: 518, 664 + xy: 881, 570 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-20 rotate: false - xy: 518, 622 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-7 - rotate: false - xy: 434, 522 + xy: 422, 163 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-8 rotate: false - xy: 434, 480 + xy: 326, 337 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-9 rotate: false - xy: 434, 438 + xy: 326, 295 size: 58, 40 orig: 58, 40 offset: 0, 0 @@ -2974,7 +2967,7 @@ dream/corner-r index: -1 ego/frog rotate: false - xy: 965, 810 + xy: 328, 131 size: 32, 36 orig: 32, 36 offset: 0, 0 @@ -2988,182 +2981,196 @@ ego/hold-up-to-window index: -1 ending-castle/frankie-fall-10 rotate: false - xy: 914, 624 + xy: 426, 89 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-11 rotate: false - xy: 965, 885 + xy: 344, 52 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-12 rotate: false - xy: 965, 848 + xy: 386, 52 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-3 rotate: false - xy: 620, 624 + xy: 966, 851 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-4 rotate: false - xy: 662, 624 + xy: 218, 3 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-5 rotate: false - xy: 704, 624 + xy: 362, 126 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-6 rotate: false - xy: 746, 624 + xy: 404, 126 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-7 rotate: false - xy: 788, 624 + xy: 446, 126 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-8 rotate: false - xy: 830, 624 + xy: 342, 89 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-9 rotate: false - xy: 872, 624 + xy: 384, 89 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 georgia/kick-11 rotate: false - xy: 578, 661 + xy: 966, 978 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-12 rotate: false - xy: 518, 577 + xy: 966, 933 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-13 rotate: false - xy: 620, 661 + xy: 966, 888 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-14 rotate: false - xy: 662, 661 + xy: 965, 806 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-15 rotate: false - xy: 704, 661 + xy: 965, 761 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-16 rotate: false - xy: 746, 661 + xy: 965, 716 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-17 rotate: false - xy: 788, 661 + xy: 965, 671 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-18 rotate: false - xy: 830, 661 + xy: 965, 626 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-19 rotate: false - xy: 872, 661 + xy: 386, 334 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-20 rotate: false - xy: 914, 661 + xy: 386, 289 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 +held/bloodclot-head-7 + rotate: false + xy: 533, 605 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-8 + rotate: false + xy: 649, 605 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 held/bloodclot-head-9 rotate: false - xy: 209, 634 + xy: 765, 605 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-3 rotate: false - xy: 416, 915 + xy: 209, 610 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-4 rotate: false - xy: 524, 915 + xy: 317, 610 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-5 rotate: false - xy: 632, 915 + xy: 425, 611 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-6 rotate: false - xy: 740, 915 + xy: 218, 335 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-7 rotate: false - xy: 848, 915 + xy: 218, 227 size: 106, 106 orig: 106, 106 offset: 0, 0 @@ -3175,16 +3182,23 @@ inside-castle/hands-1 orig: 104, 104 offset: 0, 0 index: -1 -inside-castle/roof +outside-castle/balloons rotate: false - xy: 956, 964 - size: 57, 57 - orig: 57, 57 + xy: 222, 40 + size: 60, 36 + orig: 60, 36 + offset: 0, 0 + index: -1 +outside-castle/crowd-right + rotate: false + xy: 416, 886 + size: 116, 135 + orig: 116, 135 offset: 0, 0 index: -1 outsidehouse/lamb-walk rotate: false - xy: 425, 718 + xy: 218, 120 size: 108, 28 orig: 108, 28 offset: 0, 0 @@ -3219,70 +3233,70 @@ space/bloodclot-explode-13 index: -1 space/bloodclot-explode-14 rotate: false - xy: 425, 748 + xy: 425, 719 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-15 rotate: false - xy: 533, 748 + xy: 534, 856 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-16 rotate: false - xy: 641, 748 + xy: 642, 856 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-17 rotate: false - xy: 749, 748 + xy: 750, 856 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-18 rotate: false - xy: 857, 748 + xy: 858, 856 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-19 rotate: false - xy: 218, 467 + xy: 533, 689 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-20 rotate: false - xy: 218, 300 + xy: 641, 689 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-21 rotate: false - xy: 218, 133 + xy: 749, 689 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-22 rotate: false - xy: 326, 551 + xy: 857, 689 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-23 rotate: false - xy: 326, 384 + xy: 218, 443 size: 106, 165 orig: 106, 165 offset: 0, 0 @@ -3317,42 +3331,42 @@ space/bloodclot-explode-9 index: -1 space/bloodclot-head-talk-10 rotate: false - xy: 326, 307 + xy: 326, 533 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-11 rotate: false - xy: 326, 230 + xy: 881, 612 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-12 rotate: false - xy: 326, 153 + xy: 218, 150 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-13 rotate: false - xy: 434, 641 + xy: 326, 456 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-14 rotate: false - xy: 434, 564 + xy: 326, 379 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 talk-bg rotate: false - xy: 578, 619 + xy: 941, 570 size: 40, 40 orig: 40, 40 offset: 0, 0 diff --git a/desktop/resources/packed/pack7.png b/desktop/resources/packed/pack7.png index 5d3fde2a..c901d89f 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 2c2da7fb..6c2b2975 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/ending.clj b/desktop/src-common/advent/screens/rooms/ending.clj index fa64de77..c04ed186 100644 --- a/desktop/src-common/advent/screens/rooms/ending.clj +++ b/desktop/src-common/advent/screens/rooms/ending.clj @@ -82,12 +82,12 @@ :anim-merges {:default {:origin-x 12 :origin-y 0} frankie-fall {:origin-x 22 :origin-y 0} frankie-down {:origin-x 22 :origin-y 0}}) - :gandarf (assoc (common/make-wizard screen {:x 205 :y 400 :baseline 199}) + :gandarf (assoc (common/make-wizard screen {:x 205 :y 400 :baseline 239}) :update-fn (fn [screen entities gandarf] (assoc gandarf :y (or (get-in entities [:gandarf-cloud :y]) (:y gandarf))))) :gandarf-cloud (doto (assoc (particle-effect "particles/gandarf-cloud") :x 215 :y 400 - :baseline 200) + :baseline 240) (particle-effect! :set-position 215 130)) :duke (assoc (animation->texture screen duke-stand) :x 117 :y 50 :baseline (- 240 50) @@ -106,14 +106,6 @@ (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 - :anim-start 0 - :scale-x (scaler [179 69]) - :scale-y (scaler [179 69]) - :scaled true) - :cat (assoc (animation->texture screen cat-stand) :x 73 :y 194 :baseline (- 240 195) :anim cat-stand @@ -121,11 +113,16 @@ :scale-x 0.65 :scale-y 0.65 :scaled true) - :crowd (assoc (utils/get-texture "ending-castle/crowd-left.png") + :crowd-left (assoc (utils/get-texture "ending-castle/crowd-left.png") :x 0 :y 0 :scale-x 1.2 :scale-y 1.2 :baseline 239) + :crowd-right (assoc (utils/get-texture "ending-castle/crowd-right.png") + :x 196 :y 0 + :scale-x 1.2 + :scale-y 1.2 + :baseline 238) :guard-1 (assoc (utils/get-texture "ending-castle/guard-1.png") :x 91 :y 73 :scale-x 0.9