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

fortitudes handled last

Browse Source
This commit is contained in:
FatBoy-DOTC
2025-01-27 15:55:40 -06:00
parent ebb765ae82
commit beeca529cd
4 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/Resists.java
+7 -6
View File
@@ -125,7 +125,7 @@ public class Resists {
}
//Handle Fortitudes
private static float handleFortitude(AbstractCharacter target, DamageType type, float damage) {
public static float handleFortitude(AbstractCharacter target, DamageType type, float damage) {
if (target == null || !(target.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)))
return damage;
PlayerBonuses bonus = target.getBonuses();
@@ -456,10 +456,11 @@ public class Resists {
//handle fortitudes
//damage = handleFortitude(target, type, damage);
//calculate armor piercing
float ap = source.getBonuses().getFloatPercentAll(ModType.ArmorPiercing, SourceType.None);
float damageAfterResists = damage;
if(type.equals(DamageType.Pierce) || type.equals(DamageType.Crush) || type.equals(DamageType.Slash))
damageAfterResists = damage * (1 - (this.getResist(type, trains) * 0.01f) + ap);
//float ap = 0;
//if(type.equals(DamageType.Pierce) || type.equals(DamageType.Crush) || type.equals(DamageType.Slash))
//source.getBonuses().getFloatPercentAll(ModType.ArmorPiercing, SourceType.None);
float damageAfterResists = damage * (1 - (this.getResist(type, trains) * 0.01f));
//check to see if any damage absorbers should cancel
if (target != null) {
//debug damage shields if any found
@@ -479,7 +480,7 @@ public class Resists {
}
target.cancelOnTakeDamage(type, (damageAfterResists));
}
damageAfterResists = handleFortitude(target, type, damageAfterResists);
//damageAfterResists = handleFortitude(target, type, damageAfterResists);
return damageAfterResists;
}