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

PlayerCombatStats final

Browse Source
This commit is contained in:
FatBoy-DOTC
2025-01-21 20:37:17 -06:00
parent b1250ae4e4
commit f6299f5b97
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/PlayerCombatStats.java
+13 -7
View File
@@ -76,9 +76,10 @@ public class PlayerCombatStats {
if(this.owner.skills.containsKey(mastery)) if(this.owner.skills.containsKey(mastery))
masteryLevel = this.owner.skills.get(mastery).getTotalSkillPercet(); masteryLevel = this.owner.skills.get(mastery).getTotalSkillPercet();
float masteryCalc = masteryLevel * 3;
float primaryCalc = primary * 0.5f; float primaryCalc = primary * 0.5f;
float skillCalc = skillLevel * 4; float skillCalc = skillLevel * 4;
float masteryCalc = masteryLevel * 3;
float atrEnchants = 0; float atrEnchants = 0;
float stanceValue = 0.0f; float stanceValue = 0.0f;
@@ -102,14 +103,15 @@ public class PlayerCombatStats {
atr = primaryCalc + skillCalc + masteryCalc + atrEnchants; atr = primaryCalc + skillCalc + masteryCalc + atrEnchants;
atr *= 1 + (this.owner.bonuses.getFloatPercentAll(Enum.ModType.OCV, Enum.SourceType.None) - stanceValue); atr *= 1 + (this.owner.bonuses.getFloatPercentAll(Enum.ModType.OCV, Enum.SourceType.None) - stanceValue);
atr *= 1 + stanceValue; atr *= 1 + stanceValue;
atr += 0.5f; atr = Math.round(atr);
if(mainHand){ if(mainHand){
this.atrHandOne = atr; this.atrHandOne = atr;
}else{ }else{
this.atrHandTwo = atr; this.atrHandTwo = atr;
if(this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null){ if(this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null){
this.atrHandOne = 0.0f; if(!this.owner.charItemManager.getEquipped(2).getItemBase().isShield())
this.atrHandOne = 0.0f;
} }
} }
} }
@@ -168,7 +170,8 @@ public class PlayerCombatStats {
} else { } else {
this.minDamageHandTwo = roundedMin; this.minDamageHandTwo = roundedMin;
if(this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null){ if(this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null){
this.minDamageHandOne = 0; if(!this.owner.charItemManager.getEquipped(2).getItemBase().isShield())
this.minDamageHandOne = 0;
} }
} }
} }
@@ -230,7 +233,8 @@ public class PlayerCombatStats {
}else{ }else{
this.maxDamageHandTwo = roundedMax; this.maxDamageHandTwo = roundedMax;
if(this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null){ if(this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null){
this.maxDamageHandOne = 0; if(!this.owner.charItemManager.getEquipped(2).getItemBase().isShield())
this.maxDamageHandOne = 0;
} }
} }
} }
@@ -289,7 +293,8 @@ public class PlayerCombatStats {
}else{ }else{
this.attackSpeedHandTwo = speed; this.attackSpeedHandTwo = speed;
if(this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null){ if(this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null){
this.attackSpeedHandOne = 0.0f; if(!this.owner.charItemManager.getEquipped(2).getItemBase().isShield())
this.attackSpeedHandOne = 0.0f;
} }
} }
} }
@@ -316,7 +321,8 @@ public class PlayerCombatStats {
}else{ }else{
this.rangeHandTwo = range; this.rangeHandTwo = range;
if(this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null){ if(this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null){
this.rangeHandOne = 0.0f; if(!this.owner.charItemManager.getEquipped(2).getItemBase().isShield())
this.rangeHandOne = 0.0f;
} }
} }
} }