From 0d84b871af4f9fd2a3afb3cbf452e0a551005557 Mon Sep 17 00:00:00 2001 From: KabanFriends Date: Tue, 10 Feb 2026 04:58:07 +0900 Subject: [PATCH 1/3] Add base damage & base range damage --- .../levelingcore/config/GUIConfig.java | 24 +++++++++++++++++++ .../systems/damage/PlayerDamageFilter.java | 6 +++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/azuredoom/levelingcore/config/GUIConfig.java b/src/main/java/com/azuredoom/levelingcore/config/GUIConfig.java index 0c0d2d2..038c6a1 100644 --- a/src/main/java/com/azuredoom/levelingcore/config/GUIConfig.java +++ b/src/main/java/com/azuredoom/levelingcore/config/GUIConfig.java @@ -247,12 +247,24 @@ public class GUIConfig { (exConfig, extraInfo) -> exConfig.mobDamageMultiplier ) .add() + .append( + new KeyedCodec("MobBaseDamage", Codec.FLOAT), + (exConfig, aFloat, extraInfo) -> exConfig.mobBaseDamage = aFloat, + (exConfig, extraInfo) -> exConfig.mobBaseDamage + ) + .add() .append( new KeyedCodec("MobRangeDamageMultiplier", Codec.FLOAT), (exConfig, aFloat, extraInfo) -> exConfig.mobRangeDamageMultiplier = aFloat, (exConfig, extraInfo) -> exConfig.mobRangeDamageMultiplier ) .add() + .append( + new KeyedCodec("MobBaseRangeDamage", Codec.FLOAT), + (exConfig, aFloat, extraInfo) -> exConfig.mobBaseRangeDamage = aFloat, + (exConfig, extraInfo) -> exConfig.mobBaseRangeDamage + ) + .add() .append( new KeyedCodec("EnableItemLevelRestriction", Codec.BOOLEAN), (exConfig, aBoolean, extraInfo) -> exConfig.enableItemLevelRestriction = aBoolean, @@ -369,8 +381,12 @@ public class GUIConfig { private float mobDamageMultiplier = 0.25F; + private float mobBaseDamage = 0.0F; + private float mobRangeDamageMultiplier = 0.3F; + private float mobBaseRangeDamage = 0.0F; + private boolean enableItemLevelRestriction = false; private boolean enableXPBarUI = true; @@ -616,10 +632,18 @@ public float getMobDamageMultiplier() { return mobDamageMultiplier; } + public float getMobBaseDamage() { + return mobBaseDamage; + } + public float getMobRangeDamageMultiplier() { return mobRangeDamageMultiplier; } + public float getMobBaseRangeDamage() { + return mobBaseRangeDamage; + } + public boolean isEnableItemLevelRestriction() { return enableItemLevelRestriction; } diff --git a/src/main/java/com/azuredoom/levelingcore/systems/damage/PlayerDamageFilter.java b/src/main/java/com/azuredoom/levelingcore/systems/damage/PlayerDamageFilter.java index 742023d..6160584 100644 --- a/src/main/java/com/azuredoom/levelingcore/systems/damage/PlayerDamageFilter.java +++ b/src/main/java/com/azuredoom/levelingcore/systems/damage/PlayerDamageFilter.java @@ -81,16 +81,18 @@ public void handle( () -> MobLevelingUtil.computeSpawnLevel(npcAttacker) ); var mobLevel = mobLevelData.level; + var baseMelee = config.get().getMobBaseDamage(); var meleeMulti = config.get().getMobDamageMultiplier(); + var baseProjectile = config.get().getMobBaseRangeDamage(); var projectileMulti = config.get().getMobRangeDamageMultiplier(); var con = levelService.getCon(victimPlayerRef.getUuid()); var mult = conDamageMultiplier(con); if (isProjectile) { - damage.setAmount(incoming * mult * projectileMulti * mobLevel); + damage.setAmount(incoming * mult * (baseMeelee + projectileMulti * mobLevel)); } else { - damage.setAmount(incoming * mult * meleeMulti * mobLevel); + damage.setAmount(incoming * mult * (baseProjectile + meleeMulti * mobLevel)); } } From 3cfff39da837e27aca023b3f4d4dc084d4c55be8 Mon Sep 17 00:00:00 2001 From: KabanFriends Date: Tue, 10 Feb 2026 05:07:15 +0900 Subject: [PATCH 2/3] Run spotless --- .../java/com/azuredoom/levelingcore/config/GUIConfig.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/azuredoom/levelingcore/config/GUIConfig.java b/src/main/java/com/azuredoom/levelingcore/config/GUIConfig.java index 038c6a1..3daa358 100644 --- a/src/main/java/com/azuredoom/levelingcore/config/GUIConfig.java +++ b/src/main/java/com/azuredoom/levelingcore/config/GUIConfig.java @@ -260,9 +260,9 @@ public class GUIConfig { ) .add() .append( - new KeyedCodec("MobBaseRangeDamage", Codec.FLOAT), - (exConfig, aFloat, extraInfo) -> exConfig.mobBaseRangeDamage = aFloat, - (exConfig, extraInfo) -> exConfig.mobBaseRangeDamage + new KeyedCodec("MobBaseRangeDamage", Codec.FLOAT), + (exConfig, aFloat, extraInfo) -> exConfig.mobBaseRangeDamage = aFloat, + (exConfig, extraInfo) -> exConfig.mobBaseRangeDamage ) .add() .append( From 645390761b948725cdbd6e3623cbcf2e2b2f306b Mon Sep 17 00:00:00 2001 From: KabanFriends Date: Tue, 10 Feb 2026 05:09:30 +0900 Subject: [PATCH 3/3] Fix typo --- .../levelingcore/systems/damage/PlayerDamageFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/azuredoom/levelingcore/systems/damage/PlayerDamageFilter.java b/src/main/java/com/azuredoom/levelingcore/systems/damage/PlayerDamageFilter.java index 6160584..4570d76 100644 --- a/src/main/java/com/azuredoom/levelingcore/systems/damage/PlayerDamageFilter.java +++ b/src/main/java/com/azuredoom/levelingcore/systems/damage/PlayerDamageFilter.java @@ -90,7 +90,7 @@ public void handle( var mult = conDamageMultiplier(con); if (isProjectile) { - damage.setAmount(incoming * mult * (baseMeelee + projectileMulti * mobLevel)); + damage.setAmount(incoming * mult * (baseMelee + projectileMulti * mobLevel)); } else { damage.setAmount(incoming * mult * (baseProjectile + meleeMulti * mobLevel)); }