diff --git a/src/com/projectkorra/projectkorra/airbending/AirBlast.java b/src/com/projectkorra/projectkorra/airbending/AirBlast.java index d6beae7e..ca761a02 100644 --- a/src/com/projectkorra/projectkorra/airbending/AirBlast.java +++ b/src/com/projectkorra/projectkorra/airbending/AirBlast.java @@ -400,8 +400,8 @@ public class AirBlast extends AirAbility { } } - if ((GeneralMethods.isSolid(block) || block.isLiquid()) && !this.affectedLevers.contains(block) && this.canCoolLava) { - if (block.getType() == Material.LAVA) { + if ((GeneralMethods.isSolid(block) || block.isLiquid()) && !this.affectedLevers.contains(block)) { + if (block.getType() == Material.LAVA && this.canCoolLava) { if (LavaFlow.isLavaFlowBlock(block)) { LavaFlow.removeBlock(block); // TODO: Make more generic for future lava generating moves. } else if (block.getBlockData() instanceof Levelled && ((Levelled) block.getBlockData()).getLevel() == 0) { diff --git a/src/com/projectkorra/projectkorra/configuration/ConfigManager.java b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java index 6f05790c..9288d0d3 100644 --- a/src/com/projectkorra/projectkorra/configuration/ConfigManager.java +++ b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java @@ -812,9 +812,9 @@ public class ConfigManager { config.addDefault("Abilities.Air.Passive.GracefulDescent.Enabled", true); config.addDefault("Abilities.Air.AirBlast.Enabled", true); - config.addDefault("Abilities.Air.AirBlast.Speed", 25); + config.addDefault("Abilities.Air.AirBlast.Speed", 20); config.addDefault("Abilities.Air.AirBlast.Range", 20); - config.addDefault("Abilities.Air.AirBlast.Radius", 2); + config.addDefault("Abilities.Air.AirBlast.Radius", .5); config.addDefault("Abilities.Air.AirBlast.SelectRange", 10); config.addDefault("Abilities.Air.AirBlast.SelectParticles", 4); config.addDefault("Abilities.Air.AirBlast.Particles", 6); @@ -866,7 +866,7 @@ public class ConfigManager { config.addDefault("Abilities.Air.AirSuction.Speed", 25); config.addDefault("Abilities.Air.AirSuction.Range", 20); config.addDefault("Abilities.Air.AirSuction.SelectRange", 10); - config.addDefault("Abilities.Air.AirSuction.Radius", 2); + config.addDefault("Abilities.Air.AirSuction.Radius", .5); config.addDefault("Abilities.Air.AirSuction.Push.Self", 2.0); config.addDefault("Abilities.Air.AirSuction.Push.Others", 1.3); config.addDefault("Abilities.Air.AirSuction.Cooldown", 500); @@ -974,7 +974,7 @@ public class ConfigManager { config.addDefault("Abilities.Water.IceBlast.Damage", 3); config.addDefault("Abilities.Water.IceBlast.Range", 20); config.addDefault("Abilities.Water.IceBlast.DeflectRange", 3); - config.addDefault("Abilities.Water.IceBlast.CollisionRadius", 1.5); + config.addDefault("Abilities.Water.IceBlast.CollisionRadius", 1.0); config.addDefault("Abilities.Water.IceBlast.Interval", 20); config.addDefault("Abilities.Water.IceBlast.Cooldown", 1500); config.addDefault("Abilities.Water.IceBlast.AllowSnow", false); @@ -995,7 +995,7 @@ public class ConfigManager { config.addDefault("Abilities.Water.IceSpike.Field.Cooldown", 2000); config.addDefault("Abilities.Water.IceSpike.Blast.Range", 20); config.addDefault("Abilities.Water.IceSpike.Blast.Damage", 1); - config.addDefault("Abilities.Water.IceSpike.Blast.CollisionRadius", 1.5); + config.addDefault("Abilities.Water.IceSpike.Blast.CollisionRadius", 1.0); config.addDefault("Abilities.Water.IceSpike.Blast.DeflectRange", 3); config.addDefault("Abilities.Water.IceSpike.Blast.Cooldown", 500); config.addDefault("Abilities.Water.IceSpike.Blast.SlowCooldown", 5000); @@ -1139,7 +1139,7 @@ public class ConfigManager { config.addDefault("Abilities.Water.WaterManipulation.Damage", 3.0); config.addDefault("Abilities.Water.WaterManipulation.Range", 25); config.addDefault("Abilities.Water.WaterManipulation.SelectRange", 16); - config.addDefault("Abilities.Water.WaterManipulation.CollisionRadius", 1.5); + config.addDefault("Abilities.Water.WaterManipulation.CollisionRadius", 1.0); config.addDefault("Abilities.Water.WaterManipulation.DeflectRange", 3); config.addDefault("Abilities.Water.WaterManipulation.Speed", 35); config.addDefault("Abilities.Water.WaterManipulation.Knockback", 0.3); @@ -1362,7 +1362,7 @@ public class ConfigManager { config.addDefault("Abilities.Fire.FireBlast.Enabled", true); config.addDefault("Abilities.Fire.FireBlast.Speed", 20); config.addDefault("Abilities.Fire.FireBlast.Range", 20); - config.addDefault("Abilities.Fire.FireBlast.CollisionRadius", 1.5); + config.addDefault("Abilities.Fire.FireBlast.CollisionRadius", 1.0); config.addDefault("Abilities.Fire.FireBlast.Knockback", 0.3); config.addDefault("Abilities.Fire.FireBlast.Damage", 3); config.addDefault("Abilities.Fire.FireBlast.Cooldown", 1500); diff --git a/src/com/projectkorra/projectkorra/firebending/FireBlast.java b/src/com/projectkorra/projectkorra/firebending/FireBlast.java index c6481f96..66e34f1e 100644 --- a/src/com/projectkorra/projectkorra/firebending/FireBlast.java +++ b/src/com/projectkorra/projectkorra/firebending/FireBlast.java @@ -72,13 +72,13 @@ public class FireBlast extends FireAbility { this.setFields(); this.safeBlocks = safeBlocks; - + this.damage = damage; this.location = location.clone(); this.origin = location.clone(); this.direction = direction.clone().normalize(); // The following code determines the total additive modifier between Blue Fire & Day Modifiers - this.applyModifiers(); + this.applyModifiers(this.damage, this.range); this.start(); } @@ -102,18 +102,18 @@ public class FireBlast extends FireAbility { this.location = this.location.add(this.direction.clone()); // The following code determines the total additive modifier between Blue Fire & Day Modifiers - this.applyModifiers(); + this.applyModifiers(this.damage, this.range); this.start(); this.bPlayer.addCooldown("FireBlast", this.cooldown); } - private void applyModifiers() { + private void applyModifiers(double damage, double range) { int damageMod = 0; int rangeMod = 0; damageMod = (int) (this.getDayFactor(damage) - damage); - rangeMod = (int) (this.getDayFactor(this.range) - this.range); + rangeMod = (int) (this.getDayFactor(range) - range); damageMod = (int) (bPlayer.canUseSubElement(SubElement.BLUE_FIRE) ? (BlueFireAbility.getDamageFactor() * damage - damage) + damageMod : damageMod); rangeMod = (int) (bPlayer.canUseSubElement(SubElement.BLUE_FIRE) ? (BlueFireAbility.getRangeFactor() * range - range) + rangeMod : rangeMod);