Clean up Waterbending Sounds

src/com/projectkorra/ProjectKorra/ConfigManager.java

@@ -447,7 +447,7 @@ public class ConfigManager {
 		config.addDefault("Abilities.Fire.Combustion.Enabled", true);
 		config.addDefault("Abilities.Fire.Combustion.Description", "Combustion is a powerful ability only known by a few skilled Firebenders. It allows the bender to Firebend with their mind, concentrating energy to create a powerful blast. To use, simply tap sneak (Default: Shift) to launch the blast. This technique is highly destructive and very effective, it also comes with a long cooldown.");
 		config.addDefault("Abilities.Fire.Combustion.Cooldown", 15000);
-//		config.addDefault("Abilities.Fire.Combustion.ChargeTime", 5000);
+		//		config.addDefault("Abilities.Fire.Combustion.ChargeTime", 5000);
 		config.addDefault("Abilities.Fire.Combustion.BreakBlocks", false);
 		config.addDefault("Abilities.Fire.Combustion.Power", 1.0);
 		config.addDefault("Abilities.Fire.Combustion.Damage", 5);

src/com/projectkorra/ProjectKorra/airbending/AirBlast.java

@@ -7,7 +7,6 @@ import org.bukkit.Effect;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
-import org.bukkit.configuration.MemorySection;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;

src/com/projectkorra/ProjectKorra/waterbending/OctopusForm.java

@@ -174,10 +174,6 @@ public class OctopusForm {
 			return;
 		}
 
-		if (Methods.rand.nextInt(4) == 0) {
-			Methods.playWaterbendingSound(player.getLocation());
-		}		
-
 		if (System.currentTimeMillis() > time + interval) {
 			time = System.currentTimeMillis();
 
@@ -237,11 +233,17 @@ public class OctopusForm {
 				} else {
 					angle += 20;
 				}
+				if (Methods.rand.nextInt(4) == 0) {
+					Methods.playWaterbendingSound(player.getLocation());
+				}		
 				formOctopus();
 				if (y == 2) {
 					incrementStep();
 				}
 			} else if (formed) {
+				if (Methods.rand.nextInt(7) == 0) {
+					Methods.playWaterbendingSound(player.getLocation());
+				}		
 				step += 1;
 				if (step % inc == 0)
 					animstep += 1;

src/com/projectkorra/ProjectKorra/waterbending/Torrent.java

@@ -115,10 +115,6 @@ public class Torrent {
 			return;
 		}	
 
-		if (Methods.rand.nextInt(4) == 0) {
-			Methods.playWaterbendingSound(location);
-		}		
-
 		if (System.currentTimeMillis() > time + interval) {
 			time = System.currentTimeMillis();
 
@@ -210,6 +206,9 @@ public class Torrent {
 			}
 
 			if (forming || formed) {
+				if (Methods.rand.nextInt(4) == 0) {
+					Methods.playWaterbendingSound(location);
+				}	
 				if (angle < 220) {
 					angle += 20;
 				} else {

src/com/projectkorra/ProjectKorra/waterbending/TorrentBurst.java

@@ -153,7 +153,7 @@ public class TorrentBurst {
 				}
 				
 				for(Block sound : torrentblocks) {
-					if (Methods.rand.nextInt(4) == 0) {
+					if (Methods.rand.nextInt(50) == 0) {
 						Methods.playWaterbendingSound(sound.getLocation());
 					}		
 				}

src/com/projectkorra/ProjectKorra/waterbending/WaterWall.java

@@ -240,10 +240,6 @@ public class WaterWall {
 			return false;
 		}	
 		
-		if (Methods.rand.nextInt(4) == 0) {
-			Methods.playWaterbendingSound(location);
-		}		
-		
 		if (System.currentTimeMillis() - time >= interval) {
 			time = System.currentTimeMillis();
 
@@ -274,6 +270,9 @@ public class WaterWall {
 			}
 
 			if (forming) {
+				if (Methods.rand.nextInt(7) == 0) {
+					Methods.playWaterbendingSound(location);
+				}	
 				ArrayList<Block> blocks = new ArrayList<Block>();
 				Location loc = Methods.getTargetedLocation(player, (int) range,	8, 9, 79);
 				location = loc.clone();

src/com/projectkorra/ProjectKorra/waterbending/Wave.java

@@ -249,7 +249,7 @@ public class Wave {
 								FireBlast.removeFireBlastsAroundPoint(block.getLocation(), 2);
 							}
 							
-							if (Methods.rand.nextInt(4) == 0) {
+							if (Methods.rand.nextInt(15) == 0) {
 								Methods.playWaterbendingSound(location);
 							}
 							// if (!blocks.contains(block)