TotalFreedomMC/TF-ProjectKorra
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-ProjectKorra.git synced 2024-11-04 11:15:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #395 from Simplicitee/master

Browse source 
Fix WaterManipulation
This commit is contained in:
OmniCypher 2016-02-10 13:07:15 -08:00
commit 0f0fda100d
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/com/projectkorra/projectkorra/configuration/ConfigManager.java
View file

@ -537,7 +537,8 @@ public class ConfigManager {
config.addDefault("Abilities.Water.WaterManipulation.Enabled", true);
config.addDefault("Abilities.Water.WaterManipulation.Description", "To use, place your cursor over a waterbendable object and tap sneak (default: shift). Smoke will appear where you've selected, indicating the origin of your ability. After you have selected an origin, simply left-click in any direction and you will see your water spout off in that direction, slicing any creature in its path. If you look towards a creature when you use this ability, it will target that creature. A collision from Water Manipulation both knocks the target back and deals some damage. Alternatively, if you have the source selected and tap shift again, you will be able to control the water more directly.");
config.addDefault("Abilities.Water.WaterManipulation.Damage", 3.0);
config.addDefault("Abilities.Water.WaterManipulation.SelectRange", 30);
config.addDefault("Abilities.Water.WaterManipulation.Range", 30);
config.addDefault("Abilities.Water.WaterManipulation.SelectRange", 10);
config.addDefault("Abilities.Water.WaterManipulation.CollisionRadius", 2);
config.addDefault("Abilities.Water.WaterManipulation.DeflectRange", 3);
config.addDefault("Abilities.Water.WaterManipulation.Speed", 35);

23
src/com/projectkorra/projectkorra/waterbending/WaterManipulation.java
View file

@ -39,7 +39,7 @@ public class WaterManipulation extends WaterAbility {
private long time;
private long cooldown;
private long interval;
private double selectRange;
private double selectRange, range;
private double pushFactor;
private double damage;
private double speed;
@ -65,6 +65,7 @@ public class WaterManipulation extends WaterAbility {
this.collisionRadius = getConfig().getDouble("Abilities.Water.WaterManipulation.CollisionRadius");
this.cooldown = getConfig().getLong("Abilities.Water.WaterManipulation.Cooldown");
this.selectRange = getConfig().getDouble("Abilities.Water.WaterManipulation.SelectRange");
this.range = getConfig().getDouble("Abilities.Water.WaterManipulation.Range");
this.pushFactor = getConfig().getDouble("Abilities.Water.WaterManipulation.Push");
this.damage = getConfig().getDouble("Abilities.Water.WaterManipulation.Damage");
this.speed = getConfig().getDouble("Abilities.Water.WaterManipulation.Speed");
@ -129,7 +130,7 @@ public class WaterManipulation extends WaterAbility {
public void moveWater() {
if (sourceBlock != null) {
if (sourceBlock.getWorld().equals(player.getWorld())) {
targetDestination = getTargetLocation(player, selectRange);
targetDestination = getTargetLocation(player, range);
if (targetDestination.distanceSquared(location) <= 1) {
progressing = false;
@ -141,7 +142,7 @@ public class WaterManipulation extends WaterAbility {
settingUp = true;
firstDestination = getToEyeLevel();
firstDirection = GeneralMethods.getDirection(sourceBlock.getLocation(), firstDestination).normalize();
targetDestination = GeneralMethods.getPointOnLine(firstDestination, targetDestination, selectRange);
targetDestination = GeneralMethods.getPointOnLine(firstDestination, targetDestination, range);
targetDirection = GeneralMethods.getDirection(firstDestination, targetDestination).normalize();
if (isPlant(sourceBlock)) {
@ -307,7 +308,7 @@ public class WaterManipulation extends WaterAbility {
trail = new TempBlock(sourceBlock, Material.STATIONARY_WATER, (byte) 1);
sourceBlock = block;
if (location.distanceSquared(targetDestination) <= 1 || location.distanceSquared(firstDestination) > selectRange * selectRange) {
if (location.distanceSquared(targetDestination) <= 1 || location.distanceSquared(firstDestination) > range * range) {
falling = true;
progressing = false;
}
@ -317,7 +318,7 @@ public class WaterManipulation extends WaterAbility {
private void redirect(Player player, Location targetlocation) {
if (progressing && !settingUp) {
if (location.distanceSquared(player.getLocation()) <= selectRange * selectRange) {
if (location.distanceSquared(player.getLocation()) <= range * range) {
targetDirection = GeneralMethods.getDirection(location, targetlocation).normalize();
}
targetDestination = targetlocation;
@ -466,7 +467,7 @@ public class WaterManipulation extends WaterAbility {
boolean handledPrepare = false;
double range = 25;
for (WaterManipulation waterManip : getAbilities(player, WaterManipulation.class)) {
range = waterManip.selectRange;
range = waterManip.range;
if (waterManip.prepared) {
waterManip.prepared = false;
handledPrepare = true;
@ -507,7 +508,7 @@ public class WaterManipulation extends WaterAbility {
}
if (manip.player.equals(player)) {
manip.redirect(player, getTargetLocation(player, manip.selectRange));
manip.redirect(player, getTargetLocation(player, manip.range));
}
Location location = player.getEyeLocation();
@ -631,6 +632,14 @@ public class WaterManipulation extends WaterAbility {
this.interval = interval;
}
public double getRange() {
return range;
}
public void setRange(double range) {
this.range = range;
}
public double getSelectRange() {
return selectRange;
}