From fcc1cd46a545205f8f14991d4eecc567c4687cf6 Mon Sep 17 00:00:00 2001 From: Thanos paravantis Date: Sat, 26 Dec 2015 12:28:07 +0200 Subject: [PATCH] Make bouncing block red wool traps less strict when player walks on them. --- .../arcade/game/games/mineware/MineWare.java | 64 +++++++++---------- .../challenges/ChallengeBouncingBlock.java | 12 ++-- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java index 8b5a105b8..a8a443d22 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/MineWare.java @@ -208,39 +208,39 @@ public class MineWare extends SoloGame implements IThrown public void PopulateOrders() { - _challenges.add(ChallengeAnvilDance.class); - _challenges.add(ChallengeArrowRampage.class); - _challenges.add(ChallengeBlockLobbers.class); +// _challenges.add(ChallengeAnvilDance.class); +// _challenges.add(ChallengeArrowRampage.class); +// _challenges.add(ChallengeBlockLobbers.class); _challenges.add(ChallengeBouncingBlock.class); - _challenges.add(ChallengeBuildRace.class); - _challenges.add(ChallengeChestLoot.class); - _challenges.add(ChallengeCloudFall.class); - _challenges.add(ChallengeDogvsCat.class); - _challenges.add(ChallengeDragonEgg.class); - _challenges.add(ChallengeFallingBlocks.class); - _challenges.add(ChallengeFastFood.class); - _challenges.add(ChallengeFishingDay.class); - _challenges.add(ChallengeInfestation.class); - _challenges.add(ChallengeKangarooJump.class); - _challenges.add(ChallengeKOTL.class); - _challenges.add(ChallengeLavaRun.class); - _challenges.add(ChallengeMilkACow.class); - _challenges.add(ChallengeMineADiamond.class); - _challenges.add(ChallengeMinecartDance.class); - _challenges.add(ChallengeMiniOITQ.class); - _challenges.add(ChallengeNavigateMaze.class); - _challenges.add(ChallengePickASide.class); - _challenges.add(ChallengePunchThePig.class); - _challenges.add(ChallengeRedLightGreenLight.class); - _challenges.add(ChallengeReverseTag.class); - _challenges.add(ChallengeRushPush.class); - _challenges.add(ChallengeShootChickens.class); - _challenges.add(ChallengeSmashOff.class); - _challenges.add(ChallengeStandOnColor.class); - _challenges.add(ChallengeTntLauncher.class); - _challenges.add(ChallengeTreasureDigger.class); - _challenges.add(ChallengeVolleyPig.class); - _challenges.add(ChallengeWaveCrush.class); +// _challenges.add(ChallengeBuildRace.class); +// _challenges.add(ChallengeChestLoot.class); +// _challenges.add(ChallengeCloudFall.class); +// _challenges.add(ChallengeDogvsCat.class); +// _challenges.add(ChallengeDragonEgg.class); +// _challenges.add(ChallengeFallingBlocks.class); +// _challenges.add(ChallengeFastFood.class); +// _challenges.add(ChallengeFishingDay.class); +// _challenges.add(ChallengeInfestation.class); +// _challenges.add(ChallengeKangarooJump.class); +// _challenges.add(ChallengeKOTL.class); +// _challenges.add(ChallengeLavaRun.class); +// _challenges.add(ChallengeMilkACow.class); +// _challenges.add(ChallengeMineADiamond.class); +// _challenges.add(ChallengeMinecartDance.class); +// _challenges.add(ChallengeMiniOITQ.class); +// _challenges.add(ChallengeNavigateMaze.class); +// _challenges.add(ChallengePickASide.class); +// _challenges.add(ChallengePunchThePig.class); +// _challenges.add(ChallengeRedLightGreenLight.class); +// _challenges.add(ChallengeReverseTag.class); +// _challenges.add(ChallengeRushPush.class); +// _challenges.add(ChallengeShootChickens.class); +// _challenges.add(ChallengeSmashOff.class); +// _challenges.add(ChallengeStandOnColor.class); +// _challenges.add(ChallengeTntLauncher.class); +// _challenges.add(ChallengeTreasureDigger.class); +// _challenges.add(ChallengeVolleyPig.class); +// _challenges.add(ChallengeWaveCrush.class); // ============== trashed ============== // _challenges.add(ChallengeSimonSays.class); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeBouncingBlock.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeBouncingBlock.java index f3b4f9a1f..a0fcf0f0e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeBouncingBlock.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/challenges/ChallengeBouncingBlock.java @@ -175,19 +175,19 @@ public class ChallengeBouncingBlock extends Challenge if (isDone(player)) return; - if (event.getFrom().getX() == event.getTo().getX() || event.getFrom().getZ() == event.getTo().getZ()) + if (event.getFrom().getX() == event.getTo().getX() && event.getFrom().getZ() == event.getTo().getZ()) return; Location loc = player.getLocation(); Block blockBelow = loc.getBlock().getRelative(BlockFace.DOWN); - if (blockBelow.getType() == Material.WOOL) + if (Recharge.Instance.use(player, "Movement", 300, false, false) && _playerScore.get(player) > 0) { - Wool woolBelow = (Wool) blockBelow.getState().getData(); - - if (woolBelow.getColor() == DyeColor.RED) + if (blockBelow.getType() == Material.WOOL) { - if (Recharge.Instance.use(player, "Red Wool", 300, false, false) && _playerScore.get(player) > 0) + Wool woolBelow = (Wool) blockBelow.getState().getData(); + + if (woolBelow.getColor() == DyeColor.RED) { int subtract = 2;