Merge pull request #33 from Foundryborne/issue/23-use-new-damage-thresholds

feat(damageThresholds): PCs use armor base + current level

module/data/pc.mjs

@@ -23,10 +23,6 @@ const levelUpTier = () => ({
     experiences: new MappingField(new fields.ArrayField(new fields.StringField({}))),
     proficiency: new MappingField(new fields.BooleanField()),
     armorOrEvasionSlot: new MappingField(new fields.StringField({})),
-    majorDamageThreshold2: new MappingField(new fields.BooleanField()),
-    severeDamageThreshold2: new MappingField(new fields.BooleanField()),
-    severeDamageThreshold3: new MappingField(new fields.BooleanField()),
-    severeDamageThreshold4: new MappingField(new fields.BooleanField()),
     subclass: new MappingField(
         new fields.SchemaField({
             multiclass: new fields.BooleanField(),
@@ -92,11 +88,6 @@ export default class DhpPC extends foundry.abstract.TypeDataModel {
                 min: new fields.NumberField({ initial: 1, integer: true }),
                 max: new fields.NumberField({ initial: 6, integer: true })
             }),
-            damageThresholds: new fields.SchemaField({
-                minor: new fields.NumberField({ initial: 0, integer: true }),
-                major: new fields.NumberField({ initial: 0, integer: true }),
-                severe: new fields.NumberField({ initial: 0, integer: true })
-            }),
             evasion: new fields.NumberField({ initial: 0, integer: true }),
             // armor: new fields.SchemaField({
             //   value: new fields.NumberField({ initial: 0, integer: true }),
@@ -389,21 +380,35 @@ export default class DhpPC extends foundry.abstract.TypeDataModel {
 
         this.evasion = this.class?.system?.evasion ?? 0;
         // this.armor.value = this.activeArmor?.baseScore ?? 0;
-        this.damageThresholds = this.class?.system?.damageThresholds ?? { minor: 0, major: 0, severe: 0 };
+        this.damageThresholds = this.computeDamageThresholds();
 
         this.applyLevels();
         this.applyEffects();
     }
 
+    computeDamageThresholds() {
+        // TODO: missing weapon features and domain cards calculation
+        if (!this.armor) {
+            return {
+                major: this.levelData.currentLevel,
+                severe: this.levelData.currentLevel * 2
+            };
+        }
+        const {
+            baseThresholds: { major = 0, severe = 0 }
+        } = this.armor.system;
+        return {
+            major: major + this.levelData.currentLevel,
+            severe: severe + this.levelData.currentLevel
+        };
+    }
+
     applyLevels() {
         let healthBonus = 0,
             stressBonus = 0,
             proficiencyBonus = 0,
             evasionBonus = 0,
-            armorBonus = 0,
+            armorBonus = 0;
-            minorThresholdBonus = 0,
-            majorThresholdBonus = 0,
-            severeThresholdBonus = 0;
         let experienceBonuses = {};
         let advancementFirst = null,
             advancementSecond = null;
@@ -439,11 +444,6 @@ export default class DhpPC extends foundry.abstract.TypeDataModel {
                     armorBonus += Object.keys(tierData.armorOrEvasionSlot).filter(
                         x => tierData.armorOrEvasionSlot[x] === 'armor'
                     ).length;
-
-                    majorThresholdBonus += Object.keys(tierData.majorDamageThreshold2).length * 2;
-                    severeThresholdBonus += Object.keys(tierData.severeDamageThreshold2).length * 2;
-                    severeThresholdBonus += Object.keys(tierData.severeDamageThreshold3).length * 3;
-                    severeThresholdBonus += Object.keys(tierData.severeDamageThreshold4).length * 4;
                 }
             }
         }
@@ -456,9 +456,6 @@ export default class DhpPC extends foundry.abstract.TypeDataModel {
             max: this.armor ? this.armor.system.marks.max + armorBonus : 0,
             value: this.armor ? this.armor.system.marks.value : 0
         };
-        this.damageThresholds.minor += minorThresholdBonus;
-        this.damageThresholds.major += majorThresholdBonus;
-        this.damageThresholds.severe += severeThresholdBonus;
 
         this.experiences = this.experiences.map(x => ({ ...x, value: x.value + (experienceBonuses[x.id] ?? 0) }));
 
@@ -495,20 +492,6 @@ export default class DhpPC extends foundry.abstract.TypeDataModel {
                 this.domainData.maxLoadout = Math.min(this.domainData.maxLoadout + 1, 5);
                 this.domainData.maxCards += 1;
             }
-
-            switch (tier) {
-                case 'tier1':
-                    this.damageThresholds.severe += 2;
-                    break;
-                case 'tier2':
-                    this.damageThresholds.major += 1;
-                    this.damageThresholds.severe += 3;
-                    break;
-                case 'tier3':
-                    this.damageThresholds.major += 2;
-                    this.damageThresholds.severe += 4;
-                    break;
-            }
         }
     }
 

templates/sheets/parts/health.hbs

@@ -2,11 +2,7 @@
     <legend class="legend">{{localize "DAGGERHEART.Sheets.PC.Health.Title"}}</legend>
 
     <div class="threshold-container">
-        <div class="threshold-box">
-            {{document.system.damageThresholds.minor}}
-        </div>
         <div class="threshold-spacer">
-            <i class="fa-solid fa-caret-left"></i>
             <div class="health-category">{{localize "DAGGERHEART.Sheets.PC.Health.Minor"}}</div>
         </div>