diff --git a/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigLevelEarlyGameBoost.java b/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigLevelEarlyGameBoost.java index d35e9b7c3..83b2f75b1 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigLevelEarlyGameBoost.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigLevelEarlyGameBoost.java @@ -7,22 +7,11 @@ import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; public class ConfigLevelEarlyGameBoost { private static final boolean EARLY_GAME_BOOST_DEFAULT = true; - private static final double BOOST_MULTIPLIER_DEFAULT = 0.05D; @Setting(value = "Enabled", comment = "If set to true, the early game XP boost will be applied." + "\nDefault value: " + EARLY_GAME_BOOST_DEFAULT) private boolean enableEarlyGameBoost = EARLY_GAME_BOOST_DEFAULT; - @Setting(value = "Max-Level-Percentage", comment = "This value is multiplied by a skills level cap to see determine when to stop giving a boost." + - "\nLevels in mcMMO are not capped by default, so if the skill has no set level cap it will instead use the value 100 or 1000 (if in RetroMode)" + - "\nWith default settings, this will result in the first 5 levels (or 50 in Retro) being boosted" + - "\nDefault value: " + BOOST_MULTIPLIER_DEFAULT) - private double earlyGameBoostMultiplier = BOOST_MULTIPLIER_DEFAULT; - - public double getEarlyGameBoostMultiplier() { - return earlyGameBoostMultiplier; - } - public boolean isEnableEarlyGameBoost() { return enableEarlyGameBoost; } diff --git a/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigLeveling.java b/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigLeveling.java index 053dca8a5..b2bfd0316 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigLeveling.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigLeveling.java @@ -118,10 +118,6 @@ public class ConfigLeveling { return getConfigExperienceFormula().isCumulativeCurveEnabled(); } - public double getEarlyGameBoostMultiplier() { - return earlyGameBoost.getEarlyGameBoostMultiplier(); - } - public boolean isEnableEarlyGameBoost() { return earlyGameBoost.isEnableEarlyGameBoost(); } diff --git a/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigSectionLevelScaling.java b/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigSectionLevelScaling.java index 87fa41f9e..718067a61 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigSectionLevelScaling.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/playerleveling/ConfigSectionLevelScaling.java @@ -7,7 +7,7 @@ import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; public class ConfigSectionLevelScaling { /* DEFAULT VALUES */ - public static final boolean USE_RETRO_MODE_DEFAULT = false; + public static final boolean USE_RETRO_MODE_DEFAULT = true; /* * CONFIG NODES @@ -18,8 +18,6 @@ public class ConfigSectionLevelScaling { "\nIf set to false, Standard Scaling is used instead (1-100 Level Scaling)") private boolean useRetroMode = USE_RETRO_MODE_DEFAULT; - - /* * GETTER BOILERPLATE */ diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksAcrobatics.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksAcrobatics.java index dbf3bee5b..d70d14a03 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksAcrobatics.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksAcrobatics.java @@ -7,7 +7,7 @@ import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; public class ConfigRanksAcrobatics { @Setting(value = "Dodge") - private SkillRankProperty dodgeRanks = new SkillRankProperty(2); + private SkillRankProperty dodgeRanks = new SkillRankProperty(1); public SkillRankProperty getDodgeRanks() { return dodgeRanks; diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksArchery.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksArchery.java index d7d09cea7..c8d8ea28d 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksArchery.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksArchery.java @@ -10,10 +10,10 @@ public class ConfigRanksArchery { private SkillRankProperty limitBreak = new SkillRankProperty(10, 20, 30, 40, 50, 60, 70, 80, 90, 100); @Setting(value = "Arrow-Retrieval") - private SkillRankProperty arrowRetrieval = new SkillRankProperty(2); + private SkillRankProperty arrowRetrieval = new SkillRankProperty(1); @Setting(value = "Skill-Shot") - private SkillRankProperty skillShot = new SkillRankProperty(5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95, 100); + private SkillRankProperty skillShot = new SkillRankProperty(1, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95, 100); public SkillRankProperty getLimitBreak() { return limitBreak; diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksAxes.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksAxes.java index e34e627ff..47eff4ce7 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksAxes.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksAxes.java @@ -13,13 +13,13 @@ public class ConfigRanksAxes { private SkillRankProperty skullSplitter = new SkillRankProperty(5); @Setting(value = "Critical-Strikes") - private SkillRankProperty criticalStrikes = new SkillRankProperty(2); + private SkillRankProperty criticalStrikes = new SkillRankProperty(1); @Setting(value = "Greater-Impact") private SkillRankProperty greaterImpact = new SkillRankProperty(25); @Setting(value = "Armor-Impact") - private SkillRankProperty armorImpact = new SkillRankProperty(5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95, 100); + private SkillRankProperty armorImpact = new SkillRankProperty(1, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 65, 70, 75, 80, 85, 90, 95, 100); @Setting(value = "Axe-Mastery") private SkillRankProperty axeMastery = new SkillRankProperty(5, 10, 15, 20); diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksExcavation.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksExcavation.java index 06cbd7dd5..d47794c37 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksExcavation.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksExcavation.java @@ -10,7 +10,7 @@ public class ConfigRanksExcavation { private SkillRankProperty gigaDrillBreaker = new SkillRankProperty(5); @Setting(value = "Archaeology") - private SkillRankProperty archaeology = new SkillRankProperty(5, 25, 35, 50, 65, 75, 85, 100); + private SkillRankProperty archaeology = new SkillRankProperty(1, 25, 35, 50, 65, 75, 85, 100); public SkillRankProperty getGigaDrillBreaker() { return gigaDrillBreaker; diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksFishing.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksFishing.java index 886f53f05..d65eaf8be 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksFishing.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksFishing.java @@ -22,7 +22,7 @@ public class ConfigRanksFishing { private SkillRankProperty fishermansDiet = new SkillRankProperty(20, 40, 60, 80, 100); @Setting(value = "Treasure-Hunter") - private SkillRankProperty treasureHunter = new SkillRankProperty(10, 25, 35, 50, 65, 75, 85, 100); + private SkillRankProperty treasureHunter = new SkillRankProperty(1, 25, 35, 50, 65, 75, 85, 100); @Setting(value = "Inner-Peace") private SkillRankProperty innerPeace = new SkillRankProperty(33, 66, 100); diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksHerbalism.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksHerbalism.java index 4c999870e..7a366b89b 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksHerbalism.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksHerbalism.java @@ -15,6 +15,9 @@ public class ConfigRanksHerbalism { @Setting(value = "Farmers-Diet") private SkillRankProperty farmersDiet = new SkillRankProperty(20, 40, 60, 80, 100); + @Setting(value = "Double-Drops") + private SkillRankProperty doubleDrops = new SkillRankProperty(1); + public SkillRankProperty getGreenTerra() { return greenTerra; } @@ -26,4 +29,8 @@ public class ConfigRanksHerbalism { public SkillRankProperty getFarmersDiet() { return farmersDiet; } + + public SkillRankProperty getDoubleDrops() { + return doubleDrops; + } } diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksMining.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksMining.java index e99fef838..ddbbade3d 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksMining.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksMining.java @@ -15,6 +15,9 @@ public class ConfigRanksMining { @Setting(value = "Demolitions-Expertise") private SkillRankProperty demolitionsExpertise = new SkillRankProperty(10); + @Setting(value = "Double-Drops") + private SkillRankProperty doubleDrops = new SkillRankProperty(1); + @Setting(value = "Blast-Mining") private SkillRankProperty blastMining = new SkillRankProperty(10, 25, 35, 50, 65, 75, 85, 100); @@ -30,6 +33,10 @@ public class ConfigRanksMining { return demolitionsExpertise; } + public SkillRankProperty getDoubleDrops() { + return doubleDrops; + } + public SkillRankProperty getBlastMining() { return blastMining; } diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksRepair.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksRepair.java index ec7ab2f1c..06f9326ad 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksRepair.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksRepair.java @@ -10,7 +10,7 @@ public class ConfigRanksRepair { private SkillRankProperty arcaneForging = new SkillRankProperty(10, 25, 35, 50, 65, 75, 85, 100); @Setting(value = "Repair-Mastery") - private SkillRankProperty repairMastery = new SkillRankProperty(75); + private SkillRankProperty repairMastery = new SkillRankProperty(1); @Setting(value = "Super-Repair") private SkillRankProperty superRepair = new SkillRankProperty(40); diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksSalvage.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksSalvage.java index 62a99117b..ffc972470 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksSalvage.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksSalvage.java @@ -7,7 +7,7 @@ import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; public class ConfigRanksSalvage { @Setting(value = "Scrap-Collector") - private SkillRankProperty scrapCollector = new SkillRankProperty(2, 10, 15, 20, 25, 30, 35, 40); + private SkillRankProperty scrapCollector = new SkillRankProperty(1, 10, 15, 20, 25, 30, 35, 40); @Setting(value = "Arcane-Salvage") private SkillRankProperty arcaneSalvage = new SkillRankProperty(10, 25, 35, 50, 65, 75, 85, 100); diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksSwords.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksSwords.java index f86f27d84..a7eafdeb2 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksSwords.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksSwords.java @@ -16,7 +16,7 @@ public class ConfigRanksSwords { private SkillRankProperty counterAttack = new SkillRankProperty(20); @Setting(value = "Rupture") - private SkillRankProperty rupture = new SkillRankProperty(5, 15, 75, 90); + private SkillRankProperty rupture = new SkillRankProperty(1, 15, 75, 90); @Setting(value = "Serrated-Strikes") private SkillRankProperty serratedStrikes = new SkillRankProperty(5); diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksTaming.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksTaming.java index 7622f0d0e..fb8296adc 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksTaming.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksTaming.java @@ -7,13 +7,13 @@ import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable; public class ConfigRanksTaming { @Setting(value = "Beast-Lore") - private SkillRankProperty beastLore = new SkillRankProperty(2); + private SkillRankProperty beastLore = new SkillRankProperty(1); @Setting(value = "Gore") private SkillRankProperty gore = new SkillRankProperty(15); @Setting(value = "Call-Of-The-Wild") - private SkillRankProperty callOfTheWild = new SkillRankProperty(5); + private SkillRankProperty callOfTheWild = new SkillRankProperty(1); @Setting(value = "Pummel") private SkillRankProperty pummel = new SkillRankProperty(20); diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksUnarmed.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksUnarmed.java index 71cf03bc8..ec252dd25 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksUnarmed.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksUnarmed.java @@ -22,7 +22,7 @@ public class ConfigRanksUnarmed { private SkillRankProperty ironGrip = new SkillRankProperty(60); @Setting(value = "Iron-Arm-Style") - private SkillRankProperty ironArmStyle = new SkillRankProperty(5, 25, 50, 75, 100); + private SkillRankProperty ironArmStyle = new SkillRankProperty(1, 25, 50, 75, 100); public SkillRankProperty getLimitBreak() { return limitBreak; diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksWoodcutting.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksWoodcutting.java index 9a13d656b..d52ba6c0d 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksWoodcutting.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/ConfigRanksWoodcutting.java @@ -10,7 +10,7 @@ public class ConfigRanksWoodcutting { private SkillRankProperty treeFeller = new SkillRankProperty(5); @Setting(value = "Harvest-Lumber") - private SkillRankProperty harvestLumber = new SkillRankProperty(5); + private SkillRankProperty harvestLumber = new SkillRankProperty(1); @Setting(value = "Leaf-Blower") private SkillRankProperty leafBlower = new SkillRankProperty(30); diff --git a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/SkillRankProperty.java b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/SkillRankProperty.java index 4e568420d..eebad9da9 100644 --- a/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/SkillRankProperty.java +++ b/src/main/java/com/gmail/nossr50/config/hocon/skills/ranks/SkillRankProperty.java @@ -16,12 +16,7 @@ public class SkillRankProperty implements SkillProperty { for(int x = 0; x < rankDefinitions.length; x++) { int curRank = x+1; - //Avoid negative numbers - if(rankDefinitions[x] < 0) { - standardRanks.put(curRank, 0); - } else { - standardRanks.put(curRank, rankDefinitions[x]); - } + addStandardAndRetroRank(curRank, rankDefinitions[x]); } } @@ -31,13 +26,38 @@ public class SkillRankProperty implements SkillProperty { } /** - * Convenience method to add Standard and Retro at the same time, shouldn't be used for anything other than the default values since admins may only edit Retro values and not touch Standard ones - * @param curRank - * @param rankUnlockLevel + * Convenience method to add Standard and Retro at the same time for default initialization of values + * Only requires standard values be passed + * @param curRank the rank to fill in the value for + * @param standardValue the value of the rank in Standard */ - private void addStandardAndRetroRank(int curRank, int rankUnlockLevel) { - standardRanks.put(curRank, rankUnlockLevel); - retroRanks.put(curRank, rankUnlockLevel * 10); + private void addStandardAndRetroRank(int curRank, int standardValue) { + //Retro will be equal to standards rank requirement multiplied by 10 unless that value is 1, in which case it will also be 1 + int retroValue = standardValue == 1 ? 1 : standardValue * 10; + + //Avoid negative numbers + if(standardValue < 0) { + standardRanks.put(curRank, 0); + retroRanks.put(curRank, 0); + } else { + standardRanks.put(curRank, standardValue); + retroRanks.put(curRank, retroValue); + } + } + + /** + * Convenience method to add Standard and Retro at the same time + * @param curRank the rank to fill in the value for + * @param standardValue the value of the rank in Standard + * @param retroValue the value of the rank in Retro + */ + private void addStandardAndRetroRank(int curRank, int standardValue, int retroValue) { + //Avoid negative numbers + standardValue = Math.max(0, standardValue); + retroValue = Math.max(0, retroValue); + + standardRanks.put(curRank, standardValue); + retroRanks.put(curRank, retroValue); } private void initRankMaps() {