JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Balance changes

Browse Source
This commit is contained in:
Sam 2017-04-29 23:25:13 +01:00
parent 8a54e19695
commit acb5963dd4
6 changed files with 23 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSlime.java
View File

@ -66,7 +66,7 @@ public class KitSlime extends SmashKit
}; };
private static final ItemStack[] PLAYER_ARMOR = { private static final ItemStack[] PLAYER_ARMOR = {
null, new ItemStack(Material.CHAINMAIL_BOOTS),
null, null,
new ItemStack(Material.CHAINMAIL_CHESTPLATE), new ItemStack(Material.CHAINMAIL_CHESTPLATE),
new ItemStack(Material.CHAINMAIL_HELMET), new ItemStack(Material.CHAINMAIL_HELMET),

1
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/creeper/PerkCreeperExplode.java
View File

@ -312,6 +312,7 @@ public class PerkCreeperExplode extends SmashPerk
return; return;
} }
event.AddMod(GetName(), event.GetDamage() * -0.25);
event.AddKnockback(GetName(), _knockbackMagnitude); event.AddKnockback(GetName(), _knockbackMagnitude);
} }

6
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/enderman/PerkBlockToss.java
View File

@ -45,6 +45,7 @@ public class PerkBlockToss extends SmashPerk implements IThrown
private int _cooldown; private int _cooldown;
private int _chargeTime; private int _chargeTime;
private int _damage; private int _damage;
private int _maxDamage;
private float _knockbackMagnitude; private float _knockbackMagnitude;
private Map<UUID, BlockTossData> _hold = new HashMap<>(); private Map<UUID, BlockTossData> _hold = new HashMap<>();
@ -59,9 +60,10 @@ public class PerkBlockToss extends SmashPerk implements IThrown
@Override @Override
public void setupValues() public void setupValues()
{ {
_cooldown = getPerkTime("Cooldown"); _cooldown = getPerkInt("Cooldown (ms)");
_chargeTime = getPerkInt("Charge Time (ms)"); _chargeTime = getPerkInt("Charge Time (ms)");
_damage = getPerkInt("Damage"); _damage = getPerkInt("Damage");
_maxDamage = getPerkInt("Max Damage");
_knockbackMagnitude = getPerkFloat("Knockback Magnitude"); _knockbackMagnitude = getPerkFloat("Knockback Magnitude");
} }
@ -210,7 +212,7 @@ public class PerkBlockToss extends SmashPerk implements IThrown
} }
// Damage Event // Damage Event
Manager.GetDamage().NewDamageEvent(target, data.getThrower(), null, DamageCause.PROJECTILE, data.getThrown().getVelocity().length() * _damage, true, true, false, UtilEnt.getName(data Manager.GetDamage().NewDamageEvent(target, data.getThrower(), null, DamageCause.PROJECTILE, Math.min(_maxDamage, data.getThrown().getVelocity().length() * _damage), true, true, false, UtilEnt.getName(data
.getThrower()), GetName()); .getThrower()), GetName());
// Block to Item // Block to Item

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/spider/PerkNeedler.java
View File

@ -47,7 +47,7 @@ public class PerkNeedler extends SmashPerk
@Override @Override
public void setupValues() public void setupValues()
{ {
_cooldownNormal = getPerkTime("Cooldown Normal"); _cooldownNormal = getPerkInt("Cooldown Normal (ms)");
_cooldownSmash = getPerkInt("Cooldown Smash (ms)"); _cooldownSmash = getPerkInt("Cooldown Smash (ms)");
_damage = getPerkDouble("Damage"); _damage = getPerkDouble("Damage");
_maxTicks = getPerkInt("Max Ticks"); _maxTicks = getPerkInt("Max Ticks");
@ -88,7 +88,7 @@ public class PerkNeedler extends SmashPerk
return; return;
} }
_active.put(player.getUniqueId(), 8); _active.put(player.getUniqueId(), 7);
UtilPlayer.message(player, F.main("Skill", "You used " + F.skill(GetName()) + ".")); UtilPlayer.message(player, F.main("Skill", "You used " + F.skill(GetName()) + "."));
} }

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/spider/PerkSpiderLeap.java
View File

@ -139,7 +139,7 @@ public class PerkSpiderLeap extends Perk
UtilAction.velocity(player, 1.0, 0.2, 1.0, true); UtilAction.velocity(player, 1.0, 0.2, 1.0, true);
// Energy // Energy
player.setExp(Math.max(0, player.getExp() - _energyJump)); //player.setExp(Math.max(0, player.getExp() - _energyJump));
// Sound // Sound
player.getWorld().playSound(player.getLocation(), Sound.SPIDER_IDLE, 1f, 1.5f); player.getWorld().playSound(player.getLocation(), Sound.SPIDER_IDLE, 1f, 1.5f);

45
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/squid/PerkFishFlurry.java
View File

@ -1,11 +1,17 @@
package nautilus.game.arcade.game.games.smash.perks.squid; package nautilus.game.arcade.game.games.smash.perks.squid;
import java.util.ArrayList; import mineplex.core.common.util.*;
import java.util.HashSet; import mineplex.core.common.util.UtilEvent.ActionType;
import java.util.Iterator; import mineplex.core.common.util.UtilParticle.ParticleType;
import java.util.List; import mineplex.core.common.util.UtilParticle.ViewDist;
import java.util.Set; import mineplex.core.itemstack.ItemStackFactory;
import mineplex.core.projectile.IThrown;
import mineplex.core.projectile.ProjectileUser;
import mineplex.core.recharge.Recharge;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import mineplex.minecraft.game.core.damage.CustomDamageEvent;
import nautilus.game.arcade.game.games.smash.perks.SmashPerk;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.Sound; import org.bukkit.Sound;
import org.bukkit.block.Block; import org.bukkit.block.Block;
@ -18,30 +24,7 @@ import org.bukkit.event.entity.EntityDamageEvent.DamageCause;
import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerInteractEvent;
import org.bukkit.util.Vector; import org.bukkit.util.Vector;
import mineplex.core.common.util.C; import java.util.*;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilAction;
import mineplex.core.common.util.UtilAlg;
import mineplex.core.common.util.UtilBlock;
import mineplex.core.common.util.UtilEnt;
import mineplex.core.common.util.UtilEvent;
import mineplex.core.common.util.UtilEvent.ActionType;
import mineplex.core.common.util.UtilItem;
import mineplex.core.common.util.UtilMath;
import mineplex.core.common.util.UtilParticle;
import mineplex.core.common.util.UtilParticle.ParticleType;
import mineplex.core.common.util.UtilParticle.ViewDist;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilServer;
import mineplex.core.common.util.UtilTime;
import mineplex.core.itemstack.ItemStackFactory;
import mineplex.core.projectile.IThrown;
import mineplex.core.projectile.ProjectileUser;
import mineplex.core.recharge.Recharge;
import mineplex.core.updater.UpdateType;
import mineplex.core.updater.event.UpdateEvent;
import mineplex.minecraft.game.core.damage.CustomDamageEvent;
import nautilus.game.arcade.game.games.smash.perks.SmashPerk;
public class PerkFishFlurry extends SmashPerk implements IThrown public class PerkFishFlurry extends SmashPerk implements IThrown
{ {
@ -157,7 +140,7 @@ public class PerkFishFlurry extends SmashPerk implements IThrown
// particles // particles
for (Block block : data.Blocks) for (Block block : data.Blocks)
{ {
UtilParticle.PlayParticle(ParticleType.SPLASH, block.getLocation().add(0.5, 1, 0.5), 0.25f, 0, 0.25f, 0, 3, ViewDist.LONG, UtilServer.getPlayers()); UtilParticle.PlayParticleToAll(ParticleType.SPLASH, block.getLocation().add(0.5, 1, 0.5), 0.25f, 0, 0.25f, 0, 1, ViewDist.LONG);
} }
// sound // sound