Combat tracker fixes

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)
       }
@@ -43,23 +45,11 @@ export class Hero6Combat extends Combat {
   holdAction(combatantId) {
     this.rebuildInitiative()
     console.log("Rebuilding.....")
-    /*const combatant = game.combat.combatants.get(combatantId)
-    if (combatant.actor.holdAction()) {
-      let id = combatant._id || combatant.id
-      let name = combatant.actor.name + " (H)"
-      await game.combat.updateEmbeddedDocuments("Combatant", [{ _id: id, name: name, holdAction: true }]);
-    }*/
   }
 
   /* -------------------------------------------- */
   abortAction(actorId, abortState) {
     this.rebuildInitiative()
-    /*const combatant = game.combat.combatants.find(c => c.actor.id == actorId)
-    if (abortState) {
-      let id = combatant._id || combatant.id
-      let name = combatant.actor.name + " (A)"
-      await game.combat.updateEmbeddedDocuments("Combatant", [{ _id: id, name: name }]);
-    }*/
   }
 
   /* -------------------------------------------- */
@@ -120,7 +110,7 @@ export class Hero6Combat extends Combat {
       }
       if (isOnAbort) {
         name = c.actor.name + " (A)"
-        if ( hasSegment) {
+        if ( c.actor.incAbortActionCount() ) {
           c.actor.disableAbortAction()
         }
       }