From a85ca2c98413a544301d7b59bf443a69c00446b9 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Sat, 3 Mar 2012 13:29:39 -0800 Subject: [PATCH] All thats left is to fill in the locale with information --- .../commands/skills/AcrobaticsCommand.java | 4 ++++ .../nossr50/commands/skills/ArcheryCommand.java | 3 +++ .../nossr50/commands/skills/FishingCommand.java | 3 +++ .../nossr50/commands/skills/HerbalismCommand.java | 3 +++ .../nossr50/commands/skills/RepairCommand.java | 5 ++++- .../nossr50/commands/skills/SwordsCommand.java | 3 +++ .../nossr50/commands/skills/TamingCommand.java | 3 +++ .../nossr50/commands/skills/UnarmedCommand.java | 3 +++ .../commands/skills/WoodcuttingCommand.java | 3 +++ src/main/java/com/gmail/nossr50/util/Page.java | 2 +- src/main/resources/locale/locale_en_us.properties | 15 +++++++++++++-- 11 files changed, 43 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java index fad3756e7..9ce820be4 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java @@ -10,6 +10,7 @@ import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; +import com.gmail.nossr50.util.Page; public class AcrobaticsCommand implements CommandExecutor { @Override @@ -47,6 +48,9 @@ public class AcrobaticsCommand implements CommandExecutor { player.sendMessage(mcLocale.getString("m.AcrobaticsRollChance", new Object[] { percentage })); player.sendMessage(mcLocale.getString("m.AcrobaticsGracefulRollChance", new Object[] { gracepercentage })); player.sendMessage(mcLocale.getString("m.AcrobaticsDodgeChance", new Object[] { dodgepercentage })); + + Page.grabGuidePageForSkill(SkillType.ACROBATICS, player, args); + return true; } } \ No newline at end of file diff --git a/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java index b7853d3ec..0665e8ce4 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java @@ -10,6 +10,7 @@ import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; +import com.gmail.nossr50.util.Page; public class ArcheryCommand implements CommandExecutor { @Override @@ -57,6 +58,8 @@ public class ArcheryCommand implements CommandExecutor { player.sendMessage(mcLocale.getString("m.ArcheryDazeChance", new Object[] { percentagedaze })); player.sendMessage(mcLocale.getString("m.ArcheryRetrieveChance", new Object[] { percentage })); player.sendMessage(mcLocale.getString("m.ArcheryIgnitionLength", new Object[] { (ignition / 20) })); + + Page.grabGuidePageForSkill(SkillType.AXES, player, args); return true; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java index fa9475453..91592674b 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java @@ -11,6 +11,7 @@ import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; import com.gmail.nossr50.skills.Fishing; +import com.gmail.nossr50.util.Page; public class FishingCommand implements CommandExecutor { @Override @@ -41,6 +42,8 @@ public class FishingCommand implements CommandExecutor { player.sendMessage(mcLocale.getString("m.AbilityLockTemplate", new Object[] { mcLocale.getString("m.AbilLockFishing1") })); else player.sendMessage(mcLocale.getString("m.ShakeInfo", new Object[] { Fishing.getFishingLootTier(PP) })); + + Page.grabGuidePageForSkill(SkillType.FISHING, player, args); return true; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java index ac5644011..256d6ae3d 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java @@ -10,6 +10,7 @@ import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; +import com.gmail.nossr50.util.Page; public class HerbalismCommand implements CommandExecutor { @Override @@ -63,6 +64,8 @@ public class HerbalismCommand implements CommandExecutor { player.sendMessage(mcLocale.getString("m.HerbalismGreenThumbStage", new Object[] { bonus })); player.sendMessage(mcLocale.getString("m.HerbalismFoodPlus", new Object[] { bonus } )); player.sendMessage(mcLocale.getString("m.HerbalismDoubleDropChance", new Object[] { percentage })); + + Page.grabGuidePageForSkill(SkillType.HERBALISM, player, args); return true; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java index 03b3b7c02..d7aad5e96 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java @@ -12,6 +12,7 @@ import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; import com.gmail.nossr50.skills.Repair; +import com.gmail.nossr50.util.Page; public class RepairCommand implements CommandExecutor { @Override @@ -45,7 +46,9 @@ public class RepairCommand implements CommandExecutor { player.sendMessage(mcLocale.getString("m.ArcaneForgingRank", new Object[] { Repair.getArcaneForgingRank(PP.getSkillLevel(SkillType.REPAIR)) })); player.sendMessage(mcLocale.getString("m.ArcaneEnchantKeepChance", new Object[] { Repair.getEnchantChance(Repair.getArcaneForgingRank(PP.getSkillLevel(SkillType.REPAIR))) })); player.sendMessage(mcLocale.getString("m.ArcaneEnchantDowngradeChance", new Object[] { Repair.getDowngradeChance(Repair.getArcaneForgingRank(PP.getSkillLevel(SkillType.REPAIR))) })); - + + Page.grabGuidePageForSkill(SkillType.REPAIR, player, args); + return true; } } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java index 8f003d86b..3e36dd7fc 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java @@ -10,6 +10,7 @@ import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; +import com.gmail.nossr50.util.Page; public class SwordsCommand implements CommandExecutor { @Override @@ -63,6 +64,8 @@ public class SwordsCommand implements CommandExecutor { player.sendMessage(mcLocale.getString("m.SwordsTickNote")); player.sendMessage(mcLocale.getString("m.SwordsBleedChance", new Object[] { percentage })); player.sendMessage(mcLocale.getString("m.SwordsSSLength", new Object[] { ticks })); + + Page.grabGuidePageForSkill(SkillType.SWORDS, player, args); return true; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java index 58cbf8744..24867505e 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java @@ -11,6 +11,7 @@ import com.gmail.nossr50.config.LoadProperties; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; +import com.gmail.nossr50.util.Page; public class TamingCommand implements CommandExecutor { @Override @@ -69,6 +70,8 @@ public class TamingCommand implements CommandExecutor { player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusTaming5_0"), mcLocale.getString("m.AbilBonusTaming5_1") })); player.sendMessage(mcLocale.getString("m.TamingGoreChance", new Object[] { percentage })); + + Page.grabGuidePageForSkill(SkillType.TAMING, player, args); return true; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java index 8114cb994..4698aca30 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java @@ -10,6 +10,7 @@ import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; +import com.gmail.nossr50.util.Page; public class UnarmedCommand implements CommandExecutor { @Override @@ -66,6 +67,8 @@ public class UnarmedCommand implements CommandExecutor { player.sendMessage(mcLocale.getString("m.AbilityBonusTemplate", new Object[] { mcLocale.getString("m.AbilBonusUnarmed2_0"), mcLocale.getString("m.AbilBonusUnarmed2_1", new Object[] {bonus}) })); player.sendMessage(mcLocale.getString("m.UnarmedBerserkLength", new Object[] { ticks })); + + Page.grabGuidePageForSkill(SkillType.UNARMED, player, args); return true; } diff --git a/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java index 90a79fa31..e330457a9 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java @@ -10,6 +10,7 @@ import com.gmail.nossr50.mcPermissions; import com.gmail.nossr50.datatypes.PlayerProfile; import com.gmail.nossr50.datatypes.SkillType; import com.gmail.nossr50.locale.mcLocale; +import com.gmail.nossr50.util.Page; public class WoodcuttingCommand implements CommandExecutor { @Override @@ -51,6 +52,8 @@ public class WoodcuttingCommand implements CommandExecutor { player.sendMessage(mcLocale.getString("m.WoodCuttingDoubleDropChance", new Object[] { percentage })); player.sendMessage(mcLocale.getString("m.WoodCuttingTreeFellerLength", new Object[] { ticks })); + Page.grabGuidePageForSkill(SkillType.WOODCUTTING, player, args); + return true; } } diff --git a/src/main/java/com/gmail/nossr50/util/Page.java b/src/main/java/com/gmail/nossr50/util/Page.java index 2dc8000b3..08f6ab676 100644 --- a/src/main/java/com/gmail/nossr50/util/Page.java +++ b/src/main/java/com/gmail/nossr50/util/Page.java @@ -60,7 +60,7 @@ public class Page { public static void grabGuidePageForSkill(SkillType skilltype, Player player, String[] args) { String capitalized = m.getCapitalized(skilltype.toString()); - player.sendMessage(ChatColor.DARK_AQUA+"To read a Guide about "+capitalized+" type /"+skilltype.toString().toLowerCase()+" ? [Page Number]"); + player.sendMessage(ChatColor.DARK_AQUA+"Guide for "+capitalized+"available type /"+skilltype.toString().toLowerCase()+" ? [Page#]"); if (args.length >= 1) { if(args[0].equals("?")) diff --git a/src/main/resources/locale/locale_en_us.properties b/src/main/resources/locale/locale_en_us.properties index 9c7b79176..2d8e5a418 100644 --- a/src/main/resources/locale/locale_en_us.properties +++ b/src/main/resources/locale/locale_en_us.properties @@ -414,7 +414,6 @@ Skills.SerratedStrikesPlayerOff=[[RED]]Serrated Strikes[[GREEN]] has worn off fo Skills.BlastMiningPlayer=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Blast Mining! Skills.YourBlastMining=[[GREEN]]Your [[YELLOW]]Blast Mining [[GREEN]]ability is refreshed! TreeFeller.AxeSplinters=[[RED]]YOUR AXE SPLINTERS INTO DOZENS OF PIECES -Guides.Excavation=[[DARK_AQUA]]About Excavation:\n[[YELLOW]]Excavation is the act of digging up dirt to find treasures.\n[[YELLOW]]By excavating the land you will find treasures.\n[[YELLOW]]The more you do this the more treasures you can find.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill you must dig with a shovel in hand.\n[[YELLOW]]Only certain materials can be dug up for treasures and XP.\n[[DARK_AQUA]]Compatible Materials:\n[[YELLOW]]Grass, Dirt, Sand, Clay, Gravel, Mycelium, Soul Sand\n\n[[DARK_AQUA]]How to use Giga Drill Breaker:\n[[YELLOW]]With a shovel in hand right click to ready your tool.\n[[YELLOW]]Once in this state you have about 4 seconds to make\n[[YELLOW]]contact with Excavation compatible materials this will\n[[YELLOW]]activate Giga Drill Breaker.\n[[DARK_AQUA]]What is Giga Drill Breaker?\n[[YELLOW]]Giga Drill Breaker is an ability with a cooldown\n[[YELLOW]]tied to Excavation skill. It triples your chance\n[[YELLOW]]of finding treasures and enables instant break\n[[YELLOW]]on Excavation materials.\n\n[[DARK_AQUA]]How does Treasure Hunter work?\n[[YELLOW]]Every possible treasure for Excavation has its own\n[[YELLOW]]skill level requirement for it to drop, as a result it's\n[[YELLOW]]difficult to say how much it is helping you.\n[[YELLOW]]Just keep in mind that the higher your Excavation skill\n[[YELLOW]]is, the more treasures that can be found.\n[[YELLOW]]And also keep in mind that each type of Excavation\n[[YELLOW]]compatible material has its own unique list of treasures.\n[[YELLOW]]In other words you will find different treasures in Dirt\n[[YELLOW]]than you would in Gravel.\n[[DARK_AQUA]]Notes about Excavation:\n[[YELLOW]]Excavation drops are completely customizeable\n[[YELLOW]]So results vary server to server. Acrobatics.GracefulRoll=[[GREEN]]**GRACEFUL ROLL** Acrobatics.Dodge=[[GREEN]]**DODGE** Acrobatics.Roll=**ROLL** @@ -424,4 +423,16 @@ Axes.HitByCleave=[[DARK_RED]]Struck by CLEAVE! Swords.EnemyBleeding=[[GREEN]]**ENEMY BLEEDING** Swords.HitBySerratedStrikes=[[DARK_RED]]Struck by SERRATED STRIKES! Swords.CounterAttacked=[[GREEN]]**COUNTER-ATTACKED** -Swords.HitByCounterAttack=[[DARK_RED]]Hit with a counter-attack! \ No newline at end of file +Swords.HitByCounterAttack=[[DARK_RED]]Hit with a counter-attack! +Guides.Acrobatics= +Guides.Archery= +Guides.Axes= +Guides.Excavation=[[DARK_AQUA]]About Excavation:\n[[YELLOW]]Excavation is the act of digging up dirt to find treasures.\n[[YELLOW]]By excavating the land you will find treasures.\n[[YELLOW]]The more you do this the more treasures you can find.\n\n[[DARK_AQUA]]XP GAIN:\n[[YELLOW]]To gain XP in this skill you must dig with a shovel in hand.\n[[YELLOW]]Only certain materials can be dug up for treasures and XP.\n[[DARK_AQUA]]Compatible Materials:\n[[YELLOW]]Grass, Dirt, Sand, Clay, Gravel, Mycelium, Soul Sand\n\n[[DARK_AQUA]]How to use Giga Drill Breaker:\n[[YELLOW]]With a shovel in hand right click to ready your tool.\n[[YELLOW]]Once in this state you have about 4 seconds to make\n[[YELLOW]]contact with Excavation compatible materials this will\n[[YELLOW]]activate Giga Drill Breaker.\n[[DARK_AQUA]]What is Giga Drill Breaker?\n[[YELLOW]]Giga Drill Breaker is an ability with a cooldown\n[[YELLOW]]tied to Excavation skill. It triples your chance\n[[YELLOW]]of finding treasures and enables instant break\n[[YELLOW]]on Excavation materials.\n\n[[DARK_AQUA]]How does Treasure Hunter work?\n[[YELLOW]]Every possible treasure for Excavation has its own\n[[YELLOW]]skill level requirement for it to drop, as a result it's\n[[YELLOW]]difficult to say how much it is helping you.\n[[YELLOW]]Just keep in mind that the higher your Excavation skill\n[[YELLOW]]is, the more treasures that can be found.\n[[YELLOW]]And also keep in mind that each type of Excavation\n[[YELLOW]]compatible material has its own unique list of treasures.\n[[YELLOW]]In other words you will find different treasures in Dirt\n[[YELLOW]]than you would in Gravel.\n[[DARK_AQUA]]Notes about Excavation:\n[[YELLOW]]Excavation drops are completely customizeable\n[[YELLOW]]So results vary server to server. +Guides.Fishing= +Guides.Herbalism= +Guides.Mining= +Guides.Repair= +Guides.Swords= +Guides.Taming= +Guides.Unarmed= +Guides.Woodcutting= \ No newline at end of file