fix: encumbrance indicator doubling on status change

src/module/config.ts

@@ -423,7 +423,8 @@ const RULESETS = Object.freeze({
       armorDamageFormula: "@damage - @effectiveArmor",
       addEffectToDamage: true,
       weightModifierForWornArmor: "1",
-      chainBonus: "0, 0, 0, 1, 1, 1"
+      chainBonus: "0, 0, 0, 1, 1, 1",
+      reverseHealingOrder: true
     }
   },
   CDEE: {
@@ -476,7 +477,8 @@ const RULESETS = Object.freeze({
       armorDamageFormula: "@damage - @effectiveArmor",
       addEffectToDamage: true,
       weightModifierForWornArmor: "1",
-      chainBonus: "0, 0, 0, 1, 1, 1"
+      chainBonus: "0, 0, 0, 1, 1, 1",
+      reverseHealingOrder: true
     }
   },
   CLU: {
@@ -529,7 +531,8 @@ const RULESETS = Object.freeze({
       armorDamageFormula: "@damage - @effectiveArmor",
       addEffectToDamage: true,
       weightModifierForWornArmor: "1",
-      chainBonus: "0, 0, 0, 1, 1, 1"
+      chainBonus: "0, 0, 0, 1, 1, 1",
+      reverseHealingOrder: true
     }
   },
   SOC: {

src/module/entities/TwodsixActiveEffect.ts

@@ -33,24 +33,40 @@ export class TwodsixActiveEffect extends ActiveEffect {
    * @param {object} options            Additional options which modify the creation request
    * @param {string} userId             The id of the User requesting the document update
    * @see {Document#_onCreate}
-   * @protected
+   * @override
    */
-  async _onCreate(data, options, userId): void {
+  async _onCreate(data: object, options: object, userId: string):void {
     await super._onCreate(data, options, userId);
     if(game.userId === userId  && this.parent?.type === 'traveller') {
       await checkEncumbranceStatus(this);
     }
   }
 
+  /**
+   * Perform follow-up operations after a Document of this type is updated.
+   * Post-update operations occur for all clients after the update is broadcast.
+   * @param {object} changed            The differential data that was changed relative to the documents prior values
+   * @param {object} options            Additional options which modify the update request
+   * @param {string} userId             The id of the User requesting the document update
+   * @see {Document#_onUpdate}
+   * @override
+   */
+  async _onUpdate(changed: object, options: object, userId: string):void {
+    await super._onUpdate(changed, options, userId);
+    if(game.userId === userId  && this.parent?.type === 'traveller') {
+      await checkEncumbranceStatus(this);
+    }
+  }
+
   /**
    * Perform follow-up operations after a Document of this type is deleted.
    * Post-deletion operations occur for all clients after the deletion is broadcast.
    * @param {object} options            Additional options which modify the deletion request
    * @param {string} userId             The id of the User requesting the document update
    * @see {Document#_onDelete}
-   * @protected
+   * @override
    */
-  async _onDelete(options, userId): void {
+  async _onDelete(options: object, userId: string):void {
     await super._onDelete(options, userId);
     if(game.userId === userId && this.parent?.type === 'traveller') {
       await checkEncumbranceStatus(this);
@@ -59,16 +75,41 @@ export class TwodsixActiveEffect extends ActiveEffect {
   }
 }
 
+/**
+ * Calls applyEncumberedEffect if active effect could change encumbered status
+ * @param {TwodsixActiveEffect} activeEffect  The active effect being changed
+ * @returns {void}
+ */
 async function checkEncumbranceStatus (activeEffect:TwodsixActiveEffect):void {
-  if (game.settings.get('twodsix', 'useEncumbranceStatusIndicators')) {
-    if (activeEffect.statuses.size === 0) {
+  if (game.settings.get('twodsix', 'useEncumbranceStatusIndicators') && (changesEncumbranceStat(activeEffect) || activeEffect.statuses.has('dead'))) {
+    if (activeEffect.statuses.size === 0 ) {
       await applyEncumberedEffect(activeEffect.parent);
     } else {
-      const notEncumbered= !activeEffect.statuses.has('encumbered');
-      const notWounded = !activeEffect.statuses.has('wounded');
-      if (notEncumbered && notWounded) {
+      const notEncumbered = !activeEffect.statuses.has('encumbered');
+      const notUnc = !activeEffect.statuses.has('unconscious');
+      if (notEncumbered && notUnc) {
         await applyEncumberedEffect(activeEffect.parent);
       }
     }
   }
 }
+/**
+ * Checks the changes in an active effect and determines whether it might affect encumbrance
+ * @param {TwodsixActiveEffect} activeEffect  The active effect being changed
+ * @returns {boolean} Whether the effect could change encumbrance status
+ */
+function changesEncumbranceStat(activeEffect:TwodsixActiveEffect):boolean {
+  if (activeEffect.changes.length > 0) {
+    for (const change of activeEffect.changes) {
+      if (change.key.includes('system.characteristics.strength.value')  ||
+          change.key.includes('system.characteristics.strength.current') ||
+          change.key.includes('system.characteristics.strength.mod') ||
+          (change.key.includes('system.characteristics.endurance.value') && ['CEATOM', "BARBARIC"].includes(game.settings.get('twodsix', 'ruleset'))) ||
+          change.key.includes('system.encumbrance.max') ||
+          change.key.includes('system.encumbrance.value')) {
+        return true;
+      }
+    }
+  }
+  return false;
+}

src/module/entities/TwodsixActor.ts

@@ -224,8 +224,8 @@ export default class TwodsixActor extends Actor {
           await applyWoundedEffect(this);
         }
       }
-      if (game.settings.get('twodsix', 'useEncumbranceStatusIndicators') ) {
-        if (changed.system?.characteristics && (this.type === 'traveller') ) {
+      if (game.settings.get('twodsix', 'useEncumbranceStatusIndicators') && (this.type === 'traveller')) {
+        if (isEncumbranceChange(changed)) {
           await applyEncumberedEffect(this);
         }
       }
@@ -1414,4 +1414,11 @@ function buildUntrainedSkillData(): any {
   };
 }
 
-
+function isEncumbranceChange(changed:object): boolean {
+  if (changed.system?.characteristics?.strength) {
+    return true;
+  } else if (changed.system?.characteristics?.endurance && ['CEATOM', "BARBARIC"].includes(game.settings.get('twodsix', 'ruleset'))) {
+    return true;
+  }
+  return false;
+}

src/module/sheets/AbstractTwodsixActorSheet.ts

@@ -9,7 +9,6 @@ import {onPasteStripFormatting} from "../sheets/AbstractTwodsixItemSheet";
 import { getRollTypeSelectObject } from "../utils/sheetUtils";
 import { openPDFReference, deletePDFReference } from "../utils/sheetUtils";
 import { sortObj } from "../utils/utils";
-import { applyEncumberedEffect } from "../utils/showStatusIcons";
 import { TwodsixActiveEffect } from "../entities/TwodsixActiveEffect";
 
 export abstract class AbstractTwodsixActorSheet extends ActorSheet {
@@ -617,9 +616,6 @@ export abstract class AbstractTwodsixActorSheet extends ActorSheet {
       const selectedEffect:TwodsixActiveEffect = await fromUuid(event.currentTarget["dataset"].uuid);
       if (selectedEffect) {
         await selectedEffect.update({disabled: !selectedEffect.disabled});
-        if (this.actor?.type === 'traveller' && game.settings.get('twodsix', 'useEncumbranceStatusIndicators')) {
-          applyEncumberedEffect(this.actor); //a hack for encumbrance not resetting on change of effect
-        }
       }
     } else if (action === "create") {
       await this.actor.createEmbeddedDocuments("ActiveEffect", [{

src/module/utils/showStatusIcons.ts

@@ -88,13 +88,15 @@ export async function applyEncumberedEffect(selectedActor: TwodsixActor): Promis
   let idToKeep = "";
   const maxEncumbrance = selectedActor.system.encumbrance.max; //selectedActor.getMaxEncumbrance()
 
-  //Determined whether encumbered
-  if (maxEncumbrance === 0 && selectedActor.system.encumbrance.value > 0) {
-    state = true;
-    ratio = 1;
-  } else if (maxEncumbrance > 0) {
-    ratio = /*selectedActor.getActorEncumbrance()*/ selectedActor.system.encumbrance.value / maxEncumbrance;
-    state = (ratio > parseFloat(game.settings.get('twodsix', 'encumbranceFraction'))); //remove await
+  //Determined whether encumbered if not dead
+  if (selectedActor.system.hits.value > 0) {
+    if (maxEncumbrance === 0 && selectedActor.system.encumbrance.value > 0) {
+      state = true;
+      ratio = 1;
+    } else if (maxEncumbrance > 0) {
+      ratio = /*selectedActor.getActorEncumbrance()*/ selectedActor.system.encumbrance.value / maxEncumbrance;
+      state = (ratio > parseFloat(game.settings.get('twodsix', 'encumbranceFraction'))); //remove await
+    }
   }
 
   // Delete encumbered AE's if uneeded or more than one
@@ -166,20 +168,20 @@ async function checkUnconsciousness(selectedActor: TwodsixActor, oldWoundState:
   if (!isAlreadyUnconscious && !isAlreadyDead) {
     if (['CE', 'AC', 'OTHER'].includes(rulesSet)) {
       if (isUnconsciousCE(<Traveller>selectedActor.system)) {
-        setConditionState('unconscious', selectedActor, true);
+        await setConditionState('unconscious', selectedActor, true);
       }
     } else if (['CT'].includes(rulesSet)) {
       if (oldWoundState === undefined && [DAMAGECOLORS.minorWoundTint, DAMAGECOLORS.seriousWoundTint].includes(tintToApply)) {
-        setConditionState('unconscious', selectedActor, true); // Automatic unconsciousness or out of combat
+        await setConditionState('unconscious', selectedActor, true); // Automatic unconsciousness or out of combat
       }
     } else if (oldWoundState?.tint.css !== DAMAGECOLORS.seriousWoundTint && tintToApply === DAMAGECOLORS.seriousWoundTint) {
       if (['CEQ', 'CEATOM', 'BARBARIC'].includes(rulesSet)) {
-        setConditionState('unconscious', selectedActor, true); // Automatic unconsciousness or out of combat
+        await setConditionState('unconscious', selectedActor, true); // Automatic unconsciousness or out of combat
       } else {
         const setDifficulty = Object.values(TWODSIX.DIFFICULTIES[(game.settings.get('twodsix', 'difficultyListUsed'))]).find(e => e.target=== 8); //always 8+
         const returnRoll = await selectedActor.characteristicRoll({ rollModifiers: {characteristic: 'END'}, difficulty: setDifficulty}, false);
         if (returnRoll && returnRoll.effect < 0) {
-          setConditionState('unconscious', selectedActor, true);
+          await setConditionState('unconscious', selectedActor, true);
         }
       }
     }
@@ -269,7 +271,7 @@ async function setWoundedState(targetActor: TwodsixActor, state: boolean, tint:
     }
     //
     if (!currentEffectId) {
-      targetActor.createEmbeddedDocuments("ActiveEffect", [{
+      await targetActor.createEmbeddedDocuments("ActiveEffect", [{
         name: game.i18n.localize(effectType.wounded),
         img: "icons/svg/blood.svg",
         tint: tint,
@@ -279,7 +281,7 @@ async function setWoundedState(targetActor: TwodsixActor, state: boolean, tint:
     } else {
       const currentEfffect = targetActor.effects.get(currentEffectId);
       if (currentEfffect.tint !== tint) {
-        targetActor.updateEmbeddedDocuments('ActiveEffect', [{ _id: currentEffectId, tint: tint, changes: [changeData] }]);
+        await targetActor.updateEmbeddedDocuments('ActiveEffect', [{ _id: currentEffectId, tint: tint, changes: [changeData] }]);
       }
     }
   }
@@ -333,7 +335,7 @@ export function getHitsTint(selectedTraveller: TwodsixActor): string {
 
 export function getCDWoundTint(selectedTraveller: TwodsixActor): string {
   let returnVal = '';
-  if (selectedTraveller.characteristics.lifeblood.current <= 0) {
+  if (selectedTraveller.characteristics.lifeblood.current <= 0 && selectedTraveller.characteristics.stamina.current <= 0) {
     returnVal = DAMAGECOLORS.deadTint;
   } else if (selectedTraveller.characteristics.lifeblood.current < (selectedTraveller.characteristics.lifeblood.value / 2)) {
     returnVal = DAMAGECOLORS.seriousWoundTint;