From 943dc88ca4014008e6a1ac6ada89ad30d1a6ea6b Mon Sep 17 00:00:00 2001 From: Thanos Paravantis Date: Wed, 13 Jul 2016 13:23:15 +0300 Subject: [PATCH] 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));