From 974cfc8c568ccfe685931a6b3291ea2871ffb9e1 Mon Sep 17 00:00:00 2001 From: Vidal Date: Thu, 12 Feb 2026 10:59:42 -0300 Subject: [PATCH] Changed fire delay for dual disc --- .../data/ability/type/AbilityDisc.java | 2 +- .../animations/Ability_DiscDual_Active.json | 256 +++++------------ .../animations/Ability_DiscDual_Windup.json | 264 +++++++++--------- 3 files changed, 198 insertions(+), 324 deletions(-) diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDisc.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDisc.java index 21d4073ed..f890b7d7b 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDisc.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDisc.java @@ -138,7 +138,7 @@ public class AbilityDisc extends Ability implements IAbilityDisc { AbilityDisc disc = (AbilityDisc) a; a.setName("Dual Disc"); disc.setProjectileCount(2); - disc.setFireDelay(10); + disc.setFireDelay(5); // Set color override for second disc disc.projectiles[1].colorOverride = true; disc.projectiles[1].innerColor = 0xFFFFFF; diff --git a/src/main/resources/assets/customnpcs/animations/Ability_DiscDual_Active.json b/src/main/resources/assets/customnpcs/animations/Ability_DiscDual_Active.json index 8fbaa73da..98a3299a2 100644 --- a/src/main/resources/assets/customnpcs/animations/Ability_DiscDual_Active.json +++ b/src/main/resources/assets/customnpcs/animations/Ability_DiscDual_Active.json @@ -1,17 +1,17 @@ { - "Loop": 5, + "Loop": -1, "Speed": 1.0f, "Frames": [ { "ColorMarker": 16777215, "Comment": "", - "Speed": 2.0f, + "Speed": 3.0f, "FrameParts": [ { - "Pivot2": -5.0f, - "Part": "BODY", - "Rotation1": -37.0f, - "Rotation0": 37.0f, + "Pivot2": -6.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": 18.0f, "Pivot0": 3.0f, "Pivot1": 2.0f, "Rotation2": 0.0f @@ -25,15 +25,6 @@ "Pivot1": 2.0f, "Rotation2": 56.0f }, - { - "Pivot2": 0.0f, - "Part": "LEFT_LEG", - "Rotation1": -37.0f, - "Rotation0": 31.0f, - "Pivot0": 0.0f, - "Pivot1": 0.0f, - "Rotation2": -25.0f - }, { "Pivot2": 0.0f, "Part": "LEFT_ARM", @@ -43,33 +34,6 @@ "Pivot1": 1.0f, "Rotation2": 0.0f }, - { - "Pivot2": -1.0f, - "Part": "RIGHT_LEG", - "Rotation1": -18.0f, - "Rotation0": 12.0f, - "Pivot0": -1.0f, - "Pivot1": 0.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": -6.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 18.0f, - "Pivot0": 3.0f, - "Pivot1": 2.0f, - "Rotation2": 0.0f - } - ], - "Smooth": 0b, - "Duration": 2 - }, - { - "ColorMarker": 16777215, - "Comment": "", - "Speed": 1.5f, - "FrameParts": [ { "Pivot2": -5.0f, "Part": "BODY", @@ -79,33 +43,6 @@ "Pivot1": 2.0f, "Rotation2": 0.0f }, - { - "Pivot2": -7.0f, - "Part": "RIGHT_ARM", - "Rotation1": 0.0f, - "Rotation0": 25.0f, - "Pivot0": 3.0f, - "Pivot1": 2.0f, - "Rotation2": 56.0f - }, - { - "Pivot2": 0.0f, - "Part": "LEFT_LEG", - "Rotation1": -37.0f, - "Rotation0": 31.0f, - "Pivot0": 0.0f, - "Pivot1": 0.0f, - "Rotation2": -25.0f - }, - { - "Pivot2": 0.0f, - "Part": "LEFT_ARM", - "Rotation1": 0.0f, - "Rotation0": 120.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": 0.0f - }, { "Pivot2": -1.0f, "Part": "RIGHT_LEG", @@ -115,42 +52,6 @@ "Pivot1": 0.0f, "Rotation2": 0.0f }, - { - "Pivot2": -6.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 18.0f, - "Pivot0": 3.0f, - "Pivot1": 2.0f, - "Rotation2": 0.0f - } - ], - "Smooth": 0b, - "Duration": 4 - }, - { - "ColorMarker": 16777215, - "Comment": "", - "Speed": 0.5f, - "FrameParts": [ - { - "Pivot2": -5.0f, - "Part": "BODY", - "Rotation1": -37.0f, - "Rotation0": 37.0f, - "Pivot0": 3.0f, - "Pivot1": 2.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": -7.0f, - "Part": "RIGHT_ARM", - "Rotation1": 0.0f, - "Rotation0": 25.0f, - "Pivot0": 3.0f, - "Pivot1": 2.0f, - "Rotation2": 56.0f - }, { "Pivot2": 0.0f, "Part": "LEFT_LEG", @@ -159,37 +60,10 @@ "Pivot0": 0.0f, "Pivot1": 0.0f, "Rotation2": -25.0f - }, - { - "Pivot2": 0.0f, - "Part": "LEFT_ARM", - "Rotation1": 0.0f, - "Rotation0": 120.0f, - "Pivot0": 0.0f, - "Pivot1": 1.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": -1.0f, - "Part": "RIGHT_LEG", - "Rotation1": -18.0f, - "Rotation0": 12.0f, - "Pivot0": -1.0f, - "Pivot1": 0.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": -6.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 18.0f, - "Pivot0": 3.0f, - "Pivot1": 2.0f, - "Rotation2": 0.0f } ], "Smooth": 0b, - "Duration": 4 + "Duration": 3 }, { "ColorMarker": 16777215, @@ -198,8 +72,8 @@ "FrameParts": [ { "Pivot2": 2.0f, - "Part": "BODY", - "Rotation1": -25.0f, + "Part": "HEAD", + "Rotation1": 0.0f, "Rotation0": -12.0f, "Pivot0": -1.0f, "Pivot1": 1.0f, @@ -214,15 +88,6 @@ "Pivot1": 0.0f, "Rotation2": 75.0f }, - { - "Pivot2": 0.0f, - "Part": "LEFT_LEG", - "Rotation1": -25.0f, - "Rotation0": 12.0f, - "Pivot0": 0.0f, - "Pivot1": 0.0f, - "Rotation2": -12.0f - }, { "Pivot2": 2.0f, "Part": "LEFT_ARM", @@ -232,6 +97,15 @@ "Pivot1": 1.0f, "Rotation2": 0.0f }, + { + "Pivot2": 2.0f, + "Part": "BODY", + "Rotation1": -25.0f, + "Rotation0": -12.0f, + "Pivot0": -1.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, { "Pivot2": 0.0f, "Part": "RIGHT_LEG", @@ -242,17 +116,17 @@ "Rotation2": 6.0f }, { - "Pivot2": 2.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": -12.0f, - "Pivot0": -1.0f, - "Pivot1": 1.0f, - "Rotation2": 0.0f + "Pivot2": 0.0f, + "Part": "LEFT_LEG", + "Rotation1": -25.0f, + "Rotation0": 12.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": -12.0f } ], "Smooth": 0b, - "Duration": 2 + "Duration": 3 }, { "ColorMarker": 16777215, @@ -261,8 +135,8 @@ "FrameParts": [ { "Pivot2": 2.0f, - "Part": "BODY", - "Rotation1": -25.0f, + "Part": "HEAD", + "Rotation1": 0.0f, "Rotation0": -12.0f, "Pivot0": -1.0f, "Pivot1": 1.0f, @@ -277,15 +151,6 @@ "Pivot1": 0.0f, "Rotation2": 75.0f }, - { - "Pivot2": 0.0f, - "Part": "LEFT_LEG", - "Rotation1": -25.0f, - "Rotation0": 12.0f, - "Pivot0": 0.0f, - "Pivot1": 0.0f, - "Rotation2": -12.0f - }, { "Pivot2": 2.0f, "Part": "LEFT_ARM", @@ -295,6 +160,15 @@ "Pivot1": 1.0f, "Rotation2": 0.0f }, + { + "Pivot2": 2.0f, + "Part": "BODY", + "Rotation1": -25.0f, + "Rotation0": -12.0f, + "Pivot0": -1.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, { "Pivot2": 0.0f, "Part": "RIGHT_LEG", @@ -305,27 +179,27 @@ "Rotation2": 6.0f }, { - "Pivot2": 2.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": -12.0f, - "Pivot0": -1.0f, - "Pivot1": 1.0f, - "Rotation2": 0.0f + "Pivot2": 0.0f, + "Part": "LEFT_LEG", + "Rotation1": -25.0f, + "Rotation0": 12.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": -12.0f } ], "Smooth": 0b, - "Duration": 4 + "Duration": 3 }, { "ColorMarker": 16777215, "Comment": "", - "Speed": 0.5f, + "Speed": 0.25f, "FrameParts": [ { "Pivot2": 2.0f, - "Part": "BODY", - "Rotation1": -25.0f, + "Part": "HEAD", + "Rotation1": 0.0f, "Rotation0": -12.0f, "Pivot0": -1.0f, "Pivot1": 1.0f, @@ -340,15 +214,6 @@ "Pivot1": 0.0f, "Rotation2": 75.0f }, - { - "Pivot2": 0.0f, - "Part": "LEFT_LEG", - "Rotation1": -25.0f, - "Rotation0": 12.0f, - "Pivot0": 0.0f, - "Pivot1": 0.0f, - "Rotation2": -12.0f - }, { "Pivot2": 2.0f, "Part": "LEFT_ARM", @@ -358,6 +223,15 @@ "Pivot1": 1.0f, "Rotation2": 0.0f }, + { + "Pivot2": 2.0f, + "Part": "BODY", + "Rotation1": -25.0f, + "Rotation0": -12.0f, + "Pivot0": -1.0f, + "Pivot1": 1.0f, + "Rotation2": 0.0f + }, { "Pivot2": 0.0f, "Part": "RIGHT_LEG", @@ -368,17 +242,17 @@ "Rotation2": 6.0f }, { - "Pivot2": 2.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": -12.0f, - "Pivot0": -1.0f, - "Pivot1": 1.0f, - "Rotation2": 0.0f + "Pivot2": 0.0f, + "Part": "LEFT_LEG", + "Rotation1": -25.0f, + "Rotation0": 12.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": -12.0f } ], "Smooth": 0b, - "Duration": 4 + "Duration": 3 } ], "CurrentFrameTime": 0, diff --git a/src/main/resources/assets/customnpcs/animations/Ability_DiscDual_Windup.json b/src/main/resources/assets/customnpcs/animations/Ability_DiscDual_Windup.json index 080306c95..0dc050b19 100644 --- a/src/main/resources/assets/customnpcs/animations/Ability_DiscDual_Windup.json +++ b/src/main/resources/assets/customnpcs/animations/Ability_DiscDual_Windup.json @@ -7,51 +7,6 @@ "Comment": "", "Speed": 0.5f, "FrameParts": [ - { - "Pivot2": -8.0f, - "Part": "BODY", - "Rotation1": 25.0f, - "Rotation0": 31.0f, - "Pivot0": -2.0f, - "Pivot1": 2.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": -5.0f, - "Part": "RIGHT_ARM", - "Rotation1": 0.0f, - "Rotation0": 50.0f, - "Pivot0": 0.0f, - "Pivot1": 2.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": -2.0f, - "Part": "LEFT_LEG", - "Rotation1": 0.0f, - "Rotation0": 25.0f, - "Pivot0": 0.0f, - "Pivot1": 0.0f, - "Rotation2": -31.0f - }, - { - "Pivot2": -8.0f, - "Part": "LEFT_ARM", - "Rotation1": 31.0f, - "Rotation0": -56.0f, - "Pivot0": -2.0f, - "Pivot1": 2.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": -3.0f, - "Part": "RIGHT_LEG", - "Rotation1": 25.0f, - "Rotation0": 18.0f, - "Pivot0": -1.0f, - "Pivot1": 0.0f, - "Rotation2": 0.0f - }, { "Pivot2": 0.0f, "Part": "FULL_MODEL", @@ -69,6 +24,51 @@ "Pivot0": -2.0f, "Pivot1": 2.0f, "Rotation2": -12.0f + }, + { + "Pivot2": -5.0f, + "Part": "RIGHT_ARM", + "Rotation1": 0.0f, + "Rotation0": 50.0f, + "Pivot0": 0.0f, + "Pivot1": 2.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": -8.0f, + "Part": "LEFT_ARM", + "Rotation1": 31.0f, + "Rotation0": -56.0f, + "Pivot0": -2.0f, + "Pivot1": 2.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": -8.0f, + "Part": "BODY", + "Rotation1": 25.0f, + "Rotation0": 31.0f, + "Pivot0": -2.0f, + "Pivot1": 2.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": -3.0f, + "Part": "RIGHT_LEG", + "Rotation1": 25.0f, + "Rotation0": 18.0f, + "Pivot0": -1.0f, + "Pivot1": 0.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": -2.0f, + "Part": "LEFT_LEG", + "Rotation1": 0.0f, + "Rotation0": 25.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": -31.0f } ], "Smooth": 0b, @@ -79,51 +79,6 @@ "Comment": "", "Speed": 0.35f, "FrameParts": [ - { - "Pivot2": 0.0f, - "Part": "BODY", - "Rotation1": 50.0f, - "Rotation0": -6.0f, - "Pivot0": 0.0f, - "Pivot1": 0.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": 5.0f, - "Part": "RIGHT_ARM", - "Rotation1": 0.0f, - "Rotation0": 50.0f, - "Pivot0": 2.0f, - "Pivot1": 0.0f, - "Rotation2": 170.0f - }, - { - "Pivot2": -3.0f, - "Part": "LEFT_ARM", - "Rotation1": 75.0f, - "Rotation0": -107.0f, - "Pivot0": -6.0f, - "Pivot1": 0.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": -4.0f, - "Part": "LEFT_LEG", - "Rotation1": -6.0f, - "Rotation0": 12.0f, - "Pivot0": 0.0f, - "Pivot1": 0.0f, - "Rotation2": 0.0f - }, - { - "Pivot2": 0.0f, - "Part": "RIGHT_LEG", - "Rotation1": 50.0f, - "Rotation0": 18.0f, - "Pivot0": -3.0f, - "Pivot1": -4.0f, - "Rotation2": 0.0f - }, { "Pivot2": 0.0f, "Part": "FULL_MODEL", @@ -141,6 +96,51 @@ "Pivot0": 0.0f, "Pivot1": 0.0f, "Rotation2": 0.0f + }, + { + "Pivot2": 5.0f, + "Part": "RIGHT_ARM", + "Rotation1": 0.0f, + "Rotation0": 50.0f, + "Pivot0": 2.0f, + "Pivot1": 0.0f, + "Rotation2": 170.0f + }, + { + "Pivot2": -3.0f, + "Part": "LEFT_ARM", + "Rotation1": 75.0f, + "Rotation0": -107.0f, + "Pivot0": -6.0f, + "Pivot1": 0.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "BODY", + "Rotation1": 50.0f, + "Rotation0": -6.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "RIGHT_LEG", + "Rotation1": 50.0f, + "Rotation0": 18.0f, + "Pivot0": -3.0f, + "Pivot1": -4.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": -4.0f, + "Part": "LEFT_LEG", + "Rotation1": -6.0f, + "Rotation0": 12.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": 0.0f } ], "Smooth": 0b, @@ -153,9 +153,18 @@ "FrameParts": [ { "Pivot2": 0.0f, - "Part": "BODY", - "Rotation1": 50.0f, - "Rotation0": -6.0f, + "Part": "FULL_MODEL", + "Rotation1": 0.0f, + "Rotation0": 0.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": 0.0f + }, + { + "Pivot2": 0.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": 0.0f, "Pivot0": 0.0f, "Pivot1": 0.0f, "Rotation2": 0.0f @@ -179,10 +188,10 @@ "Rotation2": 0.0f }, { - "Pivot2": -4.0f, - "Part": "LEFT_LEG", - "Rotation1": -6.0f, - "Rotation0": 12.0f, + "Pivot2": 0.0f, + "Part": "BODY", + "Rotation1": 50.0f, + "Rotation0": -6.0f, "Pivot0": 0.0f, "Pivot1": 0.0f, "Rotation2": 0.0f @@ -197,19 +206,10 @@ "Rotation2": 0.0f }, { - "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", - "Rotation1": 0.0f, - "Rotation0": 0.0f, + "Pivot2": -4.0f, + "Part": "LEFT_LEG", + "Rotation1": -6.0f, + "Rotation0": 12.0f, "Pivot0": 0.0f, "Pivot1": 0.0f, "Rotation2": 0.0f @@ -221,13 +221,13 @@ { "ColorMarker": 16777215, "Comment": "", - "Speed": 2.0f, + "Speed": 3.0f, "FrameParts": [ { - "Pivot2": -5.0f, - "Part": "BODY", - "Rotation1": -37.0f, - "Rotation0": 37.0f, + "Pivot2": -6.0f, + "Part": "HEAD", + "Rotation1": 0.0f, + "Rotation0": 18.0f, "Pivot0": 3.0f, "Pivot1": 2.0f, "Rotation2": 0.0f @@ -241,15 +241,6 @@ "Pivot1": 2.0f, "Rotation2": 56.0f }, - { - "Pivot2": 0.0f, - "Part": "LEFT_LEG", - "Rotation1": -37.0f, - "Rotation0": 31.0f, - "Pivot0": 0.0f, - "Pivot1": 0.0f, - "Rotation2": -25.0f - }, { "Pivot2": 0.0f, "Part": "LEFT_ARM", @@ -259,6 +250,15 @@ "Pivot1": 1.0f, "Rotation2": 0.0f }, + { + "Pivot2": -5.0f, + "Part": "BODY", + "Rotation1": -37.0f, + "Rotation0": 37.0f, + "Pivot0": 3.0f, + "Pivot1": 2.0f, + "Rotation2": 0.0f + }, { "Pivot2": -1.0f, "Part": "RIGHT_LEG", @@ -269,13 +269,13 @@ "Rotation2": 0.0f }, { - "Pivot2": -6.0f, - "Part": "HEAD", - "Rotation1": 0.0f, - "Rotation0": 18.0f, - "Pivot0": 3.0f, - "Pivot1": 2.0f, - "Rotation2": 0.0f + "Pivot2": 0.0f, + "Part": "LEFT_LEG", + "Rotation1": -37.0f, + "Rotation0": 31.0f, + "Pivot0": 0.0f, + "Pivot1": 0.0f, + "Rotation2": -25.0f } ], "Smooth": 0b, @@ -283,7 +283,7 @@ } ], "CurrentFrameTime": 0, - "CurrentFrame": 1, + "CurrentFrame": 3, "Smooth": 0b, "ID": 17, "WhileAttacking": 1b,