diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitCreeper.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitCreeper.java index 7fbd8e6f3..6d56a56ad 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitCreeper.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitCreeper.java @@ -24,6 +24,14 @@ import nautilus.game.arcade.kit.perks.PerkDoubleJump; public class KitCreeper extends SmashKit { + private static final Perk[] PERKS = { + new PerkSmashStats(), + new PerkDoubleJump("Double Jump"), + new PerkCreeperElectricity(), + new PerkCreeperSulphurBomb(), + new PerkCreeperExplode(), + new SmashCreeper() + }; private static final ItemStack IN_HAND = new ItemStack(Material.TNT); @@ -75,14 +83,7 @@ public class KitCreeper extends SmashKit public KitCreeper(ArcadeManager manager) { - super(manager, "Creeper", KitAvailability.Gem, 4000, new Perk[] { - new PerkSmashStats(), - new PerkDoubleJump("Double Jump"), - new PerkCreeperElectricity(), - new PerkCreeperSulphurBomb(), - new PerkCreeperExplode(), - new SmashCreeper() - }, EntityType.CREEPER, IN_HAND, DisguiseCreeper.class); + super(manager, "Creeper", KitAvailability.Gem, 4000, PERKS, EntityType.CREEPER, IN_HAND, DisguiseCreeper.class); } @Override diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitEnderman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitEnderman.java index c3324ebd3..43137cfb9 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitEnderman.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitEnderman.java @@ -86,14 +86,7 @@ public class KitEnderman extends SmashKit public KitEnderman(ArcadeManager manager) { - super(manager, "Enderman", KitAvailability.Gem, 3000, new Perk[] { - new PerkSmashStats(), - new PerkDoubleJump("Double Jump"), - new PerkBlink("Blink"), - new PerkBlockToss(), - new PerkEndermanTeleport(), - new SmashEnderman() - }, EntityType.ENDERMAN, IN_HAND, DisguiseEnderman.class); + super(manager, "Enderman", KitAvailability.Gem, 3000, PERKS, EntityType.ENDERMAN, IN_HAND, DisguiseEnderman.class); } @Override diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitGolem.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitGolem.java index 930869cd2..649a3c072 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitGolem.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitGolem.java @@ -26,6 +26,16 @@ import nautilus.game.arcade.kit.perks.PerkSlow; public class KitGolem extends SmashKit { + private static final Perk[] PERKS = { + new PerkSmashStats(), + new PerkDoubleJump("Double Jump"), + new PerkSlow(0), + new PerkFissure(), + new PerkIronHook(), + new PerkSeismicSlam(), + new SmashGolem() + }; + private static final ItemStack IN_HAND = new ItemStack(Material.IRON_BLOCK); private static final ItemStack[] PLAYER_ITEMS = { @@ -68,15 +78,7 @@ public class KitGolem extends SmashKit public KitGolem(ArcadeManager manager) { - super(manager, "Iron Golem", KitAvailability.Free, new Perk[] { - new PerkSmashStats(), - new PerkDoubleJump("Double Jump"), - new PerkSlow(0), - new PerkFissure(), - new PerkIronHook(), - new PerkSeismicSlam(), - new SmashGolem() - }, EntityType.IRON_GOLEM, IN_HAND, DisguiseIronGolem.class); + super(manager, "Iron Golem", KitAvailability.Free, PERKS, EntityType.IRON_GOLEM, IN_HAND, DisguiseIronGolem.class); } @Override diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSkeleton.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSkeleton.java index 0f37721d0..8237cf19a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSkeleton.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSkeleton.java @@ -34,6 +34,17 @@ public class KitSkeleton extends SmashKit private static double ARROW_DAMAGE = 6; + private static final Perk[] PERKS = { + new PerkSmashStats(), + new PerkDoubleJump("Double Jump"), + new PerkFletcher(), + new PerkKnockbackArrow(), + new PerkBoneExplosion(), + new PerkRopedArrow("Roped Arrow"), + new PerkBarrage(), + new SmashSkeleton() + }; + private static final ItemStack IN_HAND = new ItemStack(Material.BOW); private static final ItemStack[] PLAYER_ITEMS = { @@ -79,16 +90,7 @@ public class KitSkeleton extends SmashKit public KitSkeleton(ArcadeManager manager) { - super(manager, "Skeleton", KitAvailability.Free, new Perk[] { - new PerkSmashStats(), - new PerkDoubleJump("Double Jump"), - new PerkFletcher(), - new PerkKnockbackArrow(), - new PerkBoneExplosion(), - new PerkRopedArrow("Roped Arrow"), - new PerkBarrage(), - new SmashSkeleton() - }, EntityType.SKELETON, IN_HAND, DisguiseSkeleton.class); + super(manager, "Skeleton", KitAvailability.Free, PERKS, EntityType.SKELETON, IN_HAND, DisguiseSkeleton.class); } @Override diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSlime.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSlime.java index 411b2881c..d31d0028a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSlime.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSlime.java @@ -24,6 +24,14 @@ import nautilus.game.arcade.kit.perks.PerkDoubleJump; public class KitSlime extends SmashKit { + private static final Perk[] PERKS = { + new PerkSmashStats(), + new PerkDoubleJump("Double Jump"), + new PerkSlimeSlam(), + new PerkSlimeRocket(), + new SmashSlime() + }; + private static final ItemStack IN_HAND = new ItemStack(Material.SLIME_BALL); private static final ItemStack[] PLAYER_ITEMS = { @@ -66,13 +74,7 @@ public class KitSlime extends SmashKit public KitSlime(ArcadeManager manager) { - super(manager, "Slime", KitAvailability.Free, new Perk[] { - new PerkSmashStats(), - new PerkDoubleJump("Double Jump"), - new PerkSlimeSlam(), - new PerkSlimeRocket(), - new SmashSlime() - }, EntityType.SLIME, IN_HAND, DisguiseSlime.class); + super(manager, "Slime", KitAvailability.Free, PERKS, EntityType.SLIME, IN_HAND, DisguiseSlime.class); } @Override diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSpider.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSpider.java index 563938841..343ad990b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSpider.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSpider.java @@ -25,6 +25,14 @@ import nautilus.game.arcade.kit.Perk; public class KitSpider extends SmashKit { + private static final Perk[] PERKS = { + new PerkSmashStats(), + new PerkSpiderLeap(), + new PerkNeedler(), + new PerkWebShot(), + new SmashSpider() + }; + private static final ItemStack IN_HAND = new ItemStack(Material.WEB); private static final ItemStack[] PLAYER_ITEMS = { @@ -80,13 +88,7 @@ public class KitSpider extends SmashKit public KitSpider(ArcadeManager manager) { - super(manager, "Spider", KitAvailability.Free, new Perk[] { - new PerkSmashStats(), - new PerkSpiderLeap(), - new PerkNeedler(), - new PerkWebShot(), - new SmashSpider() - }, EntityType.SPIDER, IN_HAND, DisguiseSpider.class); + super(manager, "Spider", KitAvailability.Free, PERKS, EntityType.SPIDER, IN_HAND, DisguiseSpider.class); } @Override