diff --git a/Changelog.txt b/Changelog.txt index 0f25258b0..09aeae03d 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -9,6 +9,8 @@ Key: Version 2.1.4 Fixed a bug where Alchemy didn't gain XP + Fixed a bug where Archery gained XP from mob spawned entities + Fixed Styling for the /salvage command Temporarily disabled Flux Mining Removed XP from entities that target endermite to prevent easy exploitation (Credits to TheBentoBox for the tip!) [Can be turned off in experience.yml] Fixed a bug where static chance skills like Arcane Salvage were using incorrect calculations for success diff --git a/src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java index 99ebb1f8c..7577c4c54 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java @@ -40,11 +40,14 @@ public class SalvageCommand extends SkillCommand { SalvageManager salvageManager = UserManager.getPlayer(player).getSalvageManager(); if (canAdvancedSalvage) { - messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Salvage.Ability.Bonus.0"), LocaleLoader.getString("Salvage.Ability.Bonus.1", salvageManager.getSalvageableAmount()))); + messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Salvage.Ability.Bonus.0"), + LocaleLoader.getString("Salvage.Ability.Bonus.1", salvageManager.getSalvageableAmount()))); } if (canArcaneSalvage) { - messages.add(LocaleLoader.getString("Salvage.Arcane.Rank", salvageManager.getArcaneSalvageRank(), RankUtils.getHighestRank(SubSkillType.SALVAGE_ARCANE_SALVAGE))); + messages.add(getStatMessage(false, true, SubSkillType.SALVAGE_ARCANE_SALVAGE, + String.valueOf(salvageManager.getArcaneSalvageRank()), + String.valueOf(RankUtils.getHighestRank(SubSkillType.SALVAGE_ARCANE_SALVAGE)))); if (Salvage.arcaneSalvageEnchantLoss) { messages.add(LocaleLoader.getString("Ability.Generic.Template", LocaleLoader.getString("Salvage.Arcane.ExtractFull"), percent.format(salvageManager.getExtractFullEnchantChance() / 100))); diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties index a49f5053f..068fd4054 100644 --- a/src/main/resources/locale/locale_en_US.properties +++ b/src/main/resources/locale/locale_en_US.properties @@ -364,10 +364,10 @@ Salvage.SubSkill.AdvancedSalvage.Name=Advanced Salvage Salvage.SubSkill.AdvancedSalvage.Description=Salvage damaged items Salvage.SubSkill.ArcaneSalvage.Name=Arcane Salvaging Salvage.SubSkill.ArcaneSalvage.Description=Extract enchantments from items +Salvage.SubSkill.ArcaneSalvage.Stat=Arcane Salvaging: [[YELLOW]]Rank {0}/{1} Salvage.Ability.Locked.0=LOCKED UNTIL {0}+ SKILL (ADVANCED SALVAGE) Salvage.Ability.Bonus.0=Advanced Salvage Salvage.Ability.Bonus.1={0} Max Materials Recovered from Salvaging -Salvage.Arcane.Rank=Arcane Salvaging: [[YELLOW]]Rank {0}/{1} Salvage.Arcane.ExtractFull=[[GRAY]]AS Full-Enchant Chance Salvage.Arcane.ExtractPartial=[[GRAY]]AS Partial-Enchant Chance Salvage.Skills.Success=[[GREEN]]Item salvaged!