Skip to content

Commit

Permalink
All thats left is to fill in the locale with information
Browse files Browse the repository at this point in the history
  • Loading branch information
nossr50 committed Mar 3, 2012
1 parent e6e7f10 commit a85ca2c
Show file tree
Hide file tree
Showing 11 changed files with 43 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
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
Expand Down Expand Up @@ -47,6 +48,9 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
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;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
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
Expand Down Expand Up @@ -57,6 +58,8 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
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
Expand Down Expand Up @@ -41,6 +42,8 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
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
Expand Down Expand Up @@ -63,6 +64,8 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
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
Expand Down Expand Up @@ -45,7 +46,9 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
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;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
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
Expand Down Expand Up @@ -63,6 +64,8 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.util.Page;

public class TamingCommand implements CommandExecutor {
@Override
Expand Down Expand Up @@ -69,6 +70,8 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
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
Expand Down Expand Up @@ -66,6 +67,8 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
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;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
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
Expand Down Expand Up @@ -51,6 +52,8 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
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;
}
}
2 changes: 1 addition & 1 deletion src/main/java/com/gmail/nossr50/util/Page.java
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public static void clearChat(Player player)
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("?"))
Expand Down
15 changes: 13 additions & 2 deletions src/main/resources/locale/locale_en_us.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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**
Expand All @@ -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!
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=

0 comments on commit a85ca2c

Please sign in to comment.