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

PlayerCombatStats def calculations completed

Browse Source
This commit is contained in:
FatBoy-DOTC
2025-01-22 20:44:33 -06:00
parent 3358d9e943
commit 539d7f6e79
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/PlayerCombatStats.java
+20 -10
View File
@@ -389,8 +389,9 @@ public class PlayerCombatStats {
public void calculateDefense() { public void calculateDefense() {
//Defense = (1+Armor skill / 50) * Armor defense + (1 + Block skill / 100) * Shield defense + (Primary weapon skill / 2) //Defense = (1+Armor skill / 50) * Armor defense + (1 + Block skill / 100) * Shield defense + (Primary weapon skill / 2)
// + (Weapon mastery skill/ 2) + Dexterity * 2 + Flat bonuses from rings or cloth // + (Weapon mastery skill/ 2) + Dexterity * 2 + Flat bonuses from rings or cloth
float armorSkill = this.owner.skills.get(this.owner.charItemManager.getEquipped(MBServerStatics.SLOT_CHEST)).getTotalSkillPercet(); float armorSkill = 0.0f;
float armorDefense = 0.0f; float armorDefense = 0.0f;
ArrayList<String> armorsUsed = new ArrayList<>();
for(Item equipped : this.owner.charItemManager.getEquipped().values()){ for(Item equipped : this.owner.charItemManager.getEquipped().values()){
ItemBase ib = equipped.getItemBase(); ItemBase ib = equipped.getItemBase();
if(ib.isHeavyArmor() || ib.isMediumArmor() || ib.isLightArmor() || ib.isClothArmor()){ if(ib.isHeavyArmor() || ib.isMediumArmor() || ib.isLightArmor() || ib.isClothArmor()){
@@ -402,12 +403,21 @@ public class PlayerCombatStats {
} }
} }
} }
if(!ib.isClothArmor() && !armorsUsed.contains(ib.getSkillRequired())) {
armorsUsed.add(ib.getSkillRequired());
}
} }
} }
for(String armorUsed : armorsUsed){
if(this.owner.skills.containsKey(armorUsed))
armorSkill += this.owner.skills.get(armorUsed).getModifiedAmount();
}
if(armorsUsed.size() > 0)
armorSkill = armorSkill / armorsUsed.size();
float blockSkill = 0.0f; float blockSkill = 0.0f;
if(this.owner.skills.containsKey("Block")) if(this.owner.skills.containsKey("Block"))
blockSkill = this.owner.skills.get("Block").getTotalSkillPercet(); blockSkill = this.owner.skills.get("Block").getModifiedAmount();
float shieldDefense = 0.0f; float shieldDefense = 0.0f;
if(this.owner.charItemManager.getEquipped(2) != null && this.owner.charItemManager.getEquipped(2).getItemBase().isShield()){ if(this.owner.charItemManager.getEquipped(2) != null && this.owner.charItemManager.getEquipped(2).getItemBase().isShield()){
@@ -428,7 +438,7 @@ public class PlayerCombatStats {
if(weapon == null){ if(weapon == null){
weapon = this.owner.charItemManager.getEquipped(2); weapon = this.owner.charItemManager.getEquipped(2);
} }
if(weapon != null && !weapon.getItemBase().isShield()) if(weapon != null && weapon.getItemBase().isShield())
weapon = null; weapon = null;
String skillName = "Unarmed Combat"; String skillName = "Unarmed Combat";
@@ -439,13 +449,13 @@ public class PlayerCombatStats {
masteryName = weapon.getItemBase().getMastery(); masteryName = weapon.getItemBase().getMastery();
} }
if(this.owner.skills.containsKey(skillName)) if(this.owner.skills.containsKey(skillName))
weaponSkill = this.owner.skills.get(skillName).getTotalSkillPercet(); weaponSkill = this.owner.skills.get(skillName).getModifiedAmount();
if(this.owner.skills.containsKey(masteryName)) if(this.owner.skills.containsKey(masteryName))
masterySkill = this.owner.skills.get(masteryName).getTotalSkillPercet(); masterySkill = this.owner.skills.get(masteryName).getModifiedAmount();
float dexterity = this.owner.statDexBase; float dexterity = this.owner.statDexCurrent;//this.owner.statDexBase;
dexterity += this.owner.bonuses.getFloat(Enum.ModType.Attr, Enum.SourceType.Dexterity); //dexterity += this.owner.bonuses.getFloat(Enum.ModType.Attr, Enum.SourceType.Dexterity);
float luckyRune = 1.0f; float luckyRune = 1.0f;
for(CharacterRune rune : this.owner.runes){ for(CharacterRune rune : this.owner.runes){
@@ -458,7 +468,7 @@ public class PlayerCombatStats {
for(String effID : this.owner.effects.keySet()) { for(String effID : this.owner.effects.keySet()) {
if (effID.contains("Stance")) { if (effID.contains("Stance")) {
for (AbstractEffectModifier mod : this.owner.effects.get(effID).getEffectModifiers()) { for (AbstractEffectModifier mod : this.owner.effects.get(effID).getEffectModifiers()) {
if (mod.modType.equals(Enum.ModType.OCV)) { if (mod.modType.equals(Enum.ModType.DCV)) {
float percent = mod.getPercentMod(); float percent = mod.getPercentMod();
int trains = this.owner.effects.get(effID).getTrains(); int trains = this.owner.effects.get(effID).getTrains();
float modValue = percent + (trains * mod.getRamp()); float modValue = percent + (trains * mod.getRamp());
@@ -467,7 +477,7 @@ public class PlayerCombatStats {
} }
} else { } else {
for (AbstractEffectModifier mod : this.owner.effects.get(effID).getEffectModifiers()) { for (AbstractEffectModifier mod : this.owner.effects.get(effID).getEffectModifiers()) {
if (mod.modType.equals(Enum.ModType.OCV)) { if (mod.modType.equals(Enum.ModType.DCV)) {
float value = mod.getMinMod(); float value = mod.getMinMod();
int trains = this.owner.effects.get(effID).getTrains(); int trains = this.owner.effects.get(effID).getTrains();
float modValue = value + (trains * mod.getRamp()); float modValue = value + (trains * mod.getRamp());
@@ -477,7 +487,7 @@ public class PlayerCombatStats {
} }
} }
float defense = (1 + armorDefense/ 50) * armorDefense; float defense = (1 + armorSkill/ 50) * armorDefense;
defense += (1 + blockSkill / 100) * shieldDefense; defense += (1 + blockSkill / 100) * shieldDefense;
defense += (weaponSkill / 2); defense += (weaponSkill / 2);
defense += (masterySkill / 2); defense += (masterySkill / 2);