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

Rewrote how Arrow Retrieval subskill is handled

Browse Source
This commit is contained in:
nossr50
2019-06-07 01:18:14 -07:00
parent 39b5719e12
commit 80beb92a06
12 changed files with 63 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/gmail/nossr50/config/hocon/experience/ConfigExperienceArchery.java
View File

@@ -6,7 +6,8 @@ import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
@ConfigSerializable
public class ConfigExperienceArchery {
public static final double DISTANCE_MULTIPLIER_DEFAULT = 0.025;
private static final double DISTANCE_MULTIPLIER_DEFAULT = 0.025;
private static final double ARROW_FORCE_XP_MULTIPLIER = 2.0D;
@Setting(value = "Distance-Multiplier", comment = "The distance multiplier is multiplied against the distance an " +
"arrow travels before hitting its target to determine final XP values awarded." +
@@ -16,6 +17,14 @@ public class ConfigExperienceArchery {
"\nDefault value: " + DISTANCE_MULTIPLIER_DEFAULT)
private double distanceMultiplier = DISTANCE_MULTIPLIER_DEFAULT;
@Setting(value = "Arrow-Force-XP-Multiplier", comment = "How much velocity the arrow has after leaving the players bow is used in the XP formula for handing out Archery XP." +
"\nDefault value: "+ARROW_FORCE_XP_MULTIPLIER)
private double forceMultiplier = ARROW_FORCE_XP_MULTIPLIER;
public double getForceMultiplier() {
return forceMultiplier;
}
public double getDistanceMultiplier() {
return distanceMultiplier;
}

13
src/main/java/com/gmail/nossr50/config/hocon/skills/archery/ConfigArchery.java
View File

@@ -7,17 +7,6 @@ import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
@ConfigSerializable
public class ConfigArchery {
/* ARCHERY */
//
// public double getDazeBonusDamage() {
// return getDoubleValue(SKILLS, ARCHERY, DAZE, BONUS_DAMAGE);
// }
//
// public double getForceMultiplier() {
// return getDoubleValue(SKILLS, ARCHERY, FORCE_MULTIPLIER);
// }
@Setting(value = "Daze")
private ConfigArcheryDaze daze = new ConfigArcheryDaze();
@@ -49,6 +38,6 @@ public class ConfigArchery {
}
public double getBonusDamage() {
return daze.getBonusDamage();
return daze.getDazeBonusDamage();
}
}

2
src/main/java/com/gmail/nossr50/config/hocon/skills/archery/ConfigArcheryDaze.java
View File

@@ -30,7 +30,7 @@ public class ConfigArcheryDaze {
return maxBonusLevel;
}
public double getBonusDamage() {
public double getDazeBonusDamage() {
return bonusDamage;
}
}