Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2025-01-26 01:01:22 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Made configs more consistent

Browse Source
This commit is contained in:
Auxilor 2020-10-15 12:33:36 +01:00 committed by BuildTools
parent cd1feb4f42
commit 0fa1e406a0
62 changed files with 125 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Aerial.java
View File

@ -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);
}
}

9
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Aquatic.java
View File

@ -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);
}
}

6
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Atmospheric.java
View File

@ -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);
}
}

5
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Backstab.java
View File

@ -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);
}
}

5
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Criticals.java
View File

@ -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);
}
}

2
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Diurnal.java
View File

@ -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)));
}

2
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Diverse.java
View File

@ -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)));
}

2
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/EndInfusion.java
View File

@ -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)));
}

4
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Enderism.java
View File

@ -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)));
}

5
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Extract.java
View File

@ -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();

9
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/FireAffinity.java
View File

@ -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);
}
}

6
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/FirstStrike.java
View File

@ -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);
}
}

6
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Goliath.java
View File

@ -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);
}
}

2
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Hellish.java
View File

@ -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)));
}

5
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Leeching.java
View File

@ -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();

2
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/NetherInfusion.java
View File

@ -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)));
}

2
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Netheric.java
View File

@ -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)));
}

2
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Nocturnal.java
View File

@ -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)));
}

5
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Paladin.java
View File

@ -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);
}
}

5
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parasitic.java
View File

@ -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();

6
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Parry.java
View File

@ -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);
}
}

12
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Proximity.java
View File

@ -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);
}
}

9
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Puncture.java
View File

@ -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);
}
}

10
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Serrated.java
View File

@ -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);
}
}

2
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/ShotAssist.java
View File

@ -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);
}

13
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Sycophant.java
View File

@ -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);
}
}

2
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/VoidAffinity.java
View File

@ -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)));
}

9
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/WaterAffinity.java
View File

@ -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);
}
}

11
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Bladed.java
View File

@ -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);
}
}

5
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/LifeSteal.java
View File

@ -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();

2
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Razor.java
View File

@ -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")) {

2
Plugin/src/main/resources/enchants/normal/aerial.yml
View File

@ -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

2
Plugin/src/main/resources/enchants/normal/aquatic.yml
View File

@ -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

2
Plugin/src/main/resources/enchants/normal/atmospheric.yml
View File

@ -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

2
Plugin/src/main/resources/enchants/normal/backstab.yml
View File

@ -21,4 +21,4 @@ general-config:
maximum-level: 3
config:
damage-multiplier-per-level: 0.1
multiplier: 0.1 # 1 + (Level * Multiplier) is multiplied with the damage

2
Plugin/src/main/resources/enchants/normal/criticals.yml
View File

@ -21,4 +21,4 @@ general-config:
maximum-level: 3
config:
damage-multiplier-per-level: 0.1
multiplier: 0.1 # 1 + (Level * Multiplier) is multiplied with the damage

2
Plugin/src/main/resources/enchants/normal/diurnal.yml
View File

@ -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)

2
Plugin/src/main/resources/enchants/normal/diverse.yml
View File

@ -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)

2
Plugin/src/main/resources/enchants/normal/enderism.yml
View File

@ -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)

2
Plugin/src/main/resources/enchants/normal/endinfusion.yml
View File

@ -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)

4
Plugin/src/main/resources/enchants/normal/extract.yml
View File

@ -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

2
Plugin/src/main/resources/enchants/normal/fireaffinity.yml
View File

@ -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

2
Plugin/src/main/resources/enchants/normal/firststrike.yml
View File

@ -20,4 +20,4 @@ general-config:
maximum-level: 5
config:
damage-multiplier-per-level: 0.15
multiplier: 0.15 # 1 + (Level * Multiplier) is multiplied with the damage

2
Plugin/src/main/resources/enchants/normal/goliath.yml
View File

@ -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
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

2
Plugin/src/main/resources/enchants/normal/hellish.yml
View File

@ -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)

4
Plugin/src/main/resources/enchants/normal/leeching.yml
View File

@ -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

2
Plugin/src/main/resources/enchants/normal/netheric.yml
View File

@ -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)

2
Plugin/src/main/resources/enchants/normal/netherinfusion.yml
View File

@ -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)

2
Plugin/src/main/resources/enchants/normal/nocturnal.yml
View File

@ -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)

2
Plugin/src/main/resources/enchants/normal/paladin.yml
View File

@ -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.
multiplier: 0.2 # 1 + (Level * Multiplier) is multiplied with the damage

4
Plugin/src/main/resources/enchants/normal/parasitic.yml
View File

@ -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

2
Plugin/src/main/resources/enchants/normal/parry.yml
View File

@ -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

2
Plugin/src/main/resources/enchants/normal/proximity.yml
View File

@ -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

2
Plugin/src/main/resources/enchants/normal/puncture.yml
View File

@ -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

5
Plugin/src/main/resources/enchants/normal/serrated.yml
View File

@ -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

2
Plugin/src/main/resources/enchants/normal/shotassist.yml
View File

@ -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

4
Plugin/src/main/resources/enchants/normal/sycophant.yml
View File

@ -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

2
Plugin/src/main/resources/enchants/normal/voidaffinity.yml
View File

@ -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)

2
Plugin/src/main/resources/enchants/normal/wateraffinity.yml
View File

@ -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

6
Plugin/src/main/resources/enchants/special/bladed.yml
View File

@ -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

4
Plugin/src/main/resources/enchants/special/lifesteal.yml
View File

@ -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

2
Plugin/src/main/resources/enchants/special/razor.yml
View File

@ -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