diff --git a/Changelog.txt b/Changelog.txt index 5b4570e45..c0611ebe3 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -37,6 +37,7 @@ Version 1.4.00-dev ! Major refactoring - please take note, this WILL break any mcMMO-related plugin not properly hooking into the API. ! Changed the way party commands work, use /party ? to check how to use the new commands ! Changed McMMOChatEvent to contain the plugin that the event originated from. + ! Changed Excavation to have individual XP values for each block type, rather than a base XP value. Version 1.3.14 + Added new Hylian Luck skill to Herbalism. diff --git a/src/main/java/com/gmail/nossr50/config/Config.java b/src/main/java/com/gmail/nossr50/config/Config.java index 3f472c514..5c56ea62f 100644 --- a/src/main/java/com/gmail/nossr50/config/Config.java +++ b/src/main/java/com/gmail/nossr50/config/Config.java @@ -153,7 +153,13 @@ public class Config extends ConfigLoader { public boolean getWoodcuttingRequiresTool() { return config.getBoolean("Skills.Woodcutting.Requires_Axe", true); } /* Excavation */ - public int getExcavationBaseXP() { return config.getInt("Experience.Excavation.Base", 40); } + public int getExcavationClayXP() { return config.getInt("Experience.Excavation.Clay", 40); } + public int getExcavationDirtXP() { return config.getInt("Experience.Excavation.Dirt", 40); } + public int getExcavationGrassXP() { return config.getInt("Experience.Excavation.Grass", 40); } + public int getExcavationGravelXP() { return config.getInt("Experience.Excavation.Gravel", 40); } + public int getExcavationMycelXP() { return config.getInt("Experience.Excavation.Mycel", 40); } + public int getExcavationSandXP() { return config.getInt("Experience.Excavation.Sand", 40); } + public int getExcavationSoulSandXP() { return config.getInt("Experience.Excavation.SoulSand", 40); } /* Fishing */ public int getFishingBaseXP() { return config.getInt("Experience.Fishing.Base", 800); } diff --git a/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java b/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java index c883c8add..1e0cd53fe 100644 --- a/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java +++ b/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java @@ -56,7 +56,39 @@ public class Excavation { xp = ModChecks.getCustomBlock(block).getXpGain(); } else { - xp = Config.getInstance().getExcavationBaseXP(); + switch (type) { + case CLAY: + xp = Config.getInstance().getExcavationClayXP(); + break; + + case DIRT: + xp = Config.getInstance().getExcavationDirtXP(); + break; + + case GRASS: + xp = Config.getInstance().getExcavationGrassXP(); + break; + + case GRAVEL: + xp = Config.getInstance().getExcavationGravelXP(); + break; + + case MYCEL: + xp = Config.getInstance().getExcavationMycelXP(); + break; + + case SAND: + xp = Config.getInstance().getExcavationSandXP(); + break; + + case SOUL_SAND: + xp = Config.getInstance().getExcavationSoulSandXP(); + break; + + default: + xp = 0; + break; + } } if (Permissions.excavationTreasures(player)) { diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 71be14608..12732d064 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -235,7 +235,13 @@ Experience: Fishing: Base: 800 Excavation: - Base: 40 + Clay: 40 + Dirt: 40 + Grass: 40 + Gravel: 40 + Mycel: 40 + Sand: 40 + SoulSand: 40 Woodcutting: Oak: 70 Spruce: 80