From 44abf8f1e2275da367ab0c24b65cde68dedf0a1b Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Thu, 31 Mar 2016 16:47:16 +1100 Subject: [PATCH 01/10] Naming fixes --- .../tutorials/clans/objective/AttackEnemyObjective.java | 4 ++-- .../tutorial/tutorials/clans/objective/ClanObjective.java | 3 +-- .../clans/objective/goals/attackenemy/BlowUpWallGoal.java | 2 +- .../clans/objective/goals/attackenemy/LoadCannonGoal.java | 2 +- .../clans/objective/goals/attackenemy/MountCannonGoal.java | 2 +- .../objective/goals/attackenemy/StealEnemyPotatoesGoal.java | 2 +- .../tutorials/clans/objective/goals/clan/BuildHouseGoal.java | 2 +- .../clans/objective/goals/clan/ClanManagementGoal.java | 2 +- .../tutorials/clans/objective/goals/clan/SetHomeGoal.java | 2 +- 9 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java index 00c7eea61..285dececb 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java @@ -24,11 +24,11 @@ public class AttackEnemyObjective extends OrderedObjective public AttackEnemyObjective(ClansMainTutorial clansMainTutorial, JavaPlugin javaPlugin) { - super(clansMainTutorial, javaPlugin, "Attack Enemy", "Attack and raid this enemy!"); + super(clansMainTutorial, javaPlugin, "Enemy Clans", "Attack and raid this enemy!"); _cannon = new HashMap<>(); addGoal(new GetMapGoal(this)); - addGoal(new HoldItemGoal(this, Material.MAP, "Identify Enemy Clan", "By looking at your map, identify your new enemy")); + addGoal(new HoldItemGoal(this, Material.MAP, "Locate Enemy on Map", "By looking at your map, identify your new enemy")); addGoal(new MountCannonGoal(this)); addGoal(new LoadCannonGoal(this)); addGoal(new BlowUpWallGoal(this)); diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClanObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClanObjective.java index e8b2b4a7a..af1d57fdb 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClanObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClanObjective.java @@ -13,12 +13,11 @@ public class ClanObjective extends OrderedObjective { public ClanObjective(ClansMainTutorial clansMainTutorial, JavaPlugin javaPlugin) { - super(clansMainTutorial, javaPlugin, "Clans", "Create clan with /c create "); + super(clansMainTutorial, javaPlugin, "Clan Basics", "Create clan with /c create "); addGoal(new LeaveSpawnGoal(this)); addGoal(new CreateClanGoal(this)); addGoal(new ClanManagementGoal(this)); - addGoal(new ClanDetailsGoal(this)); addGoal(new ClanInfoGoal(this)); addGoal(new ClaimLandGoal(this)); addGoal(new BuildHouseGoal(this)); diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/BlowUpWallGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/BlowUpWallGoal.java index 082b7f0ee..fa7df76c4 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/BlowUpWallGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/BlowUpWallGoal.java @@ -24,7 +24,7 @@ public class BlowUpWallGoal extends ObjectiveGoal { public BlowUpWallGoal(AttackEnemyObjective objective) { - super(objective, "Attack Enemy", "Attack enemy clan! Blow a hole in their base by Left-Clicking to fire the Cannon."); + super(objective, "Blow up the Enemy Base", "Attack enemy clan! Blow a hole in their base by Left-Clicking to fire the Cannon."); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/LoadCannonGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/LoadCannonGoal.java index 2dd2d056c..78a48a6ad 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/LoadCannonGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/LoadCannonGoal.java @@ -13,7 +13,7 @@ public class LoadCannonGoal extends ObjectiveGoal { public LoadCannonGoal(AttackEnemyObjective objective) { - super(objective, "Load Cannon", "Right click to open the Cannon, and load it with TNT!"); + super(objective, "Load the Cannon", "Right click to open the Cannon, and load it with TNT!"); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/MountCannonGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/MountCannonGoal.java index 54cfe9b0e..abe677db9 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/MountCannonGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/MountCannonGoal.java @@ -20,7 +20,7 @@ public class MountCannonGoal extends ObjectiveGoal { public MountCannonGoal(AttackEnemyObjective objective) { - super(objective, "Get on Cannon", "Right click on the Cannon to hop on!"); + super(objective, "Get on the Cannon", "Right click on the Cannon to hop on!"); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/StealEnemyPotatoesGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/StealEnemyPotatoesGoal.java index 2e381d2c9..fda9e8830 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/StealEnemyPotatoesGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/StealEnemyPotatoesGoal.java @@ -27,7 +27,7 @@ public class StealEnemyPotatoesGoal extends ObjectiveGoal public StealEnemyPotatoesGoal(AttackEnemyObjective objective) { - super(objective, "Steal Enemy Potatoes", "Steal the enemy's potatoes"); + super(objective, "Steal Potatoes", "Steal the enemy's potatoes"); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/BuildHouseGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/BuildHouseGoal.java index 208696b65..15ab7376b 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/BuildHouseGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/BuildHouseGoal.java @@ -35,7 +35,7 @@ public class BuildHouseGoal extends ObjectiveGoal public BuildHouseGoal(ClanObjective objective) { - super(objective, "Build House", "Build a Stone Brick house. (Place all your blocks)"); + super(objective, "Build a House", "Build a Stone Brick house. (Place all your blocks)"); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClanManagementGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClanManagementGoal.java index 68deb498c..95f71c7a4 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClanManagementGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClanManagementGoal.java @@ -17,7 +17,7 @@ public class ClanManagementGoal extends ObjectiveGoal { public ClanManagementGoal(ClanObjective objective) { - super(objective, "Manage your clan", "Manage your clan by using the command /c"); + super(objective, "Open the Clan Menu", "Manage your clan by using the command /c"); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/SetHomeGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/SetHomeGoal.java index 041126606..907f628c0 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/SetHomeGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/SetHomeGoal.java @@ -18,7 +18,7 @@ public class SetHomeGoal extends ObjectiveGoal { public SetHomeGoal(ClanObjective objective) { - super(objective, "Set Home", "Set your Clan's home by typing /c sethome"); + super(objective, "Set Clan Home", "Set your Clan's home by typing /c sethome"); } @Override From 50518250dee355e9548af9f73dce4f5957046351 Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Thu, 31 Mar 2016 17:02:38 +1100 Subject: [PATCH 02/10] PC-51 - Rename randomClan to EnemyClan --- .../clans/objective/AttackEnemyObjective.java | 2 ++ .../clans/objective/ClanObjective.java | 1 - .../objective/goals/clan/ClanInfoGoal.java | 29 ++++++++++--------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java index 285dececb..5d9e90d9c 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java @@ -13,6 +13,7 @@ import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.attackenemy. import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.attackenemy.LoadCannonGoal; import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.attackenemy.MountCannonGoal; import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.attackenemy.StealEnemyPotatoesGoal; +import mineplex.game.clans.tutorial.tutorials.clans.objective.goals.clan.ClanInfoGoal; import java.util.HashMap; import java.util.Map; @@ -29,6 +30,7 @@ public class AttackEnemyObjective extends OrderedObjective addGoal(new GetMapGoal(this)); addGoal(new HoldItemGoal(this, Material.MAP, "Locate Enemy on Map", "By looking at your map, identify your new enemy")); + addGoal(new ClanInfoGoal(this)); addGoal(new MountCannonGoal(this)); addGoal(new LoadCannonGoal(this)); addGoal(new BlowUpWallGoal(this)); diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClanObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClanObjective.java index af1d57fdb..f01ad1eeb 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClanObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClanObjective.java @@ -18,7 +18,6 @@ public class ClanObjective extends OrderedObjective addGoal(new LeaveSpawnGoal(this)); addGoal(new CreateClanGoal(this)); addGoal(new ClanManagementGoal(this)); - addGoal(new ClanInfoGoal(this)); addGoal(new ClaimLandGoal(this)); addGoal(new BuildHouseGoal(this)); addGoal(new SetHomeGoal(this)); diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClanInfoGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClanInfoGoal.java index c1a4d273d..a5c0ba03d 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClanInfoGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/ClanInfoGoal.java @@ -1,8 +1,6 @@ package mineplex.game.clans.tutorial.tutorials.clans.objective.goals.clan; -import mineplex.core.common.util.Callback; -import mineplex.core.common.util.F; import mineplex.core.common.util.UtilMath; import mineplex.core.common.util.UtilTime; import mineplex.game.clans.clans.ClanInfo; @@ -12,7 +10,7 @@ import mineplex.game.clans.clans.ClansPlayer; import mineplex.game.clans.clans.event.ClansCommandPreExecutedEvent; import mineplex.game.clans.core.repository.tokens.ClanToken; import mineplex.game.clans.tutorial.objective.ObjectiveGoal; -import mineplex.game.clans.tutorial.tutorials.clans.objective.ClanObjective; +import mineplex.game.clans.tutorial.tutorials.clans.objective.AttackEnemyObjective; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -20,17 +18,16 @@ import java.sql.Timestamp; import java.util.UUID; -public class ClanInfoGoal extends ObjectiveGoal +public class ClanInfoGoal extends ObjectiveGoal { - public ClanInfoGoal(ClanObjective objective) + public ClanInfoGoal(AttackEnemyObjective objective) { - super(objective, "Info on other clan", "Get info on other clans by using the command /c "); + super(objective, "Lookup Enemy Details", "View info about the enemy clan by typing /c EnemyClan"); } @Override protected void customStart(Player player) { - player.sendMessage(F.main("Clans", "You can use the command /c to get information about other clans. Try typing /c randomClan")); } @Override @@ -46,23 +43,27 @@ public class ClanInfoGoal extends ObjectiveGoal if(event.getArguments().length < 1) return; event.setCancelled(true); - event.setCancelled(true); + + if (!event.getArguments()[0].equalsIgnoreCase("EnemyClan")) + { + // Display info + return; + } ClanToken token = new ClanToken(); - token.Name = event.getArguments()[0]; - token.Description = "Best clan ever!"; + token.Name = "EnemyClan"; + token.Description = "The meanest clan in the world!"; token.Home = ""; token.Admin = false; token.Energy = 4320; - token.Id = UtilMath.random.nextInt(100); - token.Energy = UtilMath.random.nextInt(1000); + token.Id = -1; token.Kills = UtilMath.random.nextInt(100); token.Murder = UtilMath.random.nextInt(100); token.Deaths = UtilMath.random.nextInt(100); token.WarWins = UtilMath.random.nextInt(100); token.WarLosses = UtilMath.random.nextInt(100); - token.DateCreated = new Timestamp(System.currentTimeMillis()); - token.LastOnline = new Timestamp(System.currentTimeMillis()); + token.DateCreated = new Timestamp(System.currentTimeMillis() - (UtilTime.TimeUnit.DAYS.getMilliseconds() * 10)); + token.LastOnline = new Timestamp(System.currentTimeMillis() - (UtilTime.TimeUnit.DAYS.getMilliseconds() * 1)); ClanInfo clan = new ClanInfo(ClansManager.getInstance(), token); From 7867da277d391c2c310edc6dee68dc535ae8e766 Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Thu, 31 Mar 2016 17:05:59 +1100 Subject: [PATCH 03/10] PC-52 - Rename Identify Enemy Clan to Identify Enemy on Map --- .../tutorials/clans/objective/AttackEnemyObjective.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java index 5d9e90d9c..44ff17d15 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java @@ -29,7 +29,7 @@ public class AttackEnemyObjective extends OrderedObjective _cannon = new HashMap<>(); addGoal(new GetMapGoal(this)); - addGoal(new HoldItemGoal(this, Material.MAP, "Locate Enemy on Map", "By looking at your map, identify your new enemy")); + addGoal(new HoldItemGoal(this, Material.MAP, "Identify Enemy on Map", "By looking at your map, identify your new enemy")); addGoal(new ClanInfoGoal(this)); addGoal(new MountCannonGoal(this)); addGoal(new LoadCannonGoal(this)); From 25975e47b8843037260174d2b35c557cc7bd982f Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Thu, 31 Mar 2016 17:07:08 +1100 Subject: [PATCH 04/10] PC-54 - Rename Identify Shops to Identify Shops on Map --- .../tutorial/tutorials/clans/objective/ShopsObjective.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ShopsObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ShopsObjective.java index 8c0c908ed..984354027 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ShopsObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ShopsObjective.java @@ -35,7 +35,7 @@ public class ShopsObjective extends OrderedObjective _npcMap = new HashMap<>(); _npcManager = npcManager; - addGoal(new HoldItemGoal(this, Material.MAP, "Identify Shops", "Look at your map and find the shops")); + addGoal(new HoldItemGoal(this, Material.MAP, "Identify Shops on Map", "Look at your map and find the shops")); addGoal(new GoToShopsGoal(this)); addGoal(new SellPotatoesGoal(this)); } From f229da132700bf84ad26172ed9b2dbb61261a6ff Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Thu, 31 Mar 2016 17:08:26 +1100 Subject: [PATCH 05/10] PC-55 - Remove all potatoes from inventory when player completes "Sell Potatoes" --- .../clans/objective/goals/shops/SellPotatoesGoal.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/shops/SellPotatoesGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/shops/SellPotatoesGoal.java index a71f6d9c9..ab8bb42ff 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/shops/SellPotatoesGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/shops/SellPotatoesGoal.java @@ -6,6 +6,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import mineplex.core.common.util.F; +import mineplex.core.common.util.UtilInv; import mineplex.core.common.util.UtilPlayer; import mineplex.game.clans.clans.event.ClansPlayerSellItemEvent; import mineplex.game.clans.tutorial.objective.ObjectiveGoal; @@ -29,6 +30,9 @@ public class SellPotatoesGoal extends ObjectiveGoal { // Shops Fences Closed getObjective().getPlugin().spawnFences(getObjective().getPlugin().getRegion(player), DyeColor.BROWN); + + // Remove all potatoes from inventory + UtilInv.removeAll(player, Material.POTATO_ITEM, (byte) 0); } @EventHandler From c51830145e54183ddabc5af53dea43976afa96c7 Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Thu, 31 Mar 2016 17:09:51 +1100 Subject: [PATCH 06/10] PC-58 - Close gate to the fields after you sell diamonds --- .../clans/objective/goals/fields/SellDiamondsGoal.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/SellDiamondsGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/SellDiamondsGoal.java index ea95ef419..278a1f7d4 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/SellDiamondsGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/SellDiamondsGoal.java @@ -29,6 +29,8 @@ public class SellDiamondsGoal extends ObjectiveGoal { // Close Middle Gate getObjective().getPlugin().destroyFences(getObjective().getPlugin().getRegion(player), DyeColor.RED); + // Close Fields Gate + getObjective().getPlugin().destroyFences(getObjective().getPlugin().getRegion(player), DyeColor.BLACK); } @EventHandler From e7b9d866ae0cb98d4f4aed20085f46b57be2327e Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Thu, 31 Mar 2016 17:10:56 +1100 Subject: [PATCH 07/10] PC-57 - Rename Identify Fields to Identify Fields on Map --- .../tutorial/tutorials/clans/objective/FieldsObjective.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FieldsObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FieldsObjective.java index 83fc9b181..4b93da67c 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FieldsObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FieldsObjective.java @@ -18,7 +18,7 @@ public class FieldsObjective extends OrderedObjective { super(clansMainTutorial, javaPlugin, "Fields", "Get various resources by mining for them in the fields"); - addGoal(new HoldItemGoal(this, Material.MAP, "Identify Fields", "Look at your map and find the Fields Region")); + addGoal(new HoldItemGoal(this, Material.MAP, "Identify Fields on Map", "Look at your map and find the Fields Region")); addGoal(new GoToFieldsGoal(this)); addGoal(new MineDiamondsGoal(this)); addGoal(new SellDiamondsGoal(this)); From 7c70092f3bf97bec0cccb85833d49759bcaeaaa5 Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Thu, 31 Mar 2016 18:19:06 +1100 Subject: [PATCH 08/10] PC-48 - Create a hologram saying "Jump Off" at the edge of spawn island --- .../tutorials/clans/ClansMainTutorial.java | 16 ++++++++++++++++ .../objective/goals/clan/LeaveSpawnGoal.java | 10 +--------- 2 files changed, 17 insertions(+), 9 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 cae94dc9c..6b05307e6 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 @@ -19,6 +19,7 @@ import org.bukkit.event.player.PlayerDropItemEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.plugin.java.JavaPlugin; +import mineplex.core.common.util.C; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilAlg; import mineplex.core.common.util.UtilInv; @@ -127,6 +128,21 @@ public class ClansMainTutorial extends Tutorial player.getInventory().clear(); ClansManager.getInstance().getPvpTimer().pause(player); + + // Spawn Holograms + addHologram(player, + getPoint(region, ClansMainTutorial.Point.SPAWN).add(0, 1.5, -6), + C.cGoldB + "Welcome to the Clans Tutorial!", + " ", + "This will teach you the basics of Clans.", + "It will take about 5 minutes to complete.", + "You must complete it before playing Clans.", + " ", + "Walk forward to begin!"); + + addHologram(player, + getPoint(region, ClansMainTutorial.Point.SPAWN).add(0, 1.5, -23), + "Jump Off!"); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/LeaveSpawnGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/LeaveSpawnGoal.java index e903467cc..16111fb53 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/LeaveSpawnGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/LeaveSpawnGoal.java @@ -24,15 +24,7 @@ public class LeaveSpawnGoal extends ObjectiveGoal @Override protected void setup(Player player, TutorialRegion region) { - getObjective().getPlugin().addHologram(player, - getObjective().getPlugin().getPoint(region, ClansMainTutorial.Point.SPAWN).add(0, 1.5, -6), - C.cGoldB + "Welcome to the Clans Tutorial!", - " ", - "This will teach you the basics of Clans.", - "It will take about 5 minutes to complete.", - "You must complete it before playing Clans.", - " ", - "Walk forward to begin!"); + } @Override From 30a098c645292c350be11e51ca1cbe858eaddf7e Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Thu, 31 Mar 2016 18:24:47 +1100 Subject: [PATCH 09/10] PC-49 - Kick players out of their clan when they start the tutorial if they have one (from previously playing the tutorial). --- .../clans/tutorial/tutorials/clans/ClansMainTutorial.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 6b05307e6..40fb5637e 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 @@ -20,6 +20,7 @@ import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.plugin.java.JavaPlugin; import mineplex.core.common.util.C; +import mineplex.core.common.util.Callback; import mineplex.core.common.util.F; import mineplex.core.common.util.UtilAlg; import mineplex.core.common.util.UtilInv; @@ -28,6 +29,7 @@ import mineplex.core.hologram.HologramManager; import mineplex.core.npc.NpcManager; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; +import mineplex.game.clans.clans.ClanInfo; import mineplex.game.clans.clans.ClansManager; import mineplex.game.clans.clans.event.ClansCommandPreExecutedEvent; import mineplex.game.clans.economy.GoldManager; @@ -143,6 +145,12 @@ public class ClansMainTutorial extends Tutorial addHologram(player, getPoint(region, ClansMainTutorial.Point.SPAWN).add(0, 1.5, -23), "Jump Off!"); + + ClanInfo clan = ClansManager.getInstance().getClan(player); + if (clan != null) + { + ClansManager.getInstance().getClanDataAccess().delete(clan, null); + } } @Override From b3392e78f552be3c1ead5d1299e40c0d73a84d9a Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Thu, 31 Mar 2016 20:08:45 +1100 Subject: [PATCH 10/10] PC-28 - Improve Flow of Tutorials --- .../clans/tutorial/objective/Objective.java | 59 +++++++++++++++++++ .../tutorial/objective/ObjectiveGoal.java | 54 ++++++++++++++++- .../clans/objective/AttackEnemyObjective.java | 4 +- .../clans/objective/ClanObjective.java | 3 + .../clans/objective/ClassesObjective.java | 2 + .../clans/objective/EnergyObjective.java | 2 + .../clans/objective/FieldsObjective.java | 2 + .../clans/objective/FinalObjective.java | 2 + .../objective/PurchaseItemsObjective.java | 2 + .../clans/objective/ShopsObjective.java | 2 + .../clans/objective/goals/HoldItemGoal.java | 9 ++- .../goals/attackenemy/GetMapGoal.java | 2 + .../objective/goals/clan/LeaveSpawnGoal.java | 3 + .../objective/goals/clan/SetHomeGoal.java | 2 + .../goals/classes/EquipDefaultBuildGoal.java | 2 + .../goals/energy/ExplainEnergyGoal.java | 2 + .../goals/finalobj/TpClanHomeGoal.java | 2 + .../objective/goals/shops/PurchaseGoal.java | 3 + 18 files changed, 154 insertions(+), 3 deletions(-) diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/Objective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/Objective.java index 694e0573d..847b352e0 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/Objective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/Objective.java @@ -6,12 +6,15 @@ import java.util.List; import java.util.Set; import java.util.UUID; +import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; import org.bukkit.event.Listener; import org.bukkit.plugin.java.JavaPlugin; +import mineplex.core.common.util.C; import mineplex.core.common.util.UtilPlayer; +import mineplex.core.common.util.UtilTextMiddle; import mineplex.game.clans.tutorial.TutorialRegion; /** @@ -24,6 +27,10 @@ public abstract class Objective implements L private String _name; private String _description; private String _extraDescription; + private boolean _displayStartMessage; + private int _startMessageDelay; + private boolean _displayFinishMessage; + private int _finishMessageDelay; private HashMap _active; private List _listeners; @@ -35,6 +42,10 @@ public abstract class Objective implements L _name = name; _description = description; _extraDescription = extraDescription; + _displayStartMessage = true; + _displayFinishMessage = true; + _startMessageDelay = 60; + _finishMessageDelay = 1; _active = new HashMap<>(); _listeners = new LinkedList<>(); @@ -114,6 +125,9 @@ public abstract class Objective implements L _listeners.forEach(listener -> listener.onObjectiveStart(player, this)); + if (_displayStartMessage) + Bukkit.getServer().getScheduler().runTaskLater(getJavaPlugin(), () -> showStartMessage(player), _startMessageDelay); + customStart(player); } @@ -181,8 +195,13 @@ public abstract class Objective implements L { System.out.println(String.format("Tutorial> [%s] finished objective [%s]", player.getName(), getName(player))); + showFinishMessage(player); + _active.remove(player.getUniqueId()); + if (_displayFinishMessage) + Bukkit.getServer().getScheduler().runTaskLater(getJavaPlugin(), () -> showFinishMessage(player), _finishMessageDelay); + customFinish(player); _listeners.forEach(listener -> listener.onObjectiveFinish(player, this)); @@ -241,4 +260,44 @@ public abstract class Objective implements L } public abstract void addScoreboardLines(Player player, List lines); + + private void showStartMessage(Player player) + { + UtilTextMiddle.display(C.cAqua + "Tutorial", getName(player), player); + } + + private void showFinishMessage(Player player) + { + UtilTextMiddle.display(C.cGreen + "Tutorial Completed", getName(player), player); + } + + public void setDisplayStartMessage(boolean displayStartMessage) + { + _displayStartMessage = displayStartMessage; + } + + public void setDisplayFinishMessage(boolean displayFinishMessage) + { + _displayFinishMessage = displayFinishMessage; + } + + public int getStartMessageDelay() + { + return _startMessageDelay; + } + + public void setStartMessageDelay(int startMessageDelay) + { + _startMessageDelay = startMessageDelay; + } + + public int getFinishMessageDelay() + { + return _finishMessageDelay; + } + + public void setFinishMessageDelay(int finishMessageDelay) + { + _finishMessageDelay = finishMessageDelay; + } } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/ObjectiveGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/ObjectiveGoal.java index c64ca8885..d8fb13226 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/ObjectiveGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/objective/ObjectiveGoal.java @@ -4,9 +4,12 @@ import java.util.HashSet; import java.util.Set; import java.util.UUID; +import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.event.Listener; +import mineplex.core.common.util.C; +import mineplex.core.common.util.UtilTextMiddle; import mineplex.game.clans.tutorial.TutorialRegion; public abstract class ObjectiveGoal implements Listener @@ -17,6 +20,10 @@ public abstract class ObjectiveGoal implements Listener private String _name; private String _description; private String _extraDescription; + private boolean _displayStartMessage; + private int _startMessageDelay; + private boolean _displayFinishMessage; + private int _finishMessageDelay; public ObjectiveGoal(T objective, String name, String description) { @@ -31,6 +38,10 @@ public abstract class ObjectiveGoal implements Listener _name = name; _description = description; _extraDescription = extraDescription; + _displayStartMessage = true; + _startMessageDelay = 40; + _displayFinishMessage = true; + _finishMessageDelay = 1; } public String getName(Player player) @@ -68,6 +79,12 @@ public abstract class ObjectiveGoal implements Listener System.out.println(String.format("Tutorial> [%s] started objective goal [%s]", player.getName(), getName(player))); _active.add(player.getUniqueId()); + + if (_displayStartMessage) + { + Bukkit.getServer().getScheduler().runTaskLater(_objective.getJavaPlugin(), () -> displayStartMessage(player), _startMessageDelay); + } + customStart(player); } @@ -96,10 +113,15 @@ public abstract class ObjectiveGoal implements Listener System.out.println(String.format("Tutorial> [%s] finished objective goal [%s]", player.getName(), getName(player))); _active.remove(player.getUniqueId()); + + if (_displayFinishMessage) + { + Bukkit.getServer().getScheduler().runTaskLater(_objective.getJavaPlugin(), () -> displayFinishMessage(player), _finishMessageDelay); + } + customFinish(player); _objective.completeGoal(this, player); - } } @@ -123,4 +145,34 @@ public abstract class ObjectiveGoal implements Listener { return _objective; } + + protected void displayFinishMessage(Player player) + { + UtilTextMiddle.display(C.cGreen + "Completed Objective", getName(player), player); + } + + protected void displayStartMessage(Player player) + { + UtilTextMiddle.display(C.cYellow + "New Objective", getName(player), player); + } + + public void setDisplayStartMessage(boolean displayStartMessage) + { + _displayStartMessage = displayStartMessage; + } + + public void setDisplayFinishMessage(boolean displayFinishMessage) + { + _displayFinishMessage = displayFinishMessage; + } + + public void setStartMessageDelay(int startMessageDelay) + { + _startMessageDelay = startMessageDelay; + } + + public void setFinishMessageDelay(int finishMessageDelay) + { + _finishMessageDelay = finishMessageDelay; + } } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java index 44ff17d15..3620a018e 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/AttackEnemyObjective.java @@ -29,12 +29,14 @@ public class AttackEnemyObjective extends OrderedObjective _cannon = new HashMap<>(); addGoal(new GetMapGoal(this)); - addGoal(new HoldItemGoal(this, Material.MAP, "Identify Enemy on Map", "By looking at your map, identify your new enemy")); + addGoal(new HoldItemGoal(this, Material.MAP, "Identify Enemy on Map", "By looking at your map, identify your new enemy", 40)); addGoal(new ClanInfoGoal(this)); addGoal(new MountCannonGoal(this)); addGoal(new LoadCannonGoal(this)); addGoal(new BlowUpWallGoal(this)); addGoal(new StealEnemyPotatoesGoal(this)); + + setStartMessageDelay(60); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClanObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClanObjective.java index f01ad1eeb..2b1e764b1 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClanObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClanObjective.java @@ -21,6 +21,9 @@ public class ClanObjective extends OrderedObjective addGoal(new ClaimLandGoal(this)); addGoal(new BuildHouseGoal(this)); addGoal(new SetHomeGoal(this)); + + // Wait 1 second because the player is logging in/loading + setStartMessageDelay(20); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClassesObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClassesObjective.java index 388887fcd..642b6a1c2 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClassesObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/ClassesObjective.java @@ -18,6 +18,8 @@ public class ClassesObjective extends OrderedObjective addGoal(new EquipDefaultBuildGoal(this)); addGoal(new OpenClassManagerGoal(this)); addGoal(new UseBullsChargeGoal(this)); + + setStartMessageDelay(60); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/EnergyObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/EnergyObjective.java index 7a0895b85..5b1dc6dfb 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/EnergyObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/EnergyObjective.java @@ -16,6 +16,8 @@ public class EnergyObjective extends OrderedObjective addGoal(new ExplainEnergyGoal(this)); addGoal(new BuyEnergyGoal(this)); + + setStartMessageDelay(60); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FieldsObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FieldsObjective.java index 4b93da67c..86a8051af 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FieldsObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FieldsObjective.java @@ -22,6 +22,8 @@ public class FieldsObjective extends OrderedObjective addGoal(new GoToFieldsGoal(this)); addGoal(new MineDiamondsGoal(this)); addGoal(new SellDiamondsGoal(this)); + + setStartMessageDelay(60); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FinalObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FinalObjective.java index 299f46135..256580404 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FinalObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/FinalObjective.java @@ -16,6 +16,8 @@ public class FinalObjective extends OrderedObjective addGoal(new TpClanHomeGoal(this)); // IMPLEMENTED addGoal(new DisbandClanGoal(this)); // IMPLEMENTED + + setStartMessageDelay(60); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/PurchaseItemsObjective.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/PurchaseItemsObjective.java index 6422e8c11..e2325ff5f 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/PurchaseItemsObjective.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/PurchaseItemsObjective.java @@ -20,6 +20,8 @@ public class PurchaseItemsObjective extends UnorderedObjective addGoal(new HoldItemGoal(this, Material.MAP, "Identify Shops on Map", "Look at your map and find the shops")); addGoal(new GoToShopsGoal(this)); addGoal(new SellPotatoesGoal(this)); + + setStartMessageDelay(60); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/HoldItemGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/HoldItemGoal.java index 7991c1a2a..8aab1e8c2 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/HoldItemGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/HoldItemGoal.java @@ -17,11 +17,18 @@ public class HoldItemGoal extends ObjectiveGoal private DefaultHashMap> _ticksHeld = new DefaultHashMap<>(key -> new EnclosedObject<>(Integer.valueOf(0))); private Material _material; - public HoldItemGoal(Objective objective, Material material, String name, String description) + public HoldItemGoal(Objective objective, Material material, String name, String description, int startDelay) { super(objective, name, description); _material = material; + + setStartMessageDelay(startDelay); + } + + public HoldItemGoal(Objective objective, Material material, String name, String description) + { + this(objective, material, name, description, 120); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/GetMapGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/GetMapGoal.java index 3df50bc2d..8eeb25204 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/GetMapGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/GetMapGoal.java @@ -16,6 +16,8 @@ public class GetMapGoal extends ObjectiveGoal public GetMapGoal(AttackEnemyObjective objective) { super(objective, "Get a Map", "Use the /map command to recieve a map."); + + setStartMessageDelay(120); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/LeaveSpawnGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/LeaveSpawnGoal.java index 16111fb53..eeecf27d8 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/LeaveSpawnGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/LeaveSpawnGoal.java @@ -19,6 +19,9 @@ public class LeaveSpawnGoal extends ObjectiveGoal public LeaveSpawnGoal(ClanObjective objective) { super(objective, "Leave Spawn", "Exit the tutorial spawn area"); + + // 2 seconds after start message + setStartMessageDelay(20 * 3); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/SetHomeGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/SetHomeGoal.java index 907f628c0..6da4bb42d 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/SetHomeGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/clan/SetHomeGoal.java @@ -19,6 +19,8 @@ public class SetHomeGoal extends ObjectiveGoal public SetHomeGoal(ClanObjective objective) { super(objective, "Set Clan Home", "Set your Clan's home by typing /c sethome"); + + setDisplayFinishMessage(false); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/EquipDefaultBuildGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/EquipDefaultBuildGoal.java index 0be669819..f26390553 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/EquipDefaultBuildGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/EquipDefaultBuildGoal.java @@ -12,6 +12,8 @@ public class EquipDefaultBuildGoal extends ObjectiveGoal public EquipDefaultBuildGoal(ClassesObjective objective) { super(objective, "Equip Armor", "Equip your newly bought armor to try out it's abilities"); + + setStartMessageDelay(120); } @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 2577ffb0f..caacf56c3 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 @@ -34,6 +34,8 @@ public class ExplainEnergyGoal extends ObjectiveGoal finish(player); }, 20 * 10L); }, 20 * 3L); + + setStartMessageDelay(120); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/finalobj/TpClanHomeGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/finalobj/TpClanHomeGoal.java index 9ac3d2dc2..2c2eddc8c 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/finalobj/TpClanHomeGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/finalobj/TpClanHomeGoal.java @@ -21,6 +21,8 @@ public class TpClanHomeGoal extends ObjectiveGoal public TpClanHomeGoal(FinalObjective objective) { super(objective, "Teleport to Clan Home", "Use the /c home command to teleport to your Clan Home"); + + setStartMessageDelay(120); } @Override diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/shops/PurchaseGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/shops/PurchaseGoal.java index d44c417eb..6623879e2 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/shops/PurchaseGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/shops/PurchaseGoal.java @@ -17,6 +17,9 @@ public class PurchaseGoal extends ObjectiveGoal { super(objective, name, description); _material = material; + + setDisplayStartMessage(false); + setDisplayFinishMessage(false); } @Override