From 6c92b4233579dc66b9b017f89d01e7262966ebb2 Mon Sep 17 00:00:00 2001 From: Cheese Date: Mon, 4 Apr 2016 13:01:54 +1000 Subject: [PATCH] text changes --- .../tutorial/tutorials/clans/objective/ClanObjective.java | 2 +- .../tutorials/clans/objective/FieldsObjective.java | 2 +- .../tutorials/clans/objective/FinalObjective.java | 2 +- .../clans/objective/goals/attackenemy/BlowUpWallGoal.java | 4 ++-- .../clans/objective/goals/attackenemy/ClanInfoGoal.java | 2 +- .../clans/objective/goals/attackenemy/GetMapGoal.java | 2 +- .../clans/objective/goals/attackenemy/LoadCannonGoal.java | 5 ++--- .../objective/goals/attackenemy/MountCannonGoal.java | 6 +++--- .../goals/attackenemy/StealEnemyPotatoesGoal.java | 7 +++---- .../clans/objective/goals/clan/ClaimLandGoal.java | 8 ++++---- .../clans/objective/goals/clan/ClanManagementGoal.java | 5 ++--- .../clans/objective/goals/clan/LeaveSpawnGoal.java | 4 ++-- .../tutorials/clans/objective/goals/clan/SetHomeGoal.java | 3 +-- .../objective/goals/classes/OpenClassManagerGoal.java | 2 +- .../clans/objective/goals/classes/UseBullsChargeGoal.java | 2 +- .../clans/objective/goals/fields/MineDiamondsGoal.java | 2 +- .../clans/objective/goals/shops/GoToShopsGoal.java | 5 +++-- .../clans/objective/goals/shops/SellPotatoesGoal.java | 5 ++--- 18 files changed, 32 insertions(+), 36 deletions(-) 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 2b1e764b1..c9e68e3aa 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,7 +13,7 @@ public class ClanObjective extends OrderedObjective { public ClanObjective(ClansMainTutorial clansMainTutorial, JavaPlugin javaPlugin) { - super(clansMainTutorial, javaPlugin, "Clan Basics", "Create clan with /c create "); + super(clansMainTutorial, javaPlugin, "Clans", "Create clan with /c create "); addGoal(new LeaveSpawnGoal(this)); addGoal(new CreateClanGoal(this)); 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 e1f060696..3a5e2c03c 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 @@ -24,7 +24,7 @@ public class FieldsObjective extends OrderedObjective this, Material.MAP, "Identify Fields on Map", - "Find the Orange Striped Area on your map", + "Find the Orange Striped Area on your Map", "Fields are marked by " + C.cGold + "Orange Stripes" + C.mBody + "." )); addGoal(new GoToFieldsGoal(this)); 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 af1aa5dc9..b81cede20 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 @@ -13,7 +13,7 @@ public class FinalObjective extends OrderedObjective { public FinalObjective(ClansMainTutorial clansMainTutorial, JavaPlugin javaPlugin) { - super(clansMainTutorial, javaPlugin, "Finishing", "Finalize your knowledge of Clans"); + super(clansMainTutorial, javaPlugin, "Clans Basics 2", "Finalize your knowledge of Clans"); addGoal(new TpClanHomeGoal(this)); // IMPLEMENTED addGoal(new DisbandClanGoal(this)); // IMPLEMENTED 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 8ff57b6b0..e3b3f2fc2 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 @@ -29,8 +29,8 @@ public class BlowUpWallGoal extends ObjectiveGoal super( objective, "Blow up the Enemy Base", - "Left-Click whilst sitting on the cannon to fire", - "This is the fun part. Use the Cannon to smash a hole in your enemy’s wall KA-BOOM!", + "Left-Click to shoot TNT at the Enemy Base", + "TNT Cannons will rotate to the direction you are looking. Simply look at the Enemy Base, wait for it to rotate, and then FIRE!", DyeColor.MAGENTA ); } diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/ClanInfoGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/ClanInfoGoal.java index 4610b5c15..1f1b586b0 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/ClanInfoGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/attackenemy/ClanInfoGoal.java @@ -29,7 +29,7 @@ public class ClanInfoGoal extends ObjectiveGoal "View info about the enemy clan by typing /c EnemyClan", "You can lookup details about your enemy before going for an " + "attack! This can give you a crucial advantage before " + - "you begin.", + "you fight.", null ); } 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 86c2156b5..b0c8581dd 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 @@ -21,7 +21,7 @@ public class GetMapGoal extends ObjectiveGoal "Get a Map", "Get a Map ( Type /map )", "You can get a Map any time you need one. The map will show you who " + - "owns the land around the map. Your clan is " + C.cAqua + "aqua" + + "owns the land around the map. Your clan is " + C.cAqua + "blue" + C.mBody + ", your allies are " + C.cGreen + "green" + C.mBody + ", " + "and your enemies are " + C.cRed + "red" + C.mBody + ".", null 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 8fb911aca..81ca051c6 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 @@ -16,9 +16,8 @@ public class LoadCannonGoal extends ObjectiveGoal super( objective, "Load the Cannon", - "Right click whilst sitting on the Cannon, and load it with TNT!", - "First you’ll need to load this baby up with some TNT. Right click whilst sitting " + - "on the Cannon, and load it with TNT!", + "Right-Click while on the Cannon, and insert your TNT", + "TNT Cannons require TNT to be able to shoot. You can also change the range your cannon fires in the Cannon Menu.", null ); } 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 6ed7cd3fe..a7d6c3562 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 @@ -26,9 +26,9 @@ public class MountCannonGoal extends ObjectiveGoal super( objective, "Get on the Cannon", - "Right click on the Cannon to hop on!", - "To break through an enemy Clan’s fortress you’ll need some serious " + - "firepower. Try using this TNT Cannon to get the job done!", + "Right-Click on the Cannon", + "You cannot break blocks in enemy territory, however you can blow them up! " + + "TNT Cannons are the best way to do destroy enemy bases!", DyeColor.BLACK ); } 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 8339ed67c..5e042c4bd 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 @@ -32,9 +32,8 @@ public class StealEnemyPotatoesGoal extends ObjectiveGoal super( objective, "Steal Potatoes", - "Retrieve the potatoes from the Enemy Clan’s base", - "Now that their walls are down, it’s time to get rich! Go steal their " + - "potatoes for your Clan!", + "Steal potatoes from the Enemy Clan’s base", + "Raiding enemy bases is one of the best parts of Clans! There's nothing better than looting Legendary weapons from enemies!", DyeColor.PURPLE ); } @@ -43,7 +42,7 @@ public class StealEnemyPotatoesGoal extends ObjectiveGoal public String getDescription(Player player) { int count = _playersMap.get(player.getUniqueId()).get(); - return "Retrieve the potatoes from the Enemy Clan’s base " + count + "/10"; + return "Steal potatoes from the Enemy Clan’s base " + count + "/10"; } @Override 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 c066b8a59..46895d689 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 @@ -27,10 +27,10 @@ public class ClaimLandGoal extends ObjectiveGoal super( objective, "Claim Land", - "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 " + C.cAqua + "blue" + C.cGray + " outline to claim land.", + "Type /c to Claim Land using the Clan Menu", + "Clans are able to claim land for themselves. " + + "Once claimed, no one else can break or place blocks there! " + + "You must be inside the " + C.cAqua + "blue" + C.cGray + " outline to claim land.", DyeColor.ORANGE ); } 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 628cab02e..4f2e8cadc 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 @@ -22,9 +22,8 @@ public class ClanManagementGoal extends ObjectiveGoal super( objective, "Open the Clan Menu", - "Open the Clan Menu ( Type /c )", - "Clan Menu lets you view all clan information and perform actions such as: " + - "who is online, Claiming Land, Inviting Players and much more.", + "Type /c to open the Clan Menu", + "Clan Menu lets you do lots of Clans actions, and view information about your Clan. Take a moment to look at it all!", null ); } 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 80d01bcd7..3de4a6674 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 @@ -23,12 +23,12 @@ public class LeaveSpawnGoal extends ObjectiveGoal { super( objective, - "Leave Spawn", + "Leave Spawn Island", "Jump off Spawn Island", F.elem("Spawn Island") + " is where you will respawn when you die. This area is " + "a " + F.elem("Safe Zone") + ", meaning that players cannot hurt each other. " + "From here, you can teleport to various places, as well as read some helpful " + - "hints. To leave " + F.elem("Spawn Island") + ", simply jump off!", + "hints.", DyeColor.WHITE ); 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 d8e5172ec..bc07f4143 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 @@ -24,8 +24,7 @@ public class SetHomeGoal extends ObjectiveGoal "Set Clan Home", "Set your Clan's Home ( Type /c sethome )", "Your Clan Home is a special place in your base that you can teleport " + - "to from " + F.elem("Spawn Island") + ". You can teleport to it " + - "at any time by typing " + F.elem("/c home") + ".", + "to from " + F.elem("Spawn Island") + " or at any time by typing " + F.elem("/c home") + ".", DyeColor.ORANGE ); diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/OpenClassManagerGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/OpenClassManagerGoal.java index 50cb18704..a67f38855 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/OpenClassManagerGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/OpenClassManagerGoal.java @@ -20,7 +20,7 @@ public class OpenClassManagerGoal extends ObjectiveGoal objective, "Open Class Manager", "Right-Click on the Enchantment Table", "Each class has lots of different skills, and you can pick which ones you want to " + - "equip! Click on an " + F.elem("Enchanting Table") + " to have a look at " + + "equip! Right-Click on an " + F.elem("Enchanting Table") + " to have a look at " + "this menu.", DyeColor.CYAN ); diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/UseBullsChargeGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/UseBullsChargeGoal.java index d95287c5a..6c17de60c 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/UseBullsChargeGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/classes/UseBullsChargeGoal.java @@ -21,7 +21,7 @@ public class UseBullsChargeGoal extends ObjectiveGoal { super( objective, "Use Bulls Charge", - "Right-Click with Axe to use Bull's Charge", + "Right-Click with Axe to use Bulls Charge", "One of your default abilities as Knight is Bulls Charge. This ability will make " + "you run faster for a short time, and deal extra damage to enemies.", null diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/MineDiamondsGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/MineDiamondsGoal.java index d70fe6791..aca99b031 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/MineDiamondsGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/fields/MineDiamondsGoal.java @@ -29,7 +29,7 @@ public class MineDiamondsGoal extends ObjectiveGoal super( objective, "Mine Diamonds", - "Search for some diamonds in the Fields and mine them", + "Mine Diamonds in the Fields", "Mining in the Fields is a great way to make lots of money! The ores will " + "regenerate over time. Be careful of enemies though!", DyeColor.LIME diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/shops/GoToShopsGoal.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/shops/GoToShopsGoal.java index 356653bc1..f08161fe0 100644 --- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/shops/GoToShopsGoal.java +++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/tutorial/tutorials/clans/objective/goals/shops/GoToShopsGoal.java @@ -23,8 +23,9 @@ public class GoToShopsGoal extends ObjectiveGoal super( objective, "Go to the Shops", - "Head over to the Shops (use your map)", - "The shops are the place where you can buy and sell all sorts of items!", + "Walk to the Shops", + "The shops are the place where you can buy and sell all sorts of items! " + + "The Shops are a " + F.elem("Safe Zone") + ", meaning meaning that players cannot hurt each other.", DyeColor.LIGHT_BLUE ); } 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 81ae58458..325d091a5 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 @@ -22,10 +22,9 @@ public class SellPotatoesGoal extends ObjectiveGoal super( objective, "Sell Potatoes", - "Sell your Potatoes to the " + F.elem("Organic Produce Shop NPC") + ".", + "Sell your Potatoes to the " + F.elem("Organic Produce Shop") + ".", "Farming is a great way to make money in Clans. Build a farm in your land, " + - "harvest " + - "the crops and sell it to the shops for profit!", + "harvest the crops, and sell it to the shops for profit!", DyeColor.PINK ); }