TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-15 05:17:53 +00:00
Code Issues Projects Releases Wiki Activity

Clean up Waterbending Sounds

Browse source
This commit is contained in:
MistPhizzle 2014-09-28 10:38:52 -04:00
parent 7bfe129ceb
commit c30df35a87
7 changed files with 39 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/com/projectkorra/ProjectKorra/ConfigManager.java
View file

@ -50,10 +50,10 @@ public class ConfigManager {
config.addDefault("Properties.Chat.Colors.Chi", "GOLD"); config.addDefault("Properties.Chat.Colors.Chi", "GOLD");
config.addDefault("Properties.ImportEnabled", true); config.addDefault("Properties.ImportEnabled", true);
config.addDefault("Properties.BendingAffectFallingSand.Normal", true); config.addDefault("Properties.BendingAffectFallingSand.Normal", true);
config.addDefault("Properties.BendingAffectFallingSand.NormalStrengthMultiplier", 1.0); config.addDefault("Properties.BendingAffectFallingSand.NormalStrengthMultiplier", 1.0);
config.addDefault("Properties.BendingAffectFallingSand.TNT", true); config.addDefault("Properties.BendingAffectFallingSand.TNT", true);
config.addDefault("Properties.BendingAffectFallingSand.TNTStrengthMultiplier", 1.0); config.addDefault("Properties.BendingAffectFallingSand.TNTStrengthMultiplier", 1.0);
config.addDefault("Properties.GlobalCooldown", 500); config.addDefault("Properties.GlobalCooldown", 500);
config.addDefault("Properties.SeaLevel", 62); config.addDefault("Properties.SeaLevel", 62);
@ -447,7 +447,7 @@ public class ConfigManager {
config.addDefault("Abilities.Fire.Combustion.Enabled", true); 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.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.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.BreakBlocks", false);
config.addDefault("Abilities.Fire.Combustion.Power", 1.0); config.addDefault("Abilities.Fire.Combustion.Power", 1.0);
config.addDefault("Abilities.Fire.Combustion.Damage", 5); config.addDefault("Abilities.Fire.Combustion.Damage", 5);

1
src/com/projectkorra/ProjectKorra/airbending/AirBlast.java
View file

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

10
src/com/projectkorra/ProjectKorra/waterbending/OctopusForm.java
View file

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

7
src/com/projectkorra/ProjectKorra/waterbending/Torrent.java
View file

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

2
src/com/projectkorra/ProjectKorra/waterbending/TorrentBurst.java
View file

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

7
src/com/projectkorra/ProjectKorra/waterbending/WaterWall.java
View file

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

2
src/com/projectkorra/ProjectKorra/waterbending/Wave.java
View file

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