Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-12-26 18:47:57 +01:00
Code Issues Projects Releases Wiki Activity

Fixing styling on Swords

Browse Source
This commit is contained in:
nossr50 2019-01-21 12:41:31 -08:00
parent ea0ad38fec
commit f30875ac4c
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java
View File

@ -89,17 +89,26 @@ public class SwordsCommand extends SkillCommand {
List<String> messages = new ArrayList<String>(); List<String> messages = new ArrayList<String>();
if (canCounter) { if (canCounter) {
messages.add(LocaleLoader.getString("Swords.Combat.Counter.Chance", counterChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", counterChanceLucky) : "")); messages.add(getStatMessage(SubSkillType.SWORDS_COUNTER_ATTACK, counterChance)
+ (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", counterChanceLucky) : ""));
//messages.add(LocaleLoader.getString("Swords.Combat.Counter.Chance", counterChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", counterChanceLucky) : ""));
} }
if (canBleed) { if (canBleed) {
messages.add(LocaleLoader.getString("Swords.Combat.Bleed.Length", bleedLength)); messages.add(getStatMessage(SubSkillType.SWORDS_BLEED, bleedChance)
+ (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", bleedChanceLucky) : ""));
messages.add(getStatMessage(true, true, SubSkillType.SWORDS_BLEED, String.valueOf(bleedLength)));
//messages.add(LocaleLoader.getString("Swords.Combat.Bleed.Length", bleedLength));
messages.add(LocaleLoader.getString("Swords.Combat.Bleed.Note")); messages.add(LocaleLoader.getString("Swords.Combat.Bleed.Note"));
messages.add(LocaleLoader.getString("Swords.Combat.Bleed.Chance", bleedChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", bleedChanceLucky) : "")); //messages.add(LocaleLoader.getString("Swords.Combat.Bleed.Chance", bleedChance) + (isLucky ? LocaleLoader.getString("Perks.Lucky.Bonus", bleedChanceLucky) : ""));
} }
if (canSerratedStrike) { if (canSerratedStrike) {
messages.add(LocaleLoader.getString("Swords.SS.Length", serratedStrikesLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", serratedStrikesLengthEndurance) : "")); messages.add(getStatMessage(SubSkillType.SWORDS_SERRATED_STRIKES, serratedStrikesLength)
+ (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", serratedStrikesLengthEndurance) : ""));
//messages.add(LocaleLoader.getString("Swords.SS.Length", serratedStrikesLength) + (hasEndurance ? LocaleLoader.getString("Perks.ActivationTime.Bonus", serratedStrikesLengthEndurance) : ""));
} }
return messages; return messages;

12
src/main/resources/locale/locale_en_US.properties
View File

@ -384,24 +384,25 @@ Anvil.Unbreakable=This item is unbreakable!
#SWORDS #SWORDS
Swords.Ability.Lower=[[GRAY]]You lower your sword. Swords.Ability.Lower=[[GRAY]]You lower your sword.
Swords.Ability.Ready=[[DARK_AQUA]]You [[GOLD]]ready[[DARK_AQUA]] your Sword. Swords.Ability.Ready=[[DARK_AQUA]]You [[GOLD]]ready[[DARK_AQUA]] your Sword.
Swords.Combat.Bleed.Chance=Bleed Chance: [[YELLOW]]{0}
Swords.Combat.Bleed.Length=Bleed Length: [[YELLOW]]{0} ticks
Swords.Combat.Bleed.Note=[[GRAY]]NOTE: [[YELLOW]]1 Tick happens every 2 seconds Swords.Combat.Bleed.Note=[[GRAY]]NOTE: [[YELLOW]]1 Tick happens every 2 seconds
Swords.Combat.Bleeding.Started=[[DARK_RED]] You're bleeding! Swords.Combat.Bleeding.Started=[[DARK_RED]] You're bleeding!
Swords.Combat.Bleeding.Stopped=[[GRAY]]The bleeding has [[GREEN]]stopped[[GRAY]]! Swords.Combat.Bleeding.Stopped=[[GRAY]]The bleeding has [[GREEN]]stopped[[GRAY]]!
Swords.Combat.Bleeding=[[GREEN]]**ENEMY BLEEDING** Swords.Combat.Bleeding=[[GREEN]]**ENEMY BLEEDING**
Swords.Combat.Counter.Chance=Counter Attack Chance: [[YELLOW]]{0}
Swords.Combat.Counter.Hit=[[DARK_RED]]Hit with a counter-attack! Swords.Combat.Counter.Hit=[[DARK_RED]]Hit with a counter-attack!
Swords.Combat.Countered=[[GREEN]]**COUNTER-ATTACKED** Swords.Combat.Countered=[[GREEN]]**COUNTER-ATTACKED**
Swords.Combat.SS.Struck=[[DARK_RED]]Struck by SERRATED STRIKES! Swords.Combat.SS.Struck=[[DARK_RED]]Struck by SERRATED STRIKES!
Swords.SubSkill.CounterAttack.Name=Counter Attack Swords.SubSkill.CounterAttack.Name=Counter Attack
Swords.SubSkill.CounterAttack.Description=Reflect {0} of damage taken while blocking Swords.SubSkill.CounterAttack.Description=Reflect {0} of damage taken while blocking
Swords.SubSkill.CounterAttack.Stat=Counter Attack Chance
Swords.SubSkill.SerratedStrikes.Name=Serrated Strikes Swords.SubSkill.SerratedStrikes.Name=Serrated Strikes
Swords.SubSkill.SerratedStrikes.Description={0} DMG AoE, Bleed+ AoE Swords.SubSkill.SerratedStrikes.Description={0} DMG AoE, Bleed+ AoE
Swords.Effect.4=Serrated Strikes Bleed+ Swords.SubSkill.SerratedStrikes.Stat=Serrated Strikes Length
Swords.Effect.5={0} Tick Bleed
Swords.SubSkill.Bleed.Name=Bleed Swords.SubSkill.Bleed.Name=Bleed
Swords.SubSkill.Bleed.Description=Apply a bleed DoT Swords.SubSkill.Bleed.Description=Apply a bleed DoT
Swords.SubSkill.Bleed.Stat=Bleed Chance
Swords.SubSkill.Bleed.Stat.Extra=Bleed Length: [[GREEN]]{0} ticks
Swords.Effect.4=Serrated Strikes Bleed+
Swords.Effect.5={0} Tick Bleed
Swords.Listener=Swords: Swords.Listener=Swords:
Swords.SkillName=SWORDS Swords.SkillName=SWORDS
Swords.Skills.SS.Off=**Serrated Strikes has worn off** Swords.Skills.SS.Off=**Serrated Strikes has worn off**
@ -409,7 +410,6 @@ Swords.Skills.SS.On=[[GREEN]]**SERRATED STRIKES ACTIVATED**
Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed! Swords.Skills.SS.Refresh=[[GREEN]]Your [[YELLOW]]Serrated Strikes [[GREEN]]ability is refreshed!
Swords.Skills.SS.Other.Off=Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0} Swords.Skills.SS.Other.Off=Serrated Strikes[[GREEN]] has worn off for [[YELLOW]]{0}
Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes! Swords.Skills.SS.Other.On=[[GREEN]]{0}[[DARK_GREEN]] has used [[RED]]Serrated Strikes!
Swords.SS.Length=Serrated Strikes Length: [[YELLOW]]{0}s
#TAMING #TAMING
Taming.Ability.Bonus.0=Environmentally Aware Taming.Ability.Bonus.0=Environmentally Aware
Taming.Ability.Bonus.1=Wolves avoid danger Taming.Ability.Bonus.1=Wolves avoid danger