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

Oh come on git

Browse Source
This commit is contained in:
Sam 2018-01-10 14:15:13 +00:00 committed by Alexander Meech
parent ba2eeca97d
commit 6471e00af5
3 changed files with 71 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java
View File

@ -75,13 +75,14 @@ public abstract class Skywars extends Game
public Skywars(ArcadeManager manager, GameType type, String[] description) public Skywars(ArcadeManager manager, GameType type, String[] description)
{ {
this(manager, new Kit[] { this(manager, new Kit[]
new KitIce(manager), {
new KitFire(manager), new KitIce(manager),
new KitAir(manager), new KitFire(manager),
new KitMetal(manager), new KitAir(manager),
new KitEarth(manager), new KitMetal(manager),
}, type, description); new KitEarth(manager),
}, type, description);
} }
public Skywars(ArcadeManager manager, Kit[] kits, GameType type, String[] description) public Skywars(ArcadeManager manager, Kit[] kits, GameType type, String[] description)
@ -129,10 +130,6 @@ public abstract class Skywars extends Game
_oreHider = new OreHider(); _oreHider = new OreHider();
_help = new String[] {
};
new CompassModule() new CompassModule()
.setGiveCompassToAlive(true) .setGiveCompassToAlive(true)
.register(this); .register(this);
@ -144,6 +141,8 @@ public abstract class Skywars extends Game
.register(this); .register(this);
manager.GetCreature().SetDisableCustomDrops(true); manager.GetCreature().SetDisableCustomDrops(true);
registerStatTrackers();
} }
@Override @Override
@ -588,26 +587,6 @@ public abstract class Skywars extends Game
} }
} }
//TODO REIMPLEMENT
// @EventHandler
// public void onEntityDeathZombie(EntityDeathEvent event)
// {
// if (event.getEntity() instanceof Zombie)
// {
// Zombie ent = (Zombie) event.getEntity();
//
// if (_zombies.containsKey(ent))
// {
// if (ent.getKiller() instanceof Player)
// {
// Player player = ent.getKiller();
//
// Bukkit.getPluginManager().callEvent(new PlayerKillZombieEvent(player, ent));
// }
// }
// }
// }
@EventHandler @EventHandler
public void projectileDamage(CustomDamageEvent event) public void projectileDamage(CustomDamageEvent event)
{ {

85
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/SoloSkywars.java
View File

@ -16,10 +16,9 @@ import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.GameType; import nautilus.game.arcade.GameType;
import nautilus.game.arcade.events.GameStateChangeEvent; import nautilus.game.arcade.events.GameStateChangeEvent;
import nautilus.game.arcade.game.GameTeam; import nautilus.game.arcade.game.GameTeam;
import nautilus.game.arcade.game.games.skywars.trackers.TNTStatTracker;
import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.kit.Kit;
import nautilus.game.arcade.stats.DeathBomberStatTracker; import nautilus.game.arcade.stats.DeathBomberStatTracker;
import nautilus.game.arcade.stats.SkywarsKillZombieStatTracker;
import nautilus.game.arcade.stats.SkywarsTNTStatTracker;
import nautilus.game.arcade.stats.WinWithoutOpeningChestStatTracker; import nautilus.game.arcade.stats.WinWithoutOpeningChestStatTracker;
import nautilus.game.arcade.stats.WinWithoutWearingArmorStatTracker; import nautilus.game.arcade.stats.WinWithoutWearingArmorStatTracker;
@ -31,50 +30,52 @@ public class SoloSkywars extends Skywars
{ {
this(manager, GameType.Skywars); this(manager, GameType.Skywars);
registerStatTrackers( registerStatTrackers
new SkywarsTNTStatTracker(this), (
new DeathBomberStatTracker(this, 3), //TNT Kills new TNTStatTracker(this),
new SkywarsKillZombieStatTracker(this), new DeathBomberStatTracker(this, 3), //TNT Kills
new WinWithoutOpeningChestStatTracker(this), new WinWithoutOpeningChestStatTracker(this),
new WinWithoutWearingArmorStatTracker(this)); new WinWithoutWearingArmorStatTracker(this)
);
registerChatStats( registerChatStats
Kills, (
Deaths, Kills,
KDRatio, Deaths,
BlankLine, KDRatio,
Assists, BlankLine,
DamageTaken, Assists,
DamageDealt DamageTaken,
); DamageDealt
);
} }
public SoloSkywars(ArcadeManager manager, GameType type) public SoloSkywars(ArcadeManager manager, GameType type)
{ {
super(manager, type, super(manager, type,
new String[] new String[]
{ {
"Free for all battle in the sky!", "Free for all battle in the sky!",
"Craft or loot gear for combat", "Craft or loot gear for combat",
"Last player alive wins!" "Last player alive wins!"
}); });
this.DamageTeamSelf = true; DamageTeamSelf = true;
} }
public SoloSkywars(ArcadeManager manager, Kit[] kits, GameType type) public SoloSkywars(ArcadeManager manager, Kit[] kits, GameType type)
{ {
super(manager, kits, type, super(manager, kits, type,
new String[] new String[]
{ {
"Free for all battle in the sky!", "Free for all battle in the sky!",
"Craft or loot gear for combat", "Craft or loot gear for combat",
"Last player alive wins!" "Last player alive wins!"
}); });
this.DamageTeamSelf = true; DamageTeamSelf = true;
} }
@EventHandler @EventHandler
public void CustomTeamGeneration(GameStateChangeEvent event) public void CustomTeamGeneration(GameStateChangeEvent event)
{ {
@ -88,7 +89,7 @@ public class SoloSkywars extends Skywars
players.SetName("Players"); players.SetName("Players");
players.setDisplayName(C.cYellow + C.Bold + "Players"); players.setDisplayName(C.cYellow + C.Bold + "Players");
} }
@Override @Override
@EventHandler @EventHandler
public void ScoreboardUpdate(UpdateEvent event) public void ScoreboardUpdate(UpdateEvent event)
@ -118,7 +119,7 @@ public class SoloSkywars extends Skywars
Scoreboard.draw(); Scoreboard.draw();
} }
@Override @Override
public void EndCheck() public void EndCheck()
{ {
@ -126,9 +127,9 @@ public class SoloSkywars extends Skywars
return; return;
if (GetPlayers(true).size() <= 1) if (GetPlayers(true).size() <= 1)
{ {
ArrayList<Player> places = GetTeamList().get(0).GetPlacements(true); ArrayList<Player> places = GetTeamList().get(0).GetPlacements(true);
//Announce //Announce
AnnounceEnd(places); AnnounceEnd(places);

35
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java
View File

@ -13,10 +13,9 @@ import mineplex.core.updater.event.UpdateEvent;
import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.ArcadeManager;
import nautilus.game.arcade.GameType; import nautilus.game.arcade.GameType;
import nautilus.game.arcade.game.GameTeam; import nautilus.game.arcade.game.GameTeam;
import nautilus.game.arcade.game.games.skywars.trackers.TNTStatTracker;
import nautilus.game.arcade.game.modules.TeamModule; import nautilus.game.arcade.game.modules.TeamModule;
import nautilus.game.arcade.stats.DeathBomberStatTracker; import nautilus.game.arcade.stats.DeathBomberStatTracker;
import nautilus.game.arcade.stats.SkywarsKillZombieStatTracker;
import nautilus.game.arcade.stats.SkywarsTNTStatTracker;
import nautilus.game.arcade.stats.WinWithoutOpeningChestStatTracker; import nautilus.game.arcade.stats.WinWithoutOpeningChestStatTracker;
import nautilus.game.arcade.stats.WinWithoutWearingArmorStatTracker; import nautilus.game.arcade.stats.WinWithoutWearingArmorStatTracker;
@ -28,22 +27,24 @@ public class TeamSkywars extends Skywars
{ {
this(manager, GameType.SkywarsTeams); this(manager, GameType.SkywarsTeams);
registerStatTrackers( registerStatTrackers
new SkywarsTNTStatTracker(this), (
new DeathBomberStatTracker(this, 3), //TNT Kills new TNTStatTracker(this),
new SkywarsKillZombieStatTracker(this), new DeathBomberStatTracker(this, 3), //TNT Kills
new WinWithoutOpeningChestStatTracker(this), new WinWithoutOpeningChestStatTracker(this),
new WinWithoutWearingArmorStatTracker(this)); new WinWithoutWearingArmorStatTracker(this)
);
registerChatStats( registerChatStats
Kills, (
Deaths, Kills,
KDRatio, Deaths,
BlankLine, KDRatio,
Assists, BlankLine,
DamageTaken, Assists,
DamageDealt DamageTaken,
); DamageDealt
);
} }
public TeamSkywars(ArcadeManager manager, GameType type) public TeamSkywars(ArcadeManager manager, GameType type)