diff --git a/desktop/asset-work/global/ego/tongue-idle_0.ase b/desktop/asset-work/global/ego/tongue-idle_0.ase new file mode 100644 index 00000000..f3719713 Binary files /dev/null and b/desktop/asset-work/global/ego/tongue-idle_0.ase differ diff --git a/desktop/asset-work/global/ego/tongue-idle_0.png b/desktop/asset-work/global/ego/tongue-idle_0.png new file mode 100644 index 00000000..796ff591 Binary files /dev/null and b/desktop/asset-work/global/ego/tongue-idle_0.png differ diff --git a/desktop/asset-work/global/ego/tongue-idle_1.png b/desktop/asset-work/global/ego/tongue-idle_1.png new file mode 100644 index 00000000..2a72e5de Binary files /dev/null and b/desktop/asset-work/global/ego/tongue-idle_1.png differ diff --git a/desktop/asset-work/global/ego/tongue-stance_0.ase b/desktop/asset-work/global/ego/tongue-stance_0.ase new file mode 100644 index 00000000..d824b490 Binary files /dev/null and b/desktop/asset-work/global/ego/tongue-stance_0.ase differ diff --git a/desktop/asset-work/global/ego/tongue-stance_0.png b/desktop/asset-work/global/ego/tongue-stance_0.png new file mode 100644 index 00000000..796ff591 Binary files /dev/null and b/desktop/asset-work/global/ego/tongue-stance_0.png differ diff --git a/desktop/asset-work/global/ego/tongue-stance_1.png b/desktop/asset-work/global/ego/tongue-stance_1.png new file mode 100644 index 00000000..5e78230c Binary files /dev/null and b/desktop/asset-work/global/ego/tongue-stance_1.png differ diff --git a/desktop/asset-work/global/ego/tongue-stance_2.png b/desktop/asset-work/global/ego/tongue-stance_2.png new file mode 100644 index 00000000..89c4eddc Binary files /dev/null and b/desktop/asset-work/global/ego/tongue-stance_2.png differ diff --git a/desktop/asset-work/global/ego/tongue-stance_3.png b/desktop/asset-work/global/ego/tongue-stance_3.png new file mode 100644 index 00000000..f387f37d Binary files /dev/null and b/desktop/asset-work/global/ego/tongue-stance_3.png differ diff --git a/desktop/asset-work/global/ego/tongue-stance_4.png b/desktop/asset-work/global/ego/tongue-stance_4.png new file mode 100644 index 00000000..c127663d Binary files /dev/null and b/desktop/asset-work/global/ego/tongue-stance_4.png differ diff --git a/desktop/asset-work/global/ego/tongue-stance_5.png b/desktop/asset-work/global/ego/tongue-stance_5.png new file mode 100644 index 00000000..6e0c5d45 Binary files /dev/null and b/desktop/asset-work/global/ego/tongue-stance_5.png differ diff --git a/desktop/asset-work/global/ego/tongue-stance_6.png b/desktop/asset-work/global/ego/tongue-stance_6.png new file mode 100644 index 00000000..6ddf70c9 Binary files /dev/null and b/desktop/asset-work/global/ego/tongue-stance_6.png differ diff --git a/desktop/asset-work/tongue-fight/background.png b/desktop/asset-work/tongue-fight/background.png new file mode 100644 index 00000000..e0b8faae Binary files /dev/null and b/desktop/asset-work/tongue-fight/background.png differ diff --git a/desktop/asset-work/tongue-fight/hair-0_0.png b/desktop/asset-work/tongue-fight/hair-0_0.png new file mode 100644 index 00000000..ef4d0a28 Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-0_0.png differ diff --git a/desktop/asset-work/tongue-fight/hair-0_1.png b/desktop/asset-work/tongue-fight/hair-0_1.png new file mode 100644 index 00000000..1d6ffdd7 Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-0_1.png differ diff --git a/desktop/asset-work/tongue-fight/hair-0_2.png b/desktop/asset-work/tongue-fight/hair-0_2.png new file mode 100644 index 00000000..5a8b5bf1 Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-0_2.png differ diff --git a/desktop/asset-work/tongue-fight/hair-0_3.png b/desktop/asset-work/tongue-fight/hair-0_3.png new file mode 100644 index 00000000..e788b513 Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-0_3.png differ diff --git a/desktop/asset-work/tongue-fight/hair-0_4.png b/desktop/asset-work/tongue-fight/hair-0_4.png new file mode 100644 index 00000000..bfefb5e0 Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-0_4.png differ diff --git a/desktop/asset-work/tongue-fight/hair-1_0.png b/desktop/asset-work/tongue-fight/hair-1_0.png new file mode 100644 index 00000000..0589bd62 Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-1_0.png differ diff --git a/desktop/asset-work/tongue-fight/hair-1_1.png b/desktop/asset-work/tongue-fight/hair-1_1.png new file mode 100644 index 00000000..c161433e Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-1_1.png differ diff --git a/desktop/asset-work/tongue-fight/hair-1_2.png b/desktop/asset-work/tongue-fight/hair-1_2.png new file mode 100644 index 00000000..ef048170 Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-1_2.png differ diff --git a/desktop/asset-work/tongue-fight/hair-2_0.png b/desktop/asset-work/tongue-fight/hair-2_0.png new file mode 100644 index 00000000..9031c66f Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-2_0.png differ diff --git a/desktop/asset-work/tongue-fight/hair-2_1.png b/desktop/asset-work/tongue-fight/hair-2_1.png new file mode 100644 index 00000000..3073b0b6 Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-2_1.png differ diff --git a/desktop/asset-work/tongue-fight/hair-2_2.png b/desktop/asset-work/tongue-fight/hair-2_2.png new file mode 100644 index 00000000..a08bda11 Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-2_2.png differ diff --git a/desktop/asset-work/tongue-fight/hair-3_0.png b/desktop/asset-work/tongue-fight/hair-3_0.png new file mode 100644 index 00000000..6fe3e903 Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-3_0.png differ diff --git a/desktop/asset-work/tongue-fight/hair-3_1.png b/desktop/asset-work/tongue-fight/hair-3_1.png new file mode 100644 index 00000000..7d454eb4 Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-3_1.png differ diff --git a/desktop/asset-work/tongue-fight/hair-3_2.png b/desktop/asset-work/tongue-fight/hair-3_2.png new file mode 100644 index 00000000..0de56646 Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-3_2.png differ diff --git a/desktop/asset-work/tongue-fight/hair-4_0.png b/desktop/asset-work/tongue-fight/hair-4_0.png new file mode 100644 index 00000000..694750b4 Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-4_0.png differ diff --git a/desktop/asset-work/tongue-fight/hair-4_1.png b/desktop/asset-work/tongue-fight/hair-4_1.png new file mode 100644 index 00000000..4add0f41 Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-4_1.png differ diff --git a/desktop/asset-work/tongue-fight/hair-4_2.png b/desktop/asset-work/tongue-fight/hair-4_2.png new file mode 100644 index 00000000..c9564b4e Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-4_2.png differ diff --git a/desktop/asset-work/tongue-fight/hair-5_0.png b/desktop/asset-work/tongue-fight/hair-5_0.png new file mode 100644 index 00000000..a9c2fe69 Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-5_0.png differ diff --git a/desktop/asset-work/tongue-fight/hair-5_1.png b/desktop/asset-work/tongue-fight/hair-5_1.png new file mode 100644 index 00000000..1a8fbee2 Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-5_1.png differ diff --git a/desktop/asset-work/tongue-fight/hair-5_2.png b/desktop/asset-work/tongue-fight/hair-5_2.png new file mode 100644 index 00000000..fe1ea868 Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-5_2.png differ diff --git a/desktop/asset-work/tongue-fight/hair-6_0.png b/desktop/asset-work/tongue-fight/hair-6_0.png new file mode 100644 index 00000000..f898ba4a Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-6_0.png differ diff --git a/desktop/asset-work/tongue-fight/hair-6_1.png b/desktop/asset-work/tongue-fight/hair-6_1.png new file mode 100644 index 00000000..28020ff5 Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-6_1.png differ diff --git a/desktop/asset-work/tongue-fight/hair-6_2.png b/desktop/asset-work/tongue-fight/hair-6_2.png new file mode 100644 index 00000000..a8813c86 Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-6_2.png differ diff --git a/desktop/asset-work/tongue-fight/hair-7_0.png b/desktop/asset-work/tongue-fight/hair-7_0.png new file mode 100644 index 00000000..53ae4c2b Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-7_0.png differ diff --git a/desktop/asset-work/tongue-fight/hair-7_1.png b/desktop/asset-work/tongue-fight/hair-7_1.png new file mode 100644 index 00000000..19710416 Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-7_1.png differ diff --git a/desktop/asset-work/tongue-fight/hair-7_2.png b/desktop/asset-work/tongue-fight/hair-7_2.png new file mode 100644 index 00000000..6761debb Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-7_2.png differ diff --git a/desktop/asset-work/tongue-fight/hair-8_0.png b/desktop/asset-work/tongue-fight/hair-8_0.png new file mode 100644 index 00000000..a4c1bfcb Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-8_0.png differ diff --git a/desktop/asset-work/tongue-fight/hair-8_1.png b/desktop/asset-work/tongue-fight/hair-8_1.png new file mode 100644 index 00000000..3d13fdce Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-8_1.png differ diff --git a/desktop/asset-work/tongue-fight/hair-8_2.png b/desktop/asset-work/tongue-fight/hair-8_2.png new file mode 100644 index 00000000..198c77d8 Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-8_2.png differ diff --git a/desktop/asset-work/tongue-fight/hair-9_0.png b/desktop/asset-work/tongue-fight/hair-9_0.png new file mode 100644 index 00000000..7ab0fc3e Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-9_0.png differ diff --git a/desktop/asset-work/tongue-fight/hair-9_1.png b/desktop/asset-work/tongue-fight/hair-9_1.png new file mode 100644 index 00000000..a6cb053d Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-9_1.png differ diff --git a/desktop/asset-work/tongue-fight/hair-9_2.png b/desktop/asset-work/tongue-fight/hair-9_2.png new file mode 100644 index 00000000..a8fa365e Binary files /dev/null and b/desktop/asset-work/tongue-fight/hair-9_2.png differ diff --git a/desktop/asset-work/tongue-fight/heart_0.png b/desktop/asset-work/tongue-fight/heart_0.png new file mode 100644 index 00000000..cfc16905 Binary files /dev/null and b/desktop/asset-work/tongue-fight/heart_0.png differ diff --git a/desktop/asset-work/tongue-fight/tongue-idle/tongue-idle_0.ase b/desktop/asset-work/tongue-fight/tongue-idle/tongue-idle_0.ase new file mode 100644 index 00000000..071879e4 Binary files /dev/null and b/desktop/asset-work/tongue-fight/tongue-idle/tongue-idle_0.ase differ diff --git a/desktop/asset-work/tongue-fight/tongue-idle/tongue-idle_0.png b/desktop/asset-work/tongue-fight/tongue-idle/tongue-idle_0.png new file mode 100644 index 00000000..3cf4cdd9 Binary files /dev/null and b/desktop/asset-work/tongue-fight/tongue-idle/tongue-idle_0.png differ diff --git a/desktop/asset-work/tongue-fight/tongue-idle/tongue-idle_1.png b/desktop/asset-work/tongue-fight/tongue-idle/tongue-idle_1.png new file mode 100644 index 00000000..94f5a17b Binary files /dev/null and b/desktop/asset-work/tongue-fight/tongue-idle/tongue-idle_1.png differ diff --git a/desktop/asset-work/tongue-fight/tongue-idle/tongue-idle_2.png b/desktop/asset-work/tongue-fight/tongue-idle/tongue-idle_2.png new file mode 100644 index 00000000..318335cf Binary files /dev/null and b/desktop/asset-work/tongue-fight/tongue-idle/tongue-idle_2.png differ diff --git a/desktop/asset-work/tongue-fight/tongue-idle/tongue-idle_3.png b/desktop/asset-work/tongue-fight/tongue-idle/tongue-idle_3.png new file mode 100644 index 00000000..f98bcc4b Binary files /dev/null and b/desktop/asset-work/tongue-fight/tongue-idle/tongue-idle_3.png differ diff --git a/desktop/asset-work/tongue-fight/tongue-idle/tongue-idle_4.png b/desktop/asset-work/tongue-fight/tongue-idle/tongue-idle_4.png new file mode 100644 index 00000000..308bb850 Binary files /dev/null and b/desktop/asset-work/tongue-fight/tongue-idle/tongue-idle_4.png differ diff --git a/desktop/asset-work/tongue-fight/tongue-idle_0.png b/desktop/asset-work/tongue-fight/tongue-idle_0.png new file mode 100644 index 00000000..487cb173 Binary files /dev/null and b/desktop/asset-work/tongue-fight/tongue-idle_0.png differ diff --git a/desktop/project.clj b/desktop/project.clj index 33520371..00f3c3d3 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 ",")]) - ["title" ] + ["tongue-fight" ] #_["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/global.atlas b/desktop/resources/packed/global.atlas index 6e84b66d..168ff0c3 100644 --- a/desktop/resources/packed/global.atlas +++ b/desktop/resources/packed/global.atlas @@ -6,1317 +6,1386 @@ filter: Nearest,Nearest repeat: none bird rotate: false - xy: 460, 146 + xy: 566, 642 size: 2, 2 orig: 2, 2 offset: 0, 0 index: -1 black rotate: false - xy: 574, 372 + xy: 254, 207 size: 32, 24 orig: 32, 24 offset: 0, 0 index: -1 close rotate: false - xy: 649, 2 + xy: 634, 928 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ego/Untitled rotate: false - xy: 634, 858 + xy: 732, 782 size: 144, 36 orig: 144, 36 offset: 0, 0 index: -1 ego/talk rotate: false - xy: 634, 858 + xy: 732, 782 size: 144, 36 orig: 144, 36 offset: 0, 0 index: -1 ego/axe rotate: false - xy: 2, 534 + xy: 2, 528 size: 420, 70 orig: 420, 70 offset: 0, 0 index: -1 ego/axe-wood rotate: false - xy: 2, 952 + xy: 2, 946 size: 660, 70 orig: 660, 70 offset: 0, 0 index: -1 ego/base rotate: false - xy: 1006, 772 + xy: 506, 356 size: 16, 36 orig: 16, 36 offset: 0, 0 index: -1 ego/whistle rotate: false - xy: 1006, 772 + xy: 506, 356 size: 16, 36 orig: 16, 36 offset: 0, 0 index: 0 ego/burnt rotate: false - xy: 2, 486 + xy: 2, 480 size: 480, 46 orig: 480, 46 offset: 0, 0 index: -1 ego/cat-toy rotate: false - xy: 324, 748 + xy: 324, 742 size: 205, 50 orig: 205, 50 offset: 0, 0 index: -1 ego/climb rotate: false - xy: 324, 800 + xy: 324, 794 size: 242, 46 orig: 242, 46 offset: 0, 0 index: -1 ego/crawl rotate: false - xy: 634, 896 + xy: 634, 890 size: 273, 25 orig: 273, 25 offset: 0, 0 index: -1 ego/crowbar rotate: false - xy: 780, 858 + xy: 364, 394 size: 144, 36 orig: 144, 36 offset: 0, 0 index: -1 ego/dot rotate: false - xy: 507, 247 + xy: 1021, 93 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 wizard/dot rotate: false - xy: 507, 247 + xy: 1021, 93 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 ego/fire rotate: false - xy: 2, 114 + xy: 634, 852 size: 216, 36 orig: 216, 36 offset: 0, 0 index: -1 -ego/flying - rotate: false - xy: 614, 231 - size: 34, 44 - orig: 34, 44 - offset: 0, 0 - index: -1 ego/frog rotate: false - xy: 476, 322 + xy: 858, 216 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 ego/frustrated-talk rotate: false - xy: 926, 885 + xy: 852, 852 size: 96, 36 orig: 96, 36 offset: 0, 0 index: -1 ego/georgia rotate: false - xy: 484, 470 + xy: 776, 820 size: 90, 30 orig: 90, 30 offset: 0, 0 index: -1 ego/get-sick rotate: false - xy: 348, 284 + xy: 712, 472 size: 108, 36 orig: 108, 36 offset: 0, 0 index: -1 ego/glad rotate: false - xy: 416, 668 + xy: 384, 432 size: 140, 46 orig: 140, 46 offset: 0, 0 index: -1 ego/grow rotate: false - xy: 166, 4 + xy: 822, 440 size: 90, 36 orig: 90, 36 offset: 0, 0 index: -1 ego/grow-talk rotate: false - xy: 986, 986 + xy: 986, 980 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 ego/hand-hold rotate: false - xy: 986, 948 + xy: 986, 942 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 ego/hold-hand rotate: false - xy: 1005, 734 + xy: 991, 402 size: 16, 36 orig: 16, 36 offset: 0, 0 index: -1 ego/hold-up-to-window rotate: false - xy: 348, 246 + xy: 526, 396 size: 108, 36 orig: 108, 36 offset: 0, 0 index: -1 ego/ida rotate: false - xy: 148, 42 + xy: 292, 310 size: 54, 70 orig: 54, 70 offset: 0, 0 index: -1 ego/idea rotate: false - xy: 292, 316 + xy: 254, 233 size: 54, 70 orig: 54, 70 offset: 0, 0 index: -1 ego/in-love rotate: false - xy: 2, 848 + xy: 2, 842 size: 570, 30 orig: 570, 30 offset: 0, 0 index: -1 ego/jump-straight rotate: false - xy: 384, 436 + xy: 812, 630 size: 90, 48 orig: 90, 48 offset: 0, 0 index: -1 ego/love rotate: false - xy: 254, 239 + xy: 738, 362 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 0 ego/love rotate: false - xy: 458, 250 + xy: 476, 284 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 1 ego/love rotate: false - xy: 510, 294 + xy: 412, 208 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 2 ego/love rotate: false - xy: 510, 222 + xy: 244, 74 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 3 ego/love rotate: false - xy: 204, 42 + xy: 244, 2 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 4 ego/love rotate: false - xy: 254, 167 + xy: 296, 97 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 5 ego/love rotate: false - xy: 408, 137 + xy: 296, 25 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 6 ego/love rotate: false - xy: 574, 808 + xy: 348, 97 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 7 ego/love rotate: false - xy: 562, 294 + xy: 348, 25 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 8 ego/love rotate: false - xy: 562, 222 + xy: 400, 97 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 9 ego/love rotate: false - xy: 562, 671 + xy: 400, 25 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 10 ego/love rotate: false - xy: 256, 42 + xy: 452, 97 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 11 ego/love rotate: false - xy: 308, 63 + xy: 452, 25 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 12 ego/love rotate: false - xy: 360, 63 + xy: 476, 212 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 13 ego/love rotate: false - xy: 412, 65 + xy: 708, 29 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 14 ego/love rotate: false - xy: 574, 398 + xy: 892, 368 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 15 ego/love rotate: false - xy: 464, 78 + xy: 892, 296 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 16 ego/love rotate: false - xy: 507, 150 + xy: 738, 290 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 17 ego/love rotate: false - xy: 559, 150 + xy: 732, 218 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 18 ego/love rotate: false - xy: 516, 78 + xy: 732, 146 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 19 ego/love rotate: false - xy: 568, 78 + xy: 784, 144 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 20 ego/love rotate: false - xy: 493, 6 + xy: 836, 144 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 21 ego/love rotate: false - xy: 545, 6 + xy: 892, 224 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 22 ego/love rotate: false - xy: 597, 6 + xy: 900, 710 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 23 ego/love rotate: false - xy: 611, 150 + xy: 904, 638 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 24 ego/love rotate: false - xy: 620, 78 + xy: 894, 558 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 25 ego/pant rotate: false - xy: 220, 114 + xy: 878, 782 size: 62, 36 orig: 62, 36 offset: 0, 0 index: -1 ego/player rotate: false - xy: 2, 40 + xy: 424, 532 size: 144, 72 orig: 144, 72 offset: 0, 0 index: -1 ego/poke rotate: false - xy: 492, 418 + xy: 812, 578 size: 80, 50 orig: 80, 50 offset: 0, 0 index: -1 ego/reach rotate: false - xy: 932, 772 + xy: 784, 216 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 ego/scared rotate: false - xy: 931, 734 + xy: 950, 879 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 ego/scared-walk rotate: false - xy: 926, 847 + xy: 790, 254 size: 96, 36 orig: 96, 36 offset: 0, 0 index: -1 ego/scoot rotate: false - xy: 324, 716 + xy: 574, 820 size: 200, 30 orig: 200, 30 offset: 0, 0 index: -1 ego/shock rotate: false - xy: 2, 388 + xy: 2, 382 size: 360, 48 orig: 360, 48 offset: 0, 0 index: -1 ego/shoot rotate: false - xy: 416, 630 + xy: 566, 472 size: 144, 36 orig: 144, 36 offset: 0, 0 index: -1 ego/sigh rotate: false - xy: 2, 2 + xy: 568, 782 size: 162, 36 orig: 162, 36 offset: 0, 0 index: -1 ego/spear rotate: false - xy: 324, 614 + xy: 808, 680 size: 90, 100 orig: 90, 100 offset: 0, 0 index: -1 ego/squat rotate: false - xy: 424, 554 + xy: 348, 318 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/squat-talk rotate: false - xy: 716, 561 + xy: 950, 841 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 ego/stand rotate: false - xy: 364, 398 + xy: 348, 280 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/standup rotate: false - xy: 2, 152 + xy: 2, 146 size: 225, 55 orig: 225, 55 offset: 0, 0 index: -1 ego/suspended rotate: false - xy: 424, 592 + xy: 364, 356 size: 140, 36 orig: 140, 36 offset: 0, 0 index: -1 ego/swing rotate: false - xy: 2, 311 + xy: 2, 305 size: 288, 75 orig: 288, 75 offset: 0, 0 index: -1 ego/swing-shovel rotate: false - xy: 2, 880 + xy: 2, 874 size: 630, 70 orig: 630, 70 offset: 0, 0 index: -1 ego/thorw rotate: false - xy: 364, 360 + xy: 526, 434 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/throw rotate: false - xy: 348, 322 + xy: 654, 434 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 +ego/tongue-idle + rotate: false + xy: 2, 10 + size: 119, 134 + orig: 119, 134 + offset: 0, 0 + index: 0 +ego/tongue-stance + rotate: false + xy: 2, 10 + size: 119, 134 + orig: 119, 134 + offset: 0, 0 + index: 0 +ego/tongue-idle + rotate: false + xy: 324, 606 + size: 119, 134 + orig: 119, 134 + offset: 0, 0 + index: 1 +ego/tongue-stance + rotate: false + xy: 123, 10 + size: 119, 134 + orig: 119, 134 + offset: 0, 0 + index: 1 +ego/tongue-stance + rotate: false + xy: 445, 606 + size: 119, 134 + orig: 119, 134 + offset: 0, 0 + index: 2 +ego/tongue-stance + rotate: false + xy: 566, 646 + size: 119, 134 + orig: 119, 134 + offset: 0, 0 + index: 3 +ego/tongue-stance + rotate: false + xy: 570, 510 + size: 119, 134 + orig: 119, 134 + offset: 0, 0 + index: 4 +ego/tongue-stance + rotate: false + xy: 687, 646 + size: 119, 134 + orig: 119, 134 + offset: 0, 0 + index: 5 +ego/tongue-stance + rotate: false + xy: 691, 510 + size: 119, 134 + orig: 119, 134 + offset: 0, 0 + index: 6 ego/warden rotate: false - xy: 460, 150 + xy: 480, 169 size: 42, 41 orig: 42, 41 offset: 0, 0 index: -1 ego/whistle rotate: false - xy: 552, 554 + xy: 991, 364 size: 16, 36 orig: 16, 36 offset: 0, 0 index: 1 ego/whistle rotate: false - xy: 229, 171 + xy: 991, 326 size: 16, 36 orig: 16, 36 offset: 0, 0 index: 2 ego/whistle rotate: false - xy: 1004, 548 + xy: 991, 288 size: 16, 36 orig: 16, 36 offset: 0, 0 index: 3 frankie rotate: false - xy: 664, 923 + xy: 664, 917 size: 312, 35 orig: 312, 35 offset: 0, 0 index: -1 frankie-walk rotate: false - xy: 790, 562 + xy: 989, 804 size: 24, 35 orig: 24, 35 offset: 0, 0 index: 0 frankie-walk rotate: false - xy: 258, 5 + xy: 728, 109 size: 24, 35 orig: 24, 35 offset: 0, 0 index: 1 frankie-walk rotate: false - xy: 790, 525 + xy: 754, 109 size: 24, 35 orig: 24, 35 offset: 0, 0 index: 2 frankie-walk rotate: false - xy: 755, 524 + xy: 995, 59 size: 24, 35 orig: 24, 35 offset: 0, 0 index: 3 frankie-walk rotate: false - xy: 650, 239 + xy: 991, 251 size: 24, 35 orig: 24, 35 offset: 0, 0 index: 4 frankie-walk rotate: false - xy: 676, 239 + xy: 991, 214 size: 24, 35 orig: 24, 35 offset: 0, 0 index: 5 frankie-walk rotate: false - xy: 813, 123 + xy: 993, 574 size: 24, 35 orig: 24, 35 offset: 0, 0 index: 6 frankie-walk rotate: false - xy: 993, 492 + xy: 993, 537 size: 24, 35 orig: 24, 35 offset: 0, 0 index: 7 inventory rotate: false - xy: 449, 7 + xy: 952, 726 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory rotate: false - xy: 449, 7 + xy: 952, 726 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 0 inventory-overlay rotate: false - xy: 2, 606 + xy: 2, 600 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 open-inventory rotate: false - xy: 570, 613 + xy: 956, 668 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 1 open-inventory rotate: false - xy: 570, 555 + xy: 888, 158 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 2 open-inventory rotate: false - xy: 649, 20 + xy: 979, 154 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 3 open-inventory rotate: false - xy: 720, 446 + xy: 888, 100 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 4 open-inventory rotate: false - xy: 755, 331 + xy: 979, 96 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 5 -open-inventory - rotate: false - xy: 764, 466 - size: 42, 56 - orig: 42, 56 - offset: 0, 0 - index: 6 -open-inventory - rotate: false - xy: 767, 408 - size: 42, 56 - orig: 42, 56 - offset: 0, 0 - index: 7 -open-inventory - rotate: false - xy: 767, 408 - size: 42, 56 - orig: 42, 56 - offset: 0, 0 - index: 9 -open-inventory - rotate: false - xy: 808, 467 - size: 42, 56 - orig: 42, 56 - offset: 0, 0 - index: 8 -open-inventory - rotate: false - xy: 811, 409 - size: 42, 56 - orig: 42, 56 - offset: 0, 0 - index: 10 -open-inventory - rotate: false - xy: 855, 416 - size: 42, 56 - orig: 42, 56 - offset: 0, 0 - index: 11 -open-inventory - rotate: false - xy: 663, 181 - size: 42, 56 - orig: 42, 56 - offset: 0, 0 - index: 12 safe-song/safe-song rotate: false - xy: 348, 209 + xy: 636, 397 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 0 safe-song/safe-song rotate: false - xy: 306, 172 + xy: 636, 360 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 1 safe-song/safe-song rotate: false - xy: 306, 135 + xy: 528, 359 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 2 safe-song/safe-song rotate: false - xy: 626, 821 + xy: 528, 322 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 3 safe-song/safe-song rotate: false - xy: 728, 821 + xy: 528, 285 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 4 safe-song/safe-song rotate: false - xy: 912, 810 + xy: 630, 323 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 5 safe-song/safe-song rotate: false - xy: 626, 784 + xy: 630, 286 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 6 safe-song/safe-song rotate: false - xy: 728, 784 + xy: 528, 248 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 7 safe-song/safe-song rotate: false - xy: 830, 773 + xy: 630, 249 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 8 safe-song/safe-song rotate: false - xy: 625, 747 + xy: 630, 212 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 9 safe-song/safe-song rotate: false - xy: 727, 747 + xy: 310, 243 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 10 safe-song/safe-song rotate: false - xy: 829, 736 + xy: 310, 206 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 11 safe-song/safe-song rotate: false - xy: 614, 710 + xy: 276, 169 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 12 safe-song/safe-song rotate: false - xy: 716, 710 + xy: 378, 169 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 13 safe-song/safe-song rotate: false - xy: 818, 699 + xy: 528, 211 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 14 safe-song/safe-song rotate: false - xy: 920, 697 + xy: 524, 174 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 15 safe-song/safe-song rotate: false - xy: 614, 673 + xy: 524, 137 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 16 safe-song/safe-song rotate: false - xy: 716, 673 + xy: 504, 100 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 17 safe-song/safe-song rotate: false - xy: 818, 662 + xy: 504, 63 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 18 safe-song/safe-song rotate: false - xy: 920, 660 + xy: 504, 26 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 19 safe-song/safe-song rotate: false - xy: 614, 636 + xy: 630, 175 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 20 safe-song/safe-song rotate: false - xy: 716, 636 + xy: 626, 138 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 21 safe-song/safe-song rotate: false - xy: 818, 625 + xy: 626, 101 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 22 safe-song/safe-song rotate: false - xy: 920, 623 + xy: 606, 64 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 23 safe-song/safe-song rotate: false - xy: 614, 599 + xy: 606, 27 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 24 safe-song/safe-song rotate: false - xy: 716, 599 + xy: 790, 403 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 25 safe-song/safe-song rotate: false - xy: 818, 588 + xy: 790, 366 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 26 safe-song/safe-song rotate: false - xy: 920, 586 + xy: 790, 329 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 27 safe-song/safe-song rotate: false - xy: 614, 562 + xy: 790, 292 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 28 safe/inputed-key rotate: false - xy: 464, 65 + xy: 348, 369 size: 9, 11 orig: 9, 11 offset: 0, 0 index: -1 safe/safe-screen rotate: false - xy: 2, 209 + xy: 2, 203 size: 250, 100 orig: 250, 100 offset: 0, 0 index: -1 save rotate: false - xy: 667, 2 + xy: 574, 856 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 test/abc rotate: false - xy: 664, 960 + xy: 664, 954 size: 320, 62 orig: 320, 62 offset: 0, 0 index: -1 white rotate: false - xy: 526, 717 + xy: 782, 446 size: 32, 24 orig: 32, 24 offset: 0, 0 index: -1 wizard/Untitled rotate: false - xy: 484, 502 + xy: 484, 480 size: 80, 50 orig: 80, 50 offset: 0, 0 index: -1 wizard/cloud rotate: false - xy: 306, 232 + xy: 868, 820 size: 40, 30 orig: 40, 30 offset: 0, 0 index: -1 wizard/disappear rotate: false - xy: 2, 438 + xy: 2, 432 size: 380, 46 orig: 380, 46 offset: 0, 0 index: -1 wizard/experiment rotate: false - xy: 531, 743 + xy: 229, 146 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 0 wizard/experiment rotate: false - xy: 578, 751 + xy: 942, 784 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 1 wizard/experiment rotate: false - xy: 308, 6 + xy: 956, 611 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 2 wizard/experiment rotate: false - xy: 355, 6 + xy: 946, 554 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 3 wizard/experiment rotate: false - xy: 402, 6 + xy: 946, 497 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 4 wizard/experiment rotate: false - xy: 460, 193 + xy: 914, 440 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 5 wizard/experiment rotate: false - xy: 816, 531 + xy: 961, 440 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 6 wizard/experiment rotate: false - xy: 863, 531 + xy: 944, 383 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 7 wizard/experiment rotate: false - xy: 910, 529 + xy: 944, 326 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 8 wizard/experiment rotate: false - xy: 957, 529 + xy: 944, 269 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 9 wizard/experiment rotate: false - xy: 614, 505 + xy: 944, 212 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 10 wizard/experiment rotate: false - xy: 661, 505 + xy: 932, 155 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 11 wizard/experiment rotate: false - xy: 708, 504 + xy: 932, 98 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 12 wizard/experiment rotate: false - xy: 626, 448 + xy: 780, 87 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 13 wizard/experiment rotate: false - xy: 626, 391 + xy: 827, 87 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 14 wizard/experiment rotate: false - xy: 673, 447 + xy: 760, 30 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 15 wizard/experiment rotate: false - xy: 673, 390 + xy: 807, 30 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 16 wizard/experiment rotate: false - xy: 720, 389 + xy: 854, 30 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 17 wizard/experiment rotate: false - xy: 614, 334 + xy: 901, 41 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 18 wizard/experiment rotate: false - xy: 614, 277 + xy: 948, 39 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 19 -wizard/experiment - rotate: false - xy: 661, 333 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 20 -wizard/experiment - rotate: false - xy: 661, 276 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 21 -wizard/experiment - rotate: false - xy: 708, 332 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 22 -wizard/experiment - rotate: false - xy: 708, 275 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 23 -wizard/experiment - rotate: false - xy: 755, 274 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 24 -wizard/experiment - rotate: false - xy: 852, 474 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 25 -wizard/experiment - rotate: false - xy: 899, 472 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 26 -wizard/experiment - rotate: false - xy: 946, 472 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 27 -wizard/experiment - rotate: false - xy: 899, 415 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 28 -wizard/experiment - rotate: false - xy: 946, 415 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 29 -wizard/experiment - rotate: false - xy: 707, 218 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 30 -wizard/experiment - rotate: false - xy: 754, 217 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 31 -wizard/experiment - rotate: false - xy: 707, 161 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 32 -wizard/experiment - rotate: false - xy: 754, 160 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 33 -wizard/experiment - rotate: false - xy: 801, 217 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 34 -wizard/experiment - rotate: false - xy: 801, 160 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 35 -wizard/experiment - rotate: false - xy: 672, 104 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 36 -wizard/experiment - rotate: false - xy: 719, 103 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 37 -wizard/experiment - rotate: false - xy: 766, 103 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 38 wizard/flame rotate: false - xy: 247, 197 + xy: 782, 434 size: 5, 10 orig: 5, 10 offset: 0, 0 index: -1 wizard/magic-hands rotate: false - xy: 306, 264 + xy: 904, 506 size: 40, 50 orig: 40, 50 offset: 0, 0 index: -1 wizard/stand rotate: false - xy: 284, 119 + xy: 531, 746 size: 20, 46 orig: 20, 46 offset: 0, 0 index: -1 wizard/wizard rotate: false - xy: 284, 119 + xy: 531, 746 size: 20, 46 orig: 20, 46 offset: 0, 0 index: -1 wizard/talk rotate: false - xy: 830, 810 + xy: 822, 478 size: 80, 46 orig: 80, 46 offset: 0, 0 index: -1 wizard/talk-angry rotate: false - xy: 492, 366 + xy: 812, 526 size: 80, 50 orig: 80, 50 offset: 0, 0 index: -1 + +global2.png +size: 1024,128 +format: RGBA4444 +filter: Nearest,Nearest +repeat: none +ego/flying + rotate: false + xy: 692, 71 + size: 34, 44 + orig: 34, 44 + offset: 0, 0 + index: -1 +open-inventory + rotate: false + xy: 425, 2 + size: 42, 56 + orig: 42, 56 + offset: 0, 0 + index: 6 +open-inventory + rotate: false + xy: 472, 59 + size: 42, 56 + orig: 42, 56 + offset: 0, 0 + index: 7 +open-inventory + rotate: false + xy: 472, 59 + size: 42, 56 + orig: 42, 56 + offset: 0, 0 + index: 9 +open-inventory + rotate: false + xy: 516, 59 + size: 42, 56 + orig: 42, 56 + offset: 0, 0 + index: 8 +open-inventory + rotate: false + xy: 560, 59 + size: 42, 56 + orig: 42, 56 + offset: 0, 0 + index: 10 +open-inventory + rotate: false + xy: 604, 59 + size: 42, 56 + orig: 42, 56 + offset: 0, 0 + index: 11 +open-inventory + rotate: false + xy: 648, 59 + size: 42, 56 + orig: 42, 56 + offset: 0, 0 + index: 12 +wizard/experiment + rotate: false + xy: 2, 60 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 20 +wizard/experiment + rotate: false + xy: 2, 3 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 21 +wizard/experiment + rotate: false + xy: 49, 60 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 22 +wizard/experiment + rotate: false + xy: 49, 3 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 23 +wizard/experiment + rotate: false + xy: 96, 60 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 24 +wizard/experiment + rotate: false + xy: 96, 3 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 25 +wizard/experiment + rotate: false + xy: 143, 60 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 26 +wizard/experiment + rotate: false + xy: 143, 3 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 27 +wizard/experiment + rotate: false + xy: 190, 60 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 28 +wizard/experiment + rotate: false + xy: 190, 3 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 29 +wizard/experiment + rotate: false + xy: 237, 60 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 30 +wizard/experiment + rotate: false + xy: 237, 3 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 31 +wizard/experiment + rotate: false + xy: 284, 60 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 32 +wizard/experiment + rotate: false + xy: 284, 3 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 33 +wizard/experiment + rotate: false + xy: 331, 60 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 34 +wizard/experiment + rotate: false + xy: 331, 3 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 35 +wizard/experiment + rotate: false + xy: 378, 60 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 36 +wizard/experiment + rotate: false + xy: 378, 3 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 37 +wizard/experiment + rotate: false + xy: 425, 60 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 38 diff --git a/desktop/resources/packed/global.png b/desktop/resources/packed/global.png index 59d6cc28..1d853b61 100644 Binary files a/desktop/resources/packed/global.png and b/desktop/resources/packed/global.png differ diff --git a/desktop/resources/packed/global2.png b/desktop/resources/packed/global2.png new file mode 100644 index 00000000..bed8588f Binary files /dev/null and b/desktop/resources/packed/global2.png differ diff --git a/desktop/resources/packed/tongue-fight.atlas b/desktop/resources/packed/tongue-fight.atlas new file mode 100644 index 00000000..c1f15e66 --- /dev/null +++ b/desktop/resources/packed/tongue-fight.atlas @@ -0,0 +1,292 @@ + +tongue-fight.png +size: 512,256 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +background + rotate: false + xy: 2, 14 + size: 320, 240 + orig: 320, 240 + offset: 0, 0 + index: -1 +hair-0 + rotate: false + xy: 442, 160 + size: 7, 8 + orig: 7, 8 + offset: 0, 0 + index: 0 +hair-0 + rotate: false + xy: 467, 178 + size: 7, 8 + orig: 7, 8 + offset: 0, 0 + index: 1 +hair-0 + rotate: false + xy: 372, 24 + size: 7, 8 + orig: 7, 8 + offset: 0, 0 + index: 2 +hair-0 + rotate: false + xy: 428, 128 + size: 7, 8 + orig: 7, 8 + offset: 0, 0 + index: 3 +hair-0 + rotate: false + xy: 477, 196 + size: 7, 8 + orig: 7, 8 + offset: 0, 0 + index: 4 +hair-1 + rotate: false + xy: 442, 170 + size: 23, 16 + orig: 23, 16 + offset: 0, 0 + index: 0 +hair-1 + rotate: false + xy: 372, 34 + size: 23, 16 + orig: 23, 16 + offset: 0, 0 + index: 1 +hair-1 + rotate: false + xy: 397, 34 + size: 23, 16 + orig: 23, 16 + offset: 0, 0 + index: 2 +hair-2 + rotate: false + xy: 324, 52 + size: 47, 66 + orig: 47, 66 + offset: 0, 0 + index: 0 +hair-2 + rotate: false + xy: 428, 188 + size: 47, 66 + orig: 47, 66 + offset: 0, 0 + index: 1 +hair-2 + rotate: false + xy: 373, 52 + size: 47, 66 + orig: 47, 66 + offset: 0, 0 + index: 2 +hair-3 + rotate: false + xy: 491, 226 + size: 7, 8 + orig: 7, 8 + offset: 0, 0 + index: 0 +hair-3 + rotate: false + xy: 32, 4 + size: 7, 8 + orig: 7, 8 + offset: 0, 0 + index: 1 +hair-3 + rotate: false + xy: 442, 150 + size: 7, 8 + orig: 7, 8 + offset: 0, 0 + index: 2 +hair-4 + rotate: false + xy: 428, 158 + size: 12, 28 + orig: 12, 28 + offset: 0, 0 + index: 0 +hair-4 + rotate: false + xy: 477, 226 + size: 12, 28 + orig: 12, 28 + offset: 0, 0 + index: 1 +hair-4 + rotate: false + xy: 358, 22 + size: 12, 28 + orig: 12, 28 + offset: 0, 0 + index: 2 +hair-5 + rotate: false + xy: 2, 2 + size: 8, 10 + orig: 8, 10 + offset: 0, 0 + index: 0 +hair-5 + rotate: false + xy: 12, 2 + size: 8, 10 + orig: 8, 10 + offset: 0, 0 + index: 1 +hair-5 + rotate: false + xy: 22, 2 + size: 8, 10 + orig: 8, 10 + offset: 0, 0 + index: 2 +hair-6 + rotate: false + xy: 422, 112 + size: 4, 6 + orig: 4, 6 + offset: 0, 0 + index: 0 +hair-6 + rotate: false + xy: 428, 120 + size: 4, 6 + orig: 4, 6 + offset: 0, 0 + index: 1 +hair-6 + rotate: false + xy: 477, 188 + size: 4, 6 + orig: 4, 6 + offset: 0, 0 + index: 2 +hair-7 + rotate: false + xy: 505, 247 + size: 5, 7 + orig: 5, 7 + offset: 0, 0 + index: 0 +hair-7 + rotate: false + xy: 505, 238 + size: 5, 7 + orig: 5, 7 + offset: 0, 0 + index: 1 +hair-7 + rotate: false + xy: 505, 229 + size: 5, 7 + orig: 5, 7 + offset: 0, 0 + index: 2 +hair-8 + rotate: false + xy: 451, 162 + size: 6, 6 + orig: 6, 6 + offset: 0, 0 + index: 0 +hair-8 + rotate: false + xy: 467, 170 + size: 6, 6 + orig: 6, 6 + offset: 0, 0 + index: 1 +hair-8 + rotate: false + xy: 381, 26 + size: 6, 6 + orig: 6, 6 + offset: 0, 0 + index: 2 +hair-9 + rotate: false + xy: 428, 138 + size: 12, 18 + orig: 12, 18 + offset: 0, 0 + index: 0 +hair-9 + rotate: false + xy: 477, 206 + size: 12, 18 + orig: 12, 18 + offset: 0, 0 + index: 1 +hair-9 + rotate: false + xy: 491, 236 + size: 12, 18 + orig: 12, 18 + offset: 0, 0 + index: 2 +heart + rotate: false + xy: 324, 18 + size: 32, 32 + orig: 32, 32 + offset: 0, 0 + index: 0 +tongue-idle + rotate: false + xy: 324, 120 + size: 102, 134 + orig: 102, 134 + offset: 0, 0 + index: 0 + +tongue-fight2.png +size: 1024,256 +format: RGBA8888 +filter: Nearest,Nearest +repeat: none +tongue-idle/tongue-idle + rotate: false + xy: 2, 2 + size: 135, 145 + orig: 135, 145 + offset: 0, 0 + index: 0 +tongue-idle/tongue-idle + rotate: false + xy: 139, 2 + size: 135, 145 + orig: 135, 145 + offset: 0, 0 + index: 1 +tongue-idle/tongue-idle + rotate: false + xy: 276, 2 + size: 135, 145 + orig: 135, 145 + offset: 0, 0 + index: 2 +tongue-idle/tongue-idle + rotate: false + xy: 413, 2 + size: 135, 145 + orig: 135, 145 + offset: 0, 0 + index: 3 +tongue-idle/tongue-idle + rotate: false + xy: 550, 2 + size: 135, 145 + orig: 135, 145 + offset: 0, 0 + index: 4 diff --git a/desktop/resources/packed/tongue-fight.png b/desktop/resources/packed/tongue-fight.png new file mode 100644 index 00000000..1e052b81 Binary files /dev/null and b/desktop/resources/packed/tongue-fight.png differ diff --git a/desktop/resources/packed/tongue-fight2.png b/desktop/resources/packed/tongue-fight2.png new file mode 100644 index 00000000..d86b15c0 Binary files /dev/null and b/desktop/resources/packed/tongue-fight2.png differ diff --git a/desktop/src-common/advent/screens/rooms/tongue_fight.clj b/desktop/src-common/advent/screens/rooms/tongue_fight.clj new file mode 100644 index 00000000..eaccdb09 --- /dev/null +++ b/desktop/src-common/advent/screens/rooms/tongue_fight.clj @@ -0,0 +1,257 @@ +(ns advent.screens.rooms.tongue-fight + (:require [advent.screens.rooms :as rooms] + [advent.screens.rooms.common :as common] + [advent.screens.rooms.held :as held] + [advent.saves :as saves] + [advent.actions :as actions] + [advent.screens.items :as items] + [advent.utils :as utils] + [advent.tween :as tween] + [clojure.zip :as zip] + [clojure.set :as set] + [clojure.string :as str] + [play-clj.core :refer :all] + [play-clj.ui :refer :all] + [play-clj.utils :refer :all] + [play-clj.math :refer :all] + [play-clj.g2d :refer :all])) +(println "loading " *ns*) + +(defn cause-damage [entities is-player-wound?] + (if is-player-wound? + (update-in entities [:room :ego-hearts] dec) + (update-in entities [:room :tongue-hearts] dec))) + +(defn show-heart [entities screen is-player-wound?] + + (let [[x y] (if is-player-wound? + [256 163] + [146 185])] + (-> entities + (update-in [:room :entities :heart] #(assoc % :opacity 1 :x x :y y)) + (assoc-in [:tweens :heart-y] (tween/tween :heart-y screen [:room :entities :heart :y] y (+ y 10) 0.5 :ease tween/ease-out-cubic)) + (assoc-in [:tweens :heart-opacity] (tween/tween :heart-opacity screen [:room :entities :heart :opacity] 1.0 0.0 0.5 :ease tween/ease-in-cubic)) + (cause-damage is-player-wound?)))) + +(defn stop-swing-if-necessary [screen {{{{:keys [anim anim-start] {:keys [tongue-swing]} :left } :ego} :entities} :room :as entities}] + (if (and (= tongue-swing anim) + (animation! anim + :is-animation-finished + (- (:total-time screen) anim-start))) + (update-in entities [:room :entities :ego] #(actions/start-animation screen % :tongue-idle)) + entities)) + +(defn trigger-tongue [screen {{{ + {:keys [state started anim anim-start]} :tongue + {ego-anim :anim {ego-windup :tongue-windup} :left } :ego + } :entities + :keys [ego-hearts tongue-hearts]} :room + :as entities}] + (let [time-in-state (- (:total-time screen) (or started (:total-time screen))) + is-player-wound? (= ego-anim ego-windup) + entities (stop-swing-if-necessary screen entities)] + (cond + (and (not (get-in entities [:fg-actions :script-running?])) + (get-in entities [:state :active?]) + (= 0 ego-hearts)) + (do + ((actions/get-script entities + (actions/transition-background entities :held [113 120]) + (Thread/sleep 10000)) + entities) + entities) + + (and (not (get-in entities [:fg-actions :script-running?])) + (get-in entities [:state :active?]) + (= 0 tongue-hearts)) + (do + ((actions/get-script entities + (actions/transition-background entities :cat-tree [113 120]) + (Thread/sleep 10000)) + entities) + entities) + + (and + (= state :attack) + (animation! anim + :is-animation-finished + (- (:total-time screen) anim-start))) + (-> entities + (update-in [:room :entities :tongue] #(actions/start-animation screen % :idle)) + (update-in [:room :entities :tongue] assoc :state :idle :started (:total-time screen))) + + (and + (= state :windup) + (animation! anim + :is-animation-finished + (- (:total-time screen) anim-start))) + (-> entities + (update-in [:room :entities :tongue] #(actions/start-animation screen % :attack)) + (update-in [:room :entities :tongue] assoc :state :attack :started (:total-time screen)) + (update-in [:room :entities :ego] #(if is-player-wound? + (actions/start-animation screen % :tongue-swing) + %)) + (show-heart screen is-player-wound?)) + + ;; reset timer if you wind up while the tongue is idle + (and (= state :idle) + is-player-wound?) + (assoc-in entities [:room :entities :tongue :started] (:total-time screen)) + + (and (= state :idle) + (= 1 (rand-int (* 60 3))) + (> time-in-state 3.0) + (not is-player-wound?)) + (-> entities + (update-in [:room :entities :tongue] #(actions/start-animation screen % :windup)) + (update-in [:room :entities :tongue] assoc :state :windup :started (:total-time screen))) + + (not started) + (assoc-in entities [:room :entities :tongue :started] (:total-time screen)) + :else + + entities + ))) + +(defn make [screen atlas global-atlas] + (let [hair-0 (utils/make-anim-seq atlas "hair-0" [7 8] 0.12 (range 4)) + hair-1 (utils/make-anim-seq atlas "hair-1" [23 16] 0.13 [0 1 2 1]) + hair-2 (utils/make-anim-seq atlas "hair-2" [47 66] 0.15 [0 1 2 1]) + hair-3 (utils/make-anim-seq atlas "hair-3" [7 8] 0.12 [0 1 2 1]) + hair-4 (utils/make-anim-seq atlas "hair-4" [12 28] 0.12 [0 1 2 1]) + hair-5 (utils/make-anim-seq atlas "hair-5" [8 10] 0.12 [0 1 2 1]) + hair-6 (utils/make-anim-seq atlas "hair-6" [4 6] 0.16 [0 1 2 1]) + hair-7 (utils/make-anim-seq atlas "hair-7" [5 7] 0.16 [0 1 2 1]) + hair-8 (utils/make-anim-seq atlas "hair-8" [6 6] 0.16 [0 1 2 1]) + hair-9 (utils/make-anim-seq atlas "hair-9" [12 18] 0.16 [0 1 2 1]) + heart (utils/make-anim-seq atlas "heart" [32 32] 0.16 [0]) + tongue-idle (utils/make-anim-seq atlas "tongue-idle/tongue-idle" [135 145] 0.16 (range 5)) + tongue-windup (utils/make-anim-seq atlas "tongue-idle/tongue-idle" [135 145] 0.16 [0 0 0 0 0]) + tongue-attack (utils/make-anim-seq atlas "tongue-idle/tongue-idle" [135 145] 0.16 [1 1 1 1])] + + + (rooms/make :name "Tongue Fight" + + :interactions {} + :layers [(assoc (utils/atlas->texture atlas "background") :x 0 :y 0 :baseline 0 :scale-x 1 :scale-y 1)] + :update-fn trigger-tongue + :ego-hearts 5 + :tongue-hearts 5 + + :entities {:hair-0 (assoc (animation->texture screen hair-0) + :x 35 + :y 46 + :width 6 + :height 7 + :baseline 1 + :anim hair-0 + :anim-start 0) + :hair-1 (assoc (animation->texture screen hair-1) + :x 113 + :y 176 + :width 23 + :height 16 + :baseline 1 + :anim hair-1 + :anim-start 0) + :hair-2 (assoc (animation->texture screen hair-2) + :x 243 + :y 104 + :width 47 + :height 66 + :baseline 1 + :anim hair-2 + :anim-start 0) + :hair-3 (assoc (animation->texture screen hair-3) + :x 121 + :y 222 + :width 7 + :height 8 + :baseline 1 + :anim hair-3 + :anim-start 0) + :hair-4 (assoc (animation->texture screen hair-4) + :x 71 + :y 6 + :width 12 + :height 28 + :baseline 1 + :anim hair-4 + :anim-start 0) + :hair-5 (assoc (animation->texture screen hair-5) + :x 100 + :y 12 + :width 8 + :height 10 + :baseline 1 + :anim hair-5 + :anim-start 0) + :hair-6 (assoc (animation->texture screen hair-6) + :x 113 + :y 38 + :width 4 + :height 6 + :baseline 1 + :anim hair-6 + :anim-start 0) + :hair-7 (assoc (animation->texture screen hair-7) + :x 125 + :y 21 + :width 5 + :height 7 + :baseline 1 + :anim hair-7 + :anim-start 0) + :hair-8 (assoc (animation->texture screen hair-8) + :x 145 + :y 6 + :width 6 + :height 6 + :baseline 1 + :anim hair-8 + :anim-start 0) + :hair-9 (assoc (animation->texture screen hair-9) + :x 23 + :y 29 + :width 12 + :height 18 + :baseline 1 + :anim hair-9 + :anim-start 0) + :heart (assoc (animation->texture screen heart) + :x 23 + :y 29 + :width 32 + :height 32 + :baseline 320 + :opacity 0 + :anim heart + :anim-start 0) + :tongue (assoc (animation->texture screen tongue-idle) + :x 186 + :y 65 + :origin-x 23 + :origin-y 10 + :width 135 + :height 145 + :baseline 2 + :anim tongue-idle + :windup tongue-windup + :idle tongue-idle + :attack tongue-attack + :anim-start 0 + :state :idle + :script (actions/get-script + entities + (actions/play-animation entities :ego :tongue-windup)))} + + :collision "space/collision.png" + :scale-fn (constantly 1.0) + :start-pos [141 110] + :apply-state (fn [screen e] + (-> e + (update-in [:room :entities :ego] #(actions/start-animation screen % :tongue-idle)) + (assoc-in [:room :entities :ego :stand-override] :tongue-idle) + (assoc-in [:room :entities :ego :x] 141) + (assoc-in [:room :entities :ego :y] 110)))))) + diff --git a/desktop/src-common/advent/screens/scene.clj b/desktop/src-common/advent/screens/scene.clj index b1776cc0..53dbdb5b 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -36,6 +36,7 @@ [advent.screens.rooms.inside-antique :as rooms.inside-antique] [advent.screens.rooms.behind-house :as rooms.behind-house] [advent.screens.rooms.outside-castle :as rooms.outside-castle] + [advent.screens.rooms.tongue-fight :as rooms.tongue-fight] [advent.screens.rooms.space :as rooms.space] [advent.screens.rooms.held :as rooms.held] [advent.screens.rooms.cat-tree :as rooms.cat-tree] @@ -518,6 +519,9 @@ love (utils/make-anim-seq global-atlas "ego/love" [50 70] 0.1 (flatten [0 0 1 1 2 2 3 3 4 4 5 5 6 6 (repeat 10 7) (repeat 5 8) (repeat 5 7) (repeat 5 8) (repeat 5 7) (repeat 10 [23 24 25 24]) (repeat 30 9) 10 11 12 13 14 15 16 17 18 19 20 21 21 21 22 22 22 21 21 21 21 21 21 21 21 22 22 22 22 22 21 21 21 21 22 22 22 22 22 22 21 21 21 21 21 6 6 5 5 4 4 3 3 2 2 1 1 0])) whistle (utils/make-anim-seq global-atlas "ego/whistle" [18 36] 0.2 (flatten [0 1 1 (repeat 200 [2 3])])) axe (utils/make-anim global-atlas "ego/axe" [60 70] 0.10 (flatten [1 1 1 1 1 0 0 0 1 1 1 1 1 0 0 0 0 (range 7)])) + tongue-windup (utils/make-anim-seq global-atlas "ego/tongue-stance" [119 134] 0.05 [0 1 2 2 2 2 2 2 2 2]) + tongue-swing (utils/make-anim-seq global-atlas "ego/tongue-stance" [119 134] 0.12 [ 3 4 5 6 ]) + tongue-idle (utils/make-anim-seq global-atlas "ego/tongue-idle" [119 134] 0.7 [0 1]) axe-wood (utils/make-anim global-atlas "ego/axe-wood" [60 70] 0.10 (flatten [1 1 1 1 1 0 0 0 1 1 1 1 1 0 0 0 0 (range 11)])) suspended (utils/make-anim global-atlas "ego/suspended" [20 36] 0.10 [0]) suspended-talk (utils/make-anim global-atlas "ego/suspended" [20 36] 0.20 (range 7)) @@ -556,6 +560,9 @@ :reach-down reach-down :reach-start reach-start :jump jump + :tongue-swing tongue-swing + :tongue-windup tongue-windup + :tongue-idle tongue-idle :jump-straight jump-straight :jumping-straight jumping-straight :reach-stop reach-stop @@ -615,6 +622,9 @@ :reach-down (utils/flip reach-down) :reach-start (utils/flip reach-start) :jump-straight (utils/flip jump-straight) + :tongue-swing tongue-swing + :tongue-windup tongue-windup + :tongue-idle tongue-idle :jumping-straight (utils/flip jumping-straight) :reach-stop (utils/flip reach-stop) :shoot (utils/flip shoot) @@ -739,6 +749,10 @@ (get-in ego [:left :frustrated-talk]) {:origin-x 7} (get-in ego [:left :jump-straight]) {:origin-x 9} (get-in ego [:right :jump-straight]) {:origin-x 9} + (get-in ego [:left :tongue-swing]) {:origin-x 41 :origin-y 15} + (get-in ego [:left :tongue-windup]) {:origin-x 41 :origin-y 15} + (get-in ego [:left :tongue-idle]) {:origin-x 41 :origin-y 15} + (get-in ego [:left :poke]) {:origin-x 10} (get-in ego [:right :poke]) {:origin-x 10} (get-in ego [:left :jumping-straight]) {:origin-x 9} @@ -1225,6 +1239,7 @@ :cat-tree (wrap rooms.cat-tree/make "packed/cat-tree.atlas") :inside-castle (wrap rooms.inside-castle/make "packed/inside-castle.atlas") :space (wrap rooms.space/make "packed/space.atlas") + :tongue-fight (wrap rooms.tongue-fight/make "packed/tongue-fight.atlas") :held (wrap rooms.held/make "packed/held.atlas") :inside-cafeteria (wrap rooms.inside-cafeteria/make "packed/inside-cafeteria.atlas") :inside-antique (wrap rooms.inside-antique/make "packed/inside-antique.atlas") @@ -1243,6 +1258,7 @@ :cat-tree {:day :town-2 :night :night :sunrise :night} :inside-castle {:day :town-1 :night :night :sunrise :night} :space :fight + :tongue-fight :fight :held :fight :inside-cafeteria {:day :town-1 :night :night :sunrise :night} :inside-antique :inside-antique