From 00d177f2fa3b7038445db4f8b2fd09e253311e46 Mon Sep 17 00:00:00 2001
From: Mia Ojala <mia.ojala@edu.savonia.fi>
Date: Thu, 28 Nov 2024 16:07:28 +0200
Subject: [PATCH] damagefix

---
 src/module/system/damage/iwr.ts  | 13 +++++++++++--
 src/module/system/damage/roll.ts | 11 ++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/module/system/damage/iwr.ts b/src/module/system/damage/iwr.ts
index 1168e8bf611..cf422e141c3 100644
--- a/src/module/system/damage/iwr.ts
+++ b/src/module/system/damage/iwr.ts
@@ -48,14 +48,23 @@ function applyIWR(actor: ActorPF2e, roll: Rolled<DamageRoll>, rollOptions: Set<s
             const formalDescription = new Set([...instance.formalDescription, ...rollOptions]);
 
             // If the roll's total was increased to a minimum of 1, treat the first instance as having a total of 1
-            const wasIncreased = instance.total <= 0 && typeof roll.options.increasedFrom === "number";
+            const wasIncreased = instance.total <= 0 && typeof instance.options.increasedFrom === "number";
             const isFirst = instances.indexOf(instance) === 0;
             const instanceTotal = wasIncreased && isFirst ? 1 : Math.max(instance.total, 0);
+            const instanceApplications: IWRApplication[] = [];
 
             // Step 0: Inapplicable damage outside the IWR framework
             if (!actor.isAffectedBy(instance.type)) {
                 return [{ category: "unaffected", type: instance.type, adjustment: -1 * instanceTotal }];
             }
+            // Step 0.5: adjust for 0 damage rolls
+            if (wasIncreased && isFirst){
+                instanceApplications.push({
+                    category: "weakness",
+                    type: "adjusment",
+                    adjustment: 1,
+                });
+            }
 
             // Step 1: Immunities
 
@@ -71,7 +80,7 @@ function applyIWR(actor: ActorPF2e, roll: Rolled<DamageRoll>, rollOptions: Set<s
                 return [{ category: "immunity", type: appliedImmunity.label, adjustment: -1 * instanceTotal }];
             }
 
-            const instanceApplications: IWRApplication[] = [];
+            
 
             let redirectedFromImmunity: DamageType | null = null;
             for (const immunity of applicableImmunities) {
diff --git a/src/module/system/damage/roll.ts b/src/module/system/damage/roll.ts
index 78914c503ec..5823cc574d1 100644
--- a/src/module/system/damage/roll.ts
+++ b/src/module/system/damage/roll.ts
@@ -488,9 +488,14 @@ class DamageInstance extends AbstractDamageRoll {
         return DAMAGE_TYPE_ICONS[this.type];
     }
 
-    /** Return 0 for persistent damage */
+    /** Return 0 for persistent damage and if damage is below 0 */
     protected override _evaluateTotal(): number {
-        return this.persistent && !this.options.evaluatePersistent ? 0 : super._evaluateTotal();
+        const total = super._evaluateTotal();
+        if (!this.persistent && total <= 0){
+            this.options.increasedFrom = total;
+            return 0;
+        }
+        else return this.persistent && !this.options.evaluatePersistent ? 0 : total;
     }
 
     override async render({ tooltips = true }: InstanceRenderOptions = {}): Promise<string> {
@@ -610,7 +615,7 @@ class DamageInstance extends AbstractDamageRoll {
                 result.hidden = true;
             }
         }
-
+        this._total = this._evaluateTotal();
         return this as Rolled<this>;
     }
 }