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.
This commit is contained in:
Sam 2016-08-22 17:28:51 +01:00
parent 7db41a8be5
commit e0f319ea09
6 changed files with 6 additions and 9 deletions

View File

@ -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()

View File

@ -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

View File

@ -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);
}

View File

@ -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

View File

@ -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