diff --git a/desktop/asset-work/tongue-fight/tongue-attack_0.ase b/desktop/asset-work/tongue-fight/tongue-attack_0.ase index 89e5346c..96d4153f 100644 Binary files a/desktop/asset-work/tongue-fight/tongue-attack_0.ase and b/desktop/asset-work/tongue-fight/tongue-attack_0.ase differ diff --git a/desktop/asset-work/tongue-fight/tongue-attack_0.png b/desktop/asset-work/tongue-fight/tongue-attack_0.png index 794d32de..ceb624e7 100644 Binary files a/desktop/asset-work/tongue-fight/tongue-attack_0.png and b/desktop/asset-work/tongue-fight/tongue-attack_0.png differ diff --git a/desktop/asset-work/tongue-fight/tongue-attack_1.png b/desktop/asset-work/tongue-fight/tongue-attack_1.png index e81c5e79..7c8ab0e2 100644 Binary files a/desktop/asset-work/tongue-fight/tongue-attack_1.png and b/desktop/asset-work/tongue-fight/tongue-attack_1.png differ diff --git a/desktop/asset-work/tongue-fight/tongue-attack_2.png b/desktop/asset-work/tongue-fight/tongue-attack_2.png index d39e4586..52c4afef 100644 Binary files a/desktop/asset-work/tongue-fight/tongue-attack_2.png and b/desktop/asset-work/tongue-fight/tongue-attack_2.png differ diff --git a/desktop/asset-work/tongue-fight/tongue-attack_3.png b/desktop/asset-work/tongue-fight/tongue-attack_3.png new file mode 100644 index 00000000..e44ea0d0 Binary files /dev/null and b/desktop/asset-work/tongue-fight/tongue-attack_3.png differ diff --git a/desktop/asset-work/tongue-fight/tongue-attack_4.png b/desktop/asset-work/tongue-fight/tongue-attack_4.png new file mode 100644 index 00000000..c7c7b8d0 Binary files /dev/null and b/desktop/asset-work/tongue-fight/tongue-attack_4.png differ diff --git a/desktop/asset-work/tongue-fight/tongue-attack_5.png b/desktop/asset-work/tongue-fight/tongue-attack_5.png new file mode 100644 index 00000000..69e2f148 Binary files /dev/null and b/desktop/asset-work/tongue-fight/tongue-attack_5.png differ diff --git a/desktop/asset-work/tongue-fight/tongue-attack_6.png b/desktop/asset-work/tongue-fight/tongue-attack_6.png new file mode 100644 index 00000000..a1ae6df7 Binary files /dev/null and b/desktop/asset-work/tongue-fight/tongue-attack_6.png differ diff --git a/desktop/resources/packed/tongue-fight.atlas b/desktop/resources/packed/tongue-fight.atlas index 32fbcf46..647e4984 100644 --- a/desktop/resources/packed/tongue-fight.atlas +++ b/desktop/resources/packed/tongue-fight.atlas @@ -1,376 +1,404 @@ tongue-fight.png -size: 1024,512 +size: 1024,1024 format: RGBA8888 filter: Nearest,Nearest repeat: none background rotate: false - xy: 2, 270 + xy: 2, 781 size: 320, 240 orig: 320, 240 offset: 0, 0 index: -1 hair-0 rotate: false - xy: 687, 72 + xy: 872, 730 size: 7, 8 orig: 7, 8 offset: 0, 0 index: 0 hair-0 rotate: false - xy: 114, 113 + xy: 339, 651 size: 7, 8 orig: 7, 8 offset: 0, 0 index: 1 hair-0 rotate: false - xy: 53, 45 + xy: 374, 701 size: 7, 8 orig: 7, 8 offset: 0, 0 index: 2 hair-0 rotate: false - xy: 791, 96 + xy: 399, 719 size: 7, 8 orig: 7, 8 offset: 0, 0 index: 3 hair-0 rotate: false - xy: 831, 140 + xy: 53, 36 size: 7, 8 orig: 7, 8 offset: 0, 0 index: 4 hair-1 rotate: false - xy: 2, 11 + xy: 374, 711 size: 23, 16 orig: 23, 16 offset: 0, 0 index: 0 hair-1 - rotate: false - xy: 28, 37 - size: 23, 16 - orig: 23, 16 - offset: 0, 0 - index: 1 -hair-1 - rotate: false - xy: 791, 106 - size: 23, 16 - orig: 23, 16 - offset: 0, 0 - index: 2 -hair-2 - rotate: false - xy: 2, 55 - size: 47, 66 - orig: 47, 66 - offset: 0, 0 - index: 0 -hair-2 - rotate: false - xy: 791, 150 - size: 47, 66 - orig: 47, 66 - offset: 0, 0 - index: 1 -hair-2 - rotate: false - xy: 51, 55 - size: 47, 66 - orig: 47, 66 - offset: 0, 0 - index: 2 -hair-3 - rotate: false - xy: 1009, 452 - size: 7, 8 - orig: 7, 8 - offset: 0, 0 - index: 0 -hair-3 - rotate: false - xy: 840, 166 - size: 7, 8 - orig: 7, 8 - offset: 0, 0 - index: 1 -hair-3 - rotate: false - xy: 854, 196 - size: 7, 8 - orig: 7, 8 - offset: 0, 0 - index: 2 -hair-4 - rotate: false - xy: 1009, 482 - size: 12, 28 - orig: 12, 28 - offset: 0, 0 - index: 0 -hair-4 - rotate: false - xy: 840, 188 - size: 12, 28 - orig: 12, 28 - offset: 0, 0 - index: 1 -hair-4 - rotate: false - xy: 100, 93 - size: 12, 28 - orig: 12, 28 - offset: 0, 0 - index: 2 -hair-5 - rotate: false - xy: 840, 176 - size: 8, 10 - orig: 8, 10 - offset: 0, 0 - index: 0 -hair-5 - rotate: false - xy: 854, 206 - size: 8, 10 - orig: 8, 10 - offset: 0, 0 - index: 1 -hair-5 - rotate: false - xy: 100, 81 - size: 8, 10 - orig: 8, 10 - offset: 0, 0 - index: 2 -hair-6 - rotate: false - xy: 1018, 454 - size: 4, 6 - orig: 4, 6 - offset: 0, 0 - index: 0 -hair-6 - rotate: false - xy: 1018, 446 - size: 4, 6 - orig: 4, 6 - offset: 0, 0 - index: 1 -hair-6 - rotate: false - xy: 28, 29 - size: 4, 6 - orig: 4, 6 - offset: 0, 0 - index: 2 -hair-7 rotate: false xy: 2, 2 + size: 23, 16 + orig: 23, 16 + offset: 0, 0 + index: 1 +hair-1 + rotate: false + xy: 28, 28 + size: 23, 16 + orig: 23, 16 + offset: 0, 0 + index: 2 +hair-2 + rotate: false + xy: 276, 661 + size: 47, 66 + orig: 47, 66 + offset: 0, 0 + index: 0 +hair-2 + rotate: false + xy: 276, 593 + size: 47, 66 + orig: 47, 66 + offset: 0, 0 + index: 1 +hair-2 + rotate: false + xy: 325, 661 + size: 47, 66 + orig: 47, 66 + offset: 0, 0 + index: 2 +hair-3 + rotate: false + xy: 976, 820 + size: 7, 8 + orig: 7, 8 + offset: 0, 0 + index: 0 +hair-3 + rotate: false + xy: 990, 840 + size: 7, 8 + orig: 7, 8 + offset: 0, 0 + index: 1 +hair-3 + rotate: false + xy: 1009, 963 + size: 7, 8 + orig: 7, 8 + offset: 0, 0 + index: 2 +hair-4 + rotate: false + xy: 1009, 993 + size: 12, 28 + orig: 12, 28 + offset: 0, 0 + index: 0 +hair-4 + rotate: false + xy: 276, 563 + size: 12, 28 + orig: 12, 28 + offset: 0, 0 + index: 1 +hair-4 + rotate: false + xy: 325, 631 + size: 12, 28 + orig: 12, 28 + offset: 0, 0 + index: 2 +hair-5 + rotate: false + xy: 276, 551 + size: 8, 10 + orig: 8, 10 + offset: 0, 0 + index: 0 +hair-5 + rotate: false + xy: 290, 581 + size: 8, 10 + orig: 8, 10 + offset: 0, 0 + index: 1 +hair-5 + rotate: false + xy: 325, 619 + size: 8, 10 + orig: 8, 10 + offset: 0, 0 + index: 2 +hair-6 + rotate: false + xy: 1018, 965 + size: 4, 6 + orig: 4, 6 + offset: 0, 0 + index: 0 +hair-6 + rotate: false + xy: 1018, 957 + size: 4, 6 + orig: 4, 6 + offset: 0, 0 + index: 1 +hair-6 + rotate: false + xy: 28, 20 + size: 4, 6 + orig: 4, 6 + offset: 0, 0 + index: 2 +hair-7 + rotate: false + xy: 1002, 867 size: 5, 7 orig: 5, 7 offset: 0, 0 index: 0 hair-7 rotate: false - xy: 9, 2 + xy: 276, 542 size: 5, 7 orig: 5, 7 offset: 0, 0 index: 1 hair-7 rotate: false - xy: 16, 2 + xy: 290, 572 size: 5, 7 orig: 5, 7 offset: 0, 0 index: 2 hair-8 rotate: false - xy: 316, 262 + xy: 316, 773 size: 6, 6 orig: 6, 6 offset: 0, 0 index: 0 hair-8 rotate: false - xy: 316, 254 + xy: 316, 765 size: 6, 6 orig: 6, 6 offset: 0, 0 index: 1 hair-8 rotate: false - xy: 316, 246 + xy: 316, 757 size: 6, 6 orig: 6, 6 offset: 0, 0 index: 2 hair-9 rotate: false - xy: 302, 250 + xy: 976, 830 size: 12, 18 orig: 12, 18 offset: 0, 0 index: 0 hair-9 rotate: false - xy: 817, 130 + xy: 302, 761 size: 12, 18 orig: 12, 18 offset: 0, 0 index: 1 hair-9 rotate: false - xy: 1009, 462 + xy: 1009, 973 size: 12, 18 orig: 12, 18 offset: 0, 0 index: 2 heart rotate: false - xy: 276, 244 + xy: 2, 20 size: 24, 24 orig: 24, 24 offset: 0, 0 index: 0 heart rotate: false - xy: 276, 218 + xy: 976, 850 size: 24, 24 orig: 24, 24 offset: 0, 0 index: 1 heart rotate: false - xy: 2, 29 + xy: 276, 755 size: 24, 24 orig: 24, 24 offset: 0, 0 index: 2 heart rotate: false - xy: 791, 124 + xy: 276, 729 size: 24, 24 orig: 24, 24 offset: 0, 0 index: 3 tongue-attack rotate: false - xy: 461, 218 + xy: 2, 193 size: 135, 145 orig: 135, 145 offset: 0, 0 index: 0 tongue-attack rotate: false - xy: 598, 218 + xy: 139, 340 size: 135, 145 orig: 135, 145 offset: 0, 0 index: 1 tongue-attack rotate: false - xy: 735, 218 + xy: 735, 876 size: 135, 145 orig: 135, 145 offset: 0, 0 index: 2 -tongue-attack-hit +tongue-attack 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-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 + xy: 2, 46 size: 135, 145 orig: 135, 145 offset: 0, 0 index: 3 -tongue-attack-hit +tongue-attack rotate: false - xy: 598, 365 + xy: 139, 193 size: 135, 145 orig: 135, 145 offset: 0, 0 index: 4 -tongue-attack-hit +tongue-attack rotate: false - xy: 735, 365 + xy: 872, 876 size: 135, 145 orig: 135, 145 offset: 0, 0 index: 5 -tongue-attack-hit +tongue-attack rotate: false - xy: 872, 365 + xy: 139, 46 size: 135, 145 orig: 135, 145 offset: 0, 0 index: 6 tongue-attack-hit rotate: false - xy: 324, 218 + xy: 2, 634 + size: 135, 145 + orig: 135, 145 + offset: 0, 0 + index: 0 +tongue-attack-hit + rotate: false + xy: 324, 876 + size: 135, 145 + orig: 135, 145 + offset: 0, 0 + index: 1 +tongue-attack-hit + rotate: false + xy: 2, 487 + size: 135, 145 + orig: 135, 145 + offset: 0, 0 + index: 2 +tongue-attack-hit + rotate: false + xy: 139, 634 + size: 135, 145 + orig: 135, 145 + offset: 0, 0 + index: 3 +tongue-attack-hit + rotate: false + xy: 461, 876 + size: 135, 145 + orig: 135, 145 + offset: 0, 0 + index: 4 +tongue-attack-hit + rotate: false + xy: 2, 340 + size: 135, 145 + orig: 135, 145 + offset: 0, 0 + index: 5 +tongue-attack-hit + rotate: false + xy: 139, 487 + size: 135, 145 + orig: 135, 145 + offset: 0, 0 + index: 6 +tongue-attack-hit + rotate: false + xy: 598, 876 size: 135, 145 orig: 135, 145 offset: 0, 0 index: 7 tongue-idle rotate: false - xy: 687, 82 + xy: 872, 740 size: 102, 134 orig: 102, 134 offset: 0, 0 index: 0 tongue-windup rotate: false - xy: 872, 218 + xy: 324, 729 size: 135, 145 orig: 135, 145 offset: 0, 0 index: 0 tongue-windup rotate: false - xy: 276, 71 + xy: 461, 729 size: 135, 145 orig: 135, 145 offset: 0, 0 index: 1 tongue-windup rotate: false - xy: 413, 71 + xy: 598, 729 size: 135, 145 orig: 135, 145 offset: 0, 0 index: 2 tongue-windup rotate: false - xy: 550, 71 + xy: 735, 729 size: 135, 145 orig: 135, 145 offset: 0, 0 diff --git a/desktop/resources/packed/tongue-fight.png b/desktop/resources/packed/tongue-fight.png index 9a2ca3cc..6e3a5cfe 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 9e477a9e..66c89588 100644 --- a/desktop/src-common/advent/screens/rooms/tongue_fight.clj +++ b/desktop/src-common/advent/screens/rooms/tongue_fight.clj @@ -141,7 +141,7 @@ 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 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 (utils/make-anim-seq atlas "tongue-attack" [135 145] 0.12 [ 3 4 5 6]) tongue-attack-hit (utils/make-anim-seq atlas "tongue-attack-hit" [135 145] 0.1 (range 7))] @@ -259,7 +259,7 @@ :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 {:origin-x 90 :origin-y 10} tongue-attack-hit {:origin-x 100 :origin-y 10}} :anim-start 0 :state :idle