From 78c4aed59563178eb8f7101188d1073b269a6530 Mon Sep 17 00:00:00 2001 From: Kam Date: Thu, 6 Mar 2025 17:40:26 -0500 Subject: [PATCH] Simplify Attack Functions --- .../npcs/util/AttributeAttackUtil.java | 29 +++++++------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/src/main/java/kamkeel/npcs/util/AttributeAttackUtil.java b/src/main/java/kamkeel/npcs/util/AttributeAttackUtil.java index a5bd55c19..92073b447 100644 --- a/src/main/java/kamkeel/npcs/util/AttributeAttackUtil.java +++ b/src/main/java/kamkeel/npcs/util/AttributeAttackUtil.java @@ -120,15 +120,7 @@ public class AttributeAttackUtil { PlayerAttributeTracker defender = getTracker(defendPlayer); // Calculate physical damage. - float physicalDamage; - if (ConfigMain.AttributesEnabled) { - float mainAttack = attacker.getAttributeValue(CustomAttributes.MAIN_ATTACK); - float mainBoost = attacker.getAttributeValue(CustomAttributes.MAIN_BOOST) + 1; - physicalDamage = (baseDamage * mainBoost) + mainAttack; - } else { - physicalDamage = baseDamage; - } - + float physicalDamage = applyMainAttack(baseDamage, attacker); AllocationResult result = allocateMagicDamage(physicalDamage, attackerData.magicData.getMagics()); float leftover = applyNeutral(result.leftover, attacker); addAttributeMagicDamage(result.allocation, attacker.magicDamage, attacker.magicBoost); @@ -148,15 +140,7 @@ public class AttributeAttackUtil { PlayerData attackerData = PlayerData.get(attackPlayer); PlayerAttributeTracker attacker = getTracker(attackPlayer); - float physicalDamage; - if (ConfigMain.AttributesEnabled) { - float mainAttack = attacker.getAttributeValue(CustomAttributes.MAIN_ATTACK); - float mainBoost = attacker.getAttributeValue(CustomAttributes.MAIN_BOOST) + 1; - physicalDamage = (baseDamage * mainBoost) + mainAttack; - } else { - physicalDamage = baseDamage; - } - + float physicalDamage = applyMainAttack(baseDamage, attacker); AllocationResult result = allocateMagicDamage(physicalDamage, attackerData.magicData.getMagics()); float leftover = applyNeutral(result.leftover, attacker); @@ -185,6 +169,15 @@ public class AttributeAttackUtil { return damage; } + public static float applyMainAttack(float damage, PlayerAttributeTracker tracker){ + if (ConfigMain.AttributesEnabled) { + float mainAttack = tracker.getAttributeValue(CustomAttributes.MAIN_ATTACK); + float mainBoost = tracker.getAttributeValue(CustomAttributes.MAIN_BOOST) + 1; + damage = (damage * mainBoost) + mainAttack; + } + return damage; + } + public static float applyNeutral(float leftover, PlayerAttributeTracker tracker){ if (ConfigMain.AttributesEnabled) { float neutralDamage = tracker.getAttributeValue(CustomAttributes.NEUTRAL_ATTACK);