diff --git a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-1.png b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-1.png index b819dfd4..f348a622 100644 Binary files a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-1.png and b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-1.png differ diff --git a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-10.png b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-10.png index 3e045a40..4d2f0403 100644 Binary files a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-10.png and b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-10.png differ diff --git a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-11.png b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-11.png index ffd98f39..53752da0 100644 Binary files a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-11.png and b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-11.png differ diff --git a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-12.png b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-12.png index 15f5932d..9e8bfc36 100644 Binary files a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-12.png and b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-12.png differ diff --git a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-13.png b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-13.png new file mode 100644 index 00000000..9f4f8223 Binary files /dev/null and b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-13.png differ diff --git a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-14.png b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-14.png new file mode 100644 index 00000000..f60c23af Binary files /dev/null and b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-14.png differ diff --git a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-2.png b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-2.png index cd09814c..b0692e5a 100644 Binary files a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-2.png and b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-2.png differ diff --git a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-3.png b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-3.png index 922b5e00..ea063993 100644 Binary files a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-3.png and b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-3.png differ diff --git a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-4.png b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-4.png index 2c4cc3f8..39b43b0b 100644 Binary files a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-4.png and b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-4.png differ diff --git a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-5.png b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-5.png index d473bdf6..78265b98 100644 Binary files a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-5.png and b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-5.png differ diff --git a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-6.png b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-6.png index 592b5a84..7f3e6602 100644 Binary files a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-6.png and b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-6.png differ diff --git a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-7.png b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-7.png index e1f43989..22136151 100644 Binary files a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-7.png and b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-7.png differ diff --git a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-8.png b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-8.png index 73448baf..8272704a 100644 Binary files a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-8.png and b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-8.png differ diff --git a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-9.png b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-9.png index 001be60c..0a3dd61c 100644 Binary files a/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-9.png and b/desktop/asset-work/inside-cafeteria/fight-new-assets/fight-9.png differ diff --git a/desktop/asset-work/inside-cafeteria/fight-new.psd b/desktop/asset-work/inside-cafeteria/fight-new.psd index e4d9389b..0159a75f 100644 Binary files a/desktop/asset-work/inside-cafeteria/fight-new.psd and b/desktop/asset-work/inside-cafeteria/fight-new.psd differ diff --git a/desktop/asset-work/inside-castle/big-tick.psd b/desktop/asset-work/inside-castle/big-tick.psd index 42956020..0bc09a18 100644 Binary files a/desktop/asset-work/inside-castle/big-tick.psd and b/desktop/asset-work/inside-castle/big-tick.psd differ diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas index 062fe4f0..76ea240a 100644 --- a/desktop/resources/packed/pack.atlas +++ b/desktop/resources/packed/pack.atlas @@ -2554,252 +2554,308 @@ filter: Nearest,Nearest repeat: none black rotate: false - xy: 2, 2 + xy: 626, 695 size: 32, 24 orig: 32, 24 offset: 0, 0 index: -1 castle-gate/stash-closed rotate: false - xy: 941, 567 + xy: 467, 399 size: 70, 41 orig: 70, 41 offset: 0, 0 index: -1 castle-gate/throw-walkie-4 rotate: false - xy: 2, 304 + xy: 539, 504 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-5 rotate: false - xy: 260, 498 + xy: 626, 886 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-6 rotate: false - xy: 518, 692 + xy: 539, 366 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-7 rotate: false - xy: 776, 886 + xy: 260, 304 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-8 rotate: false - xy: 2, 166 + xy: 260, 166 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-9 rotate: false - xy: 2, 28 + xy: 639, 228 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 +cat-tree/grandma-cry-10 + rotate: false + xy: 939, 4 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-11 + rotate: false + xy: 954, 697 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-12 + rotate: false + xy: 954, 357 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-13 + rotate: false + xy: 954, 315 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-14 + rotate: false + xy: 954, 273 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-15 + rotate: false + xy: 954, 231 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-16 + rotate: false + xy: 962, 524 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-17 + rotate: false + xy: 962, 482 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-18 + rotate: false + xy: 962, 440 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 cat-tree/grandma-cry-4 rotate: false - xy: 641, 496 + xy: 467, 249 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-5 rotate: false - xy: 575, 528 + xy: 467, 207 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-6 + rotate: false + xy: 467, 165 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-7 + rotate: false + xy: 941, 982 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-8 + rotate: false + xy: 467, 123 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-9 + rotate: false + xy: 328, 21 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 ego/flying rotate: false - xy: 983, 978 + xy: 988, 936 size: 34, 44 orig: 34, 44 offset: 0, 0 index: -1 -ego/frog - rotate: false - xy: 988, 864 - size: 32, 36 - orig: 32, 36 - offset: 0, 0 - index: -1 ego/georgia rotate: false - xy: 433, 17 + xy: 918, 816 size: 90, 30 orig: 90, 30 offset: 0, 0 index: -1 +ego/grow + rotate: false + xy: 918, 848 + size: 90, 36 + orig: 90, 36 + offset: 0, 0 + index: -1 ego/grow-talk rotate: false - xy: 983, 940 + xy: 943, 887 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 -ego/hand-hold +ego/hold-up-to-window rotate: false - xy: 983, 902 - size: 36, 36 - orig: 36, 36 + xy: 635, 23 + size: 108, 36 + orig: 108, 36 offset: 0, 0 index: -1 -ending-castle/hand-hold +ego/jump-straight rotate: false - xy: 983, 902 - size: 36, 36 - orig: 36, 36 + xy: 84, 4 + size: 90, 48 + orig: 90, 48 + offset: 0, 0 + index: -1 +ego/pant + rotate: false + xy: 467, 361 + size: 62, 36 + orig: 62, 36 offset: 0, 0 index: -1 ego/reach rotate: false - xy: 459, 126 + xy: 626, 759 + size: 72, 36 + orig: 72, 36 + offset: 0, 0 + index: -1 +ego/scared + rotate: false + xy: 626, 721 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 ego/squat rotate: false - xy: 854, 13 + xy: 260, 63 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +ego/stand + rotate: false + xy: 854, 566 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/suspended rotate: false - xy: 317, 126 + xy: 854, 604 size: 140, 36 orig: 140, 36 offset: 0, 0 index: -1 -georgia/kick-1 +ending-castle/frankie-fall-1 rotate: false - xy: 982, 522 - size: 40, 43 - orig: 40, 43 + xy: 981, 888 + size: 40, 35 + orig: 40, 35 offset: 0, 0 index: -1 -georgia/kick-10 +ending-castle/frankie-fall-2 rotate: false - xy: 982, 162 - size: 40, 43 - orig: 40, 43 + xy: 982, 567 + size: 40, 35 + orig: 40, 35 offset: 0, 0 index: -1 -georgia/kick-11 +georgia/stand rotate: false - xy: 982, 117 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-12 - rotate: false - xy: 982, 72 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-13 - rotate: false - xy: 982, 27 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-2 - rotate: false - xy: 982, 477 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-4 - rotate: false - xy: 982, 477 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-3 - rotate: false - xy: 982, 432 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-5 - rotate: false - xy: 982, 387 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-6 - rotate: false - xy: 982, 342 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-7 - rotate: false - xy: 982, 297 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-8 - rotate: false - xy: 982, 252 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-9 - rotate: false - xy: 982, 207 - size: 40, 43 - orig: 40, 43 + xy: 600, 645 + size: 100, 43 + orig: 100, 43 offset: 0, 0 index: -1 held/bloodclot-head-6 rotate: false - xy: 209, 24 + xy: 388, 5 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 inside-cafeteria/fight-new-assets/fight-10 rotate: false - xy: 2, 442 + xy: 2, 248 size: 256, 192 orig: 256, 192 offset: 0, 0 index: -1 inside-cafeteria/fight-new-assets/fight-11 rotate: false - xy: 260, 636 + xy: 2, 54 size: 256, 192 orig: 256, 192 offset: 0, 0 index: -1 inside-cafeteria/fight-new-assets/fight-12 rotate: false - xy: 518, 830 + xy: 260, 830 + size: 256, 192 + orig: 256, 192 + offset: 0, 0 + index: -1 +inside-cafeteria/fight-new-assets/fight-13 + rotate: false + xy: 260, 636 + size: 256, 192 + orig: 256, 192 + offset: 0, 0 + index: -1 +inside-cafeteria/fight-new-assets/fight-14 + rotate: false + xy: 281, 442 size: 256, 192 orig: 256, 192 offset: 0, 0 @@ -2820,294 +2876,294 @@ inside-cafeteria/fight-new-assets/fight-8 index: -1 inside-cafeteria/fight-new-assets/fight-9 rotate: false - xy: 260, 830 + xy: 2, 442 size: 256, 192 orig: 256, 192 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-5 rotate: false - xy: 325, 18 + xy: 833, 916 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-6 rotate: false - xy: 467, 519 - size: 106, 106 - orig: 106, 106 - offset: 0, 0 - index: -1 -inside-cafeteria/hands-fight-7 - rotate: false - xy: 641, 54 + xy: 746, 367 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/ladder-guard rotate: false - xy: 749, 73 + xy: 626, 797 size: 74, 87 orig: 74, 87 offset: 0, 0 index: -1 inside-castle/gameplayer rotate: false - xy: 776, 840 + xy: 954, 651 size: 40, 44 orig: 40, 44 offset: 0, 0 index: -1 +inside-castle/walkie-talkie + rotate: false + xy: 794, 38 + size: 35, 34 + orig: 35, 34 + offset: 0, 0 + index: -1 +inside-house/candle-aura + rotate: false + xy: 504, 3 + size: 108, 27 + orig: 108, 27 + offset: 0, 0 + index: -1 +inside-jail/chest-top + rotate: false + xy: 467, 89 + size: 44, 32 + orig: 44, 32 + offset: 0, 0 + index: -1 inside-jail/window rotate: false - xy: 833, 521 + xy: 260, 605 size: 18, 29 orig: 18, 29 offset: 0, 0 index: -1 inside-jail/window-bent rotate: false - xy: 701, 507 + xy: 260, 574 size: 18, 29 orig: 18, 29 offset: 0, 0 index: -1 +outside-castle/balloons + rotate: false + xy: 467, 323 + size: 60, 36 + orig: 60, 36 + offset: 0, 0 + index: -1 outside-castle/blanket rotate: false - xy: 749, 25 + xy: 176, 6 size: 103, 46 orig: 103, 46 offset: 0, 0 index: -1 outsidehouse/fg1 rotate: false - xy: 518, 627 + xy: 260, 101 size: 128, 63 orig: 128, 63 offset: 0, 0 index: -1 outsidehouse/fgtest rotate: false - xy: 648, 615 + xy: 390, 89 size: 75, 75 orig: 75, 75 offset: 0, 0 index: -1 +outsidehouse/lamb-walk + rotate: false + xy: 833, 886 + size: 108, 28 + orig: 108, 28 + offset: 0, 0 + index: -1 space/blergh-talk rotate: false - xy: 209, 275 + xy: 518, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-1 rotate: false - xy: 209, 108 + xy: 518, 690 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-10 rotate: false - xy: 833, 552 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-11 - rotate: false - xy: 725, 496 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-12 - rotate: false - xy: 641, 329 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-13 - rotate: false - xy: 641, 162 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-14 - rotate: false - xy: 749, 329 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-15 - rotate: false - xy: 749, 162 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-16 - rotate: false - xy: 857, 385 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-17 - rotate: false - xy: 857, 218 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-18 - rotate: false - xy: 857, 51 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-19 - rotate: false - xy: 533, 18 + xy: 854, 399 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-2 rotate: false - xy: 317, 331 + xy: 702, 719 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-3 rotate: false - xy: 317, 164 + xy: 531, 199 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-4 rotate: false - xy: 425, 331 + xy: 746, 475 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-5 rotate: false - xy: 425, 164 + xy: 810, 719 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-6 rotate: false - xy: 725, 663 + xy: 846, 200 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-7 rotate: false - xy: 833, 719 + xy: 639, 61 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-8 rotate: false - xy: 533, 352 + xy: 527, 32 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-9 rotate: false - xy: 533, 185 + xy: 831, 33 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 +space/bloodclot-head-talk-10 + rotate: false + xy: 870, 642 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-11 + rotate: false + xy: 918, 739 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 space/bloodclot-head-talk-4 rotate: false - xy: 641, 538 + xy: 702, 642 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-5 rotate: false - xy: 433, 49 + xy: 786, 642 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 +space/bloodclot-head-talk-6 + rotate: false + xy: 747, 151 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-7 + rotate: false + xy: 747, 74 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-8 + rotate: false + xy: 939, 123 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-9 + rotate: false + xy: 939, 46 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +title/balloon + rotate: false + xy: 467, 291 + size: 60, 30 + orig: 60, 30 + offset: 0, 0 + index: -1 title/screenshot-backdrop-active rotate: false - xy: 260, 458 + xy: 962, 400 size: 48, 38 orig: 48, 38 offset: 0, 0 index: -1 white rotate: false - xy: 36, 2 + xy: 660, 695 size: 32, 24 orig: 32, 24 offset: 0, 0 index: -1 wizard/experiment-35 rotate: false - xy: 575, 570 + xy: 941, 925 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-36 rotate: false - xy: 941, 829 + xy: 281, 6 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-37 rotate: false - xy: 941, 772 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-38 - rotate: false - xy: 941, 715 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 -wizard/experiment-39 - rotate: false - xy: 941, 658 + xy: 747, 17 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/talk rotate: false - xy: 941, 610 + xy: 518, 642 size: 80, 46 orig: 80, 46 offset: 0, 0 index: -1 wizard/talk-angry rotate: false - xy: 641, 2 + xy: 2, 2 size: 80, 50 orig: 80, 50 offset: 0, 0 @@ -3118,514 +3174,472 @@ size: 1024,1024 format: RGBA8888 filter: Nearest,Nearest repeat: none -cat-tree/grandma-cry-10 - rotate: false - xy: 322, 817 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-11 - rotate: false - xy: 382, 817 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-12 - rotate: false - xy: 676, 909 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-13 - rotate: false - xy: 780, 907 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-14 - rotate: false - xy: 840, 901 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-15 - rotate: false - xy: 900, 897 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-16 - rotate: false - xy: 86, 460 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-17 - rotate: false - xy: 86, 418 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-18 - rotate: false - xy: 86, 376 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 cat-tree/grandma-cry-19 rotate: false - xy: 86, 334 + xy: 434, 745 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-20 rotate: false - xy: 86, 292 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-6 - rotate: false - xy: 2, 3 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-7 - rotate: false - xy: 914, 939 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-8 - rotate: false - xy: 110, 502 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-9 - rotate: false - xy: 218, 832 + xy: 110, 229 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/inventory rotate: false - xy: 736, 907 + xy: 326, 640 size: 42, 42 orig: 42, 42 offset: 0, 0 index: -1 dream/corner-l rotate: false - xy: 218, 874 + xy: 434, 787 size: 112, 59 orig: 112, 59 offset: 0, 0 index: -1 dream/corner-r rotate: false - xy: 566, 958 + xy: 550, 871 size: 112, 59 orig: 112, 59 offset: 0, 0 index: -1 -ego/grow +ego/frog rotate: false - xy: 2, 45 - size: 90, 36 - orig: 90, 36 + xy: 634, 833 + size: 32, 36 + orig: 32, 36 offset: 0, 0 index: -1 -ego/hold-up-to-window +ego/hand-hold rotate: false - xy: 562, 891 - size: 108, 36 - orig: 108, 36 + xy: 882, 940 + size: 36, 36 + orig: 36, 36 offset: 0, 0 index: -1 -ego/jump-straight +ending-castle/hand-hold rotate: false - xy: 2, 83 - size: 90, 48 - orig: 90, 48 - offset: 0, 0 - index: -1 -ego/pant - rotate: false - xy: 460, 852 - size: 62, 36 - orig: 62, 36 - offset: 0, 0 - index: -1 -ego/scared - rotate: false - xy: 936, 981 - size: 72, 36 - orig: 72, 36 - offset: 0, 0 - index: -1 -ego/stand - rotate: false - xy: 332, 897 - size: 126, 36 - orig: 126, 36 + xy: 882, 940 + size: 36, 36 + orig: 36, 36 offset: 0, 0 index: -1 ego/thorw rotate: false - xy: 808, 981 + xy: 666, 940 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/throw rotate: false - xy: 332, 859 + xy: 794, 978 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/warden rotate: false - xy: 62, 2 + xy: 494, 744 size: 42, 41 orig: 42, 41 offset: 0, 0 index: -1 -ending-castle/frankie-fall-1 - rotate: false - xy: 170, 507 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 ending-castle/frankie-fall-10 rotate: false - xy: 650, 854 + xy: 592, 834 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-11 rotate: false - xy: 692, 872 + xy: 548, 797 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-12 rotate: false - xy: 734, 870 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -ending-castle/frankie-fall-2 - rotate: false - xy: 146, 465 + xy: 590, 797 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-3 rotate: false - xy: 146, 428 + xy: 326, 513 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-4 rotate: false - xy: 146, 391 + xy: 840, 941 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-5 rotate: false - xy: 146, 354 + xy: 920, 934 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-6 rotate: false - xy: 146, 317 + xy: 962, 934 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-7 rotate: false - xy: 128, 246 + xy: 194, 266 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-8 rotate: false - xy: 128, 209 + xy: 170, 229 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-9 rotate: false - xy: 128, 172 + xy: 550, 834 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/warden-2 rotate: false - xy: 960, 893 + xy: 260, 350 size: 42, 41 orig: 42, 41 offset: 0, 0 index: -1 +georgia/kick-1 + rotate: false + xy: 373, 696 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-10 + rotate: false + xy: 922, 971 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-11 + rotate: false + xy: 964, 971 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-12 + rotate: false + xy: 194, 303 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-13 + rotate: false + xy: 86, 136 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 georgia/kick-14 rotate: false - xy: 86, 247 + xy: 236, 304 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-15 rotate: false - xy: 86, 202 + xy: 236, 259 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-16 rotate: false - xy: 86, 157 + xy: 278, 305 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-17 rotate: false - xy: 974, 936 + xy: 278, 260 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-18 rotate: false - xy: 524, 845 + xy: 128, 139 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-19 rotate: false - xy: 566, 846 + xy: 152, 184 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-2 + rotate: false + xy: 2, 2 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-4 + rotate: false + xy: 2, 2 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-20 rotate: false - xy: 608, 846 + xy: 170, 139 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 -georgia/stand +georgia/kick-3 rotate: false - xy: 460, 890 - size: 100, 43 - orig: 100, 43 + xy: 110, 184 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-5 + rotate: false + xy: 218, 349 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-6 + rotate: false + xy: 326, 595 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-7 + rotate: false + xy: 326, 550 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-8 + rotate: false + xy: 262, 393 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-9 + rotate: false + xy: 49, 59 + size: 40, 43 + orig: 40, 43 offset: 0, 0 index: -1 held/bloodclot-head-7 rotate: false - xy: 218, 935 + xy: 434, 932 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-8 rotate: false - xy: 334, 935 + xy: 434, 848 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-9 rotate: false - xy: 450, 935 + xy: 550, 932 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 -inside-castle/walkie-talkie +inside-cafeteria/hands-fight-7 rotate: false - xy: 776, 871 - size: 35, 34 - orig: 35, 34 - offset: 0, 0 - index: -1 -inside-house/candle-aura - rotate: false - xy: 566, 929 - size: 108, 27 - orig: 108, 27 - offset: 0, 0 - index: -1 -inside-jail/chest-top - rotate: false - xy: 442, 818 - size: 44, 32 - orig: 44, 32 + xy: 326, 741 + size: 106, 106 + orig: 106, 106 offset: 0, 0 index: -1 inside-jail/chest-top-open rotate: false - xy: 146, 283 + xy: 794, 944 size: 44, 32 orig: 44, 32 offset: 0, 0 index: -1 inventory rotate: false - xy: 278, 830 + xy: 218, 394 size: 42, 42 orig: 42, 42 offset: 0, 0 index: -1 -outside-castle/balloons +space/bloodclot-explode-11 rotate: false - xy: 852, 943 - size: 60, 36 - orig: 60, 36 + xy: 2, 849 + size: 106, 165 + orig: 106, 165 offset: 0, 0 index: -1 -outsidehouse/lamb-walk +space/bloodclot-explode-12 rotate: false - xy: 680, 951 - size: 108, 28 - orig: 108, 28 + xy: 2, 682 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-13 + rotate: false + xy: 110, 849 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-14 + rotate: false + xy: 2, 515 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-15 + rotate: false + xy: 110, 682 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-16 + rotate: false + xy: 218, 849 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-17 + rotate: false + xy: 2, 348 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-18 + rotate: false + xy: 110, 515 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-19 + rotate: false + xy: 218, 682 + size: 106, 165 + orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-20 rotate: false - xy: 2, 852 + xy: 326, 849 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-21 rotate: false - xy: 2, 685 + xy: 2, 181 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-22 rotate: false - xy: 110, 852 + xy: 110, 348 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-23 rotate: false - xy: 2, 518 + xy: 218, 515 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 -space/bloodclot-head-talk-10 - rotate: false - xy: 110, 621 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-11 - rotate: false - xy: 2, 287 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 space/bloodclot-head-talk-12 rotate: false - xy: 110, 544 + xy: 2, 104 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-13 rotate: false - xy: 2, 210 + xy: 110, 271 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-14 rotate: false - xy: 2, 133 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-6 - rotate: false - xy: 110, 775 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-7 - rotate: false - xy: 2, 441 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-8 - rotate: false - xy: 110, 698 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-9 - rotate: false - xy: 2, 364 + xy: 218, 438 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/susp rotate: false - xy: 680, 981 + xy: 666, 978 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 -title/balloon +wizard/experiment-38 rotate: false - xy: 790, 949 - size: 60, 30 - orig: 60, 30 + xy: 326, 684 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-39 + rotate: false + xy: 2, 47 + size: 45, 55 + orig: 45, 55 offset: 0, 0 index: -1 diff --git a/desktop/resources/packed/pack8.png b/desktop/resources/packed/pack8.png index 787c2a3c..10262d48 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 698892f0..c39b76f0 100644 Binary files a/desktop/resources/packed/pack9.png and b/desktop/resources/packed/pack9.png differ diff --git a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj index da42871e..60d62326 100644 --- a/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj +++ b/desktop/src-common/advent/screens/rooms/inside_cafeteria.clj @@ -186,15 +186,21 @@ #_#_ladder-guard-talk (animation 0.2 (for [i [0 0 0 0 1 0 0 1]] (aget ladder-guard-sheet 0 i))) - hands-fight-win (utils/make-anim-seq "inside-cafeteria/fight-new-assets/fight" [256 192] 0.025 (flatten [(pace [0 1 0 4 0 1 0 4 0 1 0 4 0 1 0 4 0 1 0 4 0 0 1 1 1 1 0 0 0 4 0 1 1 1 1 1 1 1 1 4 0 4 0 4 0 4 5 5 5 5 5 5 5 5 5 5 5 5] 0) + hands-fight-win (utils/make-anim-seq "inside-cafeteria/fight-new-assets/fight" [256 192] 0.025 (flatten [(pace [0 1 0 4 0 1 0 4 0 1 0 4 0 1 0 4 0 1 0 4 0 0 1 1 1 1 0 0 0 4 0 1 1 1 1 1 1 1 1 4 0 4 0 4 0 4 5 5 5 5 5 4 4 4] 0) + (pace (flatten (repeat 6 [12 13])) 0) (pace (flatten (repeat 15 [7 8])) 0) (pace (flatten (repeat 15 [9])) 0) + (pace (flatten (repeat 6 [12 13])) 0) (pace (flatten (repeat 15 [7 8])) 1) (pace (flatten (repeat 15 [9])) 0) + (pace (flatten (repeat 6 [12 13])) 0) (pace (flatten (repeat 15 [7 8])) 2) (pace (flatten (repeat 15 [9])) 0) - (pace (flatten (repeat 15 [10 11])) 3) + (pace (flatten (repeat 6 [12 13])) 0) + (pace (flatten (repeat 15 [10 11])) 2) (pace (flatten (repeat 15 [9])) 0) + (pace (flatten (repeat 6 [12 13])) 0) + (pace [0 0 0 0 2 1 1 2 2 1 1 2 2 2 1 1 2 2 2 2 2 2 2 2 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3] 0)])) hands-fight-lose (utils/make-anim-seq "inside-cafeteria/fight-new-assets/fight" [256 192] 0.1 (flatten [4 4 4 4 4 4 0 0 0 0 4 4 4 0 0 0 5 5 5 6 6 6 6 6 6]))] (rooms/make :music :town-1