Combat tracker fixes

lang/en.json

@@ -14,5 +14,11 @@
       "TypeEquipment": "Equipment",
       "TypeCurrency": "Currency",
       "TypeManeuver": "Maneuver"
+    },
+    "COMBAT": {
+      "TurnPrev": "Previous initiative",
+      "RoundPrev": "Previous segment",
+      "TurnNext": "Next initiative",
+      "RoundNext": "Next segment"
     }
   }

modules/hero6-actor-sheet.js

@@ -53,6 +53,8 @@ export class Hero6ActorSheet extends ActorSheet {
       subActors: duplicate(this.actor.getSubActors()),
       race: duplicate(this.actor.getRace()),
       encCapacity: this.actor.getEncumbranceCapacity(),
+      isHold: this.actor.getHoldAction(),
+      isAbort: this.actor.getAbortAction(),
       description: await TextEditor.enrichHTML(this.object.system.biodata.description, {async: true}),
       motivation: await TextEditor.enrichHTML(this.object.system.biodata.motivation, {async: true}),
       quote: await TextEditor.enrichHTML(this.object.system.biodata.quote, {async: 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]]
 
@@ -388,27 +388,51 @@ export class Hero6Actor extends Actor {
   /* -------------------------------------------- */
   async cleanCombat() {
     await this.setFlag("world", "hold-action", false)
-    await this.setFlag("world", "abort-action", false)
+    await this.setFlag("world", "abort-action", { state: false, count: 0 } )
   }
   async holdAction() {
+    await this.disableAbortAction()
     if (this.getFlag("world", "hold-action")) {
       await this.setFlag("world", "hold-action", false)
+      //game.combat.holdAction(this.id, false)
+      game.combat.forceHold(this, false)
+      return false
     } else {
       await this.setFlag("world", "hold-action", true)
+      //game.combat.holdAction(this.id, false)      
+      game.combat.forceHold(this, true)
+      return 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() {
+    await this.disableHoldAction()
     let abort = this.getFlag("world", "abort-action")
-    if ( abort.state) {
+    if (abort.state) {
       await this.setFlag("world", "abort-action", { state: false, count: 0 })
+      game.combat.forceAbort(this, false)
+      //game.combat.abortAction(this.id, false)
     } else {
       await this.setFlag("world", "abort-action", { state: true, count: 0 })
+      game.combat.forceAbort(this, true)
+      //game.combat.abortAction(this.id, true)
     }
-    game.combat.rebuildInitiative()
+  }
+  async incAbortActionCount() {
+    let abort = this.getFlag("world", "abort-action")
+    if (abort.state) {
+      abort.count++
+      await this.setFlag("world", "abort-action", abort)
+      if (abort.count == 2) {
+        return true
+      }
+    }
+    return false
   }
   getHoldAction() {
     return this.getFlag("world", "hold-action")
@@ -422,19 +446,27 @@ export class Hero6Actor extends Actor {
   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))
+    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 })
-    let base = this.system.characteristics.dex.value + (r.total / 10)
-    return base
+  getBaseInit(turn) {
+    if ( turn != this.turn) {
+      let r = new Roll("1d6").roll({ async: false })
+      this.currentInit = this.system.characteristics.dex.value + (r.total / 10)
+      this.turn = turn
+    }
+    return this.currentInit
   }
 
   /* -------------------------------------------- */
@@ -476,6 +508,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

@@ -31,7 +31,9 @@ export class Hero6Combat extends Combat {
         option.condition = true;
         option.icon = '<i class="far fa-question-circle"></i>';
         option.callback = target => {
-          Hero6Combat.holdAction(target.data('combatant-id'));
+          let id = target.data('combatant-id')
+          let c = game.combat.combatants.get(id)
+          c.actor.holdAction()
         }
         //newOpt = duplicate(option)
       }
@@ -40,9 +42,14 @@ export class Hero6Combat extends Combat {
   }
 
   /* -------------------------------------------- */
-  static holdAction(combatantId) {
-    const combatant = game.combat.combatants.get(combatantId)
-    combatant.actor.holdAction()
+  holdAction(combatantId) {
+    this.rebuildInitiative()
+    console.log("Rebuilding.....")
+  }
+
+  /* -------------------------------------------- */
+  abortAction(actorId, abortState) {
+    this.rebuildInitiative()
   }
 
   /* -------------------------------------------- */
@@ -68,19 +75,44 @@ export class Hero6Combat extends Combat {
 
     super.startCombat();
   }
+  /* -------------------------------------------- */
+  forceHold(actor, isHold) {
+    let updList = []
+    let c = this.combatants.find(c => c.actor._id == actor.id)
+    let name = actor.name + ((isHold) ? " (H)" : "")
+    updList.push({ _id: c.id || c._id, name: name, initiative: actor.getBaseInit(this.segmentNumber) })
+    this.updateEmbeddedDocuments("Combatant", updList)
+  }
+  /* -------------------------------------------- */
+  forceAbort(actor, isAbort) {
+    let updList = []
+    let c = this.combatants.find(c => c.actor._id == actor.id)
+    let name = actor.name + ((isAbort) ? " (A)" : "")
+    updList.push({ _id: c.id || c._id, name: name, initiative: actor.getBaseInit(this.segmentNumber) })
+    this.updateEmbeddedDocuments("Combatant", updList)
+  }
 
   /* -------------------------------------------- */
   computeInitiative(c, updList) {
     let id = c._id || c.id
-    if (c.actor.hasPhase(this.segmentNumber) || c.actor.getHoldAction()) {
-      let baseInit = c.actor ? c.actor.getBaseInit() : 0;
-      let name = c.actor.name
-      if (c.actor.getHoldAction()) {
-        name = c.actor.name + " (H)"
+    let hasSegment = c.actor.hasPhase(this.segmentNumber)
+    let isOnHold = c.actor.getHoldAction()
+    let isOnAbort = c.actor.getAbortAction()
+    let name = c.actor.name
+    if (hasSegment || isOnHold || isOnAbort) {
+      let baseInit = c.actor ? c.actor.getBaseInit(this.segmentNumber) : 0;
+      if (isOnHold) {
+        if (hasSegment) { // On hold + current segment -> auto-disable on hold
+          c.actor.disableHoldAction()
+        } else {
+          name = c.actor.name + " (H)"
+        }
       }
-      if (c.actor.getAbortAction()) {
+      if (isOnAbort) {
         name = c.actor.name + " (A)"
-        c.actor.disableAbortAction()
+        if ( c.actor.incAbortActionCount() ) {
+          c.actor.disableAbortAction()
+        }
       }
       updList.push({ _id: id, name: name, initiative: baseInit, holdAction: c.holdAction })
     } else {
@@ -92,7 +124,6 @@ export class Hero6Combat extends Combat {
   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])
@@ -112,46 +143,73 @@ export class Hero6Combat extends Combat {
     for (let c of this.combatants) {
       this.computeInitiative(c, updList)
     }
-    console.log(this.combatants, 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
+  }
+
+  /* -------------------------------------------- */
+  nextTurn() {
+    let nbC = this.combatants.filter(c => c.initiative > 0).length
+    //console.log("Next turn called....", this.turn, nbC)
+    if (this.turn < nbC-1) {
+      super.nextTurn()
+    } else {
+      this.nextRound()
     }
   }
 
   /* -------------------------------------------- */
-  nextRound() {
+  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.
-    if (this.settings.skipDefeated && (turn !== null)) {
-      turn = this.turns.findIndex(t => !t.isDefeated);
-      if (turn === -1) {
-        ui.notifications.warn("COMBAT.NoneRemaining", { localize: true });
-        turn = 0;
-      }
-    }
-    let advanceTime = Math.max(this.turns.length - this.turn, 0) * CONFIG.time.turnTime;
-    advanceTime += CONFIG.time.roundTime;
-    let nextRound = this.round + 1;
-
     let turnData = this.getFlag("world", "hero6-turn-data")
-    if (!turnData) {
-      turnData = { turnNumber: 0, segmentNumber: 12 }
-      this.setFlag("world", "hero6-turn-data", turnData)
-    }
-    turnData = duplicate(turnData)
-    turnData.segmentNumber += 1
-    if (turnData.segmentNumber > 12) {
-      turnData.segmentNumber = 1
-      turnData.turnNumber++
-    }
-    this.setFlag("world", "hero6-turn-data", turnData)
-    this.turnNumber = turnData.turnNumber;
-    this.segmentNumber = turnData.segmentNumber;
 
-    // Re-compute init of actors
-    this.rebuildInitiative()
+    //console.log("Next round called....", nextRound, turnData)
+    while (!hasCombatants) {
+      if (this.settings.skipDefeated && (turn !== null)) {
+        turn = this.turns.findIndex(t => !t.isDefeated);
+        if (turn === -1) {
+          ui.notifications.warn("COMBAT.NoneRemaining", { localize: true });
+          turn = 0;
+        }
+      }
+      advanceTime = Math.max(this.turns.length - this.turn, 0) * CONFIG.time.turnTime;
+      advanceTime += CONFIG.time.roundTime;
+      nextRound = nextRound + 1;
+      //console.log("Next round called....2", nextRound, turnData)
+      turnData = this.getFlag("world", "hero6-turn-data")
+      if (!turnData) {
+        turnData = { turnNumber: 0, segmentNumber: 12 }
+        this.setFlag("world", "hero6-turn-data", turnData)
+      }
+      turnData = duplicate(turnData)
+      turnData.segmentNumber += 1
+      if (turnData.segmentNumber > 12) {
+        turnData.segmentNumber = 1
+        turnData.turnNumber++
+      }
+      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
+      hasCombatants = await this.rebuildInitiative()
+      //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);
@@ -160,12 +218,14 @@ export class Hero6Combat extends Combat {
 
   /* -------------------------------------------- */
   async _onCreateEmbeddedDocuments(type, documents, result, options, userId) {
-    super._onCreateEmbeddedDocuments(type, documents, result, options, userId)
+    //console.log("Added...")
+    await super._onCreateEmbeddedDocuments(type, documents, result, options, userId)
+    await this.rebuildInitiative()
   }
 
-  /* -------------------------------------------- */
+  /* -------------------------------------------- 
   _onUpdate(changed, options, userId) {
-  }
+  }*/
 
   /* -------------------------------------------- */
   static async checkTurnPosition() {

modules/hero6-main.js

@@ -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>
     ` });
 }
 

styles/simple.css

@@ -1258,6 +1258,9 @@ Focus FOC: #ff0084
   background: black;
   color: white;
 }
+.item-packed {
+  flex-grow:0;
+}
 .items-title-text {
   margin-left: 4px;
 }

system.json

@@ -91,16 +91,15 @@
   "styles": [
     "styles/simple.css"
   ],
-  "version": "10.0.43",
+  "version": "10.0.49",
   "compatibility": {
     "minimum": "10",
-    "verified": "10",
-    "maximum": "11"
+    "verified": "11"
   },
   "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.43.zip",   
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v10.0.49.zip",   
   "url": "https://www.uberwald.me/gitea/uberwald/",
-  "background": "images/ui/hro6_welcome_page.webp",
+  "background": "images/ui/hero6_welcome_page.webp",
   "id": "fvtt-hero-system-6"
 }

template.json

@@ -56,6 +56,7 @@
             "value": 10,
             "base": 10,
             "hasroll": true,
+            "initiative": 10,
             "category": "main"
           },
           "con": {

templates/actors/actor-sheet.hbs

@@ -178,17 +178,21 @@
   
         <div>
           <ul class="item-list alternate-list">
-            <li class="flexrow item">
-              <label class="item-field-label-medium">SPD</label>
+            <li class="flexrow item item-packed">
+
+              <label class="">Initiative</label>
+              <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.dex.initiative" value="{{characteristics.dex.initiative}}" data-dtype="Number" />
+              
+              <label class="items-title-text">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" />
       
-              <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>
+              <button class="chat-card-button item-field-label-medium hold-action">{{#if isHold}}Unhold{{else}}Hold{{/if}}</button>
+              <button class="chat-card-button item-field-label-medium abort-action">{{#if isAbort}}Unabort{{else}}Abort{{/if}}</button>
 
-              <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>
+              <label class="items-title-text">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>
 
             </li>
           </ul>

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

@@ -22,7 +22,7 @@
   {{#if charac.lift}}
   <h4 class="item-field-label-short margin-item-list">&nbsp;&nbsp;</h4>
   <h4 class="item-field-label-short margin-item-list">{{charac.lift}}</h4>
-  <h4 class="item-field-label-short margin-item-list"><a class="roll-lift-dice" data-charac-key="{{key}}"><i
+  <h4 class="item-field-label-medium margin-item-list"><a class="roll-lift-dice" data-charac-key="{{key}}"><i
         class="fas fa-dice"></i>{{charac.liftDice}}</a></h4>
 
   <select class="actor-computer-str-end" name="system.characteristics.str.strendmode"
@@ -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-long2 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>