EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-29 16:46:46 +01:00
Code Issues Projects Releases Wiki Activity

Revert "Fix issue #2464"

Browse Source 
This reverts commit d19b682a55.
This commit is contained in:
bibekaur 2015-12-02 20:45:45 -08:00
parent 90e7aee6d7
commit 1211101265
3 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java
View File

@ -165,8 +165,7 @@ public class ExperienceConfig extends AutoUpdateConfigLoader {
*/ */
/* Curve settings */ /* Curve settings */
public FormulaType getFormulaType() { return FormulaType.getFormulaType(config.getString("Experience_Formula.Curve.DEFAULT")); } public FormulaType getFormulaType() { return FormulaType.getFormulaType(config.getString("Experience_Formula.Curve")); }
public FormulaType getFormulaType(SkillType skill) { return FormulaType.getFormulaType(config.getString("Experience_Formula.Curve." + StringUtils.getCapitalized(skill.toString()))); }
public boolean getCumulativeCurveEnabled() { return config.getBoolean("Experience_Formula.Cumulative_Curve", false); } public boolean getCumulativeCurveEnabled() { return config.getBoolean("Experience_Formula.Cumulative_Curve", false); }
/* Curve values */ /* Curve values */

2
src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java
View File

@ -345,7 +345,7 @@ public class PlayerProfile {
*/ */
public int getXpToLevel(SkillType skillType) { public int getXpToLevel(SkillType skillType) {
int level = (ExperienceConfig.getInstance().getCumulativeCurveEnabled()) ? UserManager.getPlayer(playerName).getPowerLevel() : skills.get(skillType); int level = (ExperienceConfig.getInstance().getCumulativeCurveEnabled()) ? UserManager.getPlayer(playerName).getPowerLevel() : skills.get(skillType);
FormulaType formulaType = ExperienceConfig.getInstance().getFormulaType(skillType); FormulaType formulaType = ExperienceConfig.getInstance().getFormulaType();
return mcMMO.getFormulaManager().getCachedXpToLevel(level, formulaType); return mcMMO.getFormulaManager().getCachedXpToLevel(level, formulaType);
} }

16
src/main/resources/experience.yml
View File

@ -14,21 +14,7 @@ Experience_Formula:
# If an invalid value is entered, this will reset to the default setting, which is LINEAR # If an invalid value is entered, this will reset to the default setting, which is LINEAR
# LINEAR: base + (level * multiplier) # LINEAR: base + (level * multiplier)
# EXPONENTIAL: multiplier * level ^ exponent + base # EXPONENTIAL: multiplier * level ^ exponent + base
Curve: Curve: LINEAR
Swords: LINEAR
Taming: LINEAR
Acrobatics: LINEAR
Excavation: LINEAR
Herbalism: LINEAR
Unarmed: LINEAR
Woodcutting: LINEAR
Mining: LINEAR
Archery: LINEAR
Axes: LINEAR
Repair: LINEAR
Fishing: LINEAR
Alchemy: LINEAR
DEFAULT: LINEAR
# If invalid values are entered mcMMO will not start and print an error in the console # If invalid values are entered mcMMO will not start and print an error in the console
Linear_Values: Linear_Values: