From bf3391a1a8e6984e3ec6b14b91910e5d35c2114e Mon Sep 17 00:00:00 2001 From: Vidal Date: Thu, 12 Feb 2026 18:46:11 -0300 Subject: [PATCH] Made trap windup a bit slower to match the animation Made the previously only hazard animation play on both hazard and trap --- .../npcs/controllers/data/ability/type/AbilityHazard.java | 4 ++-- .../npcs/controllers/data/ability/type/AbilityTrap.java | 4 +++- .../{Ability_Hazard_Active.json => Ability_Zone_Active.json} | 2 +- .../{Ability_Hazard_Windup.json => Ability_Zone_Windup.json} | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) rename src/main/resources/assets/customnpcs/animations/{Ability_Hazard_Active.json => Ability_Zone_Active.json} (99%) rename src/main/resources/assets/customnpcs/animations/{Ability_Hazard_Windup.json => Ability_Zone_Windup.json} (99%) 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 551fbe9cc..51538da55 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 @@ -38,8 +38,8 @@ public class AbilityHazard extends AbilityZone implements IAbilityHazard { this.typeId = "ability.cnpc.hazard"; this.name = "Hazard"; this.windUpTicks = 30; - this.windUpAnimationName = "Ability_Hazard_Windup"; - this.activeAnimationName = "Ability_Hazard_Active"; + this.windUpAnimationName = "Ability_Zone_Windup"; + this.activeAnimationName = "Ability_Zone_Active"; } @Override diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityTrap.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityTrap.java index b296fa8bc..d55a4060c 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityTrap.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityTrap.java @@ -40,7 +40,9 @@ public class AbilityTrap extends AbilityZone implements IAbilityTrap { super(300, new EnergyDisplayData(0xFF6600, 0xFF0000, true, 1.0f, 0.5f, 1.5f)); this.typeId = "ability.cnpc.trap"; this.name = "Trap"; - this.windUpTicks = 20; + this.windUpTicks = 30; + this.windUpAnimationName = "Ability_Zone_Windup"; + this.activeAnimationName = "Ability_Zone_Active"; } @Override diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Hazard_Active.json b/src/main/resources/assets/customnpcs/animations/Ability_Zone_Active.json similarity index 99% rename from src/main/resources/assets/customnpcs/animations/Ability_Hazard_Active.json rename to src/main/resources/assets/customnpcs/animations/Ability_Zone_Active.json index 11cb0ef7a..747f73860 100644 --- a/src/main/resources/assets/customnpcs/animations/Ability_Hazard_Active.json +++ b/src/main/resources/assets/customnpcs/animations/Ability_Zone_Active.json @@ -261,6 +261,6 @@ "ID": 24, "WhileAttacking": 1b, "WhileWalking": 1b, - "Name": "Ability_Hazard_Active", + "Name": "Ability_Zone_Active", "WhileStanding": 1b } diff --git a/src/main/resources/assets/customnpcs/animations/Ability_Hazard_Windup.json b/src/main/resources/assets/customnpcs/animations/Ability_Zone_Windup.json similarity index 99% rename from src/main/resources/assets/customnpcs/animations/Ability_Hazard_Windup.json rename to src/main/resources/assets/customnpcs/animations/Ability_Zone_Windup.json index 8a16135a4..40a6abef7 100644 --- a/src/main/resources/assets/customnpcs/animations/Ability_Hazard_Windup.json +++ b/src/main/resources/assets/customnpcs/animations/Ability_Zone_Windup.json @@ -387,6 +387,6 @@ "ID": 23, "WhileAttacking": 1b, "WhileWalking": 1b, - "Name": "Ability_Hazard_Windup", + "Name": "Ability_Zone_Windup", "WhileStanding": 1b }