From 5759ee28446fff185e05ac036f7f18ede61f94a7 Mon Sep 17 00:00:00 2001
From: nathank33 <nathanbraunguitar@gmail.com>
Date: Sat, 4 Oct 2014 20:00:54 -0700
Subject: [PATCH] FireCombo Fixes and Changes

- FireKick now works while standing on snow.
- Changed the default values of FireCombo Abilities to balance them
better.
- Added the FireCombo configuration to the config.yml.
- Changed the JetBlaze sound.
---
 .../ProjectKorra/ConfigManager.java           |  8 +++----
 .../ProjectKorra/firebending/FireCombo.java   |  7 +++---
 src/config.yml                                | 23 +++++++++++++++++++
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/src/com/projectkorra/ProjectKorra/ConfigManager.java b/src/com/projectkorra/ProjectKorra/ConfigManager.java
index 3bb247fb..9f7d4023 100644
--- a/src/com/projectkorra/ProjectKorra/ConfigManager.java
+++ b/src/com/projectkorra/ProjectKorra/ConfigManager.java
@@ -540,16 +540,16 @@ public class ConfigManager {
 		config.addDefault("Abilities.Fire.WallOfFire.Interval", 500);
 
 		config.addDefault("Abilities.Fire.FireCombo.Enabled", true);
-		config.addDefault("Abilities.Fire.FireCombo.FireKick.Range", 6.0);
+		config.addDefault("Abilities.Fire.FireCombo.FireKick.Range", 7.0);
 		config.addDefault("Abilities.Fire.FireCombo.FireKick.Damage", 3.0);
 		config.addDefault("Abilities.Fire.FireCombo.FireKick.Cooldown", 1000);
-		config.addDefault("Abilities.Fire.FireCombo.FireSpin.Range", 4.5);
+		config.addDefault("Abilities.Fire.FireCombo.FireSpin.Range", 5.5);
 		config.addDefault("Abilities.Fire.FireCombo.FireSpin.Damage", 3.0);
-		config.addDefault("Abilities.Fire.FireCombo.FireSpin.Knockback", 2.0);
+		config.addDefault("Abilities.Fire.FireCombo.FireSpin.Knockback", 2.4);
 		config.addDefault("Abilities.Fire.FireCombo.FireSpin.Cooldown", 2000);
 		config.addDefault("Abilities.Fire.FireCombo.FireWheel.Range", 20.0);
 		config.addDefault("Abilities.Fire.FireCombo.FireWheel.Damage", 4.0);
-		config.addDefault("Abilities.Fire.FireCombo.FireWheel.Speed", 0.5);
+		config.addDefault("Abilities.Fire.FireCombo.FireWheel.Speed", 0.55);
 		config.addDefault("Abilities.Fire.FireCombo.FireWheel.Cooldown", 200);
 		config.addDefault("Abilities.Fire.FireCombo.JetBlast.Speed", 1.2);
 		config.addDefault("Abilities.Fire.FireCombo.JetBlast.Cooldown", 6000);
diff --git a/src/com/projectkorra/ProjectKorra/firebending/FireCombo.java b/src/com/projectkorra/ProjectKorra/firebending/FireCombo.java
index 38262f69..c345d6f8 100644
--- a/src/com/projectkorra/ProjectKorra/firebending/FireCombo.java
+++ b/src/com/projectkorra/ProjectKorra/firebending/FireCombo.java
@@ -8,6 +8,7 @@ import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.Sound;
 import org.bukkit.block.Block;
+import org.bukkit.block.BlockFace;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -284,8 +285,8 @@ public class FireCombo
 					fs.setCollides(false);				
 				fs.runTaskTimer(ProjectKorra.plugin, 0, 1L);
 				tasks.add(fs);
-				if(progressCounter % 5 == 0)
-					player.getWorld().playSound(player.getLocation(), Sound.WITHER_SHOOT, 3, 1F);
+				if(progressCounter % 4 == 0)
+					player.getWorld().playSound(player.getLocation(), Sound.FIZZ, 1, 0F);
 			}
 		}
 		else if(ability.equalsIgnoreCase("FireWheel"))
@@ -475,7 +476,7 @@ public class FireCombo
 		public void run() 
 		{
 			Block block = currentLoc.getBlock();
-			if(block.getType() != Material.AIR && !Methods.isPlant(block)){
+			if(block.getRelative(BlockFace.UP).getType() != Material.AIR && !Methods.isPlant(block)){
 				remove();
 				return;
 			}
diff --git a/src/config.yml b/src/config.yml
index eebe25bf..7a34f134 100644
--- a/src/config.yml
+++ b/src/config.yml
@@ -401,6 +401,29 @@ Abilities:
       Damage: 2
       Cooldown: 7500
       Interval: 500
+    FireCombo:
+      Enabled: true
+      FireKick:
+        Range: 7.0
+        Damage: 3.0
+        Cooldown: 1000
+      FireSpin:
+        Range: 5.5
+        Damage: 3.0
+        Knockback: 2.4
+        Cooldown: 2000
+      FireWheel:
+        Range: 20.0
+        Damage: 4.0
+        Speed: 0.55
+        Cooldown: 200
+      JetBlast:
+        Speed: 1.2
+        Cooldown: 6000
+      JetBlaze:
+        Speed: 1.1
+        Damage: 3
+        Cooldown: 6000
   Chi:
     Passive:
       FallReductionFactor: 0.5