From 190ced7d974dba46c6a5dd109de8a491e5926eca Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 4 Aug 2016 16:55:52 +0100 Subject: [PATCH] Metal Kit tweaks --- .../arcade/game/games/skywars/kits/KitMetal.java | 14 +++++++------- .../game/arcade/kit/perks/PerkMagnetism.java | 6 ++++-- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/kits/KitMetal.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/kits/KitMetal.java index 125020875..41fc1f8df 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/kits/KitMetal.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/kits/KitMetal.java @@ -22,26 +22,26 @@ public class KitMetal extends ProgressingKit private static final Perk[][] PERKS = { { - new PerkMagnetism(15000, 10) + new PerkMagnetism(15000, 10, 1) }, { - new PerkMagnetism(15000, 10) + new PerkMagnetism(15000, 10, 1.1) }, { - new PerkMagnetism(15000, 10) + new PerkMagnetism(15000, 10, 1.2) }, { - new PerkMagnetism(15000, 10) + new PerkMagnetism(15000, 10, 1.3) }, { - new PerkMagnetism(15000, 10) + new PerkMagnetism(15000, 10, 1.4) }, { - new PerkMagnetism(15000, 10) + new PerkMagnetism(15000, 10, 1.5) }, }; - private static final ItemStack[] PLAYER_ITEMS = { new ItemStack(Material.WOOD_SWORD), new ItemBuilder(Material.REDSTONE_COMPARATOR).setTitle(C.cGreen + "Magnet").build() }; + private static final ItemStack[] PLAYER_ITEMS = { new ItemStack(Material.WOOD_SWORD), new ItemStack(Material.STONE_AXE), new ItemBuilder(Material.REDSTONE_COMPARATOR).setTitle(C.cGreen + "Magnet").build() }; private static final ItemStack IN_HAND = new ItemStack(Material.REDSTONE_COMPARATOR); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkMagnetism.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkMagnetism.java index bec6e5577..bd961ea05 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkMagnetism.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkMagnetism.java @@ -34,13 +34,15 @@ public class PerkMagnetism extends Perk private long _cooldown; private int _range; + private double _magnituideFactor; - public PerkMagnetism(long cooldown, int range) + public PerkMagnetism(long cooldown, int range, double magnitudeFactor) { super("Magnestism", new String[] {}); _cooldown = cooldown; _range = range; + _magnituideFactor = magnitudeFactor; } @EventHandler @@ -116,7 +118,7 @@ public class PerkMagnetism extends Perk return; } - Vector vector = UtilAlg.getTrajectory(target, player).multiply(1 + magnitude / 4); + Vector vector = UtilAlg.getTrajectory(target, player).multiply((1 + magnitude / 4) * _magnituideFactor); UtilParticle.PlayParticleToAll(ParticleType.FIREWORKS_SPARK, target.getEyeLocation(), 1F, 1F, 1F, 0.1F, 20, ViewDist.NORMAL); target.setVelocity(vector.setY(Math.max(1, vector.getY())));