diff --git a/desktop/asset-work/global/ego/tongue-hit.ase b/desktop/asset-work/global/ego/tongue-hit.ase new file mode 100644 index 00000000..897f774e Binary files /dev/null and b/desktop/asset-work/global/ego/tongue-hit.ase differ diff --git a/desktop/asset-work/global/ego/tongue-hit_0.png b/desktop/asset-work/global/ego/tongue-hit_0.png new file mode 100644 index 00000000..796ff591 Binary files /dev/null and b/desktop/asset-work/global/ego/tongue-hit_0.png differ diff --git a/desktop/asset-work/global/ego/tongue-hit_1.png b/desktop/asset-work/global/ego/tongue-hit_1.png new file mode 100644 index 00000000..3e46111b Binary files /dev/null and b/desktop/asset-work/global/ego/tongue-hit_1.png differ diff --git a/desktop/asset-work/global/ego/tongue-hit_2.png b/desktop/asset-work/global/ego/tongue-hit_2.png new file mode 100644 index 00000000..04650008 Binary files /dev/null and b/desktop/asset-work/global/ego/tongue-hit_2.png differ diff --git a/desktop/asset-work/global/ego/tongue-hit_3.png b/desktop/asset-work/global/ego/tongue-hit_3.png new file mode 100644 index 00000000..f6a3b8fb Binary files /dev/null and b/desktop/asset-work/global/ego/tongue-hit_3.png differ diff --git a/desktop/asset-work/tongue-fight/tongue-attack-hit_0.ase b/desktop/asset-work/tongue-fight/tongue-attack-hit_0.ase new file mode 100644 index 00000000..e02846a2 Binary files /dev/null and b/desktop/asset-work/tongue-fight/tongue-attack-hit_0.ase differ diff --git a/desktop/asset-work/tongue-fight/tongue-attack-hit_0.png b/desktop/asset-work/tongue-fight/tongue-attack-hit_0.png new file mode 100644 index 00000000..0c220757 Binary files /dev/null and b/desktop/asset-work/tongue-fight/tongue-attack-hit_0.png differ diff --git a/desktop/asset-work/tongue-fight/tongue-attack-hit_1.png b/desktop/asset-work/tongue-fight/tongue-attack-hit_1.png new file mode 100644 index 00000000..a56e36ce Binary files /dev/null and b/desktop/asset-work/tongue-fight/tongue-attack-hit_1.png differ diff --git a/desktop/asset-work/tongue-fight/tongue-attack-hit_2.png b/desktop/asset-work/tongue-fight/tongue-attack-hit_2.png new file mode 100644 index 00000000..88581b66 Binary files /dev/null and b/desktop/asset-work/tongue-fight/tongue-attack-hit_2.png differ diff --git a/desktop/asset-work/tongue-fight/tongue-attack-hit_3.png b/desktop/asset-work/tongue-fight/tongue-attack-hit_3.png new file mode 100644 index 00000000..8f2d640b Binary files /dev/null and b/desktop/asset-work/tongue-fight/tongue-attack-hit_3.png differ diff --git a/desktop/asset-work/tongue-fight/tongue-attack-hit_4.png b/desktop/asset-work/tongue-fight/tongue-attack-hit_4.png new file mode 100644 index 00000000..675cff13 Binary files /dev/null and b/desktop/asset-work/tongue-fight/tongue-attack-hit_4.png differ diff --git a/desktop/asset-work/tongue-fight/tongue-attack-hit_5.png b/desktop/asset-work/tongue-fight/tongue-attack-hit_5.png new file mode 100644 index 00000000..f86bcdce Binary files /dev/null and b/desktop/asset-work/tongue-fight/tongue-attack-hit_5.png differ diff --git a/desktop/asset-work/tongue-fight/tongue-attack-hit_6.png b/desktop/asset-work/tongue-fight/tongue-attack-hit_6.png new file mode 100644 index 00000000..60d31c84 Binary files /dev/null and b/desktop/asset-work/tongue-fight/tongue-attack-hit_6.png differ diff --git a/desktop/asset-work/tongue-fight/tongue-attack-hit_7.png b/desktop/asset-work/tongue-fight/tongue-attack-hit_7.png new file mode 100644 index 00000000..dc717608 Binary files /dev/null and b/desktop/asset-work/tongue-fight/tongue-attack-hit_7.png differ diff --git a/desktop/asset-work/tongue-fight/tongue-windup_0.ase b/desktop/asset-work/tongue-fight/tongue-windup_0.ase index 2df8a0b3..0cf7cf7e 100644 Binary files a/desktop/asset-work/tongue-fight/tongue-windup_0.ase and b/desktop/asset-work/tongue-fight/tongue-windup_0.ase differ diff --git a/desktop/asset-work/tongue-fight/tongue-windup_0.png b/desktop/asset-work/tongue-fight/tongue-windup_0.png index 4d863f23..364116a2 100644 Binary files a/desktop/asset-work/tongue-fight/tongue-windup_0.png and b/desktop/asset-work/tongue-fight/tongue-windup_0.png differ diff --git a/desktop/asset-work/tongue-fight/tongue-windup_1.png b/desktop/asset-work/tongue-fight/tongue-windup_1.png index 49a3b778..40ab9911 100644 Binary files a/desktop/asset-work/tongue-fight/tongue-windup_1.png and b/desktop/asset-work/tongue-fight/tongue-windup_1.png differ diff --git a/desktop/asset-work/tongue-fight/tongue-windup_2.png b/desktop/asset-work/tongue-fight/tongue-windup_2.png new file mode 100644 index 00000000..5f73f4f7 Binary files /dev/null and b/desktop/asset-work/tongue-fight/tongue-windup_2.png differ diff --git a/desktop/asset-work/tongue-fight/tongue-windup_3.png b/desktop/asset-work/tongue-fight/tongue-windup_3.png new file mode 100644 index 00000000..96f91fde Binary files /dev/null and b/desktop/asset-work/tongue-fight/tongue-windup_3.png differ diff --git a/desktop/project.clj b/desktop/project.clj index 00f3c3d3..fdf49c92 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 ",")]) - ["tongue-fight" ] + ["tongue-fight", "global" ] #_["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" ]))) @@ -49,7 +49,7 @@ [slamhound "1.5.5"] [org.clojure/data.csv "0.1.3"]] - :warn-on-reflection true} + #_#_:warn-on-reflection true} :mobile-dev { :source-paths ["src" "src-common" "src-dev"] :jvm-opts ["-Duse-repl=true" "-Dui_scale=1.5" "-Dno-steam=true" "-Dclojure.compiler.direct-linking=true" "-Dis-desktop=true" "-Dplatform=desktop"] diff --git a/desktop/resources/packed/global.atlas b/desktop/resources/packed/global.atlas index 168ff0c3..f38ca438 100644 --- a/desktop/resources/packed/global.atlas +++ b/desktop/resources/packed/global.atlas @@ -6,1190 +6,1134 @@ filter: Nearest,Nearest repeat: none bird rotate: false - xy: 566, 642 + xy: 566, 648 size: 2, 2 orig: 2, 2 offset: 0, 0 index: -1 black rotate: false - xy: 254, 207 + xy: 990, 194 size: 32, 24 orig: 32, 24 offset: 0, 0 index: -1 close rotate: false - xy: 634, 928 + xy: 634, 934 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 ego/Untitled rotate: false - xy: 732, 782 + xy: 732, 788 size: 144, 36 orig: 144, 36 offset: 0, 0 index: -1 ego/talk rotate: false - xy: 732, 782 + xy: 732, 788 size: 144, 36 orig: 144, 36 offset: 0, 0 index: -1 ego/axe rotate: false - xy: 2, 528 + xy: 2, 534 size: 420, 70 orig: 420, 70 offset: 0, 0 index: -1 ego/axe-wood rotate: false - xy: 2, 946 + xy: 2, 952 size: 660, 70 orig: 660, 70 offset: 0, 0 index: -1 ego/base rotate: false - xy: 506, 356 + xy: 364, 400 size: 16, 36 orig: 16, 36 offset: 0, 0 index: -1 ego/whistle rotate: false - xy: 506, 356 + xy: 364, 400 size: 16, 36 orig: 16, 36 offset: 0, 0 index: 0 ego/burnt rotate: false - xy: 2, 480 + xy: 2, 486 size: 480, 46 orig: 480, 46 offset: 0, 0 index: -1 ego/cat-toy rotate: false - xy: 324, 742 + xy: 324, 748 size: 205, 50 orig: 205, 50 offset: 0, 0 index: -1 ego/climb rotate: false - xy: 324, 794 + xy: 324, 800 size: 242, 46 orig: 242, 46 offset: 0, 0 index: -1 ego/crawl rotate: false - xy: 634, 890 + xy: 634, 896 size: 273, 25 orig: 273, 25 offset: 0, 0 index: -1 ego/crowbar rotate: false - xy: 364, 394 + xy: 384, 264 size: 144, 36 orig: 144, 36 offset: 0, 0 index: -1 ego/dot rotate: false - xy: 1021, 93 + xy: 324, 609 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 wizard/dot rotate: false - xy: 1021, 93 + xy: 324, 609 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 ego/fire rotate: false - xy: 634, 852 + xy: 634, 858 size: 216, 36 orig: 216, 36 offset: 0, 0 index: -1 +ego/flying + rotate: false + xy: 988, 138 + size: 34, 44 + orig: 34, 44 + offset: 0, 0 + index: -1 ego/frog rotate: false - xy: 858, 216 + xy: 990, 220 size: 32, 36 orig: 32, 36 offset: 0, 0 index: -1 ego/frustrated-talk rotate: false - xy: 852, 852 + xy: 854, 478 size: 96, 36 orig: 96, 36 offset: 0, 0 index: -1 ego/georgia rotate: false - xy: 776, 820 + xy: 776, 826 size: 90, 30 orig: 90, 30 offset: 0, 0 index: -1 ego/get-sick rotate: false - xy: 712, 472 + xy: 817, 440 size: 108, 36 orig: 108, 36 offset: 0, 0 index: -1 ego/glad rotate: false - xy: 384, 432 + xy: 384, 302 size: 140, 46 orig: 140, 46 offset: 0, 0 index: -1 ego/grow rotate: false - xy: 822, 440 + xy: 852, 858 size: 90, 36 orig: 90, 36 offset: 0, 0 index: -1 ego/grow-talk rotate: false - xy: 986, 980 + xy: 986, 986 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 ego/hand-hold rotate: false - xy: 986, 942 + xy: 986, 948 size: 36, 36 orig: 36, 36 offset: 0, 0 index: -1 ego/hold-hand rotate: false - xy: 991, 402 + xy: 816, 216 size: 16, 36 orig: 16, 36 offset: 0, 0 index: -1 ego/hold-up-to-window rotate: false - xy: 526, 396 + xy: 817, 402 size: 108, 36 orig: 108, 36 offset: 0, 0 index: -1 ego/ida rotate: false - xy: 292, 310 + xy: 505, 414 size: 54, 70 orig: 54, 70 offset: 0, 0 index: -1 ego/idea rotate: false - xy: 254, 233 + xy: 858, 330 size: 54, 70 orig: 54, 70 offset: 0, 0 index: -1 ego/in-love rotate: false - xy: 2, 842 + xy: 2, 848 size: 570, 30 orig: 570, 30 offset: 0, 0 index: -1 ego/jump-straight rotate: false - xy: 812, 630 + xy: 254, 236 size: 90, 48 orig: 90, 48 offset: 0, 0 index: -1 ego/love rotate: false - xy: 738, 362 + xy: 927, 406 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 0 ego/love rotate: false - xy: 476, 284 + xy: 836, 256 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 1 ego/love rotate: false - xy: 412, 208 + xy: 888, 258 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 2 ego/love rotate: false - xy: 244, 74 + xy: 914, 330 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 3 ego/love rotate: false - xy: 244, 2 + xy: 940, 258 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 4 ego/love rotate: false - xy: 296, 97 + xy: 836, 184 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 5 ego/love rotate: false - xy: 296, 25 + xy: 929, 716 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 6 ego/love rotate: false - xy: 348, 97 + xy: 933, 587 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 7 ego/love rotate: false - xy: 348, 25 + xy: 458, 192 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 8 ego/love rotate: false - xy: 400, 97 + xy: 966, 334 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 9 ego/love rotate: false - xy: 400, 25 + xy: 428, 81 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 10 ego/love rotate: false - xy: 452, 97 + xy: 428, 9 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 11 ego/love rotate: false - xy: 452, 25 + xy: 944, 851 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 12 ego/love rotate: false - xy: 476, 212 + xy: 480, 66 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 13 ego/love rotate: false - xy: 708, 29 + xy: 532, 108 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 14 ego/love rotate: false - xy: 892, 368 + xy: 584, 108 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 15 ego/love rotate: false - xy: 892, 296 + xy: 636, 108 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 16 ego/love rotate: false - xy: 738, 290 + xy: 688, 108 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 17 ego/love rotate: false - xy: 732, 218 + xy: 740, 108 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 18 ego/love rotate: false - xy: 732, 146 + xy: 680, 36 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 19 ego/love rotate: false - xy: 784, 144 + xy: 732, 36 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 20 ego/love rotate: false - xy: 836, 144 + xy: 784, 36 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 21 ego/love rotate: false - xy: 892, 224 + xy: 836, 74 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 22 ego/love rotate: false - xy: 900, 710 + xy: 836, 2 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 23 ego/love rotate: false - xy: 904, 638 + xy: 888, 74 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 24 ego/love rotate: false - xy: 894, 558 + xy: 888, 2 size: 50, 70 orig: 50, 70 offset: 0, 0 index: 25 ego/pant rotate: false - xy: 878, 782 + xy: 878, 788 size: 62, 36 orig: 62, 36 offset: 0, 0 index: -1 ego/player rotate: false - xy: 424, 532 + xy: 424, 538 size: 144, 72 orig: 144, 72 offset: 0, 0 index: -1 ego/poke rotate: false - xy: 812, 578 + xy: 244, 110 size: 80, 50 orig: 80, 50 offset: 0, 0 index: -1 ego/reach rotate: false - xy: 784, 216 + xy: 914, 146 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 ego/scared rotate: false - xy: 950, 879 + xy: 532, 70 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 ego/scared-walk rotate: false - xy: 790, 254 + xy: 816, 146 size: 96, 36 orig: 96, 36 offset: 0, 0 index: -1 ego/scoot rotate: false - xy: 574, 820 + xy: 574, 826 size: 200, 30 orig: 200, 30 offset: 0, 0 index: -1 ego/shock rotate: false - xy: 2, 382 + xy: 2, 388 size: 360, 48 orig: 360, 48 offset: 0, 0 index: -1 ego/shoot rotate: false - xy: 566, 472 + xy: 566, 478 size: 144, 36 orig: 144, 36 offset: 0, 0 index: -1 ego/sigh rotate: false - xy: 568, 782 + xy: 568, 788 size: 162, 36 orig: 162, 36 offset: 0, 0 index: -1 ego/spear rotate: false - xy: 808, 680 + xy: 292, 286 size: 90, 100 orig: 90, 100 offset: 0, 0 index: -1 ego/squat rotate: false - xy: 348, 318 + xy: 561, 440 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/squat-talk rotate: false - xy: 950, 841 + xy: 606, 70 size: 72, 36 orig: 72, 36 offset: 0, 0 index: -1 ego/stand rotate: false - xy: 348, 280 + xy: 689, 440 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/standup rotate: false - xy: 2, 146 + xy: 2, 152 size: 225, 55 orig: 225, 55 offset: 0, 0 index: -1 ego/suspended rotate: false - xy: 364, 356 + xy: 712, 478 size: 140, 36 orig: 140, 36 offset: 0, 0 index: -1 ego/swing rotate: false - xy: 2, 305 + xy: 2, 311 size: 288, 75 orig: 288, 75 offset: 0, 0 index: -1 ego/swing-shovel rotate: false - xy: 2, 874 + xy: 2, 880 size: 630, 70 orig: 630, 70 offset: 0, 0 index: -1 ego/thorw rotate: false - xy: 526, 434 + xy: 561, 402 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 ego/throw rotate: false - xy: 654, 434 + xy: 689, 402 size: 126, 36 orig: 126, 36 offset: 0, 0 index: -1 -ego/tongue-idle +ego/tongue-hit rotate: false - xy: 2, 10 + xy: 2, 16 size: 119, 134 orig: 119, 134 offset: 0, 0 index: 0 ego/tongue-stance rotate: false - xy: 2, 10 + xy: 2, 16 size: 119, 134 orig: 119, 134 offset: 0, 0 index: 0 ego/tongue-idle rotate: false - xy: 324, 606 + xy: 2, 16 + size: 119, 134 + orig: 119, 134 + offset: 0, 0 + index: 0 +ego/tongue-hit + rotate: false + xy: 324, 612 + size: 119, 134 + orig: 119, 134 + offset: 0, 0 + index: 1 +ego/tongue-hit + rotate: false + xy: 123, 16 + size: 119, 134 + orig: 119, 134 + offset: 0, 0 + index: 2 +ego/tongue-hit + rotate: false + xy: 445, 612 + size: 119, 134 + orig: 119, 134 + offset: 0, 0 + index: 3 +ego/tongue-idle + rotate: false + xy: 566, 652 size: 119, 134 orig: 119, 134 offset: 0, 0 index: 1 ego/tongue-stance rotate: false - xy: 123, 10 + xy: 570, 516 size: 119, 134 orig: 119, 134 offset: 0, 0 index: 1 ego/tongue-stance rotate: false - xy: 445, 606 + xy: 687, 652 size: 119, 134 orig: 119, 134 offset: 0, 0 index: 2 ego/tongue-stance rotate: false - xy: 566, 646 + xy: 691, 516 size: 119, 134 orig: 119, 134 offset: 0, 0 index: 3 ego/tongue-stance rotate: false - xy: 570, 510 + xy: 808, 652 size: 119, 134 orig: 119, 134 offset: 0, 0 index: 4 ego/tongue-stance rotate: false - xy: 687, 646 + xy: 812, 516 size: 119, 134 orig: 119, 134 offset: 0, 0 index: 5 ego/tongue-stance rotate: false - xy: 691, 510 + xy: 384, 350 size: 119, 134 orig: 119, 134 offset: 0, 0 index: 6 -ego/warden - rotate: false - xy: 480, 169 - size: 42, 41 - orig: 42, 41 - offset: 0, 0 - index: -1 ego/whistle rotate: false - xy: 991, 364 + xy: 792, 142 size: 16, 36 orig: 16, 36 offset: 0, 0 index: 1 ego/whistle rotate: false - xy: 991, 326 + xy: 485, 154 size: 16, 36 orig: 16, 36 offset: 0, 0 index: 2 ego/whistle rotate: false - xy: 991, 288 + xy: 989, 813 size: 16, 36 orig: 16, 36 offset: 0, 0 index: 3 frankie rotate: false - xy: 664, 917 + xy: 664, 923 size: 312, 35 orig: 312, 35 offset: 0, 0 index: -1 frankie-walk rotate: false - xy: 989, 804 + xy: 433, 153 size: 24, 35 orig: 24, 35 offset: 0, 0 index: 0 frankie-walk rotate: false - xy: 728, 109 + xy: 985, 622 size: 24, 35 orig: 24, 35 offset: 0, 0 index: 1 frankie-walk rotate: false - xy: 754, 109 + xy: 987, 101 size: 24, 35 orig: 24, 35 offset: 0, 0 index: 2 frankie-walk rotate: false - xy: 995, 59 + xy: 987, 64 size: 24, 35 orig: 24, 35 offset: 0, 0 index: 3 frankie-walk rotate: false - xy: 991, 251 + xy: 459, 155 size: 24, 35 orig: 24, 35 offset: 0, 0 index: 4 frankie-walk rotate: false - xy: 991, 214 + xy: 992, 297 size: 24, 35 orig: 24, 35 offset: 0, 0 index: 5 frankie-walk rotate: false - xy: 993, 574 + xy: 992, 260 size: 24, 35 orig: 24, 35 offset: 0, 0 index: 6 frankie-walk rotate: false - xy: 993, 537 + xy: 987, 27 size: 24, 35 orig: 24, 35 offset: 0, 0 index: 7 inventory rotate: false - xy: 952, 726 + xy: 980, 529 size: 42, 56 orig: 42, 56 offset: 0, 0 index: -1 open-inventory rotate: false - xy: 952, 726 + xy: 980, 529 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 0 inventory-overlay rotate: false - xy: 2, 600 + xy: 2, 606 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 open-inventory rotate: false - xy: 956, 668 + xy: 979, 471 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 1 open-inventory rotate: false - xy: 888, 158 + xy: 979, 413 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 2 -open-inventory - rotate: false - xy: 979, 154 - size: 42, 56 - orig: 42, 56 - offset: 0, 0 - index: 3 -open-inventory - rotate: false - xy: 888, 100 - size: 42, 56 - orig: 42, 56 - offset: 0, 0 - index: 4 -open-inventory - rotate: false - xy: 979, 96 - size: 42, 56 - orig: 42, 56 - offset: 0, 0 - index: 5 safe-song/safe-song rotate: false - xy: 636, 397 + xy: 552, 365 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 0 safe-song/safe-song rotate: false - xy: 636, 360 + xy: 654, 365 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 1 safe-song/safe-song rotate: false - xy: 528, 359 + xy: 756, 365 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 2 safe-song/safe-song rotate: false - xy: 528, 322 + xy: 552, 328 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 3 safe-song/safe-song rotate: false - xy: 528, 285 + xy: 654, 328 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 4 safe-song/safe-song rotate: false - xy: 630, 323 + xy: 756, 328 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 5 safe-song/safe-song rotate: false - xy: 630, 286 + xy: 254, 199 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 6 safe-song/safe-song rotate: false - xy: 528, 248 + xy: 229, 162 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 7 safe-song/safe-song rotate: false - xy: 630, 249 + xy: 530, 291 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 8 safe-song/safe-song rotate: false - xy: 630, 212 + xy: 632, 291 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 9 safe-song/safe-song rotate: false - xy: 310, 243 + xy: 734, 291 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 10 safe-song/safe-song rotate: false - xy: 310, 206 + xy: 530, 254 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 11 safe-song/safe-song rotate: false - xy: 276, 169 + xy: 632, 254 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 12 safe-song/safe-song rotate: false - xy: 378, 169 + xy: 734, 254 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 13 safe-song/safe-song rotate: false - xy: 528, 211 + xy: 888, 221 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 14 safe-song/safe-song rotate: false - xy: 524, 174 + xy: 888, 184 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 15 safe-song/safe-song rotate: false - xy: 524, 137 + xy: 356, 227 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 16 safe-song/safe-song rotate: false - xy: 504, 100 + xy: 356, 190 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 17 safe-song/safe-song rotate: false - xy: 504, 63 + xy: 510, 217 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 18 safe-song/safe-song rotate: false - xy: 504, 26 + xy: 612, 217 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 19 safe-song/safe-song rotate: false - xy: 630, 175 + xy: 714, 217 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 20 safe-song/safe-song rotate: false - xy: 626, 138 + xy: 510, 180 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 21 safe-song/safe-song rotate: false - xy: 626, 101 + xy: 612, 180 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 22 safe-song/safe-song rotate: false - xy: 606, 64 + xy: 714, 180 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 23 safe-song/safe-song rotate: false - xy: 606, 27 + xy: 331, 153 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 24 safe-song/safe-song rotate: false - xy: 790, 403 + xy: 326, 116 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 25 safe-song/safe-song rotate: false - xy: 790, 366 + xy: 326, 79 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 26 safe-song/safe-song rotate: false - xy: 790, 329 + xy: 326, 42 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 27 safe-song/safe-song rotate: false - xy: 790, 292 + xy: 326, 5 size: 100, 35 orig: 100, 35 offset: 0, 0 index: 28 safe/inputed-key rotate: false - xy: 348, 369 + xy: 1013, 125 size: 9, 11 orig: 9, 11 offset: 0, 0 index: -1 safe/safe-screen rotate: false - xy: 2, 203 + xy: 2, 209 size: 250, 100 orig: 250, 100 offset: 0, 0 index: -1 save rotate: false - xy: 574, 856 + xy: 574, 862 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 test/abc rotate: false - xy: 664, 954 + xy: 664, 960 size: 320, 62 orig: 320, 62 offset: 0, 0 index: -1 white rotate: false - xy: 782, 446 + xy: 909, 897 size: 32, 24 orig: 32, 24 offset: 0, 0 index: -1 wizard/Untitled rotate: false - xy: 484, 480 + xy: 484, 486 size: 80, 50 orig: 80, 50 offset: 0, 0 index: -1 wizard/cloud rotate: false - xy: 868, 820 + xy: 868, 826 size: 40, 30 orig: 40, 30 offset: 0, 0 index: -1 wizard/disappear rotate: false - xy: 2, 432 + xy: 2, 438 size: 380, 46 orig: 380, 46 offset: 0, 0 index: -1 wizard/experiment rotate: false - xy: 229, 146 + xy: 505, 357 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 0 wizard/experiment rotate: false - xy: 942, 784 + xy: 929, 659 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 1 wizard/experiment rotate: false - xy: 956, 611 + xy: 933, 530 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 2 wizard/experiment rotate: false - xy: 946, 554 + xy: 942, 794 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 3 wizard/experiment rotate: false - xy: 946, 497 + xy: 480, 9 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 4 wizard/experiment rotate: false - xy: 914, 440 + xy: 940, 89 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 5 wizard/experiment rotate: false - xy: 961, 440 + xy: 940, 32 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 6 wizard/experiment rotate: false - xy: 944, 383 + xy: 976, 659 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 7 wizard/experiment rotate: false - xy: 944, 326 + xy: 527, 9 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 8 wizard/experiment rotate: false - xy: 944, 269 + xy: 574, 13 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 9 wizard/experiment rotate: false - xy: 944, 212 + xy: 621, 13 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 10 -wizard/experiment - rotate: false - xy: 932, 155 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 11 -wizard/experiment - rotate: false - xy: 932, 98 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 12 -wizard/experiment - rotate: false - xy: 780, 87 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 13 -wizard/experiment - rotate: false - xy: 827, 87 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 14 -wizard/experiment - rotate: false - xy: 760, 30 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 15 -wizard/experiment - rotate: false - xy: 807, 30 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 16 -wizard/experiment - rotate: false - xy: 854, 30 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 17 -wizard/experiment - rotate: false - xy: 901, 41 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 18 -wizard/experiment - rotate: false - xy: 948, 39 - size: 45, 55 - orig: 45, 55 - offset: 0, 0 - index: 19 wizard/flame rotate: false - xy: 782, 434 + xy: 503, 180 size: 5, 10 orig: 5, 10 offset: 0, 0 index: -1 wizard/magic-hands rotate: false - xy: 904, 506 + xy: 981, 742 size: 40, 50 orig: 40, 50 offset: 0, 0 index: -1 wizard/stand rotate: false - xy: 531, 746 + xy: 531, 752 size: 20, 46 orig: 20, 46 offset: 0, 0 index: -1 wizard/wizard rotate: false - xy: 531, 746 + xy: 531, 752 size: 20, 46 orig: 20, 46 offset: 0, 0 index: -1 wizard/talk rotate: false - xy: 822, 478 + xy: 244, 10 size: 80, 46 orig: 80, 46 offset: 0, 0 index: -1 wizard/talk-angry rotate: false - xy: 812, 526 + xy: 244, 58 size: 80, 50 orig: 80, 50 offset: 0, 0 @@ -1200,191 +1144,275 @@ size: 1024,128 format: RGBA4444 filter: Nearest,Nearest repeat: none -ego/flying +ego/warden rotate: false - xy: 692, 71 - size: 34, 44 - orig: 34, 44 + xy: 704, 17 + size: 42, 41 + orig: 42, 41 offset: 0, 0 index: -1 open-inventory rotate: false - xy: 425, 2 + xy: 660, 60 + size: 42, 56 + orig: 42, 56 + offset: 0, 0 + index: 3 +open-inventory + rotate: false + xy: 704, 60 + size: 42, 56 + orig: 42, 56 + offset: 0, 0 + index: 4 +open-inventory + rotate: false + xy: 748, 60 + size: 42, 56 + orig: 42, 56 + offset: 0, 0 + index: 5 +open-inventory + rotate: false + xy: 792, 60 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 6 open-inventory rotate: false - xy: 472, 59 + xy: 836, 60 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 7 open-inventory rotate: false - xy: 472, 59 + xy: 836, 60 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 9 open-inventory rotate: false - xy: 516, 59 + xy: 880, 60 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 8 open-inventory rotate: false - xy: 560, 59 + xy: 924, 60 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 10 open-inventory rotate: false - xy: 604, 59 + xy: 968, 60 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 11 open-inventory rotate: false - xy: 648, 59 + xy: 660, 2 size: 42, 56 orig: 42, 56 offset: 0, 0 index: 12 wizard/experiment rotate: false - xy: 2, 60 + xy: 2, 61 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 11 +wizard/experiment + rotate: false + xy: 2, 4 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 12 +wizard/experiment + rotate: false + xy: 49, 61 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 13 +wizard/experiment + rotate: false + xy: 49, 4 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 14 +wizard/experiment + rotate: false + xy: 96, 61 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 15 +wizard/experiment + rotate: false + xy: 96, 4 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 16 +wizard/experiment + rotate: false + xy: 143, 61 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 17 +wizard/experiment + rotate: false + xy: 143, 4 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 18 +wizard/experiment + rotate: false + xy: 190, 61 + size: 45, 55 + orig: 45, 55 + offset: 0, 0 + index: 19 +wizard/experiment + rotate: false + xy: 190, 4 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 20 wizard/experiment rotate: false - xy: 2, 3 + xy: 237, 61 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 21 wizard/experiment rotate: false - xy: 49, 60 + xy: 237, 4 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 22 wizard/experiment rotate: false - xy: 49, 3 + xy: 284, 61 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 23 wizard/experiment rotate: false - xy: 96, 60 + xy: 284, 4 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 24 wizard/experiment rotate: false - xy: 96, 3 + xy: 331, 61 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 25 wizard/experiment rotate: false - xy: 143, 60 + xy: 331, 4 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 26 wizard/experiment rotate: false - xy: 143, 3 + xy: 378, 61 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 27 wizard/experiment rotate: false - xy: 190, 60 + xy: 378, 4 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 28 wizard/experiment rotate: false - xy: 190, 3 + xy: 425, 61 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 29 wizard/experiment rotate: false - xy: 237, 60 + xy: 425, 4 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 30 wizard/experiment rotate: false - xy: 237, 3 + xy: 472, 61 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 31 wizard/experiment rotate: false - xy: 284, 60 + xy: 472, 4 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 32 wizard/experiment rotate: false - xy: 284, 3 + xy: 519, 61 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 33 wizard/experiment rotate: false - xy: 331, 60 + xy: 519, 4 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 34 wizard/experiment rotate: false - xy: 331, 3 + xy: 566, 61 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 35 wizard/experiment rotate: false - xy: 378, 60 + xy: 566, 4 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 36 wizard/experiment rotate: false - xy: 378, 3 + xy: 613, 61 size: 45, 55 orig: 45, 55 offset: 0, 0 index: 37 wizard/experiment rotate: false - xy: 425, 60 + xy: 613, 4 size: 45, 55 orig: 45, 55 offset: 0, 0 diff --git a/desktop/resources/packed/global.png b/desktop/resources/packed/global.png index 1d853b61..5af3b604 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 index bed8588f..66a4dee1 100644 Binary files a/desktop/resources/packed/global2.png and b/desktop/resources/packed/global2.png differ diff --git a/desktop/resources/packed/tongue-fight.atlas b/desktop/resources/packed/tongue-fight.atlas index d1d3a06a..32fbcf46 100644 --- a/desktop/resources/packed/tongue-fight.atlas +++ b/desktop/resources/packed/tongue-fight.atlas @@ -13,56 +13,56 @@ background index: -1 hair-0 rotate: false - xy: 735, 366 + xy: 687, 72 size: 7, 8 orig: 7, 8 offset: 0, 0 index: 0 hair-0 rotate: false - xy: 839, 404 + xy: 114, 113 size: 7, 8 orig: 7, 8 offset: 0, 0 index: 1 hair-0 rotate: false - xy: 853, 434 + xy: 53, 45 size: 7, 8 orig: 7, 8 offset: 0, 0 index: 2 hair-0 rotate: false - xy: 888, 472 + xy: 791, 96 size: 7, 8 orig: 7, 8 offset: 0, 0 index: 3 hair-0 rotate: false - xy: 902, 502 + xy: 831, 140 size: 7, 8 orig: 7, 8 offset: 0, 0 index: 4 hair-1 rotate: false - xy: 276, 226 + xy: 2, 11 size: 23, 16 orig: 23, 16 offset: 0, 0 index: 0 hair-1 rotate: false - xy: 2, 11 + xy: 28, 37 size: 23, 16 orig: 23, 16 offset: 0, 0 index: 1 hair-1 rotate: false - xy: 51, 79 + xy: 791, 106 size: 23, 16 orig: 23, 16 offset: 0, 0 @@ -76,98 +76,98 @@ hair-2 index: 0 hair-2 rotate: false - xy: 324, 297 + xy: 791, 150 size: 47, 66 orig: 47, 66 offset: 0, 0 index: 1 hair-2 rotate: false - xy: 839, 444 + xy: 51, 55 size: 47, 66 orig: 47, 66 offset: 0, 0 index: 2 hair-3 rotate: false - xy: 276, 216 + xy: 1009, 452 size: 7, 8 orig: 7, 8 offset: 0, 0 index: 0 hair-3 rotate: false - xy: 51, 69 + xy: 840, 166 size: 7, 8 orig: 7, 8 offset: 0, 0 index: 1 hair-3 rotate: false - xy: 42, 45 + xy: 854, 196 size: 7, 8 orig: 7, 8 offset: 0, 0 index: 2 hair-4 rotate: false - xy: 373, 335 + xy: 1009, 482 size: 12, 28 orig: 12, 28 offset: 0, 0 index: 0 hair-4 rotate: false - xy: 839, 414 + xy: 840, 188 size: 12, 28 orig: 12, 28 offset: 0, 0 index: 1 hair-4 rotate: false - xy: 888, 482 + xy: 100, 93 size: 12, 28 orig: 12, 28 offset: 0, 0 index: 2 hair-5 rotate: false - xy: 350, 285 + xy: 840, 176 size: 8, 10 orig: 8, 10 offset: 0, 0 index: 0 hair-5 rotate: false - xy: 373, 323 + xy: 854, 206 size: 8, 10 orig: 8, 10 offset: 0, 0 index: 1 hair-5 rotate: false - xy: 387, 353 + xy: 100, 81 size: 8, 10 orig: 8, 10 offset: 0, 0 index: 2 hair-6 rotate: false - xy: 350, 277 + xy: 1018, 454 size: 4, 6 orig: 4, 6 offset: 0, 0 index: 0 hair-6 rotate: false - xy: 360, 289 + xy: 1018, 446 size: 4, 6 orig: 4, 6 offset: 0, 0 index: 1 hair-6 rotate: false - xy: 373, 315 + xy: 28, 29 size: 4, 6 orig: 4, 6 offset: 0, 0 @@ -202,14 +202,14 @@ hair-8 index: 0 hair-8 rotate: false - xy: 324, 263 + xy: 316, 254 size: 6, 6 orig: 6, 6 offset: 0, 0 index: 1 hair-8 rotate: false - xy: 91, 115 + xy: 316, 246 size: 6, 6 orig: 6, 6 offset: 0, 0 @@ -223,14 +223,14 @@ hair-9 index: 0 hair-9 rotate: false - xy: 28, 35 + xy: 817, 130 size: 12, 18 orig: 12, 18 offset: 0, 0 index: 1 hair-9 rotate: false - xy: 77, 103 + xy: 1009, 462 size: 12, 18 orig: 12, 18 offset: 0, 0 @@ -244,67 +244,137 @@ heart index: 0 heart rotate: false - xy: 2, 29 + xy: 276, 218 size: 24, 24 orig: 24, 24 offset: 0, 0 index: 1 heart rotate: false - xy: 51, 97 + xy: 2, 29 size: 24, 24 orig: 24, 24 offset: 0, 0 index: 2 heart rotate: false - xy: 324, 271 + xy: 791, 124 size: 24, 24 orig: 24, 24 offset: 0, 0 index: 3 tongue-attack rotate: false - xy: 2, 123 + xy: 461, 218 size: 135, 145 orig: 135, 145 offset: 0, 0 index: 0 tongue-attack + rotate: false + xy: 598, 218 + size: 135, 145 + orig: 135, 145 + offset: 0, 0 + index: 1 +tongue-attack + rotate: false + xy: 735, 218 + size: 135, 145 + orig: 135, 145 + offset: 0, 0 + index: 2 +tongue-attack-hit + rotate: false + xy: 2, 123 + size: 135, 145 + orig: 135, 145 + offset: 0, 0 + index: 0 +tongue-attack-hit rotate: false xy: 324, 365 size: 135, 145 orig: 135, 145 offset: 0, 0 index: 1 -tongue-attack +tongue-attack-hit rotate: false xy: 139, 123 size: 135, 145 orig: 135, 145 offset: 0, 0 index: 2 +tongue-attack-hit + rotate: false + xy: 461, 365 + size: 135, 145 + orig: 135, 145 + offset: 0, 0 + index: 3 +tongue-attack-hit + rotate: false + xy: 598, 365 + size: 135, 145 + orig: 135, 145 + offset: 0, 0 + index: 4 +tongue-attack-hit + rotate: false + xy: 735, 365 + size: 135, 145 + orig: 135, 145 + offset: 0, 0 + index: 5 +tongue-attack-hit + rotate: false + xy: 872, 365 + size: 135, 145 + orig: 135, 145 + offset: 0, 0 + index: 6 +tongue-attack-hit + rotate: false + xy: 324, 218 + size: 135, 145 + orig: 135, 145 + offset: 0, 0 + index: 7 tongue-idle rotate: false - xy: 735, 376 + xy: 687, 82 size: 102, 134 orig: 102, 134 offset: 0, 0 index: 0 tongue-windup rotate: false - xy: 461, 365 + xy: 872, 218 size: 135, 145 orig: 135, 145 offset: 0, 0 index: 0 tongue-windup rotate: false - xy: 598, 365 + xy: 276, 71 size: 135, 145 orig: 135, 145 offset: 0, 0 index: 1 +tongue-windup + rotate: false + xy: 413, 71 + size: 135, 145 + orig: 135, 145 + offset: 0, 0 + index: 2 +tongue-windup + rotate: false + xy: 550, 71 + size: 135, 145 + orig: 135, 145 + offset: 0, 0 + index: 3 tongue-fight2.png size: 1024,256 diff --git a/desktop/resources/packed/tongue-fight.png b/desktop/resources/packed/tongue-fight.png index 5d6b042b..9a2ca3cc 100644 Binary files a/desktop/resources/packed/tongue-fight.png and b/desktop/resources/packed/tongue-fight.png differ diff --git a/desktop/src-common/advent/screens/rooms/tongue_fight.clj b/desktop/src-common/advent/screens/rooms/tongue_fight.clj index f05946a7..fc828ea9 100644 --- a/desktop/src-common/advent/screens/rooms/tongue_fight.clj +++ b/desktop/src-common/advent/screens/rooms/tongue_fight.clj @@ -17,6 +17,7 @@ [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) @@ -84,6 +85,7 @@ tongue-finished?) (-> entities (update-in [:room :entities :tongue] #(actions/start-animation screen % :idle)) + (update-in [:room :entities :ego] #(actions/start-animation screen % :tongue-idle)) (update-in [:room :entities :tongue] assoc :state :idle :started (:total-time screen)) (update-in [:room :entities :heart] #(actions/start-animation screen % :idle))) @@ -94,11 +96,13 @@ ego-finished?)) (-> 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 :tongue] #(if is-player-wound? + (actions/start-animation screen % :attack-hit) + (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) - %)) + (actions/start-animation screen % :tongue-hit))) (show-heart screen is-player-wound?)) (and (= state :idle) @@ -140,8 +144,9 @@ heart (utils/make-anim-seq atlas "heart" [24 24] 0.08 [3]) beat (utils/make-anim-seq atlas "heart" [24 24] 0.08 [0 1 0 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3 3]) 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-windup" [135 145] 0.16 [0 1 0 1 0 1 0 ]) - tongue-attack (utils/make-anim-seq atlas "tongue-attack" [135 145] 0.08 [0 1 2 2 2 2 2 2 2 2 2 2])] + tongue-windup (utils/make-anim-seq atlas "tongue-windup" [135 145] 0.16 [0 1 2 3 2 1 2 3 2 1 0 ]) + tongue-attack (utils/make-anim-seq atlas "tongue-attack" [135 145] 0.08 [0 1 2 2 2 2 2 2 2 2 2 2]) + tongue-attack-hit (utils/make-anim-seq atlas "tongue-attack-hit" [135 145] 0.1 (range 7))] (rooms/make :name "Tongue Fight" @@ -244,21 +249,22 @@ :beat beat :anim-start 0) :tongue (assoc (animation->texture screen tongue-idle) - :x 186 - :y 65 + :x 211 + :y 40 :origin-x 23 :origin-y 10 :width 135 :height 145 - :baseline 2 + :baseline 4 :anim tongue-idle :windup tongue-windup :idle tongue-idle :attack tongue-attack + :attack-hit tongue-attack-hit :anim-merges {tongue-idle {:origin-x 23 :origin-y 10} tongue-windup {:origin-x 23 :origin-y 10} tongue-attack {:origin-x 119 :origin-y 10} - } + tongue-attack-hit {:origin-x 100 :origin-y 10}} :anim-start 0 :state :idle :script (actions/get-script @@ -272,6 +278,7 @@ (-> 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 :baseline] 3) (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 53dbdb5b..4f3bd2f0 100644 --- a/desktop/src-common/advent/screens/scene.clj +++ b/desktop/src-common/advent/screens/scene.clj @@ -519,8 +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-windup (utils/make-anim-seq global-atlas "ego/tongue-stance" [119 134] 0.05 [0 1 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 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-hit (utils/make-anim-seq global-atlas "ego/tongue-hit" [119 134] 0.12 [0 1 2 2 2 2 3]) 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]) @@ -561,6 +562,7 @@ :reach-start reach-start :jump jump :tongue-swing tongue-swing + :tongue-hit tongue-hit :tongue-windup tongue-windup :tongue-idle tongue-idle :jump-straight jump-straight @@ -623,6 +625,7 @@ :reach-start (utils/flip reach-start) :jump-straight (utils/flip jump-straight) :tongue-swing tongue-swing + :tongue-hit tongue-hit :tongue-windup tongue-windup :tongue-idle tongue-idle :jumping-straight (utils/flip jumping-straight) @@ -750,6 +753,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-hit]) {: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}