From 421d6cff3bcfefd82f276b3dc9d4f7804b769041 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Mon, 24 Jun 2019 22:48:22 -0700 Subject: [PATCH] Tweak archaeology numbers --- Changelog.txt | 1 + .../gmail/nossr50/commands/skills/ExcavationCommand.java | 6 +++++- .../nossr50/skills/excavation/ExcavationManager.java | 2 +- src/main/resources/locale/locale_en_US.properties | 8 ++++---- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index e25e31c3f..0ff87395a 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -10,6 +10,7 @@ Version 2.1.89 Tweaked the locale string 'Excavation.SubSkill.Archaeology.Description' Added locale string 'Excavation.SubSkill.Archaeology.Stat' Added locale string 'Excavation.SubSkill.Archaeology.Stat.Extra' + Tweaked the locale string 'Fishing.SubSkill.MasterAngler.Stat' When using WorldGuard (WG) with mcMMO, mcMMO now examines WG more carefully to determine if it is a compatible version or not, see the notes. Keep in mind WG is optional and not needed to run mcMMO. Fixed a bug that could result in Tree Feller failing to remove parts of a tree in snowy biomes. (This fix won't apply retroactively to old trees, see the notes) diff --git a/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java b/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java index 1228c3387..2d9093311 100644 --- a/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java +++ b/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java @@ -55,7 +55,11 @@ public class ExcavationCommand extends SkillCommand { } if(canUseSubskill(player, SubSkillType.EXCAVATION_ARCHAEOLOGY)) { - messages.add(getStatMessage(SubSkillType.EXCAVATION_ARCHAEOLOGY, percent.format(excavationManager.getArchaelogyExperienceOrbChance()), String.valueOf(excavationManager.getExperienceOrbsReward()))); + messages.add(getStatMessage(false, false, SubSkillType.EXCAVATION_ARCHAEOLOGY, + percent.format(excavationManager.getArchaelogyExperienceOrbChance() / 100.0D))); + messages.add(getStatMessage(true, false, SubSkillType.EXCAVATION_ARCHAEOLOGY, + String.valueOf(excavationManager.getExperienceOrbsReward()))); + } return messages; diff --git a/src/main/java/com/gmail/nossr50/skills/excavation/ExcavationManager.java b/src/main/java/com/gmail/nossr50/skills/excavation/ExcavationManager.java index 65036d27a..994d84866 100644 --- a/src/main/java/com/gmail/nossr50/skills/excavation/ExcavationManager.java +++ b/src/main/java/com/gmail/nossr50/skills/excavation/ExcavationManager.java @@ -61,7 +61,7 @@ public class ExcavationManager extends SkillManager { } public int getExperienceOrbsReward() { - return 5 * getArchaeologyRank(); + return 1 * getArchaeologyRank(); } public double getArchaelogyExperienceOrbChance() { diff --git a/src/main/resources/locale/locale_en_US.properties b/src/main/resources/locale/locale_en_US.properties index 7c1bd2e5e..1e1d0c5b0 100644 --- a/src/main/resources/locale/locale_en_US.properties +++ b/src/main/resources/locale/locale_en_US.properties @@ -217,9 +217,9 @@ Excavation.SubSkill.GigaDrillBreaker.Name=Giga Drill Breaker Excavation.SubSkill.GigaDrillBreaker.Description=3x Drop Rate, 3x EXP, +Speed Excavation.SubSkill.GigaDrillBreaker.Stat=Giga Drill Breaker Duration Excavation.SubSkill.Archaeology.Name=Archaeology -Excavation.SubSkill.Archaeology.Description=Unearth the secrets of the land! Find treasure and experience orbs! -Excavation.SubSkill.Archaeology.Stat=Archaelogy Experience Orb Rate -Excavation.SubSkill.Archaeology.Stat.Extra={0}% chance to find {1} experience orbs alongside treasure +Excavation.SubSkill.Archaeology.Description=Unearth the secrets of the land! High skill levels increase your odds of finding experience orbs when you find treasure! +Excavation.SubSkill.Archaeology.Stat=Archaelogy Experience Orb Chance +Excavation.SubSkill.Archaeology.Stat.Extra=Archaeoloy Experience Orb Amount Excavation.Listener=Excavation: Excavation.SkillName=EXCAVATION Excavation.Skills.GigaDrillBreaker.Off=**Giga Drill Breaker has worn off** @@ -251,7 +251,7 @@ Fishing.SubSkill.FishermansDiet.Description=Improves hunger restored from fished Fishing.SubSkill.FishermansDiet.Stat=Fisherman's Diet:[[GREEN]] Rank {0} Fishing.SubSkill.MasterAngler.Name=Master Angler Fishing.SubSkill.MasterAngler.Description=Improves chance of getting a bite while fishing -Fishing.SubSkill.MasterAngler.Stat=Added Bite Chance at your current location: [[GREEN]]+[[YELLOW]]{0} +Fishing.SubSkill.MasterAngler.Stat=Added Bite Chance at your current location: [[GREEN]]+{0} Fishing.SubSkill.IceFishing.Name=Ice Fishing Fishing.SubSkill.IceFishing.Description=Allows you to fish in icy biomes Fishing.SubSkill.IceFishing.Stat=Ice Fishing