diff --git a/src/main/resources/assets/hybrid-aquatic/animations/sea_angel.animation.json b/src/main/resources/assets/hybrid-aquatic/animations/sea_angel.animation.json index cd26a3658..1caa4b830 100644 --- a/src/main/resources/assets/hybrid-aquatic/animations/sea_angel.animation.json +++ b/src/main/resources/assets/hybrid-aquatic/animations/sea_angel.animation.json @@ -1,82 +1,73 @@ { - "format_version": "1.8.0", - "animations": { - "swim": { - "loop": true, - "animation_length": 3, - "bones": { - "left_wing_1": { - "rotation": { - "0.0": { - "vector": [0, 0, 22.5] - }, - "1.0": { - "vector": [0, 0, -22.5] - }, - "1.5": { - "vector": [0, 0, -22.5] - }, - "3.0": { - "vector": [0, 0, 22.5] - } - } - }, - "left_wing_2": { - "rotation": { - "0.0": { - "vector": [0, 0, 80] - }, - "1.0": { - "vector": [0, 0, 30] - }, - "1.5": { - "vector": [0, 0, -37.5] - }, - "2.2083": { - "vector": [0, 0, -40] - }, - "3.0": { - "vector": [0, 0, 75] - } - } - }, - "right_wing_1": { - "rotation": { - "0.0": { - "vector": [0, 0, -22.5] - }, - "1.0": { - "vector": [0, 0, 22.5] - }, - "1.5": { - "vector": [0, 0, 22.5] - }, - "3.0": { - "vector": [0, 0, -22.5] - } - } - }, - "right_wing_2": { - "rotation": { - "0.0": { - "vector": [0, 0, -80] - }, - "1.0": { - "vector": [0, 0, -30] - }, - "1.5": { - "vector": [0, 0, 37.5] - }, - "2.2083": { - "vector": [0, 0, 40] - }, - "3.0": { - "vector": [0, 0, -75] - } - } - } - } - } - }, - "geckolib_format_version": 2 -} + "format_version": "1.8.0", + "animations": { + "swim": { + "loop": true, + "animation_length": 4, + "bones": { + "right_fin_tip": { + "rotation": [0, 0, "Math.sin(query.anim_time * 90)*-15"] + }, + "right_fin_2": { + "rotation": ["Math.sin(query.anim_time * 90)*7.5", 0, 0] + }, + "body": { + "rotation": ["Math.sin(query.anim_time * 90)*2.5", 0, 0] + }, + "left_fin": { + "rotation": [0, 0, "Math.cos(query.anim_time * 90)*10"] + }, + "left_fin_tip": { + "rotation": [0, 0, "Math.sin(query.anim_time * 90)*15"] + }, + "right_fin": { + "rotation": [0, 0, "Math.cos(query.anim_time * 90)*-10"] + } + } + }, + "flop": { + "loop": true, + "animation_length": 2, + "bones": { + "body": { + "rotation": { + "0.0": [2.5, 0, 0], + "1.0": [-2.5, 0, 0], + "2.0": [2.5, 0, 0] + } + }, + "left_fin": { + "rotation": { + "0.0": [2.5, 0, 0], + "1.0": [-2.5, 0, 0], + "2.0": [2.5, 0, 0] + } + }, + "right_fin": { + "rotation": { + "0.0": [2.5, 0, 0], + "1.0": [-2.5, 0, 0], + "2.0": [2.5, 0, 0] + } + } + } + }, + "idle": { + "loop": true, + "animation_length": 4, + "bones": { + "body": { + "rotation": ["Math.cos(query.anim_time * 90)*2.5", 0, 0], + "position": [0, "Math.sin(query.anim_time * 90)*-0.25", 0] + }, + "left_fin": { + "rotation": [0, 0, "Math.cos(query.anim_time * 90)*-5"] + }, + "right_fin": { + "rotation": [0, 0, "Math.cos(query.anim_time * 90)*5"] + } + } + } + }, + "geckolib_format_version": 2 +} \ No newline at end of file