Use initiative

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}),
@@ -185,6 +187,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,23 +385,88 @@ 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", { 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
+    }
+  }
+  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) {
+      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)
+    }
+  }
+  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")
+  }
+  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 })
-    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.initiative + (r.total / 10)
+      this.turn = turn
+    }
+    return this.currentInit
   }
 
   /* -------------------------------------------- */
@@ -443,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
   }
@@ -612,12 +683,15 @@ export class Hero6Actor extends Actor {
     let myRoll = new Roll(rollData.diceFormula).roll({ async: false })
     await Hero6Utility.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
 
-    rollData.roll = duplicate(myRoll)
     rollData.bodyValue = Hero6Utility.computeBodyValue(myRoll)
     rollData.result = myRoll.total
+    rollData.roll = duplicate(myRoll)
 
-    let msg = await Hero6Utility.createChatWithRollMode(rollData.alias, {
-      content: await renderTemplate(`systems/fvtt-hero-system-6/templates/chat/chat-lift-dice-result.hbs`, rollData)
+    let msgFlavor = await renderTemplate(`systems/fvtt-hero-system-6/templates/chat/chat-lift-dice-result.hbs`, rollData)
+    let msg = await myRoll.toMessage({
+      user: game.user.id,
+      rollMode: game.settings.get("core", "rollMode"),
+      flavor: msgFlavor
     })
     msg.setFlag("world", "rolldata", rollData)
     console.log("Rolldata result", rollData)

modules/hero6-combat.js

@@ -5,7 +5,7 @@ export class Hero6CombatTracker extends CombatTracker {
 
   /* -------------------------------------------- */
   static get defaultOptions() {
-    var path = "systems/fvtt-hero-system-6/templates/apps/combat-tracker.hbs";
+    let path = "systems/fvtt-hero-system-6/templates/apps/combat-tracker.hbs";
     return foundry.utils.mergeObject(super.defaultOptions, {
       template: path,
     });
@@ -16,114 +16,200 @@ 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) {
     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'));
+          let id = target.data('combatant-id')
+          let c = game.combat.combatants.get(id)
+          c.actor.holdAction()
         }
-        newOpt = duplicate(option)
+        //newOpt = duplicate(option)
       }
     }
-    newOpt.name = "Abort action"
-    newOpt.callback = target => {
-      Hero6Combat.abortAction(target.data('combatant-id'));
-    }
-    options.push( newOpt)
+    //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)
+  holdAction(combatantId) {
+    this.rebuildInitiative()
+    //console.log("Rebuilding.....")
   }
+
   /* -------------------------------------------- */
-  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)
+  abortAction(actorId, abortState) {
+    this.rebuildInitiative()
   }
 
   /* -------------------------------------------- */
   constructor(data, context) {
     super(data, context);
 
-    this.turnNumber = 1;
+    this.turnNumber = 0;
     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 }]);
+  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()
     }
-    console.log("Combatant", c)
+    if (updList.length > 0) {
+      await this.updateEmbeddedDocuments("Combatant", updList);
+    }
+
+    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
+    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 (isOnAbort) {
+        name = c.actor.name + " (A)"
+        if ( c.actor.incAbortActionCount() ) {
+          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;
+
+    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() {
-    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;
+  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
+        }
       }
     }
-    let advanceTime = Math.max(this.turns.length - this.turn, 0) * CONFIG.time.turnTime;
-    advanceTime += CONFIG.time.roundTime;
-    let nextRound = this.round + 1;
+    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()
+    }
+  }
+
+  /* -------------------------------------------- */
+  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")
-    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)
+    //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);
@@ -132,13 +218,14 @@ export class Hero6Combat extends Combat {
 
   /* -------------------------------------------- */
   async _onCreateEmbeddedDocuments(type, documents, result, options, userId) {
-    console.log(">>>>", documents)
-    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

@@ -43,8 +43,8 @@ Hooks.once("init", async function () {
     formula: "1d6",
     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,6 +96,8 @@ Hooks.once("ready", function () {
   welcomeMessage();
   Hero6Utility.ready()
   Hero6Commands.ready()
+  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()
 
@@ -388,18 +393,22 @@ export class Hero6Utility {
     // Ensure we have no space at all
     //hero6Formula = hero6Formula.replace(/\s/g, '')
     let hasHalfDice = ""
-    if (hero6Formula.match("1/2d6")) {
-      hero6Formula = hero6Formula.replace("1/2d6", "d6")
-      hasHalfDice = "+round(1d6/2)"
+    let newFormula = hero6Formula
+
+    let form1 = hero6Formula.match(/\s*(\d*)\s*1\/2d6/)
+    if ( form1 ) { 
+      let nbDice = form1[1] || 0
+      newFormula = nbDice+"d6+round(1d6/2)"
     }
-    if (hero6Formula.match(".5")) {
-      hero6Formula = hero6Formula.replace(".5", "")
-      hasHalfDice = "+round(1d6/2)"
+
+    let form3 = hero6Formula.match(/\s*(\d*)\.5d6/)
+    if ( form3 ) {
+      let nbDice = form3[1] || 0
+      newFormula = nbDice+"d6+round(1d6/2)"
     }
-    let foundryFormula = hero6Formula + hasHalfDice
-    foundryFormula = foundryFormula.replace(' ', '')
-    console.log("Parsed formula : ", hero6Formula, foundryFormula)
-    return foundryFormula
+
+    console.log("Parsed formula : ", hero6Formula, newFormula)
+    return newFormula
   }
 
   /* -------------- ----------------------------- */

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;
 }
@@ -1309,6 +1312,11 @@ Focus FOC: #ff0084
   max-width: 9rem;
   min-width: 9rem;
 }
+.item-field-label-very-short {
+  flex-grow:1;
+  max-width: 2.5rem;
+  min-width: 2.5rem;
+}
 .item-field-label-short {
   flex-grow:1;
   max-width: 4rem;

system.json

@@ -91,16 +91,15 @@
   "styles": [
     "styles/simple.css"
   ],
-  "version": "10.0.41",
+  "version": "10.0.50",
   "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.41.zip",   
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v10.0.50.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": {
@@ -351,8 +352,8 @@
       ],
       "maneuvertype": "general",
       "pha": "",
-      "ocv": 0,
-      "dcv" : 0,
+      "ocv": "",
+      "dcv" : "",
       "isstock": false,
       "active": false
     },

templates/actors/actor-sheet.hbs

@@ -139,18 +139,18 @@
             <ul class="stat-list alternate-list">
               <li class="item flexrow list-item items-title-bg">
                 <span class="item-field-label-long-img">
-                  <label class="">{{upperFirst key}} Standard Maneuver</label>
+                  <label class="">{{upperFirst key}} Maneuver</label>
                 </span>
-                <span class="item-field-label-short">
+                <span class="item-field-label-very-short">
                   <label class="short-label">PHA</label>
                 </span>
-                <span class="item-field-label-short">
+                <span class="item-field-label-very-short">
                   <label class="short-label">OCV</label>
                 </span>
                 <span class="item-field-label-short">
                   <label class="short-label">DCV</label>
                 </span>
-                <span class="item-field-label-medium">
+                <span class="item-field-label-long">
                   <label class="short-label">Effects</label>
                 </span>
               </li>
@@ -160,12 +160,13 @@
                     src="{{maneuver.img}}" /></a>
                 <span class="item-field-label-long">{{maneuver.name}}</span>
 
-                <span class="item-field-label-short">{{maneuver.system.pha}}</span>
-                <span class="item-field-label-short">{{maneuver.system.ocv}}</span>
+                <span class="item-field-label-very-short">{{maneuver.system.pha}}</span>
+                <span class="item-field-label-very-short">{{maneuver.system.ocv}}</span>
                 <span class="item-field-label-short">{{maneuver.system.dcv}}</span>
 
-                <span class="item-field-label-medium">{{maneuver.system.effects}}</span>
+                <span class="item-field-label-long">{{maneuver.system.effects}}</span>
 
+                <span class="item-field-label-short">&nbsp;</span>
                 <div class="item-controls item-controls-fixed">
                   <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
                 </div>
@@ -177,14 +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" />
       
-              <label class="item-field-label-short">&nbsp;</label>
+              <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/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/chat/chat-damage-result.hbs

@@ -20,7 +20,7 @@
       <ul>
         <li>Name : {{title}}</li>
         <li>Damage formula : {{diceFormula}}</li>
-        <li><strong>Result : {{result}}</strong></li>
+        <li><strong>TOTAL : {{result}}</strong></li>
         <li><strong>BODY : {{bodyValue}}</strong></li>
         
       </ul>  

templates/chat/chat-generic-result.hbs

@@ -40,7 +40,7 @@
         </li>
         {{/if}}
 
-        <li><strong>Result : {{result}}</strong>
+        <li><strong>TOTAL : {{result}}</strong>
           {{#if (exists margin)}}
             ({{#if isSuccess}}Success!!{{else}}Failure!{{/if}})
           {{/if}}

templates/chat/chat-lift-dice-result.hbs

@@ -21,7 +21,7 @@
         <li>Lift dice formula : {{diceFormula}}</li>
         <li>BODY : {{bodyValue}}</li>
 
-        <li><strong>Result : {{result}}</strong></li>
+        <li><strong>TOTAL : {{result}}</strong></li>
         
       </ul>  
     </div>

templates/chat/chat-request-defense.hbs

@@ -1,46 +0,0 @@
-<div class="chat-message-header">
-  {{#if actorImg}}
-  <img class="actor-icon" src="{{actorImg}}" alt="{{alias}}" />
-  {{/if}}
-  <h4 class=chat-actor-name>{{alias}}</h4>
-</div>
-
-<hr>
-
-{{#if img}}
-<div>
-  <img class="chat-icon" src="{{img}}" alt="{{name}}" />
-</div>
-{{/if}}
-
-<div class="flexcol">
-</div>
-
-<div>
-  
-  {{#if isRangedAttack}}
-  <div>{{defender.name}} is under Ranged attack. He must roll a Target Roll to defend himself.</div>
-  {{else}}
-  <div>{{defender.name}} is under Melee attack. He must roll a Defense Roll to defend himself.</div>
-  {{/if}}
-
-  <ul>
-    {{#if isRangedAttack}}
-      <li>
-        <button class="chat-card-button roll-defense-ranged" data-roll-id="{{@root.rollId}}">Roll Target !</button>
-      </li>
-    {{else}}
-      <li>
-        {{#each defenderWeapons as |weapon idx|}}
-        <button class="chat-card-button roll-defense-melee" data-defense-weapon-id="{{weapon._id}}"
-          data-roll-id="{{@root.rollId}}">{{weapon.name}}</button>
-        {{/each}}
-      </li>
-    {{/if}}
-    </ul>
-  <!-- <button class="chat-card-button reroll-level-remaining" data-roll-id="{{rollId}}">Reroll</button> -->
-
-  </ul>
-</div>
-
-</div>

templates/items/item-maneuver-sheet.hbs

@@ -38,11 +38,11 @@
           </li>
 
           <li class="flexrow"><label class="item-field-label-medium">OCV</label>
-            <input type="text" class="item-field-label-medium" name="system.ocv" value="{{system.ocv}}" data-dtype="Number"/>
+            <input type="text" class="item-field-label-medium" name="system.ocv" value="{{system.ocv}}" data-dtype="String"/>
           </li>
 
           <li class="flexrow"><label class="item-field-label-medium">DCV</label>
-            <input type="text" class="item-field-label-medium" name="system.dcv" value="{{system.dcv}}" data-dtype="Number"/>
+            <input type="text" class="item-field-label-medium" name="system.dcv" value="{{system.dcv}}" data-dtype="String"/>
           </li>
 
           <li class="flexrow"><label class="item-field-label-medium">Effects</label>

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

@@ -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>