From 601b0d721ed297e53778477a5488ab337993b720 Mon Sep 17 00:00:00 2001 From: Vidal Date: Fri, 30 Jan 2026 00:33:32 -0300 Subject: [PATCH] Added an active animation for orb and updated windup and IDs --- .../data/ability/type/AbilityOrb.java | 1 + .../animations/Ability_Beam_Active.json | 64 +-- .../animations/Ability_Disc_Active.json | 28 +- .../animations/Ability_Disc_Windup.json | 482 +++++++++--------- .../animations/Ability_Laser_Windup.json | 112 ++-- .../animations/Ability_Orb_Active.json | 77 +++ .../animations/Ability_Orb_Windup.json | 143 ++---- .../animations/Ability_Slam_Active.json | 60 +-- .../animations/Ability_Slam_Windup.json | 94 ++-- 9 files changed, 538 insertions(+), 523 deletions(-) create mode 100644 src/main/resources/assets/customnpcs/animations/Ability_Orb_Active.json diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityOrb.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityOrb.java index 014a88f40..78936adbf 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityOrb.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityOrb.java @@ -57,6 +57,7 @@ public class AbilityOrb extends Ability implements IAbilityOrb { this.showTelegraph = true; // Default built-in animation this.windUpAnimationName = "Ability_Orb_Windup"; + this.activeAnimationName = "Ability_Orb_Active"; } @Override diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Beam_Active.json b/src/main/resources/assets/customnpcs/animations/Ability_Beam_Active.json index 466b9163c..e285bc679 100644 --- a/src/main/resources/assets/customnpcs/animations/Ability_Beam_Active.json +++ b/src/main/resources/assets/customnpcs/animations/Ability_Beam_Active.json @@ -9,13 +9,22 @@ "FrameParts": [ { "Pivot2": -5.0f, - "Part": "RIGHT_ARM", - "Rotation1": -18.0f, - "Rotation0": -107.0f, - "Pivot0": -1.0f, - "Pivot1": 2.0f, + "Part": "LEFT_ARM", + "Rotation1": 12.0f, + "Rotation0": -75.0f, + "Pivot0": -2.0f, + "Pivot1": 3.0f, "Rotation2": 50.0f }, + { + "Pivot2": -4.0f, + "Part": "RIGHT_LEG", + "Rotation1": 56.0f, + "Rotation0": 18.0f, + "Pivot0": -4.0f, + "Pivot1": 0.0f, + "Rotation2": 0.0f + }, { "Pivot2": -6.0f, "Part": "LEFT_LEG", @@ -25,6 +34,15 @@ "Pivot1": 0.0f, "Rotation2": -6.0f }, + { + "Pivot2": -3.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": 0.0f, + "Pivot0": -1.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, { "Pivot2": -3.0f, "Part": "BODY", @@ -34,6 +52,15 @@ "Pivot1": 1.0f, "Rotation2": 0.0f }, + { + "Pivot2": -5.0f, + "Part": "RIGHT_ARM", + "Rotation1": -18.0f, + "Rotation0": -107.0f, + "Pivot0": -1.0f, + "Pivot1": 2.0f, + "Rotation2": 50.0f + }, { "Pivot2": 0.0f, "Part": "FULL_MODEL", @@ -42,33 +69,6 @@ "Pivot0": 0.0f, "Pivot1": 0.0f, "Rotation2": 0.0f - }, - { - "Pivot2": -3.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 0.0f, - "Pivot0": -1.0f, - "Pivot1": 1.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": -4.0f, - "Part": "RIGHT_LEG", - "Rotation1": 56.0f, - "Rotation0": 18.0f, - "Pivot0": -4.0f, - "Pivot1": 0.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": -5.0f, - "Part": "LEFT_ARM", - "Rotation1": 12.0f, - "Rotation0": -75.0f, - "Pivot0": -2.0f, - "Pivot1": 3.0f, - "Rotation2": 50.0f } ], "Smooth": 0b, diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Disc_Active.json b/src/main/resources/assets/customnpcs/animations/Ability_Disc_Active.json index 0e221560e..13fe07485 100644 --- a/src/main/resources/assets/customnpcs/animations/Ability_Disc_Active.json +++ b/src/main/resources/assets/customnpcs/animations/Ability_Disc_Active.json @@ -9,12 +9,12 @@ "FrameParts": [ { "Pivot2": -5.0f, - "Part": "BODY", + "Part": "HEAD", "Rotation1": 0.0f, "Rotation0": 25.0f, "Pivot0": 2.0f, "Pivot1": 3.0f, - "Rotation2": 12.0f + "Rotation2": 6.0f }, { "Pivot2": 0.0f, @@ -25,15 +25,6 @@ "Pivot1": 1.0f, "Rotation2": 31.0f }, - { - "Pivot2": -7.0f, - "Part": "RIGHT_ARM", - "Rotation1": -44.0f, - "Rotation0": -90.0f, - "Pivot0": 1.0f, - "Pivot1": 4.0f, - "Rotation2": 90.0f - }, { "Pivot2": -4.0f, "Part": "LEFT_LEG", @@ -43,6 +34,15 @@ "Pivot1": 0.0f, "Rotation2": 0.0f }, + { + "Pivot2": -7.0f, + "Part": "RIGHT_ARM", + "Rotation1": -44.0f, + "Rotation0": -90.0f, + "Pivot0": 1.0f, + "Pivot1": 4.0f, + "Rotation2": 90.0f + }, { "Pivot2": -2.0f, "Part": "LEFT_ARM", @@ -54,12 +54,12 @@ }, { "Pivot2": -5.0f, - "Part": "HEAD", + "Part": "BODY", "Rotation1": 0.0f, "Rotation0": 25.0f, "Pivot0": 2.0f, "Pivot1": 3.0f, - "Rotation2": 6.0f + "Rotation2": 12.0f } ], "Smooth": 0b, @@ -69,7 +69,7 @@ "CurrentFrameTime": 0, "CurrentFrame": 0, "Smooth": 0b, - "ID": 7, + "ID": 9, "WhileAttacking": 1b, "WhileWalking": 1b, "Name": "Ability_Disc_Active", diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Disc_Windup.json b/src/main/resources/assets/customnpcs/animations/Ability_Disc_Windup.json index 035e51f7f..a8231ff50 100644 --- a/src/main/resources/assets/customnpcs/animations/Ability_Disc_Windup.json +++ b/src/main/resources/assets/customnpcs/animations/Ability_Disc_Windup.json @@ -9,22 +9,13 @@ "FrameParts": [ { "Pivot2": 0.0f, - "Part": "BODY", + "Part": "HEAD", "Rotation1": 0.0f, "Rotation0": 0.0f, "Pivot0": 2.0f, "Pivot1": 2.0f, "Rotation2": 18.0f }, - { - "Pivot2": -1.0f, - "Part": "RIGHT_ARM", - "Rotation1": 90.0f, - "Rotation0": 0.0f, - "Pivot0": 1.0f, - "Pivot1": -2.0f, - "Rotation2": 180.0f - }, { "Pivot2": 0.0f, "Part": "RIGHT_LEG", @@ -44,13 +35,13 @@ "Rotation2": 0.0f }, { - "Pivot2": 0.0f, - "Part": "HEAD", - "Rotation1": 0.0f, + "Pivot2": -1.0f, + "Part": "RIGHT_ARM", + "Rotation1": 90.0f, "Rotation0": 0.0f, - "Pivot0": 2.0f, - "Pivot1": 2.0f, - "Rotation2": 18.0f + "Pivot0": 1.0f, + "Pivot1": -2.0f, + "Rotation2": 180.0f }, { "Pivot2": 3.0f, @@ -60,6 +51,15 @@ "Pivot0": -1.0f, "Pivot1": 7.0f, "Rotation2": 37.0f + }, + { + "Pivot2": 0.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": 0.0f, + "Pivot0": 2.0f, + "Pivot1": 2.0f, + "Rotation2": 18.0f } ], "Smooth": 0b, @@ -72,22 +72,13 @@ "FrameParts": [ { "Pivot2": 0.0f, - "Part": "BODY", + "Part": "HEAD", "Rotation1": 0.0f, "Rotation0": 0.0f, "Pivot0": 0.0f, "Pivot1": 1.0f, "Rotation2": 6.0f }, - { - "Pivot2": -1.0f, - "Part": "RIGHT_ARM", - "Rotation1": 90.0f, - "Rotation0": 25.0f, - "Pivot0": -1.0f, - "Pivot1": -2.0f, - "Rotation2": 180.0f - }, { "Pivot2": 0.0f, "Part": "RIGHT_LEG", @@ -107,13 +98,13 @@ "Rotation2": 0.0f }, { - "Pivot2": 0.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": 6.0f + "Pivot2": -1.0f, + "Part": "RIGHT_ARM", + "Rotation1": 90.0f, + "Rotation0": 25.0f, + "Pivot0": -1.0f, + "Pivot1": -2.0f, + "Rotation2": 180.0f }, { "Pivot2": 3.0f, @@ -123,6 +114,15 @@ "Pivot0": -2.0f, "Pivot1": 7.0f, "Rotation2": 37.0f + }, + { + "Pivot2": 0.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": 0.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 6.0f } ], "Smooth": 0b, @@ -135,22 +135,13 @@ "FrameParts": [ { "Pivot2": 2.0f, - "Part": "BODY", + "Part": "HEAD", "Rotation1": 0.0f, "Rotation0": -12.0f, "Pivot0": 0.0f, "Pivot1": 2.0f, "Rotation2": 6.0f }, - { - "Pivot2": 1.0f, - "Part": "RIGHT_ARM", - "Rotation1": 110.0f, - "Rotation0": -90.0f, - "Pivot0": -1.0f, - "Pivot1": -2.0f, - "Rotation2": 90.0f - }, { "Pivot2": 0.0f, "Part": "RIGHT_LEG", @@ -170,13 +161,13 @@ "Rotation2": 0.0f }, { - "Pivot2": 2.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": -12.0f, - "Pivot0": 0.0f, - "Pivot1": 2.0f, - "Rotation2": 6.0f + "Pivot2": 1.0f, + "Part": "RIGHT_ARM", + "Rotation1": 110.0f, + "Rotation0": -90.0f, + "Pivot0": -1.0f, + "Pivot1": -2.0f, + "Rotation2": 90.0f }, { "Pivot2": 4.0f, @@ -186,6 +177,15 @@ "Pivot0": -1.0f, "Pivot1": 7.0f, "Rotation2": 37.0f + }, + { + "Pivot2": 2.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": -12.0f, + "Pivot0": 0.0f, + "Pivot1": 2.0f, + "Rotation2": 6.0f } ], "Smooth": 0b, @@ -198,22 +198,13 @@ "FrameParts": [ { "Pivot2": 2.0f, - "Part": "BODY", + "Part": "HEAD", "Rotation1": 0.0f, "Rotation0": -12.0f, "Pivot0": 2.0f, "Pivot1": 2.0f, "Rotation2": 18.0f }, - { - "Pivot2": 2.0f, - "Part": "RIGHT_ARM", - "Rotation1": 120.0f, - "Rotation0": -90.0f, - "Pivot0": 1.0f, - "Pivot1": -2.0f, - "Rotation2": 90.0f - }, { "Pivot2": 0.0f, "Part": "RIGHT_LEG", @@ -234,12 +225,12 @@ }, { "Pivot2": 2.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": -12.0f, - "Pivot0": 2.0f, - "Pivot1": 2.0f, - "Rotation2": 18.0f + "Part": "RIGHT_ARM", + "Rotation1": 120.0f, + "Rotation0": -90.0f, + "Pivot0": 1.0f, + "Pivot1": -2.0f, + "Rotation2": 90.0f }, { "Pivot2": 4.0f, @@ -249,6 +240,15 @@ "Pivot0": -1.0f, "Pivot1": 7.0f, "Rotation2": 37.0f + }, + { + "Pivot2": 2.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": -12.0f, + "Pivot0": 2.0f, + "Pivot1": 2.0f, + "Rotation2": 18.0f } ], "Smooth": 0b, @@ -261,22 +261,13 @@ "FrameParts": [ { "Pivot2": 0.0f, - "Part": "BODY", + "Part": "HEAD", "Rotation1": 0.0f, "Rotation0": 0.0f, "Pivot0": 4.0f, "Pivot1": 3.0f, "Rotation2": 31.0f }, - { - "Pivot2": -1.0f, - "Part": "RIGHT_ARM", - "Rotation1": 90.0f, - "Rotation0": -18.0f, - "Pivot0": 3.0f, - "Pivot1": -1.0f, - "Rotation2": 180.0f - }, { "Pivot2": 0.0f, "Part": "RIGHT_LEG", @@ -296,13 +287,13 @@ "Rotation2": 0.0f }, { - "Pivot2": 0.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 0.0f, - "Pivot0": 4.0f, - "Pivot1": 3.0f, - "Rotation2": 31.0f + "Pivot2": -1.0f, + "Part": "RIGHT_ARM", + "Rotation1": 90.0f, + "Rotation0": -18.0f, + "Pivot0": 3.0f, + "Pivot1": -1.0f, + "Rotation2": 180.0f }, { "Pivot2": 3.0f, @@ -312,6 +303,15 @@ "Pivot0": 0.0f, "Pivot1": 8.0f, "Rotation2": 37.0f + }, + { + "Pivot2": 0.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": 0.0f, + "Pivot0": 4.0f, + "Pivot1": 3.0f, + "Rotation2": 31.0f } ], "Smooth": 0b, @@ -324,22 +324,13 @@ "FrameParts": [ { "Pivot2": -2.0f, - "Part": "BODY", + "Part": "HEAD", "Rotation1": 0.0f, "Rotation0": 12.0f, "Pivot0": 4.0f, "Pivot1": 3.0f, "Rotation2": 31.0f }, - { - "Pivot2": -3.0f, - "Part": "RIGHT_ARM", - "Rotation1": 90.0f, - "Rotation0": -18.0f, - "Pivot0": 3.0f, - "Pivot1": -1.0f, - "Rotation2": 180.0f - }, { "Pivot2": 0.0f, "Part": "RIGHT_LEG", @@ -359,13 +350,13 @@ "Rotation2": 0.0f }, { - "Pivot2": -2.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 12.0f, - "Pivot0": 4.0f, - "Pivot1": 3.0f, - "Rotation2": 31.0f + "Pivot2": -3.0f, + "Part": "RIGHT_ARM", + "Rotation1": 90.0f, + "Rotation0": -18.0f, + "Pivot0": 3.0f, + "Pivot1": -1.0f, + "Rotation2": 180.0f }, { "Pivot2": 1.0f, @@ -375,6 +366,15 @@ "Pivot0": 0.0f, "Pivot1": 8.0f, "Rotation2": 37.0f + }, + { + "Pivot2": -2.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": 12.0f, + "Pivot0": 4.0f, + "Pivot1": 3.0f, + "Rotation2": 31.0f } ], "Smooth": 0b, @@ -387,22 +387,13 @@ "FrameParts": [ { "Pivot2": -2.0f, - "Part": "BODY", + "Part": "HEAD", "Rotation1": 0.0f, "Rotation0": 12.0f, "Pivot0": 2.0f, "Pivot1": 2.0f, "Rotation2": 18.0f }, - { - "Pivot2": -2.0f, - "Part": "RIGHT_ARM", - "Rotation1": 90.0f, - "Rotation0": 0.0f, - "Pivot0": 1.0f, - "Pivot1": -2.0f, - "Rotation2": 180.0f - }, { "Pivot2": 0.0f, "Part": "RIGHT_LEG", @@ -423,12 +414,12 @@ }, { "Pivot2": -2.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 12.0f, - "Pivot0": 2.0f, - "Pivot1": 2.0f, - "Rotation2": 18.0f + "Part": "RIGHT_ARM", + "Rotation1": 90.0f, + "Rotation0": 0.0f, + "Pivot0": 1.0f, + "Pivot1": -2.0f, + "Rotation2": 180.0f }, { "Pivot2": 2.0f, @@ -438,6 +429,15 @@ "Pivot0": -1.0f, "Pivot1": 7.0f, "Rotation2": 37.0f + }, + { + "Pivot2": -2.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": 12.0f, + "Pivot0": 2.0f, + "Pivot1": 2.0f, + "Rotation2": 18.0f } ], "Smooth": 0b, @@ -450,22 +450,13 @@ "FrameParts": [ { "Pivot2": 0.0f, - "Part": "BODY", + "Part": "HEAD", "Rotation1": 0.0f, "Rotation0": 0.0f, "Pivot0": 2.0f, "Pivot1": 2.0f, "Rotation2": 18.0f }, - { - "Pivot2": -1.0f, - "Part": "RIGHT_ARM", - "Rotation1": 90.0f, - "Rotation0": 0.0f, - "Pivot0": 1.0f, - "Pivot1": -2.0f, - "Rotation2": 180.0f - }, { "Pivot2": 0.0f, "Part": "RIGHT_LEG", @@ -485,13 +476,13 @@ "Rotation2": 0.0f }, { - "Pivot2": 0.0f, - "Part": "HEAD", - "Rotation1": 0.0f, + "Pivot2": -1.0f, + "Part": "RIGHT_ARM", + "Rotation1": 90.0f, "Rotation0": 0.0f, - "Pivot0": 2.0f, - "Pivot1": 2.0f, - "Rotation2": 18.0f + "Pivot0": 1.0f, + "Pivot1": -2.0f, + "Rotation2": 180.0f }, { "Pivot2": 3.0f, @@ -501,6 +492,15 @@ "Pivot0": -1.0f, "Pivot1": 7.0f, "Rotation2": 37.0f + }, + { + "Pivot2": 0.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": 0.0f, + "Pivot0": 2.0f, + "Pivot1": 2.0f, + "Rotation2": 18.0f } ], "Smooth": 0b, @@ -513,13 +513,31 @@ "FrameParts": [ { "Pivot2": 0.0f, - "Part": "BODY", + "Part": "HEAD", "Rotation1": 0.0f, "Rotation0": 0.0f, "Pivot0": 0.0f, "Pivot1": 1.0f, "Rotation2": 6.0f }, + { + "Pivot2": 0.0f, + "Part": "RIGHT_LEG", + "Rotation1": 0.0f, + "Rotation0": 0.0f, + "Pivot0": -2.0f, + "Pivot1": 0.0f, + "Rotation2": 31.0f + }, + { + "Pivot2": -3.0f, + "Part": "LEFT_LEG", + "Rotation1": -31.0f, + "Rotation0": 12.0f, + "Pivot0": 1.0f, + "Pivot1": 0.0f, + "Rotation2": 0.0f + }, { "Pivot2": -1.0f, "Part": "RIGHT_ARM", @@ -529,33 +547,6 @@ "Pivot1": -2.0f, "Rotation2": 180.0f }, - { - "Pivot2": 0.0f, - "Part": "RIGHT_LEG", - "Rotation1": 0.0f, - "Rotation0": 0.0f, - "Pivot0": -2.0f, - "Pivot1": 0.0f, - "Rotation2": 31.0f - }, - { - "Pivot2": -3.0f, - "Part": "LEFT_LEG", - "Rotation1": -31.0f, - "Rotation0": 12.0f, - "Pivot0": 1.0f, - "Pivot1": 0.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": 0.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": 6.0f - }, { "Pivot2": 3.0f, "Part": "LEFT_ARM", @@ -564,6 +555,15 @@ "Pivot0": -2.0f, "Pivot1": 7.0f, "Rotation2": 37.0f + }, + { + "Pivot2": 0.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": 0.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 6.0f } ], "Smooth": 0b, @@ -576,22 +576,13 @@ "FrameParts": [ { "Pivot2": 2.0f, - "Part": "BODY", + "Part": "HEAD", "Rotation1": 0.0f, "Rotation0": -12.0f, "Pivot0": 0.0f, "Pivot1": 2.0f, "Rotation2": 6.0f }, - { - "Pivot2": 1.0f, - "Part": "RIGHT_ARM", - "Rotation1": 110.0f, - "Rotation0": -90.0f, - "Pivot0": -1.0f, - "Pivot1": -2.0f, - "Rotation2": 90.0f - }, { "Pivot2": 0.0f, "Part": "RIGHT_LEG", @@ -611,13 +602,13 @@ "Rotation2": 0.0f }, { - "Pivot2": 2.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": -12.0f, - "Pivot0": 0.0f, - "Pivot1": 2.0f, - "Rotation2": 6.0f + "Pivot2": 1.0f, + "Part": "RIGHT_ARM", + "Rotation1": 110.0f, + "Rotation0": -90.0f, + "Pivot0": -1.0f, + "Pivot1": -2.0f, + "Rotation2": 90.0f }, { "Pivot2": 4.0f, @@ -627,6 +618,15 @@ "Pivot0": -1.0f, "Pivot1": 7.0f, "Rotation2": 37.0f + }, + { + "Pivot2": 2.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": -12.0f, + "Pivot0": 0.0f, + "Pivot1": 2.0f, + "Rotation2": 6.0f } ], "Smooth": 0b, @@ -639,22 +639,13 @@ "FrameParts": [ { "Pivot2": 2.0f, - "Part": "BODY", + "Part": "HEAD", "Rotation1": 0.0f, "Rotation0": -12.0f, "Pivot0": 2.0f, "Pivot1": 2.0f, "Rotation2": 18.0f }, - { - "Pivot2": 2.0f, - "Part": "RIGHT_ARM", - "Rotation1": 120.0f, - "Rotation0": -90.0f, - "Pivot0": 1.0f, - "Pivot1": -2.0f, - "Rotation2": 90.0f - }, { "Pivot2": 0.0f, "Part": "RIGHT_LEG", @@ -675,12 +666,12 @@ }, { "Pivot2": 2.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": -12.0f, - "Pivot0": 2.0f, - "Pivot1": 2.0f, - "Rotation2": 18.0f + "Part": "RIGHT_ARM", + "Rotation1": 120.0f, + "Rotation0": -90.0f, + "Pivot0": 1.0f, + "Pivot1": -2.0f, + "Rotation2": 90.0f }, { "Pivot2": 4.0f, @@ -690,6 +681,15 @@ "Pivot0": -1.0f, "Pivot1": 7.0f, "Rotation2": 37.0f + }, + { + "Pivot2": 2.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": -12.0f, + "Pivot0": 2.0f, + "Pivot1": 2.0f, + "Rotation2": 18.0f } ], "Smooth": 0b, @@ -702,22 +702,13 @@ "FrameParts": [ { "Pivot2": 0.0f, - "Part": "BODY", + "Part": "HEAD", "Rotation1": 0.0f, "Rotation0": 0.0f, "Pivot0": 4.0f, "Pivot1": 3.0f, "Rotation2": 31.0f }, - { - "Pivot2": -1.0f, - "Part": "RIGHT_ARM", - "Rotation1": 90.0f, - "Rotation0": -18.0f, - "Pivot0": 3.0f, - "Pivot1": -1.0f, - "Rotation2": 180.0f - }, { "Pivot2": 0.0f, "Part": "RIGHT_LEG", @@ -737,13 +728,13 @@ "Rotation2": 0.0f }, { - "Pivot2": 0.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 0.0f, - "Pivot0": 4.0f, - "Pivot1": 3.0f, - "Rotation2": 31.0f + "Pivot2": -1.0f, + "Part": "RIGHT_ARM", + "Rotation1": 90.0f, + "Rotation0": -18.0f, + "Pivot0": 3.0f, + "Pivot1": -1.0f, + "Rotation2": 180.0f }, { "Pivot2": 3.0f, @@ -753,6 +744,15 @@ "Pivot0": 0.0f, "Pivot1": 8.0f, "Rotation2": 37.0f + }, + { + "Pivot2": 0.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": 0.0f, + "Pivot0": 4.0f, + "Pivot1": 3.0f, + "Rotation2": 31.0f } ], "Smooth": 0b, @@ -765,22 +765,13 @@ "FrameParts": [ { "Pivot2": -2.0f, - "Part": "BODY", + "Part": "HEAD", "Rotation1": 0.0f, "Rotation0": 12.0f, "Pivot0": 4.0f, "Pivot1": 3.0f, "Rotation2": 31.0f }, - { - "Pivot2": -3.0f, - "Part": "RIGHT_ARM", - "Rotation1": 90.0f, - "Rotation0": -18.0f, - "Pivot0": 3.0f, - "Pivot1": -1.0f, - "Rotation2": 180.0f - }, { "Pivot2": 0.0f, "Part": "RIGHT_LEG", @@ -800,13 +791,13 @@ "Rotation2": 0.0f }, { - "Pivot2": -2.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 12.0f, - "Pivot0": 4.0f, - "Pivot1": 3.0f, - "Rotation2": 31.0f + "Pivot2": -3.0f, + "Part": "RIGHT_ARM", + "Rotation1": 90.0f, + "Rotation0": -18.0f, + "Pivot0": 3.0f, + "Pivot1": -1.0f, + "Rotation2": 180.0f }, { "Pivot2": 1.0f, @@ -816,6 +807,15 @@ "Pivot0": 0.0f, "Pivot1": 8.0f, "Rotation2": 37.0f + }, + { + "Pivot2": -2.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": 12.0f, + "Pivot0": 4.0f, + "Pivot1": 3.0f, + "Rotation2": 31.0f } ], "Smooth": 0b, @@ -828,12 +828,12 @@ "FrameParts": [ { "Pivot2": -5.0f, - "Part": "BODY", + "Part": "HEAD", "Rotation1": 0.0f, "Rotation0": 25.0f, "Pivot0": 2.0f, "Pivot1": 3.0f, - "Rotation2": 12.0f + "Rotation2": 6.0f }, { "Pivot2": 0.0f, @@ -844,15 +844,6 @@ "Pivot1": 1.0f, "Rotation2": 31.0f }, - { - "Pivot2": -7.0f, - "Part": "RIGHT_ARM", - "Rotation1": -44.0f, - "Rotation0": -90.0f, - "Pivot0": 1.0f, - "Pivot1": 4.0f, - "Rotation2": 90.0f - }, { "Pivot2": -4.0f, "Part": "LEFT_LEG", @@ -862,6 +853,15 @@ "Pivot1": 0.0f, "Rotation2": 0.0f }, + { + "Pivot2": -7.0f, + "Part": "RIGHT_ARM", + "Rotation1": -44.0f, + "Rotation0": -90.0f, + "Pivot0": 1.0f, + "Pivot1": 4.0f, + "Rotation2": 90.0f + }, { "Pivot2": -2.0f, "Part": "LEFT_ARM", @@ -873,12 +873,12 @@ }, { "Pivot2": -5.0f, - "Part": "HEAD", + "Part": "BODY", "Rotation1": 0.0f, "Rotation0": 25.0f, "Pivot0": 2.0f, "Pivot1": 3.0f, - "Rotation2": 6.0f + "Rotation2": 12.0f } ], "Smooth": 0b, @@ -888,7 +888,7 @@ "CurrentFrameTime": 0, "CurrentFrame": 0, "Smooth": 0b, - "ID": 6, + "ID": 11, "WhileAttacking": 1b, "WhileWalking": 1b, "Name": "Ability_Disc_Windup", diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Laser_Windup.json b/src/main/resources/assets/customnpcs/animations/Ability_Laser_Windup.json index 5b7dc3e16..c445faca9 100644 --- a/src/main/resources/assets/customnpcs/animations/Ability_Laser_Windup.json +++ b/src/main/resources/assets/customnpcs/animations/Ability_Laser_Windup.json @@ -7,6 +7,15 @@ "Comment": "", "Speed": 3.0f, "FrameParts": [ + { + "Pivot2": 3.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": 0.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, { "Pivot2": 0.0f, "Part": "LEFT_LEG", @@ -16,15 +25,6 @@ "Pivot1": 0.0f, "Rotation2": -18.0f }, - { - "Pivot2": 3.0f, - "Part": "BODY", - "Rotation1": 0.0f, - "Rotation0": -12.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": 0.0f - }, { "Pivot2": 0.0f, "Part": "RIGHT_LEG", @@ -54,9 +54,9 @@ }, { "Pivot2": 3.0f, - "Part": "HEAD", + "Part": "BODY", "Rotation1": 0.0f, - "Rotation0": 0.0f, + "Rotation0": -12.0f, "Pivot0": 0.0f, "Pivot1": 1.0f, "Rotation2": 0.0f @@ -70,6 +70,15 @@ "Comment": "", "Speed": 3.0f, "FrameParts": [ + { + "Pivot2": 3.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": 0.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, { "Pivot2": 0.0f, "Part": "LEFT_LEG", @@ -79,15 +88,6 @@ "Pivot1": 0.0f, "Rotation2": -18.0f }, - { - "Pivot2": 3.0f, - "Part": "BODY", - "Rotation1": 0.0f, - "Rotation0": -12.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": 0.0f - }, { "Pivot2": 0.0f, "Part": "RIGHT_LEG", @@ -117,9 +117,9 @@ }, { "Pivot2": 3.0f, - "Part": "HEAD", + "Part": "BODY", "Rotation1": 0.0f, - "Rotation0": 0.0f, + "Rotation0": -12.0f, "Pivot0": 0.0f, "Pivot1": 1.0f, "Rotation2": 0.0f @@ -133,6 +133,15 @@ "Comment": "", "Speed": 3.0f, "FrameParts": [ + { + "Pivot2": 3.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": 0.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, { "Pivot2": 0.0f, "Part": "LEFT_LEG", @@ -142,15 +151,6 @@ "Pivot1": 0.0f, "Rotation2": -18.0f }, - { - "Pivot2": 3.0f, - "Part": "BODY", - "Rotation1": 0.0f, - "Rotation0": -12.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": 0.0f - }, { "Pivot2": 0.0f, "Part": "RIGHT_LEG", @@ -180,9 +180,9 @@ }, { "Pivot2": 3.0f, - "Part": "HEAD", + "Part": "BODY", "Rotation1": 0.0f, - "Rotation0": 0.0f, + "Rotation0": -12.0f, "Pivot0": 0.0f, "Pivot1": 1.0f, "Rotation2": 0.0f @@ -196,6 +196,15 @@ "Comment": "", "Speed": 3.0f, "FrameParts": [ + { + "Pivot2": 3.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": 0.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, { "Pivot2": 0.0f, "Part": "LEFT_LEG", @@ -205,15 +214,6 @@ "Pivot1": 0.0f, "Rotation2": -18.0f }, - { - "Pivot2": 3.0f, - "Part": "BODY", - "Rotation1": 0.0f, - "Rotation0": -12.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": 0.0f - }, { "Pivot2": 0.0f, "Part": "RIGHT_LEG", @@ -243,9 +243,9 @@ }, { "Pivot2": 3.0f, - "Part": "HEAD", + "Part": "BODY", "Rotation1": 0.0f, - "Rotation0": 0.0f, + "Rotation0": -12.0f, "Pivot0": 0.0f, "Pivot1": 1.0f, "Rotation2": 0.0f @@ -259,6 +259,15 @@ "Comment": "", "Speed": 3.0f, "FrameParts": [ + { + "Pivot2": 5.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": -37.0f, + "Pivot0": 0.0f, + "Pivot1": 2.0f, + "Rotation2": 0.0f + }, { "Pivot2": 0.0f, "Part": "LEFT_LEG", @@ -268,15 +277,6 @@ "Pivot1": 0.0f, "Rotation2": -18.0f }, - { - "Pivot2": 5.0f, - "Part": "BODY", - "Rotation1": 0.0f, - "Rotation0": -25.0f, - "Pivot0": 0.0f, - "Pivot1": 2.0f, - "Rotation2": 0.0f - }, { "Pivot2": 0.0f, "Part": "RIGHT_LEG", @@ -306,9 +306,9 @@ }, { "Pivot2": 5.0f, - "Part": "HEAD", + "Part": "BODY", "Rotation1": 0.0f, - "Rotation0": -37.0f, + "Rotation0": -25.0f, "Pivot0": 0.0f, "Pivot1": 2.0f, "Rotation2": 0.0f @@ -321,7 +321,7 @@ "CurrentFrameTime": 0, "CurrentFrame": 3, "Smooth": 0b, - "ID": 8, + "ID": 12, "WhileAttacking": 1b, "WhileWalking": 1b, "Name": "Ability_Laser_Windup", diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Orb_Active.json b/src/main/resources/assets/customnpcs/animations/Ability_Orb_Active.json new file mode 100644 index 000000000..994e2190c --- /dev/null +++ b/src/main/resources/assets/customnpcs/animations/Ability_Orb_Active.json @@ -0,0 +1,77 @@ +{ + "Loop": 0, + "Speed": 1.0f, + "Frames": [ + { + "ColorMarker": 16777215, + "Comment": "", + "Speed": 0.5f, + "FrameParts": [ + { + "Pivot2": 0.0f, + "Part": "HEAD", + "Rotation1": -37.0f, + "Rotation0": 25.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 4.0f, + "Part": "LEFT_LEG", + "Rotation1": -75.0f, + "Rotation0": 12.0f, + "Pivot0": -1.0f, + "Pivot1": 0.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": -3.0f, + "Part": "RIGHT_LEG", + "Rotation1": -18.0f, + "Rotation0": 12.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 4.0f, + "Part": "LEFT_ARM", + "Rotation1": -50.0f, + "Rotation0": 50.0f, + "Pivot0": -3.0f, + "Pivot1": 0.0f, + "Rotation2": -56.0f + }, + { + "Pivot2": -6.0f, + "Part": "RIGHT_ARM", + "Rotation1": 0.0f, + "Rotation0": -90.0f, + "Pivot0": 2.0f, + "Pivot1": 0.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "BODY", + "Rotation1": -44.0f, + "Rotation0": 12.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": 0.0f + } + ], + "Smooth": 0b, + "Duration": 30 + } + ], + "CurrentFrameTime": 0, + "CurrentFrame": 0, + "Smooth": 0b, + "ID": 13, + "WhileAttacking": 1b, + "WhileWalking": 1b, + "Name": "Ability_Orb_Active", + "WhileStanding": 1b +} diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Orb_Windup.json b/src/main/resources/assets/customnpcs/animations/Ability_Orb_Windup.json index 77f21f941..1be8ef71c 100644 --- a/src/main/resources/assets/customnpcs/animations/Ability_Orb_Windup.json +++ b/src/main/resources/assets/customnpcs/animations/Ability_Orb_Windup.json @@ -7,11 +7,11 @@ "Comment": "", "FrameParts": [ { - "Pivot2": 0.0f, - "Part": "BODY", - "Rotation1": 31.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, + "Pivot2": -3.0f, + "Part": "LEFT_LEG", + "Rotation1": -18.0f, + "Rotation0": 12.0f, + "Pivot0": 1.0f, "Pivot1": 0.0f, "Rotation2": 0.0f }, @@ -24,15 +24,6 @@ "Pivot1": 0.0f, "Rotation2": 0.0f }, - { - "Pivot2": 5.0f, - "Part": "RIGHT_ARM", - "Rotation1": 37.0f, - "Rotation0": -101.0f, - "Pivot0": 2.0f, - "Pivot1": 1.0f, - "Rotation2": -25.0f - }, { "Pivot2": 0.0f, "Part": "LEFT_ARM", @@ -43,31 +34,49 @@ "Rotation2": -90.0f }, { - "Pivot2": -3.0f, - "Part": "LEFT_LEG", - "Rotation1": -18.0f, - "Rotation0": 12.0f, - "Pivot0": 1.0f, + "Pivot2": 4.0f, + "Part": "RIGHT_ARM", + "Rotation1": 70.0f, + "Rotation0": -125.0f, + "Pivot0": 2.0f, + "Pivot1": 1.0f, + "Rotation2": -50.0f + }, + { + "Pivot2": 0.0f, + "Part": "BODY", + "Rotation1": 31.0f, + "Rotation0": 0.0f, + "Pivot0": 0.0f, "Pivot1": 0.0f, "Rotation2": 0.0f } ], - "Duration": 20 + "Duration": 26 }, { "ColorMarker": 16777215, "Comment": "", - "Speed": 1.0f, + "Speed": 2.0f, "FrameParts": [ { "Pivot2": 0.0f, - "Part": "BODY", - "Rotation1": -44.0f, - "Rotation0": 12.0f, + "Part": "HEAD", + "Rotation1": -37.0f, + "Rotation0": 25.0f, "Pivot0": 0.0f, "Pivot1": 0.0f, "Rotation2": 0.0f }, + { + "Pivot2": 4.0f, + "Part": "LEFT_LEG", + "Rotation1": -75.0f, + "Rotation0": 12.0f, + "Pivot0": -1.0f, + "Pivot1": 0.0f, + "Rotation2": 0.0f + }, { "Pivot2": -3.0f, "Part": "RIGHT_LEG", @@ -78,13 +87,13 @@ "Rotation2": 0.0f }, { - "Pivot2": 0.0f, - "Part": "HEAD", - "Rotation1": -37.0f, - "Rotation0": 25.0f, - "Pivot0": 0.0f, + "Pivot2": 4.0f, + "Part": "LEFT_ARM", + "Rotation1": -50.0f, + "Rotation0": 50.0f, + "Pivot0": -3.0f, "Pivot1": 0.0f, - "Rotation2": 0.0f + "Rotation2": -56.0f }, { "Pivot2": -6.0f, @@ -95,33 +104,6 @@ "Pivot1": 0.0f, "Rotation2": 0.0f }, - { - "Pivot2": 4.0f, - "Part": "LEFT_ARM", - "Rotation1": -50.0f, - "Rotation0": 50.0f, - "Pivot0": -3.0f, - "Pivot1": 0.0f, - "Rotation2": -56.0f - }, - { - "Pivot2": 4.0f, - "Part": "LEFT_LEG", - "Rotation1": -75.0f, - "Rotation0": 12.0f, - "Pivot0": -1.0f, - "Pivot1": 0.0f, - "Rotation2": 0.0f - } - ], - "Smooth": 0b, - "Duration": 5 - }, - { - "ColorMarker": 16777215, - "Comment": "", - "Speed": 0.5f, - "FrameParts": [ { "Pivot2": 0.0f, "Part": "BODY", @@ -130,55 +112,10 @@ "Pivot0": 0.0f, "Pivot1": 0.0f, "Rotation2": 0.0f - }, - { - "Pivot2": -3.0f, - "Part": "RIGHT_LEG", - "Rotation1": -18.0f, - "Rotation0": 12.0f, - "Pivot0": 0.0f, - "Pivot1": 0.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": 0.0f, - "Part": "HEAD", - "Rotation1": -37.0f, - "Rotation0": 25.0f, - "Pivot0": 0.0f, - "Pivot1": 0.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": -6.0f, - "Part": "RIGHT_ARM", - "Rotation1": 0.0f, - "Rotation0": -90.0f, - "Pivot0": 2.0f, - "Pivot1": 0.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": 4.0f, - "Part": "LEFT_ARM", - "Rotation1": -50.0f, - "Rotation0": 50.0f, - "Pivot0": -3.0f, - "Pivot1": 0.0f, - "Rotation2": -56.0f - }, - { - "Pivot2": 4.0f, - "Part": "LEFT_LEG", - "Rotation1": -75.0f, - "Rotation0": 12.0f, - "Pivot0": -1.0f, - "Pivot1": 0.0f, - "Rotation2": 0.0f } ], "Smooth": 0b, - "Duration": 5 + "Duration": 4 } ], "CurrentFrameTime": 0, diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Slam_Active.json b/src/main/resources/assets/customnpcs/animations/Ability_Slam_Active.json index 90e16e948..da3e8d61f 100644 --- a/src/main/resources/assets/customnpcs/animations/Ability_Slam_Active.json +++ b/src/main/resources/assets/customnpcs/animations/Ability_Slam_Active.json @@ -6,6 +6,15 @@ "ColorMarker": 16777215, "Comment": "", "FrameParts": [ + { + "Pivot2": 0.0f, + "Part": "FULL_MODEL", + "Rotation1": 0.0f, + "Rotation0": 0.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": 0.0f + }, { "Pivot2": 0.0f, "Part": "HEAD", @@ -15,33 +24,6 @@ "Pivot1": 0.0f, "Rotation2": 0.0f }, - { - "Pivot2": 0.0f, - "Part": "LEFT_ARM", - "Rotation1": 0.0f, - "Rotation0": -208.0f, - "Pivot0": 0.0f, - "Pivot1": 0.0f, - "Rotation2": 12.0f - }, - { - "Pivot2": 0.0f, - "Part": "BODY", - "Rotation1": 0.0f, - "Rotation0": -6.0f, - "Pivot0": 0.0f, - "Pivot1": 0.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": 0.0f, - "Part": "RIGHT_ARM", - "Rotation1": 0.0f, - "Rotation0": -208.0f, - "Pivot0": 0.0f, - "Pivot1": 0.0f, - "Rotation2": -12.0f - }, { "Pivot2": -2.0f, "Part": "RIGHT_LEG", @@ -62,9 +44,27 @@ }, { "Pivot2": 0.0f, - "Part": "FULL_MODEL", + "Part": "LEFT_ARM", "Rotation1": 0.0f, - "Rotation0": 0.0f, + "Rotation0": -208.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": 12.0f + }, + { + "Pivot2": 0.0f, + "Part": "RIGHT_ARM", + "Rotation1": 0.0f, + "Rotation0": -208.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": -12.0f + }, + { + "Pivot2": 0.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": -6.0f, "Pivot0": 0.0f, "Pivot1": 0.0f, "Rotation2": 0.0f @@ -76,7 +76,7 @@ "CurrentFrameTime": 0, "CurrentFrame": 0, "Smooth": 0b, - "ID": 5, + "ID": 14, "WhileAttacking": 1b, "WhileWalking": 1b, "Name": "Ability_Slam_Active", diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Slam_Windup.json b/src/main/resources/assets/customnpcs/animations/Ability_Slam_Windup.json index b35cef0cf..0c22ac017 100644 --- a/src/main/resources/assets/customnpcs/animations/Ability_Slam_Windup.json +++ b/src/main/resources/assets/customnpcs/animations/Ability_Slam_Windup.json @@ -17,12 +17,21 @@ "Rotation2": 0.0f }, { - "Pivot2": 2.0f, - "Part": "BODY", + "Pivot2": 4.0f, + "Part": "RIGHT_LEG", "Rotation1": 0.0f, - "Rotation0": 12.0f, + "Rotation0": 82.0f, "Pivot0": 0.0f, - "Pivot1": 6.0f, + "Pivot1": 7.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "LEFT_LEG", + "Rotation1": 0.0f, + "Rotation0": 18.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, "Rotation2": 0.0f }, { @@ -44,21 +53,12 @@ "Rotation2": 6.0f }, { - "Pivot2": 4.0f, - "Part": "RIGHT_LEG", + "Pivot2": 2.0f, + "Part": "BODY", "Rotation1": 0.0f, - "Rotation0": 82.0f, + "Rotation0": 12.0f, "Pivot0": 0.0f, - "Pivot1": 7.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": 0.0f, - "Part": "LEFT_LEG", - "Rotation1": 0.0f, - "Rotation0": 18.0f, - "Pivot0": 0.0f, - "Pivot1": 0.0f, + "Pivot1": 6.0f, "Rotation2": 0.0f } ], @@ -69,6 +69,15 @@ "ColorMarker": 16777215, "Comment": "", "FrameParts": [ + { + "Pivot2": 0.0f, + "Part": "FULL_MODEL", + "Rotation1": 0.0f, + "Rotation0": 0.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": 0.0f + }, { "Pivot2": 0.0f, "Part": "HEAD", @@ -78,33 +87,6 @@ "Pivot1": 0.0f, "Rotation2": 0.0f }, - { - "Pivot2": 0.0f, - "Part": "LEFT_ARM", - "Rotation1": 0.0f, - "Rotation0": -82.0f, - "Pivot0": 0.0f, - "Pivot1": 0.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": 0.0f, - "Part": "BODY", - "Rotation1": 0.0f, - "Rotation0": -6.0f, - "Pivot0": 0.0f, - "Pivot1": 0.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": 0.0f, - "Part": "RIGHT_ARM", - "Rotation1": 0.0f, - "Rotation0": -88.0f, - "Pivot0": 0.0f, - "Pivot1": 0.0f, - "Rotation2": 0.0f - }, { "Pivot2": -2.0f, "Part": "RIGHT_LEG", @@ -125,9 +107,27 @@ }, { "Pivot2": 0.0f, - "Part": "FULL_MODEL", + "Part": "LEFT_ARM", "Rotation1": 0.0f, - "Rotation0": 0.0f, + "Rotation0": -82.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "RIGHT_ARM", + "Rotation1": 0.0f, + "Rotation0": -88.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": -6.0f, "Pivot0": 0.0f, "Pivot1": 0.0f, "Rotation2": 0.0f @@ -139,7 +139,7 @@ "CurrentFrameTime": 0, "CurrentFrame": 0, "Smooth": 0b, - "ID": 4, + "ID": 15, "WhileAttacking": 1b, "WhileWalking": 1b, "Name": "Ability_Slam_Windup",