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

Steel Arm Style can now be customized in advanced.yml

Browse Source
This commit is contained in:
nossr50 2020-08-25 16:28:21 -07:00
parent e4c5a3b8ee
commit 419a810a1e
4 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changelog.txt
View File

@ -1,4 +1,5 @@
Version 2.1.144
Steel Arm Style damage is now customizable in advanced.yml (make sure to set override to true)
Fixed a bug where Deflect worked against non-arrow projectiles
Fixed a bug where Deflect was checked twice, resulting in two chances to deflect effectively
Fixed a bug where Roll wouldn't award XP when fall height was over a certain amount
@ -9,6 +10,7 @@ Version 2.1.144
NOTES:
I seem to consistently find old bugs in mcMMO, this deflect bug where it was checked twice, who knows how many years its been in mcMMO, I didn't check but its probably between 5-7.
I was waiting to make Steel Arm Customizable for the config update (due in the future), but enough people ask for it that I decided to do the extra work to put it into 2.1.XX
Version 2.1.143
mcMMO now tracks super ability boosted items through persistent metadata

5
src/main/java/com/gmail/nossr50/config/AdvancedConfig.java
View File

@ -981,6 +981,11 @@ public class AdvancedConfig extends AutoUpdateConfigLoader {
/* UNARMED */
public boolean isSteelArmDamageCustom() { return config.getBoolean("Skills.Unarmed.SteelArmStyle.Damage_Override", false); }
public double getSteelArmOverride(int rank, double def) {
String key = "Rank_" + rank;
return config.getDouble("Skills.Unarmed.SteelArmStyle.Override." + key, def);
}
public boolean getDisarmProtected() { return config.getBoolean("Skills.Unarmed.Disarm.AntiTheft", false); }
/* WOODCUTTING */

10
src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java
View File

@ -156,12 +156,20 @@ public class UnarmedManager extends SkillManager {
public double getSteelArmStyleDamage() {
double rank = RankUtils.getRank(getPlayer(), SubSkillType.UNARMED_STEEL_ARM_STYLE);
double bonus = 0;
if(rank >= 18)
bonus = 1 + rank - 18;
return bonus + 0.5 + (rank / 2);
double finalBonus = bonus + 0.5 + (rank / 2);
if(AdvancedConfig.getInstance().isSteelArmDamageCustom()) {
return AdvancedConfig.getInstance().getSteelArmOverride(RankUtils.getRank(getPlayer(), SubSkillType.UNARMED_STEEL_ARM_STYLE), finalBonus);
} else {
return finalBonus;
}
}
/**

25
src/main/resources/advanced.yml
View File

@ -543,11 +543,32 @@ Skills:
Standard: 100
RetroMode: 1000
IronArmStyle:
SteelArmStyle:
# BonusMin: Minimum bonus damage for unarmed
# BonusMax: Maximum bonus damage for unarmed
# IncreaseLevel: Bonus damage increases every increase level
IncreaseLevel: 10
Damage_Override: false
Override:
Rank_1: 1
Rank_2: 1.5
Rank_3: 2.0
Rank_4: 2.5
Rank_5: 3.0
Rank_6: 3.5
Rank_7: 4.0
Rank_8: 4.5
Rank_9: 5.0
Rank_10: 5.5
Rank_11: 6.0
Rank_12: 6.5
Rank_13: 7.0
Rank_14: 7.5
Rank_15: 8.0
Rank_16: 8.5
Rank_17: 9.0
Rank_18: 10.5
Rank_19: 12.0
Rank_20: 13.5
#
# Settings for Woodcutting
###