From 5e41c22fc7ae77e2a44d5eeda427948c2ea4717d Mon Sep 17 00:00:00 2001 From: phobia Date: Sun, 3 Apr 2016 13:39:32 +1000 Subject: [PATCH] - The "WARNING: Clan energy is running very low" message should appear after I get the Buy Energy objective - Need a congrats message/title when tutorial is completed - Force user to claim via gui --- .../clans/tutorial/tutorials/clans/ClansMainTutorial.java | 3 ++- .../tutorials/clans/objective/goals/clan/ClaimLandGoal.java | 2 +- .../clans/objective/goals/energy/BuyEnergyGoal.java | 5 +++++ .../clans/objective/goals/energy/ExplainEnergyGoal.java | 3 --- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java index 4fd692721..43d037bf3 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/ClansMainTutorial.java @@ -88,7 +88,7 @@ public class ClansMainTutorial extends Tutorial protected void onFinish(Player player) { _fireworks.add(player); - + UtilTextMiddle.display(C.cYellow + "Congratulations", "You have completed the Tutorial!", 10, 60, 10); Bukkit.getScheduler().runTaskLater(getPlugin(), () -> { _fireworks.remove(player); getMessage().removePlayer(player); @@ -362,6 +362,7 @@ public class ClansMainTutorial extends Tutorial || event.getArguments()[0].equalsIgnoreCase("ally") || event.getArguments()[0].equalsIgnoreCase("trust") || event.getArguments()[0].equalsIgnoreCase("unclaim") + || event.getArguments()[0].equalsIgnoreCase("claim") || event.getArguments()[0].equalsIgnoreCase("delete") || event.getArguments()[0].equalsIgnoreCase("disband") || event.getArguments()[0].equalsIgnoreCase("admin") diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClaimLandGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClaimLandGoal.java index bd67fd908..91fcdfe55 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClaimLandGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClaimLandGoal.java @@ -29,7 +29,7 @@ public class ClaimLandGoal extends ObjectiveGoal "Claim Land using the Clan Menu ( Type /c )", "The first thing your Clan needs to do before you can start to " + "build your fortress is claim the land in an area for your Clan. " + - "You must be inside the blue box to claim land.", + "You must be inside the blue outline to claim land.", DyeColor.ORANGE ); } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/energy/BuyEnergyGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/energy/BuyEnergyGoal.java index ba592560e..73f0ac438 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/energy/BuyEnergyGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/energy/BuyEnergyGoal.java @@ -1,5 +1,8 @@ package mineplex.game.clans.tutorial.tutorials.clans.objective.goals.energy; +import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilPlayer; +import mineplex.core.common.util.UtilTextMiddle; import org.bukkit.DyeColor; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -25,6 +28,8 @@ public class BuyEnergyGoal extends ObjectiveGoal @Override protected void customStart(Player player) { + UtilPlayer.message(player, F.main("Clans", "WARNING: Clan Energy is running very low!")); + UtilTextMiddle.display("Clan Energy", "is running very low", 10, 80, 10, player); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/energy/ExplainEnergyGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/energy/ExplainEnergyGoal.java index 2cab456ca..b21a4a9d3 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/energy/ExplainEnergyGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/energy/ExplainEnergyGoal.java @@ -31,9 +31,6 @@ public class ExplainEnergyGoal extends ObjectiveGoal @Override protected void customStart(Player player) { - UtilPlayer.message(player, F.main("Clans", "WARNING: Clan Energy is running very low!")); - UtilTextMiddle.display("Clan Energy", "is running very low", 10, 100, 10, player); - player.playSound(player.getLocation(), Sound.NOTE_BASS, 1.0f, 1.0f); ClansManager.getInstance().runSyncLater(() -> {