Add champions gladiators and fix tiny winners typo
This commit is contained in:
parent
63c44afa10
commit
a1a6abc1ca
@ -33,6 +33,7 @@ import nautilus.game.arcade.game.games.draw.Draw;
|
||||
import nautilus.game.arcade.game.games.event.EventGame;
|
||||
import nautilus.game.arcade.game.games.evolution.Evolution;
|
||||
import nautilus.game.arcade.game.games.gladiators.Gladiators;
|
||||
import nautilus.game.arcade.game.games.gladiators.modes.ChampionsGladiators;
|
||||
import nautilus.game.arcade.game.games.gladiators.modes.OverpoweredGladiators;
|
||||
import nautilus.game.arcade.game.games.gravity.Gravity;
|
||||
import nautilus.game.arcade.game.games.halloween.Halloween;
|
||||
@ -42,7 +43,7 @@ import nautilus.game.arcade.game.games.holeinwall.HoleInTheWall;
|
||||
import nautilus.game.arcade.game.games.horsecharge.Horse;
|
||||
import nautilus.game.arcade.game.games.lobbers.BombLobbers;
|
||||
import nautilus.game.arcade.game.games.micro.Micro;
|
||||
import nautilus.game.arcade.game.games.micro.modes.TinnyWinners;
|
||||
import nautilus.game.arcade.game.games.micro.modes.TinyWinners;
|
||||
import nautilus.game.arcade.game.games.milkcow.MilkCow;
|
||||
import nautilus.game.arcade.game.games.minecraftleague.MinecraftLeague;
|
||||
import nautilus.game.arcade.game.games.minestrike.MineStrike;
|
||||
@ -131,7 +132,7 @@ public enum GameType
|
||||
HoleInTheWall(HoleInTheWall.class, GameDisplay.HoleInTheWall),
|
||||
Horse(Horse.class, GameDisplay.Horse),
|
||||
Lobbers(BombLobbers.class, GameDisplay.Lobbers),
|
||||
Micro(Micro.class, new GameMode[]{new GameMode(TinnyWinners.class, "Tinny Winners")}, GameDisplay.Micro),
|
||||
Micro(Micro.class, new GameMode[]{new GameMode(TinyWinners.class, "Tiny Winners")}, GameDisplay.Micro),
|
||||
MilkCow(MilkCow.class, GameDisplay.MilkCow),
|
||||
MineStrike(MineStrike.class, GameDisplay.MineStrike, new Pair[]
|
||||
{
|
||||
@ -177,7 +178,7 @@ public enum GameType
|
||||
SkywarsTeams(TeamSkywars.class, new GameMode[]{new GameMode(OverpoweredSkywars.class, "OP Skywars")}, GameDisplay.SkywarsTeams, new GameType[]{GameType.Skywars}, false),
|
||||
MonsterMaze(MonsterMaze.class, GameDisplay.MonsterMaze),
|
||||
MonsterLeague(MonsterLeague.class, GameDisplay.MonsterLeague),
|
||||
Gladiators(Gladiators.class, new GameMode[]{new GameMode(OverpoweredGladiators.class, "OP Gladiators")}, GameDisplay.Gladiators),
|
||||
Gladiators(Gladiators.class, new GameMode[]{new GameMode(OverpoweredGladiators.class, "OP Gladiators"), new GameMode(ChampionsGladiators.class, "Champions Gladiators")}, GameDisplay.Gladiators),
|
||||
|
||||
BouncyBalls(BouncyBalls.class, GameDisplay.BouncyBalls),
|
||||
|
||||
|
@ -91,11 +91,15 @@ public class Gladiators extends SoloGame
|
||||
|
||||
public Gladiators(ArcadeManager manager)
|
||||
{
|
||||
super(manager, GameType.Gladiators,
|
||||
new Kit[]
|
||||
this(manager, new Kit[]
|
||||
{
|
||||
new KitGladiator(manager)
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
public Gladiators(ArcadeManager manager, Kit[] kits)
|
||||
{
|
||||
super(manager, GameType.Gladiators, kits,
|
||||
new String[]
|
||||
{
|
||||
"This is a 1v1 tournament!",
|
||||
|
@ -0,0 +1,84 @@
|
||||
package nautilus.game.arcade.game.games.gladiators.modes;
|
||||
|
||||
import org.bukkit.Material;
|
||||
import org.bukkit.Sound;
|
||||
import org.bukkit.enchantments.Enchantment;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.inventory.ItemStack;
|
||||
|
||||
import mineplex.core.common.util.UtilInv;
|
||||
import mineplex.core.common.util.UtilItem;
|
||||
import nautilus.game.arcade.ArcadeManager;
|
||||
import nautilus.game.arcade.events.GameStateChangeEvent;
|
||||
import nautilus.game.arcade.game.Game.GameState;
|
||||
import nautilus.game.arcade.game.games.champions.ChampionsFixes;
|
||||
import nautilus.game.arcade.game.games.champions.kits.KitAssassin;
|
||||
import nautilus.game.arcade.game.games.champions.kits.KitBrute;
|
||||
import nautilus.game.arcade.game.games.champions.kits.KitKnight;
|
||||
import nautilus.game.arcade.game.games.champions.kits.KitMage;
|
||||
import nautilus.game.arcade.game.games.champions.kits.KitRanger;
|
||||
import nautilus.game.arcade.game.games.gladiators.ArenaType;
|
||||
import nautilus.game.arcade.game.games.gladiators.Gladiators;
|
||||
import nautilus.game.arcade.game.games.gladiators.hotbar.HotbarLayout;
|
||||
import nautilus.game.arcade.kit.Kit;
|
||||
|
||||
/**
|
||||
* ChampionsGladiators
|
||||
*
|
||||
* @author xXVevzZXx
|
||||
*/
|
||||
public class ChampionsGladiators extends Gladiators
|
||||
{
|
||||
|
||||
public ChampionsGladiators(ArcadeManager manager)
|
||||
{
|
||||
super(manager, new Kit[]
|
||||
{
|
||||
new KitBrute(manager),
|
||||
new KitRanger(manager),
|
||||
new KitKnight(manager),
|
||||
new KitMage(manager),
|
||||
new KitAssassin(manager),
|
||||
});
|
||||
|
||||
Manager.GetDamage().UseSimpleWeaponDamage = false;
|
||||
Manager.getCosmeticManager().setHideParticles(true);
|
||||
|
||||
Manager.getClassManager().GetItemFactory().getProximityManager().setProxyLimit(6);
|
||||
|
||||
StrictAntiHack = true;
|
||||
TeamArmor = false;
|
||||
|
||||
new ChampionsFixes(this);
|
||||
|
||||
manager.enableChampionsModules();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void giveLoadout(Player p, ArenaType type)
|
||||
{
|
||||
if (!GetPlayers(true).contains(p))
|
||||
return;
|
||||
|
||||
GetKit(p).ApplyKit(p);
|
||||
|
||||
p.playSound(p.getLocation(), Sound.LEVEL_UP, 1f, 1f);
|
||||
}
|
||||
|
||||
@EventHandler
|
||||
public void end(GameStateChangeEvent event)
|
||||
{
|
||||
if (event.GetState() != GameState.End)
|
||||
return;
|
||||
|
||||
Manager.disableChampionsModules();
|
||||
}
|
||||
|
||||
@Override
|
||||
public String GetMode()
|
||||
{
|
||||
return "Champions Gladiators";
|
||||
}
|
||||
|
||||
}
|
@ -21,10 +21,10 @@ import nautilus.game.arcade.kit.Kit;
|
||||
*
|
||||
* @author xXVevzZXx
|
||||
*/
|
||||
public class TinnyWinners extends Micro
|
||||
public class TinyWinners extends Micro
|
||||
{
|
||||
|
||||
public TinnyWinners(ArcadeManager manager)
|
||||
public TinyWinners(ArcadeManager manager)
|
||||
{
|
||||
super(manager,
|
||||
|
||||
@ -73,7 +73,7 @@ public class TinnyWinners extends Micro
|
||||
@Override
|
||||
public String GetMode()
|
||||
{
|
||||
return "Tinny Winners";
|
||||
return "Tiny Winners";
|
||||
}
|
||||
|
||||
}
|
@ -219,7 +219,7 @@ public class GameCreationManager implements Listener
|
||||
{
|
||||
for (GameMode modes : gameType.getGameModes())
|
||||
{
|
||||
if (modes.getName().replaceAll(" ", "").equalsIgnoreCase(ModePref))
|
||||
if (modes.getName().replaceAll(" ", "").toUpperCase().startsWith(ModePref.toUpperCase()))
|
||||
{
|
||||
_lastMode = ModePref;
|
||||
mode = modes;
|
||||
|
Loading…
Reference in New Issue
Block a user