From 4fea1c88a7b185664768d62eb1e45f5c4ece2a15 Mon Sep 17 00:00:00 2001 From: MistPhizzle Date: Sun, 7 Sep 2014 10:43:56 -0400 Subject: [PATCH] Finish IceBlast calm down waterbenders your new move is here --- .../projectkorra/ProjectKorra/Ability/StockAbilities.java | 6 +----- src/com/projectkorra/ProjectKorra/ConfigManager.java | 2 +- src/config.yml | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/com/projectkorra/ProjectKorra/Ability/StockAbilities.java b/src/com/projectkorra/ProjectKorra/Ability/StockAbilities.java index 16125155..bea7bc47 100644 --- a/src/com/projectkorra/ProjectKorra/Ability/StockAbilities.java +++ b/src/com/projectkorra/ProjectKorra/Ability/StockAbilities.java @@ -18,11 +18,7 @@ public enum StockAbilities { AvatarState, // Project Korra -<<<<<<< HEAD - Extraction, Smokescreen, Combustion, LavaSurge, LavaFlow, Suffocate; -======= - Extraction, Smokescreen, Combustion, LavaSurge, Suffocate, IceBlast; ->>>>>>> 8850298c24178751e38414722d52a00691d3a625 + Extraction, Smokescreen, Combustion, LavaSurge, Suffocate, LavaFlow, IceBlast; private enum AirbendingAbilities { AirBlast, AirBubble, AirShield, AirSuction, AirSwipe, Tornado, AirScooter, AirSpout, AirBurst, Suffocate; diff --git a/src/com/projectkorra/ProjectKorra/ConfigManager.java b/src/com/projectkorra/ProjectKorra/ConfigManager.java index 84aad7a4..0dc5db81 100644 --- a/src/com/projectkorra/ProjectKorra/ConfigManager.java +++ b/src/com/projectkorra/ProjectKorra/ConfigManager.java @@ -233,7 +233,7 @@ public class ConfigManager { config.addDefault("Abilities.Water.IceBlast.Enabled", true); config.addDefault("Abilities.Water.IceBlast.Damage", 3); config.addDefault("Abilities.Water.IceBlast.Range", 20); - config.addDefault("Abilities.Water.IceBlast.Description", "Fires an explosive burst of ice at the opponent, spraying ice and snow around it. Requires a source of ice to use, crouch to select it, and then left click to fire."); + config.addDefault("Abilities.Water.IceBlast.Description", "This ability offers a powerful ice utility for Waterbenders. It can be used to fire an explosive burst of ice at an opponent, spraying ice and snow around it. To use, simply tap sneak (Default: Shift) while targeting a block of ice to select it as a source. From there, you can just left click to send the blast off at your opponent."); config.addDefault("Abilities.Water.IceSpike.Enabled", true); config.addDefault("Abilities.Water.IceSpike.Description", "This ability has many functions. Clicking while targetting ice, or an entity over some ice, " diff --git a/src/config.yml b/src/config.yml index 0a669b37..a1dbf620 100644 --- a/src/config.yml +++ b/src/config.yml @@ -174,7 +174,7 @@ Abilities: Enabled: true Damage: 3 Range: 20 - Description: "Fires an explosive burst of ice at the opponent, spraying ice and snow around it. Requires a source of ice to use, crouch to select it, and then left click to fire." + Description: "This ability offers a powerful ice utility for Waterbenders. It can be used to fire an explosive burst of ice at an opponent, spraying ice and snow around it. To use, simply tap sneak (Default: Shift) while targeting a block of ice to select it as a source. From there, you can just left click to send the blast off at your opponent." IceSpike: Enabled: true Description: "This ability has many functions. Clicking while targetting ice, or an entity over some ice, will raise a spike of ice up, damaging and slowing the target. Tapping sneak (default: shift) while selecting a water source will select that source that can be fired with a click. Firing this will launch a spike of ice at your target, dealing a bit of damage and slowing the target. If you sneak (shift) will not selecting a source, many ice spikes will erupt from around you, damaging and slowing those targets."