TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2025-02-11 19:50:37 +00:00
Code Issues Projects Releases Wiki Activity

Fix AirCombo variable names

Browse source
This commit is contained in:
Jack Lin 2015-07-15 14:39:29 +12:00
parent 8c8b9149b6
commit d91cafec9c
1 changed files with 63 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

126
src/com/projectkorra/ProjectKorra/airbending/AirCombo.java
View file

@ -31,33 +31,33 @@ public class AirCombo implements ConfigLoadable {
public static ArrayList<AirCombo> instances = new ArrayList<AirCombo>(); public static ArrayList<AirCombo> instances = new ArrayList<AirCombo>();
public double twister_speed = config.getDouble("Abilities.Air.AirCombo.Twister.Speed"); public static double twisterSpeed = config.getDouble("Abilities.Air.AirCombo.Twister.Speed");
public double twister_range = config.getDouble("Abilities.Air.AirCombo.Twister.Range"); public static double twisterRange = config.getDouble("Abilities.Air.AirCombo.Twister.Range");
public double twister_height = config.getDouble("Abilities.Air.AirCombo.Twister.Height"); public static double twisterHeight = config.getDouble("Abilities.Air.AirCombo.Twister.Height");
public double twister_radius = config.getDouble("Abilities.Air.AirCombo.Twister.Radius"); public static double twisterRadius = config.getDouble("Abilities.Air.AirCombo.Twister.Radius");
public double twister_degree_per_particle = config.getDouble("Abilities.Air.AirCombo.Twister.DegreesPerParticle"); public static double twisterDegreePerParticle = config.getDouble("Abilities.Air.AirCombo.Twister.DegreesPerParticle");
public double twister_height_per_particle = config.getDouble("Abilities.Air.AirCombo.Twister.HeightPerParticle"); public static double twisterHeightPerParticle = config.getDouble("Abilities.Air.AirCombo.Twister.HeightPerParticle");
public long twister_remove_delay = config.getLong("Abilities.Air.AirCombo.Twister.RemoveDelay"); public static long twisterRemoveDelay = config.getLong("Abilities.Air.AirCombo.Twister.RemoveDelay");
public long twister_cooldown = config.getLong("Abilities.Air.AirCombo.Twister.Cooldown"); public static long twisterCooldown = config.getLong("Abilities.Air.AirCombo.Twister.Cooldown");
public double air_stream_speed = config.getDouble("Abilities.Air.AirCombo.AirStream.Speed"); public static double airStreamSpeed = config.getDouble("Abilities.Air.AirCombo.AirStream.Speed");
public double air_stream_range = config.getDouble("Abilities.Air.AirCombo.AirStream.Range"); public static double airStreamRange = config.getDouble("Abilities.Air.AirCombo.AirStream.Range");
public double air_stream_entity_height = config.getDouble("Abilities.Air.AirCombo.AirStream.EntityHeight"); public static double airStreamEntityHeight = config.getDouble("Abilities.Air.AirCombo.AirStream.EntityHeight");
public long air_stream_entity_duration = config.getLong("Abilities.Air.AirCombo.AirStream.EntityDuration"); public static long airStreamEntityDuration = config.getLong("Abilities.Air.AirCombo.AirStream.EntityDuration");
public long air_stream_cooldown = config.getLong("Abilities.Air.AirCombo.AirStream.Cooldown"); public static long airStreamCooldown = config.getLong("Abilities.Air.AirCombo.AirStream.Cooldown");
public double air_sweep_speed = config.getDouble("Abilities.Air.AirCombo.AirSweep.Speed"); public static double airSweepSpeed = config.getDouble("Abilities.Air.AirCombo.AirSweep.Speed");
public double air_sweep_range = config.getDouble("Abilities.Air.AirCombo.AirSweep.Range"); public static double airSweepRange = config.getDouble("Abilities.Air.AirCombo.AirSweep.Range");
public double air_sweep_damage = config.getDouble("Abilities.Air.AirCombo.AirSweep.Damage"); public static double airSweepDamage = config.getDouble("Abilities.Air.AirCombo.AirSweep.Damage");
public double air_sweep_knockback = config.getDouble("Abilities.Air.AirCombo.AirSweep.Knockback"); public static double airSweepKnockback = config.getDouble("Abilities.Air.AirCombo.AirSweep.Knockback");
public long air_sweep_cooldown = config.getLong("Abilities.Air.AirCombo.AirSweep.Cooldown"); public static long airSweepCooldown = config.getLong("Abilities.Air.AirCombo.AirSweep.Cooldown");
private boolean enabled = config.getBoolean("Abilities.Air.AirCombo.Enabled"); private static boolean enabled = config.getBoolean("Abilities.Air.AirCombo.Enabled");
public double AIR_SLICE_SPEED = 0.7; public double airSliceSpeed = 0.7;
public double AIR_SLICE_RANGE = 10; public double airSliceRange = 10;
public double AIR_SLICE_DAMAGE = 3; public double airSliceDamage = 3;
public long AIR_SLICE_COOLDOWN = 500; public long airSliceCooldown = 500;
private Player player; private Player player;
private BendingPlayer bPlayer; private BendingPlayer bPlayer;
@ -102,25 +102,25 @@ public class AirCombo implements ConfigLoadable {
if (ability.equalsIgnoreCase("Twister")) { if (ability.equalsIgnoreCase("Twister")) {
damage = 0; damage = 0;
range = twister_range; range = twisterRange;
speed = twister_speed; speed = twisterSpeed;
cooldown = twister_cooldown; cooldown = twisterCooldown;
} else if (ability.equalsIgnoreCase("AirStream")) { } else if (ability.equalsIgnoreCase("AirStream")) {
damage = 0; damage = 0;
range = air_stream_range; range = airStreamRange;
speed = air_stream_speed; speed = airStreamSpeed;
cooldown = air_stream_cooldown; cooldown = airStreamCooldown;
} else if (ability.equalsIgnoreCase("AirSlice")) { } else if (ability.equalsIgnoreCase("AirSlice")) {
damage = AIR_SLICE_DAMAGE; damage = airSliceDamage;
range = AIR_SLICE_RANGE; range = airSliceRange;
speed = AIR_SLICE_SPEED; speed = airSliceSpeed;
cooldown = AIR_SLICE_COOLDOWN; cooldown = airSliceCooldown;
} else if (ability.equalsIgnoreCase("AirSweep")) { } else if (ability.equalsIgnoreCase("AirSweep")) {
damage = air_sweep_damage; damage = airSweepDamage;
range = air_sweep_range; range = airSweepRange;
speed = air_sweep_speed; speed = airSweepSpeed;
knockback = air_sweep_knockback; knockback = airSweepKnockback;
cooldown = air_sweep_cooldown; cooldown = airSweepCooldown;
} }
if (AvatarState.isAvatarState(player)) { if (AvatarState.isAvatarState(player)) {
cooldown = 0; cooldown = 0;
@ -162,7 +162,7 @@ public class AirCombo implements ConfigLoadable {
else if (state == AbilityState.TWISTER_MOVING) { else if (state == AbilityState.TWISTER_MOVING) {
state = AbilityState.TWISTER_STATIONARY; state = AbilityState.TWISTER_STATIONARY;
time = System.currentTimeMillis(); time = System.currentTimeMillis();
} else if (System.currentTimeMillis() - time >= twister_remove_delay) { } else if (System.currentTimeMillis() - time >= twisterRemoveDelay) {
remove(); remove();
return; return;
} else if (GeneralMethods.isRegionProtectedFromBuild(player, "AirBlast", } else if (GeneralMethods.isRegionProtectedFromBuild(player, "AirBlast",
@ -178,11 +178,11 @@ public class AirCombo implements ConfigLoadable {
} }
currentLoc.setY(topBlock.getLocation().getY()); currentLoc.setY(topBlock.getLocation().getY());
double height = twister_height; double height = twisterHeight;
double radius = twister_radius; double radius = twisterRadius;
for (double y = 0; y < height; y += twister_height_per_particle) { for (double y = 0; y < height; y += twisterHeightPerParticle) {
double animRadius = ((radius / height) * y); double animRadius = ((radius / height) * y);
for (double i = -180; i <= 180; i += twister_degree_per_particle) { for (double i = -180; i <= 180; i += twisterDegreePerParticle) {
Vector animDir = GeneralMethods.rotateXZ(new Vector(1, 0, 1), i); Vector animDir = GeneralMethods.rotateXZ(new Vector(1, 0, 1), i);
Location animLoc = currentLoc.clone().add( Location animLoc = currentLoc.clone().add(
animDir.multiply(animRadius)); animDir.multiply(animRadius));
@ -236,7 +236,7 @@ public class AirCombo implements ConfigLoadable {
remove(); remove();
return; return;
} else if (affectedEntities.size() > 0 } else if (affectedEntities.size() > 0
&& System.currentTimeMillis() - time >= air_stream_entity_duration) { && System.currentTimeMillis() - time >= airStreamEntityDuration) {
remove(); remove();
return; return;
} else if (!player.isSneaking()) { } else if (!player.isSneaking()) {
@ -246,7 +246,7 @@ public class AirCombo implements ConfigLoadable {
currentLoc.getBlock())) { currentLoc.getBlock())) {
remove(); remove();
return; return;
} else if (currentLoc.getY() - origin.getY() > air_stream_entity_height) { } else if (currentLoc.getY() - origin.getY() > airStreamEntityHeight) {
remove(); remove();
return; return;
} else if (GeneralMethods.isRegionProtectedFromBuild(player, "AirBlast", } else if (GeneralMethods.isRegionProtectedFromBuild(player, "AirBlast",
@ -519,26 +519,26 @@ public class AirCombo implements ConfigLoadable {
@Override @Override
public void reloadVariables() { public void reloadVariables() {
twister_speed = config.getDouble("Abilities.Air.AirCombo.Twister.Speed"); twisterSpeed = config.getDouble("Abilities.Air.AirCombo.Twister.Speed");
twister_range = config.getDouble("Abilities.Air.AirCombo.Twister.Range"); twisterRange = config.getDouble("Abilities.Air.AirCombo.Twister.Range");
twister_height = config.getDouble("Abilities.Air.AirCombo.Twister.Height"); twisterHeight = config.getDouble("Abilities.Air.AirCombo.Twister.Height");
twister_radius = config.getDouble("Abilities.Air.AirCombo.Twister.Radius"); twisterRadius = config.getDouble("Abilities.Air.AirCombo.Twister.Radius");
twister_degree_per_particle = config.getDouble("Abilities.Air.AirCombo.Twister.DegreesPerParticle"); twisterDegreePerParticle = config.getDouble("Abilities.Air.AirCombo.Twister.DegreesPerParticle");
twister_height_per_particle = config.getDouble("Abilities.Air.AirCombo.Twister.HeightPerParticle"); twisterHeightPerParticle = config.getDouble("Abilities.Air.AirCombo.Twister.HeightPerParticle");
twister_remove_delay = config.getLong("Abilities.Air.AirCombo.Twister.RemoveDelay"); twisterRemoveDelay = config.getLong("Abilities.Air.AirCombo.Twister.RemoveDelay");
twister_cooldown = config.getLong("Abilities.Air.AirCombo.Twister.Cooldown"); twisterCooldown = config.getLong("Abilities.Air.AirCombo.Twister.Cooldown");
air_stream_speed = config.getDouble("Abilities.Air.AirCombo.AirStream.Speed"); airStreamSpeed = config.getDouble("Abilities.Air.AirCombo.AirStream.Speed");
air_stream_range = config.getDouble("Abilities.Air.AirCombo.AirStream.Range"); airStreamRange = config.getDouble("Abilities.Air.AirCombo.AirStream.Range");
air_stream_entity_height = config.getDouble("Abilities.Air.AirCombo.AirStream.EntityHeight"); airStreamEntityHeight = config.getDouble("Abilities.Air.AirCombo.AirStream.EntityHeight");
air_stream_entity_duration = config.getLong("Abilities.Air.AirCombo.AirStream.EntityDuration"); airStreamEntityDuration = config.getLong("Abilities.Air.AirCombo.AirStream.EntityDuration");
air_stream_cooldown = config.getLong("Abilities.Air.AirCombo.AirStream.Cooldown"); airStreamCooldown = config.getLong("Abilities.Air.AirCombo.AirStream.Cooldown");
air_sweep_speed = config.getDouble("Abilities.Air.AirCombo.AirSweep.Speed"); airSweepSpeed = config.getDouble("Abilities.Air.AirCombo.AirSweep.Speed");
air_sweep_range = config.getDouble("Abilities.Air.AirCombo.AirSweep.Range"); airSweepRange = config.getDouble("Abilities.Air.AirCombo.AirSweep.Range");
air_sweep_damage = config.getDouble("Abilities.Air.AirCombo.AirSweep.Damage"); airSweepDamage = config.getDouble("Abilities.Air.AirCombo.AirSweep.Damage");
air_sweep_knockback = config.getDouble("Abilities.Air.AirCombo.AirSweep.Knockback"); airSweepKnockback = config.getDouble("Abilities.Air.AirCombo.AirSweep.Knockback");
air_sweep_cooldown = config.getLong("Abilities.Air.AirCombo.AirSweep.Cooldown"); airSweepCooldown = config.getLong("Abilities.Air.AirCombo.AirSweep.Cooldown");
enabled = config.getBoolean("Abilities.Air.AirCombo.Enabled"); enabled = config.getBoolean("Abilities.Air.AirCombo.Enabled");
} }