From 8884f01e1a63d86d4f44de9e023bdcff4928f5e0 Mon Sep 17 00:00:00 2001 From: Christopher Martin Date: Tue, 17 Jan 2017 00:23:14 -0800 Subject: [PATCH] Fix PhaseChange region stuff and blank usage (#700) --- src/com/projectkorra/projectkorra/command/HelpCommand.java | 4 +++- .../projectkorra/configuration/ConfigManager.java | 7 ------- .../projectkorra/projectkorra/firebending/HeatControl.java | 2 +- .../projectkorra/waterbending/ice/PhaseChange.java | 2 +- src/plugin.yml | 1 - 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/com/projectkorra/projectkorra/command/HelpCommand.java b/src/com/projectkorra/projectkorra/command/HelpCommand.java index 323aa388..d83cc5ba 100644 --- a/src/com/projectkorra/projectkorra/command/HelpCommand.java +++ b/src/com/projectkorra/projectkorra/command/HelpCommand.java @@ -124,7 +124,9 @@ public class HelpCommand extends PKCommand { ChatColor color = ability.getElement().getColor(); sender.sendMessage(color + ability.getName() + " - "); sender.sendMessage(color + ability.getDescription()); - sender.sendMessage(ChatColor.GOLD + usage + ability.getInstructions()); + if (!ability.getInstructions().isEmpty()) { + sender.sendMessage(ChatColor.GOLD + usage + ability.getInstructions()); + } } else if (Arrays.asList(Commands.airaliases).contains(args.get(0))) { sender.sendMessage(Element.AIR.getColor() + air.replace("/b help AirCombos", Element.AIR.getSubColor() + "/b help AirCombos" + Element.AIR.getColor())); sender.sendMessage(ChatColor.YELLOW + learnMore + ChatColor.DARK_AQUA + "http://tinyurl.com/qffg9m3"); diff --git a/src/com/projectkorra/projectkorra/configuration/ConfigManager.java b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java index b59b9a44..89a723d8 100644 --- a/src/com/projectkorra/projectkorra/configuration/ConfigManager.java +++ b/src/com/projectkorra/projectkorra/configuration/ConfigManager.java @@ -280,7 +280,6 @@ public class ConfigManager { config.addDefault("Abilities.Water.OctopusForm.DeathMessage", "{victim} was slapped by {attacker}'s {ability}"); config.addDefault("Abilities.Water.PhaseChange.Description", "PhaseChange is one of the most useful utility moves that a waterbender possess. This ability is better used when fighting, allowing you to create a platform on water that you can fight on and being territorial by manipulating your environment. It's also useful for travelling across seas."); config.addDefault("Abilities.Water.PhaseChange.Instructions", "\n" + "(Melt) To melt ice, hold sneak while looking at an ice block." + "\n" + "(Freeze) To freeze water and turn it into ice, simply left click at water. This ice will stay so long as you are in range, otherwise it will revert back to water. This only freezes the top layer of ice."); - config.addDefault("Abilities.Water.PlantArmor.Description", "PlantArmor is a defensive ability in the arsenal of the plantbender. Clicking on leaves with this ability will temporarily clad you in strong armor made out of plants! You can use this defensively, but you can also use the armor as a source for other plantbending skills."); config.addDefault("Abilities.Water.Surge.Description", "Surge offers great utility and is one of the most important defence abilities for waterbender's. It can be used to push entities back, used to push yourself in a direction, trap entities and protect yourself with a shield."); config.addDefault("Abilities.Water.Surge.Instructions", "\n" + "(Shield) Left click on a water source and then hold sneak while looking up to create a water shield that will move wherever you look. Additionally, you can left click to turn this shield into ice. If you let go of sneak at any point, this ability will cancel." + "\n" + "(Surge) Tap sneak at a water source and click in a direction to fire a surge of water that will knock entities back. Additionally, if you tap sneak again before the surge reaches an entity, when it hits them it will encase them in ice."); config.addDefault("Abilities.Water.Torrent.Description", "Torrent is one of the strongest moves in a waterbender's arsenal. It has the potential to do immense damage and to be comboed with other abilities to perform a deal a large damage burst. Torrent is fundamental for waterbender's. "); @@ -809,12 +808,6 @@ public class ConfigManager { config.addDefault("Abilities.Water.PhaseChange.Melt.Radius", 7); config.addDefault("Abilities.Water.PhaseChange.Melt.AllowFlow", true); - config.addDefault("Abilities.Water.PlantArmor.Enabled", true); - config.addDefault("Abilities.Water.PlantArmor.Duration", 7500); - config.addDefault("Abilities.Water.PlantArmor.Resistance", 1); - config.addDefault("Abilities.Water.PlantArmor.Cooldown", 15000); - config.addDefault("Abilities.Water.PlantArmor.Range", 10); - config.addDefault("Abilities.Water.Surge.Enabled", true); config.addDefault("Abilities.Water.Surge.Wave.Radius", 3); config.addDefault("Abilities.Water.Surge.Wave.Range", 20); diff --git a/src/com/projectkorra/projectkorra/firebending/HeatControl.java b/src/com/projectkorra/projectkorra/firebending/HeatControl.java index 56bafa0c..2a3df2be 100644 --- a/src/com/projectkorra/projectkorra/firebending/HeatControl.java +++ b/src/com/projectkorra/projectkorra/firebending/HeatControl.java @@ -414,7 +414,7 @@ public class HeatControl extends FireAbility { @Override public boolean isHarmlessAbility() { - return true; + return false; } @Override diff --git a/src/com/projectkorra/projectkorra/waterbending/ice/PhaseChange.java b/src/com/projectkorra/projectkorra/waterbending/ice/PhaseChange.java index 14f58f22..0c20078b 100644 --- a/src/com/projectkorra/projectkorra/waterbending/ice/PhaseChange.java +++ b/src/com/projectkorra/projectkorra/waterbending/ice/PhaseChange.java @@ -465,7 +465,7 @@ public class PhaseChange extends IceAbility { @Override public boolean isHarmlessAbility() { - return true; + return false; } @Override diff --git a/src/plugin.yml b/src/plugin.yml index e3eeb55d..9664cc06 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -100,7 +100,6 @@ permissions: bending.ability.WaterSpout: true bending.ability.WaterSpout.Wave: true bending.ability.WaterCombo: true - bending.ability.PlantArmor: true bending.water.plantbending: true bending.message.nightmessage: true bending.water.passive: true