From ccdb859f11b7f510bbfd6194bc7ef7f98fd0f75f Mon Sep 17 00:00:00 2001 From: Mini-Chiss Date: Mon, 3 Aug 2015 16:11:11 +0200 Subject: [PATCH 1/6] lowered mythical change a little :) --- Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java index 556c7f5e0..3807d4140 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java @@ -6,7 +6,7 @@ public enum RewardType GameLoot( 0.000001, 0.00001, 0.0001, 3), OldChest( 0, 0.05, 0.4, 5), AncientChest( 0, 1, 4, 25), - MythicalChest( 0.5, 3, 12, 75); + MythicalChest( 0.35, 3, 12, 75); private double _mythicalChance; private double _legendaryChance; From e10d26dae17f5c51e4d58020aa228b80a4880c29 Mon Sep 17 00:00:00 2001 From: Mini-Chiss Date: Mon, 3 Aug 2015 16:18:59 +0200 Subject: [PATCH 2/6] reduced respawn time in OITQ removed respawn msg for short respawn times --- .../Mineplex.Core/src/mineplex/core/reward/RewardType.java | 2 +- .../src/nautilus/game/arcade/game/games/quiver/Quiver.java | 2 +- .../src/nautilus/game/arcade/managers/GameFlagManager.java | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java index 3807d4140..b40559d74 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardType.java @@ -6,7 +6,7 @@ public enum RewardType GameLoot( 0.000001, 0.00001, 0.0001, 3), OldChest( 0, 0.05, 0.4, 5), AncientChest( 0, 1, 4, 25), - MythicalChest( 0.35, 3, 12, 75); + MythicalChest( 0.4, 3, 12, 75); private double _mythicalChance; private double _legendaryChance; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java index 2bffb2d60..9793ac98c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/quiver/Quiver.java @@ -80,7 +80,7 @@ public class Quiver extends SoloGame this.BlockBreakAllow.add(102); this.BlockBreakAllow.add(20); - this.DeathSpectateSecs = 2; + this.DeathSpectateSecs = 1; _scoreObj = Scoreboard.GetScoreboard().registerNewObjective("Kills", "dummy"); _scoreObj.setDisplaySlot(DisplaySlot.BELOW_NAME); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java index 759ab84d2..0f25e0656 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameFlagManager.java @@ -727,8 +727,11 @@ public class GameFlagManager implements Listener return; } - UtilPlayer.message(player, C.cWhite + C.Bold + "You will respawn in " + time + " seconds..."); - UtilTextMiddle.display(null, "Respawning in " + time + " seconds...", 5, 40, 5, player); + if (time > 3) + { + UtilPlayer.message(player, C.cWhite + C.Bold + "You will respawn in " + time + " seconds..."); + UtilTextMiddle.display(null, "Respawning in " + time + " seconds...", 5, 40, 5, player); + } Manager.getPlugin().getServer().getScheduler().scheduleSyncDelayedTask(Manager.getPlugin(), new Runnable() { From ab670a03fbcdcbc0bfcc847752083591712cc5be Mon Sep 17 00:00:00 2001 From: Mini-Chiss Date: Mon, 3 Aug 2015 16:23:50 +0200 Subject: [PATCH 3/6] fixed logic error that was displaying gems wrong --- .../src/nautilus/game/arcade/managers/GameGemManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java index 844b78975..1a17dcb39 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java @@ -215,7 +215,8 @@ public class GameGemManager implements Listener String out = ""; if (Manager.IsRewardGems()) out += F.elem(C.cGreen + "+" + (int)(gemCount * game.GemMultiplier) + " Gems") + " for "; - out += F.elem(amountStr + type); + else + out += F.elem(amountStr + type); UtilPlayer.message(player, out); } From 67fd0e2c1d56749f4fc869ab31f99ac6bb457b41 Mon Sep 17 00:00:00 2001 From: Mini-Chiss Date: Mon, 3 Aug 2015 16:24:43 +0200 Subject: [PATCH 4/6] fixed MPS awards formatting --- .../src/nautilus/game/arcade/managers/GameGemManager.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java index 1a17dcb39..dc0d34aa6 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java @@ -222,7 +222,12 @@ public class GameGemManager implements Listener } if (!Manager.IsRewardGems()) + { + UtilPlayer.message(player, ""); + UtilPlayer.message(player, ArcadeFormat.Line); return; + } + earnedGems = (int) (earnedGems * game.GemMultiplier); From f350e4efe5e3c62efa687edb92861be093c5e23d Mon Sep 17 00:00:00 2001 From: Mini-Chiss Date: Mon, 3 Aug 2015 16:25:31 +0200 Subject: [PATCH 5/6] further fixed gem stuff! --- .../nautilus/game/arcade/managers/GameGemManager.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java index dc0d34aa6..b53d86fb3 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java @@ -117,9 +117,6 @@ public class GameGemManager implements Listener @EventHandler(priority = EventPriority.MONITOR) public void GameStateChange(GameStateChangeEvent event) { - if (!Manager.IsRewardGems()) - return; - if (event.GetState() != GameState.Dead) return; @@ -129,11 +126,11 @@ public class GameGemManager implements Listener public void RewardGems(Game game, Player player, boolean give) { - if (!Manager.IsRewardGems()) - return; - //Inform Gems AnnounceGems(game, player, game.GetPlayerGems().get(player), give); + + if (!Manager.IsRewardGems()) + return; //Give Gems if (give) From 40e2b6216eda67dcde12351750b4beed1a469342 Mon Sep 17 00:00:00 2001 From: Mini-Chiss Date: Mon, 3 Aug 2015 16:30:38 +0200 Subject: [PATCH 6/6] oops, was right before, reverting change. --- .../src/nautilus/game/arcade/managers/GameGemManager.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java index b53d86fb3..e401dea32 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java @@ -212,8 +212,7 @@ public class GameGemManager implements Listener String out = ""; if (Manager.IsRewardGems()) out += F.elem(C.cGreen + "+" + (int)(gemCount * game.GemMultiplier) + " Gems") + " for "; - else - out += F.elem(amountStr + type); + out += F.elem(amountStr + type); UtilPlayer.message(player, out); }