Combat tab for v13

module/applications/combat.mjs

@@ -2,17 +2,53 @@
 /* -------------------------------------------- */
 export class LethalFantasyCombatTracker extends foundry.applications.sidebar.tabs.CombatTracker {
 
-  async getData(options) {
-    let data = await super.getData(options);
-    for (let u of data.turns) {
+  static PARTS = {
+    "header": {
+      "template": "systems/fvtt-lethal-fantasy/templates/combat-tracker-header-v2.hbs"
+    },
+    "tracker": {
+      "template": "systems/fvtt-lethal-fantasy/templates/combat-tracker-v2.hbs"
+    },
+    "footer": {
+      "template": "systems/fvtt-lethal-fantasy/templates/combat-tracker-footer-v2.hbs"
+    }
+  }
+
+  static DEFAULT_OPTIONS = foundry.utils.mergeObject(super.DEFAULT_OPTIONS, {
+    actions: {
+      initiativePlus: LethalFantasyCombatTracker.#initiativePlus,
+      initiativeMinus: LethalFantasyCombatTracker.#initiativeMinus,
+    },
+  });
+
+  async _prepareContext(options) {
+    let data = await super._prepareContext(options);
+    console?.log("Combat Tracker Data", data);
+    /*for (let u of data.turns) {
       let c = game.combat.combatants.get(u.id);
       u.progressionCount = c.system.progressionCount
       u.isMonster = c.actor.type === "monster"
     }
-    console.log("Combat Data", data);
+    console.log("Combat Data", data);*/
     return data;
   }
 
+  static #initiativePlus(ev) {
+    ev.preventDefault();
+    let cId = ev.target.closest(".combatant").dataset.combatantId;
+    let c = game.combat.combatants.get(cId);
+    c.update({ 'initiative': c.initiative + 1 });
+    console.log("Initiative Plus");
+  }
+
+  static #initiativeMinus(ev) {
+    ev.preventDefault();
+    let cId = ev.target.closest(".combatant").dataset.combatantId;
+    let c = game.combat.combatants.get(cId);
+    let newInit = Math.max(c.initiative - 1, 0);
+    c.update({ 'initiative': newInit });
+  }
+
   activateListeners(html) {
     super.activateListeners(html);
     // Display Combat settings
@@ -21,7 +57,6 @@ export class LethalFantasyCombatTracker extends foundry.applications.sidebar.tab
       let cId = ev.currentTarget.closest(".combatant").dataset.combatantId;
       let c = game.combat.combatants.get(cId);
       c.update({ 'initiative': c.initiative + 1 });
-      console.log("Initiative Plus");
     });
 
     html.find(".initiative-minus").click(ev => {
@@ -160,10 +195,10 @@ export class LethalFantasyCombat extends Combat {
     }
 
     for (let c of this.combatants) {
-      if ( nextRound >= c.initiative) {
+      if (nextRound >= c.initiative) {
         let user = game.users.find(u => u.active && u.character && u.character.id === c.actor.id);
         if (user?.hasPlayerOwner) {
-          game.socket.emit(`system.${SYSTEM.id}`, { type: "rollProgressionDice", progressionCount: c.system.progressionCount+1, actorId: c.actor.id, combatId: this.id, combatantId: c.id });
+          game.socket.emit(`system.${SYSTEM.id}`, { type: "rollProgressionDice", progressionCount: c.system.progressionCount + 1, actorId: c.actor.id, combatId: this.id, combatantId: c.id });
         } else {
           user = game.users.find(u => u.active && u.isGM);
           c.actor.system.rollProgressionDice(this.id, c.id);

module/models/monster.mjs

@@ -238,7 +238,7 @@ export default class LethalFantasyMonster extends foundry.abstract.TypeDataModel
 
   async rollProgressionDice(combatId, combatantId) {
 
-    const rollModes = Object.fromEntries(Object.entries(CONFIG.Dice.rollModes).map(([key, value]) => [key, game.i18n.localize(value)]))
+    const rollModes = foundry.utils.duplicate(CONFIG.Dice.rollModes)
     const fieldRollMode = new foundry.data.fields.StringField({
       choices: rollModes,
       blank: false,