From 8bcdaf5f118a660b009c75f2a621852a15408d40 Mon Sep 17 00:00:00 2001 From: Kam Date: Thu, 6 Mar 2025 12:20:14 -0500 Subject: [PATCH] Gear! --- .../data/attribute/tracker/PlayerAttributeTracker.java | 4 ++-- src/main/java/kamkeel/npcs/util/AttributeAttackUtil.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/kamkeel/npcs/controllers/data/attribute/tracker/PlayerAttributeTracker.java b/src/main/java/kamkeel/npcs/controllers/data/attribute/tracker/PlayerAttributeTracker.java index 331b9987d..218c4ad1c 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/attribute/tracker/PlayerAttributeTracker.java +++ b/src/main/java/kamkeel/npcs/controllers/data/attribute/tracker/PlayerAttributeTracker.java @@ -29,7 +29,7 @@ public class PlayerAttributeTracker { private PlayerAttributeMap playerAttributes = new PlayerAttributeMap(); public float extraHealth = 0; - public float maximumOutput = 0.0f; + public float gearOutput = 0.0f; public final Map magicDamage = new HashMap<>(); public final Map magicBoost = new HashMap<>(); @@ -116,7 +116,7 @@ public class PlayerAttributeTracker { } } equipmentTracker = currentEquip; - maximumOutput = AttributeAttackUtil.calculateMaximumOutput(this); + gearOutput = AttributeAttackUtil.calculateGearOutput(this); extraHealth = getAttributeValue(CustomAttributes.HEALTH); updatePlayerMaxHealth(player); diff --git a/src/main/java/kamkeel/npcs/util/AttributeAttackUtil.java b/src/main/java/kamkeel/npcs/util/AttributeAttackUtil.java index 8ddfcfb5c..5d868206f 100644 --- a/src/main/java/kamkeel/npcs/util/AttributeAttackUtil.java +++ b/src/main/java/kamkeel/npcs/util/AttributeAttackUtil.java @@ -1,7 +1,6 @@ package kamkeel.npcs.util; import kamkeel.npcs.CustomAttributes; -import kamkeel.npcs.controllers.AttributeController; import net.minecraft.entity.player.EntityPlayer; import kamkeel.npcs.controllers.data.attribute.tracker.PlayerAttributeTracker; import noppes.npcs.config.ConfigMain; @@ -213,7 +212,7 @@ public class AttributeAttackUtil { /** * Calculates a player's maximum output ignoring defensive modifiers. */ - public static float calculateMaximumOutput(PlayerAttributeTracker attacker) { + public static float calculateGearOutput(PlayerAttributeTracker attacker) { float neutralDamage = attacker.getAttributeValue(CustomAttributes.NEUTRAL_ATTACK); float neutralBoost = attacker.getAttributeValue(CustomAttributes.NEUTRAL_BOOST) + 1; float neutralTotal = neutralDamage * neutralBoost; @@ -239,7 +238,7 @@ public class AttributeAttackUtil { PlayerAttributeTracker attacker = getTracker(entityPlayer); float mainAttack = attacker.getAttributeValue(CustomAttributes.MAIN_ATTACK); float mainBoost = attacker.getAttributeValue(CustomAttributes.MAIN_BOOST) + 1; - return attacker.maximumOutput + (baseDamage * mainBoost) + mainAttack; + return attacker.gearOutput + (baseDamage * mainBoost) + mainAttack; } return baseDamage; }