diff --git a/desktop/project.clj b/desktop/project.clj index 9a1ce4cd..cc1ead49 100644 --- a/desktop/project.clj +++ b/desktop/project.clj @@ -2,7 +2,7 @@ (def packs (into ["do"] (mapcat (fn [directory] ["run" "-m" "com.badlogic.gdx.tools.texturepacker.TexturePacker" (str "asset-work/" directory) "resources/packed/" (str directory ",")]) - ["inside-jail"] + ["global" "ending-castle"] #_["behindhouse" "dream" "georgia" "inside-cafeteria" "inside-jail" "outsidehouse" "safe-song" "title" "castle-gate" "ego" "held" "inside-castle" "inside-stash" "outside-castle" "screenshots" "wizard" "cat-tree" "ending-castle" "inside-antique" "inside-house" "outside-jail" "space" ]))) diff --git a/desktop/resources/packed/castle-gate.atlas b/desktop/resources/packed/castle-gate.atlas index 217b55e8..eed574a6 100644 --- a/desktop/resources/packed/castle-gate.atlas +++ b/desktop/resources/packed/castle-gate.atlas @@ -6,7 +6,7 @@ filter: Nearest,Nearest repeat: none Untitled rotate: false - xy: 638, 460 + xy: 142, 80 size: 192, 35 orig: 192, 35 offset: 0, 0 @@ -25,107 +25,44 @@ coinflip orig: 50, 10 offset: 0, 0 index: -1 -frankie - rotate: false - xy: 324, 460 - size: 312, 35 - orig: 312, 35 - offset: 0, 0 - index: -1 -frankie-walk-1 - rotate: false - xy: 763, 104 - size: 24, 35 - orig: 24, 35 - offset: 0, 0 - index: -1 -frankie-walk-2 - rotate: false - xy: 835, 147 - size: 24, 35 - orig: 24, 35 - offset: 0, 0 - index: -1 -frankie-walk-3 - rotate: false - xy: 763, 67 - size: 24, 35 - orig: 24, 35 - offset: 0, 0 - index: -1 -frankie-walk-4 - rotate: false - xy: 789, 104 - size: 24, 35 - orig: 24, 35 - offset: 0, 0 - index: -1 -frankie-walk-5 - rotate: false - xy: 861, 147 - size: 24, 35 - orig: 24, 35 - offset: 0, 0 - index: -1 -frankie-walk-6 - rotate: false - xy: 789, 67 - size: 24, 35 - orig: 24, 35 - offset: 0, 0 - index: -1 -frankie-walk-7 - rotate: false - xy: 887, 147 - size: 24, 35 - orig: 24, 35 - offset: 0, 0 - index: -1 -frankie-walk-8 - rotate: false - xy: 913, 147 - size: 24, 35 - orig: 24, 35 - offset: 0, 0 - index: -1 goon-1 rotate: false - xy: 142, 14 + xy: 945, 419 size: 26, 33 orig: 26, 33 offset: 0, 0 index: -1 goon-2 rotate: false - xy: 192, 49 + xy: 763, 119 size: 24, 32 orig: 24, 32 offset: 0, 0 index: -1 goon-2-flip rotate: false - xy: 142, 49 + xy: 763, 153 size: 48, 32 orig: 48, 32 offset: 0, 0 index: -1 goon-2-search rotate: false - xy: 142, 83 + xy: 763, 187 size: 192, 32 orig: 192, 32 offset: 0, 0 index: -1 goon-2-talk rotate: false - xy: 939, 150 + xy: 813, 153 size: 24, 32 orig: 24, 32 offset: 0, 0 index: -1 goon-2-walk rotate: false - xy: 832, 461 + xy: 142, 44 size: 168, 34 orig: 168, 34 offset: 0, 0 @@ -139,71 +76,71 @@ overlay index: -1 stash-closed rotate: false - xy: 763, 141 + xy: 945, 454 size: 70, 41 orig: 70, 41 offset: 0, 0 index: -1 -throw-walkie-1 +throw-walkie rotate: false - xy: 324, 322 + xy: 324, 359 size: 205, 136 orig: 205, 136 offset: 0, 0 - index: -1 -throw-walkie-2 + index: 0 +throw-walkie + rotate: false + xy: 531, 359 + size: 205, 136 + orig: 205, 136 + offset: 0, 0 + index: 1 +throw-walkie + rotate: false + xy: 738, 359 + size: 205, 136 + orig: 205, 136 + offset: 0, 0 + index: 2 +throw-walkie rotate: false xy: 142, 117 size: 205, 136 orig: 205, 136 offset: 0, 0 - index: -1 -throw-walkie-3 + index: 3 +throw-walkie rotate: false - xy: 349, 184 + xy: 349, 221 size: 205, 136 orig: 205, 136 offset: 0, 0 - index: -1 -throw-walkie-4 + index: 4 +throw-walkie rotate: false - xy: 349, 46 + xy: 556, 221 size: 205, 136 orig: 205, 136 offset: 0, 0 - index: -1 -throw-walkie-5 + index: 5 +throw-walkie rotate: false - xy: 531, 322 + xy: 763, 221 size: 205, 136 orig: 205, 136 offset: 0, 0 - index: -1 -throw-walkie-6 + index: 6 +throw-walkie rotate: false - xy: 556, 184 + xy: 349, 83 size: 205, 136 orig: 205, 136 offset: 0, 0 - index: -1 -throw-walkie-7 + index: 7 +throw-walkie rotate: false - xy: 556, 46 + xy: 556, 83 size: 205, 136 orig: 205, 136 offset: 0, 0 - index: -1 -throw-walkie-8 - rotate: false - xy: 738, 322 - size: 205, 136 - orig: 205, 136 - offset: 0, 0 - index: -1 -throw-walkie-9 - rotate: false - xy: 763, 184 - size: 205, 136 - orig: 205, 136 - offset: 0, 0 - index: -1 + index: 8 diff --git a/desktop/resources/packed/castle-gate.png b/desktop/resources/packed/castle-gate.png index e44319f6..6e5f9bd3 100644 Binary files a/desktop/resources/packed/castle-gate.png and b/desktop/resources/packed/castle-gate.png differ diff --git a/desktop/resources/packed/ending-castle.atlas b/desktop/resources/packed/ending-castle.atlas index 66b46bf0..1f78a4cf 100644 --- a/desktop/resources/packed/ending-castle.atlas +++ b/desktop/resources/packed/ending-castle.atlas @@ -1,180 +1,356 @@ ending-castle.png -size: 512,256 -format: RGBA8888 +size: 1024,512 +format: RGBA4444 filter: Nearest,Nearest repeat: none Untitled rotate: false - xy: 238, 98 + xy: 983, 426 size: 28, 39 orig: 28, 39 offset: 0, 0 index: -1 game-player rotate: false - xy: 238, 98 + xy: 983, 426 size: 28, 39 orig: 28, 39 offset: 0, 0 index: -1 +cat-stand + rotate: false + xy: 2, 15 + size: 198, 11 + orig: 198, 11 + offset: 0, 0 + index: -1 crowd-left rotate: false - xy: 2, 60 + xy: 324, 176 size: 116, 135 orig: 116, 135 offset: 0, 0 index: -1 crowd-right rotate: false - xy: 120, 60 + xy: 324, 39 size: 116, 135 orig: 116, 135 offset: 0, 0 index: -1 duke rotate: false - xy: 2, 197 + xy: 324, 462 size: 440, 48 orig: 440, 48 offset: 0, 0 index: -1 -frankie-fall-1 - rotate: false - xy: 31, 23 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -frankie-fall-10 - rotate: false - xy: 241, 23 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -frankie-fall-11 - rotate: false - xy: 268, 123 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -frankie-fall-12 - rotate: false - xy: 310, 123 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -frankie-fall-2 - rotate: false - xy: 267, 160 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -frankie-fall-3 - rotate: false - xy: 73, 23 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -frankie-fall-4 - rotate: false - xy: 309, 160 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -frankie-fall-5 - rotate: false - xy: 115, 23 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -frankie-fall-6 - rotate: false - xy: 351, 160 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -frankie-fall-7 - rotate: false - xy: 157, 23 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -frankie-fall-8 - rotate: false - xy: 393, 160 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -frankie-fall-9 - rotate: false - xy: 199, 23 - size: 40, 35 - orig: 40, 35 - offset: 0, 0 - index: -1 -guard-1 - rotate: false - xy: 2, 2 - size: 27, 56 - orig: 27, 56 - offset: 0, 0 - index: -1 -guard-2 - rotate: false - xy: 238, 139 - size: 27, 56 - orig: 27, 56 - offset: 0, 0 - index: -1 -hand-hold - rotate: false - xy: 238, 60 - size: 36, 36 - orig: 36, 36 - offset: 0, 0 - index: -1 -warden-2 - rotate: false - xy: 444, 204 - size: 42, 41 - orig: 42, 41 - offset: 0, 0 - index: -1 - -ending-castle2.png -size: 1024,256 -format: RGBA8888 -filter: Nearest,Nearest -repeat: none ending-castle2-assets/background rotate: false - xy: 2, 2 + xy: 2, 270 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 ending-castle2-assets/collision rotate: false - xy: 324, 2 + xy: 2, 28 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 ending-castle2-assets/foreground rotate: false - xy: 646, 133 + xy: 324, 351 size: 344, 109 orig: 344, 109 offset: 0, 0 index: -1 +frankie-fall-1 + rotate: false + xy: 324, 2 + size: 40, 35 + orig: 40, 35 + offset: 0, 0 + index: -1 +frankie-fall-10 + rotate: false + xy: 492, 13 + size: 40, 35 + orig: 40, 35 + offset: 0, 0 + index: -1 +frankie-fall-11 + rotate: false + xy: 534, 21 + size: 40, 35 + orig: 40, 35 + offset: 0, 0 + index: -1 +frankie-fall-12 + rotate: false + xy: 576, 36 + size: 40, 35 + orig: 40, 35 + offset: 0, 0 + index: -1 +frankie-fall-2 + rotate: false + xy: 366, 2 + size: 40, 35 + orig: 40, 35 + offset: 0, 0 + index: -1 +frankie-fall-3 + rotate: false + xy: 408, 2 + size: 40, 35 + orig: 40, 35 + offset: 0, 0 + index: -1 +frankie-fall-4 + rotate: false + xy: 442, 45 + size: 40, 35 + orig: 40, 35 + offset: 0, 0 + index: -1 +frankie-fall-5 + rotate: false + xy: 526, 58 + size: 40, 35 + orig: 40, 35 + offset: 0, 0 + index: -1 +frankie-fall-6 + rotate: false + xy: 670, 350 + size: 40, 35 + orig: 40, 35 + offset: 0, 0 + index: -1 +frankie-fall-7 + rotate: false + xy: 568, 110 + size: 40, 35 + orig: 40, 35 + offset: 0, 0 + index: -1 +frankie-fall-8 + rotate: false + xy: 568, 73 + size: 40, 35 + orig: 40, 35 + offset: 0, 0 + index: -1 +frankie-fall-9 + rotate: false + xy: 450, 8 + size: 40, 35 + orig: 40, 35 + offset: 0, 0 + index: -1 +georgia/kick + rotate: false + xy: 928, 467 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: 0 +georgia/kick + rotate: false + xy: 471, 185 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: 1 +georgia/kick + rotate: false + xy: 471, 185 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: 3 +georgia/kick + rotate: false + xy: 970, 467 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: 2 +georgia/kick + rotate: false + xy: 731, 417 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: 4 +georgia/kick + rotate: false + xy: 773, 422 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: 5 +georgia/kick + rotate: false + xy: 815, 422 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: 6 +georgia/kick + rotate: false + xy: 857, 422 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: 7 +georgia/kick + rotate: false + xy: 899, 422 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: 8 +georgia/kick + rotate: false + xy: 941, 422 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: 9 +georgia/kick + rotate: false + xy: 513, 185 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: 10 +georgia/kick + rotate: false + xy: 544, 230 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: 11 +georgia/kick + rotate: false + xy: 555, 185 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: 12 +georgia/kick + rotate: false + xy: 442, 127 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: 13 +georgia/kick + rotate: false + xy: 442, 82 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: 14 +georgia/kick + rotate: false + xy: 484, 140 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: 15 +georgia/kick + rotate: false + xy: 484, 95 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: 16 +georgia/kick + rotate: false + xy: 526, 140 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: 17 +georgia/kick + rotate: false + xy: 484, 50 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: 18 +georgia/kick + rotate: false + xy: 526, 95 + size: 40, 43 + orig: 40, 43 + offset: 0, 0 + index: 19 +georgia/stand + rotate: false + xy: 442, 230 + size: 100, 43 + orig: 100, 43 + offset: 0, 0 + index: -1 +georgia/walk + rotate: false + xy: 766, 467 + size: 160, 43 + orig: 160, 43 + offset: 0, 0 + index: -1 +grandma + rotate: false + xy: 324, 313 + size: 275, 36 + orig: 275, 36 + offset: 0, 0 + index: -1 +guard-1 + rotate: false + xy: 702, 404 + size: 27, 56 + orig: 27, 56 + offset: 0, 0 + index: -1 +guard-2 + rotate: false + xy: 442, 172 + size: 27, 56 + orig: 27, 56 + offset: 0, 0 + index: -1 +hand-hold + rotate: false + xy: 568, 147 + size: 36, 36 + orig: 36, 36 + offset: 0, 0 + index: -1 +ladder-guard-2 + rotate: false + xy: 670, 387 + size: 30, 73 + orig: 30, 73 + offset: 0, 0 + index: -1 +peddler-talk + rotate: false + xy: 442, 275 + size: 126, 36 + orig: 126, 36 + offset: 0, 0 + index: -1 +warden-2 + rotate: false + xy: 601, 308 + size: 42, 41 + orig: 42, 41 + offset: 0, 0 + index: -1 diff --git a/desktop/resources/packed/ending-castle.png b/desktop/resources/packed/ending-castle.png index 4f105db4..c1a213cd 100644 Binary files a/desktop/resources/packed/ending-castle.png and b/desktop/resources/packed/ending-castle.png differ diff --git a/desktop/resources/packed/ending-castle2.png b/desktop/resources/packed/ending-castle2.png deleted file mode 100644 index c81372bd..00000000 Binary files a/desktop/resources/packed/ending-castle2.png and /dev/null differ diff --git a/desktop/resources/packed/global.atlas b/desktop/resources/packed/global.atlas index c29ecfb6..8f9bc6f7 100644 --- a/desktop/resources/packed/global.atlas +++ b/desktop/resources/packed/global.atlas @@ -6,35 +6,35 @@ filter: Nearest,Nearest repeat: none bird rotate: false - xy: 466, 630 + xy: 144, 74 size: 2, 2 orig: 2, 2 offset: 0, 0 index: -1 black rotate: false - xy: 94, 17 + xy: 2, 4 size: 32, 24 orig: 32, 24 offset: 0, 0 index: -1 close rotate: false - xy: 492, 360 + xy: 470, 660 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ego/Untitled rotate: false - xy: 664, 922 + xy: 324, 640 size: 144, 36 orig: 144, 36 offset: 0, 0 index: -1 ego/talk rotate: false - xy: 664, 922 + xy: 324, 640 size: 144, 36 orig: 144, 36 offset: 0, 0 @@ -55,14 +55,14 @@ ego/axe-wood index: -1 ego/base rotate: false - xy: 128, 5 + xy: 956, 922 size: 16, 36 orig: 16, 36 offset: 0, 0 index: -1 ego/whistle rotate: false - xy: 128, 5 + xy: 956, 922 size: 16, 36 orig: 16, 36 offset: 0, 0 @@ -90,84 +90,84 @@ ego/climb index: -1 ego/crawl rotate: false - xy: 2, 284 + xy: 2, 247 size: 273, 25 orig: 273, 25 offset: 0, 0 index: -1 ego/crowbar rotate: false - xy: 810, 922 + xy: 664, 922 size: 144, 36 orig: 144, 36 offset: 0, 0 index: -1 ego/dot rotate: false - xy: 613, 748 + xy: 522, 197 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 wizard/dot rotate: false - xy: 613, 748 + xy: 522, 197 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 ego/fire rotate: false - xy: 2, 189 + xy: 2, 152 size: 216, 36 orig: 216, 36 offset: 0, 0 index: -1 ego/flying rotate: false - xy: 930, 792 + xy: 988, 902 size: 34, 44 orig: 34, 44 offset: 0, 0 index: -1 ego/frog rotate: false - xy: 890, 846 + xy: 954, 722 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 ego/frustrated-talk rotate: false - xy: 526, 710 + xy: 348, 284 size: 96, 36 orig: 96, 36 offset: 0, 0 index: -1 ego/georgia rotate: false - xy: 476, 450 + xy: 324, 608 size: 90, 30 orig: 90, 30 offset: 0, 0 index: -1 ego/get-sick rotate: false - xy: 348, 322 + xy: 364, 360 size: 108, 36 orig: 108, 36 offset: 0, 0 index: -1 ego/glad rotate: false - xy: 324, 630 + xy: 2, 30 size: 140, 46 orig: 140, 46 offset: 0, 0 index: -1 ego/grow rotate: false - xy: 466, 634 + xy: 626, 808 size: 90, 36 orig: 90, 36 offset: 0, 0 @@ -188,28 +188,28 @@ ego/hand-hold index: -1 ego/hold-hand rotate: false - xy: 944, 664 + xy: 474, 360 size: 16, 36 orig: 16, 36 offset: 0, 0 index: -1 ego/hold-up-to-window rotate: false - xy: 348, 284 + xy: 348, 322 size: 108, 36 orig: 108, 36 offset: 0, 0 index: -1 ego/ida rotate: false - xy: 148, 117 + xy: 292, 316 size: 54, 70 orig: 54, 70 offset: 0, 0 index: -1 ego/idea rotate: false - xy: 292, 316 + xy: 229, 175 size: 54, 70 orig: 54, 70 offset: 0, 0 @@ -230,224 +230,224 @@ ego/jump-straight index: -1 ego/love rotate: false - xy: 94, 43 + xy: 240, 103 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 0 ego/love rotate: false - xy: 458, 288 + xy: 240, 31 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 1 ego/love rotate: false - xy: 229, 212 + xy: 424, 568 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 2 ego/love rotate: false - xy: 424, 558 + xy: 574, 808 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 3 ego/love rotate: false - xy: 492, 378 + xy: 660, 736 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 4 ego/love rotate: false - xy: 558, 600 + xy: 786, 722 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 5 ego/love rotate: false - xy: 610, 600 + xy: 838, 736 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 6 ego/love rotate: false - xy: 605, 528 + xy: 890, 760 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 7 ego/love rotate: false - xy: 544, 378 + xy: 942, 760 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 8 ego/love rotate: false - xy: 510, 306 + xy: 838, 664 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 9 ego/love rotate: false - xy: 562, 306 + xy: 786, 650 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 10 ego/love rotate: false - xy: 204, 117 + xy: 890, 650 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 11 ego/love rotate: false - xy: 574, 808 + xy: 942, 650 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 12 ego/love rotate: false - xy: 660, 736 + xy: 838, 592 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 13 ego/love rotate: false - xy: 712, 736 + xy: 890, 578 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 14 ego/love rotate: false - xy: 774, 774 + xy: 942, 578 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 15 ego/love rotate: false - xy: 826, 774 + xy: 476, 587 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 16 ego/love rotate: false - xy: 878, 774 + xy: 535, 671 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 17 ego/love rotate: false - xy: 764, 702 + xy: 587, 684 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 18 ego/love rotate: false - xy: 816, 702 + xy: 639, 664 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 19 ego/love rotate: false - xy: 868, 702 + xy: 587, 612 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 20 ego/love rotate: false - xy: 920, 702 + xy: 535, 599 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 21 ego/love rotate: false - xy: 972, 876 + xy: 639, 592 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 22 ego/love rotate: false - xy: 972, 804 + xy: 691, 646 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 23 ego/love rotate: false - xy: 972, 732 + xy: 691, 574 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 24 ego/love rotate: false - xy: 972, 660 + xy: 587, 540 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 25 ego/pant rotate: false - xy: 586, 672 + xy: 890, 722 size: 62, 36 orig: 62, 36 offset: 0, 0 index: -1 ego/player rotate: false - xy: 2, 115 + xy: 2, 78 size: 144, 72 orig: 144, 72 offset: 0, 0 index: -1 ego/poke rotate: false - xy: 476, 582 + xy: 578, 756 size: 80, 50 orig: 80, 50 offset: 0, 0 index: -1 ego/reach rotate: false - xy: 510, 268 + xy: 800, 808 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 ego/scared rotate: false - xy: 626, 808 + xy: 712, 756 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 ego/scared-walk rotate: false - xy: 488, 672 + xy: 890, 832 size: 96, 36 orig: 96, 36 offset: 0, 0 @@ -468,7 +468,7 @@ ego/shock index: -1 ego/shoot rotate: false - xy: 634, 884 + xy: 810, 922 size: 144, 36 orig: 144, 36 offset: 0, 0 @@ -482,42 +482,42 @@ ego/sigh index: -1 ego/spear rotate: false - xy: 2, 13 + xy: 148, 50 size: 90, 100 orig: 90, 100 offset: 0, 0 index: -1 ego/squat rotate: false - xy: 634, 846 + xy: 776, 884 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/squat-talk rotate: false - xy: 700, 808 + xy: 712, 718 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 ego/stand rotate: false - xy: 762, 846 + xy: 634, 846 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/standup rotate: false - xy: 2, 227 + xy: 2, 190 size: 225, 55 orig: 225, 55 offset: 0, 0 index: -1 ego/suspended rotate: false - xy: 780, 884 + xy: 634, 884 size: 140, 36 orig: 140, 36 offset: 0, 0 @@ -538,56 +538,119 @@ ego/swing-shovel index: -1 ego/thorw rotate: false - xy: 364, 398 + xy: 762, 846 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/throw rotate: false - xy: 364, 360 + xy: 364, 398 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/warden rotate: false - xy: 146, 14 + xy: 476, 544 size: 42, 41 orig: 42, 41 offset: 0, 0 index: -1 ego/whistle rotate: false - xy: 991, 574 + xy: 988, 722 size: 16, 36 orig: 16, 36 offset: 0, 0 index: 1 ego/whistle rotate: false - xy: 991, 536 + xy: 1006, 864 size: 16, 36 orig: 16, 36 offset: 0, 0 index: 2 ego/whistle rotate: false - xy: 991, 498 + xy: 988, 864 size: 16, 36 orig: 16, 36 offset: 0, 0 index: 3 +frankie + rotate: false + xy: 2, 274 + size: 312, 35 + orig: 312, 35 + offset: 0, 0 + index: -1 +frankie-walk + rotate: false + xy: 285, 179 + size: 24, 35 + orig: 24, 35 + offset: 0, 0 + index: 0 +frankie-walk + rotate: false + xy: 311, 179 + size: 24, 35 + orig: 24, 35 + offset: 0, 0 + index: 1 +frankie-walk + rotate: false + xy: 336, 19 + size: 24, 35 + orig: 24, 35 + offset: 0, 0 + index: 2 +frankie-walk + rotate: false + xy: 362, 19 + size: 24, 35 + orig: 24, 35 + offset: 0, 0 + index: 3 +frankie-walk + rotate: false + xy: 388, 19 + size: 24, 35 + orig: 24, 35 + offset: 0, 0 + index: 4 +frankie-walk + rotate: false + xy: 414, 19 + size: 24, 35 + orig: 24, 35 + offset: 0, 0 + index: 5 +frankie-walk + rotate: false + xy: 440, 19 + size: 24, 35 + orig: 24, 35 + offset: 0, 0 + index: 6 +frankie-walk + rotate: false + xy: 994, 685 + size: 24, 35 + orig: 24, 35 + offset: 0, 0 + index: 7 inventory rotate: false - xy: 146, 57 + xy: 743, 576 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory rotate: false - xy: 146, 57 + xy: 743, 576 size: 42, 56 orig: 42, 56 offset: 0, 0 @@ -601,98 +664,98 @@ inventory-overlay index: -1 open-inventory rotate: false - xy: 190, 2 + xy: 484, 486 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 1 open-inventory rotate: false - xy: 234, 2 + xy: 505, 314 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 2 open-inventory rotate: false - xy: 278, 2 + xy: 549, 314 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 3 open-inventory rotate: false - xy: 568, 450 + xy: 285, 216 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 4 open-inventory rotate: false - xy: 612, 470 + xy: 470, 245 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 5 open-inventory rotate: false - xy: 612, 412 + xy: 292, 121 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 6 open-inventory rotate: false - xy: 891, 416 + xy: 292, 63 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 7 open-inventory rotate: false - xy: 891, 416 + xy: 292, 63 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 9 open-inventory rotate: false - xy: 750, 359 + xy: 292, 5 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 8 open-inventory rotate: false - xy: 794, 359 + xy: 478, 187 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 10 open-inventory rotate: false - xy: 838, 359 + xy: 571, 28 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 11 open-inventory rotate: false - xy: 882, 358 + xy: 615, 28 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 12 safe/inputed-key rotate: false - xy: 1013, 647 + xy: 466, 43 size: 9, 11 orig: 9, 11 offset: 0, 0 index: -1 save rotate: false - xy: 930, 774 + xy: 691, 718 size: 16, 16 orig: 16, 16 offset: 0, 0 @@ -706,21 +769,21 @@ test/abc index: -1 white rotate: false - xy: 566, 517 + xy: 424, 542 size: 32, 24 orig: 32, 24 offset: 0, 0 index: -1 wizard/Untitled rotate: false - xy: 531, 748 + xy: 904, 870 size: 80, 50 orig: 80, 50 offset: 0, 0 index: -1 wizard/cloud rotate: false - xy: 930, 838 + xy: 743, 634 size: 40, 30 orig: 40, 30 offset: 0, 0 @@ -734,315 +797,315 @@ wizard/disappear index: -1 wizard/experiment rotate: false - xy: 558, 543 + xy: 531, 743 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 0 wizard/experiment rotate: false - xy: 613, 751 + xy: 488, 659 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 1 wizard/experiment rotate: false - xy: 584, 249 + xy: 639, 535 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 2 wizard/experiment rotate: false - xy: 650, 679 + xy: 686, 517 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 3 wizard/experiment rotate: false - xy: 697, 679 + xy: 787, 593 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 4 wizard/experiment rotate: false - xy: 662, 622 + xy: 733, 517 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 5 wizard/experiment rotate: false - xy: 709, 622 + xy: 787, 536 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 6 wizard/experiment rotate: false - xy: 756, 645 + xy: 834, 535 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 7 wizard/experiment rotate: false - xy: 803, 645 + xy: 881, 521 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 8 wizard/experiment rotate: false - xy: 850, 645 + xy: 928, 521 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 9 wizard/experiment rotate: false - xy: 897, 645 + xy: 975, 521 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 10 wizard/experiment rotate: false - xy: 756, 588 + xy: 498, 429 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 11 wizard/experiment rotate: false - xy: 803, 588 + xy: 492, 372 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 12 wizard/experiment rotate: false - xy: 850, 588 + xy: 458, 303 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 13 wizard/experiment rotate: false - xy: 897, 588 + xy: 539, 372 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 14 wizard/experiment rotate: false - xy: 944, 603 + xy: 329, 227 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 15 wizard/experiment rotate: false - xy: 662, 565 + xy: 376, 227 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 16 wizard/experiment rotate: false - xy: 709, 565 + xy: 423, 227 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 17 wizard/experiment rotate: false - xy: 657, 508 + xy: 514, 257 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 18 wizard/experiment rotate: false - xy: 704, 508 + xy: 561, 257 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 19 wizard/experiment rotate: false - xy: 756, 531 + xy: 337, 170 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 20 wizard/experiment rotate: false - xy: 803, 531 + xy: 384, 170 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 21 wizard/experiment rotate: false - xy: 850, 531 + xy: 336, 113 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 22 wizard/experiment rotate: false - xy: 897, 531 + xy: 383, 113 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 23 wizard/experiment rotate: false - xy: 944, 546 + xy: 336, 56 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 24 wizard/experiment rotate: false - xy: 751, 474 + xy: 383, 56 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 25 wizard/experiment rotate: false - xy: 798, 474 + xy: 431, 170 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 26 wizard/experiment rotate: false - xy: 845, 474 + xy: 430, 113 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 27 wizard/experiment rotate: false - xy: 892, 474 + xy: 430, 56 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 28 wizard/experiment rotate: false - xy: 944, 489 + xy: 522, 200 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 29 wizard/experiment rotate: false - xy: 190, 60 + xy: 569, 200 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 30 wizard/experiment rotate: false - xy: 237, 60 + xy: 478, 130 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 31 wizard/experiment rotate: false - xy: 656, 451 + xy: 477, 73 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 32 wizard/experiment rotate: false - xy: 703, 451 + xy: 525, 143 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 33 wizard/experiment rotate: false - xy: 656, 394 + xy: 572, 143 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 34 wizard/experiment rotate: false - xy: 703, 394 + xy: 477, 16 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 35 wizard/experiment rotate: false - xy: 750, 417 + xy: 525, 86 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 36 wizard/experiment rotate: false - xy: 797, 417 + xy: 572, 86 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 37 wizard/experiment rotate: false - xy: 844, 417 + xy: 524, 29 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 38 wizard/flame rotate: false - xy: 146, 2 + xy: 528, 647 size: 5, 10 orig: 5, 10 offset: 0, 0 index: -1 wizard/magic-hands rotate: false - xy: 930, 870 + xy: 743, 666 size: 40, 50 orig: 40, 50 offset: 0, 0 index: -1 wizard/stand rotate: false - xy: 991, 612 + xy: 476, 438 size: 20, 46 orig: 20, 46 offset: 0, 0 index: -1 wizard/wizard rotate: false - xy: 991, 612 + xy: 476, 438 size: 20, 46 orig: 20, 46 offset: 0, 0 index: -1 wizard/talk rotate: false - xy: 476, 534 + xy: 144, 2 size: 80, 46 orig: 80, 46 offset: 0, 0 index: -1 wizard/talk-angry rotate: false - xy: 484, 482 + xy: 718, 794 size: 80, 50 orig: 80, 50 offset: 0, 0 diff --git a/desktop/resources/packed/global.png b/desktop/resources/packed/global.png index 71ad6b61..9a085b02 100644 Binary files a/desktop/resources/packed/global.png and b/desktop/resources/packed/global.png differ diff --git a/desktop/resources/packed/held.atlas b/desktop/resources/packed/held.atlas index c8d78bd7..b02a994f 100644 --- a/desktop/resources/packed/held.atlas +++ b/desktop/resources/packed/held.atlas @@ -11,69 +11,69 @@ background orig: 320, 240 offset: 0, 0 index: -1 -bloodclot-head-1 +bloodclot-head rotate: false xy: 324, 182 size: 114, 82 orig: 114, 82 offset: 0, 0 - index: -1 -bloodclot-head-2 + index: 0 +bloodclot-head rotate: false xy: 646, 424 size: 114, 82 orig: 114, 82 offset: 0, 0 - index: -1 -bloodclot-head-3 + index: 1 +bloodclot-head rotate: false xy: 324, 98 size: 114, 82 orig: 114, 82 offset: 0, 0 - index: -1 -bloodclot-head-4 + index: 2 +bloodclot-head rotate: false xy: 440, 182 size: 114, 82 orig: 114, 82 offset: 0, 0 - index: -1 -bloodclot-head-5 + index: 3 +bloodclot-head rotate: false xy: 646, 340 size: 114, 82 orig: 114, 82 offset: 0, 0 - index: -1 -bloodclot-head-6 + index: 4 +bloodclot-head rotate: false xy: 762, 424 size: 114, 82 orig: 114, 82 offset: 0, 0 - index: -1 -bloodclot-head-7 + index: 5 +bloodclot-head rotate: false xy: 440, 98 size: 114, 82 orig: 114, 82 offset: 0, 0 - index: -1 -bloodclot-head-8 + index: 6 +bloodclot-head rotate: false xy: 762, 340 size: 114, 82 orig: 114, 82 offset: 0, 0 - index: -1 -bloodclot-head-9 + index: 7 +bloodclot-head rotate: false xy: 878, 424 size: 114, 82 orig: 114, 82 offset: 0, 0 - index: -1 + index: 8 dot rotate: false xy: 324, 95 diff --git a/desktop/resources/packed/inside-stash.atlas b/desktop/resources/packed/inside-stash.atlas index f6defa6e..e78f5066 100644 --- a/desktop/resources/packed/inside-stash.atlas +++ b/desktop/resources/packed/inside-stash.atlas @@ -13,11 +13,18 @@ background index: -1 candle rotate: false - xy: 324, 247 + xy: 324, 218 size: 16, 4 orig: 16, 4 offset: 0, 0 index: -1 +candle-aura + rotate: false + xy: 324, 224 + size: 108, 27 + orig: 108, 27 + offset: 0, 0 + index: -1 lid rotate: false xy: 2, 2 diff --git a/desktop/resources/packed/inside-stash.png b/desktop/resources/packed/inside-stash.png index 7a7768b1..400b2527 100644 Binary files a/desktop/resources/packed/inside-stash.png and b/desktop/resources/packed/inside-stash.png differ diff --git a/desktop/resources/packed/space.atlas b/desktop/resources/packed/space.atlas index f53a6c97..7882074c 100644 --- a/desktop/resources/packed/space.atlas +++ b/desktop/resources/packed/space.atlas @@ -46,265 +46,265 @@ blergh-talk orig: 106, 165 offset: 0, 0 index: -1 -bloodclot-explode-1 +bloodclot-explode rotate: false xy: 538, 682 size: 106, 165 orig: 106, 165 offset: 0, 0 - index: -1 -bloodclot-explode-10 - rotate: false - xy: 218, 198 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -bloodclot-explode-11 - rotate: false - xy: 218, 31 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -bloodclot-explode-12 - rotate: false - xy: 756, 515 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -bloodclot-explode-13 - rotate: false - xy: 862, 682 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -bloodclot-explode-14 - rotate: false - xy: 864, 515 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -bloodclot-explode-15 - rotate: false - xy: 326, 310 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -bloodclot-explode-16 - rotate: false - xy: 326, 143 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -bloodclot-explode-17 - rotate: false - xy: 434, 310 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -bloodclot-explode-18 - rotate: false - xy: 434, 143 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -bloodclot-explode-19 - rotate: false - xy: 542, 348 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -bloodclot-explode-2 + index: 0 +bloodclot-explode rotate: false xy: 2, 31 size: 106, 165 orig: 106, 165 offset: 0, 0 - index: -1 -bloodclot-explode-20 - rotate: false - xy: 542, 181 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -bloodclot-explode-21 - rotate: false - xy: 650, 348 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -bloodclot-explode-22 - rotate: false - xy: 650, 181 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -bloodclot-explode-23 - rotate: false - xy: 758, 348 - size: 106, 165 - orig: 106, 165 - offset: 0, 0 - index: -1 -bloodclot-explode-3 + index: 1 +bloodclot-explode rotate: false xy: 110, 198 size: 106, 165 orig: 106, 165 offset: 0, 0 - index: -1 -bloodclot-explode-4 + index: 2 +bloodclot-explode rotate: false xy: 432, 515 size: 106, 165 orig: 106, 165 offset: 0, 0 - index: -1 -bloodclot-explode-5 + index: 3 +bloodclot-explode rotate: false xy: 646, 682 size: 106, 165 orig: 106, 165 offset: 0, 0 - index: -1 -bloodclot-explode-6 + index: 4 +bloodclot-explode rotate: false xy: 110, 31 size: 106, 165 orig: 106, 165 offset: 0, 0 - index: -1 -bloodclot-explode-7 + index: 5 +bloodclot-explode rotate: false xy: 540, 515 size: 106, 165 orig: 106, 165 offset: 0, 0 - index: -1 -bloodclot-explode-8 + index: 6 +bloodclot-explode rotate: false xy: 754, 682 size: 106, 165 orig: 106, 165 offset: 0, 0 - index: -1 -bloodclot-explode-9 + index: 7 +bloodclot-explode rotate: false xy: 648, 515 size: 106, 165 orig: 106, 165 offset: 0, 0 - index: -1 -bloodclot-head-talk-1 + index: 8 +bloodclot-explode + rotate: false + xy: 218, 198 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: 9 +bloodclot-explode + rotate: false + xy: 218, 31 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: 10 +bloodclot-explode + rotate: false + xy: 756, 515 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: 11 +bloodclot-explode + rotate: false + xy: 862, 682 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: 12 +bloodclot-explode + rotate: false + xy: 864, 515 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: 13 +bloodclot-explode + rotate: false + xy: 326, 310 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: 14 +bloodclot-explode + rotate: false + xy: 326, 143 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: 15 +bloodclot-explode + rotate: false + xy: 434, 310 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: 16 +bloodclot-explode + rotate: false + xy: 434, 143 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: 17 +bloodclot-explode + rotate: false + xy: 542, 348 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: 18 +bloodclot-explode + rotate: false + xy: 542, 181 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: 19 +bloodclot-explode + rotate: false + xy: 650, 348 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: 20 +bloodclot-explode + rotate: false + xy: 650, 181 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: 21 +bloodclot-explode + rotate: false + xy: 758, 348 + size: 106, 165 + orig: 106, 165 + offset: 0, 0 + index: 22 +bloodclot-head-talk rotate: false xy: 326, 66 size: 82, 75 orig: 82, 75 offset: 0, 0 - index: -1 -bloodclot-head-talk-10 - rotate: false - xy: 578, 27 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -bloodclot-head-talk-11 - rotate: false - xy: 662, 27 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -bloodclot-head-talk-12 - rotate: false - xy: 842, 271 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -bloodclot-head-talk-13 - rotate: false - xy: 842, 194 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -bloodclot-head-talk-14 - rotate: false - xy: 758, 117 - size: 82, 75 - orig: 82, 75 - offset: 0, 0 - index: -1 -bloodclot-head-talk-2 + index: 0 +bloodclot-head-talk rotate: false xy: 758, 271 size: 82, 75 orig: 82, 75 offset: 0, 0 - index: -1 -bloodclot-head-talk-3 + index: 1 +bloodclot-head-talk rotate: false xy: 866, 438 size: 82, 75 orig: 82, 75 offset: 0, 0 - index: -1 -bloodclot-head-talk-4 + index: 2 +bloodclot-head-talk rotate: false xy: 410, 66 size: 82, 75 orig: 82, 75 offset: 0, 0 - index: -1 -bloodclot-head-talk-5 + index: 3 +bloodclot-head-talk rotate: false xy: 758, 194 size: 82, 75 orig: 82, 75 offset: 0, 0 - index: -1 -bloodclot-head-talk-6 + index: 4 +bloodclot-head-talk rotate: false xy: 866, 361 size: 82, 75 orig: 82, 75 offset: 0, 0 - index: -1 -bloodclot-head-talk-7 + index: 5 +bloodclot-head-talk rotate: false xy: 494, 66 size: 82, 75 orig: 82, 75 offset: 0, 0 - index: -1 -bloodclot-head-talk-8 + index: 6 +bloodclot-head-talk rotate: false xy: 578, 104 size: 82, 75 orig: 82, 75 offset: 0, 0 - index: -1 -bloodclot-head-talk-9 + index: 7 +bloodclot-head-talk rotate: false xy: 662, 104 size: 82, 75 orig: 82, 75 offset: 0, 0 - index: -1 + index: 8 +bloodclot-head-talk + rotate: false + xy: 578, 27 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: 9 +bloodclot-head-talk + rotate: false + xy: 662, 27 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: 10 +bloodclot-head-talk + rotate: false + xy: 842, 271 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: 11 +bloodclot-head-talk + rotate: false + xy: 842, 194 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: 12 +bloodclot-head-talk + rotate: false + xy: 758, 117 + size: 82, 75 + orig: 82, 75 + offset: 0, 0 + index: 13 bloodclot-stand rotate: false xy: 324, 682 diff --git a/desktop/src-common/advent/screens/rooms/castle_gate.clj b/desktop/src-common/advent/screens/rooms/castle_gate.clj index 632baceb..f358f61e 100644 --- a/desktop/src-common/advent/screens/rooms/castle_gate.clj +++ b/desktop/src-common/advent/screens/rooms/castle_gate.clj @@ -20,8 +20,8 @@ (defn make-night [entities] entities) -(defn make-coin-flip [screen] - (let [coin-flip (utils/make-anim "castle-gate/coinflip.png" [10 10] 0.05 (range 5))] +(defn make-coin-flip [screen atlas] + (let [coin-flip (utils/make-anim atlas "coinflip" [10 10] 0.05 (range 5))] (assoc (animation->texture screen coin-flip) :x 212 :y 114 :baseline 151 :opacity 0.0 @@ -40,8 +40,8 @@ :walk coin-flip :coinflip coin-flip))) -(defn make-goon-1 [screen] - (let [stand (utils/make-anim "castle-gate/goon-1.png" [13 33] 0.21 [0 0 0 0 0 0 0 0 0 1])] +(defn make-goon-1 [screen atlas] + (let [stand (utils/make-anim atlas "goon-1" [13 33] 0.21 [0 0 0 0 0 0 0 0 0 1])] (assoc (animation->texture screen stand) :x 244 :y 102 :baseline 138 :label "Goon" @@ -53,12 +53,13 @@ :anim-start 0 :stand stand))) -(defn make-goon-2 [screen] - (let [stand (utils/make-anim "castle-gate/goon-2.png" [12 32] 0.175 [0 0 0 0 0 0 0 0 0 0 0 0 0 1]) - talk (utils/make-anim "castle-gate/goon-2-talk.png" [12 32] 0.175 (range 2)) - flip (utils/make-anim "castle-gate/goon-2-flip.png" [12 32] 0.05 [1 2 2 2 3 3 3 3 3 3 3 3 3 3 3 3 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ]) - search (utils/make-anim "castle-gate/goon-2-search.png" [24 32] 0.3 [0 1 2 3 2 3 2 1 4 5 6 5 6 7 6 7 6 7 6 1 0]) - walk (utils/flip (utils/make-anim "castle-gate/goon-2-walk.png" [24 34] 0.075 (range 7)))] +(defn make-goon-2 [screen atlas] + (let [ + stand (utils/make-anim atlas "goon-2" [12 32] 0.175 [0 0 0 0 0 0 0 0 0 0 0 0 0 1]) + talk (utils/make-anim atlas "goon-2-talk" [12 32] 0.175 (range 2)) + flip (utils/make-anim atlas "goon-2-flip" [12 32] 0.05 [1 2 2 2 3 3 3 3 3 3 3 3 3 3 3 3 3 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ]) + search (utils/make-anim atlas "goon-2-search" [24 32] 0.3 [0 1 2 3 2 3 2 1 4 5 6 5 6 7 6 7 6 7 6 1 0]) + walk (utils/flip (utils/make-anim atlas "goon-2-walk" [24 34] 0.075 (range 7)))] (assoc (animation->texture screen stand) :x 214 :y 102 :baseline 151 :scale-x 1.4 @@ -197,9 +198,11 @@ (sign-note entities))}}) (defn make [screen] - (let [throw-walkie (utils/make-anim-seq "castle-gate/throw-walkie" [205 136] 0.1 (flatten [(repeat 55 0) (range 9) (repeat 55 8)])) - walkie-visible (animation 1.0 [(utils/get-texture "castle-gate/throw-walkie-9.png")]) - walkie-invisible (animation 1.0 [(utils/get-texture "castle-gate/throw-walkie-1.png")])] + (let [[screen atlas] (utils/acquire-atlas screen "packed/castle-gate.atlas") + [screen global-atlas] (utils/acquire-atlas screen "packed/global.atlas") + throw-walkie (utils/make-anim-seq atlas "throw-walkie" [205 136] 0.1 (flatten [(repeat 55 0) (range 9) (repeat 55 8)])) + walkie-visible (animation 1.0 [(utils/atlas->texture atlas "throw-walkie" 8)]) + walkie-invisible (animation 1.0 [(utils/atlas->texture atlas "throw-walkie" 0)])] (rooms/make :music {:day :town-2 :night :night} :name "Castle gate" :timers {:taunt [1.0 6.0 flip-coin]} @@ -234,15 +237,15 @@ (actions/walk-straight-to entities :ego [285 71]))}} :note (make-note)} - :layers {:day [(assoc (utils/get-texture "castle-gate/background.png") :x 0 :y 0 :baseline 0) - (assoc (utils/get-texture "castle-gate/overlay.png") :x 0 :y 0 :baseline 240)] - :night [(assoc (utils/get-texture "castle-gate/background.png") :x 0 :y 0 :baseline 0) - (assoc (utils/get-texture "castle-gate/overlay.png") :x 0 :y 0 :baseline 240)]} - :entities {:frankie (common/make-frankie screen) - :goon-1 (make-goon-1 screen) - :goon-2 (make-goon-2 screen) + :layers {:day [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0) + (assoc (utils/atlas->texture atlas "overlay") :x 0 :y 0 :baseline 240)] + :night [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0) + (assoc (utils/atlas->texture atlas "overlay") :x 0 :y 0 :baseline 240)]} + :entities {:frankie (common/make-frankie screen global-atlas) + :goon-1 (make-goon-1 screen atlas) + :goon-2 (make-goon-2 screen atlas) :outside-particles (common/make-outside-particles) - :coin-flip (make-coin-flip screen) + :coin-flip (make-coin-flip screen atlas) } :walkie-talkies (rooms/make-entity :walkie-talkies (assoc (animation->texture screen walkie-visible) diff --git a/desktop/src-common/advent/screens/rooms/common.clj b/desktop/src-common/advent/screens/rooms/common.clj index 703cdec6..5b09dac5 100644 --- a/desktop/src-common/advent/screens/rooms/common.clj +++ b/desktop/src-common/advent/screens/rooms/common.clj @@ -294,14 +294,14 @@ "Nevermind." {:run #(actions/respond entities % :frankie "Come back when you've got some good valuables.")}]})) -(defn make-frankie [screen] - (let [stand (utils/make-anim "castle-gate/frankie.png" [24 35] 0.19 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1]) - talk (utils/make-anim "castle-gate/frankie.png" [24 35] 0.2 [2 0 2 0 2 0 2 0 0 1 0]) - walk (utils/make-anim-seq "castle-gate/frankie-walk" [24 35] 0.2 (range 8)) - laugh (utils/make-anim "castle-gate/frankie.png" [24 35] 0.1 [1 3 4 3 4 3 4 3 4 3 4 3 4 1 0]) - glance (utils/make-anim "castle-gate/frankie.png" [24 35] 0.25 [0 6 0 6 5 5 5 6 7 7 7 6 ]) - reach (utils/make-anim "castle-gate/frankie.png" [24 35] 0.2 [0 8 9 9 9 9 8]) - flex (utils/make-anim "castle-gate/frankie.png" [24 35] 0.2 [0 10 11 12 12 12 12 11 10])] +(defn make-frankie [screen atlas] + (let [stand (utils/make-anim atlas "frankie" [24 35] 0.19 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1]) + talk (utils/make-anim atlas "frankie" [24 35] 0.2 [2 0 2 0 2 0 2 0 0 1 0]) + walk (utils/make-anim-seq atlas "frankie-walk" [24 35] 0.2 (range 8)) + laugh (utils/make-anim atlas "frankie" [24 35] 0.1 [1 3 4 3 4 3 4 3 4 3 4 3 4 1 0]) + glance (utils/make-anim atlas "frankie" [24 35] 0.25 [0 6 0 6 5 5 5 6 7 7 7 6 ]) + reach (utils/make-anim atlas "frankie" [24 35] 0.2 [0 8 9 9 9 9 8]) + flex (utils/make-anim atlas "frankie" [24 35] 0.2 [0 10 11 12 12 12 12 11 10])] (assoc (animation->texture screen stand) :x 235 :y 90 :baseline 150 :label "Frankie Rockfist" diff --git a/desktop/src-common/advent/screens/rooms/ending.clj b/desktop/src-common/advent/screens/rooms/ending.clj index 03fa762e..c552dc67 100644 --- a/desktop/src-common/advent/screens/rooms/ending.clj +++ b/desktop/src-common/advent/screens/rooms/ending.clj @@ -18,39 +18,41 @@ (:import [com.badlogic.gdx.graphics Color])) (defn make [screen] - (let [ - peddler-sheet (texture! (utils/get-texture "outside-castle/peddler-talk.png" ) :split 18 36) + (let [[screen atlas] (utils/acquire-atlas screen "packed/ending-castle.atlas") + [screen global-atlas] (utils/acquire-atlas screen "packed/global.atlas") + + peddler-sheet (texture! (utils/atlas->texture atlas "peddler-talk" ) :split 18 36) peddler-stand (utils/flip (animation 0.2 (for [i (flatten [(repeat 8 0) 6 (repeat 8 0) 6 (repeat 5 0) 4 5 4 5 4 5])] (aget peddler-sheet 0 i)))) - warden-stand (utils/make-anim "ending-castle/warden-2.png" [21 41] 0.21 (flatten [(repeat 7 0) 1])) + warden-stand (utils/make-anim atlas "warden-2" [21 41] 0.21 (flatten [(repeat 7 0) 1])) - game-player-stand (utils/make-anim "ending-castle/game-player.png" [14 39] 0.2 (flatten [(repeat 5 0) 1] )) + game-player-stand (utils/make-anim atlas "game-player" [14 39] 0.2 (flatten [(repeat 5 0) 1] )) - ladder-guard-stand-1 (animation 0.1 [(utils/get-texture "inside-cafeteria/ladder-guard-2.png")]) - ladder-guard-stand-2 (utils/flip (animation 0.1 [(utils/get-texture "inside-cafeteria/ladder-guard-2.png")])) - grandma-stand (utils/make-anim "cat-tree/grandma.png" [25 36] 0.2 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1]) - cat-stand (utils/make-anim "cat-tree/cat-stand.png" [22 10] 0.15 (flatten [(repeat 10 0) 1 1 (repeat 10 0) 2 3 4 3 0 0 2 3 4 3 (repeat 10 0) 1 1 (repeat 10 0) 5 5 6 6 7 (repeat 10 [7 8]) 6 5 0])) - duke-stand (utils/make-anim "ending-castle/duke.png" [40 48] 0.23 (flatten [(repeat 4 0) 1])) - duke-talk (utils/make-anim "ending-castle/duke.png" [40 48] 0.23 [0 2 0 2 1 2]) - duke-reach (utils/make-anim "ending-castle/duke.png" [40 48] 0.23 [3 4 5 6]) - duke-reach-talk (utils/make-anim "ending-castle/duke.png" [40 48] 0.23 [6 7]) - duke-knight (utils/make-anim "ending-castle/duke.png" [40 48] 0.23 [8 9 10 9 8]) + ladder-guard-stand-1 (animation 0.1 [(utils/atlas->texture atlas "ladder-guard-2")]) + ladder-guard-stand-2 (utils/flip (animation 0.1 [(utils/atlas->texture atlas "ladder-guard-2")])) + grandma-stand (utils/make-anim atlas "grandma" [25 36] 0.2 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1]) + cat-stand (utils/make-anim atlas "cat-stand" [22 10] 0.15 (flatten [(repeat 10 0) 1 1 (repeat 10 0) 2 3 4 3 0 0 2 3 4 3 (repeat 10 0) 1 1 (repeat 10 0) 5 5 6 6 7 (repeat 10 [7 8]) 6 5 0])) + duke-stand (utils/make-anim atlas "duke" [40 48] 0.23 (flatten [(repeat 4 0) 1])) + duke-talk (utils/make-anim atlas "duke" [40 48] 0.23 [0 2 0 2 1 2]) + duke-reach (utils/make-anim atlas "duke" [40 48] 0.23 [3 4 5 6]) + duke-reach-talk (utils/make-anim atlas "duke" [40 48] 0.23 [6 7]) + duke-knight (utils/make-anim atlas "duke" [40 48] 0.23 [8 9 10 9 8]) - georgia-stand (utils/make-anim "georgia/stand.png" [20 43] 0.2 (flatten [(repeat 20 0) 1 (repeat 10 0) 1])) - georgia-hand-hold (utils/make-anim "georgia/stand.png" [20 43] 0.2 (flatten [(repeat 3 0) 3 4])) - georgia-talk (utils/make-anim "georgia/stand.png" [20 43] 0.2 (flatten [0 2 0 2 0 1 0 0 2])) - georgia-kick (utils/make-anim-seq "georgia/kick" [40 43] 0.1 (flatten [(repeat 10 0) (repeat 7 1) (repeat 7 2) + georgia-stand (utils/make-anim atlas "georgia/stand" [20 43] 0.2 (flatten [(repeat 20 0) 1 (repeat 10 0) 1])) + georgia-hand-hold (utils/make-anim atlas "georgia/stand" [20 43] 0.2 (flatten [(repeat 3 0) 3 4])) + georgia-talk (utils/make-anim atlas "georgia/stand" [20 43] 0.2 (flatten [0 2 0 2 0 1 0 0 2])) + georgia-kick (utils/make-anim-seq atlas "georgia/kick" [40 43] 0.1 (flatten [(repeat 10 0) (repeat 7 1) (repeat 7 2) 3 4 5 6 7 8 9 10 11 12 13 (repeat 10 14) 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]) + frankie-fall (utils/make-anim-seq atlas "frankie-fall" [40 35] 0.1 (flatten [(range 8) (repeat 20 7) 8 9 10 11 7])) + frankie-down (utils/make-anim-seq atlas "frankie-fall" [40 35] 0.1 [0]) scaler (utils/scaler-fn-with-baseline 20 1.3 1.30)] (rooms/make :music :dream :sounds {:cloud (utils/load-sound "ending-castle/cloud.ogg")} :name "Ending" :interactions {} - :layers [(assoc (utils/get-texture "ending-castle/ending-castle2-assets/background.png") :x 0 :y 0 :origin-x 0 :origin-y 0 :baseline 0) - (assoc (utils/get-texture "ending-castle/ending-castle2-assets/foreground.png") :x 160 :y 0 :origin-x 165 :origin-y 5 :baseline 240 :parallax 1.4)] + :layers [(assoc (utils/atlas->texture atlas "ending-castle2-assets/background") :x 0 :y 0 :origin-x 0 :origin-y 0 :baseline 0) + (assoc (utils/atlas->texture atlas "ending-castle2-assets/foreground") :x 160 :y 0 :origin-x 165 :origin-y 5 :baseline 240 :parallax 1.4)] :apply-state (fn [screen e] (as-> e e (utils/play-sound! screen e :cloud (fn [e] @@ -70,14 +72,14 @@ :stand georgia-stand :talk georgia-talk :kick georgia-kick - :walk (utils/make-anim "georgia/walk.png" [20 43] 0.2 (range 8)) + :walk (utils/make-anim atlas "georgia/walk" [20 43] 0.2 (range 8)) :hand-hold georgia-hand-hold :kick-sound (utils/load-sound "georgia/kick.ogg") :anim-sound-frames {georgia-kick {27 [:kick-sound (constantly 0.6)]}} :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 {:frankie (assoc (common/make-frankie screen) + :entities {:frankie (assoc (common/make-frankie screen global-atlas) :x 28 :y 21 :baseline 200 :fall frankie-fall :down frankie-down @@ -88,7 +90,7 @@ :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 239}) + :gandarf (assoc (common/make-wizard screen global-atlas {:x 205 :y 400 :baseline 239}) :update-fn (fn [screen entities gandarf] (assoc gandarf :y (or (get-in entities [:gandarf-cloud :y]) (:y gandarf))))) @@ -119,22 +121,22 @@ :scale-x 0.65 :scale-y 0.65 :scaled true) - :crowd-left (assoc (utils/get-texture "ending-castle/crowd-left.png") + :crowd-left (assoc (utils/atlas->texture atlas "crowd-left") :x 0 :y 0 :scale-x 1.3 :scale-y 1.3 :baseline 239) - :crowd-right (assoc (utils/get-texture "ending-castle/crowd-right.png") + :crowd-right (assoc (utils/atlas->texture atlas "crowd-right") :x 196 :y 0 :scale-x 1.3 :scale-y 1.3 :baseline 238) - :guard-1 (assoc (utils/get-texture "ending-castle/guard-1.png") + :guard-1 (assoc (utils/atlas->texture atlas "guard-1") :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") + :guard-2 (assoc (utils/atlas->texture atlas "guard-2") :x 182 :y 73 :scale-x 0.9 :scale-y 0.9 diff --git a/desktop/src-common/advent/screens/rooms/held.clj b/desktop/src-common/advent/screens/rooms/held.clj index 3603f481..b621111b 100644 --- a/desktop/src-common/advent/screens/rooms/held.clj +++ b/desktop/src-common/advent/screens/rooms/held.clj @@ -57,8 +57,9 @@ (actions/talk entities who msg))) (defn make [screen] - (let [bloodclot-talk (utils/make-anim-seq "held/bloodclot-head" [114 82] 0.1 [0 1 2 1 0 3 3 0 1 2 1 0 3 4 5 6 5 3 3 1 2 1 3 3 3 3 3 0 0 0 7 8 7]) - bloodclot-stand (utils/make-anim-seq "held/bloodclot-head" [114 82] 0.1 (flatten [(repeat 15 0) 7 8 7]))] + (let [[screen atlas] (utils/acquire-atlas screen "packed/held.atlas") + bloodclot-talk (utils/make-anim-seq atlas "bloodclot-head" [114 82] 0.1 [0 1 2 1 0 3 3 0 1 2 1 0 3 4 5 6 5 3 3 1 2 1 3 3 3 3 3 0 0 0 7 8 7]) + bloodclot-stand (utils/make-anim-seq atlas "bloodclot-head" [114 82] 0.1 (flatten [(repeat 15 0) 7 8 7]))] (rooms/make :music :fight :name "Held" :interactions {:bloodclot {:box [182 42 270 196] @@ -81,8 +82,8 @@ (actions/talk entities :bloodclot-head "Don't make me laugh, kid!"))) }} :timers {:taunt [5.0 1.0 add-second]} - :layers [(assoc (utils/get-texture "held/background.png") :x 0 :y 0 :baseline 0) - (assoc (utils/get-texture "held/hand.png") :x 0 :y 0 :baseline 240)] + :layers [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0) + (assoc (utils/atlas->texture atlas "hand") :x 0 :y 0 :baseline 240)] :entities {:bloodclot-head (assoc (animation->texture screen bloodclot-stand) :x 211 :y 115 :baseline 240 :origin-x 57 :origin-y 0 diff --git a/desktop/src-common/advent/screens/rooms/inside_castle.clj b/desktop/src-common/advent/screens/rooms/inside_castle.clj index e710c4ca..4ffd2d13 100644 --- a/desktop/src-common/advent/screens/rooms/inside_castle.clj +++ b/desktop/src-common/advent/screens/rooms/inside_castle.clj @@ -547,7 +547,7 @@ :cursor :talk :x 257 :y 135 - :baseline 0 + :baseline 1 :night-profile :sprite :script (actions/get-script entities (actions/talk entities :ego "Let's see if this thing works.") diff --git a/desktop/src-common/advent/screens/rooms/inside_stash.clj b/desktop/src-common/advent/screens/rooms/inside_stash.clj index 91171b3c..0503fa48 100644 --- a/desktop/src-common/advent/screens/rooms/inside_stash.clj +++ b/desktop/src-common/advent/screens/rooms/inside_stash.clj @@ -55,8 +55,9 @@ (defn make [screen] - (let [candle-flame (utils/make-anim "inside-stash/candle.png" [4 4] 0.1 (range 4)) - candle-aura (utils/make-anim "inside-house/candle-aura.png" [27 27] 0.2 [0 1 2 3 2 1] ) + (let [[screen atlas] (utils/acquire-atlas screen "packed/inside-stash.atlas") + candle-flame (utils/make-anim atlas "candle" [4 4] 0.1 (range 4)) + candle-aura (utils/make-anim atlas "candle-aura" [27 27] 0.2 [0 1 2 3 2 1] ) ] (rooms/make :music {:day :secret-hideout :night :secret-hideout} :name "Inside stash" @@ -95,8 +96,8 @@ (bust-chest entities)) :key (actions/get-script entities (unlock-chest entities))}}} - :layers [(assoc (utils/get-texture "inside-stash/background.png") :x 0 :y 0 :baseline 0 :night-profile :none)] - :entities {:lid (assoc (utils/get-texture "inside-stash/lid.png") + :layers [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0 :night-profile :none)] + :entities {:lid (assoc (utils/atlas->texture atlas "lid") :x 156 :y 116 :baseline 125 :night-profile :none) :candle-flame (assoc (animation->texture screen candle-flame) :x 165 :y 135 :baseline 1 diff --git a/desktop/src-common/advent/screens/rooms/space.clj b/desktop/src-common/advent/screens/rooms/space.clj index 49569cb8..fa931984 100644 --- a/desktop/src-common/advent/screens/rooms/space.clj +++ b/desktop/src-common/advent/screens/rooms/space.clj @@ -80,7 +80,7 @@ (skip-type [this screen entities] :none))) -(defn swing-at-blergh [entities] +(defn swing-at-blergh [entities atlas] (let [jump-path (bezier (map #(apply vector-2* %) [[35 45] [110 145] [195 180]])) swing-path (bezier (map #(apply vector-2* %) [[195 180] [205 45]])) jump-dist (utils/dist 35 45 205 45) @@ -94,7 +94,7 @@ (utils/play-sound! screen entities :jump (constantly 0.9)) (-> entities - (assoc-in [:room :entities :cloud] (assoc (utils/get-texture "space/cloud.png") + (assoc-in [:room :entities :cloud] (assoc (utils/atlas->texture atlas "cloud") :x (- (get-in entities [:room :entities :ego :x]) 10) :y (get-in entities [:room :entities :ego :y]) :origin-x 7 @@ -183,13 +183,14 @@ (* 0.3 (get-in entities [:room :entities :bloodclot :opacity]))) (defn make [screen] - (let [bloodclot-head-talk-anim (utils/make-anim-seq "space/bloodclot-head-talk" [82 75] 0.05 [0 0 1 1 2 2 1 1 0 0 1 1 2 2 1 1 0 0 3 4 4 4 3 0 0 1 1 2 2 1 1 0 0 0 0 5 5 5 6 6 6 7 7 7]) - bloodclot-head-stand-anim (utils/make-anim-seq "space/bloodclot-head-talk" [82 75] 0.05 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 4 3]) - bloodclot-head-shoot-anim (utils/make-anim-seq "space/bloodclot-head-talk" [82 75] 0.05 [8 9 8 9 8 9 8 9 8 9 8 9 8 9 8 9 8 9 8 9 10 11 10 11 10 11 10 11 10 11 10 11]) - bloodclot-head-keep-shoot-anim (utils/make-anim-seq "space/bloodclot-head-talk" [82 75] 0.05 [12 13]) - blergh-stand-anim (utils/make-anim "space/bloodclot-stand.png" [106 165] 0.9 [0 1]) - bloodclot-explode (utils/make-anim-seq "space/bloodclot-explode" [106 165] 0.075 [0 0 0 0 0 0 0 1 1 1 1 2 2 2 2 2 2 2 2 2 2 3 3 3 4 4 4 5 5 5 5 5 5 5 5 5 6 6 6 6 7 7 7 7 7 7 7 7 7 7 7 8 8 8 7 7 7 7 8 8 8 8 8 7 7 7 7 8 8 7 7 7 7 8 8 8 7 8 8 8 8 8 8 8 8 9 8 8 8 8 9 9 8 8 8 8 8 8 8 9 9 9 8 8 8 8 8 9 9 9 9 9 9 9 9 9 9 9 9 9 10 9 10 10 8 9 9 9 9 9 10 10 10 10 9 9 9 9 9 9 9 9 9 9 10 10 10 10 9 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 13 14 15 16 17 18 19 20 21 22]) - bullet (utils/make-anim "space/bullet.png" [24 24] 0.0075 [0 1 2 0 1 2 0 1 2 0 1 2 0 1 2 3 3 3 4 4 5 5 6 5 4 7]) + (let [[screen atlas] (utils/acquire-atlas screen "packed/space.atlas") + bloodclot-head-talk-anim (utils/make-anim-seq atlas "bloodclot-head-talk" [82 75] 0.05 [0 0 1 1 2 2 1 1 0 0 1 1 2 2 1 1 0 0 3 4 4 4 3 0 0 1 1 2 2 1 1 0 0 0 0 5 5 5 6 6 6 7 7 7]) + bloodclot-head-stand-anim (utils/make-anim-seq atlas "bloodclot-head-talk" [82 75] 0.05 [0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 4 3]) + bloodclot-head-shoot-anim (utils/make-anim-seq atlas "bloodclot-head-talk" [82 75] 0.05 [8 9 8 9 8 9 8 9 8 9 8 9 8 9 8 9 8 9 8 9 10 11 10 11 10 11 10 11 10 11 10 11]) + bloodclot-head-keep-shoot-anim (utils/make-anim-seq atlas "bloodclot-head-talk" [82 75] 0.05 [12 13]) + blergh-stand-anim (utils/make-anim atlas "bloodclot-stand" [106 165] 0.9 [0 1]) + bloodclot-explode (utils/make-anim-seq atlas "bloodclot-explode" [106 165] 0.075 [0 0 0 0 0 0 0 1 1 1 1 2 2 2 2 2 2 2 2 2 2 3 3 3 4 4 4 5 5 5 5 5 5 5 5 5 6 6 6 6 7 7 7 7 7 7 7 7 7 7 7 8 8 8 7 7 7 7 8 8 8 8 8 7 7 7 7 8 8 7 7 7 7 8 8 8 7 8 8 8 8 8 8 8 8 9 8 8 8 8 9 9 8 8 8 8 8 8 8 9 9 9 8 8 8 8 8 9 9 9 9 9 9 9 9 9 9 9 9 9 10 9 10 10 8 9 9 9 9 9 10 10 10 10 9 9 9 9 9 9 9 9 9 9 10 10 10 10 9 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 10 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 12 13 14 15 16 17 18 19 20 21 22]) + bullet (utils/make-anim atlas "bullet" [24 24] 0.0075 [0 1 2 0 1 2 0 1 2 0 1 2 0 1 2 3 3 3 4 4 5 5 6 5 4 7]) effect (particle-effect "particles/appear") blowup-effect (particle-effect "particles/blowup") lightning-effect (particle-effect "particles/lightning") @@ -202,13 +203,13 @@ :swing-sword (utils/load-sound "space/swingsword.ogg")} :interactions {} - :layers [(assoc (utils/get-texture "space/background.png") :x 0 :y 0 :baseline 0)] + :layers [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0)] :timers {:taunt [10.0 8.0 taunt] :shock [5.0 15.0 shock]} :entities {:appear (assoc effect :x 240 :y 50 :baseline 200) - :later (assoc (utils/get-texture "space/later.png") + :later (assoc (utils/atlas->texture atlas "later") :x 0 :y 0 :baseline 240 :opacity 0.0) @@ -273,7 +274,7 @@ (if (actions/has-item? entities :magic-slingshot) (if (get-in @entities [:state :broke-jewel?]) (do - (swing-at-blergh entities) + (swing-at-blergh entities atlas) (actions/do-dialogue entities :bloodclot-head "Ha ha ha! Still a weakling, I see." :bloodclot-head "But you'll not best me!") @@ -286,7 +287,7 @@ (actions/update-entity entities :ego (fn [e] (dissoc e :stand-override :talk-override))) (actions/update-entity entities :ego #(assoc % :get-script (:original-get-script %))) - (swing-at-blergh entities) + (swing-at-blergh entities atlas) (actions/do-dialogue entities :bloodclot-head "Ha ha ha! Is that the best you can do?" :bloodclot-head "Take this!") @@ -338,7 +339,7 @@ :bullet (assoc (animation->texture screen bullet) :x 37 :y 85 :baseline 241 :walk bullet) - :broken-jewel (assoc (utils/get-texture "space/broken-jewel.png") + :broken-jewel (assoc (utils/atlas->texture atlas "broken-jewel") :x 225 :y 170 :baseline 240) :collision "space/collision.png" :scale-fn (constantly 1.5)