MagicBane
/
Server
92
0
Fork 2
Code Issues 5 Pull Requests Projects Releases Wiki Activity
Browse Source

PlayerCombatStats defense

lakebane-dex-penalty
FatBoy-DOTC 1 week ago
parent
ecee2f2e8c
commit
fdf42bd913
1 changed files with 35 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 69
      src/engine/objects/PlayerCombatStats.java

69
src/engine/objects/PlayerCombatStats.java
Unescape View File

@ -7,7 +7,6 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
public class PlayerCombatStats { public class PlayerCombatStats {
public static HashMap<PlayerCharacter, PlayerCombatStats> combatstats = new HashMap<>();
public PlayerCharacter owner; public PlayerCharacter owner;
//main hand data //main hand data
@ -47,7 +46,6 @@ public class PlayerCombatStats {
this.calculateAttackRange(false); this.calculateAttackRange(false);
this.calculateRegen(); this.calculateRegen();
this.calculateDefense(); this.calculateDefense();
combatstats.put(this.owner, this);
} }
public void calculateATR(boolean mainHand) { public void calculateATR(boolean mainHand) {
@ -330,7 +328,7 @@ public class PlayerCombatStats {
} }
} }
public void calculateDefense(){ public void calculateDefense() {
int armorDefense = 0; int armorDefense = 0;
int shieldDefense = 0; int shieldDefense = 0;
int dexterity = this.owner.statDexCurrent; int dexterity = this.owner.statDexCurrent;
@ -338,36 +336,35 @@ public class PlayerCombatStats {
double blockSkill = 0; double blockSkill = 0;
double weaponSkill = 0; double weaponSkill = 0;
double weaponMastery = 0; double weaponMastery = 0;
int flatBonuses = 0;
//armor defense value need to loop all equipped items and log armor defense values //armor defense value need to loop all equipped items and log armor defense values
ArrayList<String> armorTypes = new ArrayList<>(); ArrayList<String> armorTypes = new ArrayList<>();
if(this.owner.charItemManager != null){ if (this.owner.charItemManager != null) {
for(Item equipped : this.owner.charItemManager.getEquippedList()){ for (Item equipped : this.owner.charItemManager.getEquippedList()) {
if(equipped.getItemBase().isHeavyArmor()){ if (equipped.getItemBase().isHeavyArmor()) {
armorDefense += equipped.getItemBase().getDefense(); armorDefense += equipped.getItemBase().getDefense();
if(!armorTypes.contains(equipped.getItemBase().getSkillRequired())) if (!armorTypes.contains(equipped.getItemBase().getSkillRequired()))
armorTypes.add(equipped.getItemBase().getSkillRequired()); armorTypes.add(equipped.getItemBase().getSkillRequired());
} else if(equipped.getItemBase().isLightArmor()){ } else if (equipped.getItemBase().isLightArmor()) {
armorDefense += equipped.getItemBase().getDefense(); armorDefense += equipped.getItemBase().getDefense();
if(!armorTypes.contains(equipped.getItemBase().getSkillRequired())) if (!armorTypes.contains(equipped.getItemBase().getSkillRequired()))
armorTypes.add(equipped.getItemBase().getSkillRequired()); armorTypes.add(equipped.getItemBase().getSkillRequired());
} else if(equipped.getItemBase().isMediumArmor()){ } else if (equipped.getItemBase().isMediumArmor()) {
armorDefense += equipped.getItemBase().getDefense(); armorDefense += equipped.getItemBase().getDefense();
if(!armorTypes.contains(equipped.getItemBase().getSkillRequired())) if (!armorTypes.contains(equipped.getItemBase().getSkillRequired()))
armorTypes.add(equipped.getItemBase().getSkillRequired()); armorTypes.add(equipped.getItemBase().getSkillRequired());
} else if(equipped.getItemBase().isClothArmor()){ } else if (equipped.getItemBase().isClothArmor()) {
armorDefense += equipped.getItemBase().getDefense(); armorDefense += equipped.getItemBase().getDefense();
}else if(equipped.getItemBase().isShield()){ } else if (equipped.getItemBase().isShield()) {
shieldDefense += equipped.getItemBase().getDefense(); shieldDefense += equipped.getItemBase().getDefense();
} }
} }
} }
//armor skill needs to calculate all trains in armor types //armor skill needs to calculate all trains in armor types
for(String armorType : armorTypes){ for (String armorType : armorTypes) {
if(this.owner.skills!= null){ if (this.owner.skills != null) {
if(this.owner.skills.containsKey(armorType)){ if (this.owner.skills.containsKey(armorType)) {
armorSkill += this.owner.skills.get(armorType).getModifiedAmount(); armorSkill += this.owner.skills.get(armorType).getModifiedAmount();
} }
} }
@ -381,39 +378,41 @@ public class PlayerCombatStats {
String primarySkillName = "Unarmed Combat"; String primarySkillName = "Unarmed Combat";
String primaryMasteryName = "Unarmed Combat Mastery"; String primaryMasteryName = "Unarmed Combat Mastery";
Item weapon = this.owner.charItemManager.getEquipped(1); Item weapon = this.owner.charItemManager.getEquipped(1);
if(weapon == null){ if (weapon == null) {
weapon = this.owner.charItemManager.getEquipped(2); weapon = this.owner.charItemManager.getEquipped(2);
} }
if(weapon != null){ if (weapon != null) {
primarySkillName = weapon.getItemBase().getSkillRequired(); primarySkillName = weapon.getItemBase().getSkillRequired();
primaryMasteryName = weapon.getItemBase().getMastery(); primaryMasteryName = weapon.getItemBase().getMastery();
} }
if(this.owner.skills != null){ if (this.owner.skills != null) {
if(this.owner.skills.containsKey(primarySkillName)){ if (this.owner.skills.containsKey(primarySkillName)) {
weaponSkill = this.owner.skills.get(primarySkillName).getModifiedAmount(); weaponSkill = this.owner.skills.get(primarySkillName).getModifiedAmount();
} }
if(this.owner.skills.containsKey(primaryMasteryName)){ if (this.owner.skills.containsKey(primaryMasteryName)) {
weaponMastery = this.owner.skills.get(primaryMasteryName).getModifiedAmount(); weaponMastery = this.owner.skills.get(primaryMasteryName).getModifiedAmount();
} }
} }
float stanceValue = 0.0f; float stanceValue = 0.0f;
if(this.owner.bonuses != null){ float bonusValues = 0;
for(String effID : this.owner.effects.keySet()){ float percentBonus = 0;
if(effID.contains("STC")){ if (this.owner.bonuses != null) {
for(AbstractEffectModifier mod : this.owner.effects.get(effID).getEffectModifiers()){ for (String effID : this.owner.effects.keySet()) {
if(mod.modType.equals(Enum.ModType.AttackDelay)){ if (effID.contains("Stance")) {
stanceValue = mod.getPercentMod() * 0.01f; // account for weapon prefix and suffix mods if (this.owner.effects != null) {
for (AbstractEffectModifier mod : this.owner.effects.get(effID).getEffectModifiers()) {
if (mod.modType.equals(Enum.ModType.DCV)) {
stanceValue = mod.getPercentMod() * 0.01f; // account for weapon prefix and suffix mods
}
} }
} }
} }
} }
float bonusValues = 1.0f + this.owner.bonuses.getFloat(Enum.ModType.DCV, Enum.SourceType.None); bonusValues = this.owner.bonuses.getFloat(Enum.ModType.DCV, Enum.SourceType.None);
percentBonus = this.owner.bonuses.getFloatPercentAll(Enum.ModType.DCV, Enum.SourceType.None) - stanceValue;
bonusValues -= stanceValue; // take away stance modifier from alac bonus values
flatBonuses += bonusValues; // apply alac bonuses without stance mod
} }
double defense = (1 + armorSkill / 50.0) * armorDefense + double defense = (1 + armorSkill / 50.0) * armorDefense +
@ -421,8 +420,10 @@ public class PlayerCombatStats {
(weaponSkill / 2.0) + (weaponSkill / 2.0) +
(weaponMastery / 2.0) + (weaponMastery / 2.0) +
dexterity * 2.0 + dexterity * 2.0 +
flatBonuses; bonusValues;
defense *= 1.0f + percentBonus;
defense *= 1.0f + stanceValue;
this.defense = (int) (defense * 1.0f + stanceValue); this.defense = (int) defense;
} }
} }

Write Preview
Loading…
Cancel
Save