EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-08-02 20:45:28 +02:00
Code Issues Projects Releases Wiki Activity

Wire up special combat XP multipliers

Browse Source
This commit is contained in:
nossr50
2019-04-30 00:57:50 -07:00
parent 6932abc9d8
commit 06016f4ada
5 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -128,18 +128,6 @@ public class ExperienceConfig extends ConfigValidated {
}*/
/* PVP modifier */
public double getPlayerVersusPlayerXP() {
return getDoubleValue(EXPERIENCE_FORMULA, MULTIPLIER, PVP);
}
/* Spawned Mob modifier */
public double getSpawnedMobXpMultiplier() {
return getDoubleValue(EXPERIENCE_FORMULA, MOBSPAWNERS, MULTIPLIER);
}
public double getBredMobXpMultiplier() {
return getDoubleValue(EXPERIENCE_FORMULA, BREEDING, MULTIPLIER);
}
/* Skill modifiers */
public double getFormulaSkillModifier(PrimarySkillType skill) {
@@ -186,10 +174,6 @@ public class ExperienceConfig extends ConfigValidated {
return getDoubleValue(EXPERIENCE, COMBAT, MULTIPLIER, StringUtils.getEntityConfigName(entity));
}
public double getAnimalsXP() {
return getDoubleValue(EXPERIENCE, COMBAT, MULTIPLIER, ANIMALS);
}
public boolean hasCombatXP(EntityType entity) {
return hasNode(EXPERIENCE, COMBAT, MULTIPLIER, StringUtils.getEntityConfigName(entity));
}

4
src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperience.java
View File

@@ -177,6 +177,10 @@ public class ConfigExperience {
return getConfigExperienceSkills().getSpawnedMobXPMult();
}
public double getPlayerBredMobsXPMult() {
return getExperienceCombat().getPlayerBredMobsXPMult();
}
public double getPVPXPMult() {
return getConfigExperienceSkills().getPVPXPMult();
}

4
src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceCombat.java
View File

@@ -112,4 +112,8 @@ public class ConfigExperienceCombat {
public double getAnimalsXPMult() {
return specialCombatExperienceMap.get("animals");
}
public double getPlayerBredMobsXPMult() {
return specialCombatExperienceMap.get("player-bred-mobs");
}
}

4
src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceSkills.java
View File

@@ -47,6 +47,10 @@ public class ConfigExperienceSkills {
* BOILER PLATE GETTERS
*/
public double getPlayerBredMobsXPMult() {
return experienceCombat.getPlayerBredMobsXPMult();
}
public ConfigExperienceAcrobatics getExperienceAcrobatics() {
return experienceAcrobatics;
}