diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/battleroyale/BattleRoyale.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/battleroyale/BattleRoyale.java index 54d25748c..73842accd 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/battleroyale/BattleRoyale.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/battleroyale/BattleRoyale.java @@ -117,9 +117,6 @@ public abstract class BattleRoyale extends Game { super(manager, gameType, kits, gameDesc); - // TODO REMOVE THIS - TeleportsDisqualify = false; - PrepareTime = PREPARE_TIME; PrepareFreeze = false; SpawnTeleport = false; @@ -209,8 +206,10 @@ public abstract class BattleRoyale extends Game // Weapons new ChestLootPool() + .addItem(new ItemStack(Material.IRON_SWORD)) + .addItem(new ItemStack(Material.IRON_AXE)) .addItem(new ItemStack(Material.BOW)) - .setProbability(0.05) + .setProbability(0.1) , // Ammo @@ -224,7 +223,7 @@ public abstract class BattleRoyale extends Game new ChestLootPool() .addItem(SMALL_HEALTH_POT) .addItem(LARGE_HEALTH_POT) - .setProbability(0.2) + .setProbability(0.1) .setAmountsPerChest(1, 2) , @@ -259,17 +258,13 @@ public abstract class BattleRoyale extends Game // Food new ChestLootPool() - .addItem(new ItemStack(Material.RAW_FISH), 1, 3) - .addItem(new ItemStack(Material.RAW_BEEF), 1, 3) - .addItem(new ItemStack(Material.RAW_CHICKEN), 1, 3) - .addItem(new ItemStack(Material.MUTTON), 1, 3) .addItem(new ItemStack(Material.MELON), 1, 3) - .addItem(new ItemStack(Material.BREAD), 1, 2, 0.4) - .addItem(new ItemStack(Material.COOKED_FISH), 0.2) - .addItem(new ItemStack(Material.COOKED_BEEF), 0.2) - .addItem(new ItemStack(Material.COOKED_CHICKEN), 0.2) - .addItem(new ItemStack(Material.COOKED_MUTTON), 0.2) - .addItem(new ItemStack(Material.COOKIE), 0.2) + .addItem(new ItemStack(Material.BREAD), 1, 2, 0.6) + .addItem(new ItemStack(Material.COOKED_FISH), 0.5) + .addItem(new ItemStack(Material.COOKED_BEEF), 0.5) + .addItem(new ItemStack(Material.COOKED_CHICKEN), 0.5) + .addItem(new ItemStack(Material.COOKED_MUTTON), 0.5) + .addItem(new ItemStack(Material.COOKIE), 0.5) , // Misc @@ -416,7 +411,6 @@ public abstract class BattleRoyale extends Game goal.setX(-spawn.getX()); goal.setZ(-spawn.getZ()); - Bukkit.broadcastMessage(player.getName() + " -> " + UtilWorld.locToStrClean(spawn) + " after " + attempts + " attempts"); BattleRoyalePlayer royalePlayer = new BattleRoyalePlayer(Manager, player, spawn, goal); _playerData.put(player, royalePlayer); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/battleroyale/BattleRoyaleSolo.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/battleroyale/BattleRoyaleSolo.java index 945a3a98b..03a984706 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/battleroyale/BattleRoyaleSolo.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/battleroyale/BattleRoyaleSolo.java @@ -1,9 +1,11 @@ package nautilus.game.arcade.game.games.battleroyale; import mineplex.core.common.util.C; +import mineplex.core.common.util.F; import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilTime; import mineplex.core.common.util.UtilWorld; +import mineplex.core.treasure.TreasureType; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; import nautilus.game.arcade.ArcadeManager; @@ -207,6 +209,40 @@ public class BattleRoyaleSolo extends BattleRoyale if (places.size() >= 1) { + Player player = places.get(0); + long wins = Manager.GetStatsManager().Get(player).getStat("Battle Royale.Wins"); + + if (wins > 1) + { + Manager.getInventoryManager().addItemToInventory(success -> + { + if (success) + { + player.sendMessage(F.main("Game", "Unlocked 1 " + C.cAqua + "Mythical Chest" + C.mBody + ".")); + } + else + { + player.sendMessage(F.main("Game", "Failed to give you your Mythical Chest, you should inform a staff member!")); + } + + }, player, TreasureType.MYTHICAL.getItemName(), 1); + } + else + { + Manager.getInventoryManager().addItemToInventory(success -> + { + if (success) + { + player.sendMessage(F.main("Game", "Unlocked 1 " + C.cRed + "Freedom Chest" + C.mBody + ".")); + } + else + { + player.sendMessage(F.main("Game", "Failed to give you your Freedom Chest, you should inform a staff member!")); + } + + }, player, TreasureType.FREEDOM.getItemName(), 1); + } + AddGems(places.get(0), 20, "1st Place", false, false); } if (places.size() >= 2)