diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/baconbrawl/kits/KitBabyPig.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/baconbrawl/kits/KitBabyPig.java index e6a3c6e05..54a64f6d4 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/baconbrawl/kits/KitBabyPig.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/baconbrawl/kits/KitBabyPig.java @@ -65,7 +65,7 @@ public class KitBabyPig extends Kit LivingEntity entity = (LivingEntity) Manager.GetCreature().SpawnEntity(loc, type); entity.setRemoveWhenFarAway(false); - entity.setCustomName(GetAvailability().GetColor() + GetName() + " Kit" + (GetAvailability() == KitAvailability.Blue ? ChatColor.GRAY + " (" + ChatColor.WHITE + "Ultra" + ChatColor.GRAY + ")" : "")); + entity.setCustomName(GetAvailability().GetColor() + GetName() + " Kit"); entity.setCustomNameVisible(true); entity.getEquipment().setItemInHand(_itemInHand); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/baconbrawl/kits/KitSheepPig.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/baconbrawl/kits/KitSheepPig.java index aff9daf13..6ca35322f 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/baconbrawl/kits/KitSheepPig.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/baconbrawl/kits/KitSheepPig.java @@ -26,7 +26,7 @@ public class KitSheepPig extends Kit { public KitSheepPig(ArcadeManager manager) { - super(manager, "'Pig'", KitAvailability.Blue, + super(manager, "'Pig'", KitAvailability.Green, 5000, new String[] { @@ -65,7 +65,7 @@ public class KitSheepPig extends Kit LivingEntity entity = (LivingEntity) Manager.GetCreature().SpawnEntity(loc, type); entity.setRemoveWhenFarAway(false); - entity.setCustomName(GetAvailability().GetColor() + GetName() + " Kit" + (GetAvailability() == KitAvailability.Blue ? ChatColor.GRAY + " (" + ChatColor.WHITE + "Ultra" + ChatColor.GRAY + ")" : "")); + entity.setCustomName(GetAvailability().GetColor() + GetName() + " Kit"); entity.setCustomNameVisible(true); entity.getEquipment().setItemInHand(_itemInHand); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/barbarians/kits/KitBomber.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/barbarians/kits/KitBomber.java index d87639e7a..ff265513c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/barbarians/kits/KitBomber.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/barbarians/kits/KitBomber.java @@ -18,7 +18,7 @@ public class KitBomber extends Kit { public KitBomber(ArcadeManager manager) { - super(manager, "Bomber", KitAvailability.Blue, + super(manager, "Bomber", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBomber.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBomber.java index 5d2da9ccd..b2d9cf1d3 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBomber.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBomber.java @@ -15,7 +15,7 @@ public class KitBomber extends Kit { public KitBomber(ArcadeManager manager) { - super(manager, "Bomber", KitAvailability.Blue, + super(manager, "Bomber", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitMiner.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitMiner.java index 619775db5..032384e02 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitMiner.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitMiner.java @@ -16,7 +16,7 @@ public class KitMiner extends Kit { public KitMiner(ArcadeManager manager) { - super(manager, "Miner", KitAvailability.Blue, + super(manager, "Miner", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitHumanAssassin.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitHumanAssassin.java index 9304884ec..1672de6ee 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitHumanAssassin.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitHumanAssassin.java @@ -23,7 +23,7 @@ public class KitHumanAssassin extends Kit { public KitHumanAssassin(ArcadeManager manager) { - super(manager, "Castle Assassin", KitAvailability.Blue, + super(manager, "Castle Assassin", KitAvailability.Green, 5000, new String[] { "Able to kill with a single shot!" diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitHumanBrawler.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitHumanBrawler.java index 1cc641bba..7d2bcd633 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitHumanBrawler.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitHumanBrawler.java @@ -22,7 +22,7 @@ public class KitHumanBrawler extends Kit { public KitHumanBrawler(ArcadeManager manager) { - super(manager, "Castle Brawler", KitAvailability.Blue, + super(manager, "Castle Brawler", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitUndeadZombie.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitUndeadZombie.java index 95d1cd22c..51324bf46 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitUndeadZombie.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitUndeadZombie.java @@ -19,7 +19,7 @@ public class KitUndeadZombie extends Kit { public KitUndeadZombie(ArcadeManager manager) { - super(manager, "Undead Zombie", KitAvailability.Blue, + super(manager, "Undead Zombie", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/deathtag/kits/KitRunnerTraitor.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/deathtag/kits/KitRunnerTraitor.java index 502628695..5c62b702d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/deathtag/kits/KitRunnerTraitor.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/deathtag/kits/KitRunnerTraitor.java @@ -16,7 +16,7 @@ public class KitRunnerTraitor extends Kit { public KitRunnerTraitor(ArcadeManager manager) { - super(manager, "Runner Traitor", KitAvailability.Blue, + super(manager, "Runner Traitor", KitAvailability.Green, 5000, new String[] { "You can deal knockback to other runners!" diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonescape/kits/KitWarper.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonescape/kits/KitWarper.java index 818f153da..20851dcf5 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonescape/kits/KitWarper.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonescape/kits/KitWarper.java @@ -16,7 +16,7 @@ public class KitWarper extends Kit { public KitWarper(ArcadeManager manager) { - super(manager, "Warper", KitAvailability.Blue, + super(manager, "Warper", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/kits/KitPyrotechnic.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/kits/KitPyrotechnic.java index e2efac54a..faf4d12e6 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/kits/KitPyrotechnic.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/kits/KitPyrotechnic.java @@ -17,7 +17,7 @@ public class KitPyrotechnic extends Kit { public KitPyrotechnic(ArcadeManager manager) { - super(manager, "Pyrotechnic", KitAvailability.Blue, + super(manager, "Pyrotechnic", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/kits/KitHiderShocker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/kits/KitHiderShocker.java index aebd5dd80..29c83ef9b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/kits/KitHiderShocker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/kits/KitHiderShocker.java @@ -22,7 +22,7 @@ public class KitHiderShocker extends Kit { public KitHiderShocker(ArcadeManager manager) { - super(manager, "Shocking Hider", KitAvailability.Blue, + super(manager, "Shocking Hider", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/kits/KitSeekerRadar.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/kits/KitSeekerRadar.java index 43598ac4f..c76b38437 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/kits/KitSeekerRadar.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/kits/KitSeekerRadar.java @@ -22,7 +22,7 @@ public class KitSeekerRadar extends Kit { public KitSeekerRadar(ArcadeManager manager) { - super(manager, "Radar Hunter", KitAvailability.Blue, + super(manager, "Radar Hunter", KitAvailability.Green, 5000, new String[] { "tick......tick...tick.tick.", diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/kits/KitMachineGun.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/kits/KitMachineGun.java index 62b5d3fb9..32f3de047 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/kits/KitMachineGun.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/kits/KitMachineGun.java @@ -19,7 +19,7 @@ public class KitMachineGun extends Kit { public KitMachineGun(ArcadeManager manager) { - super(manager, "Machine Gun", KitAvailability.Blue, + super(manager, "Machine Gun", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/kits/KitElementalist.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/kits/KitElementalist.java index 9de11409c..49c33bd33 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/kits/KitElementalist.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/kits/KitElementalist.java @@ -20,7 +20,7 @@ public class KitElementalist extends Kit { public KitElementalist(ArcadeManager manager) { - super(manager, "Enchanter", KitAvailability.Blue, + super(manager, "Enchanter", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/runner/kits/KitFrosty.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/runner/kits/KitFrosty.java index aa6c65056..4ff4ce99d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/runner/kits/KitFrosty.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/runner/kits/KitFrosty.java @@ -19,7 +19,7 @@ public class KitFrosty extends Kit { public KitFrosty(ArcadeManager manager) { - super(manager, "Frosty", KitAvailability.Blue, + super(manager, "Frosty", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/kits/KitBrute.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/kits/KitBrute.java index 179742f58..df0dfc452 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/kits/KitBrute.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/kits/KitBrute.java @@ -19,7 +19,7 @@ public class KitBrute extends Kit { public KitBrute(ArcadeManager manager) { - super(manager, "Brute", KitAvailability.Blue, + super(manager, "Brute", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitBlaze.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitBlaze.java index c9c451639..b5d5919fb 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitBlaze.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitBlaze.java @@ -27,7 +27,7 @@ public class KitBlaze extends SmashKit { public KitBlaze(ArcadeManager manager) { - super(manager, "Blaze", KitAvailability.Blue, + super(manager, "Blaze", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitChicken.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitChicken.java index 1983b93d9..857c02d5e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitChicken.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitChicken.java @@ -23,7 +23,7 @@ public class KitChicken extends SmashKit { public KitChicken(ArcadeManager manager) { - super(manager, "Chicken", KitAvailability.Blue, + super(manager, "Chicken", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitComingSoon.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitComingSoon.java index 2d2fb25e3..22c070891 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitComingSoon.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitComingSoon.java @@ -15,7 +15,7 @@ public class KitComingSoon extends SmashKit { public KitComingSoon(ArcadeManager manager) { - super(manager, C.cRed + "Coming Soon", KitAvailability.Blue, + super(manager, C.cRed + "Coming Soon", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitCow.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitCow.java index 386f3eb6c..f5be517e4 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitCow.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitCow.java @@ -19,7 +19,7 @@ public class KitCow extends SmashKit { public KitCow(ArcadeManager manager) { - super(manager, "Mad Cow", KitAvailability.Blue, + super(manager, "Mad Cow", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java index e27a72c01..b33110b46 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java @@ -50,7 +50,7 @@ public class KitKnight extends SmashKit public KitKnight(ArcadeManager manager) { - super(manager, "Undead Knight", KitAvailability.Blue, + super(manager, "Undead Knight", KitAvailability.Green, 5000, new String[] { @@ -254,7 +254,7 @@ public class KitKnight extends SmashKit LivingEntity entity = (LivingEntity) Manager.GetCreature().SpawnEntity(loc, type); entity.setRemoveWhenFarAway(false); - entity.setCustomName(GetAvailability().GetColor() + GetName() + " Kit" + (GetAvailability() == KitAvailability.Blue ? ChatColor.GRAY + " (" + ChatColor.WHITE + "Ultra" + ChatColor.GRAY + ")" : "")); + entity.setCustomName(GetAvailability().GetColor() + GetName() + " Kit"); entity.setCustomNameVisible(true); entity.getEquipment().setItemInHand(_itemInHand); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitMagmaCube.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitMagmaCube.java index 6cb7ba3aa..e935bb2cf 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitMagmaCube.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitMagmaCube.java @@ -19,7 +19,7 @@ public class KitMagmaCube extends SmashKit { public KitMagmaCube(ArcadeManager manager) { - super(manager, "Magma Cube", KitAvailability.Blue, + super(manager, "Magma Cube", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitPig.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitPig.java index a2a83d46f..7ad27329c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitPig.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitPig.java @@ -23,7 +23,7 @@ public class KitPig extends SmashKit { public KitPig(ArcadeManager manager) { - super(manager, "Pig", KitAvailability.Blue, + super(manager, "Pig", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSkeletalHorse.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSkeletalHorse.java index 58e38686d..cbdad7e94 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSkeletalHorse.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSkeletalHorse.java @@ -27,7 +27,7 @@ public class KitSkeletalHorse extends SmashKit { public KitSkeletalHorse(ArcadeManager manager) { - super(manager, "Skeletal Horse", KitAvailability.Blue, + super(manager, "Skeletal Horse", KitAvailability.Green, 5000, new String[] { @@ -111,7 +111,7 @@ public class KitSkeletalHorse extends SmashKit LivingEntity entity = (LivingEntity) Manager.GetCreature().SpawnEntity(loc, type); entity.setRemoveWhenFarAway(false); - entity.setCustomName(GetAvailability().GetColor() + GetName() + " Kit" + (GetAvailability() == KitAvailability.Blue ? ChatColor.GRAY + " (" + ChatColor.WHITE + "Ultra" + ChatColor.GRAY + ")" : "")); + entity.setCustomName(GetAvailability().GetColor() + GetName() + " Kit"); entity.setCustomNameVisible(true); entity.getEquipment().setItemInHand(_itemInHand); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSkySquid.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSkySquid.java index 034e085f1..b9d9f5cba 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSkySquid.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSkySquid.java @@ -22,7 +22,7 @@ public class KitSkySquid extends SmashKit { public KitSkySquid(ArcadeManager manager) { - super(manager, "Sky Squid", KitAvailability.Blue, + super(manager, "Sky Squid", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitWitch.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitWitch.java index f14c5b0a0..3526305d7 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitWitch.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitWitch.java @@ -26,7 +26,7 @@ public class KitWitch extends SmashKit { public KitWitch(ArcadeManager manager) { - super(manager, "Witch", KitAvailability.Blue, + super(manager, "Witch", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitWither.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitWither.java index 758cd9260..f31f7bb18 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitWither.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitWither.java @@ -29,7 +29,7 @@ public class KitWither extends SmashKit { public KitWither(ArcadeManager manager) { - super(manager, "Wither", KitAvailability.Blue, + super(manager, "Wither", KitAvailability.Green, 5000, new String[] { @@ -101,7 +101,7 @@ public class KitWither extends SmashKit LivingEntity entity = (LivingEntity) Manager.GetCreature().SpawnEntity(loc, type); entity.setRemoveWhenFarAway(false); - entity.setCustomName(GetAvailability().GetColor() + GetName() + " Kit" + (GetAvailability() == KitAvailability.Blue ? ChatColor.GRAY + " (" + ChatColor.WHITE + "Ultra" + ChatColor.GRAY + ")" : "")); + entity.setCustomName(GetAvailability().GetColor() + GetName() + " Kit"); entity.setCustomNameVisible(true); entity.getEquipment().setItemInHand(_itemInHand); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitWitherSkeleton.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitWitherSkeleton.java index d4ff7f82d..dfd5dc7c1 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitWitherSkeleton.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitWitherSkeleton.java @@ -24,7 +24,7 @@ public class KitWitherSkeleton extends SmashKit { public KitWitherSkeleton(ArcadeManager manager) { - super(manager, "Wither Skeleton", KitAvailability.Blue, + super(manager, "Wither Skeleton", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snake/kits/KitInvulnerable.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snake/kits/KitInvulnerable.java index 241b76a9c..55c1d6748 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snake/kits/KitInvulnerable.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snake/kits/KitInvulnerable.java @@ -17,7 +17,7 @@ public class KitInvulnerable extends Kit { public KitInvulnerable(ArcadeManager manager) { - super(manager, "Super Snake", KitAvailability.Blue, + super(manager, "Super Snake", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snake/kits/KitOther.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snake/kits/KitOther.java index aab268773..d620e9a8d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snake/kits/KitOther.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snake/kits/KitOther.java @@ -17,7 +17,7 @@ public class KitOther extends Kit { public KitOther(ArcadeManager manager) { - super(manager, "Other Snake", KitAvailability.Blue, + super(manager, "Other Snake", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/kits/KitRevealer.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/kits/KitRevealer.java index df7a18b94..efc870aad 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/kits/KitRevealer.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/kits/KitRevealer.java @@ -14,7 +14,7 @@ public class KitRevealer extends SneakyAssassinKit { public KitRevealer(ArcadeManager manager) { - super(manager, "Revealer", KitAvailability.Blue, + super(manager, "Revealer", KitAvailability.Green, 5000, new String[] { "Carries three Revealers which explode and reveal nearby assassins!" diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/kits/SneakyAssassinKit.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/kits/SneakyAssassinKit.java index 6e3edb4fe..6f4dfc477 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/kits/SneakyAssassinKit.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/kits/SneakyAssassinKit.java @@ -16,6 +16,11 @@ public abstract class SneakyAssassinKit extends Kit super(manager, name, kitAvailability, kitDesc, kitPerks, EntityType.VILLAGER, itemInHand); } + public SneakyAssassinKit(ArcadeManager manager, String name, KitAvailability kitAvailability, int cost, String[] kitDesc, Perk[] kitPerks, ItemStack itemInHand) + { + super(manager, name, kitAvailability, cost, kitDesc, kitPerks, EntityType.VILLAGER, itemInHand); + } + @Override public void GiveItems(Player player) { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/kits/KitArcher.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/kits/KitArcher.java index 1093e839f..0884e85f7 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/kits/KitArcher.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/kits/KitArcher.java @@ -16,7 +16,7 @@ public class KitArcher extends Kit { public KitArcher(ArcadeManager manager) { - super(manager, "Archer", KitAvailability.Blue, + super(manager, "Archer", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/squidshooter/kits/KitSniper.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/squidshooter/kits/KitSniper.java index f78b0ed16..74c0a9231 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/squidshooter/kits/KitSniper.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/squidshooter/kits/KitSniper.java @@ -20,7 +20,7 @@ public class KitSniper extends Kit { public KitSniper(ArcadeManager manager) { - super(manager, "Squid Sniper", KitAvailability.Blue, + super(manager, "Squid Sniper", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/kit/KitAssassin.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/kit/KitAssassin.java index b1e922912..014daa74d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/kit/KitAssassin.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/kit/KitAssassin.java @@ -15,7 +15,7 @@ public class KitAssassin extends Kit { public KitAssassin(ArcadeManager manager) { - super(manager, "Assassin", KitAvailability.Blue, + super(manager, "Assassin", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/kit/KitBeastmaster.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/kit/KitBeastmaster.java index 0aa0ce6f0..c4d0fddaa 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/kit/KitBeastmaster.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/kit/KitBeastmaster.java @@ -15,7 +15,7 @@ public class KitBeastmaster extends Kit { public KitBeastmaster(ArcadeManager manager) { - super(manager, "Beastmaster", KitAvailability.Blue, + super(manager, "Beastmaster", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/kit/KitBomber.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/kit/KitBomber.java index 158379a80..e8ba91f8d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/kit/KitBomber.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/kit/KitBomber.java @@ -15,7 +15,7 @@ public class KitBomber extends Kit { public KitBomber(ArcadeManager manager) { - super(manager, "Bomber", KitAvailability.Blue, + super(manager, "Bomber", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/kit/KitNecromancer.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/kit/KitNecromancer.java index 8835edb4f..5388dafd7 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/kit/KitNecromancer.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/kit/KitNecromancer.java @@ -15,7 +15,7 @@ public class KitNecromancer extends Kit { public KitNecromancer(ArcadeManager manager) { - super(manager, "Necromancer", KitAvailability.Blue, + super(manager, "Necromancer", KitAvailability.Green, 5000, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/kits/KitShredder.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/kits/KitShredder.java index a06f57d48..140200ea0 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/kits/KitShredder.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/kits/KitShredder.java @@ -20,7 +20,7 @@ public class KitShredder extends Kit { public KitShredder(ArcadeManager manager) { - super(manager, "Shredder", KitAvailability.Blue, + super(manager, "Shredder", KitAvailability.Green, 5000, new String[] { "Arrows are weaker, but shred through forts." diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/zombiesurvival/kits/KitSurvivorArcher.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/zombiesurvival/kits/KitSurvivorArcher.java index 9cd6f0afb..9668251d4 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/zombiesurvival/kits/KitSurvivorArcher.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/zombiesurvival/kits/KitSurvivorArcher.java @@ -17,7 +17,7 @@ public class KitSurvivorArcher extends Kit { public KitSurvivorArcher(ArcadeManager manager) { - super(manager, "Survivor Archer", KitAvailability.Blue, + super(manager, "Survivor Archer", KitAvailability.Green, new String[] { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java index 052d54192..707c58d6e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java @@ -39,7 +39,7 @@ public abstract class Kit implements Listener public Kit(ArcadeManager manager, String name, KitAvailability kitAvailability, String[] kitDesc, Perk[] kitPerks, EntityType entityType, ItemStack itemInHand) { - this(manager, name, kitAvailability, kitAvailability.getDefaultCost(), kitDesc, kitPerks, entityType, itemInHand); + this(manager, name, kitAvailability, 2000, kitDesc, kitPerks, entityType, itemInHand); } public Kit(ArcadeManager manager, String name, KitAvailability kitAvailability, int cost, String[] kitDesc, Perk[] kitPerks, EntityType entityType, ItemStack itemInHand) @@ -135,7 +135,7 @@ public abstract class Kit implements Listener LivingEntity entity = (LivingEntity) Manager.GetCreature().SpawnEntity(loc, type); entity.setRemoveWhenFarAway(false); - entity.setCustomName(GetAvailability().GetColor() + GetName() + " Kit" + (GetAvailability() == KitAvailability.Blue ? ChatColor.GRAY + " (" + ChatColor.WHITE + "Premium" + ChatColor.GRAY + ")" : "")); + entity.setCustomName(GetAvailability().GetColor() + GetName() + " Kit"); entity.setCustomNameVisible(true); entity.getEquipment().setItemInHand(_itemInHand); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/KitAvailability.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/KitAvailability.java index d449df925..18a6cde8c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/KitAvailability.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/KitAvailability.java @@ -6,7 +6,7 @@ public enum KitAvailability { Free(ChatColor.YELLOW), Green(ChatColor.GREEN), - Blue(ChatColor.AQUA), + //Blue(ChatColor.AQUA), Hide(ChatColor.YELLOW), Null(ChatColor.BLACK); @@ -21,20 +21,4 @@ public enum KitAvailability { return _color; } - - public int getDefaultCost() - { - int cost = 0; - - switch (this) - { - case Blue: - cost = 5000; - break; - default: - cost = 2000; - } - - return cost; - } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/SmashKit.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/SmashKit.java index d7281c438..9c0fc2fdb 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/SmashKit.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/SmashKit.java @@ -18,6 +18,13 @@ public abstract class SmashKit extends Kit super(manager, name, kitAvailability, kitDesc, kitPerks, entityType, itemInHand); } + public SmashKit(ArcadeManager manager, String name, + KitAvailability kitAvailability, int cost, String[] kitDesc, Perk[] kitPerks, + EntityType entityType, ItemStack itemInHand) + { + super(manager, name, kitAvailability, cost, kitDesc, kitPerks, entityType, itemInHand); + } + public void DisplayDesc(Player player) { for (int i=0 ; i<3 ; i++) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java index 6a1dab9e5..02af7be51 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java @@ -2,6 +2,8 @@ package nautilus.game.arcade.managers; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map.Entry; @@ -464,11 +466,22 @@ public class GameLobbyManager implements IPacketRunnable, Listener for (int i=0 ; i() + { + @Override + public int compare(Kit o1, Kit o2) + { + return o1.GetCost() - o2.GetCost(); + } + }); + //Positions double space = 4; double offset = (kitsA.size()-1)*space/2d; @@ -484,7 +497,7 @@ public class GameLobbyManager implements IPacketRunnable, Listener byte data = 4; if (kit.GetAvailability() == KitAvailability.Green) data = 5; - else if (kit.GetAvailability() == KitAvailability.Blue) data = 3; +// else if (kit.GetAvailability() == KitAvailability.Blue) data = 3; SetKitTeamBlocks(entLoc.clone(), 35, data, _kitBlocks); entLoc.add(0, 1.5, 0); @@ -515,7 +528,7 @@ public class GameLobbyManager implements IPacketRunnable, Listener byte data = 4; if (kit.GetAvailability() == KitAvailability.Green) data = 5; - else if (kit.GetAvailability() == KitAvailability.Blue) data = 3; +// else if (kit.GetAvailability() == KitAvailability.Blue) data = 3; SetKitTeamBlocks(entLoc.clone(), 35, data, _kitBlocks); entLoc.add(0, 1.5, 0); @@ -549,7 +562,7 @@ public class GameLobbyManager implements IPacketRunnable, Listener byte data = 4; if (kit.GetAvailability() == KitAvailability.Green) data = 5; - else if (kit.GetAvailability() == KitAvailability.Blue) data = 3; +// else if (kit.GetAvailability() == KitAvailability.Blue) data = 3; SetKitTeamBlocks(entLoc.clone(), 35, data, _kitBlocks); entLoc.add(0, 1.5, 0); @@ -985,7 +998,7 @@ public class GameLobbyManager implements IPacketRunnable, Listener else { entityName = ChatColor.RED + C.Bold + entityName; - entityName += ChatColor.RESET + " (" + ent.GetKit().GetAvailability().GetColor() + ent.GetKit().GetCost() + " Gems" + ChatColor.RESET + ")"; + entityName += ChatColor.RESET + " (" + C.cGreen + ent.GetKit().GetCost() + " Gems" + ChatColor.RESET + ")"; } return entityName; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java index 390170ae6..b97f609e7 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java @@ -314,11 +314,11 @@ public class GamePlayerManager implements Listener Donor donor = Manager.GetDonation().Get(player.getName()); if (kit.GetAvailability() == KitAvailability.Free || //Free - donor.OwnsUnknownPackage(Manager.GetGame().GetName() + " " + kit.GetName())) //Green or Blue + donor.OwnsUnknownPackage(Manager.GetGame().GetName() + " " + kit.GetName())) //Green { Manager.GetGame().SetKit(player, kit, true); } - else if ((kit.GetAvailability() == KitAvailability.Green || kit.GetAvailability() == KitAvailability.Blue) && donor.GetBalance(CurrencyType.Gems) > kit.GetCost()) + else if (kit.GetAvailability() == KitAvailability.Green && donor.GetBalance(CurrencyType.Gems) > kit.GetCost()) { Manager.GetShop().OpenPageForPlayer(player, new ConfirmationPage( Manager, Manager.GetShop(), Manager.GetClients(), Manager.GetDonation(), new Runnable()