From 5a3f8ad15f7048641bc05774afbfff11e329ee6c Mon Sep 17 00:00:00 2001 From: GJ Date: Tue, 17 Sep 2013 14:13:11 -0400 Subject: [PATCH] Add COTW info for horses to the Taming command. --- .../java/com/gmail/nossr50/commands/skills/TamingCommand.java | 3 ++- src/main/resources/locale/locale_en_US.properties | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) 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 f3959bea8..97504495e 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java @@ -38,7 +38,7 @@ public class TamingCommand extends SkillCommand { @Override protected void permissionsCheck() { canBeastLore = Permissions.beastLore(player); - canCallWild = Permissions.callOfTheWild(player, EntityType.WOLF) || Permissions.callOfTheWild(player, EntityType.OCELOT); + canCallWild = Permissions.callOfTheWild(player, EntityType.HORSE) || Permissions.callOfTheWild(player, EntityType.WOLF) || Permissions.callOfTheWild(player, EntityType.OCELOT); canEnvironmentallyAware = Permissions.environmentallyAware(player); canFastFood = Permissions.fastFoodService(player); canGore = Permissions.gore(player); @@ -93,6 +93,7 @@ public class TamingCommand extends SkillCommand { player.sendMessage(LocaleLoader.getString("Effects.Template", LocaleLoader.getString("Taming.Effect.12"), LocaleLoader.getString("Taming.Effect.13"))); player.sendMessage(LocaleLoader.getString("Taming.Effect.14", Config.getInstance().getTamingCOTWOcelotCost())); player.sendMessage(LocaleLoader.getString("Taming.Effect.15", Config.getInstance().getTamingCOTWWolfCost())); + player.sendMessage(LocaleLoader.getString("Taming.Effect.20", Config.getInstance().getTamingCOTWHorseCost())); } } diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties index f8c32adc7..ac4bac550 100644 --- a/src/main/resources/locale/locale_en_US.properties +++ b/src/main/resources/locale/locale_en_US.properties @@ -310,6 +310,7 @@ Taming.Effect.12=Call of the Wild Taming.Effect.13=Summon an animal to your side Taming.Effect.14=[[GRAY]]COTW (Ocelot): Crouch and left-click with {0} Fish in hand Taming.Effect.15=[[GRAY]]COTW (Wolf): Crouch and left-click with {0} Bones in hand +Taming.Effect.20=[[GRAY]]COTW (Horse): Crouch and left-click with {0} Apples in hand Taming.Effect.16=Fast Food Service Taming.Effect.17=Chance for wolves to heal on attack Taming.Effect.18=Holy Hound