From 63e0f9a58b9d6118fac74712ca82b568226ee0dd Mon Sep 17 00:00:00 2001 From: Simp Date: Sat, 27 Jun 2020 20:06:07 -0400 Subject: [PATCH] config changes * Change Abilities.Earth.Passive.Duration to Abilities.Earth.Passive.DensityShift.Duration * Add Enabled option for BlueFlames fire passive * Fix Fire passive path --- src/com/projectkorra/projectkorra/PKListener.java | 2 +- .../projectkorra/configuration/ConfigManager.java | 5 +++-- .../projectkorra/earthbending/passive/DensityShift.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/com/projectkorra/projectkorra/PKListener.java b/src/com/projectkorra/projectkorra/PKListener.java index 0574738f..94f7f47e 100644 --- a/src/com/projectkorra/projectkorra/PKListener.java +++ b/src/com/projectkorra/projectkorra/PKListener.java @@ -232,7 +232,7 @@ public class PKListener implements Listener { CoreAbility bf = CoreAbility.getAbility(BlueFlames.class); if (bf != null && bPlayer.canBendPassive(bf) && bPlayer.canUsePassive(bf) && ability instanceof FireAbility && ability.hasAttribute(Attribute.DAMAGE)) { - ability.addAttributeModifier(Attribute.DAMAGE, ConfigManager.getConfig().getDouble("Abilities.Fire.Passives.BlueFlames.DamageMultiplier"), AttributeModifier.MULTIPLICATION); + ability.addAttributeModifier(Attribute.DAMAGE, ConfigManager.getConfig().getDouble("Abilities.Fire.Passive.BlueFlames.DamageMultiplier"), AttributeModifier.MULTIPLICATION); } } diff --git a/src/com/projectkorra/projectkorra/configuration/ConfigManager.java b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java index a145189e..b62920c8 100644 --- a/src/com/projectkorra/projectkorra/configuration/ConfigManager.java +++ b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java @@ -1171,8 +1171,8 @@ public class ConfigManager { config.addDefault("Abilities.Water.IceBullet.Cooldown", 10000); config.addDefault("Abilities.Water.IceBullet.ShotCooldown", 500); - config.addDefault("Abilities.Earth.Passive.Duration", 2500); config.addDefault("Abilities.Earth.Passive.DensityShift.Enabled", true); + config.addDefault("Abilities.Earth.Passive.DensityShift.Duration", 2500); config.addDefault("Abilities.Earth.Passive.FerroControl.Enabled", true); config.addDefault("Abilities.Earth.Catapult.Enabled", true); @@ -1331,7 +1331,8 @@ public class ConfigManager { config.addDefault("Abilities.Earth.EarthPillars.Damage.Value", 2); config.addDefault("Abilities.Earth.EarthPillars.FallThreshold", 12); - config.addDefault("Abilities.Fire.Passives.BlueFlames.DamageMultiplier", 1.3); + config.addDefault("Abilities.Fire.Passive.BlueFlames.Enabled", true); + config.addDefault("Abilities.Fire.Passive.BlueFlames.DamageMultiplier", 1.3); config.addDefault("Abilities.Fire.Blaze.Enabled", true); config.addDefault("Abilities.Fire.Blaze.Arc", 14); diff --git a/src/com/projectkorra/projectkorra/earthbending/passive/DensityShift.java b/src/com/projectkorra/projectkorra/earthbending/passive/DensityShift.java index fded2585..e1b9de41 100644 --- a/src/com/projectkorra/projectkorra/earthbending/passive/DensityShift.java +++ b/src/com/projectkorra/projectkorra/earthbending/passive/DensityShift.java @@ -95,7 +95,7 @@ public class DensityShift extends EarthAbility implements PassiveAbility { } public static long getDuration() { - return ConfigManager.getConfig().getLong("Abilities.Earth.Passive.Duration"); + return ConfigManager.getConfig().getLong("Abilities.Earth.Passive.DensityShift.Duration"); } @Override