From 0fa1e406a0500ca7f427b7cb6d01ccf81e899a4e Mon Sep 17 00:00:00 2001 From: Auxilor Date: Thu, 15 Oct 2020 12:33:36 +0100 Subject: [PATCH] Made configs more consistent --- .../enchantments/ecoenchants/normal/Aerial.java | 6 +++--- .../enchantments/ecoenchants/normal/Aquatic.java | 9 ++++----- .../ecoenchants/normal/Atmospheric.java | 6 +++--- .../enchantments/ecoenchants/normal/Backstab.java | 5 ++++- .../enchantments/ecoenchants/normal/Criticals.java | 5 ++++- .../enchantments/ecoenchants/normal/Diurnal.java | 2 +- .../enchantments/ecoenchants/normal/Diverse.java | 2 +- .../ecoenchants/normal/EndInfusion.java | 2 +- .../enchantments/ecoenchants/normal/Enderism.java | 4 ++-- .../enchantments/ecoenchants/normal/Extract.java | 5 ++--- .../ecoenchants/normal/FireAffinity.java | 9 ++++----- .../ecoenchants/normal/FirstStrike.java | 6 ++++-- .../enchantments/ecoenchants/normal/Goliath.java | 6 ++++-- .../enchantments/ecoenchants/normal/Hellish.java | 2 +- .../enchantments/ecoenchants/normal/Leeching.java | 5 ++--- .../ecoenchants/normal/NetherInfusion.java | 2 +- .../enchantments/ecoenchants/normal/Netheric.java | 2 +- .../enchantments/ecoenchants/normal/Nocturnal.java | 2 +- .../enchantments/ecoenchants/normal/Paladin.java | 5 ++++- .../enchantments/ecoenchants/normal/Parasitic.java | 5 ++--- .../enchantments/ecoenchants/normal/Parry.java | 6 +++--- .../enchantments/ecoenchants/normal/Proximity.java | 12 +++++++----- .../enchantments/ecoenchants/normal/Puncture.java | 9 ++++----- .../enchantments/ecoenchants/normal/Serrated.java | 10 ++++------ .../enchantments/ecoenchants/normal/ShotAssist.java | 2 +- .../enchantments/ecoenchants/normal/Sycophant.java | 13 ++++++------- .../ecoenchants/normal/VoidAffinity.java | 2 +- .../ecoenchants/normal/WaterAffinity.java | 9 ++++----- .../enchantments/ecoenchants/special/Bladed.java | 11 +++++------ .../enchantments/ecoenchants/special/LifeSteal.java | 5 ++--- .../enchantments/ecoenchants/special/Razor.java | 2 +- .../src/main/resources/enchants/normal/aerial.yml | 2 +- .../src/main/resources/enchants/normal/aquatic.yml | 2 +- .../main/resources/enchants/normal/atmospheric.yml | 2 +- .../src/main/resources/enchants/normal/backstab.yml | 2 +- .../main/resources/enchants/normal/criticals.yml | 2 +- .../src/main/resources/enchants/normal/diurnal.yml | 2 +- .../src/main/resources/enchants/normal/diverse.yml | 2 +- .../src/main/resources/enchants/normal/enderism.yml | 2 +- .../main/resources/enchants/normal/endinfusion.yml | 2 +- .../src/main/resources/enchants/normal/extract.yml | 4 ++-- .../main/resources/enchants/normal/fireaffinity.yml | 2 +- .../main/resources/enchants/normal/firststrike.yml | 2 +- .../src/main/resources/enchants/normal/goliath.yml | 2 +- .../src/main/resources/enchants/normal/hellish.yml | 2 +- .../src/main/resources/enchants/normal/leeching.yml | 4 ++-- .../src/main/resources/enchants/normal/netheric.yml | 2 +- .../resources/enchants/normal/netherinfusion.yml | 2 +- .../main/resources/enchants/normal/nocturnal.yml | 2 +- .../src/main/resources/enchants/normal/paladin.yml | 2 +- .../main/resources/enchants/normal/parasitic.yml | 4 ++-- Plugin/src/main/resources/enchants/normal/parry.yml | 2 +- .../main/resources/enchants/normal/proximity.yml | 2 +- .../src/main/resources/enchants/normal/puncture.yml | 2 +- .../src/main/resources/enchants/normal/serrated.yml | 5 +---- .../main/resources/enchants/normal/shotassist.yml | 2 +- .../main/resources/enchants/normal/sycophant.yml | 4 ++-- .../main/resources/enchants/normal/voidaffinity.yml | 2 +- .../resources/enchants/normal/wateraffinity.yml | 2 +- .../src/main/resources/enchants/special/bladed.yml | 6 +++--- .../main/resources/enchants/special/lifesteal.yml | 4 ++-- .../src/main/resources/enchants/special/razor.yml | 2 +- 62 files changed, 125 insertions(+), 125 deletions(-) diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Aerial.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Aerial.java index 80502b76..809bec3a 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Aerial.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Aerial.java @@ -34,8 +34,8 @@ public final class Aerial extends EcoEnchant { if(!arrow.hasMetadata("shot-in-air")) return; double damage = event.getDamage(); - double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "damage-multiplier-per-level"); - double reduction = 1 + (multiplier * level); - event.setDamage(damage * reduction); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); + double bonus = 1 + (multiplier * level); + event.setDamage(damage * bonus); } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Aquatic.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Aquatic.java index e0d1eee6..d5f363e2 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Aquatic.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Aquatic.java @@ -22,10 +22,9 @@ public final class Aquatic extends EcoEnchant { if(!attacker.getLocation().getBlock().getType().equals(Material.WATER)) return; - double perLevelDamage = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "percent-more-per-level"); - - double totalDamagePercent = (100 + (perLevelDamage * level))/100; - - event.setDamage(event.getDamage() * totalDamagePercent); + double damage = event.getDamage(); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); + double reduction = 1 + (multiplier * level); + event.setDamage(damage * reduction); } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Atmospheric.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Atmospheric.java index c2e925dd..3a491a34 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Atmospheric.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Atmospheric.java @@ -31,8 +31,8 @@ public final class Atmospheric extends EcoEnchant { if(!trident.hasMetadata("shot-in-air")) return; double damage = event.getDamage(); - double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "damage-multiplier-per-level"); - double reduction = 1 + (multiplier * level); - event.setDamage(damage * reduction); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); + double bonus = 1 + (multiplier * level); + event.setDamage(damage * bonus); } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Backstab.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Backstab.java index 2a445106..41f6115f 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Backstab.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Backstab.java @@ -29,6 +29,9 @@ public final class Backstab extends EcoEnchant { if(angleInDegrees > 60 || angleInDegrees < -32) return; - event.setDamage(event.getDamage() * ((level * this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "damage-multiplier-per-level")) + 1)); + double damage = event.getDamage(); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); + double bonus = 1 + (multiplier * level); + event.setDamage(damage * bonus); } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Criticals.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Criticals.java index e62c9ca6..12423662 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Criticals.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Criticals.java @@ -20,6 +20,9 @@ public final class Criticals extends EcoEnchant { if (!(attacker.getFallDistance() > 0 && !attacker.isOnGround())) return; - event.setDamage(event.getDamage() * ((level * this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "damage-multiplier-per-level")) + 1)); + double damage = event.getDamage(); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); + double bonus = 1 + (multiplier * level); + event.setDamage(damage * bonus); } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Diurnal.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Diurnal.java index 62086c8b..32d9a53a 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Diurnal.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Diurnal.java @@ -23,7 +23,7 @@ public final class Diurnal extends EcoEnchant { if(!(attacker.getWorld().getTime() < 12300 && attacker.getWorld().getTime() > 23850)) return; - double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "per-level-multiplier"); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); event.setDamage(event.getDamage() * (1 + (level * multiplier))); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Diverse.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Diverse.java index fa24b623..aa278cb8 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Diverse.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Diverse.java @@ -22,7 +22,7 @@ public final class Diverse extends EcoEnchant { if(!victim.getEquipment().getItemInMainHand().getType().toString().endsWith("_SWORD")) return; - double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "per-level-multiplier"); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); event.setDamage(event.getDamage() * (1 + (level * multiplier))); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/EndInfusion.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/EndInfusion.java index 07026a39..9fcca383 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/EndInfusion.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/EndInfusion.java @@ -22,7 +22,7 @@ public final class EndInfusion extends EcoEnchant { if(!attacker.getWorld().getEnvironment().equals(World.Environment.THE_END)) return; - double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "per-level-multiplier"); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); event.setDamage(event.getDamage() * (1 + (level * multiplier))); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Enderism.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Enderism.java index efd4f721..c93a28e8 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Enderism.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Enderism.java @@ -26,7 +26,7 @@ public final class Enderism extends EcoEnchant { if(!attacker.getWorld().getEnvironment().equals(World.Environment.THE_END)) return; - double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "per-level-multiplier"); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); event.setDamage(event.getDamage() * (1 + (level * multiplier))); } @@ -48,7 +48,7 @@ public final class Enderism extends EcoEnchant { if (!EnchantChecks.arrow(arrow, this)) return; int level = EnchantChecks.getArrowLevel(arrow, this); - double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "per-level-multiplier"); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); event.setDamage(event.getDamage() * (1 + (level * multiplier))); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Extract.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Extract.java index 43e1e252..e4c52029 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Extract.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Extract.java @@ -19,9 +19,8 @@ public final class Extract extends EcoEnchant { @Override public void onTridentDamage(LivingEntity attacker, LivingEntity victim, Trident trident, int level, EntityDamageByEntityEvent event) { - double damage = event.getDamage(); - double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "damage-multiplier-per-level"); - double amountToHeal = damage * level * multiplier; + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "health-per-level"); + double amountToHeal = level * multiplier; double newHealth = attacker.getHealth() + amountToHeal; if (newHealth > attacker.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()) { newHealth = attacker.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue(); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/FireAffinity.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/FireAffinity.java index 1b165bff..154f4918 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/FireAffinity.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/FireAffinity.java @@ -19,10 +19,9 @@ public final class FireAffinity extends EcoEnchant { public void onMeleeAttack(LivingEntity attacker, LivingEntity victim, int level, EntityDamageByEntityEvent event) { if(attacker.getFireTicks() == 0) return; - double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "percent-more-per-level"); - - double finalMultiplier = (multiplier/100 * level) + 1; - - event.setDamage(event.getDamage() * finalMultiplier); + double damage = event.getDamage(); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); + double bonus = 1 + (multiplier * level); + event.setDamage(damage * bonus); } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/FirstStrike.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/FirstStrike.java index fcf50224..66944f5a 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/FirstStrike.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/FirstStrike.java @@ -20,7 +20,9 @@ public final class FirstStrike extends EcoEnchant { if (!(victim.getHealth() == victim.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue())) return; - double damagemultiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "damage-multiplier-per-level"); - event.setDamage(event.getDamage() * ((level * damagemultiplier) + 1)); + double damage = event.getDamage(); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); + double bonus = 1 + (multiplier * level); + event.setDamage(damage * bonus); } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Goliath.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Goliath.java index 4fdb1bbd..a4e587a3 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Goliath.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Goliath.java @@ -23,7 +23,9 @@ public final class Goliath extends EcoEnchant { double timesMoreHealth = victim.getHealth() / attacker.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue(); - double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "damage-multiplier-per-level"); - event.setDamage(event.getDamage() * ((level * multiplier * timesMoreHealth) + 1)); + double damage = event.getDamage(); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); + double bonus = 1 + (multiplier * level * timesMoreHealth); + event.setDamage(damage * bonus); } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Hellish.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Hellish.java index 28d9e2a9..c8b451d3 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Hellish.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Hellish.java @@ -23,7 +23,7 @@ public final class Hellish extends EcoEnchant { if(!attacker.getWorld().getEnvironment().equals(World.Environment.NETHER)) return; - double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "per-level-multiplier"); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); event.setDamage(event.getDamage() * (1 + (level * multiplier))); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Leeching.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Leeching.java index 3b8fcd0d..d7e9c7f0 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Leeching.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Leeching.java @@ -18,9 +18,8 @@ public final class Leeching extends EcoEnchant { @Override public void onMeleeAttack(LivingEntity attacker, LivingEntity victim, int level, EntityDamageByEntityEvent event) { - double damage = event.getDamage(); - double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "damage-multiplier-per-level"); - double amountToHeal = damage * level * multiplier; + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "health-per-level"); + double amountToHeal = level * multiplier; double newHealth = attacker.getHealth() + amountToHeal; if (newHealth > attacker.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()) { newHealth = attacker.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue(); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/NetherInfusion.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/NetherInfusion.java index 86f8a138..35205baf 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/NetherInfusion.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/NetherInfusion.java @@ -21,7 +21,7 @@ public final class NetherInfusion extends EcoEnchant { if(!attacker.getWorld().getEnvironment().equals(World.Environment.NETHER)) return; - double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "per-level-multiplier"); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); event.setDamage(event.getDamage() * (1 + (level * multiplier))); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Netheric.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Netheric.java index 62391be6..d5897384 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Netheric.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Netheric.java @@ -23,7 +23,7 @@ public final class Netheric extends EcoEnchant { if(!attacker.getWorld().getEnvironment().equals(World.Environment.NETHER)) return; - double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "per-level-multiplier"); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); event.setDamage(event.getDamage() * (1 + (level * multiplier))); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Nocturnal.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Nocturnal.java index 8a88b69b..3bfcab4d 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Nocturnal.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Nocturnal.java @@ -24,7 +24,7 @@ public final class Nocturnal extends EcoEnchant { if(!(attacker.getWorld().getTime() > 12300 && attacker.getWorld().getTime() < 23850)) return; - double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "per-level-multiplier"); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); event.setDamage(event.getDamage() * (1 + (level * multiplier))); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Paladin.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Paladin.java index d97dc265..6e6bde65 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Paladin.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Paladin.java @@ -20,6 +20,9 @@ public final class Paladin extends EcoEnchant { public void onMeleeAttack(LivingEntity attacker, LivingEntity victim, int level, EntityDamageByEntityEvent event) { if(!(attacker.getVehicle() instanceof Horse)) return; - event.setDamage(event.getDamage() * ((level * this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "damage-multiplier-per-level")) + 1)); + double damage = event.getDamage(); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); + double bonus = 1 + (multiplier * level); + event.setDamage(damage * bonus); } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parasitic.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parasitic.java index d6ad3eff..55743a3c 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parasitic.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parasitic.java @@ -19,9 +19,8 @@ public final class Parasitic extends EcoEnchant { @Override public void onArrowDamage(LivingEntity attacker, LivingEntity victim, Arrow arrow, int level, EntityDamageByEntityEvent event) { - double damage = event.getDamage(); - double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "damage-multiplier-per-level"); - double amountToHeal = damage * level * multiplier; + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "health-per-level"); + double amountToHeal = level * multiplier; double newHealth = attacker.getHealth() + amountToHeal; if (newHealth > attacker.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()) { newHealth = attacker.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue(); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parry.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parry.java index 618b1e43..ee338553 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parry.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parry.java @@ -31,8 +31,8 @@ public final class Parry extends EcoEnchant { int level = EnchantChecks.getMainhandLevel(player, this); double damage = event.getDamage(); - double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "damage-multiplier-per-level"); - double reduction = 1 - (multiplier * level); - event.setDamage(damage * reduction); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); + double bonus = 1 - (multiplier * level); + event.setDamage(damage * bonus); } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Proximity.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Proximity.java index 16a27ba3..88f2084e 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Proximity.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Proximity.java @@ -21,10 +21,12 @@ public final class Proximity extends EcoEnchant { double decreaseAfter = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "when-closer-than-blocks"); - if(distance <= decreaseAfter) { - double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "percent-more-per-level"); - double finalMultiplier = (multiplier/100 * level) +1; - event.setDamage(event.getDamage() * finalMultiplier); - } + if(distance > decreaseAfter) + return; + + double damage = event.getDamage(); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); + double bonus = 1 + (multiplier * level); + event.setDamage(damage * bonus); } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Puncture.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Puncture.java index 1f80867b..4261d753 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Puncture.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Puncture.java @@ -23,10 +23,9 @@ public final class Puncture extends EcoEnchant { if(!(victim instanceof Turtle || victim instanceof Shulker)) return; - double perLevelDamage = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "percent-more-per-level"); - - double totalDamagePercent = (100 + (perLevelDamage * level))/100; - - event.setDamage(event.getDamage() * totalDamagePercent); + double damage = event.getDamage(); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); + double bonus = 1 + (multiplier * level); + event.setDamage(damage * bonus); } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Serrated.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Serrated.java index 30c8d056..f4a4ff85 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Serrated.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Serrated.java @@ -18,11 +18,9 @@ public final class Serrated extends EcoEnchant { @Override public void onTridentDamage(LivingEntity attacker, LivingEntity victim, Trident trident, int level, EntityDamageByEntityEvent event) { - double baseDamage = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "percent-more-base"); - double perLevelDamage = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "percent-more-per-level"); - - double totalDamagePercent = (100 + baseDamage + (perLevelDamage * level))/100; - - event.setDamage(event.getDamage() * totalDamagePercent); + double damage = event.getDamage(); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); + double bonus = 1 + (multiplier * level); + event.setDamage(damage * bonus); } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/ShotAssist.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/ShotAssist.java index 60f7abc8..e377308a 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/ShotAssist.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/ShotAssist.java @@ -38,7 +38,7 @@ public final class ShotAssist extends EcoEnchant { if(points == 0) return; double damage = event.getDamage(); - double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "damage-multiplier-per-level"); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); double reduction = 1 + (multiplier * points); event.setDamage(damage * reduction); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Sycophant.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Sycophant.java index 0dd26099..b15e1ace 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Sycophant.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Sycophant.java @@ -19,13 +19,12 @@ public final class Sycophant extends EcoEnchant { @Override public void onDeflect(Player blocker, LivingEntity attacker, int level, EntityDamageByEntityEvent event) { - double damage = event.getDamage(); - double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "damage-multiplier-per-level"); - double amountToHeal = damage * level * multiplier; - double newHealth = blocker.getHealth() + amountToHeal; - if (newHealth > blocker.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()) { - newHealth = blocker.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue(); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "health-per-level"); + double amountToHeal = level * multiplier; + double newHealth = attacker.getHealth() + amountToHeal; + if (newHealth > attacker.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()) { + newHealth = attacker.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue(); } - blocker.setHealth(newHealth); + attacker.setHealth(newHealth); } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/VoidAffinity.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/VoidAffinity.java index 57247745..dce67663 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/VoidAffinity.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/VoidAffinity.java @@ -23,7 +23,7 @@ public final class VoidAffinity extends EcoEnchant { if(!attacker.getWorld().getEnvironment().equals(World.Environment.THE_END)) return; - double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "per-level-multiplier"); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); event.setDamage(event.getDamage() * (1 + (level * multiplier))); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/WaterAffinity.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/WaterAffinity.java index 6374aae2..4ec92625 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/WaterAffinity.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/WaterAffinity.java @@ -21,10 +21,9 @@ public final class WaterAffinity extends EcoEnchant { if(!attacker.getLocation().getBlock().getType().equals(Material.WATER)) return; - double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "percent-more-per-level"); - - double finalMultiplier = (multiplier/100 * level) + 1; - - event.setDamage(event.getDamage() * finalMultiplier); + double damage = event.getDamage(); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); + double bonus = 1 + (multiplier * level); + event.setDamage(damage * bonus); } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bladed.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bladed.java index 484fb96c..0c2282d8 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bladed.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bladed.java @@ -18,11 +18,10 @@ public final class Bladed extends EcoEnchant { @Override public void onTridentDamage(LivingEntity attacker, LivingEntity victim, Trident trident, int level, EntityDamageByEntityEvent event) { - double baseDamage = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "percent-more-base"); - double perLevelDamage = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "percent-more-per-level"); - - double totalDamagePercent = (100 + baseDamage + (perLevelDamage * level))/100; - - event.setDamage(event.getDamage() * totalDamagePercent); + double baseDamage = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "base-multiplier"); + double damage = event.getDamage(); + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); + double bonus = 1 + (multiplier * level) + baseDamage; + event.setDamage(damage * bonus); } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/LifeSteal.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/LifeSteal.java index 1057c748..35c3be86 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/LifeSteal.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/LifeSteal.java @@ -18,9 +18,8 @@ public final class LifeSteal extends EcoEnchant { @Override public void onMeleeAttack(LivingEntity attacker, LivingEntity victim, int level, EntityDamageByEntityEvent event) { - double damage = event.getDamage(); - double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "damage-multiplier-per-level"); - double amountToHeal = damage * level * multiplier; + double multiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "health-per-level"); + double amountToHeal = level * multiplier; double newHealth = attacker.getHealth() + amountToHeal; if (newHealth > attacker.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()) { newHealth = attacker.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue(); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Razor.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Razor.java index b4fc99ce..6743fa15 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Razor.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Razor.java @@ -19,7 +19,7 @@ public final class Razor extends EcoEnchant { @Override public void onMeleeAttack(LivingEntity attacker, LivingEntity victim, int level, EntityDamageByEntityEvent event) { - double perLevelMultiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "per-level-multiplier"); + double perLevelMultiplier = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "multiplier"); double baseDamage = this.getConfig().getDouble(EcoEnchants.CONFIG_LOCATION + "base-damage"); double extra = level*perLevelMultiplier + baseDamage; if(this.getConfig().getBool((EcoEnchants.CONFIG_LOCATION) + "decrease-if-cooldown")) { diff --git a/Plugin/src/main/resources/enchants/normal/aerial.yml b/Plugin/src/main/resources/enchants/normal/aerial.yml index 596ef3e6..12522bb2 100644 --- a/Plugin/src/main/resources/enchants/normal/aerial.yml +++ b/Plugin/src/main/resources/enchants/normal/aerial.yml @@ -21,4 +21,4 @@ general-config: maximum-level: 3 config: - damage-multiplier-per-level: 0.06 # 1 + (Level * Multiplier) is multiplied with the damage + multiplier: 0.06 # 1 + (Level * Multiplier) is multiplied with the damage diff --git a/Plugin/src/main/resources/enchants/normal/aquatic.yml b/Plugin/src/main/resources/enchants/normal/aquatic.yml index cd9b77c8..bcaaa093 100644 --- a/Plugin/src/main/resources/enchants/normal/aquatic.yml +++ b/Plugin/src/main/resources/enchants/normal/aquatic.yml @@ -20,4 +20,4 @@ general-config: maximum-level: 8 config: - percent-more-per-level: 2.5 # Percent more damage to do per level + multiplier: 0.05 # 1 + (Level * Multiplier) is multiplied with the damage diff --git a/Plugin/src/main/resources/enchants/normal/atmospheric.yml b/Plugin/src/main/resources/enchants/normal/atmospheric.yml index f861c079..060bd7a9 100644 --- a/Plugin/src/main/resources/enchants/normal/atmospheric.yml +++ b/Plugin/src/main/resources/enchants/normal/atmospheric.yml @@ -20,4 +20,4 @@ general-config: maximum-level: 3 config: - damage-multiplier-per-level: 0.06 # 1 + (Level * Multiplier) is multiplied with the damage + multiplier: 0.06 # 1 + (Level * Multiplier) is multiplied with the damage diff --git a/Plugin/src/main/resources/enchants/normal/backstab.yml b/Plugin/src/main/resources/enchants/normal/backstab.yml index a6fe2b29..65a97f0e 100644 --- a/Plugin/src/main/resources/enchants/normal/backstab.yml +++ b/Plugin/src/main/resources/enchants/normal/backstab.yml @@ -21,4 +21,4 @@ general-config: maximum-level: 3 config: - damage-multiplier-per-level: 0.1 \ No newline at end of file + multiplier: 0.1 # 1 + (Level * Multiplier) is multiplied with the damage \ No newline at end of file diff --git a/Plugin/src/main/resources/enchants/normal/criticals.yml b/Plugin/src/main/resources/enchants/normal/criticals.yml index ec1d9b1c..940a5e56 100644 --- a/Plugin/src/main/resources/enchants/normal/criticals.yml +++ b/Plugin/src/main/resources/enchants/normal/criticals.yml @@ -21,4 +21,4 @@ general-config: maximum-level: 3 config: - damage-multiplier-per-level: 0.1 \ No newline at end of file + multiplier: 0.1 # 1 + (Level * Multiplier) is multiplied with the damage \ No newline at end of file diff --git a/Plugin/src/main/resources/enchants/normal/diurnal.yml b/Plugin/src/main/resources/enchants/normal/diurnal.yml index b36ed092..26de7ec2 100644 --- a/Plugin/src/main/resources/enchants/normal/diurnal.yml +++ b/Plugin/src/main/resources/enchants/normal/diurnal.yml @@ -21,4 +21,4 @@ general-config: maximum-level: 6 config: - per-level-multiplier: 0.02 # Multiplier per level for damage. Calculated as damage * (1 + level * multiplier) + multiplier: 0.02 # Multiplier per level for damage. Calculated as damage * (1 + level * multiplier) diff --git a/Plugin/src/main/resources/enchants/normal/diverse.yml b/Plugin/src/main/resources/enchants/normal/diverse.yml index 8bbf9722..334f81eb 100644 --- a/Plugin/src/main/resources/enchants/normal/diverse.yml +++ b/Plugin/src/main/resources/enchants/normal/diverse.yml @@ -20,4 +20,4 @@ general-config: maximum-level: 6 config: - per-level-multiplier: 0.05 # Multiplier per level for damage. Calculated as damage * (1 + level * multiplier) + multiplier: 0.05 # Multiplier per level for damage. Calculated as damage * (1 + level * multiplier) diff --git a/Plugin/src/main/resources/enchants/normal/enderism.yml b/Plugin/src/main/resources/enchants/normal/enderism.yml index 14cb2b80..ed286f31 100644 --- a/Plugin/src/main/resources/enchants/normal/enderism.yml +++ b/Plugin/src/main/resources/enchants/normal/enderism.yml @@ -22,4 +22,4 @@ general-config: maximum-level: 6 config: - per-level-multiplier: 0.02 # Multiplier per level for damage. Calculated as damage * (1 + level * multiplier) + multiplier: 0.02 # Multiplier per level for damage. Calculated as damage * (1 + level * multiplier) diff --git a/Plugin/src/main/resources/enchants/normal/endinfusion.yml b/Plugin/src/main/resources/enchants/normal/endinfusion.yml index d220318d..0df773b3 100644 --- a/Plugin/src/main/resources/enchants/normal/endinfusion.yml +++ b/Plugin/src/main/resources/enchants/normal/endinfusion.yml @@ -21,4 +21,4 @@ general-config: maximum-level: 6 config: - per-level-multiplier: 0.02 # Multiplier per level for damage. Calculated as damage * (1 + level * multiplier) + multiplier: 0.02 # Multiplier per level for damage. Calculated as damage * (1 + level * multiplier) diff --git a/Plugin/src/main/resources/enchants/normal/extract.yml b/Plugin/src/main/resources/enchants/normal/extract.yml index 6a34eea1..26252734 100644 --- a/Plugin/src/main/resources/enchants/normal/extract.yml +++ b/Plugin/src/main/resources/enchants/normal/extract.yml @@ -17,7 +17,7 @@ general-config: - trident grindstoneable: true conflicts: [] - maximum-level: 6 + maximum-level: 3 config: - damage-multiplier-per-level: 0.02 # Damage * Level * Multiplier is used to calculate how much health to heal + health-per-level: 1 # Level * Health = Amount of health to heal diff --git a/Plugin/src/main/resources/enchants/normal/fireaffinity.yml b/Plugin/src/main/resources/enchants/normal/fireaffinity.yml index 437ffa76..461a67b2 100644 --- a/Plugin/src/main/resources/enchants/normal/fireaffinity.yml +++ b/Plugin/src/main/resources/enchants/normal/fireaffinity.yml @@ -21,4 +21,4 @@ general-config: maximum-level: 7 config: - percent-more-per-level: 2 # percent more damage to deal per level when on fire + multiplier: 0.05 # 1 + (Level * Multiplier) is multiplied with the damage diff --git a/Plugin/src/main/resources/enchants/normal/firststrike.yml b/Plugin/src/main/resources/enchants/normal/firststrike.yml index e71f3c97..be24706c 100644 --- a/Plugin/src/main/resources/enchants/normal/firststrike.yml +++ b/Plugin/src/main/resources/enchants/normal/firststrike.yml @@ -20,4 +20,4 @@ general-config: maximum-level: 5 config: - damage-multiplier-per-level: 0.15 \ No newline at end of file + multiplier: 0.15 # 1 + (Level * Multiplier) is multiplied with the damage \ No newline at end of file diff --git a/Plugin/src/main/resources/enchants/normal/goliath.yml b/Plugin/src/main/resources/enchants/normal/goliath.yml index 6eb9411a..dfd3144e 100644 --- a/Plugin/src/main/resources/enchants/normal/goliath.yml +++ b/Plugin/src/main/resources/enchants/normal/goliath.yml @@ -20,4 +20,4 @@ general-config: maximum-level: 8 config: - damage-multiplier-per-level: 0.01 # If enemy has 200 health, and you have 20 w/ goliath 8 then your damage is multiplied by: ((200/10)*8*0.01) + 1 = 2.6 \ No newline at end of file + multiplier: 0.01 # If enemy has 200 health, and you have 20 w/ goliath 8 then your damage is multiplied by: ((200/10)*8*0.01) + 1 = 2.6 \ No newline at end of file diff --git a/Plugin/src/main/resources/enchants/normal/hellish.yml b/Plugin/src/main/resources/enchants/normal/hellish.yml index 71e9beb2..db493971 100644 --- a/Plugin/src/main/resources/enchants/normal/hellish.yml +++ b/Plugin/src/main/resources/enchants/normal/hellish.yml @@ -21,4 +21,4 @@ general-config: maximum-level: 6 config: - per-level-multiplier: 0.02 # Multiplier per level for damage. Calculated as damage * (1 + level * multiplier) + multiplier: 0.02 # Multiplier per level for damage. Calculated as damage * (1 + level * multiplier) diff --git a/Plugin/src/main/resources/enchants/normal/leeching.yml b/Plugin/src/main/resources/enchants/normal/leeching.yml index c313ed8b..69c66c26 100644 --- a/Plugin/src/main/resources/enchants/normal/leeching.yml +++ b/Plugin/src/main/resources/enchants/normal/leeching.yml @@ -19,7 +19,7 @@ general-config: grindstoneable: true conflicts: - life_steal - maximum-level: 6 + maximum-level: 3 config: - damage-multiplier-per-level: 0.02 # Damage * Level * Multiplier is used to calculate how much health to heal + health-per-level: 1 # Level * Health = Amount of health to heal diff --git a/Plugin/src/main/resources/enchants/normal/netheric.yml b/Plugin/src/main/resources/enchants/normal/netheric.yml index 5e367cf2..31312adb 100644 --- a/Plugin/src/main/resources/enchants/normal/netheric.yml +++ b/Plugin/src/main/resources/enchants/normal/netheric.yml @@ -22,4 +22,4 @@ general-config: maximum-level: 6 config: - per-level-multiplier: 0.02 # Multiplier per level for damage. Calculated as damage * (1 + level * multiplier) + multiplier: 0.02 # Multiplier per level for damage. Calculated as damage * (1 + level * multiplier) diff --git a/Plugin/src/main/resources/enchants/normal/netherinfusion.yml b/Plugin/src/main/resources/enchants/normal/netherinfusion.yml index 9cb06442..645f8265 100644 --- a/Plugin/src/main/resources/enchants/normal/netherinfusion.yml +++ b/Plugin/src/main/resources/enchants/normal/netherinfusion.yml @@ -21,4 +21,4 @@ general-config: maximum-level: 6 config: - per-level-multiplier: 0.02 # Multiplier per level for damage. Calculated as damage * (1 + level * multiplier) + multiplier: 0.02 # Multiplier per level for damage. Calculated as damage * (1 + level * multiplier) diff --git a/Plugin/src/main/resources/enchants/normal/nocturnal.yml b/Plugin/src/main/resources/enchants/normal/nocturnal.yml index 8574c3c2..06853be4 100644 --- a/Plugin/src/main/resources/enchants/normal/nocturnal.yml +++ b/Plugin/src/main/resources/enchants/normal/nocturnal.yml @@ -21,4 +21,4 @@ general-config: maximum-level: 6 config: - per-level-multiplier: 0.02 # Multiplier per level for damage. Calculated as damage * (1 + level * multiplier) + multiplier: 0.02 # Multiplier per level for damage. Calculated as damage * (1 + level * multiplier) diff --git a/Plugin/src/main/resources/enchants/normal/paladin.yml b/Plugin/src/main/resources/enchants/normal/paladin.yml index e51a0710..9f492433 100644 --- a/Plugin/src/main/resources/enchants/normal/paladin.yml +++ b/Plugin/src/main/resources/enchants/normal/paladin.yml @@ -20,4 +20,4 @@ general-config: maximum-level: 3 config: - damage-multiplier-per-level: 0.1 # This number can be relatively high as it is rare for a player to be riding a horse, therefore rewarding that. \ No newline at end of file + multiplier: 0.2 # 1 + (Level * Multiplier) is multiplied with the damage \ No newline at end of file diff --git a/Plugin/src/main/resources/enchants/normal/parasitic.yml b/Plugin/src/main/resources/enchants/normal/parasitic.yml index a6be6791..98b6eb83 100644 --- a/Plugin/src/main/resources/enchants/normal/parasitic.yml +++ b/Plugin/src/main/resources/enchants/normal/parasitic.yml @@ -18,7 +18,7 @@ general-config: - crossbow grindstoneable: true conflicts: [] - maximum-level: 6 + maximum-level: 3 config: - damage-multiplier-per-level: 0.02 # Damage * Level * Multiplier is used to calculate how much health to heal + health-per-level: 1 # Level * Health = Amount of health to heal diff --git a/Plugin/src/main/resources/enchants/normal/parry.yml b/Plugin/src/main/resources/enchants/normal/parry.yml index 4fe50131..e9e70be0 100644 --- a/Plugin/src/main/resources/enchants/normal/parry.yml +++ b/Plugin/src/main/resources/enchants/normal/parry.yml @@ -20,4 +20,4 @@ general-config: maximum-level: 4 config: - damage-multiplier-per-level: 0.05 # 1 - (Level * Multiplier) is multiplied with the damage + multiplier: 0.05 # 1 - (Level * Multiplier) is multiplied with the damage diff --git a/Plugin/src/main/resources/enchants/normal/proximity.yml b/Plugin/src/main/resources/enchants/normal/proximity.yml index 3808eed3..d71add5c 100644 --- a/Plugin/src/main/resources/enchants/normal/proximity.yml +++ b/Plugin/src/main/resources/enchants/normal/proximity.yml @@ -21,4 +21,4 @@ general-config: config: when-closer-than-blocks: 1.5 - percent-more-per-level: 5 # percent more damage to deal per level when close + multiplier: 0.05 # 1 + (Level * Multiplier) is multiplied with the damage diff --git a/Plugin/src/main/resources/enchants/normal/puncture.yml b/Plugin/src/main/resources/enchants/normal/puncture.yml index 53f37f62..c6a7d8ae 100644 --- a/Plugin/src/main/resources/enchants/normal/puncture.yml +++ b/Plugin/src/main/resources/enchants/normal/puncture.yml @@ -20,4 +20,4 @@ general-config: maximum-level: 6 config: - percent-more-per-level: 12 # Percent more damage to do per level + multiplier: 0.12 # 1 + (Level * Multiplier) is multiplied with the damage diff --git a/Plugin/src/main/resources/enchants/normal/serrated.yml b/Plugin/src/main/resources/enchants/normal/serrated.yml index 2cc62788..284718a8 100644 --- a/Plugin/src/main/resources/enchants/normal/serrated.yml +++ b/Plugin/src/main/resources/enchants/normal/serrated.yml @@ -26,7 +26,4 @@ general-config: maximum-level: 5 config: - percent-more-base: 25 # Percent more damage to do as base - percent-more-per-level: 25 # Percent more damage to do per level - # To explain, Serrated V would be 150% more damage: 25 + (5*25) - # Default values are taken from the power enchantment + multiplier: 0.25 # 1 + (Level * Multiplier) is multiplied with the damage diff --git a/Plugin/src/main/resources/enchants/normal/shotassist.yml b/Plugin/src/main/resources/enchants/normal/shotassist.yml index 832b31ef..75c4c0b9 100644 --- a/Plugin/src/main/resources/enchants/normal/shotassist.yml +++ b/Plugin/src/main/resources/enchants/normal/shotassist.yml @@ -23,4 +23,4 @@ general-config: maximum-level: 6 config: - damage-multiplier-per-level: 0.015 + multiplier: 0.015 # 1 + (Level * Multiplier) is multiplied with the damage diff --git a/Plugin/src/main/resources/enchants/normal/sycophant.yml b/Plugin/src/main/resources/enchants/normal/sycophant.yml index 39df166a..6a1edf40 100644 --- a/Plugin/src/main/resources/enchants/normal/sycophant.yml +++ b/Plugin/src/main/resources/enchants/normal/sycophant.yml @@ -17,7 +17,7 @@ general-config: - shield grindstoneable: true conflicts: [] - maximum-level: 6 + maximum-level: 3 config: - damage-multiplier-per-level: 0.04 # Damage * Level * Multiplier is used to calculate how much health to heal + health-per-level: 1 # Level * Health = Amount of health to heal diff --git a/Plugin/src/main/resources/enchants/normal/voidaffinity.yml b/Plugin/src/main/resources/enchants/normal/voidaffinity.yml index ae467602..59a8a2ea 100644 --- a/Plugin/src/main/resources/enchants/normal/voidaffinity.yml +++ b/Plugin/src/main/resources/enchants/normal/voidaffinity.yml @@ -21,4 +21,4 @@ general-config: maximum-level: 5 config: - per-level-multiplier: 0.02 # Multiplier per level for damage. Calculated as damage * (1 + level * multiplier) + multiplier: 0.02 # Multiplier per level for damage. Calculated as damage * (1 + level * multiplier) diff --git a/Plugin/src/main/resources/enchants/normal/wateraffinity.yml b/Plugin/src/main/resources/enchants/normal/wateraffinity.yml index 0e4e9116..b4797876 100644 --- a/Plugin/src/main/resources/enchants/normal/wateraffinity.yml +++ b/Plugin/src/main/resources/enchants/normal/wateraffinity.yml @@ -21,4 +21,4 @@ general-config: maximum-level: 7 config: - percent-more-per-level: 2 # percent more damage to deal per level when on fire + multiplier: 0.02 # 1 + (Level * Multiplier) is multiplied with the damage diff --git a/Plugin/src/main/resources/enchants/special/bladed.yml b/Plugin/src/main/resources/enchants/special/bladed.yml index 09272189..f27dd589 100644 --- a/Plugin/src/main/resources/enchants/special/bladed.yml +++ b/Plugin/src/main/resources/enchants/special/bladed.yml @@ -26,7 +26,7 @@ general-config: maximum-level: 5 config: - percent-more-base: 150 # Percent more damage to do as base - percent-more-per-level: 25 # Percent more damage to do per level - # To explain, Bladed V would be 275% more damage: 150 + (5*25) + base-multiplier: 1.25 # Percent more damage to do as base + multiplier: 0.25 # 1 + (Level * Multiplier) is multiplied with the damage + # To explain, Bladed V would be 2.5x more damage: 1.25 + (5*0.25) # By default, Bladed I acts like Serrated VI diff --git a/Plugin/src/main/resources/enchants/special/lifesteal.yml b/Plugin/src/main/resources/enchants/special/lifesteal.yml index fb32649a..acd1eee9 100644 --- a/Plugin/src/main/resources/enchants/special/lifesteal.yml +++ b/Plugin/src/main/resources/enchants/special/lifesteal.yml @@ -19,7 +19,7 @@ general-config: grindstoneable: true conflicts: - leeching - maximum-level: 6 + maximum-level: 3 config: - damage-multiplier-per-level: 0.06 # Damage * Level * Multiplier is used to calculate how much health to heal + health-per-level: 2 # Level * Health = Amount of health to heal diff --git a/Plugin/src/main/resources/enchants/special/razor.yml b/Plugin/src/main/resources/enchants/special/razor.yml index ee8709bb..29e7b471 100644 --- a/Plugin/src/main/resources/enchants/special/razor.yml +++ b/Plugin/src/main/resources/enchants/special/razor.yml @@ -26,6 +26,6 @@ general-config: maximum-level: 8 config: - per-level-multiplier: 0.5 # Vanilla sharpness is 0.5*level + 0.5 extra damage. Razor formula is multiplier*level + base extra damage. + multiplier: 0.5 # Vanilla sharpness is 0.5*level + 0.5 extra damage. Razor formula is multiplier*level + base extra damage. base-damage: 10 # Vanilla Smite 5/BOA 5 extra damage is 12.5 decrease-if-cooldown: true \ No newline at end of file