diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java index 1d03e647c..3dc6ab3f4 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java @@ -242,7 +242,221 @@ public enum Achievement new String[] {"Champions Domination.Earthquake", "Champions TDM.Earthquake"}, new String[] {"Launch 5 enemies using Seismic Slam"}, new int[] {1}, - AchievementCategory.CHAMPIONS); + AchievementCategory.CHAMPIONS), + + //Paintball + SUPER_PAINTBALL_WINS("Paintball King", + new String[] {"Super Paintball.Wins"}, + new String[] {"Win 50 games of Paintball"}, + new int[] {50}, + AchievementCategory.SUPER_PAINTBALL), + + SUPER_PAINTBALL_KILLING_SPREE("Killing Spree", + new String[] {"Super Paintball.KillingSpree"}, + new String[] {"Get 4 kills in a row, with no more than", "5 seconds between each kill"}, + new int[] {1}, + AchievementCategory.SUPER_PAINTBALL), + + SUPER_PAINTBALL_FLAWLESS_VICTORY("Flawless Victory", + new String[] {"Super Paintball.Wins"}, + new String[] {"Win a team with your entire team alive"}, + new int[] {1}, + AchievementCategory.SUPER_PAINTBALL), + + SUPER_PAINTBALL_MEDIC("Medic!", + new String[] {"Super Paintball.Medic"}, + new String[] {"Revive 200 team members"}, + new int[] {200}, + AchievementCategory.SUPER_PAINTBALL), + + SUPER_PAINTBALL_SPEEDRUNNER("Speedrunner", + new String[] {"Super Paintball.Speedrunner"}, + new String[] {"Win a game in 20 seconds"}, + new int[] {1}, + AchievementCategory.SUPER_PAINTBALL), + + SUPER_PAINTBALL_LAST_STAND("Last Stand", + new String[] {"Super Paintball.LastStand"}, + new String[] {"Be the last alive on your team", "and kill 3 enemy players"}, + new int[] {1}, + AchievementCategory.SUPER_PAINTBALL), + + //Sheep Quest + SHEEP_QUEST_WINS("Hungry Hungry Hippo", + new String[] {"Sheep Quest.Wins"}, + new String[] {"Win 50 games of Sheep Quest"}, + new int[] {50}, + AchievementCategory.SHEEP_QUEST), + + SHEEP_QUEST_THIEF("Thief", + new String[] {"Sheep Quest.Thief"}, + new String[] {"Steal 300 Sheep from enemy pens"}, + new int[] {300}, + AchievementCategory.SHEEP_QUEST), + + SHEEP_QUEST_ANIMAL_RESCUE("Animal Rescue", + new String[] {"Sheep Quest.AnimalRescue"}, + new String[] {"Make 300 enemies drop their Sheep"}, + new int[] {300}, + AchievementCategory.SHEEP_QUEST), + + SHEEP_QUEST_SELFISH("Selfish", + new String[] {"Sheep Quest.Selfish"}, + new String[] {"Win with more than 12 Sheep"}, + new int[] {1}, + AchievementCategory.SHEEP_QUEST), + + //Snake + SNAKE_WINS("Nokia 3310", + new String[] {"Snake.Wins"}, + new String[] {"Win 50 games of Snake"}, + new int[] {50}, + AchievementCategory.SNAKE), + + SNAKE_CANNIBAL("Cannibal", + new String[] {"Snake.Cannibal"}, + new String[] {"Kill 8 players in a single game"}, + new int[] {1}, + AchievementCategory.SNAKE), + + SNAKE_CHOO_CHOO("Choo Choo", + new String[] {"Snake.ChooChoo"}, + new String[] {"Grow to be 60 Sheep or longer"}, + new int[] {1}, + AchievementCategory.SNAKE), + + SNAKE_SLIMY_SHEEP("Slimy Sheep", + new String[] {"Snake.SlimySheep"}, + new String[] {"Eat 20 slimes in a single game"}, + new int[] {1}, + AchievementCategory.SNAKE), + + //Dragons + DRAGONS_WINS("Dragon Tamer", + new String[] {"Dragons.Wins"}, + new String[] {"Win 50 games of Snake"}, + new int[] {50}, + AchievementCategory.DRAGONS), + + DRAGONS_SPARKLEZ("Sparklez", + new String[] {"Dragons.Sparklez"}, + new String[] {"Throw 100 Sparklers"}, + new int[] {100}, + AchievementCategory.DRAGONS), + + //Turf Wars + TURF_WARS_WINS("Turf Master 3000", + new String[] {"Turf Wars.Wins"}, + new String[] {"Win 50 games of Turf Wars"}, + new int[] {50}, + AchievementCategory.TURF_WARS), + + TURF_WARS_SHREDDINATOR("The Shreddinator", + new String[] {"Turf Wars.TheShreddinator"}, + new String[] {"Destroy 2000 blocks as Shredder"}, + new int[] {2000}, + AchievementCategory.TURF_WARS), + + TURF_WARS_BEHIND_ENEMY_LINES("Behind Enemy Lines", + new String[] {"Turf Wars.BehindEnemyLines"}, + new String[] {"Stay on enemy turf for 15 seconds"}, + new int[] {1}, + AchievementCategory.TURF_WARS), + + TURF_WARS_COMEBACK("The Comeback", + new String[] {"Turf Wars.TheComeback"}, + new String[] {"Win a game after having 5 or less turf"}, + new int[] {1}, + AchievementCategory.TURF_WARS), + + //Death Tag + DEATH_TAG_WINS("Death Proof", + new String[] {"Death Tag.Wins"}, + new String[] {"Win 50 games of Turf Wars"}, + new int[] {50}, + AchievementCategory.DEATH_TAG), + + DEATH_TAG_COME_AT_ME_BRO("Come At Me Bro!", + new String[] {"Death Tag.ComeAtMeBro"}, + new String[] {"Kill 2 Undead Chasers in a single game"}, + new int[] {1}, + AchievementCategory.DEATH_TAG), + + //Runner + RUNNER_WINS("Hot Feet", + new String[] {"Runner.Wins"}, + new String[] {"Win 50 games of Runner"}, + new int[] {50}, + AchievementCategory.RUNNER), + + //Dragon Escape + DRAGON_ESCAPE_WINS("Douglas Defeater", + new String[] {"Dragon Escape.Wins"}, + new String[] {"Win 50 games of Dragon Escape"}, + new int[] {50}, + AchievementCategory.DRAGON_ESCAPE), + + DRAGON_ESCAPE_PARALYMPICS("Paralympics", + new String[] {"Dragon Escape.Wins"}, + new String[] {"Win a game without using Leap"}, + new int[] {1}, + AchievementCategory.DRAGON_ESCAPE), + + DRAGON_ESCAPE_SKYLANDS("Skylands Master", + new String[] {"Dragon Escape.Win.Skylands"}, + new String[] {"Win by finishing Skylands 5 times"}, + new int[] {5}, + AchievementCategory.DRAGON_ESCAPE), + + DRAGON_ESCAPE_THROUGH_HELL("To Hell and Back", + new String[] {"Dragon Escape.Win.Through Hell"}, + new String[] {"Win by finishing Through Hell 5 times"}, + new int[] {5}, + AchievementCategory.DRAGON_ESCAPE), + + DRAGON_ESCAPE_PIRATE_BAY("Plundered", + new String[] {"Dragon Escape.Win.Pirate Bay"}, + new String[] {"Win by finishing Pirate Bay 5 times"}, + new int[] {5}, + AchievementCategory.DRAGON_ESCAPE), + + //OITQ + OITQ_WINS("One of a Kind", + new String[] {"One in the Quiver.Wins"}, + new String[] {"Win 50 games of One in the Quiver"}, + new int[] {50}, + AchievementCategory.ONE_IN_THE_QUIVER), + + OITQ_PERFECTIONIST("The Perfect Game", + new String[] {"One in the Quiver.Perfectionist"}, + new String[] {"Win without dying"}, + new int[] {1}, + AchievementCategory.ONE_IN_THE_QUIVER), + + OITQ_SHARPSHOOTER("SharpShooter", + new String[] {"One in the Quiver.Sharpshooter"}, + new String[] {"Hit with 8 Arrows in a row"}, + new int[] {1}, + AchievementCategory.ONE_IN_THE_QUIVER), + + //Super Spleef + SPLEEF_WINS("Wins", + new String[] {"Super Spleef.Wins"}, + new String[] {"Win 50 games of Super Spleef"}, + new int[] {50}, + AchievementCategory.SPLEEF), + + //Bacon Brawl + BACON_BRAWL_WINS("King of Bacon", + new String[] {"Bacon Brawl.Wins"}, + new String[] {"Win 50 games of Bacon Brawl"}, + new int[] {50}, + AchievementCategory.BACON_BRAWL), + + + + + ; private String _name; private String[] _desc; diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java index 6b3915975..76112124c 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java @@ -108,6 +108,11 @@ public enum AchievementCategory new String[] {"Wins", "Losses", "Kills", "Deaths", "GemsEarned"}, new String[] {"Wins", "Losses", "Kills", "Deaths", "Gems Earned"}, Material.SKULL_ITEM, 0, GameCategory.ARCADE), + + SNAKE("Snake", null, + new String[] {"Wins", "Losses", "Kills", "Deaths", "GemsEarned"}, + new String[] {"Wins", "Losses", "Kills", "Deaths", "Gems Earned"}, + Material.WOOL, 4, GameCategory.ARCADE), BACON_BRAWL("Bacon Brawl", null, new String[] {"Wins", "Losses", "Kills", "Deaths", "GemsEarned"}, diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/page/AchievementPage.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/page/AchievementPage.java index 676e0aaa6..d9b7db140 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/page/AchievementPage.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/ui/page/AchievementPage.java @@ -85,7 +85,7 @@ public class AchievementPage extends ShopPageBase { public String Mode = "Normal"; - + private BlockRestore _blockRestore; private CoreClientManager _clientManager; private ConditionManager _conditionManager; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java index 810eb1f09..889b987aa 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java @@ -814,6 +814,11 @@ public class ArcadeManager extends MiniPlugin implements IRelation { return _serverConfig.Tournament; } + + public int GetDesiredPlayerAmount() + { + return _serverConfig.MaxPlayers; + } @EventHandler public void ObserverQuit(GameStateChangeEvent event)