From e0f319ea09bc130d4d3822a8a990224b9ee6feb9 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 22 Aug 2016 17:28:51 +0100 Subject: [PATCH] Change kit internal names Changes the kit internal names to match the current skywars ones in order so that kit progression experience is carried over during this update. --- .../games/minestrike/{MineStrike.java => Minestrike.java} | 0 .../nautilus/game/arcade/game/games/skywars/Skywars.java | 7 ++----- .../game/arcade/game/games/skywars/kits/KitAir.java | 2 +- .../game/arcade/game/games/skywars/kits/KitFire.java | 2 +- .../game/arcade/game/games/skywars/kits/KitIce.java | 2 +- .../game/arcade/game/games/skywars/kits/KitMetal.java | 2 +- 6 files changed, 6 insertions(+), 9 deletions(-) rename Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/{MineStrike.java => Minestrike.java} (100%) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/Minestrike.java similarity index 100% rename from Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/MineStrike.java rename to Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/Minestrike.java diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java index 0a69fab1d..1dd25e1c9 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java @@ -40,7 +40,6 @@ import org.bukkit.event.entity.ExplosionPrimeEvent; import org.bukkit.event.entity.ItemDespawnEvent; import org.bukkit.event.entity.ProjectileHitEvent; import org.bukkit.event.entity.ProjectileLaunchEvent; -import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerPickupItemEvent; import org.bukkit.inventory.ItemStack; @@ -518,7 +517,7 @@ public abstract class Skywars extends Game for (Player player : GetPlayers(true)) { - if (GetKit(player).GetFormattedName().contains("Air")) + if (GetKit(player) instanceof KitAir) { player.sendMessage(F.main("Game", "Your " + F.skill("Leap") + " is on a 30 second cooldown.")); Recharge.Instance.use(player, "Leap", 30000, true, false); @@ -1490,9 +1489,7 @@ public abstract class Skywars extends Game @Override public double GetKillsGems(Player killer, Player killed, boolean assist) { - if (assist) - return 3; - return 12; + return assist ? 3 : 12; } public TNTGenerator getTnTGen() diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/kits/KitAir.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/kits/KitAir.java index 1a5f2faeb..2722c0a8f 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/kits/KitAir.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/kits/KitAir.java @@ -82,7 +82,7 @@ public class KitAir extends ProgressingKit public KitAir(ArcadeManager manager) { - super(manager, "Air", "skywarsair", KitAvailability.Gem, 4000, DESCRIPTION, PERKS, UPGRADE_DETAILS, EntityType.ZOMBIE, IN_HAND); + super(manager, "Air", "skywarsmadscientist", KitAvailability.Gem, 4000, DESCRIPTION, PERKS, UPGRADE_DETAILS, EntityType.ZOMBIE, IN_HAND); } @Override diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/kits/KitFire.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/kits/KitFire.java index c6053f86a..b078a8252 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/kits/KitFire.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/kits/KitFire.java @@ -78,7 +78,7 @@ public class KitFire extends ProgressingKit public KitFire(ArcadeManager manager) { - super(manager, "Fire", "skywarsfire", KitAvailability.Gem, 4000, DESCRIPTION, PERKS, UPGRADE_DETAILS, EntityType.ZOMBIE, IN_HAND); + super(manager, "Fire", "skywarsminer", KitAvailability.Gem, 4000, DESCRIPTION, PERKS, UPGRADE_DETAILS, EntityType.ZOMBIE, IN_HAND); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/kits/KitIce.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/kits/KitIce.java index 875fe61cb..c565ed750 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/kits/KitIce.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/kits/KitIce.java @@ -77,7 +77,7 @@ public class KitIce extends ProgressingKit public KitIce(ArcadeManager manager) { - super(manager, "Ice", "skywarsice", KitAvailability.Free, DESCRIPTION, PERKS, UPGRADE_DETAILS, EntityType.ZOMBIE, IN_HAND); + super(manager, "Ice", "skywarschickenfarmer", KitAvailability.Free, DESCRIPTION, PERKS, UPGRADE_DETAILS, EntityType.ZOMBIE, IN_HAND); } @Override 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 7f5960af3..1c6e43125 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 @@ -84,7 +84,7 @@ public class KitMetal extends ProgressingKit public KitMetal(ArcadeManager manager) { - super(manager, "Metal", "skywarsmetal", KitAvailability.Gem, 4000, DESCRIPTION, PERKS, UPGRADE_DETAILS, EntityType.ZOMBIE, IN_HAND); + super(manager, "Metal", "skywarsdestructor", KitAvailability.Gem, 4000, DESCRIPTION, PERKS, UPGRADE_DETAILS, EntityType.ZOMBIE, IN_HAND); } @Override