JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove KitAvailability.Blue

Browse Source
This commit is contained in:
Shaun Bennett 2014-08-03 23:31:55 -05:00
parent 35b16e026c
commit fe32cf5444
46 changed files with 80 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/baconbrawl/kits/KitBabyPig.java
View File

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

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/baconbrawl/kits/KitSheepPig.java
View File

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

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/barbarians/kits/KitBomber.java
View File

@ -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[]
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitBomber.java
View File

@ -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[]
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/bridge/kits/KitMiner.java
View File

@ -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[]
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitHumanAssassin.java
View File

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

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitHumanBrawler.java
View File

@ -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[]
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiege/kits/KitUndeadZombie.java
View File

@ -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[]
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/deathtag/kits/KitRunnerTraitor.java
View File

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

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragonescape/kits/KitWarper.java
View File

@ -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[]
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/dragons/kits/KitPyrotechnic.java
View File

@ -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[]
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/kits/KitHiderShocker.java
View File

@ -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[]
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/kits/KitSeekerRadar.java
View File

@ -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.",

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/paintball/kits/KitMachineGun.java
View File

@ -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[]
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/kits/KitElementalist.java
View File

@ -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[]
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/runner/kits/KitFrosty.java
View File

@ -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[]
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sheep/kits/KitBrute.java
View File

@ -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[]
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitBlaze.java
View File

@ -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[]
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitChicken.java
View File

@ -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[]
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitComingSoon.java
View File

@ -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[]
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitCow.java
View File

@ -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[]
{

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitKnight.java
View File

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

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitMagmaCube.java
View File

@ -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[]
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitPig.java
View File

@ -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[]
{

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSkeletalHorse.java
View File

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

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitSkySquid.java
View File

@ -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[]
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitWitch.java
View File

@ -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[]
{

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitWither.java
View File

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

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/kits/KitWitherSkeleton.java
View File

@ -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[]
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snake/kits/KitInvulnerable.java
View File

@ -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[]
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/snake/kits/KitOther.java
View File

@ -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[]
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/kits/KitRevealer.java
View File

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

5
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/sneakyassassins/kits/SneakyAssassinKit.java
View File

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

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/spleef/kits/KitArcher.java
View File

@ -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[]
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/squidshooter/kits/KitSniper.java
View File

@ -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[]
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/kit/KitAssassin.java
View File

@ -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[]
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/kit/KitBeastmaster.java
View File

@ -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[]
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/kit/KitBomber.java
View File

@ -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[]
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/kit/KitNecromancer.java
View File

@ -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[]
{

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/turfforts/kits/KitShredder.java
View File

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

2
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/zombiesurvival/kits/KitSurvivorArcher.java
View File

@ -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[]
{

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/Kit.java
View File

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

18
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/KitAvailability.java
View File

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

7
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/SmashKit.java
View File

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

25
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameLobbyManager.java
View File

@ -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<kits.size() ; i++)
{
if (kits.get(i).GetAvailability() != KitAvailability.Blue) kitsA.add(kits.get(i));
else kitsB.add(kits.get(i));
kitsA.add(kits.get(i));
// if (kits.get(i).GetAvailability() != KitAvailability.Blue) kitsA.add(kits.get(i));
// else kitsB.add(kits.get(i));
}
{
// Sort kits by price
Collections.sort(kitsA, new Comparator<Kit>()
{
@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;

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GamePlayerManager.java
View File

@ -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<ArcadeManager, ArcadeShop>(
Manager, Manager.GetShop(), Manager.GetClients(), Manager.GetDonation(), new Runnable()