MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

PlayerCombatStats revision

Browse Source
This commit is contained in:
FatBoy-DOTC
2025-01-22 21:28:51 -06:00
parent 0d9e03f848
commit 44197fd83c
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/PlayerCombatStats.java
+14 -2
View File
@@ -180,7 +180,6 @@ public class PlayerCombatStats {
preciseRune += 0.05f; preciseRune += 0.05f;
} }
if(weapon != null && weapon.getItemBase().isStrBased()){ if(weapon != null && weapon.getItemBase().isStrBased()){
atr = (((primaryStat / 2) + (skillLevel * 4 + masteryLevel * 3) + prefixValues) * preciseRune + atrEnchants) * (1.0f + stanceValue); atr = (((primaryStat / 2) + (skillLevel * 4 + masteryLevel * 3) + prefixValues) * preciseRune + atrEnchants) * (1.0f + stanceValue);
atr += 1; atr += 1;
@@ -238,6 +237,13 @@ public class PlayerCombatStats {
primaryStat = this.owner.statStrCurrent; primaryStat = this.owner.statStrCurrent;
secondaryStat = this.owner.statDexCurrent; secondaryStat = this.owner.statDexCurrent;
} }
for(Effect eff : weapon.effects.values()){
for(AbstractEffectModifier mod : eff.getEffectModifiers()){
if(mod.modType.equals(Enum.ModType.MinDamage)){
baseDMG += mod.minMod + (mod.getRamp() * eff.getTrains());
}
}
}
} }
if (this.owner.skills.containsKey(skill)) { if (this.owner.skills.containsKey(skill)) {
@@ -293,7 +299,6 @@ public class PlayerCombatStats {
String skill = "Unarmed Combat"; String skill = "Unarmed Combat";
String mastery = "Unarmed Combat Mastery"; String mastery = "Unarmed Combat Mastery";
if (weapon != null) { if (weapon != null) {
baseDMG = weapon.getItemBase().getMaxDamage(); baseDMG = weapon.getItemBase().getMaxDamage();
skill = weapon.getItemBase().getSkillRequired(); skill = weapon.getItemBase().getSkillRequired();
@@ -302,6 +307,13 @@ public class PlayerCombatStats {
primaryStat = this.owner.statStrCurrent; primaryStat = this.owner.statStrCurrent;
secondaryStat = this.owner.statDexCurrent; secondaryStat = this.owner.statDexCurrent;
} }
for(Effect eff : weapon.effects.values()){
for(AbstractEffectModifier mod : eff.getEffectModifiers()){
if(mod.modType.equals(Enum.ModType.MaxDamage)){
baseDMG += mod.minMod + (mod.getRamp() * eff.getTrains());
}
}
}
} }
if (this.owner.skills.containsKey(skill)) { if (this.owner.skills.containsKey(skill)) {