From 8a9c83606524a21af76ef3a2c1e0c78788d1cecf Mon Sep 17 00:00:00 2001 From: nossr50 Date: Tue, 2 Jul 2019 00:45:08 -0700 Subject: [PATCH] More locale tweaks for COTW --- Changelog.txt | 7 ++++++- .../com/gmail/nossr50/skills/taming/TamingManager.java | 7 +++---- src/main/resources/locale/locale_en_US.properties | 7 +++---- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 27f661da5..3ad695e07 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,5 +1,6 @@ Version 2.1.92 Call Of The Wild (COTW) no longer cares if entities of the same type are nearby when attempting to summon a new entity + Most COTW messages have been tweaked and new COTW messages have been added By default players are no longer allowed to breed COTW summoned animals with other animals, you can turn this off (see the notes) Changed the sound effect for COTW (Fireworks -> Pop) Fixed a bug where COTW summon limit was global instead of per player @@ -18,9 +19,13 @@ Version 2.1.92 Taming.Summon.Fail.Ocelot Taming.Summon.Fail.Wolf Taming.Summon.Fail.Horse + Taming.Summon.Fail.TooMany + Taming.Summon.Lifespan Added new locale strings + Taming.Summon.COTW.NeedMoreItems Taming.Summon.COTW.BreedingDisallowed - Taming.Summon.COTW.Success + Taming.Summon.COTW.Success.WithLifespan + Taming.Summon.COTW.Success.WithoutLifespan Taming.Summon.COTW.Limit Taming.Summon.COTW.TimeExpired Tweaked locale string diff --git a/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java b/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java index 45b58e919..735c8d3c0 100644 --- a/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java +++ b/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java @@ -355,10 +355,10 @@ public class TamingManager extends SkillManager { //Inform the player about what they have just done if (tamingSummon.getSummonLifespan() > 0) { - NotificationManager.sendPlayerInformationChatOnly(player, "Taming.Summon.COTW.Success", + NotificationManager.sendPlayerInformationChatOnly(player, "Taming.Summon.COTW.Success.WithLifespan", StringUtils.getCapitalized(callOfTheWildType.toString()), String.valueOf(tamingSummon.getSummonLifespan())); } else { - NotificationManager.sendPlayerInformationChatOnly(player, "Taming.Summon.Complete"); + NotificationManager.sendPlayerInformationChatOnly(player, "Taming.Summon.COTW.Success.WithoutLifespan", StringUtils.getCapitalized(callOfTheWildType.toString())); } //Send Sound @@ -378,10 +378,9 @@ public class TamingManager extends SkillManager { } else { //Player did not have enough of the item in their main hand int difference = tamingSummon.getItemAmountRequired() - itemInMainHand.getAmount(); - NotificationManager.sendPlayerInformation(player, NotificationType.REQUIREMENTS_NOT_MET, "Item.NotEnough", String.valueOf(difference), StringUtils.getPrettyItemString(itemInMainHand.getType())); + NotificationManager.sendPlayerInformationChatOnly(player, "Taming.Summon.COTW.NeedMoreItems", String.valueOf(difference), StringUtils.getPrettyItemString(itemInMainHand.getType())); } } - } private void spawnCOTWEntity(CallOfTheWildType callOfTheWildType, Location spawnLocation, EntityType entityType) { diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties index ff84cff18..7b6b75b7c 100644 --- a/src/main/resources/locale/locale_en_US.properties +++ b/src/main/resources/locale/locale_en_US.properties @@ -480,13 +480,12 @@ Taming.SubSkill.Pummel.TargetMessage=You've been knocked back by a wolf! Taming.Listener.Wolf=[[DARK_GRAY]]Your wolf scurries back to you... Taming.Listener=Taming: Taming.SkillName=TAMING -Taming.Summon.Complete=[[GREEN]]Summoning complete -Taming.Summon.COTW.Success=[[GREEN]](Call Of The Wild) [[GRAY]]You have summoned a [[GOLD]]{0}[[GRAY]] and it has a duration of [[GOLD]]{1}[[GRAY]] seconds. -Taming.Summon.Lifespan= (Lifespan: {0}s) -Taming.Summon.Fail.TooMany=[[RED]]You have reached the maximum limit of pets to summon. [[YELLOW]]({0}) +Taming.Summon.COTW.Success.WithoutLifespan=[[GREEN]](Call Of The Wild) [[GRAY]]You have summoned a [[GOLD]]{0}[[GRAY]] +Taming.Summon.COTW.Success.WithLifespan=[[GREEN]](Call Of The Wild) [[GRAY]]You have summoned a [[GOLD]]{0}[[GRAY]] and it has a duration of [[GOLD]]{1}[[GRAY]] seconds. Taming.Summon.COTW.Limit=[[GREEN]](Call Of The Wild) [[GRAY]]You can only have [[RED]]{0} [[GRAY]]summoned [[GRAY]]{1} pets at the same time. Taming.Summon.COTW.TimeExpired=[[GREEN]](Call Of The Wild) [[GRAY]]Time is up, your [[GOLD]]{0}[[GRAY]] departs. Taming.Summon.COTW.BreedingDisallowed=[[GREEN]](Call Of The Wild) [[RED]]You cannot breed a summoned animal. +Taming.Summon.COTW.NeedMoreItems=[[GREEN]](Call Of The Wild) [[GRAY]]You need [[YELLOW]]{0}[[GRAY]] more [[DARK_AQUA]]{1}[[GRAY]](s) Taming.Summon.Name.Format=[[GOLD]](COTW) [[WHITE]]{0}'s {1} #UNARMED Unarmed.Ability.Bonus.0=Iron Arm Style