From 91762bb1bacc13b7a7ee390cff9ab9b28d5eeb84 Mon Sep 17 00:00:00 2001 From: Vidal Date: Thu, 12 Feb 2026 11:28:00 -0300 Subject: [PATCH 1/6] Hazard animation --- .../data/ability/type/AbilityHazard.java | 2 + .../animations/Ability_Hazard_Active.json | 266 ++++++++++++ .../animations/Ability_Hazard_Windup.json | 392 ++++++++++++++++++ 3 files changed, 660 insertions(+) create mode 100644 src/main/resources/assets/customnpcs/animations/Ability_Hazard_Active.json create mode 100644 src/main/resources/assets/customnpcs/animations/Ability_Hazard_Windup.json diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHazard.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHazard.java index 58c2560a4..f1ae7e719 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHazard.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityHazard.java @@ -113,6 +113,8 @@ public class AbilityHazard extends Ability implements IAbilityHazard { this.windUpTicks = 30; this.telegraphType = TelegraphType.CIRCLE; this.allowedBy = UserType.NPC_ONLY; + this.windUpAnimationName = "Ability_Hazard_Windup"; + this.activeAnimationName = "Ability_Hazard_Active"; } @Override diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Hazard_Active.json b/src/main/resources/assets/customnpcs/animations/Ability_Hazard_Active.json new file mode 100644 index 000000000..11cb0ef7a --- /dev/null +++ b/src/main/resources/assets/customnpcs/animations/Ability_Hazard_Active.json @@ -0,0 +1,266 @@ +{ + "Loop": 3, + "Speed": 1.0f, + "Frames": [ + { + "ColorMarker": 16777215, + "Comment": "", + "Speed": 1.0f, + "FrameParts": [ + { + "Pivot2": -12.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": 82.0f, + "Pivot0": 0.0f, + "Pivot1": 12.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "LEFT_LEG", + "Rotation1": 25.0f, + "Rotation0": 25.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": -12.0f + }, + { + "Pivot2": -10.0f, + "Part": "LEFT_ARM", + "Rotation1": 6.0f, + "Rotation0": 0.0f, + "Pivot0": -1.0f, + "Pivot1": 12.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": -11.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": 101.0f, + "Pivot0": 0.0f, + "Pivot1": 12.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "RIGHT_LEG", + "Rotation1": -25.0f, + "Rotation0": 25.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 12.0f + }, + { + "Pivot2": -10.0f, + "Part": "RIGHT_ARM", + "Rotation1": -6.0f, + "Rotation0": 0.0f, + "Pivot0": 1.0f, + "Pivot1": 12.0f, + "Rotation2": 0.0f + } + ], + "Smooth": 0b, + "Duration": 10 + }, + { + "ColorMarker": 16777215, + "Comment": "", + "Speed": 2.0f, + "FrameParts": [ + { + "Pivot2": 3.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": -18.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "LEFT_LEG", + "Rotation1": 18.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": -12.0f + }, + { + "Pivot2": 3.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": -18.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 4.0f, + "Part": "LEFT_ARM", + "Rotation1": -56.0f, + "Rotation0": -132.0f, + "Pivot0": -2.0f, + "Pivot1": 3.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "RIGHT_LEG", + "Rotation1": -18.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": 12.0f + }, + { + "Pivot2": 4.0f, + "Part": "RIGHT_ARM", + "Rotation1": 56.0f, + "Rotation0": -132.0f, + "Pivot0": 2.0f, + "Pivot1": 3.0f, + "Rotation2": 0.0f + } + ], + "Smooth": 0b, + "Duration": 3 + }, + { + "ColorMarker": 16777215, + "Comment": "", + "Speed": 0.5f, + "FrameParts": [ + { + "Pivot2": 3.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": -18.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "LEFT_LEG", + "Rotation1": 18.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": -12.0f + }, + { + "Pivot2": 3.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": -18.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 4.0f, + "Part": "LEFT_ARM", + "Rotation1": -56.0f, + "Rotation0": -132.0f, + "Pivot0": -2.0f, + "Pivot1": 3.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "RIGHT_LEG", + "Rotation1": -18.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": 12.0f + }, + { + "Pivot2": 4.0f, + "Part": "RIGHT_ARM", + "Rotation1": 56.0f, + "Rotation0": -132.0f, + "Pivot0": 2.0f, + "Pivot1": 3.0f, + "Rotation2": 0.0f + } + ], + "Smooth": 0b, + "Duration": 6 + }, + { + "ColorMarker": 16777215, + "Comment": "", + "Speed": 0.5f, + "FrameParts": [ + { + "Pivot2": 1.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": -6.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "LEFT_LEG", + "Rotation1": 18.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": -12.0f + }, + { + "Pivot2": 1.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": 0.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 3.0f, + "Part": "LEFT_ARM", + "Rotation1": -56.0f, + "Rotation0": -37.0f, + "Pivot0": -2.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "RIGHT_LEG", + "Rotation1": -18.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": 12.0f + }, + { + "Pivot2": 3.0f, + "Part": "RIGHT_ARM", + "Rotation1": 56.0f, + "Rotation0": -37.0f, + "Pivot0": 2.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + } + ], + "Smooth": 0b, + "Duration": 5 + } + ], + "CurrentFrameTime": 0, + "CurrentFrame": 0, + "Smooth": 0b, + "ID": 24, + "WhileAttacking": 1b, + "WhileWalking": 1b, + "Name": "Ability_Hazard_Active", + "WhileStanding": 1b +} diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Hazard_Windup.json b/src/main/resources/assets/customnpcs/animations/Ability_Hazard_Windup.json new file mode 100644 index 000000000..8a16135a4 --- /dev/null +++ b/src/main/resources/assets/customnpcs/animations/Ability_Hazard_Windup.json @@ -0,0 +1,392 @@ +{ + "Loop": -1, + "Speed": 1.0f, + "Frames": [ + { + "ColorMarker": 16777215, + "Comment": "", + "Speed": 2.0f, + "FrameParts": [ + { + "Pivot2": -3.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": 12.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "LEFT_LEG", + "Rotation1": 12.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": -6.0f + }, + { + "Pivot2": -3.0f, + "Part": "LEFT_ARM", + "Rotation1": 37.0f, + "Rotation0": -37.0f, + "Pivot0": -1.0f, + "Pivot1": 0.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": -3.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": 31.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "RIGHT_LEG", + "Rotation1": -12.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": 6.0f + }, + { + "Pivot2": -3.0f, + "Part": "RIGHT_ARM", + "Rotation1": -37.0f, + "Rotation0": -37.0f, + "Pivot0": 1.0f, + "Pivot1": 0.0f, + "Rotation2": 0.0f + } + ], + "Smooth": 0b, + "Duration": 6 + }, + { + "ColorMarker": 16777215, + "Comment": "", + "Speed": 0.25f, + "FrameParts": [ + { + "Pivot2": 3.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": -18.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "LEFT_LEG", + "Rotation1": 18.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": -12.0f + }, + { + "Pivot2": 3.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": -18.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 4.0f, + "Part": "LEFT_ARM", + "Rotation1": -56.0f, + "Rotation0": -132.0f, + "Pivot0": -2.0f, + "Pivot1": 3.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "RIGHT_LEG", + "Rotation1": -18.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": 12.0f + }, + { + "Pivot2": 4.0f, + "Part": "RIGHT_ARM", + "Rotation1": 56.0f, + "Rotation0": -132.0f, + "Pivot0": 2.0f, + "Pivot1": 3.0f, + "Rotation2": 0.0f + } + ], + "Smooth": 0b, + "Duration": 6 + }, + { + "ColorMarker": 16777215, + "Comment": "", + "Speed": 0.5f, + "FrameParts": [ + { + "Pivot2": 3.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": -18.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "LEFT_LEG", + "Rotation1": 18.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": -12.0f + }, + { + "Pivot2": 3.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": -18.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 4.0f, + "Part": "LEFT_ARM", + "Rotation1": -56.0f, + "Rotation0": -132.0f, + "Pivot0": -2.0f, + "Pivot1": 3.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "RIGHT_LEG", + "Rotation1": -18.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": 12.0f + }, + { + "Pivot2": 4.0f, + "Part": "RIGHT_ARM", + "Rotation1": 56.0f, + "Rotation0": -132.0f, + "Pivot0": 2.0f, + "Pivot1": 3.0f, + "Rotation2": 0.0f + } + ], + "Smooth": 0b, + "Duration": 6 + }, + { + "ColorMarker": 16777215, + "Comment": "", + "Speed": 0.75f, + "FrameParts": [ + { + "Pivot2": 3.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": -18.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "LEFT_LEG", + "Rotation1": 18.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": -12.0f + }, + { + "Pivot2": 3.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": -18.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 4.0f, + "Part": "LEFT_ARM", + "Rotation1": -56.0f, + "Rotation0": -132.0f, + "Pivot0": -2.0f, + "Pivot1": 3.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "RIGHT_LEG", + "Rotation1": -18.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": 12.0f + }, + { + "Pivot2": 4.0f, + "Part": "RIGHT_ARM", + "Rotation1": 56.0f, + "Rotation0": -132.0f, + "Pivot0": 2.0f, + "Pivot1": 3.0f, + "Rotation2": 0.0f + } + ], + "Smooth": 0b, + "Duration": 6 + }, + { + "ColorMarker": 16777215, + "Comment": "", + "Speed": 1.0f, + "FrameParts": [ + { + "Pivot2": 3.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": -18.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "LEFT_LEG", + "Rotation1": 18.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": -12.0f + }, + { + "Pivot2": 3.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": -18.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 4.0f, + "Part": "LEFT_ARM", + "Rotation1": -56.0f, + "Rotation0": -132.0f, + "Pivot0": -2.0f, + "Pivot1": 3.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "RIGHT_LEG", + "Rotation1": -18.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": 12.0f + }, + { + "Pivot2": 4.0f, + "Part": "RIGHT_ARM", + "Rotation1": 56.0f, + "Rotation0": -132.0f, + "Pivot0": 2.0f, + "Pivot1": 3.0f, + "Rotation2": 0.0f + } + ], + "Smooth": 0b, + "Duration": 3 + }, + { + "ColorMarker": 16777215, + "Comment": "", + "Speed": 3.0f, + "FrameParts": [ + { + "Pivot2": -12.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": 82.0f, + "Pivot0": 0.0f, + "Pivot1": 12.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "LEFT_LEG", + "Rotation1": 25.0f, + "Rotation0": 25.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": -12.0f + }, + { + "Pivot2": -10.0f, + "Part": "LEFT_ARM", + "Rotation1": 6.0f, + "Rotation0": 0.0f, + "Pivot0": -1.0f, + "Pivot1": 12.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": -11.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": 101.0f, + "Pivot0": 0.0f, + "Pivot1": 12.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "RIGHT_LEG", + "Rotation1": -25.0f, + "Rotation0": 25.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 12.0f + }, + { + "Pivot2": -10.0f, + "Part": "RIGHT_ARM", + "Rotation1": -6.0f, + "Rotation0": 0.0f, + "Pivot0": 1.0f, + "Pivot1": 12.0f, + "Rotation2": 0.0f + } + ], + "Smooth": 0b, + "Duration": 3 + } + ], + "CurrentFrameTime": 0, + "CurrentFrame": 5, + "Smooth": 0b, + "ID": 23, + "WhileAttacking": 1b, + "WhileWalking": 1b, + "Name": "Ability_Hazard_Windup", + "WhileStanding": 1b +} From eee9b32a5b2a5c32ad44a54a20586b072118c8ce Mon Sep 17 00:00:00 2001 From: Vidal Date: Thu, 12 Feb 2026 12:14:21 -0300 Subject: [PATCH 2/6] Added eye anchor point using the entity's eye height --- .../kamkeel/npcs/controllers/data/ability/AnchorPoint.java | 4 +++- src/main/java/kamkeel/npcs/util/AnchorPointHelper.java | 7 +++++++ src/main/resources/assets/customnpcs/lang/en_US.lang | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/AnchorPoint.java b/src/main/java/kamkeel/npcs/controllers/data/ability/AnchorPoint.java index 1c308493c..58e54b5aa 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/AnchorPoint.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/AnchorPoint.java @@ -10,7 +10,8 @@ public enum AnchorPoint { RIGHT_HAND("Right Hand"), // Right arm/hand position LEFT_HAND("Left Hand"), // Left arm/hand position ABOVE_HEAD("Above Head"), // Above the entity - CHEST("Chest"); // Chest level, centered + CHEST("Chest"), // Chest level, centered + EYE("Eye"); // Eye level, centered private final String displayName; @@ -55,6 +56,7 @@ public enum AnchorPoint { case LEFT_HAND: return "ability.anchor.leftHand"; case ABOVE_HEAD: return "ability.anchor.aboveHead"; case CHEST: return "ability.anchor.chest"; + case EYE: return "ability.anchor.eye"; default: return name(); } } diff --git a/src/main/java/kamkeel/npcs/util/AnchorPointHelper.java b/src/main/java/kamkeel/npcs/util/AnchorPointHelper.java index 5ee5936b1..20d557bef 100644 --- a/src/main/java/kamkeel/npcs/util/AnchorPointHelper.java +++ b/src/main/java/kamkeel/npcs/util/AnchorPointHelper.java @@ -37,6 +37,7 @@ public class AnchorPointHelper { private static final float ARM_HEIGHT = 0.75f; private static final float ABOVE_HEAD_HEIGHT = 1.2f; private static final float CHEST_HEIGHT = 0.65f; + private static final float EYE_HEIGHT = 0.85f; // Distance in front for FRONT anchor private static final float DEFAULT_FRONT_DISTANCE = 1.0f; @@ -98,6 +99,10 @@ public class AnchorPointHelper { case CHEST: y += height * CHEST_HEIGHT; break; + + case EYE: + y += entity.getEyeHeight(); + break; } // Rotate offsets relative to entity's body yaw @@ -347,6 +352,8 @@ public class AnchorPointHelper { return ABOVE_HEAD_HEIGHT; case CHEST: return CHEST_HEIGHT; + case EYE: + return EYE_HEIGHT; default: return FRONT_HEIGHT; } diff --git a/src/main/resources/assets/customnpcs/lang/en_US.lang b/src/main/resources/assets/customnpcs/lang/en_US.lang index 3bc0fa119..9319f1b36 100644 --- a/src/main/resources/assets/customnpcs/lang/en_US.lang +++ b/src/main/resources/assets/customnpcs/lang/en_US.lang @@ -1549,6 +1549,7 @@ ability.anchor.rightHand=Right Hand ability.anchor.leftHand=Left Hand ability.anchor.aboveHead=Above Head ability.anchor.chest=Chest +ability.anchor.eye=Eye # Sweep Mode ability.sweep.swipe=Swipe From 0dc6f9aab30fe3b2a4e53f8346cfb64387ece2fc Mon Sep 17 00:00:00 2001 From: Vidal Date: Thu, 12 Feb 2026 12:38:13 -0300 Subject: [PATCH 3/6] Orb Barrage animation --- .../data/ability/type/AbilityOrb.java | 6 +- .../animations/Ability_OrbBarrage_Active.json | 203 ++++++++++++++++++ .../animations/Ability_OrbBarrage_Windup.json | 201 +++++++++++++++++ 3 files changed, 407 insertions(+), 3 deletions(-) create mode 100644 src/main/resources/assets/customnpcs/animations/Ability_OrbBarrage_Active.json create mode 100644 src/main/resources/assets/customnpcs/animations/Ability_OrbBarrage_Windup.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 17b878305..c4a4a1ebb 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 @@ -143,11 +143,11 @@ public class AbilityOrb extends Ability implements IAbilityOrb { a.setMaxRange(75.0f); a.setBurstEnabled(true); a.setBurstAmount(15); - a.setBurstDelay(10); + a.setBurstDelay(5); a.setBurstReplayAnimations(false); a.setBurstOverlap(true); - a.setWindUpAnimationName("Ability_BeamDual_Windup"); - a.setActiveAnimationName("Ability_BeamDual_Active"); + a.setWindUpAnimationName("Ability_OrbBarrage_Windup"); + a.setActiveAnimationName("Ability_OrbBarrage_Active"); }) ); } diff --git a/src/main/resources/assets/customnpcs/animations/Ability_OrbBarrage_Active.json b/src/main/resources/assets/customnpcs/animations/Ability_OrbBarrage_Active.json new file mode 100644 index 000000000..0a0ba828c --- /dev/null +++ b/src/main/resources/assets/customnpcs/animations/Ability_OrbBarrage_Active.json @@ -0,0 +1,203 @@ +{ + "Loop": 1, + "Speed": 1.0f, + "Frames": [ + { + "ColorMarker": 16777215, + "Comment": "", + "Speed": 3.0f, + "FrameParts": [ + { + "Pivot2": -7.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": 0.0f, + "Pivot0": 0.0f, + "Pivot1": 2.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "RIGHT_LEG", + "Rotation1": -31.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": 18.0f + }, + { + "Pivot2": -7.0f, + "Part": "RIGHT_ARM", + "Rotation1": 0.0f, + "Rotation0": -90.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "LEFT_LEG", + "Rotation1": 31.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": -18.0f + }, + { + "Pivot2": -6.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": 25.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": -1.0f, + "Part": "LEFT_ARM", + "Rotation1": -25.0f, + "Rotation0": -90.0f, + "Pivot0": -1.0f, + "Pivot1": 1.0f, + "Rotation2": -25.0f + } + ], + "Smooth": 0b, + "Duration": 2 + }, + { + "ColorMarker": 16777215, + "Comment": "", + "Speed": 3.0f, + "FrameParts": [ + { + "Pivot2": -7.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": 0.0f, + "Pivot0": 0.0f, + "Pivot1": 2.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "RIGHT_LEG", + "Rotation1": -31.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": 18.0f + }, + { + "Pivot2": -1.0f, + "Part": "RIGHT_ARM", + "Rotation1": 25.0f, + "Rotation0": -90.0f, + "Pivot0": 1.0f, + "Pivot1": 1.0f, + "Rotation2": 25.0f + }, + { + "Pivot2": 0.0f, + "Part": "LEFT_LEG", + "Rotation1": 31.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": -18.0f + }, + { + "Pivot2": -6.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": 25.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": -7.0f, + "Part": "LEFT_ARM", + "Rotation1": 0.0f, + "Rotation0": -90.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + } + ], + "Smooth": 0b, + "Duration": 5 + }, + { + "ColorMarker": 16777215, + "Comment": "", + "Speed": 3.0f, + "FrameParts": [ + { + "Pivot2": -7.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": 0.0f, + "Pivot0": 0.0f, + "Pivot1": 2.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "RIGHT_LEG", + "Rotation1": -31.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": 18.0f + }, + { + "Pivot2": -7.0f, + "Part": "RIGHT_ARM", + "Rotation1": 0.0f, + "Rotation0": -90.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "LEFT_LEG", + "Rotation1": 31.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": -18.0f + }, + { + "Pivot2": -6.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": 25.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": -1.0f, + "Part": "LEFT_ARM", + "Rotation1": -25.0f, + "Rotation0": -90.0f, + "Pivot0": -1.0f, + "Pivot1": 1.0f, + "Rotation2": -25.0f + } + ], + "Smooth": 0b, + "Duration": 5 + } + ], + "CurrentFrameTime": 0, + "CurrentFrame": 0, + "Smooth": 0b, + "ID": 26, + "WhileAttacking": 1b, + "WhileWalking": 1b, + "Name": "Ability_OrbBarrage_Active", + "WhileStanding": 1b +} diff --git a/src/main/resources/assets/customnpcs/animations/Ability_OrbBarrage_Windup.json b/src/main/resources/assets/customnpcs/animations/Ability_OrbBarrage_Windup.json new file mode 100644 index 000000000..dfe8f601b --- /dev/null +++ b/src/main/resources/assets/customnpcs/animations/Ability_OrbBarrage_Windup.json @@ -0,0 +1,201 @@ +{ + "Loop": -1, + "Speed": 1.0f, + "Frames": [ + { + "ColorMarker": 16777215, + "Comment": "", + "FrameParts": [ + { + "Pivot2": 3.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": -25.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "RIGHT_LEG", + "Rotation1": 31.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": 18.0f + }, + { + "Pivot2": 3.0f, + "Part": "RIGHT_ARM", + "Rotation1": 56.0f, + "Rotation0": -126.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": -12.0f + }, + { + "Pivot2": 0.0f, + "Part": "LEFT_LEG", + "Rotation1": -31.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": -18.0f + }, + { + "Pivot2": 3.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": -18.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 3.0f, + "Part": "LEFT_ARM", + "Rotation1": -56.0f, + "Rotation0": -126.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 12.0f + } + ], + "Duration": 8 + }, + { + "ColorMarker": 16777215, + "Comment": "", + "Speed": 0.25f, + "FrameParts": [ + { + "Pivot2": 3.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": -25.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "RIGHT_LEG", + "Rotation1": 31.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": 18.0f + }, + { + "Pivot2": 3.0f, + "Part": "RIGHT_ARM", + "Rotation1": 56.0f, + "Rotation0": -126.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": -12.0f + }, + { + "Pivot2": 0.0f, + "Part": "LEFT_LEG", + "Rotation1": -31.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": -18.0f + }, + { + "Pivot2": 3.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": -18.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 3.0f, + "Part": "LEFT_ARM", + "Rotation1": -56.0f, + "Rotation0": -126.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 12.0f + } + ], + "Smooth": 0b, + "Duration": 19 + }, + { + "ColorMarker": 16777215, + "Comment": "", + "Speed": 3.0f, + "FrameParts": [ + { + "Pivot2": -7.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": 0.0f, + "Pivot0": 0.0f, + "Pivot1": 2.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "RIGHT_LEG", + "Rotation1": -31.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": 18.0f + }, + { + "Pivot2": -7.0f, + "Part": "RIGHT_ARM", + "Rotation1": 0.0f, + "Rotation0": -90.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "LEFT_LEG", + "Rotation1": 31.0f, + "Rotation0": 6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": -18.0f + }, + { + "Pivot2": -6.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": 25.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": -1.0f, + "Part": "LEFT_ARM", + "Rotation1": -25.0f, + "Rotation0": -90.0f, + "Pivot0": -1.0f, + "Pivot1": 1.0f, + "Rotation2": -25.0f + } + ], + "Smooth": 0b, + "Duration": 3 + } + ], + "CurrentFrameTime": 0, + "CurrentFrame": 2, + "Smooth": 0b, + "ID": 25, + "WhileAttacking": 1b, + "WhileWalking": 1b, + "Name": "Ability_OrbBarrage_Windup", + "WhileStanding": 1b +} From 171578ad9b3b8c8f974424d7555ab2c0a8505074 Mon Sep 17 00:00:00 2001 From: Vidal Date: Thu, 12 Feb 2026 12:52:58 -0300 Subject: [PATCH 4/6] Fixed heavy hit animation --- .../animations/Ability_HeavyHit_Windup.json | 1181 +---------------- 1 file changed, 55 insertions(+), 1126 deletions(-) diff --git a/src/main/resources/assets/customnpcs/animations/Ability_HeavyHit_Windup.json b/src/main/resources/assets/customnpcs/animations/Ability_HeavyHit_Windup.json index 15d49bce6..a276742ba 100644 --- a/src/main/resources/assets/customnpcs/animations/Ability_HeavyHit_Windup.json +++ b/src/main/resources/assets/customnpcs/animations/Ability_HeavyHit_Windup.json @@ -7,24 +7,6 @@ "Comment": "", "Speed": 0.8f, "FrameParts": [ - { - "Pivot2": 3.0f, - "Part": "RIGHT_ARM", - "Rotation1": 31.0f, - "Rotation0": -107.0f, - "Pivot0": 2.0f, - "Pivot1": 1.0f, - "Rotation2": -37.0f - }, - { - "Pivot2": -4.0f, - "Part": "LEFT_LEG", - "Rotation1": -31.0f, - "Rotation0": 31.0f, - "Pivot0": 2.0f, - "Pivot1": 0.0f, - "Rotation2": -12.0f - }, { "Pivot2": -1.0f, "Part": "HEAD", @@ -34,15 +16,6 @@ "Pivot1": 1.0f, "Rotation2": 0.0f }, - { - "Pivot2": -2.0f, - "Part": "RIGHT_LEG", - "Rotation1": 37.0f, - "Rotation0": 25.0f, - "Pivot0": -2.0f, - "Pivot1": -1.0f, - "Rotation2": 6.0f - }, { "Pivot2": -1.0f, "Part": "BODY", @@ -60,24 +33,6 @@ "Pivot0": 0.0f, "Pivot1": 1.0f, "Rotation2": 6.0f - } - ], - "Smooth": 0b, - "Duration": 10 - }, - { - "ColorMarker": 16777215, - "Comment": "", - "Speed": 0.1f, - "FrameParts": [ - { - "Pivot2": 3.0f, - "Part": "RIGHT_ARM", - "Rotation1": 40.0f, - "Rotation0": -107.0f, - "Pivot0": 2.0f, - "Pivot1": 1.0f, - "Rotation2": -37.0f }, { "Pivot2": -4.0f, @@ -86,16 +41,16 @@ "Rotation0": 31.0f, "Pivot0": 2.0f, "Pivot1": 0.0f, - "Rotation2": -18.0f + "Rotation2": -12.0f }, { - "Pivot2": -1.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, + "Pivot2": 3.0f, + "Part": "RIGHT_ARM", + "Rotation1": 31.0f, + "Rotation0": -107.0f, + "Pivot0": 2.0f, "Pivot1": 1.0f, - "Rotation2": -6.0f + "Rotation2": -37.0f }, { "Pivot2": -2.0f, @@ -104,7 +59,25 @@ "Rotation0": 25.0f, "Pivot0": -2.0f, "Pivot1": -1.0f, - "Rotation2": 0.0f + "Rotation2": 6.0f + } + ], + "Smooth": 0b, + "Duration": 13 + }, + { + "ColorMarker": 16777215, + "Comment": "", + "Speed": 0.1f, + "FrameParts": [ + { + "Pivot2": -1.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": 0.0f, + "Pivot0": 0.0f, + "Pivot1": 1.0f, + "Rotation2": -6.0f }, { "Pivot2": -1.0f, @@ -123,24 +96,6 @@ "Pivot0": 0.0f, "Pivot1": 1.0f, "Rotation2": -6.0f - } - ], - "Smooth": 0b, - "Duration": 1 - }, - { - "ColorMarker": 16777215, - "Comment": "", - "Speed": 0.1f, - "FrameParts": [ - { - "Pivot2": 3.0f, - "Part": "RIGHT_ARM", - "Rotation1": 40.0f, - "Rotation0": -107.0f, - "Pivot0": 2.0f, - "Pivot1": 1.0f, - "Rotation2": -37.0f }, { "Pivot2": -4.0f, @@ -151,51 +106,6 @@ "Pivot1": 0.0f, "Rotation2": -18.0f }, - { - "Pivot2": -1.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": -2.0f, - "Part": "RIGHT_LEG", - "Rotation1": 37.0f, - "Rotation0": 25.0f, - "Pivot0": -2.0f, - "Pivot1": -1.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": -1.0f, - "Part": "BODY", - "Rotation1": 18.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": 0.0f, - "Part": "LEFT_ARM", - "Rotation1": -40.0f, - "Rotation0": -40.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - } - ], - "Smooth": 0b, - "Duration": 1 - }, - { - "ColorMarker": 16777215, - "Comment": "", - "Speed": 0.1f, - "FrameParts": [ { "Pivot2": 3.0f, "Part": "RIGHT_ARM", @@ -205,24 +115,6 @@ "Pivot1": 1.0f, "Rotation2": -37.0f }, - { - "Pivot2": -4.0f, - "Part": "LEFT_LEG", - "Rotation1": -31.0f, - "Rotation0": 31.0f, - "Pivot0": 2.0f, - "Pivot1": 0.0f, - "Rotation2": -18.0f - }, - { - "Pivot2": -1.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, { "Pivot2": -2.0f, "Part": "RIGHT_LEG", @@ -231,997 +123,16 @@ "Pivot0": -2.0f, "Pivot1": -1.0f, "Rotation2": 0.0f - }, - { - "Pivot2": -1.0f, - "Part": "BODY", - "Rotation1": 18.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": 0.0f, - "Part": "LEFT_ARM", - "Rotation1": -40.0f, - "Rotation0": -40.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f } ], "Smooth": 0b, - "Duration": 1 - }, - { - "ColorMarker": 16777215, - "Comment": "", - "Speed": 0.1f, - "FrameParts": [ - { - "Pivot2": 3.0f, - "Part": "RIGHT_ARM", - "Rotation1": 40.0f, - "Rotation0": -107.0f, - "Pivot0": 2.0f, - "Pivot1": 1.0f, - "Rotation2": -37.0f - }, - { - "Pivot2": -4.0f, - "Part": "LEFT_LEG", - "Rotation1": -31.0f, - "Rotation0": 31.0f, - "Pivot0": 2.0f, - "Pivot1": 0.0f, - "Rotation2": -18.0f - }, - { - "Pivot2": -1.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": -2.0f, - "Part": "RIGHT_LEG", - "Rotation1": 37.0f, - "Rotation0": 25.0f, - "Pivot0": -2.0f, - "Pivot1": -1.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": -1.0f, - "Part": "BODY", - "Rotation1": 18.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": 0.0f, - "Part": "LEFT_ARM", - "Rotation1": -40.0f, - "Rotation0": -40.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - } - ], - "Smooth": 0b, - "Duration": 1 - }, - { - "ColorMarker": 16777215, - "Comment": "", - "Speed": 0.1f, - "FrameParts": [ - { - "Pivot2": 3.0f, - "Part": "RIGHT_ARM", - "Rotation1": 40.0f, - "Rotation0": -107.0f, - "Pivot0": 2.0f, - "Pivot1": 1.0f, - "Rotation2": -37.0f - }, - { - "Pivot2": -4.0f, - "Part": "LEFT_LEG", - "Rotation1": -31.0f, - "Rotation0": 31.0f, - "Pivot0": 2.0f, - "Pivot1": 0.0f, - "Rotation2": -18.0f - }, - { - "Pivot2": -1.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": -2.0f, - "Part": "RIGHT_LEG", - "Rotation1": 37.0f, - "Rotation0": 25.0f, - "Pivot0": -2.0f, - "Pivot1": -1.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": -1.0f, - "Part": "BODY", - "Rotation1": 18.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": 0.0f, - "Part": "LEFT_ARM", - "Rotation1": -40.0f, - "Rotation0": -40.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - } - ], - "Smooth": 0b, - "Duration": 1 - }, - { - "ColorMarker": 16777215, - "Comment": "", - "Speed": 0.1f, - "FrameParts": [ - { - "Pivot2": 3.0f, - "Part": "RIGHT_ARM", - "Rotation1": 40.0f, - "Rotation0": -107.0f, - "Pivot0": 2.0f, - "Pivot1": 1.0f, - "Rotation2": -37.0f - }, - { - "Pivot2": -4.0f, - "Part": "LEFT_LEG", - "Rotation1": -31.0f, - "Rotation0": 31.0f, - "Pivot0": 2.0f, - "Pivot1": 0.0f, - "Rotation2": -18.0f - }, - { - "Pivot2": -1.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": -2.0f, - "Part": "RIGHT_LEG", - "Rotation1": 37.0f, - "Rotation0": 25.0f, - "Pivot0": -2.0f, - "Pivot1": -1.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": -1.0f, - "Part": "BODY", - "Rotation1": 18.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": 0.0f, - "Part": "LEFT_ARM", - "Rotation1": -40.0f, - "Rotation0": -40.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - } - ], - "Smooth": 0b, - "Duration": 1 - }, - { - "ColorMarker": 16777215, - "Comment": "", - "Speed": 0.1f, - "FrameParts": [ - { - "Pivot2": 3.0f, - "Part": "RIGHT_ARM", - "Rotation1": 40.0f, - "Rotation0": -107.0f, - "Pivot0": 2.0f, - "Pivot1": 1.0f, - "Rotation2": -37.0f - }, - { - "Pivot2": -4.0f, - "Part": "LEFT_LEG", - "Rotation1": -31.0f, - "Rotation0": 31.0f, - "Pivot0": 2.0f, - "Pivot1": 0.0f, - "Rotation2": -18.0f - }, - { - "Pivot2": -1.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": -2.0f, - "Part": "RIGHT_LEG", - "Rotation1": 37.0f, - "Rotation0": 25.0f, - "Pivot0": -2.0f, - "Pivot1": -1.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": -1.0f, - "Part": "BODY", - "Rotation1": 18.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": 0.0f, - "Part": "LEFT_ARM", - "Rotation1": -40.0f, - "Rotation0": -40.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - } - ], - "Smooth": 0b, - "Duration": 1 - }, - { - "ColorMarker": 16777215, - "Comment": "", - "Speed": 0.1f, - "FrameParts": [ - { - "Pivot2": 3.0f, - "Part": "RIGHT_ARM", - "Rotation1": 40.0f, - "Rotation0": -107.0f, - "Pivot0": 2.0f, - "Pivot1": 1.0f, - "Rotation2": -37.0f - }, - { - "Pivot2": -4.0f, - "Part": "LEFT_LEG", - "Rotation1": -31.0f, - "Rotation0": 31.0f, - "Pivot0": 2.0f, - "Pivot1": 0.0f, - "Rotation2": -18.0f - }, - { - "Pivot2": -1.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": -2.0f, - "Part": "RIGHT_LEG", - "Rotation1": 37.0f, - "Rotation0": 25.0f, - "Pivot0": -2.0f, - "Pivot1": -1.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": -1.0f, - "Part": "BODY", - "Rotation1": 18.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": 0.0f, - "Part": "LEFT_ARM", - "Rotation1": -40.0f, - "Rotation0": -40.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - } - ], - "Smooth": 0b, - "Duration": 1 - }, - { - "ColorMarker": 16777215, - "Comment": "", - "Speed": 0.1f, - "FrameParts": [ - { - "Pivot2": 3.0f, - "Part": "RIGHT_ARM", - "Rotation1": 40.0f, - "Rotation0": -107.0f, - "Pivot0": 2.0f, - "Pivot1": 1.0f, - "Rotation2": -37.0f - }, - { - "Pivot2": -4.0f, - "Part": "LEFT_LEG", - "Rotation1": -31.0f, - "Rotation0": 31.0f, - "Pivot0": 2.0f, - "Pivot1": 0.0f, - "Rotation2": -18.0f - }, - { - "Pivot2": -1.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": -2.0f, - "Part": "RIGHT_LEG", - "Rotation1": 37.0f, - "Rotation0": 25.0f, - "Pivot0": -2.0f, - "Pivot1": -1.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": -1.0f, - "Part": "BODY", - "Rotation1": 18.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": 0.0f, - "Part": "LEFT_ARM", - "Rotation1": -40.0f, - "Rotation0": -40.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - } - ], - "Smooth": 0b, - "Duration": 1 - }, - { - "ColorMarker": 16777215, - "Comment": "", - "Speed": 0.1f, - "FrameParts": [ - { - "Pivot2": 3.0f, - "Part": "RIGHT_ARM", - "Rotation1": 40.0f, - "Rotation0": -107.0f, - "Pivot0": 2.0f, - "Pivot1": 1.0f, - "Rotation2": -37.0f - }, - { - "Pivot2": -4.0f, - "Part": "LEFT_LEG", - "Rotation1": -31.0f, - "Rotation0": 31.0f, - "Pivot0": 2.0f, - "Pivot1": 0.0f, - "Rotation2": -18.0f - }, - { - "Pivot2": -1.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": -2.0f, - "Part": "RIGHT_LEG", - "Rotation1": 37.0f, - "Rotation0": 25.0f, - "Pivot0": -2.0f, - "Pivot1": -1.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": -1.0f, - "Part": "BODY", - "Rotation1": 18.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": 0.0f, - "Part": "LEFT_ARM", - "Rotation1": -40.0f, - "Rotation0": -40.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - } - ], - "Smooth": 0b, - "Duration": 1 - }, - { - "ColorMarker": 16777215, - "Comment": "", - "Speed": 0.1f, - "FrameParts": [ - { - "Pivot2": 3.0f, - "Part": "RIGHT_ARM", - "Rotation1": 40.0f, - "Rotation0": -107.0f, - "Pivot0": 2.0f, - "Pivot1": 1.0f, - "Rotation2": -37.0f - }, - { - "Pivot2": -4.0f, - "Part": "LEFT_LEG", - "Rotation1": -31.0f, - "Rotation0": 31.0f, - "Pivot0": 2.0f, - "Pivot1": 0.0f, - "Rotation2": -18.0f - }, - { - "Pivot2": -1.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": -2.0f, - "Part": "RIGHT_LEG", - "Rotation1": 37.0f, - "Rotation0": 25.0f, - "Pivot0": -2.0f, - "Pivot1": -1.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": -1.0f, - "Part": "BODY", - "Rotation1": 18.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": 0.0f, - "Part": "LEFT_ARM", - "Rotation1": -40.0f, - "Rotation0": -40.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - } - ], - "Smooth": 0b, - "Duration": 1 - }, - { - "ColorMarker": 16777215, - "Comment": "", - "Speed": 0.1f, - "FrameParts": [ - { - "Pivot2": 3.0f, - "Part": "RIGHT_ARM", - "Rotation1": 40.0f, - "Rotation0": -107.0f, - "Pivot0": 2.0f, - "Pivot1": 1.0f, - "Rotation2": -37.0f - }, - { - "Pivot2": -4.0f, - "Part": "LEFT_LEG", - "Rotation1": -31.0f, - "Rotation0": 31.0f, - "Pivot0": 2.0f, - "Pivot1": 0.0f, - "Rotation2": -18.0f - }, - { - "Pivot2": -1.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": -2.0f, - "Part": "RIGHT_LEG", - "Rotation1": 37.0f, - "Rotation0": 25.0f, - "Pivot0": -2.0f, - "Pivot1": -1.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": -1.0f, - "Part": "BODY", - "Rotation1": 18.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": 0.0f, - "Part": "LEFT_ARM", - "Rotation1": -40.0f, - "Rotation0": -40.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - } - ], - "Smooth": 0b, - "Duration": 1 - }, - { - "ColorMarker": 16777215, - "Comment": "", - "Speed": 0.1f, - "FrameParts": [ - { - "Pivot2": 3.0f, - "Part": "RIGHT_ARM", - "Rotation1": 40.0f, - "Rotation0": -107.0f, - "Pivot0": 2.0f, - "Pivot1": 1.0f, - "Rotation2": -37.0f - }, - { - "Pivot2": -4.0f, - "Part": "LEFT_LEG", - "Rotation1": -31.0f, - "Rotation0": 31.0f, - "Pivot0": 2.0f, - "Pivot1": 0.0f, - "Rotation2": -18.0f - }, - { - "Pivot2": -1.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": -2.0f, - "Part": "RIGHT_LEG", - "Rotation1": 37.0f, - "Rotation0": 25.0f, - "Pivot0": -2.0f, - "Pivot1": -1.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": -1.0f, - "Part": "BODY", - "Rotation1": 18.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": 0.0f, - "Part": "LEFT_ARM", - "Rotation1": -40.0f, - "Rotation0": -40.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - } - ], - "Smooth": 0b, - "Duration": 1 - }, - { - "ColorMarker": 16777215, - "Comment": "", - "Speed": 0.1f, - "FrameParts": [ - { - "Pivot2": 3.0f, - "Part": "RIGHT_ARM", - "Rotation1": 40.0f, - "Rotation0": -107.0f, - "Pivot0": 2.0f, - "Pivot1": 1.0f, - "Rotation2": -37.0f - }, - { - "Pivot2": -4.0f, - "Part": "LEFT_LEG", - "Rotation1": -31.0f, - "Rotation0": 31.0f, - "Pivot0": 2.0f, - "Pivot1": 0.0f, - "Rotation2": -18.0f - }, - { - "Pivot2": -1.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": -2.0f, - "Part": "RIGHT_LEG", - "Rotation1": 37.0f, - "Rotation0": 25.0f, - "Pivot0": -2.0f, - "Pivot1": -1.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": -1.0f, - "Part": "BODY", - "Rotation1": 18.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": 0.0f, - "Part": "LEFT_ARM", - "Rotation1": -40.0f, - "Rotation0": -40.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - } - ], - "Smooth": 0b, - "Duration": 1 - }, - { - "ColorMarker": 16777215, - "Comment": "", - "Speed": 0.1f, - "FrameParts": [ - { - "Pivot2": 3.0f, - "Part": "RIGHT_ARM", - "Rotation1": 40.0f, - "Rotation0": -107.0f, - "Pivot0": 2.0f, - "Pivot1": 1.0f, - "Rotation2": -37.0f - }, - { - "Pivot2": -4.0f, - "Part": "LEFT_LEG", - "Rotation1": -31.0f, - "Rotation0": 31.0f, - "Pivot0": 2.0f, - "Pivot1": 0.0f, - "Rotation2": -18.0f - }, - { - "Pivot2": -1.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": -2.0f, - "Part": "RIGHT_LEG", - "Rotation1": 37.0f, - "Rotation0": 25.0f, - "Pivot0": -2.0f, - "Pivot1": -1.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": -1.0f, - "Part": "BODY", - "Rotation1": 18.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": 0.0f, - "Part": "LEFT_ARM", - "Rotation1": -40.0f, - "Rotation0": -40.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - } - ], - "Smooth": 0b, - "Duration": 1 - }, - { - "ColorMarker": 16777215, - "Comment": "", - "Speed": 0.1f, - "FrameParts": [ - { - "Pivot2": 3.0f, - "Part": "RIGHT_ARM", - "Rotation1": 40.0f, - "Rotation0": -107.0f, - "Pivot0": 2.0f, - "Pivot1": 1.0f, - "Rotation2": -37.0f - }, - { - "Pivot2": -4.0f, - "Part": "LEFT_LEG", - "Rotation1": -31.0f, - "Rotation0": 31.0f, - "Pivot0": 2.0f, - "Pivot1": 0.0f, - "Rotation2": -18.0f - }, - { - "Pivot2": -1.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": -2.0f, - "Part": "RIGHT_LEG", - "Rotation1": 37.0f, - "Rotation0": 25.0f, - "Pivot0": -2.0f, - "Pivot1": -1.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": -1.0f, - "Part": "BODY", - "Rotation1": 18.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": 0.0f, - "Part": "LEFT_ARM", - "Rotation1": -40.0f, - "Rotation0": -40.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - } - ], - "Smooth": 0b, - "Duration": 1 - }, - { - "ColorMarker": 16777215, - "Comment": "", - "Speed": 0.1f, - "FrameParts": [ - { - "Pivot2": 3.0f, - "Part": "RIGHT_ARM", - "Rotation1": 40.0f, - "Rotation0": -107.0f, - "Pivot0": 2.0f, - "Pivot1": 1.0f, - "Rotation2": -37.0f - }, - { - "Pivot2": -4.0f, - "Part": "LEFT_LEG", - "Rotation1": -31.0f, - "Rotation0": 31.0f, - "Pivot0": 2.0f, - "Pivot1": 0.0f, - "Rotation2": -18.0f - }, - { - "Pivot2": -1.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": -2.0f, - "Part": "RIGHT_LEG", - "Rotation1": 37.0f, - "Rotation0": 25.0f, - "Pivot0": -2.0f, - "Pivot1": -1.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": -1.0f, - "Part": "BODY", - "Rotation1": 18.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": 0.0f, - "Part": "LEFT_ARM", - "Rotation1": -40.0f, - "Rotation0": -40.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - } - ], - "Smooth": 0b, - "Duration": 1 - }, - { - "ColorMarker": 16777215, - "Comment": "", - "Speed": 0.1f, - "FrameParts": [ - { - "Pivot2": 3.0f, - "Part": "RIGHT_ARM", - "Rotation1": 40.0f, - "Rotation0": -107.0f, - "Pivot0": 2.0f, - "Pivot1": 1.0f, - "Rotation2": -37.0f - }, - { - "Pivot2": -4.0f, - "Part": "LEFT_LEG", - "Rotation1": -31.0f, - "Rotation0": 31.0f, - "Pivot0": 2.0f, - "Pivot1": 0.0f, - "Rotation2": -18.0f - }, - { - "Pivot2": -1.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": -2.0f, - "Part": "RIGHT_LEG", - "Rotation1": 37.0f, - "Rotation0": 25.0f, - "Pivot0": -2.0f, - "Pivot1": -1.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": -1.0f, - "Part": "BODY", - "Rotation1": 18.0f, - "Rotation0": 0.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - }, - { - "Pivot2": 0.0f, - "Part": "LEFT_ARM", - "Rotation1": -40.0f, - "Rotation0": -40.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": -6.0f - } - ], - "Smooth": 0b, - "Duration": 1 + "Duration": 15 }, { "ColorMarker": 16777215, "Comment": "", "Speed": 2.0f, "FrameParts": [ - { - "Pivot2": -5.0f, - "Part": "RIGHT_ARM", - "Rotation1": 0.0f, - "Rotation0": -90.0f, - "Pivot0": 0.0f, - "Pivot1": 2.0f, - "Rotation2": 90.0f - }, - { - "Pivot2": 2.0f, - "Part": "LEFT_LEG", - "Rotation1": -31.0f, - "Rotation0": 31.0f, - "Pivot0": 1.0f, - "Pivot1": 0.0f, - "Rotation2": -18.0f - }, { "Pivot2": 0.0f, "Part": "HEAD", @@ -1231,15 +142,6 @@ "Pivot1": 1.0f, "Rotation2": 0.0f }, - { - "Pivot2": -2.0f, - "Part": "RIGHT_LEG", - "Rotation1": 6.0f, - "Rotation0": 12.0f, - "Pivot0": -1.0f, - "Pivot1": 0.0f, - "Rotation2": 0.0f - }, { "Pivot2": 0.0f, "Part": "BODY", @@ -1257,6 +159,33 @@ "Pivot0": -2.0f, "Pivot1": 1.0f, "Rotation2": -6.0f + }, + { + "Pivot2": 2.0f, + "Part": "LEFT_LEG", + "Rotation1": -31.0f, + "Rotation0": 31.0f, + "Pivot0": 1.0f, + "Pivot1": 0.0f, + "Rotation2": -18.0f + }, + { + "Pivot2": -5.0f, + "Part": "RIGHT_ARM", + "Rotation1": 0.0f, + "Rotation0": -90.0f, + "Pivot0": 0.0f, + "Pivot1": 2.0f, + "Rotation2": 90.0f + }, + { + "Pivot2": -2.0f, + "Part": "RIGHT_LEG", + "Rotation1": 6.0f, + "Rotation0": 12.0f, + "Pivot0": -1.0f, + "Pivot1": 0.0f, + "Rotation2": 0.0f } ], "Smooth": 0b, @@ -1264,7 +193,7 @@ } ], "CurrentFrameTime": 0, - "CurrentFrame": 19, + "CurrentFrame": 1, "Smooth": 0b, "ID": 15, "WhileAttacking": 1b, From cac27535f877d1fd2540419766ab103181e12353 Mon Sep 17 00:00:00 2001 From: Vidal Date: Thu, 12 Feb 2026 13:03:57 -0300 Subject: [PATCH 5/6] Charge animation --- .../data/ability/type/AbilityCharge.java | 2 + .../animations/Ability_Charge_Active.json | 59 +++++++++ .../animations/Ability_Charge_Windup.json | 122 ++++++++++++++++++ 3 files changed, 183 insertions(+) create mode 100644 src/main/resources/assets/customnpcs/animations/Ability_Charge_Active.json create mode 100644 src/main/resources/assets/customnpcs/animations/Ability_Charge_Windup.json diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCharge.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCharge.java index 4ae81bfcb..2a0a5ff8c 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCharge.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityCharge.java @@ -56,6 +56,8 @@ public class AbilityCharge extends Ability implements IAbilityCharge { this.showTelegraph = true; this.windUpSound = "mob.zombie.wood"; this.activeSound = "mob.zombie.attack"; + this.windUpAnimationName = "Ability_Charge_Windup"; + this.activeAnimationName = "Ability_Active_Windup"; } @Override diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Charge_Active.json b/src/main/resources/assets/customnpcs/animations/Ability_Charge_Active.json new file mode 100644 index 000000000..82b2294ca --- /dev/null +++ b/src/main/resources/assets/customnpcs/animations/Ability_Charge_Active.json @@ -0,0 +1,59 @@ +{ + "Loop": 0, + "Speed": 1.0f, + "Frames": [ + { + "ColorMarker": 16777215, + "Comment": "", + "Speed": 3.0f, + "FrameParts": [ + { + "Pivot2": -6.0f, + "Part": "RIGHT_ARM", + "Rotation1": -50.0f, + "Rotation0": -75.0f, + "Pivot0": 0.0f, + "Pivot1": 3.0f, + "Rotation2": -45.0f + }, + { + "Pivot2": -6.0f, + "Part": "LEFT_ARM", + "Rotation1": 50.0f, + "Rotation0": -75.0f, + "Pivot0": 0.0f, + "Pivot1": 3.0f, + "Rotation2": 45.0f + }, + { + "Pivot2": -6.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": 0.0f, + "Pivot0": 0.0f, + "Pivot1": 3.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": -6.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": 31.0f, + "Pivot0": 0.0f, + "Pivot1": 2.0f, + "Rotation2": 0.0f + } + ], + "Smooth": 0b, + "Duration": 2 + } + ], + "CurrentFrameTime": 0, + "CurrentFrame": 0, + "Smooth": 0b, + "ID": 28, + "WhileAttacking": 1b, + "WhileWalking": 1b, + "Name": "Ability_Charge_Active", + "WhileStanding": 1b +} diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Charge_Windup.json b/src/main/resources/assets/customnpcs/animations/Ability_Charge_Windup.json new file mode 100644 index 000000000..c627007e3 --- /dev/null +++ b/src/main/resources/assets/customnpcs/animations/Ability_Charge_Windup.json @@ -0,0 +1,122 @@ +{ + "Loop": -1, + "Speed": 1.0f, + "Frames": [ + { + "ColorMarker": 16777215, + "Comment": "", + "Speed": 0.8f, + "FrameParts": [ + { + "Pivot2": 0.0f, + "Part": "LEFT_LEG", + "Rotation1": 0.0f, + "Rotation0": 69.0f, + "Pivot0": 0.0f, + "Pivot1": 5.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": -8.0f, + "Part": "RIGHT_ARM", + "Rotation1": 0.0f, + "Rotation0": 0.0f, + "Pivot0": 0.0f, + "Pivot1": 12.0f, + "Rotation2": 18.0f + }, + { + "Pivot2": -6.0f, + "Part": "RIGHT_LEG", + "Rotation1": 0.0f, + "Rotation0": 44.0f, + "Pivot0": 0.0f, + "Pivot1": 2.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": -8.0f, + "Part": "LEFT_ARM", + "Rotation1": 0.0f, + "Rotation0": 0.0f, + "Pivot0": 0.0f, + "Pivot1": 12.0f, + "Rotation2": -18.0f + }, + { + "Pivot2": -10.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": 18.0f, + "Pivot0": 0.0f, + "Pivot1": 12.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": -10.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": 75.0f, + "Pivot0": 0.0f, + "Pivot1": 12.0f, + "Rotation2": 0.0f + } + ], + "Smooth": 0b, + "Duration": 18 + }, + { + "ColorMarker": 16777215, + "Comment": "", + "Speed": 3.0f, + "FrameParts": [ + { + "Pivot2": -6.0f, + "Part": "RIGHT_ARM", + "Rotation1": -50.0f, + "Rotation0": -75.0f, + "Pivot0": 0.0f, + "Pivot1": 3.0f, + "Rotation2": -45.0f + }, + { + "Pivot2": -6.0f, + "Part": "LEFT_ARM", + "Rotation1": 50.0f, + "Rotation0": -75.0f, + "Pivot0": 0.0f, + "Pivot1": 3.0f, + "Rotation2": 45.0f + }, + { + "Pivot2": -6.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": 0.0f, + "Pivot0": 0.0f, + "Pivot1": 3.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": -6.0f, + "Part": "BODY", + "Rotation1": 0.0f, + "Rotation0": 31.0f, + "Pivot0": 0.0f, + "Pivot1": 2.0f, + "Rotation2": 0.0f + } + ], + "Smooth": 0b, + "Duration": 2 + } + ], + "CurrentFrameTime": 0, + "CurrentFrame": 0, + "Smooth": 0b, + "ID": 27, + "WhileAttacking": 1b, + "WhileWalking": 1b, + "Name": "Ability_Charge_Windup", + "WhileStanding": 1b +} From 540903d71fb3a071896e5c8546c43a95c13bb155 Mon Sep 17 00:00:00 2001 From: Vidal Date: Thu, 12 Feb 2026 13:24:28 -0300 Subject: [PATCH 6/6] Changed Abilities register method call --- src/main/java/kamkeel/npcs/util/Register.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/kamkeel/npcs/util/Register.java b/src/main/java/kamkeel/npcs/util/Register.java index ff6b0f24e..c343a9f03 100644 --- a/src/main/java/kamkeel/npcs/util/Register.java +++ b/src/main/java/kamkeel/npcs/util/Register.java @@ -69,7 +69,7 @@ public class Register { public void register() { for (Map.Entry> entry : entries.entrySet()) { - AbilityController.Instance.registerType(entry.getValue().get().getTypeId(), entry.getValue()); + AbilityController.Instance.registerAbility(entry.getKey(), entry.getValue().get()); } }