Combat tracker fixes

modules/hero6-actor-sheet.js

@@ -185,6 +185,13 @@ export class Hero6ActorSheet extends ActorSheet {
       this.actor.rollWeapon(skillId)
     });
 
+    html.find('.hold-action').click((event) => {
+      this.actor.holdAction()
+    });
+    html.find('.abort-action').click((event) => {
+      this.actor.abortAction()
+    });
+    
     html.find('.lock-unlock-sheet').click((event) => {
       this.options.editScore = !this.options.editScore;
       this.render(true);

modules/hero6-actor.js

@@ -4,7 +4,7 @@ import { Hero6RollDialog } from "./hero6-roll-dialog.js";
 import { Hero6LiftDice } from "./hero6-lift-dice.js";
 
 /* -------------------------------------------- */
-const __speed2Segments = [[0], [7], [6, 12], [4, 8, 12], [3, 6, 9, 12], [3, 5, 8, 10, 12], [2, 4, 6, 8, 10, 12]
+const __speed2Segments = [ [0], [7], [6, 12], [4, 8, 12], [3, 6, 9, 12], [3, 5, 8, 10, 12], [2, 4, 6, 8, 10, 12],
 [2, 4, 6, 7, 9, 11, 12], [2, 3, 5, 6, 8, 9, 11, 12], [2, 3, 4, 6, 7, 8, 10, 11, 12], [2, 3, 4, 5, 6, 8, 9, 10, 11, 12],
 [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]]
 
@@ -385,18 +385,59 @@ export class Hero6Actor extends Actor {
       await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
     }
   }
+  /* -------------------------------------------- */
+  async cleanCombat() {
+    await this.setFlag("world", "hold-action", false)
+    await this.setFlag("world", "abort-action", false)
+  }
+  async holdAction() {
+    if (this.getFlag("world", "hold-action")) {
+      await this.setFlag("world", "hold-action", false)
+    } else {
+      await this.setFlag("world", "hold-action", true)
+    }
+    game.combat.rebuildInitiative()
+  }
+  async disableHoldAction() {
+    await this.setFlag("world", "hold-action", false)
+  }
+  async disableAbortAction() {
+    await this.setFlag("world", "abort-action", { state: false, count: 0 })
+  }
+  async abortAction() {
+    let abort = this.getFlag("world", "abort-action")
+    if (abort.state) {
+      await this.setFlag("world", "abort-action", { state: false, count: 0 })
+    } else {
+      await this.setFlag("world", "abort-action", { state: true, count: 0 })
+    }
+    game.combat.rebuildInitiative()
+  }
+  getHoldAction() {
+    return this.getFlag("world", "hold-action")
+  }
+  getAbortAction() {
+    let abort = this.getFlag("world", "abort-action")
+    return abort?.state || false
+  }
 
   /* -------------------------------------------- */
   hasPhase(segmentNumber) {
     let index = Math.min(Math.max(this.system.characteristics.spd.value, 1), 12) // Security bounds
     let phases = __speed2Segments[index]
+    console.log("index", segmentNumber, index, phases, phases.includes(segmentNumber), __speed2Segments)
     return phases.includes(segmentNumber)
   }
   /* -------------------------------------------- */
   getSegments() {
-    let index = [ Math.min(Math.max(this.system.characteristics.spd.value, 1), 12) ] // Security bounds
+    let index = Math.min(Math.max(this.system.characteristics.spd.value, 1), 12) // Security bounds
+    console.log("INDEX", index, __speed2Segments[index])
     return __speed2Segments[index]
   }
+  getPhasesString() {
+    let index = Math.min(Math.max(this.system.characteristics.spd.value, 1), 12) // Security bounds
+    return __speed2Segments[index].toString()
+  }
   /* -------------------------------------------- */
   getBaseInit() {
     let r = new Roll("1d6").roll({ async: false })
@@ -443,6 +484,12 @@ export class Hero6Actor extends Actor {
         ch.lift = Hero6LiftDice.getLift(ch.value)
         ch.liftDice = Hero6LiftDice.getLiftDice(ch.value)
       }
+      if (key == "spd") {
+        ch.phasesString = this.getPhasesString()
+      }
+      if (key =="pre") {
+        ch.presenceattack = duplicate(this.system.biodata.presenceattack)
+      }
     }
     return characs
   }

modules/hero6-combat.js

@@ -16,47 +16,33 @@ export class Hero6CombatTracker extends CombatTracker {
 export class Hero6Combat extends Combat {
 
   /* -------------------------------------------- */
-  static init() {
+  static ready() {
     Hooks.on("getCombatTrackerEntryContext", (html, options) => { Hero6Combat.pushMenuOptions(html, options); });
+    game.combat.settings.resource = "characteristics.spd.value";
   }
+
   /* -------------------------------------------- */
   static pushMenuOptions(html, options) {
-    console.log(">>>>>>>>>>>>>>>>>>>>>>>< MENU OPTIONS!!!!!")
     let newOpt
     for (let i = 0; i < options.length; i++) {
       let option = options[i];
       if (option.name == 'COMBAT.CombatantReroll') { // Replace !
-        option.name = "Hold action";
+        option.name = "Hold/Unhold action";
         option.condition = true;
         option.icon = '<i class="far fa-question-circle"></i>';
         option.callback = target => {
           Hero6Combat.holdAction(target.data('combatant-id'));
         }
-        newOpt = duplicate(option)
+        //newOpt = duplicate(option)
       }
     }
-    newOpt.name = "Abort action"
+    //options.push(newOpt)
-    newOpt.callback = target => {
-      Hero6Combat.abortAction(target.data('combatant-id'));
-    }
-    options.push( newOpt)
   }
 
   /* -------------------------------------------- */
   static holdAction(combatantId) {
-    console.log("Combatant HOLD : ", combatantId)
     const combatant = game.combat.combatants.get(combatantId)
-    combatant.setFlag("world", "hero6-hold-action", true)
+    combatant.actor.holdAction()
-    combatant.update({name: combatant.name + " (H)"})
-    console.log("HOLD", combatant)
-  }
-  /* -------------------------------------------- */
-  static abortAction(html, combatantId) {
-    console.log("Combatant ABORT : ", combatantId);
-    const combatant = game.combat.combatants.get(combatantId);
-    combatant.setFlag("world", "hero6-abort-action", true)
-    combatant.update({name: combatant.name + " (A)"})
-    console.log("ABORT", combatant)
   }
 
   /* -------------------------------------------- */
@@ -68,30 +54,93 @@ export class Hero6Combat extends Combat {
   }
 
   /* -------------------------------------------- */
-  async computeInitiative(c) {
+  async startCombat() {
+    game.combat.settings.resource = "characteristics.spd.value";
+
+    let updList = []
+    for (let c of this.combatants) {
+      this.computeInitiative(c, updList)
+      await c.actor.cleanCombat()
+    }
+    if (updList.length > 0) {
+      await this.updateEmbeddedDocuments("Combatant", updList);
+    }
+
+    super.startCombat();
+  }
+
+  /* -------------------------------------------- */
+  computeInitiative(c, updList) {
     let id = c._id || c.id
-    if (c.actor.hasPhase(this.segmentNumber)) {
+    let hasSegment = c.actor.hasPhase(this.segmentNumber)
-      let baseInit = c.actor ? c.actor.getBaseInit() : - 1;
+    let isOnHold = c.actor.isOnHold()
-      await this.updateEmbeddedDocuments("Combatant", [{ _id: id, initiative: baseInit }]);
+    if (hasSegment || isOnHold) {
+      let baseInit = c.actor ? c.actor.getBaseInit() : 0;
+      let name = c.actor.name
+      if (isOnHold) {
+        if (hasSegment) { // On hold + current segment -> auto-disable on hold
+          c.actor.disableHoldAction()
         } else {
-      await this.updateEmbeddedDocuments("Combatant", [{ _id: id, initiative: -1, visible: false, active: false }]);
+          name = c.actor.name + " (H)"
         }
-    console.log("Combatant", c)
       }
+      if (c.actor.getAbortAction()) {
+        name = c.actor.name + " (A)"
+        c.actor.disableAbortAction()
+      }
+      updList.push({ _id: id, name: name, initiative: baseInit, holdAction: c.holdAction })
+    } else {
+      updList.push({ _id: id, name: name, initiative: 0, holdAction: c.holdAction })
+    }
+  }
+
   /* -------------------------------------------- */
   async rollInitiative(ids, formula = undefined, messageOptions = {}) {
     ids = typeof ids === "string" ? [ids] : ids;
+
+    console.log("Roll INIT")
+    let updList = []
     for (let cId = 0; cId < ids.length; cId++) {
       const c = this.combatants.get(ids[cId])
-      await this.computeInitiative(c)
+      this.computeInitiative(c, updList)
+    }
+
+    if (updList.length > 0) {
+      await this.updateEmbeddedDocuments("Combatant", updList);
     }
 
     return this;
   }
 
   /* -------------------------------------------- */
-  nextRound() {
+  async rebuildInitiative() {
+    let updList = []
+    for (let c of this.combatants) {
+      this.computeInitiative(c, updList)
+    }
+    if (updList.length > 0) {
+      await this.updateEmbeddedDocuments("Combatant", updList);
+      console.log("Rebuild INIT", updList)
+      for(let c of updList) {
+        if ( c.initiative != 0) {
+          return true
+        }
+      }
+    }
+    return false
+  }
+
+  /* -------------------------------------------- */
+  async nextRound() {
+    let hasCombatants = false
+    let nextRound = this.round
+    let advanceTime = 0
     let turn = this.turn === null ? null : 0; // Preserve the fact that it's no-one's turn currently.
+    let turnData = this.getFlag("world", "hero6-turn-data")
+    
+    console.log("Next round called....", nextRound, turnData)
+    while (!hasCombatants) {
+      turn = turn; // Preserve the fact that it's no-one's turn currently.
       if (this.settings.skipDefeated && (turn !== null)) {
         turn = this.turns.findIndex(t => !t.isDefeated);
         if (turn === -1) {
@@ -99,11 +148,11 @@ export class Hero6Combat extends Combat {
           turn = 0;
         }
       }
-    let advanceTime = Math.max(this.turns.length - this.turn, 0) * CONFIG.time.turnTime;
+      advanceTime = Math.max(this.turns.length - this.turn, 0) * CONFIG.time.turnTime;
       advanceTime += CONFIG.time.roundTime;
-    let nextRound = this.round + 1;
+      nextRound = nextRound + 1;
-
+      console.log("Next round called....2", nextRound, turnData)
-    let turnData = this.getFlag("world", "hero6-turn-data")
+      turnData = this.getFlag("world", "hero6-turn-data")
       if (!turnData) {
         turnData = { turnNumber: 0, segmentNumber: 12 }
         this.setFlag("world", "hero6-turn-data", turnData)
@@ -114,17 +163,18 @@ export class Hero6Combat extends Combat {
         turnData.segmentNumber = 1
         turnData.turnNumber++
       }
-    this.setFlag("world", "hero6-turn-data", turnData)
+      await this.setFlag("world", "hero6-turn-data", turnData)
       this.turnNumber = turnData.turnNumber;
       this.segmentNumber = turnData.segmentNumber;
+      console.log("Next round called....3", nextRound, turnData)
 
       // Re-compute init of actors
-    for (let c of this.combatants) {
+      hasCombatants = await this.rebuildInitiative()
-      this.computeInitiative(c)
+      console.log("Going round....", nextRound, hasCombatants)
     }
 
     // Update the document, passing data through a hook first
-    const updateData = { round: nextRound, turn, segmentNumber: turnData.segmentNumber, turnNumber: turnData.turnNumber };
+    const updateData = { round: nextRound, turn: turn, segmentNumber: turnData.segmentNumber, turnNumber: turnData.turnNumber };
     const updateOptions = { advanceTime, direction: 1 };
     Hooks.callAll("combatRound", this, updateData, updateOptions);
     return this.update(updateData, updateOptions);
@@ -133,7 +183,6 @@ export class Hero6Combat extends Combat {
 
   /* -------------------------------------------- */
   async _onCreateEmbeddedDocuments(type, documents, result, options, userId) {
-    console.log(">>>>", documents)
     super._onCreateEmbeddedDocuments(type, documents, result, options, userId)
   }
 

modules/hero6-main.js

@@ -44,7 +44,7 @@ Hooks.once("init", async function () {
     decimals: 3
   };
   
-  /* -------------------------------------------- */
+  /* -------------------------------  ------------- */
   game.socket.on("system.fvtt-hero-system-6", data => {
     Hero6Utility.onSocketMesssage(data)
   });
@@ -75,7 +75,7 @@ function welcomeMessage() {
     user: game.user.id,
     whisper: [game.user.id],
     content: `<div id="welcome-message-dark-stars"><span class="rdd-roll-part">
-    <strong>Welcome to the Hero6 RPG.</strong>
+    <strong>Welcome to Hero System 6E RPG.</strong>
     ` });
 }
 
@@ -96,7 +96,7 @@ Hooks.once("ready", function () {
   welcomeMessage();
   Hero6Utility.ready()
   Hero6Commands.ready()
-  Hero6Combat.init()
+  Hero6Combat.ready()
   
 })
 

modules/hero6-utility.js

@@ -52,6 +52,11 @@ export class Hero6Utility {
       }
       return false
     })
+    Handlebars.registerHelper('checkInit', function (value) {
+      let myValue = Number(value) || 0
+      return myValue > 0
+    })
+    
 
     this.gameSettings()
 

system.json

@@ -91,7 +91,7 @@
   "styles": [
     "styles/simple.css"
   ],
-  "version": "10.0.42",
+  "version": "10.0.44",
   "compatibility": {
     "minimum": "10",
     "verified": "10",
@@ -99,7 +99,7 @@
   },
   "title": "Hero System v6 for FoundrtVTT (Official)",
   "manifest": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/raw/branch/main/system.json",
-  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v10.0.42.zip",   
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v10.0.44.zip",   
   "url": "https://www.uberwald.me/gitea/uberwald/",
   "background": "images/ui/hro6_welcome_page.webp",
   "id": "fvtt-hero-system-6"

templates/actors/actor-sheet.hbs

@@ -182,7 +182,10 @@
               <label class="item-field-label-medium">SPD</label>
               <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.spd.value" value="{{characteristics.spd.value}}" data-dtype="Number" />
       
-              <label class="item-field-label-short">&nbsp;</label>
+              <span class="item-field-label-very-short">&nbsp;</span>
+              <button class="chat-card-button item-field-label-medium hold-action">Hold/Unhold</button>
+              <button class="chat-card-button item-field-label-medium abort-action">Abort/Unabort</button>
+              <span class="">&nbsp;</span>
 
               <label class="item-field-label-long">Presence attack</label>
               <a class="roll-direct" data-roll-source="Presence attack"  data-roll-formula="{{system.biodata.presenceattack.rollFormula}}"><i class="fas fa-dice"></i>{{system.biodata.presenceattack.displayFormula}}</a>

templates/apps/combat-tracker.hbs

@@ -60,11 +60,11 @@
 
     <ol id="combat-tracker" class="directory-list">
         {{#each turns}}
-          {{#if (ne this.initiative "-1")}}
+          {{#if (checkInit this.initiative)}}
           <li class="combatant actor directory-item flexrow {{this.css}}" data-combatant-id="{{this.id}}">
               <img class="token-image" data-src="{{this.img}}" alt="{{this.name}}"/>
               <div class="token-name flexcol">
-                  <h4>{{this.name}} {{log this}} {{#if this.holdAction}}(H){{/if}}</h4>
+                  <h4>{{this.name}} </h4>
                   <div class="combatant-controls flexrow">
                       {{#if ../user.isGM}}
                       <a class="combatant-control {{#if this.hidden}}active{{/if}}" data-tooltip="COMBAT.ToggleVis" data-control="toggleHidden">

templates/partials/partial-actor-equipment-section.hbs

@@ -4,7 +4,7 @@
             <label class="">&nbsp;</label>
           </span>
           <span class="item-field-label-short">
-            <label class="item-field-label-short">Q.</label>
+            <label class="item-field-label-short">Qty</label>
           </span>
           <span class="item-field-label-long3">
             <label class="item-field-label-long3">{{title}}</label>

templates/partials/partial-actor-full-charac.hbs

@@ -37,4 +37,15 @@
 
   {{/if}}
 
+  {{#if charac.phasesString}}
+    <h4 class="item-field-label-short margin-item-list">&nbsp;&nbsp;</h4>
+    <h4 class="item-field-label-long margin-item-list">Phases : {{charac.phasesString}}</h4>
+  {{/if}}
+
+  {{#if charac.presenceattack}}
+    <h4 class="item-field-label-short margin-item-list">&nbsp;&nbsp;</h4>
+    <h4 class="item-field-label-long margin-item-list">Presence attack</h4>
+    <a class="roll-direct" data-roll-source="Presence attack"  data-roll-formula="{{charac.presenceattack.rollFormula}}"><i class="fas fa-dice"></i>{{charac.presenceattack.displayFormula}}</a>
+  {{/if}}
+
 </li>