From 0f3b2da8b738a43ace7277dfaee43bc70211e5fd Mon Sep 17 00:00:00 2001 From: Thanos Paravantis Date: Tue, 12 Jul 2016 23:02:01 +0300 Subject: [PATCH 01/13] Fix Bouncing Block, re-add features for testing --- .../core/achievement/Achievement.java | 10 +- .../game/games/mineware/BawkBawkBattles.java | 80 ++++++++- .../other/ChallengeSeperateRooms.java | 158 ------------------ .../type/ChallengeBouncingBlock.java | 53 +++--- .../challenge/type/ChallengeCloudFall.java | 5 +- 5 files changed, 107 insertions(+), 199 deletions(-) delete mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/other/ChallengeSeperateRooms.java diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java index 52090385e..058c0e255 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/Achievement.java @@ -769,11 +769,11 @@ public enum Achievement new int[] {3}, AchievementCategory.BAWK_BAWK_BATTLES), -// BAWK_BAWK_BATTLES_BOUNCING_SHADOW("Bouncing Shadow", 500, -// new String[]{"Bawk Bawk Battles.BouncingShadow"}, -// new String[]{C.cGray + "Bouncing Block Challenge", "Win 3 entire rounds", "without stepping on red wool"}, -// new int[] {3}, -// AchievementCategory.BAWK_BAWK_BATTLES), + BAWK_BAWK_BATTLES_BOUNCING_SHADOW("Bouncing Shadow", 500, + new String[]{"Bawk Bawk Battles.BouncingShadow"}, + new String[]{C.cGray + "Bouncing Block Challenge", "Win 3 entire rounds", "without stepping on red wool"}, + new int[] {3}, + AchievementCategory.BAWK_BAWK_BATTLES), //Bomb Lobbers BOMB_LOBBERS_WINS("Master Bomber", 1200, diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java index e8df7a9f0..380db7a63 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java @@ -29,6 +29,7 @@ import org.bukkit.event.entity.EntityDamageEvent.DamageCause; import org.bukkit.event.entity.ItemSpawnEvent; import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.player.PlayerArmorStandManipulateEvent; +import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.event.player.PlayerDropItemEvent; import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.event.player.PlayerMoveEvent; @@ -41,6 +42,7 @@ import org.bukkit.scheduler.BukkitRunnable; import com.google.common.collect.Lists; +import mineplex.core.common.Rank; import mineplex.core.common.util.C; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilAction; @@ -78,8 +80,11 @@ import nautilus.game.arcade.game.games.mineware.challenge.ChallengeSettings; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeAnvilDance; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeArrowRampage; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeBlockLobbers; +import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeBouncingBlock; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeBuildRace; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeChickenShooting; +import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeCloudFall; +import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeColorChange; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeDeadlyTnt; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeDiamondHunt; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeDogsVersusCats; @@ -108,6 +113,7 @@ import nautilus.game.arcade.game.games.mineware.effect.DeathEffect; import nautilus.game.arcade.game.games.mineware.effect.DeathEffectData; import nautilus.game.arcade.game.games.mineware.events.ChallengeEndEvent; import nautilus.game.arcade.game.games.mineware.kit.KitBawksFood; +import nautilus.game.arcade.game.games.mineware.tracker.BouncingShadowTracker; import nautilus.game.arcade.game.games.mineware.tracker.DragonKingTracker; import nautilus.game.arcade.game.games.mineware.tracker.EliteArcherTracker; import nautilus.game.arcade.game.games.mineware.tracker.MilkManTracker; @@ -254,6 +260,7 @@ public class BawkBawkBattles extends TeamGame implements IThrown populateChallenges(); registerStatTrackers( + new BouncingShadowTracker(this), new DragonKingTracker(this), new EliteArcherTracker(this), new MilkManTracker(this), @@ -271,7 +278,10 @@ public class BawkBawkBattles extends TeamGame implements IThrown new ChallengeAnvilDance(this), new ChallengeArrowRampage(this), new ChallengeBlockLobbers(this), + new ChallengeBouncingBlock(this), // new ChallengeBuildRace(this), + new ChallengeCloudFall(this), // + new ChallengeColorChange(this), // new ChallengeChickenShooting(this), new ChallengeDeadlyTnt(this), new ChallengeDiamondHunt(this), @@ -294,7 +304,7 @@ public class BawkBawkBattles extends TeamGame implements IThrown new ChallengeRushPush(this), new ChallengeSmashOff(this), new ChallengeTreasureDigger(this), - new ChallengeVolleyPig(this), + new ChallengeVolleyPig(this), // new ChallengeWaveCrush(this)); } @@ -1475,6 +1485,74 @@ public class BawkBawkBattles extends TeamGame implements IThrown return ""; } + @EventHandler + public void debugCommands(PlayerCommandPreprocessEvent event) + { + Player player = event.getPlayer(); + String message = event.getMessage(); + + if (Manager.GetClients().hasRank(player, Rank.SNR_MODERATOR)) + { + if (message.startsWith("/restrict")) + { + String[] pieces = message.split(" "); + + if (pieces.length > 1) + { + String challenge = F.combine(pieces, 1, null, false).trim(); + + if (_list.restrict(challenge)) + { + UtilPlayer.message(player, F.main("Game", "Restricted to " + F.elem(challenge) + " challenge.")); + } + else + { + UtilPlayer.message(player, F.main("Game", "Could not find any challenge by that name.")); + } + } + else + { + UtilPlayer.message(player, F.main("Game", "All challenge restrictions were cleared.")); + _list.unrestrict(); + } + + event.setCancelled(true); + } + else if (message.startsWith("/skip")) + { + if (IsLive()) + { + endCurrentChallenge(); + + Announce(C.cAqua + C.Bold + player.getName() + " skipped this challenge."); + } + else + { + UtilPlayer.message(player, F.main("Game", "You cannot skip a challenge if the game is not started.")); + } + + event.setCancelled(true); + } + else if (message.startsWith("/lose")) + { + if (IsLive() && _challenge != null && IsAlive(player)) + { + setLives(player, 0); + _challenge.getData().addLostPlayer(player); + _deathEffect.playDeath(player, player.getLocation()); + GetScoreboard().ResetScore(player.getName()); + _chickenAttack.start(player); + } + else + { + UtilPlayer.message(player, F.main("Game", "You cannot lose at this time.")); + } + + event.setCancelled(true); + } + } + } + /* * Helper methods */ diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/other/ChallengeSeperateRooms.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/other/ChallengeSeperateRooms.java deleted file mode 100644 index f7f12a675..000000000 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/other/ChallengeSeperateRooms.java +++ /dev/null @@ -1,158 +0,0 @@ -package nautilus.game.arcade.game.games.mineware.challenge.other; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map.Entry; - -import org.bukkit.Location; -import org.bukkit.entity.Player; - -import mineplex.core.common.util.UtilPlayer; -import nautilus.game.arcade.game.games.mineware.BawkBawkBattles; -import nautilus.game.arcade.game.games.mineware.challenge.Challenge; -import nautilus.game.arcade.game.games.mineware.challenge.ChallengeType; - -/** - * Not used. - * @deprecated - */ -public abstract class ChallengeSeperateRooms extends Challenge -{ - private HashMap _borders = new HashMap(); - private HashMap> _spawns = new HashMap>(); - private HashMap _rooms = new HashMap(); - private double _borderX, _borderZ; - - public ChallengeSeperateRooms(BawkBawkBattles host, ChallengeType challengeType, String challengeName) - { - super(host, challengeType, challengeName); - } - - public Location getRoom(Player player) - { - System.out.print("2. " + player.getName()); - return _rooms.get(player.getName()).clone(); - } - - public void assignRooms() - { - for (Player player : getPlayersAlive()) - { - for (Entry> entry : _spawns.entrySet()) - { - if (entry.getKey().distance(player.getLocation()) < 1) - { - System.out.print("1. " + player.getName()); - _rooms.put(player.getName(), entry.getValue().getValue()); - _borders.put(player.getName(), entry.getValue().getKey()); - break; - } - } - } - } - - @SuppressWarnings({ "unchecked", "rawtypes" }) - public final void generateRoom() - { - int size = getPlayersAlive().size(); - - int x = 1; - int z = 1; - - while (size > x * z) - { - if (x > z) - { - z++; - } - else - { - x++; - } - } - - _borderX = (x * getBorderX()) + (x * getDividersX()); - _borderZ = (z * getBorderZ()) + (z * getDividersZ()); - _borderX /= 2; - _borderZ /= 2; - _borderX = Math.ceil(_borderX); - _borderZ = Math.ceil(_borderZ); - - int players = 0; - - for (int x1 = 0; x1 < x; x1++) - { - for (int z1 = 0; z1 < z; z1++) - { - if (++players > size) - continue; - - double lX = (x1 * getBorderX()) + (x1 * getDividersX()); - double lZ = (z1 * getBorderZ()) + (z1 * getDividersZ()); - lX -= _borderX; - lZ -= _borderZ; - - Location loc = getCenter().clone().add(lX, 0, lZ); - - generateRoom(loc.clone()); - - _spawns.put(getSpawn(loc.clone()), new HashMap.SimpleEntry(new Integer[] - { - loc.getBlockX(), loc.getBlockX() + getBorderX(), - - loc.getBlockY(), loc.getBlockY() + getBorderY(), - - loc.getBlockZ(), loc.getBlockZ() + getBorderZ() - }, loc.clone())); - } - } - } - - @Override - public void start() - { - super.start(); - - setBorder((int) -Math.ceil(_borderX), (int) Math.ceil(_borderX), 0, 256, (int) -Math.ceil(_borderZ), - (int) Math.ceil(_borderZ)); - } - - public abstract void generateRoom(Location loc); - - public abstract int getBorderX(); - - public abstract int getBorderY(); - - public abstract int getBorderZ(); - - public abstract int getDividersX(); - - public abstract int getDividersZ(); - - public Location getSpawn(Location roomLocation) - { - return roomLocation.clone().add((getBorderX() + 1) / 2D, 1.1, (getBorderZ() + 1) / 2D); - } - - @Override - public ArrayList createSpawns() - { - return new ArrayList(_spawns.keySet()); - } - - public boolean isInsideMap(Player player) - { - Location loc = player.getLocation(); - - if (!_borders.containsKey(player.getName()) || UtilPlayer.isSpectator(player)) - { - return super.isInsideMap(player); - } - - Integer[] borders = _borders.get(player.getName()); - - return !(loc.getX() >= borders[1] + 1 || loc.getX() <= borders[0] || loc.getZ() >= borders[5] + 1 - || loc.getZ() <= borders[4] || loc.getY() >= borders[3] + 1 || loc.getY() <= borders[2]); - } - -} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeBouncingBlock.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeBouncingBlock.java index e126d141b..371d41789 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeBouncingBlock.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeBouncingBlock.java @@ -55,7 +55,7 @@ public class ChallengeBouncingBlock extends Challenge implements LogicTracker private static final float SCORE_SOUND_PITCH = 0.2F; private static final int SCORE_BLOCK_HEIGHT = 6; private static final int SCORE_BLOCK_HEIGHT_ADD = 5; - private static final int SCORE_BLOCK_HEIGHT_MAX = SCORE_BLOCK_HEIGHT + SCORE_BLOCK_HEIGHT_ADD; + private static final int SCORE_BLOCK_DATA_RANGE = 16; private static final int SCORE_BLOCK_SPAWN_SHIFT = 2; private static final int SCORE_BLOCK_BOUND_MULTIPLY = 2; private static final double SCORE_FIREWORK_LOCATION_ADD = 0.5; @@ -230,7 +230,7 @@ public class ChallengeBouncingBlock extends Challenge implements LogicTracker increment(player, 1); player.playSound(player.getLocation(), Sound.SUCCESSFUL_HIT, SCORE_SOUND_VOLUME, SCORE_SOUND_PITCH); resetBlock(block); - spawnRandomWool(); + spawnRandomWool(true); } private void checkCompleted(Player player) @@ -238,7 +238,6 @@ public class ChallengeBouncingBlock extends Challenge implements LogicTracker if (_score.get(player) >= SCORE_GOAL) { setCompleted(player); - UtilTextBottom.display(C.cGreen + C.Bold + "Completed!", player); } } @@ -279,40 +278,15 @@ public class ChallengeBouncingBlock extends Challenge implements LogicTracker } } - private static final double SCORE_BLOCK_SPAWN_CHANCE = 0.1; - private static final int SCORE_BLOCK_DATA_RANGE = 16; - private void spawnStartingWool() { - whileLoop: while (_blocks.size() <= Settings.getMaxCompletedCount() + 1) + for (int i = 0; i < Host.getPlayersWithRemainingLives() + 1; i++) { - for (int x = -getArenaSize(); x <= getArenaSize(); x++) - { - for (int z = -getArenaSize(); z <= getArenaSize(); z++) - { - for (int y = SCORE_BLOCK_HEIGHT; y <= SCORE_BLOCK_HEIGHT_MAX; y++) - { - Block block = getCenter().getBlock().getRelative(x, y, z); - - if (block.isEmpty() || block.getType() == null) - { - if (Math.random() < SCORE_BLOCK_SPAWN_CHANCE) - { - spawnRandomWoolAt(x, y, z); - - if (_blocks.size() >= Settings.getMaxCompletedCount() + 1) - { - break whileLoop; - } - } - } - } - } - } + spawnRandomWool(false); } } - private void spawnRandomWool() + private void spawnRandomWool(boolean firework) { int size = getArenaSize(MAP_MIN_SIZE) - SCORE_BLOCK_SPAWN_SHIFT; @@ -320,11 +294,18 @@ public class ChallengeBouncingBlock extends Challenge implements LogicTracker int y = SCORE_BLOCK_HEIGHT + UtilMath.r(SCORE_BLOCK_HEIGHT_ADD); int z = UtilMath.r(size * SCORE_BLOCK_BOUND_MULTIPLY) - size; - spawnRandomWoolAt(x, y, z); + while (!Host.WorldData.World.getBlockAt(x, y, z).isEmpty()) + { + x = UtilMath.r(size * SCORE_BLOCK_BOUND_MULTIPLY) - size; + y = SCORE_BLOCK_HEIGHT + UtilMath.r(SCORE_BLOCK_HEIGHT_ADD); + z = UtilMath.r(size * SCORE_BLOCK_BOUND_MULTIPLY) - size; + } + + spawnRandomWoolAt(x, y, z, firework); } @SuppressWarnings("deprecation") - private void spawnRandomWoolAt(int x, int y, int z) + private void spawnRandomWoolAt(int x, int y, int z, boolean firework) { Block b = getCenter().getBlock().getRelative(x, y, z); Byte color = (byte) UtilMath.r(SCORE_BLOCK_DATA_RANGE); @@ -335,7 +316,11 @@ public class ChallengeBouncingBlock extends Challenge implements LogicTracker } setBlock(b, Material.WOOL, color); - UtilFirework.playFirework(b.getLocation().add(SCORE_FIREWORK_LOCATION_ADD, SCORE_FIREWORK_LOCATION_ADD, SCORE_FIREWORK_LOCATION_ADD), Type.BALL, DyeColor.getByWoolData(b.getData()).getColor(), false, false); + + if (firework) + { + UtilFirework.playFirework(b.getLocation().add(SCORE_FIREWORK_LOCATION_ADD, SCORE_FIREWORK_LOCATION_ADD, SCORE_FIREWORK_LOCATION_ADD), Type.BALL, DyeColor.getByWoolData(b.getData()).getColor(), false, false); + } _blocks.add(b); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeCloudFall.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeCloudFall.java index 5384545b8..f7c936b33 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeCloudFall.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeCloudFall.java @@ -84,7 +84,6 @@ public class ChallengeCloudFall extends Challenge Host.DamageFall = false; } - @EventHandler public void onCustomDamage(CustomDamageEvent event) { @@ -101,6 +100,10 @@ public class ChallengeCloudFall extends Challenge Block below = player.getLocation().getBlock().getRelative(BlockFace.DOWN); + System.out.println(player.getName()); + System.out.println("Below: " + below.getY()); + System.out.println("Height: " + ((int) getCenter().getY() + LANDING_PLATFORMS_HEIGHT)); + if (below.getY() == (int) getCenter().getY() + LANDING_PLATFORMS_HEIGHT) { if (below.isEmpty()) From 943dc88ca4014008e6a1ac6ada89ad30d1a6ea6b Mon Sep 17 00:00:00 2001 From: Thanos Paravantis Date: Wed, 13 Jul 2016 13:23:15 +0300 Subject: [PATCH 02/13] Modify challenge list, change display messages --- .../game/games/mineware/BawkBawkBattles.java | 22 +++++++++++-------- .../challenge/type/ChallengeCloudFall.java | 2 ++ .../type/ChallengeDogsVersusCats.java | 2 ++ .../type/ChallengeNavigationMaze.java | 2 ++ .../challenge/type/ChallengeRushPush.java | 2 +- .../challenge/type/ChallengeVolleyPig.java | 2 ++ .../type/ChallengeZombieInfection.java | 2 ++ .../games/mineware/effect/ChickenAttack.java | 2 +- 8 files changed, 25 insertions(+), 11 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java index 380db7a63..698496d56 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java @@ -83,11 +83,9 @@ import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeBlockLob import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeBouncingBlock; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeBuildRace; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeChickenShooting; -import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeCloudFall; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeColorChange; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeDeadlyTnt; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeDiamondHunt; -import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeDogsVersusCats; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeEggSmash; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeFallingBlocks; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeFastFood; @@ -105,7 +103,6 @@ import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeReverseT import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeRushPush; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeSmashOff; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeTreasureDigger; -import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeVolleyPig; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeWaterHorror; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeWaveCrush; import nautilus.game.arcade.game.games.mineware.effect.ChickenAttack; @@ -278,14 +275,12 @@ public class BawkBawkBattles extends TeamGame implements IThrown new ChallengeAnvilDance(this), new ChallengeArrowRampage(this), new ChallengeBlockLobbers(this), - new ChallengeBouncingBlock(this), // + new ChallengeBouncingBlock(this), new ChallengeBuildRace(this), - new ChallengeCloudFall(this), // - new ChallengeColorChange(this), // + new ChallengeColorChange(this), new ChallengeChickenShooting(this), new ChallengeDeadlyTnt(this), new ChallengeDiamondHunt(this), - new ChallengeDogsVersusCats(this), new ChallengeEggSmash(this), new ChallengeFallingBlocks(this), new ChallengeFastFood(this), @@ -304,8 +299,17 @@ public class BawkBawkBattles extends TeamGame implements IThrown new ChallengeRushPush(this), new ChallengeSmashOff(this), new ChallengeTreasureDigger(this), - new ChallengeVolleyPig(this), // new ChallengeWaveCrush(this)); + + /* + * Removed: + * + * Cloud Fall + * Dogs Vs Cats + * Navigation Maze + * Volley Pig + * Zombie Infection + */ } @Override @@ -698,7 +702,7 @@ public class BawkBawkBattles extends TeamGame implements IThrown private void showDescriptionText() { List messages = Lists.newArrayList(_challenge.getDescription()); - messages.add(0, C.cGray + "Bawk Bawk says..."); + messages.add(0, C.cGray + "Bawk Bawk commands..."); new BukkitRunnable() { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeCloudFall.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeCloudFall.java index f7c936b33..5fca09bea 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeCloudFall.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeCloudFall.java @@ -19,6 +19,8 @@ import nautilus.game.arcade.game.games.mineware.challenge.ChallengeType; /** * A challenge based on dropping from a platform in the correct block. + * + * @deprecated */ public class ChallengeCloudFall extends Challenge { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeDogsVersusCats.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeDogsVersusCats.java index f0a3c0474..86abbfedf 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeDogsVersusCats.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeDogsVersusCats.java @@ -34,6 +34,8 @@ import nautilus.game.arcade.game.games.mineware.challenge.TeamChallenge; /** * A team based challenge with players disguised as dogs and cats. + * + * @deprecated */ public class ChallengeDogsVersusCats extends TeamChallenge { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeNavigationMaze.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeNavigationMaze.java index 804633ce6..cbcc9648b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeNavigationMaze.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeNavigationMaze.java @@ -20,6 +20,8 @@ import nautilus.game.arcade.game.games.mineware.challenge.NumberTracker; /** * A challenge based on mazes. + * + * @deprecated */ public class ChallengeNavigationMaze extends Challenge implements NumberTracker { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeRushPush.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeRushPush.java index 879ca6006..e87e88be6 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeRushPush.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeRushPush.java @@ -45,7 +45,7 @@ public class ChallengeRushPush extends TeamChallenge (byte) 11, (byte) 14, "Rush Push", - "Attack to the enemy team.", + "Attack the enemy team.", "Push them off the platform."); Settings.setUseMapHeight(); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeVolleyPig.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeVolleyPig.java index 3b1b4c12d..360d5b437 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeVolleyPig.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeVolleyPig.java @@ -34,6 +34,8 @@ import nautilus.game.arcade.game.games.mineware.challenge.TeamChallenge; /** * A challenge based on volley. + * + * @deprecated */ public class ChallengeVolleyPig extends TeamChallenge { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeZombieInfection.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeZombieInfection.java index dba0d979c..2d7dd04fe 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeZombieInfection.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeZombieInfection.java @@ -35,6 +35,8 @@ import nautilus.game.arcade.game.games.mineware.challenge.other.ZombieWrapper; /** * A challenge based on zombie survival. + * + * @deprecated */ public class ChallengeZombieInfection extends Challenge { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/effect/ChickenAttack.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/effect/ChickenAttack.java index 950608a2f..02f34c55d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/effect/ChickenAttack.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/effect/ChickenAttack.java @@ -81,7 +81,7 @@ public class ChickenAttack player.teleport(_center); UtilTextMiddle.display(C.cRed + "Chicken Attack!", "You ran out of lives.", INFORM_TITLTE_FADE_IN_TICKS, INFORM_TITLTE_STAY_TICKS, INFORM_TITLTE_FADE_OUT_TICKS, player); - UtilPlayer.message(player, F.main("Game", "You failed to follow bawk bawk's instructions and you ran out of lives. His minions are now attacking you.")); + UtilPlayer.message(player, F.main("Game", "You failed to follow Bawk Bawk's commands. Now his chickens will devour you!")); player.playSound(player.getLocation(), Sound.WITHER_SPAWN, 1.0F, 1.0F); player.addPotionEffect(new PotionEffect(PotionEffectType.SLOW, Integer.MAX_VALUE, 1)); From 6cef42d7a48fedef626203bb4d63720a8a6807ee Mon Sep 17 00:00:00 2001 From: Thanos Paravantis Date: Wed, 13 Jul 2016 13:36:59 +0300 Subject: [PATCH 03/13] Fix merge issues --- .../nautilus/game/arcade/game/games/minestrike/Minestrike.java | 2 +- .../game/arcade/game/games/mineware/BawkBawkBattles.java | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/Minestrike.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/Minestrike.java index fb42cbfdb..862ead445 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/Minestrike.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/Minestrike.java @@ -1344,4 +1344,4 @@ public class Minestrike extends TeamGame { return _gunModule; } -} +} \ No newline at end of file diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java index 698496d56..bdbde39f0 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java @@ -39,6 +39,7 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; import org.bukkit.scheduler.BukkitRunnable; +import org.bukkit.scoreboard.Scoreboard; import com.google.common.collect.Lists; @@ -71,6 +72,7 @@ import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.GameType; import nautilus.game.arcade.events.GamePrepareCountdownCommence; import nautilus.game.arcade.events.GameStateChangeEvent; +import nautilus.game.arcade.game.Game.GameState; import nautilus.game.arcade.game.GameTeam; import nautilus.game.arcade.game.TeamGame; import nautilus.game.arcade.game.games.mineware.challenge.Challenge; @@ -121,6 +123,7 @@ import nautilus.game.arcade.game.games.mineware.tracker.SurfUpTracker; import nautilus.game.arcade.game.games.mineware.tracker.TagMasterTracker; import nautilus.game.arcade.game.games.mineware.tracker.VeteranTracker; import nautilus.game.arcade.kit.Kit; +import nautilus.game.arcade.world.WorldData; /** *

From 2e5d7c023f0d6ca954277aef697b7cef1b08cf14 Mon Sep 17 00:00:00 2001 From: Thanos Paravantis Date: Wed, 13 Jul 2016 17:13:02 +0300 Subject: [PATCH 04/13] Fix Tag Master, show bouncing block full score --- .../game/arcade/game/games/mineware/BawkBawkBattles.java | 5 ++--- .../mineware/challenge/type/ChallengeBouncingBlock.java | 2 +- .../mineware/challenge/type/ChallengeReverseTag.java | 9 +-------- .../game/games/mineware/tracker/TagMasterTracker.java | 2 +- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java index bdbde39f0..e8ce86b47 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java @@ -39,7 +39,6 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; import org.bukkit.scheduler.BukkitRunnable; -import org.bukkit.scoreboard.Scoreboard; import com.google.common.collect.Lists; @@ -72,7 +71,6 @@ import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.GameType; import nautilus.game.arcade.events.GamePrepareCountdownCommence; import nautilus.game.arcade.events.GameStateChangeEvent; -import nautilus.game.arcade.game.Game.GameState; import nautilus.game.arcade.game.GameTeam; import nautilus.game.arcade.game.TeamGame; import nautilus.game.arcade.game.games.mineware.challenge.Challenge; @@ -123,7 +121,6 @@ import nautilus.game.arcade.game.games.mineware.tracker.SurfUpTracker; import nautilus.game.arcade.game.games.mineware.tracker.TagMasterTracker; import nautilus.game.arcade.game.games.mineware.tracker.VeteranTracker; import nautilus.game.arcade.kit.Kit; -import nautilus.game.arcade.world.WorldData; /** *

@@ -465,6 +462,8 @@ public class BawkBawkBattles extends TeamGame implements IThrown { for (Player player : GetPlayers(false)) { + System.out.println("Resetting: " + player.getName()); + if (_lives.get(player) > 0) { Manager.Clear(player); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeBouncingBlock.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeBouncingBlock.java index 371d41789..dbe302bbc 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeBouncingBlock.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeBouncingBlock.java @@ -177,7 +177,7 @@ public class ChallengeBouncingBlock extends Challenge implements LogicTracker if (event.getType() != UpdateType.TICK) return; - for (Player player : getPlayersIn(true)) + for (Player player : getPlayersIn(false)) { UtilTextBottom.display(C.Bold + "Score: " + C.Reset + C.cYellow + C.Bold + _score.get(player), player); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeReverseTag.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeReverseTag.java index a88e4e3ee..71bf1e093 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeReverseTag.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeReverseTag.java @@ -267,14 +267,7 @@ public class ChallengeReverseTag extends TeamChallenge implements LogicTracker private void trackTag(Player player) { - if (_tagTracker.containsKey(player)) - { - if (_tagTracker.get(player)) - { - _tagTracker.put(player, true); - } - } - else + if (!_tagTracker.containsKey(player)) { _tagTracker.put(player, true); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/TagMasterTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/TagMasterTracker.java index f5729a679..a2fe686dd 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/TagMasterTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/TagMasterTracker.java @@ -28,7 +28,7 @@ public class TagMasterTracker extends ChallengeStatTracker { ChallengeReverseTag reverseTag = (ChallengeReverseTag) challenge; - for (Player player : reverseTag.getFirstTeam().getPlayers()) + for (Player player : getGame().GetPlayers(false)) { if (reverseTag.hasData(player)) { From efce89a7e754cf64046ec5a34042e493aaa0f76b Mon Sep 17 00:00:00 2001 From: Thanos Paravantis Date: Wed, 13 Jul 2016 17:47:17 +0300 Subject: [PATCH 05/13] Fix Color Change platforms not removed properly --- .../game/games/mineware/challenge/type/ChallengeColorChange.java | 1 + 1 file changed, 1 insertion(+) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeColorChange.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeColorChange.java index 345cfecb2..c55f48649 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeColorChange.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeColorChange.java @@ -104,6 +104,7 @@ public class ChallengeColorChange extends Challenge { _isFalling = false; _lastSound = 0; + _lastGeneratedPlatforms.clear(); } @EventHandler From 839d9263fd456d49ac1da0fc5f867290b2c3cf93 Mon Sep 17 00:00:00 2001 From: Thanos Paravantis Date: Wed, 13 Jul 2016 18:03:38 +0300 Subject: [PATCH 06/13] Prevent game crash if started with one player --- .../game/games/mineware/BawkBawkBattles.java | 45 +++++++++++-------- .../challenge/type/ChallengeEmpty.java | 40 +++++++++++++++++ 2 files changed, 66 insertions(+), 19 deletions(-) create mode 100644 Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeEmpty.java diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java index e8ce86b47..8ec20e5de 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java @@ -87,6 +87,7 @@ import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeColorCha import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeDeadlyTnt; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeDiamondHunt; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeEggSmash; +import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeEmpty; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeFallingBlocks; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeFastFood; import nautilus.game.arcade.game.games.mineware.challenge.type.ChallengeKangarooJump; @@ -381,27 +382,33 @@ public class BawkBawkBattles extends TeamGame implements IThrown private Challenge selectChallenge() { - int limit = _list.size(); - int attemps = 0; - - Challenge instance = _list.random(); - - while (!isSuitable(instance)) + if (GetPlayers(false).size() > MIN_PLAYERS_BLOCK_ATTEMPT) { - if (attemps < limit) - { - instance = _list.random(); - attemps++; - } - else - { - _list.resetPlayed(); - attemps = 0; - } - } + int limit = _list.size(); + int attemps = 0; - System.out.println("Found matching challenge: " + instance.getName()); - return instance; + Challenge instance = _list.random(); + + while (!isSuitable(instance)) + { + if (attemps < limit) + { + instance = _list.random(); + attemps++; + } + else + { + _list.resetPlayed(); + attemps = 0; + } + } + + return instance; + } + else + { + return new ChallengeEmpty(this); + } } private boolean isSuitable(Challenge instance) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeEmpty.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeEmpty.java new file mode 100644 index 000000000..c3695fe6c --- /dev/null +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeEmpty.java @@ -0,0 +1,40 @@ +package nautilus.game.arcade.game.games.mineware.challenge.type; + +import java.util.ArrayList; + +import org.bukkit.Location; +import org.bukkit.Material; +import org.bukkit.block.Block; + +import nautilus.game.arcade.game.games.mineware.BawkBawkBattles; +import nautilus.game.arcade.game.games.mineware.challenge.Challenge; +import nautilus.game.arcade.game.games.mineware.challenge.ChallengeType; + +/** + * This challenge is used to prevent the game from crashing if it's forced to start with only one player. + */ +public class ChallengeEmpty extends Challenge +{ + public ChallengeEmpty(BawkBawkBattles host) + { + super(host, ChallengeType.FirstComplete, "Empty", new String[] { "Not enough players" }); + + Settings.setUseMapHeight(); + } + + @Override + public ArrayList createSpawns() + { + ArrayList spawns = new ArrayList<>(); + spawns.add(getCenter().add(0, 1, 0)); + return spawns; + } + + @Override + public void createMap() + { + Block center = getCenter().getBlock(); + center.setType(Material.BARRIER); + addBlock(center); + } +} From ad32f4e2f1a7eb55d9cdecece4a23746de10ac73 Mon Sep 17 00:00:00 2001 From: Thanos Paravantis Date: Wed, 13 Jul 2016 18:05:35 +0300 Subject: [PATCH 07/13] Remove unnecessary new string declaration --- .../game/games/mineware/challenge/type/ChallengeEmpty.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeEmpty.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeEmpty.java index c3695fe6c..e4c313ee1 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeEmpty.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeEmpty.java @@ -17,7 +17,7 @@ public class ChallengeEmpty extends Challenge { public ChallengeEmpty(BawkBawkBattles host) { - super(host, ChallengeType.FirstComplete, "Empty", new String[] { "Not enough players" }); + super(host, ChallengeType.FirstComplete, "Empty", "Not enough players"); Settings.setUseMapHeight(); } From dab3e09837102c7200f80f7da6dcc6c98104d08a Mon Sep 17 00:00:00 2001 From: Thanos Paravantis Date: Wed, 13 Jul 2016 18:52:14 +0300 Subject: [PATCH 08/13] Achievement fixes, minor challenge changes - Fishing Day was marked as deprecated. - Surf Up will no longer track waves in which players were killed. - Make Bouncing Shadow not count players that lost. - Tag Master will now select alive players only. - Removed debug messages. --- .../game/games/mineware/BawkBawkBattles.java | 1 + .../type/ChallengeFallingBlocks.java | 9 ++--- .../challenge/type/ChallengeFishingDay.java | 2 ++ .../challenge/type/ChallengeWaveCrush.java | 33 ++++++++++++------- .../tracker/BouncingShadowTracker.java | 3 +- .../mineware/tracker/DragonKingTracker.java | 1 - .../mineware/tracker/EliteArcherTracker.java | 1 - .../mineware/tracker/MilkManTracker.java | 1 - .../mineware/tracker/PinataMasterTracker.java | 1 - .../mineware/tracker/PixelNinjaTracker.java | 1 - .../tracker/SpeedyBuildersTracker.java | 1 - .../games/mineware/tracker/SurfUpTracker.java | 1 - .../mineware/tracker/TagMasterTracker.java | 3 +- .../mineware/tracker/VeteranTracker.java | 1 - 14 files changed, 28 insertions(+), 31 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java index 8ec20e5de..4dc98bbad 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java @@ -307,6 +307,7 @@ public class BawkBawkBattles extends TeamGame implements IThrown * * Cloud Fall * Dogs Vs Cats + * Fishing Day * Navigation Maze * Volley Pig * Zombie Infection diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeFallingBlocks.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeFallingBlocks.java index 297439697..8024d10e7 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeFallingBlocks.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeFallingBlocks.java @@ -55,7 +55,7 @@ public class ChallengeFallingBlocks extends Challenge implements NumberTracker private static final int PLAYER_CAMP_MAX_HEIGHT = 3; private static final byte ADDITIONAL_BLOCK_DATA = 2; - private static final float BLOCK_HITBOX_GROW = 0.7F; + private static final float BLOCK_HITBOX_GROW = 0.6F; private static final Material[] MATERIALS = { Material.GRASS, @@ -234,12 +234,7 @@ public class ChallengeFallingBlocks extends Challenge implements NumberTracker if (!isChallengeValid()) return; - Player player = event.getPlayer(); - - if (_waveTracker.containsKey(player)) - { - _waveTracker.remove(player); - } + _waveTracker.remove(event.getPlayer()); } private void initializeWaveTracker() diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeFishingDay.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeFishingDay.java index 6baa30a9d..a5d699233 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeFishingDay.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeFishingDay.java @@ -43,6 +43,8 @@ import nautilus.game.arcade.game.games.mineware.challenge.ChallengeType; /** * A challenge based on fishing. + * + * @deprecated */ @SuppressWarnings("deprecation") public class ChallengeFishingDay extends Challenge diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeWaveCrush.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeWaveCrush.java index 82422cfc0..2626492de 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeWaveCrush.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeWaveCrush.java @@ -62,7 +62,7 @@ public class ChallengeWaveCrush extends Challenge implements NumberTracker ChallengeType.LastStanding, "Wave Crush", "Waves of blocks are coming towards you!", - "Avoid getting him by them."); + "Avoid getting hit by them."); Settings.setUseMapHeight(); } @@ -119,11 +119,7 @@ public class ChallengeWaveCrush extends Challenge implements NumberTracker { _modifiedNextWaveDelay = NEXT_WAVE_DELAY; - for (Player player : getPlayersAlive()) - { - _survivedWaves.put(player, 0); - } - + initializeWaveTracker(); startWavesTask(); } @@ -143,12 +139,7 @@ public class ChallengeWaveCrush extends Challenge implements NumberTracker if (!isChallengeValid()) return; - Player player = event.getPlayer(); - - if (_survivedWaves.containsKey(player)) - { - _survivedWaves.remove(player); - } + _survivedWaves.remove(event.getPlayer()); } @Override @@ -161,6 +152,7 @@ public class ChallengeWaveCrush extends Challenge implements NumberTracker if (isPlayerValid(player)) { Host.Manager.GetDamage().NewDamageEvent(target, null, null, DamageCause.PROJECTILE, player.getHealth(), false, false, false, "Falling Block", "Wave Crush"); + subtractWaveCount(player); } } } @@ -179,6 +171,23 @@ public class ChallengeWaveCrush extends Challenge implements NumberTracker return COLORS[_colorIndex]; } + private void initializeWaveTracker() + { + for (Player player : getPlayersAlive()) + { + _survivedWaves.put(player, 0); + } + } + + private void subtractWaveCount(Player player) + { + if (Data.isLost(player) && _survivedWaves.get(player) > 0) + { + System.out.println("Subtracting from " + player.getName()); + _survivedWaves.put(player, _survivedWaves.get(player) - 1); + } + } + private void startWavesTask() { new BukkitRunnable() diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/BouncingShadowTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/BouncingShadowTracker.java index 5cc154fa7..fa18c7066 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/BouncingShadowTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/BouncingShadowTracker.java @@ -30,9 +30,8 @@ public class BouncingShadowTracker extends ChallengeStatTracker for (Player player : getGame().GetPlayers(true)) { - if (bouncingBlock.hasData(player) && bouncingBlock.getData().isDone(player)) + if (bouncingBlock.hasData(player) && bouncingBlock.getData().isCompleted(player)) { - System.out.println("Bouncing Shadow: " + player.getName()); addStat(player, "BouncingShadow", 1, false, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/DragonKingTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/DragonKingTracker.java index 50944864f..717363810 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/DragonKingTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/DragonKingTracker.java @@ -36,7 +36,6 @@ public class DragonKingTracker extends ChallengeStatTracker if (score > 0) { - System.out.println("Dragon King: " + player.getName()); addStat(player, "DragonKing", score, false, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/EliteArcherTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/EliteArcherTracker.java index 7f634de5e..ae654b4f3 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/EliteArcherTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/EliteArcherTracker.java @@ -36,7 +36,6 @@ public class EliteArcherTracker extends ChallengeStatTracker if (score > 0) { - System.out.println("Elite Archer: " + player.getName()); addStat(player, "EliteArcher", score, false, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/MilkManTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/MilkManTracker.java index 0aadc34c6..11c11a92e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/MilkManTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/MilkManTracker.java @@ -36,7 +36,6 @@ public class MilkManTracker extends ChallengeStatTracker if (score > 0) { - System.out.println("Milk Man: " + player.getName()); addStat(player, "MilkMan", score, false, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/PinataMasterTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/PinataMasterTracker.java index 5c47f2b3c..c45c23d71 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/PinataMasterTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/PinataMasterTracker.java @@ -36,7 +36,6 @@ public class PinataMasterTracker extends ChallengeStatTracker if (score > 0) { - System.out.println("Pinata Master: " + player.getName()); addStat(player, "PinataMaster", score, false, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/PixelNinjaTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/PixelNinjaTracker.java index 9d94686f3..05401270e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/PixelNinjaTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/PixelNinjaTracker.java @@ -36,7 +36,6 @@ public class PixelNinjaTracker extends ChallengeStatTracker if (score > 0) { - System.out.println("Pixel Ninja: " + player.getName()); addStat(player, "PixelNinja", score, false, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/SpeedyBuildersTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/SpeedyBuildersTracker.java index be408cef1..205995bf2 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/SpeedyBuildersTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/SpeedyBuildersTracker.java @@ -34,7 +34,6 @@ public class SpeedyBuildersTracker extends ChallengeStatTracker { if (buildRace.hasData(player) && buildRace.getData().isDone(player)) { - System.out.println("Speedy Builders: " + player.getName()); addStat(player, "SpeedyBuilders", 1, false, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/SurfUpTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/SurfUpTracker.java index 54eb2fdc3..b976ca2d8 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/SurfUpTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/SurfUpTracker.java @@ -36,7 +36,6 @@ public class SurfUpTracker extends ChallengeStatTracker if (score > 0) { - System.out.println("Surf Up: " + player.getName()); addStat(player, "SurfUp", score, false, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/TagMasterTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/TagMasterTracker.java index a2fe686dd..fd672eebc 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/TagMasterTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/TagMasterTracker.java @@ -28,11 +28,10 @@ public class TagMasterTracker extends ChallengeStatTracker { ChallengeReverseTag reverseTag = (ChallengeReverseTag) challenge; - for (Player player : getGame().GetPlayers(false)) + for (Player player : getGame().GetPlayers(true)) { if (reverseTag.hasData(player)) { - System.out.println("Tag Master: " + player.getName()); addStat(player, "TagMaster", 1, false, false); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/VeteranTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/VeteranTracker.java index 80c2bac97..debcf47ae 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/VeteranTracker.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/tracker/VeteranTracker.java @@ -31,7 +31,6 @@ public class VeteranTracker extends StatTracker if (winner != null) { - System.out.println("Veteran: " + winner.getName()); addStat(winner, "Veteran", 1, true, false); } } From 6c11b718af08b5a54dfe0d9398f4e64eabd39bd5 Mon Sep 17 00:00:00 2001 From: Thanos Paravantis Date: Wed, 13 Jul 2016 19:03:39 +0300 Subject: [PATCH 09/13] Remove suppress warnings annotations --- .../game/games/mineware/challenge/type/ChallengeCloudFall.java | 1 - .../game/games/mineware/challenge/type/ChallengeFishingDay.java | 1 - .../game/games/mineware/challenge/type/ChallengeVolleyPig.java | 2 -- 3 files changed, 4 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeCloudFall.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeCloudFall.java index 5fca09bea..32ce82b9c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeCloudFall.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeCloudFall.java @@ -147,7 +147,6 @@ public class ChallengeCloudFall extends Challenge } } - @SuppressWarnings("deprecation") private boolean isLandingBlock(Block block) { return block.getType() == LANDING_PLATFORM_BLOCK_TYPE && block.getData() == LANDING_PLATFORM_BLOCK_DATA; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeFishingDay.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeFishingDay.java index a5d699233..d288ca70b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeFishingDay.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeFishingDay.java @@ -46,7 +46,6 @@ import nautilus.game.arcade.game.games.mineware.challenge.ChallengeType; * * @deprecated */ -@SuppressWarnings("deprecation") public class ChallengeFishingDay extends Challenge { private int _startingLureLevel = 8; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeVolleyPig.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeVolleyPig.java index 360d5b437..9c9f7c5d7 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeVolleyPig.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeVolleyPig.java @@ -166,7 +166,6 @@ public class ChallengeVolleyPig extends TeamChallenge _redSide = 0; } - @SuppressWarnings("deprecation") @EventHandler(priority = EventPriority.LOW) public void onPlayerMove(PlayerMoveEvent event) { @@ -310,7 +309,6 @@ public class ChallengeVolleyPig extends TeamChallenge } } - @SuppressWarnings("deprecation") private void increaseTeamScore() { if (_pig.isValid()) From 3497a4c09547e803e74c4c8333e7ff38c0cb2321 Mon Sep 17 00:00:00 2001 From: Thanos Paravantis Date: Wed, 13 Jul 2016 19:29:48 +0300 Subject: [PATCH 10/13] Remove unused debug messages --- .../game/arcade/game/games/mineware/BawkBawkBattles.java | 2 -- .../arcade/game/games/mineware/challenge/ChallengeList.java | 1 - .../games/mineware/challenge/type/ChallengeBuildRace.java | 1 - .../games/mineware/challenge/type/ChallengeCloudFall.java | 4 ---- .../game/games/mineware/challenge/type/ChallengeLavaRun.java | 1 - .../games/mineware/challenge/type/ChallengeWaveCrush.java | 1 - 6 files changed, 10 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java index 4dc98bbad..3d415a13b 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/BawkBawkBattles.java @@ -470,8 +470,6 @@ public class BawkBawkBattles extends TeamGame implements IThrown { for (Player player : GetPlayers(false)) { - System.out.println("Resetting: " + player.getName()); - if (_lives.get(player) > 0) { Manager.Clear(player); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/ChallengeList.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/ChallengeList.java index 352d5fc33..4a394b405 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/ChallengeList.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/ChallengeList.java @@ -57,7 +57,6 @@ public class ChallengeList { if (challenge.getName().contains(name)) { - System.out.println("Restricted: " + challenge.getName()); _restricted = challenge; return true; } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeBuildRace.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeBuildRace.java index 77d93c836..b2829b1b3 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeBuildRace.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeBuildRace.java @@ -144,7 +144,6 @@ public class ChallengeBuildRace extends Challenge implements LogicTracker if (!Data.isModifiedBlock(block.getRelative(BlockFace.DOWN))) { - System.out.println("Cancel"); event.setCancelled(true); return; } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeCloudFall.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeCloudFall.java index 32ce82b9c..96661c9a9 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeCloudFall.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeCloudFall.java @@ -102,10 +102,6 @@ public class ChallengeCloudFall extends Challenge Block below = player.getLocation().getBlock().getRelative(BlockFace.DOWN); - System.out.println(player.getName()); - System.out.println("Below: " + below.getY()); - System.out.println("Height: " + ((int) getCenter().getY() + LANDING_PLATFORMS_HEIGHT)); - if (below.getY() == (int) getCenter().getY() + LANDING_PLATFORMS_HEIGHT) { if (below.isEmpty()) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeLavaRun.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeLavaRun.java index b6fdcce87..311983f81 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeLavaRun.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeLavaRun.java @@ -149,7 +149,6 @@ public class ChallengeLavaRun extends Challenge _modifiedDelay += _modifiedDelayMin; } - System.out.println("Delay: " + _modifiedDelay); _disappearingBlocks++; _shouldMoveObsidian = false; } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeWaveCrush.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeWaveCrush.java index 2626492de..ace1cd80c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeWaveCrush.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeWaveCrush.java @@ -183,7 +183,6 @@ public class ChallengeWaveCrush extends Challenge implements NumberTracker { if (Data.isLost(player) && _survivedWaves.get(player) > 0) { - System.out.println("Subtracting from " + player.getName()); _survivedWaves.put(player, _survivedWaves.get(player) - 1); } } From 711a04ffa894fbddd39c7bbe240d4133bfb7878c Mon Sep 17 00:00:00 2001 From: Thanos Paravantis Date: Wed, 13 Jul 2016 21:40:31 +0300 Subject: [PATCH 11/13] Add Bawk Bawk Battles to hub compass --- .../src/mineplex/core/game/GameDisplay.java | 2 +- .../mineplex/hub/server/ServerManager.java | 5 ++++ .../hub/server/ui/ServerGameMenu.java | 20 +++++++++++++--- .../server/ui/button/SelectBawkButton.java | 23 +++++++++++++++++++ .../type/ChallengeChickenShooting.java | 2 +- 5 files changed, 47 insertions(+), 5 deletions(-) create mode 100644 Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/button/SelectBawkButton.java diff --git a/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java b/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java index c51a2fea3..5bc78f8a3 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java @@ -32,7 +32,7 @@ public enum GameDisplay Micro("Micro Battle", Material.LAVA_BUCKET, (byte)0, GameCategory.ARCADE, 24), MilkCow("Milk the Cow", Material.MILK_BUCKET, (byte)0, GameCategory.ARCADE, 27), MineStrike("MineStrike", Material.TNT, (byte)0, GameCategory.CHAMPIONS, 25),// Temp set to CHAMPIONS to fix UI bug - BawkBawkBattles("Bawk Bawk Battles", Material.EGG, (byte)0, GameCategory.EXTRA, 26), + BawkBawkBattles("Bawk Bawk Battles", Material.EGG, (byte)0, GameCategory.CLASSICS, 26), OldMineWare("Old MineWare", Material.PAPER, (byte)0, GameCategory.EXTRA, 26), Paintball("Super Paintball", Material.ENDER_PEARL, (byte)0, GameCategory.ARCADE, 28), Quiver("One in the Quiver", Material.ARROW, (byte)0, GameCategory.ARCADE, 29), diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java index a92a99b2e..3e0ac74e7 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java @@ -924,6 +924,11 @@ public class ServerManager extends MiniDbClientPlugin implement return _serverNpcShopMap.get("Weekend Brawl"); } + public ShopBase getBawkShop() + { + return _serverNpcShopMap.get("Bawk Bawk Battles"); + } + @Override public String getQuery(int accountId, String uuid, String name) { diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java index 517720f53..20e8ebd65 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java @@ -41,7 +41,16 @@ public class ServerGameMenu extends ShopPageBase @Override protected void buildPage() { - add(2, Material.QUARTZ_BLOCK, C.cYellowB + "Speed Builders " + C.cGray + "Competitive Building", new String[] + add(1, Material.TNT, C.cYellowB + "Bawk Bawk Battles " + C.cGray + "Challenges", new String[] + { + (_extraValue ? C.cAquaB : C.cWhiteB) + "NEW GAME", + C.Reset + "", + C.Reset + "Follow Bawk Bawk's instructions", + C.Reset + "Complete different tasks", + C.Reset + "If you lose, chickens will devour you!" + }, "BBB", "Bawk_Bawk_Battles", new SelectBawkButton(this)); + + add(3, Material.QUARTZ_BLOCK, C.cYellowB + "Speed Builders " + C.cGray + "Competitive Building", new String[] { (_extraValue ? C.cAquaB : C.cWhiteB) + "NEW GAME", C.Reset + "", @@ -50,7 +59,7 @@ public class ServerGameMenu extends ShopPageBase C.Reset + "The least correct builder is eliminated.", }, "SB", "Speed_Builders", new SelectSBButton(this)); - add(4, Material.BOOK_AND_QUILL, C.cYellowB + "Draw My Thing " + C.cGray + "Pictionary", new String[] + add(5, Material.BOOK_AND_QUILL, C.cYellowB + "Draw My Thing " + C.cGray + "Pictionary", new String[] { (_extraValue ? C.cAquaB : C.cWhiteB) + "NEW UPDATE", C.Reset + "", @@ -59,7 +68,7 @@ public class ServerGameMenu extends ShopPageBase C.Reset + "limit gets some points!", }, "DMT", "Draw_My_Thing", new SelectDMTButton(this)); - add(6, Material.TNT, C.cYellowB + "Dragon Escape " + C.cGray + "Fast Paced Parkour", new String[] + add(7, Material.TNT, C.cYellowB + "Dragon Escape " + C.cGray + "Fast Paced Parkour", new String[] { (_extraValue ? C.cAquaB : C.cWhiteB) + "FEATURED ARCADE GAME", C.Reset + "", @@ -570,6 +579,11 @@ public class ServerGameMenu extends ShopPageBase { getPlugin().getValentinesShop().attemptShopOpen(player); } + + public void openBawk(Player player) + { + getPlugin().getBawkShop().attemptShopOpen(player); + } /* ADDITIONAL LORES; diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/button/SelectBawkButton.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/button/SelectBawkButton.java new file mode 100644 index 000000000..8e9edf8c0 --- /dev/null +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/button/SelectBawkButton.java @@ -0,0 +1,23 @@ +package mineplex.hub.server.ui.button; + +import org.bukkit.entity.Player; +import org.bukkit.event.inventory.ClickType; + +import mineplex.core.shop.item.IButton; +import mineplex.hub.server.ui.ServerGameMenu; + +public class SelectBawkButton implements IButton +{ + private ServerGameMenu _menu; + + public SelectBawkButton(ServerGameMenu menu) + { + _menu = menu; + } + + @Override + public void onClick(Player player, ClickType clickType) + { + _menu.openBawk(player); + } +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeChickenShooting.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeChickenShooting.java index 4354a2ef5..abdec69e5 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeChickenShooting.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeChickenShooting.java @@ -357,7 +357,7 @@ public class ChallengeChickenShooting extends Challenge implements NumberTracker chicken.setMaxHealth(CHICKEN_HEATH); chicken.setHealth(CHICKEN_HEATH); - + if (Math.random() < CHICKEN_BABY_SPAWN_CHANCE) { chicken.setBaby(); From 4e985b85e676268309854a483ca26e6b06ecdeab Mon Sep 17 00:00:00 2001 From: Thanos Paravantis Date: Wed, 13 Jul 2016 23:59:01 +0300 Subject: [PATCH 12/13] Make final challenge changes - Increase Color Change delay - Make Tag Master not count for players jumping into the void --- .../games/mineware/challenge/type/ChallengeColorChange.java | 2 +- .../games/mineware/challenge/type/ChallengeReverseTag.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeColorChange.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeColorChange.java index c55f48649..67f62bdcf 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeColorChange.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeColorChange.java @@ -31,7 +31,7 @@ public class ChallengeColorChange extends Challenge private static final int SPAWN_COORDINATES_MULTIPLE = 2; private static final int MAP_HEIGHT = 1; - private static final long TIME_DELAY = 3000; + private static final long TIME_DELAY = 5000; private static final int TIME_DELAY_DECREMENT_RATE = 100; private static final int RESET_DELAY = 4000; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeReverseTag.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeReverseTag.java index 71bf1e093..2883ab39a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeReverseTag.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenge/type/ChallengeReverseTag.java @@ -199,7 +199,11 @@ public class ChallengeReverseTag extends TeamChallenge implements LogicTracker return; Player player = event.getEntity(); - getFirstTeam().remove(player); + + if (!isPlayerValid(player)) + return; + + _tagTracker.put(player, false); } @EventHandler From 6082418fc7a113e1a2427c4bc88c037e30b66435 Mon Sep 17 00:00:00 2001 From: Thanos Paravantis Date: Wed, 13 Jul 2016 23:59:37 +0300 Subject: [PATCH 13/13] Update game tags on the hub game compass --- .../hub/server/ui/ServerGameMenu.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java index 20e8ebd65..a62a032c4 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java @@ -41,18 +41,17 @@ public class ServerGameMenu extends ShopPageBase @Override protected void buildPage() { - add(1, Material.TNT, C.cYellowB + "Bawk Bawk Battles " + C.cGray + "Challenges", new String[] - { - (_extraValue ? C.cAquaB : C.cWhiteB) + "NEW GAME", - C.Reset + "", - C.Reset + "Follow Bawk Bawk's instructions", - C.Reset + "Complete different tasks", - C.Reset + "If you lose, chickens will devour you!" - }, "BBB", "Bawk_Bawk_Battles", new SelectBawkButton(this)); + add(1, Material.EGG, C.cYellowB + "Bawk Bawk Battles " + C.cGray + "Challenges", new String[] + { + (_extraValue ? C.cAquaB : C.cWhiteB) + "NEW GAME", + C.Reset + "", + C.Reset + "Follow Bawk Bawk's instructions", + C.Reset + "Complete different tasks", + C.Reset + "If you lose, chickens will devour you!" + }, "BBB", "Bawk_Bawk_Battles", new SelectBawkButton(this)); add(3, Material.QUARTZ_BLOCK, C.cYellowB + "Speed Builders " + C.cGray + "Competitive Building", new String[] { - (_extraValue ? C.cAquaB : C.cWhiteB) + "NEW GAME", C.Reset + "", C.Reset + "Memorize Gwen the Guardian's builds", C.Reset + "Then recreate them in a short amount of time.", @@ -61,7 +60,6 @@ public class ServerGameMenu extends ShopPageBase add(5, Material.BOOK_AND_QUILL, C.cYellowB + "Draw My Thing " + C.cGray + "Pictionary", new String[] { - (_extraValue ? C.cAquaB : C.cWhiteB) + "NEW UPDATE", C.Reset + "", C.Reset + "Players take turns at drawing a random", C.Reset + "word. Whoever guesses it within the time", @@ -201,7 +199,6 @@ public class ServerGameMenu extends ShopPageBase add(41, Material.BREWING_STAND_ITEM, C.cYellowB + "Monster Maze " + C.cGray + "Snow Sprint", new String[] { - (_extraValue ? C.cAquaB : C.cWhiteB) + "BETA GAME", C.Reset + "", C.Reset + "Run along a maze avoiding", C.Reset + "evil monsters. Get to the",