diff --git a/src/com/projectkorra/ProjectKorra/ConfigManager.java b/src/com/projectkorra/ProjectKorra/ConfigManager.java index ecab1af2..b5cd41f4 100644 --- a/src/com/projectkorra/ProjectKorra/ConfigManager.java +++ b/src/com/projectkorra/ProjectKorra/ConfigManager.java @@ -666,7 +666,12 @@ public class ConfigManager { config.addDefault("Abilities.Chi.Smokescreen.Cooldown", 50000); config.addDefault("Abilities.Chi.Smokescreen.Radius", 4); config.addDefault("Abilities.Chi.Smokescreen.Duration", 15); - + + config.addDefault("Abilities.Chi.WarriorStance.Enabled", true); + config.addDefault("Abilities.Chi.WarriorStance.Description", "WarriorStance gives a Chiblocker increased damage but makes them a tad more vulnerable. To activate, simply left click."); + config.addDefault("Abilities.Chi.WarriorStance.Strength", 1); + config.addDefault("Abilities.Chi.WarriorStance.Resistance", -1); + config.addDefault("Storage.engine", "sqlite"); config.addDefault("Storage.MySQL.host", "localhost"); diff --git a/src/com/projectkorra/ProjectKorra/chiblocking/ChiblockingManager.java b/src/com/projectkorra/ProjectKorra/chiblocking/ChiblockingManager.java index ee9b5977..7365baad 100644 --- a/src/com/projectkorra/ProjectKorra/chiblocking/ChiblockingManager.java +++ b/src/com/projectkorra/ProjectKorra/chiblocking/ChiblockingManager.java @@ -18,6 +18,7 @@ public class ChiblockingManager implements Runnable { for(Player player : Bukkit.getOnlinePlayers()) { ChiPassive.handlePassive(); Smokescreen.removeFromHashMap(player); + WarriorStance.progressAll(); } } diff --git a/src/com/projectkorra/ProjectKorra/chiblocking/WarriorStance.java b/src/com/projectkorra/ProjectKorra/chiblocking/WarriorStance.java index c714e76e..47aaf317 100644 --- a/src/com/projectkorra/ProjectKorra/chiblocking/WarriorStance.java +++ b/src/com/projectkorra/ProjectKorra/chiblocking/WarriorStance.java @@ -7,11 +7,15 @@ import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; import com.projectkorra.ProjectKorra.Methods; +import com.projectkorra.ProjectKorra.ProjectKorra; import com.projectkorra.ProjectKorra.Ability.StockAbilities; import com.projectkorra.ProjectKorra.waterbending.Bloodbending; public class WarriorStance { + public static int strength = ProjectKorra.plugin.getConfig().getInt("Abilities.Chi.WarriorStance.Strength") - 1; + public static int resistance = ProjectKorra.plugin.getConfig().getInt("Abilities.Chi.WarriorStance.Resistance"); + private Player player; public static ConcurrentHashMap instances = new ConcurrentHashMap(); @@ -39,11 +43,11 @@ public class WarriorStance { return; } if (!player.hasPotionEffect(PotionEffectType.DAMAGE_RESISTANCE)) { - player.addPotionEffect(new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE, 60, -1)); + player.addPotionEffect(new PotionEffect(PotionEffectType.DAMAGE_RESISTANCE, 60, resistance)); } if (!player.hasPotionEffect(PotionEffectType.INCREASE_DAMAGE)) { - player.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE, 60, 0)); + player.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE, 60, strength)); } } diff --git a/src/config.yml b/src/config.yml index c952c3ec..6d524139 100644 --- a/src/config.yml +++ b/src/config.yml @@ -544,6 +544,7 @@ Abilities: Enabled: true Description: "WarriorStance gives a Chiblocker increased damage but makes them a tad more vulnerable. To activate, simply left click." Strength: 1 + Resistance: -1 Storage: engine: sqlite MySQL: diff --git a/src/plugin.yml b/src/plugin.yml index f9e202ee..5345cd2f 100644 --- a/src/plugin.yml +++ b/src/plugin.yml @@ -131,6 +131,7 @@ permissions: bending.ability.Paralyze: true bending.ability.RapidPunch: true bending.ability.Smokescreen: true + bending.ability.WarriorStance: true bending.chi.passive: true bending.chi.grapplinghook: true bending.avatar: