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

defense calc completed

Browse Source
This commit is contained in:
FatBoy-DOTC
2025-01-25 19:03:12 -06:00
parent 172dcfb6d8
commit eac0aebd59
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/PlayerCombatStats.java
+9 -7
View File
@@ -213,9 +213,11 @@ public class PlayerCombatStats {
public void calculateMin(boolean mainHand) { public void calculateMin(boolean mainHand) {
Item weapon; Item weapon;
float specialDex = this.owner.statDexBase;
specialDex += this.owner.bonuses.getFloat(Enum.ModType.Attr, Enum.SourceType.Dexterity);
float baseDMG = 1; float baseDMG = 1;
int primaryStat = getDexAfterPenalty(this.owner); float primaryStat = specialDex;//getDexAfterPenalty(this.owner);
int secondaryStat = this.owner.statStrCurrent; float secondaryStat = this.owner.statStrCurrent;
double weaponSkill = 5; double weaponSkill = 5;
double weaponMastery = 5; double weaponMastery = 5;
@@ -234,7 +236,7 @@ public class PlayerCombatStats {
mastery = weapon.getItemBase().getMastery(); mastery = weapon.getItemBase().getMastery();
if (weapon.getItemBase().isStrBased()) { if (weapon.getItemBase().isStrBased()) {
primaryStat = this.owner.statStrCurrent; primaryStat = this.owner.statStrCurrent;
secondaryStat = getDexAfterPenalty(this.owner); secondaryStat = specialDex;//getDexAfterPenalty(this.owner);
} }
for(Effect eff : weapon.effects.values()){ for(Effect eff : weapon.effects.values()){
for(AbstractEffectModifier mod : eff.getEffectModifiers()){ for(AbstractEffectModifier mod : eff.getEffectModifiers()){
@@ -293,8 +295,8 @@ public class PlayerCombatStats {
float specialDex = this.owner.statDexBase; float specialDex = this.owner.statDexBase;
specialDex += this.owner.bonuses.getFloat(Enum.ModType.Attr, Enum.SourceType.Dexterity); specialDex += this.owner.bonuses.getFloat(Enum.ModType.Attr, Enum.SourceType.Dexterity);
double baseDMG = 5; double baseDMG = 5;
int primaryStat = getDexAfterPenalty(this.owner); float primaryStat = specialDex;//getDexAfterPenalty(this.owner);
int secondaryStat = this.owner.statStrCurrent; float secondaryStat = this.owner.statStrCurrent;
double weaponSkill = 5; double weaponSkill = 5;
double weaponMastery = 5; double weaponMastery = 5;
@@ -313,7 +315,7 @@ public class PlayerCombatStats {
mastery = weapon.getItemBase().getMastery(); mastery = weapon.getItemBase().getMastery();
if (weapon.getItemBase().isStrBased()) { if (weapon.getItemBase().isStrBased()) {
primaryStat = this.owner.statStrCurrent; primaryStat = this.owner.statStrCurrent;
secondaryStat = getDexAfterPenalty(this.owner); secondaryStat = specialDex;//getDexAfterPenalty(this.owner);
} }
for(Effect eff : weapon.effects.values()){ for(Effect eff : weapon.effects.values()){
for(AbstractEffectModifier mod : eff.getEffectModifiers()){ for(AbstractEffectModifier mod : eff.getEffectModifiers()){
@@ -351,7 +353,7 @@ public class PlayerCombatStats {
} }
} }
int roundedMax = (int)Math.round(maxDMG); int roundedMax = (int)(maxDMG);
if(mainHand){ if(mainHand){
this.maxDamageHandOne = roundedMax; this.maxDamageHandOne = roundedMax;