Add missing limit break settings

This commit is contained in:
nossr50 2019-09-23 12:34:00 -07:00
parent 4e2d68908e
commit 9b6e6d7861
7 changed files with 54 additions and 7 deletions

View File

@ -24,7 +24,7 @@ public class ConfigAcrobatics {
return subSkills.getDodge();
}
public double getRollDamageTheshold() {
public double getRollDamageThreshold() {
return getRoll().getDamageTheshold();
}

View File

@ -0,0 +1,17 @@
package com.gmail.nossr50.config.hocon.skills.swords;
import ninja.leaping.configurate.objectmapping.Setting;
import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
@ConfigSerializable
public class ConfigSwordsLimitBreak {
private static final boolean DEFAULT_PVE = false;
@Setting(value = "PVE", comment = "If true, the bonus damage from Limit Break will apply to PVE in addition to PVP." +
"\nDefault value: "+DEFAULT_PVE)
private boolean PVE = DEFAULT_PVE;
public boolean isEnabledForPVE() {
return PVE;
}
}

View File

@ -16,6 +16,9 @@ public class ConfigSwordsSubSkills {
@Setting(value = "Serrated-Strikes")
private ConfigSwordsSerratedStrikes serratedStrikes = new ConfigSwordsSerratedStrikes();
@Setting(value = "Limit-Break")
private ConfigSwordsLimitBreak swordsLimitBreak = new ConfigSwordsLimitBreak();
public ConfigSwordsCounterAttack getCounterAttack() {
return counterAttack;
}
@ -63,4 +66,8 @@ public class ConfigSwordsSubSkills {
public int getRuptureBaseTicks() {
return rupture.getRuptureBaseTicks();
}
public ConfigSwordsLimitBreak getSwordsLimitBreak() {
return swordsLimitBreak;
}
}

View File

@ -10,14 +10,14 @@ public class ConfigUnarmed {
private static final boolean ITEMS_COUNT_AS_UNARMED_DEFAULT = true;
@Setting(value = ConfigConstants.SUB_SKILL_NODE)
private ConfigUnarmedSubskills subskills = new ConfigUnarmedSubskills();
private ConfigUnarmedSubSkills subskills = new ConfigUnarmedSubSkills();
@Setting(value = "Items-Count-As-Unarmed", comment = "Unarmed skills will work even if you are holding an item." +
"\nMost tools are not considered an item, for example pickaxes, tridents, swords, etc won't count as unarmed with this setting enabled." +
"\nDefault value: "+ITEMS_COUNT_AS_UNARMED_DEFAULT)
private boolean doItemsCountAsUnarmed = ITEMS_COUNT_AS_UNARMED_DEFAULT;
public ConfigUnarmedSubskills getSubskills() {
public ConfigUnarmedSubSkills getSubSkills() {
return subskills;
}

View File

@ -0,0 +1,17 @@
package com.gmail.nossr50.config.hocon.skills.unarmed;
import ninja.leaping.configurate.objectmapping.Setting;
import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
@ConfigSerializable
public class ConfigUnarmedLimitBreak {
private static final boolean DEFAULT_PVE = false;
@Setting(value = "PVE", comment = "If true, the bonus damage from Limit Break will apply to PVE in addition to PVP." +
"\nDefault value: "+DEFAULT_PVE)
private boolean PVE = DEFAULT_PVE;
public boolean isEnabledForPVE() {
return PVE;
}
}

View File

@ -4,11 +4,13 @@ import ninja.leaping.configurate.objectmapping.Setting;
import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
@ConfigSerializable
public class ConfigUnarmedSubskills {
public class ConfigUnarmedSubSkills {
@Setting(value = "Disarm")
public ConfigUnarmedDisarm disarm = new ConfigUnarmedDisarm();
public ConfigUnarmedLimitBreak unarmedLimitBreak = new ConfigUnarmedLimitBreak();
public ConfigUnarmedDisarm getDisarm() {
return disarm;
}
@ -16,4 +18,8 @@ public class ConfigUnarmedSubskills {
public boolean isPreventItemTheft() {
return disarm.isPreventItemTheft();
}
public ConfigUnarmedLimitBreak getUnarmedLimitBreak() {
return unarmedLimitBreak;
}
}

View File

@ -201,7 +201,7 @@ public class Roll extends AcrobaticsSubSkill {
return gracefulRollCheck(player, mcMMOPlayer, damage, skillLevel);
}
double modifiedDamage = calculateModifiedRollDamage(damage, pluginRef.getConfigManager().getConfigAcrobatics().getRollDamageTheshold());
double modifiedDamage = calculateModifiedRollDamage(damage, pluginRef.getConfigManager().getConfigAcrobatics().getRollDamageThreshold());
if (!isFatal(player, modifiedDamage)
&& pluginRef.getRandomChanceTools().isActivationSuccessful(SkillActivationType.RANDOM_LINEAR_100_SCALE_WITH_CAP, SubSkillType.ACROBATICS_ROLL, player)) {
@ -237,7 +237,7 @@ public class Roll extends AcrobaticsSubSkill {
* @return the modified event damage if the ability was successful, the original event damage otherwise
*/
private double gracefulRollCheck(Player player, McMMOPlayer mcMMOPlayer, double damage, int skillLevel) {
double modifiedDamage = calculateModifiedRollDamage(damage, pluginRef.getConfigManager().getConfigAcrobatics().getRollDamageTheshold() * 2);
double modifiedDamage = calculateModifiedRollDamage(damage, pluginRef.getConfigManager().getConfigAcrobatics().getRollDamageThreshold() * 2);
RandomChanceSkill rcs = new RandomChanceSkill(player, subSkillType);
rcs.setSkillLevel(rcs.getSkillLevel() * 2); //Double the effective odds
@ -395,7 +395,7 @@ public class Roll extends AcrobaticsSubSkill {
//Chance Stat Calculations
rollChanceHalfMax = pluginRef.getRandomChanceTools().getRandomChanceExecutionChance(rollHalfMaxSkill);
graceChanceHalfMax = pluginRef.getRandomChanceTools().getRandomChanceExecutionChance(rollGraceHalfMaxSkill);
damageThreshold = pluginRef.getConfigManager().getConfigAcrobatics().getRollDamageTheshold();
damageThreshold = pluginRef.getConfigManager().getConfigAcrobatics().getRollDamageThreshold();
chancePerLevel = pluginRef.getRandomChanceTools().getRandomChanceExecutionChance(rollOneSkillLevel);