Combat Tracker + power enhancements

modules/hero6-actor.js

@@ -3,12 +3,9 @@ import { Hero6Utility } from "./hero6-utility.js";
 import { Hero6RollDialog } from "./hero6-roll-dialog.js";
 
 /* -------------------------------------------- */
-const coverBonusTable = { "nocover": 0, "lightcover": 2, "heavycover": 4, "entrenchedcover": 6 };
+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 statThreatLevel = ["agi", "str", "phy", "com", "def", "per"]
+    [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],
-const __subkey2title = {
+    [2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]]
-  "melee-dmg": "Melee Damage", "melee-atk": "Melee Attack", "ranged-atk": "Ranged Attack",
-  "ranged-dmg": "Ranged Damage", "dmg-res": "Damare Resistance"
-}
 
 /* -------------------------------------------- */
 /* -------------------------------------------- */
@@ -67,8 +64,8 @@ export class Hero6Actor extends Actor {
     }
   }
   computeDicesValue() {
-    this.system.biodata.presenceattack = Hero6Utility.getDerivatedDiceFormulas(this.system.characteristics.pre.value )
+    this.system.biodata.presenceattack = Hero6Utility.getDerivatedDiceFormulas(this.system.characteristics.pre.value)
-    this.system.characteristics.str.strdice = Hero6Utility.getDerivatedDiceFormulas(this.system.characteristics.str.value )
+    this.system.characteristics.str.strdice = Hero6Utility.getDerivatedDiceFormulas(this.system.characteristics.str.value)
   }
   /* -------------------------------------------- */
   prepareDerivedData() {
@@ -275,13 +272,13 @@ export class Hero6Actor extends Actor {
     return 0;
   }
   getManeuvers() {
-    let maneuvers = { 
+    let maneuvers = {
       general: this.items.filter(item => item.type == "maneuver" && item.system.maneuvertype == "general"),
       offensive: this.items.filter(item => item.type == "maneuver" && item.system.maneuvertype == "offensive"),
       defensive: this.items.filter(item => item.type == "maneuver" && item.system.maneuvertype == "defensive")
     }
-    Hero6Utility.sortArrayObjectsByName(maneuvers.general) 
+    Hero6Utility.sortArrayObjectsByName(maneuvers.general)
-    Hero6Utility.sortArrayObjectsByName(maneuvers.offensive) 
+    Hero6Utility.sortArrayObjectsByName(maneuvers.offensive)
     Hero6Utility.sortArrayObjectsByName(maneuvers.defensive)
     return maneuvers
   }
@@ -292,32 +289,32 @@ export class Hero6Actor extends Actor {
   }
   getEquipments() {
     let list = this.items.filter(item => item.type == "equipment" && item.system.subtype == "equipment");
-    Hero6Utility.sortArrayObjectsByName(list) 
+    Hero6Utility.sortArrayObjectsByName(list)
     return list
   }
   getWeapons() {
     let list = this.items.filter(item => item.type == "equipment" && item.system.subtype == "weapon");
-    Hero6Utility.sortArrayObjectsByName(list) 
+    Hero6Utility.sortArrayObjectsByName(list)
     return list
   }
   getArmors() {
     let list = this.items.filter(item => item.type == "equipment" && item.system.subtype == "armor");
-    Hero6Utility.sortArrayObjectsByName(list) 
+    Hero6Utility.sortArrayObjectsByName(list)
     return list
   }
   getShields() {
     let list = this.items.filter(item => item.type == "equipment" && item.system.subtype == "shield");
-    Hero6Utility.sortArrayObjectsByName(list) 
+    Hero6Utility.sortArrayObjectsByName(list)
     return list
   }
   getEquipmentsMoneys() {
     let list = duplicate(this.items.filter(item => item.type == "equipment" && (item.system.subtype == "equipment" || item.system.subtype == "money")) || [])
-    Hero6Utility.sortArrayObjectsByName(list) 
+    Hero6Utility.sortArrayObjectsByName(list)
     return list
   }
   getEquipmentsOnly() {
     let list = duplicate(this.items.filter(item => item.type == "equipment" && item.system.subtype == "equipment") || [])
-    Hero6Utility.sortArrayObjectsByName(list) 
+    Hero6Utility.sortArrayObjectsByName(list)
     return list
   }
 
@@ -412,13 +409,23 @@ export class Hero6Actor extends Actor {
       await this.updateEmbeddedDocuments('Item', [update]); // Updates one EmbeddedEntity
     }
   }
+
   /* -------------------------------------------- */
-  getInitiativeScore(combatId, combatantId) {
+  hasPhase( segmentNumber) {
-    if (this.type == 'character') {
+    let index = Math.min( Math.max(this.system.characteristics.spd.value, 1), 12) // Security bounds
-      this.rollMR(true, combatId, combatantId)
+    let phases = __speed2Segments[index]    
-    }
+    return phases.includes(segmentNumber)
-    console.log("Init required !!!!")
+  }
-    return -1;
+  /* -------------------------------------------- */
+  getSegments() {
+    let index = Math.min( Math.max(this.system.characteristics.spd.value, 1), 12) // Security bounds
+    return __speed2Segments[index]
+  }
+  /* -------------------------------------------- */
+  getBaseInit() {
+    let r = new Roll("1d6").roll({async: false})
+    let base = this.system.characteristics.dex.value + (r.total / 10)
+    return base
   }
 
   /* -------------------------------------------- */

modules/hero6-combat.js

@@ -1,21 +1,141 @@
 import { Hero6Utility } from "./hero6-utility.js";
 
 /* -------------------------------------------- */
-export class Hero6Combat extends Combat {
+export class Hero6CombatTracker extends CombatTracker {
-  
+
   /* -------------------------------------------- */
-  async rollInitiative(ids, formula = undefined, messageOptions = {} ) {
+  static get defaultOptions() {
+    var path = "systems/fvtt-hero-system-6/templates/apps/combat-tracker.hbs";
+    return foundry.utils.mergeObject(super.defaultOptions, {
+      template: path,
+    });
+  }
+}
+
+/* -------------------------------------------- */
+export class Hero6Combat extends Combat {
+
+  /* -------------------------------------------- */
+  static init() {
+    Hooks.on("getCombatTrackerEntryContext", (html, options) => { Hero6Combat.pushMenuOptions(html, options); });
+  }
+  /* -------------------------------------------- */
+  static pushMenuOptions(html, 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.condition = true;
+        option.icon = '<i class="far fa-question-circle"></i>';
+        option.callback = target => {
+          Hero6Combat.holdAction(target.data('combatant-id'));
+        }
+        newOpt = duplicate(option)
+      }
+    }
+    newOpt.name = "Abort action"
+    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.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)
+  }
+
+  /* -------------------------------------------- */
+  constructor(data, context) {
+    super(data, context);
+
+    this.turnNumber = 1;
+    this.segmentNumber = 12;
+  }
+
+  /* -------------------------------------------- */
+  async computeInitiative(c) {
+    let id = c._id || c.id
+    if (c.actor.hasPhase(this.segmentNumber)) {
+      let baseInit = c.actor ? c.actor.getBaseInit() : - 1;
+      await this.updateEmbeddedDocuments("Combatant", [{ _id: id, initiative: baseInit }]);
+    } else {
+      await this.updateEmbeddedDocuments("Combatant", [{ _id: id, initiative: -1, visible: false, active: false }]);
+    }
+    console.log("Combatant", c)
+  }
+  /* -------------------------------------------- */
+  async rollInitiative(ids, formula = undefined, messageOptions = {}) {
     ids = typeof ids === "string" ? [ids] : ids;
     for (let cId = 0; cId < ids.length; cId++) {
-      const c = this.combatants.get(ids[cId]);
+      const c = this.combatants.get(ids[cId])
-      let id = c._id || c.id;
+      await this.computeInitiative(c)
-      let initBonus = c.actor ? c.actor.getInitiativeScore( this.id, id ) : -1;
-      await this.updateEmbeddedDocuments("Combatant", [ { _id: id, initiative: initBonus } ]);
     }
 
     return this;
   }
 
+  /* -------------------------------------------- */
+  nextRound() {
+    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: 1, segmentNumber: 12 }
+      this.setFlag("world", "hero6-turn-data", turnData)
+    }
+    turnData = duplicate(turnData)
+    turnData.segmentNumber -= 1
+    if (turnData.segmentNumber <= 0) {
+      turnData.segmentNumber = 12
+      turnData.turnNumber++
+    }
+    this.setFlag("world", "hero6-turn-data", turnData)
+    this.turnNumber = turnData.turnNumber;
+    this.segmentNumber = turnData.segmentNumber;
+
+    // Re-compute init of actors
+    for (let c of this.combatants) {
+      this.computeInitiative(c)
+    }
+
+    // Update the document, passing data through a hook first
+    const updateData = { round: nextRound, turn, segmentNumber: turnData.segmentNumber, turnNumber: turnData.turnNumber };
+    const updateOptions = { advanceTime, direction: 1 };
+    Hooks.callAll("combatRound", this, updateData, updateOptions);
+    return this.update(updateData, updateOptions);
+  }
+
+
+  /* -------------------------------------------- */
+  async _onCreateEmbeddedDocuments(type, documents, result, options, userId) {
+    console.log(">>>>", documents)
+    super._onCreateEmbeddedDocuments(type, documents, result, options, userId)
+  }
+
   /* -------------------------------------------- */
   _onUpdate(changed, options, userId) {
   }

modules/hero6-config.js

@@ -48,5 +48,11 @@ export const Hero6_CONFIG = {
   powerSenseAffecting: {
     "none": "None",
     "senseaffecting": "Sense-Affecting",
+  },
+  powerEffectRoll: {
+    "standard": "Standard",
+    "normal": "Normal",
+    "killing": "Killing",
+    "countbody": "Killing (Count BODY)"
   }
 }

modules/hero6-main.js

@@ -13,7 +13,7 @@ import { Hero6ItemSheet } from "./hero6-item-sheet.js";
 import { Hero6ActorSheet } from "./hero6-actor-sheet.js";
 import { Hero6NPCSheet } from "./hero6-npc-sheet.js";
 import { Hero6Utility } from "./hero6-utility.js";
-import { Hero6Combat } from "./hero6-combat.js";
+import { Hero6Combat, Hero6CombatTracker } from "./hero6-combat.js";
 import { Hero6Item } from "./hero6-item.js";
 import { Hero6Hotbar } from "./hero6-hotbar.js"
 import { Hero6Commands } from "./hero6-commands.js"
@@ -41,7 +41,7 @@ Hooks.once("init", async function () {
   // Set an initiative formula for the system 
   CONFIG.Combat.initiative = {
     formula: "1d6",
-    decimals: 1
+    decimals: 3
   };
 
   /* -------------------------------------------- */
@@ -54,6 +54,8 @@ Hooks.once("init", async function () {
   CONFIG.Combat.documentClass = Hero6Combat
   CONFIG.Actor.documentClass = Hero6Actor
   CONFIG.Item.documentClass = Hero6Item
+  CONFIG.ui.combat = Hero6CombatTracker;
+
   
   /* -------------------------------------------- */
   // Register sheet application classes
@@ -65,6 +67,7 @@ Hooks.once("init", async function () {
   Items.registerSheet("fvtt-hero-system-6", Hero6ItemSheet, { makeDefault: true });
 
   Hero6Utility.init()
+  Hero6Combat.init()
 });
 
 /* -------------------------------------------- */

modules/hero6-utility.js

@@ -179,7 +179,8 @@ export class Hero6Utility {
       'systems/fvtt-hero-system-6/templates/partials/partial-power-equipment-cost.hbs',
       'systems/fvtt-hero-system-6/templates/partials/partial-item-hasroll.hbs',
       'systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment.hbs',
-      'systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs'
+      'systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs',
+      'systems/fvtt-hero-system-6/templates/partials/partial-power-maneuver-effect.hbs'
     ]
     return loadTemplates(templatePaths);
   }

system.json

@@ -91,7 +91,7 @@
   "styles": [
     "styles/simple.css"
   ],
-  "version": "10.0.33",
+  "version": "10.0.34",
   "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.33.zip",   
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v10.0.34.zip",   
   "url": "https://www.uberwald.me/gitea/uberwald/",
   "background": "images/ui/hro6_welcome_page.webp",
   "id": "fvtt-hero-system-6"

template.json

@@ -346,6 +346,9 @@
         "hasroll": false,
         "roll": 0,
         "computebody": false,
+        "haseffectroll": false,
+        "effectroll": "standard",
+        "effectrollformula": "",
         "items": {}
       }
     },

templates/apps/combat-tracker.hbs

@@ -0,0 +1,127 @@
+<section class="{{cssClass}} directory flexcol" id="{{cssId}}" data-tab="{{tabName}}">
+    <header class="combat-tracker-header">
+        {{#if user.isGM}}
+        <nav class="encounters flexrow" aria-label="COMBAT.NavLabel">
+            <a class="combat-button combat-create" data-tooltip="COMBAT.Create">
+                <i class="fas fa-plus"></i>
+            </a>
+            {{#if combatCount}}
+            <a class="combat-button combat-cycle" data-tooltip="COMBAT.EncounterPrevious"
+               {{#if previousId}}data-document-id="{{previousId}}"{{else}}disabled{{/if}}>
+                <i class="fas fa-caret-left"></i>
+            </a>
+            <h4 class="encounter">{{localize "COMBAT.Encounter"}} {{currentIndex}} / {{combatCount}}</h4>
+            <a class="combat-button combat-cycle" data-tooltip="COMBAT.EncounterNext"
+               {{#if nextId}}data-document-id="{{nextId}}"{{else}}disabled{{/if}}>
+                <i class="fas fa-caret-right"></i>
+            </a>
+            {{/if}}
+            <a class="combat-button combat-control" data-tooltip="COMBAT.Delete" data-control="endCombat" {{#unless combatCount}}disabled{{/unless}}>
+                <i class="fas fa-trash"></i>
+            </a>
+        </nav>
+        {{/if}}
+
+        <div class="encounter-controls flexrow {{#if hasCombat}}combat{{/if}}">
+            {{#if user.isGM}}
+            <a class="combat-button combat-control" data-tooltip="COMBAT.RollAll" data-control="rollAll" {{#unless turns}}disabled{{/unless}}>
+                <i class="fas fa-users"></i>
+            </a>
+            <a class="combat-button combat-control" data-tooltip="COMBAT.RollNPC" data-control="rollNPC" {{#unless turns}}disabled{{/unless}}>
+                <i class="fas fa-users-cog"></i>
+            </a>
+            {{/if}}
+
+            {{#if combatCount}}
+            {{#if combat.round}}
+            <h3 class="encounter-title noborder">Turn {{combat.turnNumber}} Segment {{combat.segmentNumber}}</h3>
+            {{else}}
+            <h3 class="encounter-title noborder">{{localize 'COMBAT.NotStarted'}}</h3>
+            {{/if}}
+            {{else}}
+            <h3 class="encounter-title noborder">{{localize "COMBAT.None"}}</h3>
+            {{/if}}
+
+            {{#if user.isGM}}
+            <a class="combat-button combat-control" data-tooltip="COMBAT.InitiativeReset" data-control="resetAll"
+                {{#unless hasCombat}}disabled{{/unless}}>
+                <i class="fas fa-undo"></i>
+            </a>
+            <a class="combat-button combat-control" data-tooltip="{{labels.scope}}"
+                data-control="toggleSceneLink" {{#unless hasCombat}}disabled{{/unless}}>
+                <i class="fas fa-{{#unless linked}}un{{/unless}}link"></i>
+            </a>
+            <a class="combat-button combat-settings" data-tooltip="COMBAT.Settings" data-control="trackerSettings">
+                <i class="fas fa-cog"></i>
+            </a>
+            {{/if}}
+        </div>
+    </header>
+
+    <ol id="combat-tracker" class="directory-list">
+        {{#each turns}}
+          {{#if (ne this.initiative "-1")}}
+          <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>
+                  <div class="combatant-controls flexrow">
+                      {{#if ../user.isGM}}
+                      <a class="combatant-control {{#if this.hidden}}active{{/if}}" data-tooltip="COMBAT.ToggleVis" data-control="toggleHidden">
+                          <i class="fas fa-eye-slash"></i>
+                      </a>
+                      <a class="combatant-control {{#if this.defeated}}active{{/if}}" data-tooltip="COMBAT.ToggleDead" data-control="toggleDefeated">
+                          <i class="fas fa-skull"></i>
+                      </a>
+                      {{/if}}
+                      {{#if this.canPing}}
+                      <a class="combatant-control" data-tooltip="COMBAT.PingCombatant" data-control="pingCombatant">
+                          <i class="fa-solid fa-bullseye-arrow"></i>
+                      </a>
+                      {{/if}}
+                      <div class="token-effects">
+                          {{#each this.effects}}
+                          <img class="token-effect" src="{{this}}"/>
+                          {{/each}}
+                      </div>
+                  </div>
+              </div>
+
+              {{#if this.hasResource}}
+              <div class="token-resource">
+                  <span class="resource">{{this.resource}}</span>
+              </div>
+              {{/if}}
+
+              <div class="token-initiative">
+                  {{#if this.hasRolled}}
+                  <span class="initiative">{{this.initiative}}</span>
+                  {{else if this.owner}}
+                  <a class="combatant-control roll" data-tooltip="COMBAT.InitiativeRoll" data-control="rollInitiative"></a>
+                  {{/if}}
+              </div>
+          </li>
+          {{/if}}
+        {{/each}}
+    </ol>
+
+    <nav id="combat-controls" class="directory-footer flexrow" data-tooltip-direction="UP">
+    {{#if hasCombat}}
+        {{#if user.isGM}}
+            {{#if round}}
+            <a class="combat-control" data-tooltip="COMBAT.RoundPrev" data-control="previousRound"><i class="fas fa-step-backward"></i></a>
+            <a class="combat-control" data-tooltip="COMBAT.TurnPrev" data-control="previousTurn"><i class="fas fa-arrow-left"></i></a>
+            <a class="combat-control center" data-control="endCombat">{{localize 'COMBAT.End'}}</a>
+            <a class="combat-control" data-tooltip="COMBAT.TurnNext" data-control="nextTurn"><i class="fas fa-arrow-right"></i></a>
+            <a class="combat-control" data-tooltip="COMBAT.RoundNext" data-control="nextRound"><i class="fas fa-step-forward"></i></a>
+            {{else}}
+            <a class="combat-control center" data-control="startCombat">{{localize 'COMBAT.Begin'}}</a>
+            {{/if}}
+        {{else if control}}
+        <a class="combat-control" data-tooltip="COMBAT.TurnPrev" data-control="previousTurn"><i class="fas fa-arrow-left"></i></a>
+        <a class="combat-control center" data-control="nextTurn">{{localize 'COMBAT.TurnEnd'}}</a>
+        <a class="combat-control" data-tooltip="COMBAT.TurnNext" data-control="nextTurn"><i class="fas fa-arrow-right"></i></a>
+        {{/if}}
+    {{/if}}
+    </nav>
+</section>

templates/items/item-maneuver-sheet.hbs

@@ -27,6 +27,8 @@
             </select> 
           </li>
 
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-power-maneuver-effect.hbs}}
+          
           <li class="flexrow"><label class="item-field-label-medium">Is stock ?</label>
             <label class="item-field-label-medium"><input type="checkbox" name="system.isstock" {{checked system.isstock}}/></label>
           </li>
@@ -46,6 +48,7 @@
           <li class="flexrow"><label class="item-field-label-medium">Effects</label>
             <input type="text" class="item-field-label-long" name="system.effects" value="{{system.effects}}" data-dtype="String"/>
           </li>
+
           {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}
 
         </ul>

templates/items/item-power-sheet.hbs

@@ -18,6 +18,8 @@
         <ul>
           {{> systems/fvtt-hero-system-6/templates/partials/partial-item-hasroll.hbs}}
 
+          {{> systems/fvtt-hero-system-6/templates/partials/partial-power-maneuver-effect.hbs}}
+
           {{> systems/fvtt-hero-system-6/templates/partials/partial-power-equipment-cost.hbs}}
 
           {{> systems/fvtt-hero-system-6/templates/partials/partial-item-cost.hbs}}

templates/partials/partial-power-maneuver-effect.hbs

@@ -0,0 +1,20 @@
+<li class="flexrow"><label class="item-field-label-long">Has Effect Roll ?</label>
+  <label class="item-field-label-medium"><input type="checkbox" name="system.haseffectroll" {{checked
+      system.haseffectroll}} /></label>
+</li>
+
+{{#if system.haseffectroll}}
+  <li class="flexrow"><label class="item-field-label-long">Effect Roll</label>
+    <select class="item-field-label-long" type="text" name="system.effectroll" value="{{system.effectroll}}"
+      data-dtype="String">
+      {{#select system.effectroll}}
+      {{#each config.powerEffectRoll as |name key|}}
+      <option value="{{key}}">{{name}}</option>
+      {{/each}}
+      {{/select}}
+    </select>    
+  </li>
+  <li class="flexrow"><label class="item-field-label-long">Effect roll formula</label>
+    <input type="text" class="item-field-label-long" name="system.effectrollformula" value="{{system.effectrollformula}}" data-dtype="String"/>
+  </li>
+{{/if}}