diff --git a/desktop/asset-work/ego/hand-hold.png b/desktop/asset-work/ego/hand-hold.png index 768e3649..a78f4729 100644 Binary files a/desktop/asset-work/ego/hand-hold.png and b/desktop/asset-work/ego/hand-hold.png differ diff --git a/desktop/asset-work/ego/hand-hold.pxa/0.pxi b/desktop/asset-work/ego/hand-hold.pxa/0.pxi index 85a5c456..c405117a 100644 Binary files a/desktop/asset-work/ego/hand-hold.pxa/0.pxi and b/desktop/asset-work/ego/hand-hold.pxa/0.pxi differ diff --git a/desktop/asset-work/ego/hand-hold.pxa/1.pxi b/desktop/asset-work/ego/hand-hold.pxa/1.pxi index 2b7d42f3..c116a7ba 100644 Binary files a/desktop/asset-work/ego/hand-hold.pxa/1.pxi and b/desktop/asset-work/ego/hand-hold.pxa/1.pxi differ diff --git a/desktop/asset-work/ending-castle/guard-2.png b/desktop/asset-work/ending-castle/guard-2.png new file mode 100644 index 00000000..a85eca45 Binary files /dev/null and b/desktop/asset-work/ending-castle/guard-2.png differ diff --git a/desktop/asset-work/ending-castle/hand-hold.png b/desktop/asset-work/ending-castle/hand-hold.png new file mode 100644 index 00000000..a78f4729 Binary files /dev/null and b/desktop/asset-work/ending-castle/hand-hold.png differ diff --git a/desktop/resources/packed/pack.atlas b/desktop/resources/packed/pack.atlas index cca0b007..5061b815 100644 --- a/desktop/resources/packed/pack.atlas +++ b/desktop/resources/packed/pack.atlas @@ -109,14 +109,7 @@ 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 +dream/dot rotate: false xy: 846, 784 size: 1, 1 @@ -130,14 +123,7 @@ 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 +inside-jail/dot rotate: false xy: 846, 784 size: 1, 1 @@ -151,6 +137,13 @@ inside-antique/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 outsidehouse/dot rotate: false xy: 846, 784 @@ -158,6 +151,13 @@ outsidehouse/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 title/dot rotate: false xy: 846, 784 @@ -249,6 +249,13 @@ ego/hand-hold orig: 36, 36 offset: 0, 0 index: -1 +ending-castle/hand-hold + rotate: false + xy: 986, 229 + size: 36, 36 + orig: 36, 36 + offset: 0, 0 + index: -1 ego/in-love rotate: false xy: 187, 316 @@ -382,14 +389,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 @@ -815,13 +822,6 @@ dream/background orig: 320, 240 offset: 0, 0 index: -1 -dream/broom - rotate: false - xy: 993, 715 - size: 15, 66 - orig: 15, 66 - offset: 0, 0 - index: -1 dream/case rotate: false xy: 1002, 2 @@ -845,7 +845,7 @@ dream/fairy-godfather-magic index: -1 dream/shovel rotate: false - xy: 984, 227 + xy: 993, 717 size: 19, 64 orig: 19, 64 offset: 0, 0 @@ -857,13 +857,6 @@ dream/sign orig: 41, 58 offset: 0, 0 index: -1 -dream/sword - rotate: false - xy: 1005, 253 - size: 15, 38 - orig: 15, 38 - offset: 0, 0 - index: -1 ego/Untitled rotate: false xy: 968, 588 @@ -969,6 +962,13 @@ ending-castle/guard-1 orig: 27, 56 offset: 0, 0 index: -1 +ending-castle/guard-2 + rotate: false + xy: 984, 235 + size: 27, 56 + orig: 27, 56 + offset: 0, 0 + index: -1 georgia/kick-6 rotate: false xy: 634, 892 @@ -976,13 +976,6 @@ georgia/kick-6 orig: 40, 43 offset: 0, 0 index: -1 -georgia/kick-7 - rotate: false - xy: 968, 182 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 held/background rotate: false xy: 646, 418 @@ -1053,13 +1046,6 @@ inside-castle/trophy orig: 64, 16 offset: 0, 0 index: -1 -inside-house/flask - rotate: false - xy: 1005, 230 - size: 16, 21 - orig: 16, 21 - offset: 0, 0 - index: -1 inside-jail/candle rotate: false xy: 526, 42 @@ -1172,6 +1158,13 @@ wizard/experiment-1 orig: 45, 55 offset: 0, 0 index: -1 +wizard/experiment-2 + rotate: false + xy: 968, 178 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 wizard/stand rotate: false xy: 986, 660 @@ -1913,119 +1906,119 @@ outsidehouse/foreground index: -1 wizard/experiment-10 rotate: false - xy: 977, 510 + xy: 968, 567 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-11 rotate: false - xy: 977, 453 + xy: 977, 510 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-12 rotate: false - xy: 977, 396 + xy: 977, 453 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-13 rotate: false - xy: 977, 339 + xy: 977, 396 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-14 rotate: false - xy: 977, 282 + xy: 977, 339 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-15 rotate: false - xy: 977, 225 + xy: 977, 282 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-16 rotate: false - xy: 977, 168 + xy: 977, 225 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-17 rotate: false - xy: 977, 111 + xy: 977, 168 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-18 rotate: false - xy: 977, 54 + xy: 977, 111 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/experiment-2 +wizard/experiment-19 rotate: false - xy: 968, 966 + xy: 977, 54 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-3 rotate: false - xy: 968, 909 + xy: 968, 966 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-4 rotate: false - xy: 968, 852 + xy: 968, 909 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-5 rotate: false - xy: 968, 795 + xy: 968, 852 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-6 rotate: false - xy: 968, 738 + xy: 968, 795 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-7 rotate: false - xy: 968, 681 + xy: 968, 738 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-8 rotate: false - xy: 968, 624 + xy: 968, 681 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-9 rotate: false - xy: 968, 567 + xy: 968, 624 size: 45, 55 orig: 45, 55 offset: 0, 0 @@ -2045,266 +2038,273 @@ filter: Nearest,Nearest repeat: none behindhouse/house rotate: false - xy: 324, 776 + xy: 324, 781 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 cat-tree/inventory rotate: false - xy: 968, 62 + xy: 968, 67 size: 42, 42 orig: 42, 42 offset: 0, 0 index: -1 cat-tree/owl rotate: false - xy: 334, 18 + xy: 334, 23 size: 168, 30 orig: 168, 30 offset: 0, 0 index: -1 cat-tree/sillhoute rotate: false - xy: 646, 292 + xy: 646, 297 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 dream/pedestals rotate: false - xy: 324, 50 + xy: 324, 55 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 ego/thorw rotate: false - xy: 632, 12 + xy: 632, 17 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/throw rotate: false - xy: 760, 12 + xy: 760, 17 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 goon-2-walk rotate: false - xy: 164, 14 + xy: 164, 19 size: 168, 34 orig: 168, 34 offset: 0, 0 index: -1 castle-gate/goon-2-walk rotate: false - xy: 164, 14 + xy: 164, 19 size: 168, 34 orig: 168, 34 offset: 0, 0 index: -1 held/hand rotate: false - xy: 2, 776 + xy: 2, 781 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 held/head rotate: false - xy: 2, 534 + xy: 2, 539 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-antique/open-blinds rotate: false - xy: 324, 292 + xy: 324, 297 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inside-castle/Untitled rotate: false - xy: 2, 4 + xy: 2, 9 size: 160, 44 orig: 160, 44 offset: 0, 0 index: -1 inside-castle/pedestal-overlay rotate: false - xy: 646, 534 + xy: 646, 539 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 +inside-house/flask + rotate: false + xy: 993, 2 + size: 16, 21 + orig: 16, 21 + offset: 0, 0 + index: -1 inside-house/sillhoute rotate: false - xy: 646, 50 + xy: 646, 55 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 inventory-overlay rotate: false - xy: 324, 534 + xy: 324, 539 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outside-castle/blanket rotate: false - xy: 888, 2 + xy: 888, 7 size: 103, 46 orig: 103, 46 offset: 0, 0 index: -1 outsidehouse/house rotate: false - xy: 2, 292 + xy: 2, 297 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 space/later rotate: false - xy: 646, 776 + xy: 646, 781 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 space/susp rotate: false - xy: 504, 12 + xy: 504, 17 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 talk-bg-2 rotate: false - xy: 993, 20 + xy: 993, 25 size: 21, 40 orig: 21, 40 offset: 0, 0 index: -1 title/logo rotate: false - xy: 2, 50 + xy: 2, 55 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -wizard/experiment-19 - rotate: false - xy: 968, 961 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 wizard/experiment-20 rotate: false - xy: 968, 904 + xy: 968, 966 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-21 rotate: false - xy: 968, 847 + xy: 968, 909 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-22 rotate: false - xy: 968, 790 + xy: 968, 852 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-23 rotate: false - xy: 968, 733 + xy: 968, 795 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-24 rotate: false - xy: 968, 676 + xy: 968, 738 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-25 rotate: false - xy: 968, 619 + xy: 968, 681 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-26 rotate: false - xy: 968, 562 + xy: 968, 624 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-27 rotate: false - xy: 968, 505 + xy: 968, 567 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-28 rotate: false - xy: 968, 448 + xy: 968, 510 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-29 rotate: false - xy: 968, 391 + xy: 968, 453 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-30 rotate: false - xy: 968, 334 + xy: 968, 396 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-31 rotate: false - xy: 968, 277 + xy: 968, 339 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-32 rotate: false - xy: 968, 220 + xy: 968, 282 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-33 rotate: false - xy: 968, 163 + xy: 968, 225 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-34 rotate: false - xy: 968, 106 + xy: 968, 168 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: -1 +wizard/experiment-35 + rotate: false + xy: 968, 111 size: 45, 55 orig: 45, 55 offset: 0, 0 @@ -2315,114 +2315,121 @@ size: 1024,1024 format: RGBA8888 filter: Nearest,Nearest repeat: none -castle-gate/stash-closed - rotate: false - xy: 2, 739 - size: 70, 41 - orig: 70, 41 - offset: 0, 0 - index: -1 castle-gate/throw-walkie-1 rotate: false - xy: 324, 267 + xy: 2, 160 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-2 rotate: false - xy: 692, 644 + xy: 324, 402 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-3 rotate: false - xy: 692, 506 + xy: 646, 719 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-4 rotate: false - xy: 531, 268 + xy: 2, 22 size: 205, 136 orig: 205, 136 offset: 0, 0 index: -1 castle-gate/throw-walkie-5 rotate: false - xy: 738, 275 + xy: 646, 581 + size: 205, 136 + orig: 205, 136 + offset: 0, 0 + index: -1 +castle-gate/throw-walkie-6 + rotate: false + 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-2 rotate: false - xy: 162, 740 + xy: 780, 19 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-3 rotate: false - xy: 222, 740 + xy: 956, 129 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-4 rotate: false - xy: 282, 740 + xy: 956, 87 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-5 rotate: false - xy: 342, 740 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-6 - rotate: false - xy: 402, 740 - size: 58, 40 - orig: 58, 40 - offset: 0, 0 - index: -1 -cat-tree/grandma-cry-7 - rotate: false - xy: 924, 2 + xy: 956, 45 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/tree-and-rock rotate: false - xy: 646, 782 + xy: 324, 782 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 cat-tree/tree-r rotate: false - xy: 2, 13 + xy: 531, 298 size: 65, 240 orig: 65, 240 offset: 0, 0 index: -1 -dream/cliff +dream/broom rotate: false - xy: 417, 11 - size: 81, 87 - orig: 81, 87 + xy: 961, 789 + size: 15, 66 + orig: 15, 66 offset: 0, 0 index: -1 dream/corner-l rotate: false - xy: 730, 413 + xy: 607, 12 size: 112, 59 orig: 112, 59 offset: 0, 0 @@ -2434,940 +2441,947 @@ dream/sky orig: 320, 240 offset: 0, 0 index: -1 +dream/sword + rotate: false + xy: 1003, 188 + size: 15, 38 + orig: 15, 38 + offset: 0, 0 + index: -1 ego/georgia rotate: false - xy: 691, 474 + xy: 531, 266 size: 90, 30 orig: 90, 30 offset: 0, 0 index: -1 -ego/grow - rotate: false - xy: 928, 427 - size: 90, 36 - orig: 90, 36 - offset: 0, 0 - index: -1 ego/hold-hand rotate: false - xy: 432, 702 + xy: 1003, 751 size: 16, 36 orig: 16, 36 offset: 0, 0 index: -1 +ego/hold-up-to-window + rotate: false + xy: 317, 19 + size: 108, 36 + orig: 108, 36 + offset: 0, 0 + index: -1 ego/pant rotate: false - xy: 899, 744 + xy: 427, 19 size: 62, 36 orig: 62, 36 offset: 0, 0 index: -1 -ego/reach - rotate: false - xy: 945, 389 - size: 72, 36 - orig: 72, 36 - offset: 0, 0 - index: -1 -ego/scared - rotate: false - xy: 945, 351 - size: 72, 36 - orig: 72, 36 - offset: 0, 0 - index: -1 -ego/spear - rotate: false - xy: 432, 552 - size: 90, 100 - orig: 90, 100 - offset: 0, 0 - index: -1 ego/warden rotate: false - xy: 74, 739 + xy: 956, 2 size: 42, 41 orig: 42, 41 offset: 0, 0 index: -1 -ending-castle/crowd-left +ending-castle/frankie-fall-3 rotate: false - 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 + xy: 598, 446 + size: 40, 35 + orig: 40, 35 offset: 0, 0 index: -1 ending-castle/warden-2 rotate: false - xy: 118, 739 + xy: 978, 789 size: 42, 41 orig: 42, 41 offset: 0, 0 index: -1 georgia/kick-10 rotate: false - xy: 886, 416 + xy: 961, 744 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-11 + rotate: false + xy: 961, 699 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-12 + rotate: false + xy: 961, 654 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-13 + rotate: false + xy: 961, 609 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-14 + rotate: false + xy: 961, 564 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-15 + rotate: false + xy: 961, 519 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-16 + rotate: false + xy: 961, 474 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-17 + rotate: false + xy: 961, 429 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-18 + rotate: false + xy: 961, 384 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-19 + rotate: false + xy: 978, 832 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: -1 +georgia/kick-7 + rotate: false + xy: 805, 341 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-8 rotate: false - xy: 845, 461 + xy: 968, 922 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 georgia/kick-9 rotate: false - xy: 844, 416 + xy: 968, 877 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 held/bloodclot-head-1 rotate: false - xy: 69, 4 + xy: 491, 13 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 -held/bloodclot-head-2 +inside-cafeteria/hands-fight-3 rotate: false - xy: 185, 4 - size: 114, 82 - orig: 114, 82 - offset: 0, 0 - index: -1 -held/bloodclot-head-3 - rotate: false - xy: 301, 4 - size: 114, 82 - orig: 114, 82 - offset: 0, 0 - index: -1 -held/bloodclot-head-4 - rotate: false - xy: 576, 16 - size: 114, 82 - orig: 114, 82 - offset: 0, 0 - index: -1 -held/bloodclot-head-5 - rotate: false - xy: 692, 17 - size: 114, 82 - orig: 114, 82 - offset: 0, 0 - index: -1 -held/bloodclot-head-6 - rotate: false - xy: 808, 17 - size: 114, 82 - orig: 114, 82 - offset: 0, 0 - index: -1 -inside-cafeteria/knights - rotate: false - xy: 531, 683 - size: 74, 97 - orig: 74, 97 - offset: 0, 0 - index: -1 -inside-cafeteria/ladder-guard - rotate: false - xy: 500, 11 - size: 74, 87 - orig: 74, 87 + xy: 209, 23 + size: 106, 106 + orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/warriors rotate: false - xy: 462, 654 + xy: 956, 228 size: 66, 126 orig: 66, 126 offset: 0, 0 index: -1 inside-castle/roof rotate: false - xy: 945, 292 + xy: 721, 2 size: 57, 57 orig: 57, 57 offset: 0, 0 index: -1 inside-castle/walkie-talkie rotate: false - xy: 984, 8 + xy: 805, 305 size: 35, 34 orig: 35, 34 offset: 0, 0 index: -1 inside-castle/way-back-tree rotate: false - xy: 2, 255 + xy: 324, 540 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outside-castle/walk-behind rotate: false - xy: 2, 497 + xy: 2, 298 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 outside-jail/guard-sleep rotate: false - xy: 432, 483 + xy: 317, 57 size: 172, 67 orig: 172, 67 offset: 0, 0 index: -1 outsidehouse/fg1 rotate: false - xy: 600, 409 + xy: 632, 73 size: 128, 63 orig: 128, 63 offset: 0, 0 index: -1 -outsidehouse/fgtest - rotate: false - xy: 530, 606 - size: 75, 75 - orig: 75, 75 - offset: 0, 0 - index: -1 space/Blergh rotate: false - xy: 283, 88 + xy: 860, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-flex rotate: false - xy: 324, 572 + xy: 853, 690 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-stand rotate: false - xy: 324, 572 + xy: 853, 690 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/blergh-talk rotate: false - xy: 324, 405 + xy: 209, 131 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-1 rotate: false - xy: 391, 100 + xy: 853, 523 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-2 rotate: false - xy: 499, 100 + xy: 853, 356 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-3 rotate: false - xy: 607, 101 + xy: 524, 97 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-4 rotate: false - xy: 715, 101 + xy: 632, 138 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-5 rotate: false - xy: 823, 108 + xy: 740, 138 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-6 + rotate: false + xy: 848, 189 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: -1 +space/bloodclot-explode-7 + rotate: false + xy: 848, 22 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-head-talk-1 rotate: false - xy: 607, 705 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-2 - rotate: false - xy: 607, 628 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-3 - rotate: false - xy: 607, 551 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-4 - rotate: false - xy: 607, 474 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-5 - rotate: false - xy: 432, 406 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-6 - rotate: false - xy: 516, 406 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-7 - rotate: false - xy: 931, 198 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-8 - rotate: false - xy: 931, 121 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -space/bloodclot-head-talk-9 - rotate: false - xy: 931, 44 + xy: 762, 61 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-stand rotate: false - xy: 69, 88 + xy: 646, 857 size: 212, 165 orig: 212, 165 offset: 0, 0 index: -1 the-end rotate: false - xy: 324, 782 + xy: 2, 540 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 -title/balloon - rotate: false - xy: 783, 474 - size: 60, 30 - orig: 60, 30 - offset: 0, 0 - index: -1 -wizard/experiment-35 - rotate: false - xy: 968, 967 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: -1 wizard/experiment-36 rotate: false - xy: 968, 910 + xy: 598, 483 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-37 rotate: false - xy: 968, 853 + xy: 805, 386 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-38 rotate: false - xy: 968, 796 + xy: 968, 967 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 wizard/experiment-39 rotate: false - xy: 968, 739 + xy: 956, 171 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 -wizard/talk - rotate: false - xy: 524, 558 - size: 80, 46 - orig: 80, 46 - offset: 0, 0 - index: -1 pack8.png size: 1024,1024 format: RGBA8888 filter: Nearest,Nearest repeat: none -castle-gate/throw-walkie-6 +castle-gate/stash-closed rotate: false - xy: 2, 885 - size: 205, 136 - orig: 205, 136 - offset: 0, 0 - index: -1 -castle-gate/throw-walkie-7 - rotate: false - xy: 2, 747 - size: 205, 136 - orig: 205, 136 - offset: 0, 0 - index: -1 -castle-gate/throw-walkie-8 - rotate: false - xy: 209, 885 - size: 205, 136 - orig: 205, 136 - offset: 0, 0 - index: -1 -castle-gate/throw-walkie-9 - rotate: false - xy: 2, 609 - size: 205, 136 - orig: 205, 136 + xy: 578, 477 + size: 70, 41 + orig: 70, 41 offset: 0, 0 index: -1 cat-tree/grandma-cry-10 rotate: false - xy: 326, 253 + xy: 586, 275 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-11 rotate: false - xy: 222, 78 + xy: 592, 233 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-12 rotate: false - xy: 282, 78 + xy: 652, 761 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-13 rotate: false - xy: 284, 36 + xy: 712, 761 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-14 rotate: false - xy: 326, 211 + xy: 772, 761 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-15 rotate: false - xy: 302, 169 + xy: 874, 760 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-16 rotate: false - xy: 386, 247 + xy: 186, 89 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-17 rotate: false - xy: 386, 205 + xy: 186, 47 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-18 rotate: false - xy: 362, 163 + xy: 152, 5 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-19 rotate: false - xy: 881, 570 + xy: 246, 83 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-20 rotate: false - xy: 422, 163 + xy: 246, 41 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-6 + rotate: false + xy: 964, 837 + size: 58, 40 + orig: 58, 40 + offset: 0, 0 + index: -1 +cat-tree/grandma-cry-7 + rotate: false + xy: 964, 795 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-8 rotate: false - xy: 326, 337 + xy: 578, 359 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 cat-tree/grandma-cry-9 rotate: false - xy: 326, 295 + xy: 586, 317 size: 58, 40 orig: 58, 40 offset: 0, 0 index: -1 +dream/cliff + rotate: false + xy: 326, 493 + size: 81, 87 + orig: 81, 87 + offset: 0, 0 + index: -1 dream/corner-r rotate: false - xy: 108, 47 + xy: 896, 879 size: 112, 59 orig: 112, 59 offset: 0, 0 index: -1 ego/frog rotate: false - xy: 328, 131 + xy: 212, 9 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 -ego/hold-up-to-window +ego/grow rotate: false - xy: 108, 9 - size: 108, 36 - orig: 108, 36 + xy: 418, 235 + size: 90, 36 + orig: 90, 36 + offset: 0, 0 + index: -1 +ego/reach + rotate: false + xy: 578, 439 + size: 72, 36 + orig: 72, 36 + offset: 0, 0 + index: -1 +ego/scared + rotate: false + xy: 578, 401 + size: 72, 36 + orig: 72, 36 + offset: 0, 0 + index: -1 +ego/spear + rotate: false + xy: 110, 146 + size: 90, 100 + orig: 90, 100 + offset: 0, 0 + index: -1 +ending-castle/crowd-left + rotate: false + xy: 542, 887 + size: 116, 135 + orig: 116, 135 + offset: 0, 0 + index: -1 +ending-castle/crowd-right + rotate: false + xy: 660, 887 + size: 116, 135 + orig: 116, 135 offset: 0, 0 index: -1 ending-castle/frankie-fall-10 rotate: false - xy: 426, 89 + xy: 634, 603 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-11 rotate: false - xy: 344, 52 + xy: 676, 724 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-12 rotate: false - xy: 386, 52 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -ending-castle/frankie-fall-3 - rotate: false - xy: 966, 851 + xy: 676, 687 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-4 rotate: false - xy: 218, 3 + xy: 246, 4 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-5 rotate: false - xy: 362, 126 + xy: 306, 88 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-6 rotate: false - xy: 404, 126 + xy: 306, 51 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-7 rotate: false - xy: 446, 126 + xy: 634, 714 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-8 rotate: false - xy: 342, 89 + xy: 634, 677 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 ending-castle/frankie-fall-9 rotate: false - xy: 384, 89 + xy: 634, 640 size: 40, 35 orig: 40, 35 offset: 0, 0 index: -1 -georgia/kick-11 - rotate: false - xy: 966, 978 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-12 - rotate: false - xy: 966, 933 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-13 - rotate: false - xy: 966, 888 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-14 - rotate: false - xy: 965, 806 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-15 - rotate: false - xy: 965, 761 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-16 - rotate: false - xy: 965, 716 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-17 - rotate: false - xy: 965, 671 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-18 - rotate: false - xy: 965, 626 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 -georgia/kick-19 - rotate: false - xy: 386, 334 - size: 40, 43 - orig: 40, 43 - offset: 0, 0 - index: -1 georgia/kick-20 rotate: false - xy: 386, 289 + xy: 110, 2 size: 40, 43 orig: 40, 43 offset: 0, 0 index: -1 +held/bloodclot-head-2 + rotate: false + xy: 896, 940 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-3 + rotate: false + xy: 648, 803 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-4 + rotate: false + xy: 764, 803 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-5 + rotate: false + xy: 218, 331 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 +held/bloodclot-head-6 + rotate: false + xy: 218, 247 + size: 114, 82 + orig: 114, 82 + offset: 0, 0 + index: -1 held/bloodclot-head-7 rotate: false - xy: 533, 605 + xy: 434, 665 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-8 rotate: false - xy: 649, 605 + xy: 434, 581 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 held/bloodclot-head-9 rotate: false - xy: 765, 605 + xy: 202, 163 size: 114, 82 orig: 114, 82 offset: 0, 0 index: -1 -inside-cafeteria/hands-fight-3 - rotate: false - xy: 209, 610 - size: 106, 106 - orig: 106, 106 - offset: 0, 0 - index: -1 inside-cafeteria/hands-fight-4 rotate: false - xy: 317, 610 + xy: 110, 248 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-5 rotate: false - xy: 425, 611 + xy: 218, 415 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-6 rotate: false - xy: 218, 335 + xy: 326, 582 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 inside-cafeteria/hands-fight-7 rotate: false - xy: 218, 227 + xy: 434, 749 size: 106, 106 orig: 106, 106 offset: 0, 0 index: -1 +inside-cafeteria/knights + rotate: false + xy: 110, 47 + size: 74, 97 + orig: 74, 97 + offset: 0, 0 + index: -1 +inside-cafeteria/ladder-guard + rotate: false + xy: 334, 327 + size: 74, 87 + orig: 74, 87 + offset: 0, 0 + index: -1 inside-castle/hands-1 rotate: false - xy: 2, 2 + xy: 542, 781 size: 104, 104 orig: 104, 104 offset: 0, 0 index: -1 outside-castle/balloons rotate: false - xy: 222, 40 + xy: 264, 125 size: 60, 36 orig: 60, 36 offset: 0, 0 index: -1 outside-castle/crowd-right rotate: false - xy: 416, 886 + xy: 778, 887 size: 116, 135 orig: 116, 135 offset: 0, 0 index: -1 +outsidehouse/fgtest + rotate: false + xy: 577, 520 + size: 75, 75 + orig: 75, 75 + offset: 0, 0 + index: -1 outsidehouse/lamb-walk rotate: false - xy: 218, 120 + xy: 542, 751 size: 108, 28 orig: 108, 28 offset: 0, 0 index: -1 space/bloodclot-explode-10 rotate: false - xy: 317, 718 + xy: 110, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-11 rotate: false - xy: 110, 442 + xy: 2, 523 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-12 rotate: false - xy: 110, 275 + xy: 110, 690 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-13 rotate: false - xy: 110, 108 + xy: 218, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-14 rotate: false - xy: 425, 719 + xy: 2, 356 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-15 rotate: false - xy: 534, 856 + xy: 110, 523 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-16 rotate: false - xy: 642, 856 + xy: 218, 690 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-17 rotate: false - xy: 750, 856 + xy: 326, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-18 rotate: false - xy: 858, 856 + xy: 2, 189 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-19 rotate: false - xy: 533, 689 + xy: 110, 356 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-20 rotate: false - xy: 641, 689 + xy: 218, 523 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-21 rotate: false - xy: 749, 689 + xy: 326, 690 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-22 rotate: false - xy: 857, 689 + xy: 434, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-23 rotate: false - xy: 218, 443 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-6 - rotate: false - xy: 209, 718 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -space/bloodclot-explode-7 - rotate: false - xy: 2, 442 + xy: 2, 22 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-8 rotate: false - xy: 2, 275 + xy: 2, 857 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-explode-9 rotate: false - xy: 2, 108 + xy: 2, 690 size: 106, 165 orig: 106, 165 offset: 0, 0 index: -1 space/bloodclot-head-talk-10 rotate: false - xy: 326, 533 + xy: 493, 504 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-11 rotate: false - xy: 881, 612 + xy: 494, 427 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-12 rotate: false - xy: 218, 150 + xy: 494, 350 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-13 rotate: false - xy: 326, 456 + xy: 418, 273 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 space/bloodclot-head-talk-14 rotate: false - xy: 326, 379 + xy: 502, 273 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-2 + rotate: false + xy: 326, 416 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-3 + rotate: false + xy: 334, 250 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-4 + rotate: false + xy: 880, 802 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-5 + rotate: false + xy: 409, 504 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-6 + rotate: false + xy: 410, 427 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-7 + rotate: false + xy: 410, 350 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-8 + rotate: false + xy: 550, 674 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: -1 +space/bloodclot-head-talk-9 + rotate: false + xy: 550, 597 size: 82, 75 orig: 82, 75 offset: 0, 0 index: -1 talk-bg rotate: false - xy: 941, 570 + xy: 832, 761 size: 40, 40 orig: 40, 40 offset: 0, 0 index: -1 +title/balloon + rotate: false + xy: 202, 131 + size: 60, 30 + orig: 60, 30 + offset: 0, 0 + index: -1 +wizard/talk + rotate: false + xy: 510, 225 + size: 80, 46 + orig: 80, 46 + offset: 0, 0 + index: -1 diff --git a/desktop/resources/packed/pack.png b/desktop/resources/packed/pack.png index 0ec974a3..2522ace9 100644 Binary files a/desktop/resources/packed/pack.png and b/desktop/resources/packed/pack.png differ diff --git a/desktop/resources/packed/pack2.png b/desktop/resources/packed/pack2.png index 4435f13a..1fafd875 100644 Binary files a/desktop/resources/packed/pack2.png and b/desktop/resources/packed/pack2.png differ diff --git a/desktop/resources/packed/pack5.png b/desktop/resources/packed/pack5.png index 5f893b31..a0d39169 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 a555a67f..77392e36 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 c901d89f..39391f3b 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 6c2b2975..9446ddf5 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/credits.clj b/desktop/src-common/advent/screens/credits.clj index f8ad15ed..3569105e 100644 --- a/desktop/src-common/advent/screens/credits.clj +++ b/desktop/src-common/advent/screens/credits.clj @@ -21,14 +21,6 @@ (def credit-messages [["\"Tick's Tales\" Created By" "Bryce Covert"] - ["Artwork" - "Bryce Covert"] - ["Programming" - "Bryce Covert"] - ["Music" - "Bryce Covert"] - ["Sound Effects" - "Bryce Covert"] ["Frog Legs" "Marya Yama"] ["Perspective Tutorials" diff --git a/desktop/src-common/advent/screens/rooms/ending.clj b/desktop/src-common/advent/screens/rooms/ending.clj index c04ed186..8af38d23 100644 --- a/desktop/src-common/advent/screens/rooms/ending.clj +++ b/desktop/src-common/advent/screens/rooms/ending.clj @@ -44,7 +44,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 1.2 1.20)] + scaler (utils/scaler-fn-with-baseline 20 1.3 1.30)] (rooms/make :music :dream :name "Ending" :interactions {} @@ -54,9 +54,9 @@ (update-in e [:room :entities :ego] dissoc :talk-override )) :georgia (rooms/make-entity :georgia (assoc (animation->texture screen georgia-stand) :x 111 :y 22 :baseline 218 - :scale-x 1.2 - :scale-y 1.2 - :talk-color (Color/valueOf "ffabe0ff") + :scale-x 1.3 + :scale-y 1.3 + :talk-color3(Color/valueOf "ffabe0ff") :opacity 0.0 :anim georgia-stand :anim-start 0 @@ -67,18 +67,12 @@ :anim-merges {georgia-stand {:origin-x 10 :origin-y 1} :default {:origin-x 10 :origin-y 1} georgia-kick {:origin-x 19 :origin-y 0}})) - :entities {:peddler (assoc (animation->texture screen peddler-stand) - :x 245 :y 46 :baseline 200 - :anim peddler-stand - :anim-start 0 - :scaled true) - - :frankie (assoc (common/make-frankie screen) + :entities {:frankie (assoc (common/make-frankie screen) :x 28 :y 21 :baseline 200 :fall frankie-fall :down frankie-down - :scale-x 1.2 - :scale-y 1.2 + :scale-x 1.3 + :scale-y 1.3 :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}}) @@ -91,8 +85,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 + :scale-x 1.3 + :scale-y 1.3 :anim duke-stand :anim-start 0 :talk-color (color 0.4 0.5 0.94 1.0) @@ -115,18 +109,23 @@ :scaled true) :crowd-left (assoc (utils/get-texture "ending-castle/crowd-left.png") :x 0 :y 0 - :scale-x 1.2 - :scale-y 1.2 + :scale-x 1.3 + :scale-y 1.3 :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 + :scale-x 1.3 + :scale-y 1.3 :baseline 238) :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) + :guard-2 (assoc (utils/get-texture "ending-castle/guard-2.png") + :x 182 :y 73 + :scale-x 0.9 + :scale-y 0.9 :baseline 140)} :collision "ending-castle/ending-castle2-assets/collision.png" :scale-fn scaler