From 7c024314b7156a73bf8fc56f4726ccfb8d6268d5 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Fri, 11 Jan 2019 01:52:16 -0800 Subject: [PATCH] Classic mode setting is now UseOldLevelScaling to lessen confusion --- Changelog.txt | 2 +- src/main/java/com/gmail/nossr50/config/Config.java | 2 +- src/main/java/com/gmail/nossr50/mcMMO.java | 2 +- .../com/gmail/nossr50/util/experience/FormulaManager.java | 2 +- src/main/resources/config.yml | 4 +++- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index bd5447a62..a4cfe8679 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -10,7 +10,7 @@ Key: Version 2.1.0 + Prevented exploits involving blocks made from entities (snowmen, etc..) + Added JSON integration to all Skill Commands - + Added config setting to enable or disable classic mcMMO skill scaling + + Added config setting to enable or disable old mcMMO skill scaling (General.UseOldLevelScaling) this is on by default for existing installs + You can now disable specific skills in coreskills.yml without the need for permissions + Added links to mcMMO related websites to various commands + Certain elements of mcMMO's UI have been restyled diff --git a/src/main/java/com/gmail/nossr50/config/Config.java b/src/main/java/com/gmail/nossr50/config/Config.java index e8b35cbd5..a718c5120 100644 --- a/src/main/java/com/gmail/nossr50/config/Config.java +++ b/src/main/java/com/gmail/nossr50/config/Config.java @@ -246,7 +246,7 @@ public class Config extends AutoUpdateConfigLoader { /* General Settings */ //Classic mode will default the value to true if the config file doesn't contain the entry (server is from a previous mcMMO install) - public boolean getClassicMode() { return config.getBoolean("General.Classic_Mode", true); } + public boolean getUseOldLevelScaling() { return config.getBoolean("General.UseOldLevelScaling", true); } //XP needed to level is multiplied by this when using classic mode public int getClassicModeXPFormulaFactor() { return config.getInt("General.Skill_Scaling.Classic_XP_Formula_Factor", 1); } diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index ff78aa608..50dc9c349 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/src/main/java/com/gmail/nossr50/mcMMO.java @@ -92,7 +92,7 @@ public class mcMMO extends JavaPlugin { // XP Event Check private boolean xpEventEnabled; - private boolean classicModeEnabled; + private boolean UseOldLevelScalingEnabled; /* Metadata Values */ public final static String entityMetadataKey = "mcMMO: Spawned Entity"; diff --git a/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java b/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java index ce33b629b..f7611811a 100644 --- a/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java +++ b/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java @@ -27,7 +27,7 @@ public class FormulaManager { public FormulaManager() { /* Setting for Classic Mode (Scales a lot of stuff up by * 10) */ - classicModeEnabled = Config.getInstance().getClassicMode(); + classicModeEnabled = Config.getInstance().getUseOldLevelScaling(); classicModeXPFormulaFactor = Config.getInstance().getClassicModeXPFormulaFactor(); loadFormula(); } diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 85c67133d..f52fa1cec 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -10,7 +10,9 @@ General: Skill_Scaling: # Turning this on will scale mcMMO around 1-1000 with default scaling factor - Classic_Mode: false + # Everything in your config related to skill level requirements, skill level bonuses, etc will be multiplied by 10 when this mode is on + # This change is purely cosmetic, it retains the old feel of mcMMO where you could level up thousands of times + UseOldLevelScaling: true Skill_Scaling: # This is the value that is skill level requirements are multiplied by in Classic Mode (Default is 10) Classic_LevelReq_Factor: 10