upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 23:37:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify Attack Functions

Browse Source
This commit is contained in:
Kam committed 2025-03-06 17:40:26 -05:00
1 parent 73594e46c0
commit 78c4aed595
1 file changed
+11 -18
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/kamkeel/npcs/util/AttributeAttackUtil.java
+11 -18
View File
@@ -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);