Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions src/main/java/com/azuredoom/levelingcore/config/GUIConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -247,12 +247,24 @@ public class GUIConfig {
(exConfig, extraInfo) -> exConfig.mobDamageMultiplier
)
.add()
.append(
new KeyedCodec<Float>("MobBaseDamage", Codec.FLOAT),
(exConfig, aFloat, extraInfo) -> exConfig.mobBaseDamage = aFloat,
(exConfig, extraInfo) -> exConfig.mobBaseDamage
)
.add()
.append(
new KeyedCodec<Float>("MobRangeDamageMultiplier", Codec.FLOAT),
(exConfig, aFloat, extraInfo) -> exConfig.mobRangeDamageMultiplier = aFloat,
(exConfig, extraInfo) -> exConfig.mobRangeDamageMultiplier
)
.add()
.append(
new KeyedCodec<Float>("MobBaseRangeDamage", Codec.FLOAT),
(exConfig, aFloat, extraInfo) -> exConfig.mobBaseRangeDamage = aFloat,
(exConfig, extraInfo) -> exConfig.mobBaseRangeDamage
)
.add()
.append(
new KeyedCodec<Boolean>("EnableItemLevelRestriction", Codec.BOOLEAN),
(exConfig, aBoolean, extraInfo) -> exConfig.enableItemLevelRestriction = aBoolean,
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 * (baseMelee + projectileMulti * mobLevel));
} else {
damage.setAmount(incoming * mult * meleeMulti * mobLevel);
damage.setAmount(incoming * mult * (baseProjectile + meleeMulti * mobLevel));
}
}

Expand Down
Loading