Skip to content

Commit

Permalink
1.0.5 Update
Browse files Browse the repository at this point in the history
  • Loading branch information
@xNuminousx
xNuminousx committed Dec 23, 2017
1 parent ecbf069 commit 1c3c982
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 19 deletions.
10 changes: 5 additions & 5 deletions src/me/xnuminousx/spirits/ability/dark/Intoxicate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public void effect(int points, float size) {

for (Entity target : GeneralMethods.getEntitiesAroundPoint(location, 1)) {
if (((target instanceof LivingEntity)) && (target.getEntityId() != player.getEntityId())) {
Location tarLoc = target.getLocation();
location = target.getLocation();
LivingEntity le = (LivingEntity)target;
progress = false;

Expand All @@ -96,10 +96,10 @@ public void effect(int points, float size) {
double x = size * (Math.PI * 4 - angle) * Math.cos(angle + i);
double y = 1.2 * Math.cos(angle) + 1.2;
double z = size * (Math.PI * 4 - angle) * Math.sin(angle + i);
tarLoc.add(x, y, z);
GeneralMethods.displayColoredParticle(tarLoc, hexColor, 0, 0, 0);
GeneralMethods.displayColoredParticle(tarLoc, "000000", 0, 0, 0);
tarLoc.subtract(x, y, z);
location.add(x, y, z);
GeneralMethods.displayColoredParticle(location, hexColor, 0, 0, 0);
GeneralMethods.displayColoredParticle(location, "000000", 0, 0, 0);
location.subtract(x, y, z);
}

if (System.currentTimeMillis() - time > potInt) {
Expand Down
2 changes: 1 addition & 1 deletion src/me/xnuminousx/spirits/ability/dark/combo/Infest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ private void setFields() {
this.duration = ConfigManager.getConfig().getLong("Abilities.Spirits.DarkSpirit.Combo.Infest.Duration");
this.range = ConfigManager.getConfig().getInt("Abilities.Spirits.DarkSpirit.Combo.Infest.Range");
this.radius = ConfigManager.getConfig().getDouble("Abilities.Spirits.DarkSpirit.Combo.Infest.Radius");
this.canUseOnSpirits = ConfigManager.getConfig().getBoolean("Abilities.Spirits.DarkSpirit.Combo.Infest.CanUseOnOtherSpirits");
this.canUseOnSpirits = ConfigManager.getConfig().getBoolean("Abilities.Spirits.DarkSpirit.Combo.Infest.CanUseOtherSpirits");
this.origin = player.getLocation().clone().add(0, 1, 0);
this.location = origin.clone();
this.direction = player.getLocation().getDirection();
Expand Down
8 changes: 4 additions & 4 deletions src/me/xnuminousx/spirits/ability/light/Alleviate.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public void effect(int points, float size) {

for (Entity target : GeneralMethods.getEntitiesAroundPoint(location, 1)) {
if (((target instanceof LivingEntity)) && (target.getEntityId() != player.getEntityId())) {
Location tarLoc = target.getLocation();
location = target.getLocation().clone();
LivingEntity le = (LivingEntity)target;
progress = false;

Expand All @@ -96,9 +96,9 @@ public void effect(int points, float size) {
double x = size * (Math.PI * 4 - angle) * Math.cos(angle + i);
double y = 1.2 * Math.cos(angle) + 1.2;
double z = size * (Math.PI * 4 - angle) * Math.sin(angle + i);
tarLoc.add(x, y, z);
GeneralMethods.displayColoredParticle(tarLoc, hexColor, 0, 0, 0);
tarLoc.subtract(x, y, z);
location.add(x, y, z);
GeneralMethods.displayColoredParticle(location, hexColor, 0, 0, 0);
location.subtract(x, y, z);
}

if (System.currentTimeMillis() - time > potInt) {
Expand Down
1 change: 0 additions & 1 deletion src/me/xnuminousx/spirits/ability/spirit/Possess.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ public void progress() {
}

if (!bPlayer.getBoundAbilityName().equals(getName())) {
bPlayer.addCooldown(this);
remove();
return;
}
Expand Down
10 changes: 4 additions & 6 deletions src/me/xnuminousx/spirits/ability/spirit/combo/Fuse.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public class Fuse extends SpiritAbility implements AddonAbility, ComboAbility {
private long cooldown;
private Location origin;
private int distance;
private int strengthDuration;
private int posEffectDuration;
private int weaknessDuration;

public Fuse(Player player) {
Expand All @@ -45,12 +45,9 @@ public Fuse(Player player) {
private void setFields() {
this.cooldown = ConfigManager.getConfig().getLong("Abilities.Spirits.Neutral.Combo.Fuse.Cooldown");
this.distance = ConfigManager.getConfig().getInt("Abilities.Spirits.Neutral.Combo.Fuse.Distance");
this.strengthDuration = ConfigManager.getConfig().getInt("Abilities.Spirits.Neutral.Combo.Fuse.StrengthDuration");
this.posEffectDuration = ConfigManager.getConfig().getInt("Abilities.Spirits.Neutral.Combo.Fuse.StrengthDuration");
this.weaknessDuration = ConfigManager.getConfig().getInt("Abilities.Spirits.Neutral.Combo.Fuse.WeaknessDuration");
this.origin = player.getLocation();
this.distance = 10;
this.strengthDuration = 2;
this.weaknessDuration = 2;

}

Expand Down Expand Up @@ -82,7 +79,8 @@ public void dash() {

LivingEntity le = (LivingEntity)target;
ParticleEffect.FIREWORKS_SPARK.display(target.getLocation().add(0, 1, 0), 0.5F, 1, 0.5F, 0.2F, 10);
le.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE, strengthDuration * 100, 0), true);
le.addPotionEffect(new PotionEffect(PotionEffectType.INCREASE_DAMAGE, posEffectDuration * 100, 0), true);
le.addPotionEffect(new PotionEffect(PotionEffectType.SPEED, posEffectDuration * 100, 1), true);
player.addPotionEffect(new PotionEffect(PotionEffectType.WEAKNESS, weaknessDuration * 100, 0), true);

remove();
Expand Down
6 changes: 4 additions & 2 deletions src/me/xnuminousx/spirits/config/Handler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public void load() {
langConfig.addDefault("Abilities.Spirit.Fuse.Description", "Rush towards a human to combine your energies and temporarily empower them with strength! This will come at a cost of your own power and strength, however. You must collide with your target for this to be used successfully. An alternative usage is a powerful boost.");
langConfig.addDefault("Abilities.Spirit.Fuse.Instructions", "Soar (Left-click 2x) > Possess (Hold shift)");

langConfig.addDefault("Abilities.LightSpirit.Alleviate.Description", "Use this ability to relieve your friends and allies of their negative potion effects, keep using it and you'll give them a small boost of your own health. If your target moves, the ability will cancel.");
langConfig.addDefault("Abilities.LightSpirit.Alleviate.Description", "Use this ability to relieve your friends and allies of their negative potion effects, keep using it and you'll give them a small boost of your own health. If your target moves too far, the ability will cancel.");
langConfig.addDefault("Abilities.LightSpirit.Alleviate.Instructions", "Hold shift while looking at your target");

langConfig.addDefault("Abilities.LightSpirit.Shelter.Description", "A very useful tactic when group battling, a light spirit can temporarily shield a friend or even a foe from incoming enemies.");
Expand Down Expand Up @@ -139,14 +139,16 @@ public void load() {
config.addDefault("Abilities.Spirits.DarkSpirit.Combo.Infest.Duration", 5000);
config.addDefault("Abilities.Spirits.DarkSpirit.Combo.Infest.Range", 20);
config.addDefault("Abilities.Spirits.DarkSpirit.Combo.Infest.Radius", 2);
config.addDefault("Abilities.Spirits.DarkSpirit.Combo.Infest.CanUseOnOtherSpirits", false);
config.addDefault("Abilities.Spirits.DarkSpirit.Combo.Infest.CanUseOnSpirits", false);

ConfigManager.defaultConfig.save();
ConfigManager.languageConfig.save();
}

@Override
public void stop() {
ConfigManager.defaultConfig.save();
ConfigManager.languageConfig.save();
super.remove();
}

Expand Down

0 comments on commit 1c3c982

Please sign in to comment.