From a83626fbbda567a240d4efa991a73c393e761b42 Mon Sep 17 00:00:00 2001 From: MysticKoko <132279944+MysticKoko@users.noreply.github.com> Date: Sat, 2 Nov 2024 23:54:11 +0200 Subject: [PATCH] Yeti Crab visual update --- .../animations/yeti_crab.animation.json | 290 ++---------------- .../crustacean/yeti_crab/yeti_crab.geo.json | 67 ++-- .../entity/crustacean/yeti_crab/yeti_crab.png | Bin 350 -> 319 bytes 3 files changed, 62 insertions(+), 295 deletions(-) diff --git a/src/main/resources/assets/hybrid-aquatic/animations/yeti_crab.animation.json b/src/main/resources/assets/hybrid-aquatic/animations/yeti_crab.animation.json index 3e486500d..465d05679 100644 --- a/src/main/resources/assets/hybrid-aquatic/animations/yeti_crab.animation.json +++ b/src/main/resources/assets/hybrid-aquatic/animations/yeti_crab.animation.json @@ -1,284 +1,54 @@ { "format_version": "1.8.0", "animations": { + "idle": { + "loop": true, + "animation_length": 8, + "bones": { + "left_claw": { + "rotation": ["Math.sin(query.anim_time * 45)*10", 0, 0] + }, + "right_claw": { + "rotation": ["Math.sin(query.anim_time * 45)*10", 0, 0] + } + } + }, "walk": { "loop": true, "animation_length": 2, "bones": { "body": { - "rotation": { - "0.0": { - "vector": [0, 0, 2.5] - }, - "0.25": { - "vector": [2.5, 0, 0] - }, - "0.5": { - "vector": [0, 0, -2.5] - }, - "0.75": { - "vector": [-2.5, 0, 0] - }, - "1.0": { - "vector": [0, 0, 2.5] - }, - "1.25": { - "vector": [2.5, 0, 0] - }, - "1.5": { - "vector": [0, 0, -2.5] - }, - "1.75": { - "vector": [-2.5, 0, 0] - }, - "2.0": { - "vector": [0, 0, 2.5] - } - } + "rotation": ["Math.cos(query.anim_time * 180)*2.5", 0, 0] }, "left_leg_1": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [-22.5, 22.5, -22.5] - }, - "0.5": { - "vector": [0, 22.5, 0] - }, - "0.75": { - "vector": [0, 0, 0] - }, - "1.0": { - "vector": [0, 0, 0] - }, - "1.25": { - "vector": [-22.5, 22.5, -22.5] - }, - "1.5": { - "vector": [0, 22.5, 0] - }, - "1.75": { - "vector": [0, 0, 0] - }, - "2.0": { - "vector": [0, 0, 0] - } - } - }, - "left_leg_2": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [0, 0, 0] - }, - "0.5": { - "vector": [-22.5, 22.5, -22.5] - }, - "0.75": { - "vector": [0, 22.5, 0] - }, - "1.0": { - "vector": [0, 0, 0] - }, - "1.25": { - "vector": [0, 0, 0] - }, - "1.5": { - "vector": [-22.5, 22.5, -22.5] - }, - "1.75": { - "vector": [0, 22.5, 0] - }, - "2.0": { - "vector": [0, 0, 0] - } - } - }, - "left_leg_3": { - "rotation": { - "0.0": { - "vector": [0, 22.5, 0] - }, - "0.25": { - "vector": [0, 0, 0] - }, - "0.5": { - "vector": [0, 0, 0] - }, - "0.75": { - "vector": [-22.5, 22.5, -22.5] - }, - "1.0": { - "vector": [0, 22.5, 0] - }, - "1.25": { - "vector": [0, 0, 0] - }, - "1.5": { - "vector": [0, 0, 0] - }, - "1.75": { - "vector": [-22.5, 22.5, -22.5] - }, - "2.0": { - "vector": [0, 22.5, 0] - } - } + "rotation": ["Math.sin(query.anim_time * 180)*15", "Math.cos(query.anim_time * 180)*10", "5+Math.sin(query.anim_time * 180)*15"] }, "right_leg_1": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [-22.5, -22.5, 22.5] - }, - "0.5": { - "vector": [0, -22.5, 0] - }, - "0.75": { - "vector": [0, 0, 0] - }, - "1.0": { - "vector": [0, 0, 0] - }, - "1.25": { - "vector": [-22.5, -22.5, 22.5] - }, - "1.5": { - "vector": [0, -22.5, 0] - }, - "1.75": { - "vector": [0, 0, 0] - }, - "2.0": { - "vector": [0, 0, 0] - } - } + "rotation": ["Math.sin(query.anim_time * 180)*15", "Math.cos(query.anim_time * 180)*10", "5+Math.sin(query.anim_time * 180)*15"] + }, + "left_leg_2": { + "rotation": ["Math.cos(query.anim_time * 180)*15", "Math.sin(query.anim_time * 180)*-10", "5+Math.cos(query.anim_time * 180)*15"] }, "right_leg_2": { - "rotation": { - "0.0": { - "vector": [0, 0, 0] - }, - "0.25": { - "vector": [0, 0, 0] - }, - "0.5": { - "vector": [-22.5, -22.5, 22.5] - }, - "0.75": { - "vector": [0, -22.5, 0] - }, - "1.0": { - "vector": [0, 0, 0] - }, - "1.25": { - "vector": [0, 0, 0] - }, - "1.5": { - "vector": [-22.5, -22.5, 22.5] - }, - "1.75": { - "vector": [0, -22.5, 0] - }, - "2.0": { - "vector": [0, 0, 0] - } - } + "rotation": ["Math.cos(query.anim_time * 180)*-15", "Math.sin(query.anim_time * 180)*10", "5+Math.sin(query.anim_time * 180)*-15"] + }, + "left_leg_3": { + "rotation": ["Math.sin(query.anim_time * 180)*15", "Math.cos(query.anim_time * 180)*10", "5+Math.sin(query.anim_time * 180)*15"] }, "right_leg_3": { - "rotation": { - "0.0": { - "vector": [0, -22.5, 0] - }, - "0.25": { - "vector": [0, 0, 0] - }, - "0.5": { - "vector": [0, 0, 0] - }, - "0.75": { - "vector": [-22.5, -22.5, 22.5] - }, - "1.0": { - "vector": [0, -22.5, 0] - }, - "1.25": { - "vector": [0, 0, 0] - }, - "1.5": { - "vector": [0, 0, 0] - }, - "1.75": { - "vector": [-22.5, -22.5, 22.5] - }, - "2.0": { - "vector": [0, -22.5, 0] - } - } + "rotation": ["Math.sin(query.anim_time * 180)*15", "Math.cos(query.anim_time * 180)*10", "5+Math.sin(query.anim_time * 180)*15"] }, - "left_claw": { - "rotation": { - "0.0": { - "vector": [0, 0, 5] - }, - "1.0": { - "vector": [0, 0, 0] - }, - "2.0": { - "vector": [0, 0, 5] - } - } + "left_leg_4": { + "rotation": ["Math.cos(query.anim_time * 180)*15", "Math.sin(query.anim_time * 180)*-10", "5+Math.cos(query.anim_time * 180)*15"] + }, + "right_leg_4": { + "rotation": ["Math.cos(query.anim_time * 180)*-15", "Math.sin(query.anim_time * 180)*10", "5+Math.sin(query.anim_time * 180)*-15"] }, - "right_claw": { - "rotation": { - "0.0": { - "vector": [0, 0, -5] - }, - "1.0": { - "vector": [0, 0, 0] - }, - "2.0": { - "vector": [0, 0, -5] - } - } - } - } - }, - "idle": { - "loop": true, - "animation_length": 3, - "bones": { "left_claw": { - "rotation": { - "0.0": { - "vector": [-5, 0, 0] - }, - "1.5": { - "vector": [0, 0, 0] - }, - "3.0": { - "vector": [-5, 0, 0] - } - } + "rotation": ["Math.sin(query.anim_time * 180)*5", 0, 0] }, "right_claw": { - "rotation": { - "0.0": { - "vector": [-5, 0, 0] - }, - "1.5": { - "vector": [0, 0, 0] - }, - "3.0": { - "vector": [-5, 0, 0] - } - } + "rotation": ["Math.sin(query.anim_time * 180)*5", 0, 0] } } } diff --git a/src/main/resources/assets/hybrid-aquatic/geo/crustacean/yeti_crab/yeti_crab.geo.json b/src/main/resources/assets/hybrid-aquatic/geo/crustacean/yeti_crab/yeti_crab.geo.json index 65df20558..4fe11593a 100644 --- a/src/main/resources/assets/hybrid-aquatic/geo/crustacean/yeti_crab/yeti_crab.geo.json +++ b/src/main/resources/assets/hybrid-aquatic/geo/crustacean/yeti_crab/yeti_crab.geo.json @@ -21,87 +21,84 @@ "pivot": [0, 2, -0.12866], "cubes": [ {"origin": [-1.5, 0.5, -0.58775], "size": [3, 2, 4], "uv": [0, 0]}, - {"origin": [-1, 1.5, -1.58775], "size": [2, 1, 1], "uv": [13, 5]}, - {"origin": [0.5, 1, -4.58775], "size": [0, 2, 4], "pivot": [0.5, 1.5, 0.41225], "rotation": [0, 0, 22.5], "uv": [0, 9]}, - {"origin": [-0.5, 1, -4.58775], "size": [0, 2, 4], "pivot": [-0.5, 1.5, 0.41225], "rotation": [0, 0, -22.5], "uv": [0, 9], "mirror": true}, - {"origin": [0.4, 2, -1.08775], "size": [1, 1, 1], "uv": [0, 0]}, - {"origin": [-1.4, 2, -1.08775], "size": [1, 1, 1], "uv": [0, 0], "mirror": true} + {"origin": [-0.5, 1.5, -1.58775], "size": [1, 1, 1], "uv": [6, 11]}, + {"origin": [-0.5, 1.5, -4.58775], "size": [1, 2, 3], "uv": [10, 6]}, + {"origin": [0.51, 1.75, -0.83775], "size": [0, 1, 1], "uv": [10, 11]}, + {"origin": [-0.51, 1.75, -0.83775], "size": [0, 1, 1], "uv": [10, 11], "mirror": true} ] }, { "name": "left_leg_1", "parent": "body", - "pivot": [1.4311, 1.63808, 0.91225], + "pivot": [1.4311, 0.63808, 0.41225], + "rotation": [0, 0, 22.5], "cubes": [ - {"origin": [1.4311, 0.13808, 0.41225], "size": [2, 2, 1], "uv": [10, 0]} + {"origin": [1.4311, 0.63808, -0.08775], "size": [2, 1, 1], "uv": [0, 11]} ] }, { "name": "right_leg_1", "parent": "body", - "pivot": [-1.4311, 1.63808, 0.91225], + "pivot": [-1.4311, 0.63808, 0.41225], + "rotation": [0, 0, -22.5], "cubes": [ - {"origin": [-3.4311, 0.13808, 0.41225], "size": [2, 2, 1], "uv": [10, 0], "mirror": true} + {"origin": [-3.4311, 0.63808, -0.08775], "size": [2, 1, 1], "uv": [0, 11], "mirror": true} ] }, { "name": "left_leg_2", "parent": "body", - "pivot": [1.4311, 1.63808, 2.06225], - "rotation": [0, -10, 0], + "pivot": [1.4311, 0.63808, 1.41225], + "rotation": [-10, -22.5, 22.5], "cubes": [ - {"origin": [1.4311, 0.13808, 1.56225], "size": [2, 2, 1], "uv": [10, 0]} + {"origin": [1.4311, 0.63808, 0.91225], "size": [2, 1, 1], "uv": [0, 11]} ] }, { "name": "right_leg_2", "parent": "body", - "pivot": [-1.4311, 1.63808, 2.06225], - "rotation": [0, 10, 0], + "pivot": [-1.4311, 0.63808, 1.41225], + "rotation": [-10, 22.5, -22.5], "cubes": [ - {"origin": [-3.4311, 0.13808, 1.56225], "size": [2, 2, 1], "uv": [10, 0], "mirror": true} + {"origin": [-3.4311, 0.63808, 0.91225], "size": [2, 1, 1], "uv": [0, 11], "mirror": true} ] }, { "name": "left_leg_3", "parent": "body", - "pivot": [1.0811, 1.63808, 3.01225], - "rotation": [0, -45, 0], + "pivot": [1.1811, 0.63808, 2.41225], + "rotation": [-20.51374, -44.56641, 27.85202], "cubes": [ - {"origin": [1.0811, 0.13808, 2.51225], "size": [2, 2, 1], "uv": [10, 0]} + {"origin": [1.1811, 0.63808, 1.91225], "size": [2, 1, 1], "uv": [0, 11]} ] }, { "name": "right_leg_3", "parent": "body", - "pivot": [-1.0811, 1.63808, 3.01225], - "rotation": [0, 45, 0], + "pivot": [-1.1811, 0.63808, 2.41225], + "rotation": [-20.51374, 44.56641, -27.85202], "cubes": [ - {"origin": [-3.0811, 0.13808, 2.51225], "size": [2, 2, 1], "uv": [10, 0], "mirror": true} + {"origin": [-3.1811, 0.63808, 1.91225], "size": [2, 1, 1], "uv": [0, 11], "mirror": true} ] }, { - "name": "right_claw", + "name": "left_claw", "parent": "body", - "pivot": [-1.5, 1.25, 0.41225], + "pivot": [1, 1.25, -0.58775], + "rotation": [0, -2.5, 0], "cubes": [ - {"origin": [-2, 0.75, -4.58775], "size": [1, 1, 5], "uv": [7, 7]}, - {"origin": [-2.5, 0.25, -2.83775], "size": [2, 2, 0], "pivot": [-1.5, 1.25, -2.83775], "rotation": [0, 22.5, 0], "uv": [0, 8]}, - {"origin": [-2.5, 0.25, -2.33775], "size": [2, 2, 0], "pivot": [-1.5, 1.25, -2.33775], "rotation": [0, 22.5, 0], "uv": [7, 8]}, - {"origin": [-2.5, 0.25, -1.83775], "size": [2, 2, 0], "pivot": [-1.5, 1.25, -1.83775], "rotation": [0, 22.5, 0], "uv": [0, 8]}, - {"origin": [-1.5, 0.75, -4.08775], "size": [1, 1, 1], "inflate": -0.01, "uv": [8, 13]} + {"origin": [0.5, 0.75, -4.58775], "size": [1, 1, 4], "uv": [0, 6]}, + {"origin": [0.5, 0.75, -3.58775], "size": [1, 1, 0], "uv": [12, 11]} ] }, { - "name": "left_claw", + "name": "right_claw", "parent": "body", - "pivot": [1.5, 1.25, 0.41225], + "pivot": [-1, 1.25, -0.58775], + "rotation": [0, 2.5, 0], "cubes": [ - {"origin": [1, 0.75, -4.58775], "size": [1, 1, 5], "uv": [0, 6]}, - {"origin": [0.5, 0.25, -2.83775], "size": [2, 2, 0], "pivot": [1.5, 1.25, -2.83775], "rotation": [0, -22.5, 0], "uv": [0, 6]}, - {"origin": [0.5, 0.25, -2.33775], "size": [2, 2, 0], "pivot": [1.5, 1.25, -2.33775], "rotation": [0, -22.5, 0], "uv": [7, 6]}, - {"origin": [0.5, 0.25, -1.83775], "size": [2, 2, 0], "pivot": [1.5, 1.25, -1.83775], "rotation": [0, -22.5, 0], "uv": [0, 6]}, - {"origin": [0.5, 0.75, -4.08775], "size": [1, 1, 1], "inflate": -0.01, "uv": [0, 2]} + {"origin": [-1.5, 0.75, -4.58775], "size": [1, 1, 4], "uv": [0, 6], "mirror": true}, + {"origin": [-1.5, 0.75, -3.58775], "size": [1, 1, 0], "uv": [12, 11], "mirror": true} ] } ] diff --git a/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/yeti_crab/yeti_crab.png b/src/main/resources/assets/hybrid-aquatic/textures/entity/crustacean/yeti_crab/yeti_crab.png index f87c409c90fdcbdae3fd3d89077e0b6302e498a7..4aa4e9c6ab16b81d202b17621277b0ab86e2ceaa 100644 GIT binary patch delta 293 zcmV+=0owlF0>1)~BYyw^b5ch_0Itp)=>Px#`AI}UR9J=Wm9c8WFc5}+l`O#mm(W34 z+M!#9K>7$B`xtphKSoAx9y;kJQ-g%Z%Mc_SIYYo!y4<&%bO_!3x;vzh(X|a%JA=>@ z0ud@>5QuR2KB@fd8fN$FPG^a?R>JeRLmr)wMT+J?(TxaIB?Jd;@hrMrGHgLgc& zOPNhUt*wfe$L@c7Kc>m3wN2eWc*mo6Fy?F7L=c^M@Q$OM2DqnmE%gAPh|Y`$YF}%s rK3@0y`_~rv6CMOX5ClOGgn#1#m6Cgl?M#}O00000NkvXXu0mjfAgPG3 delta 324 zcmV-K0lWUc0^S0UBYy!UNklGu4gW1P<==eLjb_0WdNZ1K!0qF7lg6DW+I3>T&Jo| z&ICE<9+v^<+-*#Z^d4&F^o|%Wbn1^>f)uR2SuWxra&L$GtiJWZ#Ji12Yz@m=y31*^ zCmuSMmrLiVBBI7}He16>j(F%6zrTxm`Gg$NL{>{Bz}N$0?@N%?qd+arayWjnu5waR z1@O?ZPpg>y**%&NmxG60`$$~$WKZI9{v%=`rsdg-nTe;0rQ^SPk_&}Gp-?Ck{*7Pd Wa;G~?{KXIe0000