Add party an army sheeets

module/models/_module.mjs

@@ -15,3 +15,5 @@ export { default as OathHammerSettlement } from "./settlement.mjs"
 export { default as OathHammerSkillNPC } from "./skillnpc.mjs"
 export { default as OathHammerNpcAttack } from "./npcattack.mjs"
 export { default as OathHammerRegiment }  from "./regiment.mjs"
+export { default as OathHammerParty }     from "./party.mjs"
+export { default as OathHammerArmy }      from "./army.mjs"

module/models/army.mjs

@@ -0,0 +1,13 @@
+export default class OathHammerArmy extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const { fields } = foundry.data
+    const schema = {}
+
+    schema.regimentRefs  = new fields.ArrayField(new fields.StringField({ required: true, blank: false }))
+    schema.leaderUuid    = new fields.StringField({ required: false, nullable: true, initial: null })
+    schema.location      = new fields.StringField({ required: false, nullable: true, initial: "" })
+    schema.notes         = new fields.HTMLField({ required: false, nullable: true, initial: "" })
+
+    return schema
+  }
+}

module/models/party.mjs

@@ -0,0 +1,24 @@
+export default class OathHammerParty extends foundry.abstract.TypeDataModel {
+  static defineSchema() {
+    const { fields } = foundry.data
+    const requiredInteger = { required: true, nullable: false, integer: true }
+    const schema = {}
+
+    schema.notes = new fields.HTMLField({ required: false, nullable: true, initial: "" })
+
+    // Ordered list of character actor IDs — position = marching order
+    schema.memberRefs = new fields.ArrayField(
+      new fields.StringField({ required: true, nullable: false, blank: false })
+    )
+
+    schema.treasury = new fields.SchemaField({
+      gp: new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 }),
+      sp: new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 }),
+      cp: new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 }),
+    })
+
+    return schema
+  }
+
+  static LOCALIZATION_PREFIXES = ["OATHHAMMER.Party"]
+}

module/models/regiment.mjs

@@ -7,46 +7,33 @@ export default class OathHammerRegiment extends foundry.abstract.TypeDataModel {
     const schema = {}
 
     schema.description = new fields.HTMLField({ required: false, nullable: true, initial: "" })
-    schema.notes        = new fields.StringField({ required: false, nullable: true, initial: "" })
+    schema.notes        = new fields.HTMLField({ required: false, nullable: true, initial: "" })
 
     schema.grit = new fields.SchemaField({
-      max: new fields.NumberField({ ...requiredInteger, initial: 20, min: 0, max: 200 }),
+      value: new fields.NumberField({ ...requiredInteger, initial: 20, min: 0 }),
+      max:   new fields.NumberField({ ...requiredInteger, initial: 20, min: 0 }),
     })
 
     schema.armorDice = new fields.SchemaField({
-      value:        new fields.NumberField({ ...requiredInteger, initial: 1, min: 0, max: 20 }),
+      value:         new fields.NumberField({ ...requiredInteger, initial: 1, min: 0, max: 20 }),
       colorDiceType: new fields.StringField({ required: true, nullable: false, initial: "white", choices: SYSTEM.DICE_COLOR_TYPES }),
     })
 
-    schema.movement = new fields.NumberField({ ...requiredInteger, initial: 60, min: 0, max: 500 })
+    schema.movement        = new fields.NumberField({ ...requiredInteger, initial: 60, min: 0, max: 500 })
+    schema.supplyCost      = new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 })
+    schema.recruitmentCost = new fields.NumberField({ ...requiredInteger, initial: 0, min: 0 })
 
-    // Embedded skill rows: [{name, value, colorDiceType}]
-    schema.skills = new fields.ArrayField(new fields.SchemaField({
-      name:          new fields.StringField({ required: true, nullable: false, initial: "" }),
-      value:         new fields.NumberField({ ...requiredInteger, initial: 2, min: 0, max: 6 }),
-      colorDiceType: new fields.StringField({ required: true, nullable: false, initial: "white", choices: SYSTEM.DICE_COLOR_TYPES }),
-    }))
-
-    // Embedded attack rows: [{name, damageDice, colorDiceType, ap, special}]
-    schema.attacks = new fields.ArrayField(new fields.SchemaField({
-      name:          new fields.StringField({ required: true, nullable: false, initial: "" }),
-      damageDice:    new fields.NumberField({ ...requiredInteger, initial: 6, min: 0, max: 20 }),
-      colorDiceType: new fields.StringField({ required: true, nullable: false, initial: "white", choices: SYSTEM.DICE_COLOR_TYPES }),
-      ap:            new fields.NumberField({ ...requiredInteger, initial: 0, min: 0, max: 6 }),
-      special:       new fields.StringField({ required: false, nullable: true, initial: "" }),
-    }))
-
-    // Embedded trait rows: [{name, description}]
-    schema.traits = new fields.ArrayField(new fields.SchemaField({
-      name:        new fields.StringField({ required: true, nullable: false, initial: "" }),
-      description: new fields.StringField({ required: false, nullable: true, initial: "" }),
-    }))
+    schema.leaderUuid = new fields.StringField({ required: false, nullable: true, initial: null })
 
     return schema
   }
 
   static LOCALIZATION_PREFIXES = ["OATHHAMMER.Regiment"]
 
+  get threshold() {
+    return { white: 4, red: 3, black: 2 }[this.armorDice.colorDiceType] ?? 4
+  }
+
   get colorEmoji() {
     return { white: "⬜", red: "🔴", black: "⬛" }[this.armorDice.colorDiceType] ?? "⬜"
   }

module/models/settlement.mjs

@@ -33,6 +33,11 @@ export default class OathHammerSettlement extends foundry.abstract.TypeDataModel
     schema.isCapital  = new fields.BooleanField({ required: true, initial: false })
     schema.taxNotes   = new fields.StringField({ required: true, nullable: false, initial: "" })
 
+    // Linked regiment actor IDs
+    schema.garrisonRefs = new fields.ArrayField(
+      new fields.StringField({ required: true, nullable: false, blank: false })
+    )
+
     return schema
   }