Various fixes and enhancents

modules/hero6-actor-sheet.js

@@ -180,12 +180,16 @@ export class Hero6ActorSheet extends ActorSheet {
       let itemId = li.data("item-id")
       this.actor.rollLiftDice(itemId);
     });    
-    
     html.find('.roll-weapon').click((event) => {
       const li = $(event.currentTarget).parents(".item");
       const skillId = li.data("item-id")
       this.actor.rollWeapon(skillId)
     });
+    html.find('.roll-maneuver').click((event) => {
+      const li = $(event.currentTarget).parents(".item");
+      const maneuverId = li.data("maneuver-id")
+      this.actor.rollManeuver(maneuverId)
+    });
     
     html.find('.hold-action').click((event) => {
       this.actor.holdAction()

modules/hero6-actor.js

@@ -70,6 +70,14 @@ export class Hero6Actor extends Actor {
     }
   }
 
+  /* -------------------------------------------- */
+  performMigration() {
+    // Fix OCV/OMCV rollable
+    if (!this.system.characteristics.ocv.hasroll) {
+      this.update({ 'system.characteristics.ocv.hasroll': true, 'system.characteristics.omcv.hasroll': true })
+    }
+  }
+  /* -------------------------------------------- */
   computeDicesValue() {
     this.system.biodata.presenceattack = Hero6Utility.getDerivatedDiceFormulas(this.system.characteristics.pre.value)
     this.system.characteristics.str.strdice = Hero6LiftDice.getLiftDice(this.system.characteristics.str.value)
@@ -206,6 +214,17 @@ export class Hero6Actor extends Actor {
     }
   }
   
+  /* -------------------------------------------- */
+  prepareManeuver(maneuver) {
+    
+    maneuver.roll = 11 + this.system.characteristics.ocv.value
+    if ( Number(maneuver.system.ocv)) {
+      maneuver.roll += Number(maneuver.system.ocv)
+    } else {
+      maneuver.noOCV = true
+    }
+  }
+
   /* -------------------------------------------- */
   getSkills() {
     let comp = duplicate(this.items.filter(item => item.type == 'skill') || [])
@@ -464,7 +483,7 @@ export class Hero6Actor extends Actor {
   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.currentInit = Number(this.system.characteristics.dex.initiative) + Number(((r.total / 10).toFixed(2)))
       this.turn = turn
     }
     return this.currentInit
@@ -648,6 +667,9 @@ export class Hero6Actor extends Actor {
     if (item.type == "skill") {
       this.prepareSkill(rollData.item)
     }
+    if (item.type == "maneuver") {
+      this.prepareManeuver(rollData.item)
+    }
     this.startRoll(rollData)
   }
   /* -------------------------------------------- */
@@ -697,7 +719,28 @@ export class Hero6Actor extends Actor {
     msg.setFlag("world", "rolldata", rollData)
     console.log("Rolldata result", rollData)
   }
-
+  /* -------------------------------------------- */
+  rollManeuver(maneuverId) {
+    let skill = this.items.get(skillId)
+    if (skill) {
+      if (skill.system.islore && skill.system.level == 0) {
+        ui.notifications.warn("You can't use Lore Skills with a SL of 0.")
+        return
+      }
+      skill = duplicate(skill)
+      Hero6Utility.updateSkill(skill)
+      let abilityKey = skill.system.ability
+      let rollData = this.getCommonRollData(abilityKey)
+      rollData.mode = "skill"
+      rollData.skill = skill
+      rollData.img = skill.img
+      if (rollData.target) {
+        ui.notifications.warn("You are targetting a token with a skill : please use a Weapon instead.")
+        return
+      }
+      this.startRoll(rollData)
+    }
+  }
   /* -------------------------------------------- */
   rollSkill(skillId) {
     let skill = this.items.get(skillId)

modules/hero6-combat.js

@@ -77,19 +77,28 @@ export class Hero6Combat extends Combat {
   }
   /* -------------------------------------------- */
   forceHold(actor, isHold) {
-    let updList = []
+    if (game.user.isGM) {
-    let c = this.combatants.find(c => c.actor._id == actor.id)
+      let updList = []
-    let name = actor.name + ((isHold) ? " (H)" : "")
+      let c = this.combatants.find(c => c.actor._id == actor.id)
-    updList.push({ _id: c.id || c._id, name: name, initiative: actor.getBaseInit(this.segmentNumber) })
+      let name = actor.name + ((isHold) ? " (H)" : "")
-    this.updateEmbeddedDocuments("Combatant", updList)
+      console.log("ForceHold!!", c, actor)
+      updList.push({ _id: c.id || c._id, name: name, initiative: actor.getBaseInit(this.segmentNumber) })
+      this.updateEmbeddedDocuments("Combatant", updList)
+    } else {
+      game.socket.emit("system.fvtt-hero-system-6", { name: "msg_force_hold", data: { actorId: actor.id, isHold: isHold } });
+    }
   }
   /* -------------------------------------------- */
   forceAbort(actor, isAbort) {
-    let updList = []
+    if (game.user.isGM) {
-    let c = this.combatants.find(c => c.actor._id == actor.id)
+      let updList = []
-    let name = actor.name + ((isAbort) ? " (A)" : "")
+      let c = this.combatants.find(c => c.actor._id == actor.id)
-    updList.push({ _id: c.id || c._id, name: name, initiative: actor.getBaseInit(this.segmentNumber) })
+      let name = actor.name + ((isAbort) ? " (A)" : "")
-    this.updateEmbeddedDocuments("Combatant", updList)
+      updList.push({ _id: c.id || c._id, name: name, initiative: actor.getBaseInit(this.segmentNumber) })
+      this.updateEmbeddedDocuments("Combatant", updList)
+    } else {
+      game.socket.emit("system.fvtt-hero-system-6", { name: "msg_force_abort", data: { actorId: actor.id, isAbort: isAbort } });
+    }
   }
 
   /* -------------------------------------------- */
@@ -110,7 +119,7 @@ export class Hero6Combat extends Combat {
       }
       if (isOnAbort) {
         name = c.actor.name + " (A)"
-        if ( c.actor.incAbortActionCount() ) {
+        if (c.actor.incAbortActionCount()) {
           c.actor.disableAbortAction()
         }
       }
@@ -159,7 +168,7 @@ export class Hero6Combat extends Combat {
   nextTurn() {
     let nbC = this.combatants.filter(c => c.initiative > 0).length
     //console.log("Next turn called....", this.turn, nbC)
-    if (this.turn < nbC-1) {
+    if (this.turn < nbC - 1) {
       super.nextTurn()
     } else {
       this.nextRound()
@@ -172,7 +181,7 @@ export class Hero6Combat extends Combat {
     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")
+    let turnData = this.getFlag("world", "turnData")
 
     //console.log("Next round called....", nextRound, turnData)
     while (!hasCombatants) {
@@ -187,18 +196,21 @@ export class Hero6Combat extends Combat {
       advanceTime += CONFIG.time.roundTime;
       nextRound = nextRound + 1;
       //console.log("Next round called....2", nextRound, turnData)
-      turnData = this.getFlag("world", "hero6-turn-data")
+      turnData = this.getFlag("world", "turnData")
       if (!turnData) {
         turnData = { turnNumber: 0, segmentNumber: 12 }
-        this.setFlag("world", "hero6-turn-data", turnData)
+        this.setFlag("world", "turnData", turnData)
       }
       turnData = duplicate(turnData)
       turnData.segmentNumber += 1
       if (turnData.segmentNumber > 12) {
         turnData.segmentNumber = 1
         turnData.turnNumber++
+        ChatMessage.create({
+          content: "Complete Post-Segment 12 Recoveries."
+        })
       }
-      await this.setFlag("world", "hero6-turn-data", turnData)
+      await this.setFlag("world", "turnData", turnData)
       this.turnNumber = turnData.turnNumber;
       this.segmentNumber = turnData.segmentNumber;
       //console.log("Next round called....3", nextRound, turnData)
@@ -209,9 +221,10 @@ export class Hero6Combat extends Combat {
     }
 
     // Update the document, passing data through a hook first
-    const updateData = { round: nextRound, turn: turn, segmentNumber: turnData.segmentNumber, turnNumber: turnData.turnNumber };
+    const updateData = { round: nextRound, turn };
     const updateOptions = { advanceTime, direction: 1 };
     Hooks.callAll("combatRound", this, updateData, updateOptions);
+    console.log(this)
     return this.update(updateData, updateOptions);
   }
 

modules/hero6-main.js

@@ -41,7 +41,7 @@ Hooks.once("init", async function () {
   // Set an initiative formula for the system 
   CONFIG.Combat.initiative = {
     formula: "1d6",
-    decimals: 3
+    decimals: 2
   };
   
   /* -------------------------------  ------------- */

modules/hero6-utility.js

@@ -124,6 +124,10 @@ export class Hero6Utility {
     const rollTables = await Hero6Utility.loadCompendium("fvtt-hero-system-6.rolltables")
     this.rollTables = rollTables.map(i => i.toObject())
 
+    for (let actor of game.actors) {
+      actor.performMigration()
+    }
+
   }
 
   /* -------------------------------------------- */
@@ -230,12 +234,21 @@ export class Hero6Utility {
 
   /* -------------------------------------------- */
   static async onSocketMesssage(msg) {
-    console.log("SOCKET MESSAGE", msg.name)
+    console.log("SOCKET MESSAGE", msg.name, msg)
     if (msg.name == "msg_update_roll") {
       this.updateRollData(msg.data)
     }
-    if (msg.name == "msg_gm_process_attack_defense") {
+    if (msg.name == "msg_force_hold") {
-      this.processSuccessResult(msg.data)
+      if (game.user.isGM) {
+        let actor = game.actors.get(msg.data.actorId)
+        game.combat.forceHold(actor, msg.data.isHold)
+      }
+    }
+    if (msg.name == "msg_force_abort") {
+      if (game.user.isGM) {
+        let actor = game.actors.get(msg.data.actorId)
+        game.combat.forceAbort(actor, msg.data.isAbort)
+      }
     }
     if (msg.name == "msg_gm_item_drop" && game.user.isGM) {
       let actor = game.actors.get(msg.data.actorId)

packs/complications/CURRENT

@@ -1 +1 @@
-MANIFEST-000026
+MANIFEST-000042

packs/complications/LOG

@@ -1,8 +1,8 @@
-2023/08/03-22:40:14.252896 7f01523fc6c0 Recovering log #24
+2023/08/07-22:18:14.000526 7f5afddfa6c0 Recovering log #40
-2023/08/03-22:40:14.358951 7f01523fc6c0 Delete type=3 #22
+2023/08/07-22:18:14.012956 7f5afddfa6c0 Delete type=3 #38
-2023/08/03-22:40:14.359046 7f01523fc6c0 Delete type=0 #24
+2023/08/07-22:18:14.012989 7f5afddfa6c0 Delete type=0 #40
-2023/08/04-06:57:06.069198 7f0151bfb6c0 Level-0 table #29: started
+2023/08/07-23:27:51.013130 7f58677fe6c0 Level-0 table #45: started
-2023/08/04-06:57:06.069219 7f0151bfb6c0 Level-0 table #29: 0 bytes OK
+2023/08/07-23:27:51.013173 7f58677fe6c0 Level-0 table #45: 0 bytes OK
-2023/08/04-06:57:06.076321 7f0151bfb6c0 Delete type=0 #27
+2023/08/07-23:27:51.019258 7f58677fe6c0 Delete type=0 #43
-2023/08/04-06:57:06.083882 7f0151bfb6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/07-23:27:51.040432 7f58677fe6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
-2023/08/04-06:57:06.083924 7f0151bfb6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/07-23:27:51.040586 7f58677fe6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)

packs/complications/LOG.old

@@ -1,8 +1,8 @@
-2023/08/03-22:32:11.523171 7f01523fc6c0 Recovering log #20
+2023/08/07-22:00:56.735452 7f5afd5f96c0 Recovering log #36
-2023/08/03-22:32:11.540084 7f01523fc6c0 Delete type=3 #18
+2023/08/07-22:00:56.833916 7f5afd5f96c0 Delete type=3 #34
-2023/08/03-22:32:11.540129 7f01523fc6c0 Delete type=0 #20
+2023/08/07-22:00:56.833991 7f5afd5f96c0 Delete type=0 #36
-2023/08/03-22:32:17.500527 7f0151bfb6c0 Level-0 table #25: started
+2023/08/07-22:18:10.662583 7f58677fe6c0 Level-0 table #41: started
-2023/08/03-22:32:17.500588 7f0151bfb6c0 Level-0 table #25: 0 bytes OK
+2023/08/07-22:18:10.662627 7f58677fe6c0 Level-0 table #41: 0 bytes OK
-2023/08/03-22:32:17.506820 7f0151bfb6c0 Delete type=0 #23
+2023/08/07-22:18:10.668688 7f58677fe6c0 Delete type=0 #39
-2023/08/03-22:32:17.520955 7f0151bfb6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/07-22:18:10.668861 7f58677fe6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
-2023/08/03-22:32:17.521030 7f0151bfb6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/07-22:18:10.668891 7f58677fe6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)

packs/equipment/CURRENT

@@ -1 +1 @@
-MANIFEST-000026
+MANIFEST-000042

packs/equipment/LOG

@@ -1,7 +1,7 @@
-2023/08/03-22:40:14.091976 7f0152bfd6c0 Recovering log #24
+2023/08/07-22:18:13.969369 7f5afd5f96c0 Recovering log #40
-2023/08/03-22:40:14.149634 7f0152bfd6c0 Delete type=3 #22
+2023/08/07-22:18:13.978774 7f5afd5f96c0 Delete type=3 #38
-2023/08/03-22:40:14.149784 7f0152bfd6c0 Delete type=0 #24
+2023/08/07-22:18:13.978872 7f5afd5f96c0 Delete type=0 #40
-2023/08/04-06:57:06.028441 7f0151bfb6c0 Level-0 table #29: started
+2023/08/07-23:27:50.976450 7f58677fe6c0 Level-0 table #45: started
-2023/08/04-06:57:06.028465 7f0151bfb6c0 Level-0 table #29: 0 bytes OK
+2023/08/07-23:27:50.976502 7f58677fe6c0 Level-0 table #45: 0 bytes OK
-2023/08/04-06:57:06.036211 7f0151bfb6c0 Delete type=0 #27
+2023/08/07-23:27:50.982719 7f58677fe6c0 Delete type=0 #43
-2023/08/04-06:57:06.043646 7f0151bfb6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/08/07-23:27:50.982828 7f58677fe6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)

packs/equipment/LOG.old

@@ -1,7 +1,7 @@
-2023/08/03-22:32:11.490520 7f0153bff6c0 Recovering log #20
+2023/08/07-22:00:56.587410 7f5afd5f96c0 Recovering log #36
-2023/08/03-22:32:11.500170 7f0153bff6c0 Delete type=3 #18
+2023/08/07-22:00:56.639569 7f5afd5f96c0 Delete type=3 #34
-2023/08/03-22:32:11.500230 7f0153bff6c0 Delete type=0 #20
+2023/08/07-22:00:56.639645 7f5afd5f96c0 Delete type=0 #36
-2023/08/03-22:32:17.438731 7f0151bfb6c0 Level-0 table #25: started
+2023/08/07-22:18:10.624177 7f58677fe6c0 Level-0 table #41: started
-2023/08/03-22:32:17.438765 7f0151bfb6c0 Level-0 table #25: 0 bytes OK
+2023/08/07-22:18:10.624214 7f58677fe6c0 Level-0 table #41: 0 bytes OK
-2023/08/03-22:32:17.445239 7f0151bfb6c0 Delete type=0 #23
+2023/08/07-22:18:10.632567 7f58677fe6c0 Delete type=0 #39
-2023/08/03-22:32:17.461466 7f0151bfb6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/08/07-22:18:10.642835 7f58677fe6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)

packs/maneuvers/CURRENT

@@ -1 +1 @@
-MANIFEST-000018
+MANIFEST-000034

packs/maneuvers/LOG

@@ -1,8 +1,8 @@
-2023/08/03-22:40:14.268511 7f0153bff6c0 Recovering log #16
+2023/08/07-22:18:14.000527 7f5afd5f96c0 Recovering log #32
-2023/08/03-22:40:14.378296 7f0153bff6c0 Delete type=3 #14
+2023/08/07-22:18:14.012956 7f5afd5f96c0 Delete type=3 #30
-2023/08/03-22:40:14.378369 7f0153bff6c0 Delete type=0 #16
+2023/08/07-22:18:14.012992 7f5afd5f96c0 Delete type=0 #32
-2023/08/04-06:57:06.076544 7f0151bfb6c0 Level-0 table #21: started
+2023/08/07-23:27:51.026690 7f58677fe6c0 Level-0 table #37: started
-2023/08/04-06:57:06.076585 7f0151bfb6c0 Level-0 table #21: 0 bytes OK
+2023/08/07-23:27:51.026730 7f58677fe6c0 Level-0 table #37: 0 bytes OK
-2023/08/04-06:57:06.083787 7f0151bfb6c0 Delete type=0 #19
+2023/08/07-23:27:51.033892 7f58677fe6c0 Delete type=0 #35
-2023/08/04-06:57:06.083915 7f0151bfb6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/07-23:27:51.040520 7f58677fe6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
-2023/08/04-06:57:06.084004 7f0151bfb6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/07-23:27:51.040625 7f58677fe6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)

packs/maneuvers/LOG.old

@@ -1,8 +1,8 @@
-2023/08/03-22:32:11.526034 7f0152bfd6c0 Recovering log #12
+2023/08/07-22:00:56.752593 7f5afcdf86c0 Recovering log #28
-2023/08/03-22:32:11.543863 7f0152bfd6c0 Delete type=3 #10
+2023/08/07-22:00:56.851595 7f5afcdf86c0 Delete type=3 #26
-2023/08/03-22:32:11.543924 7f0152bfd6c0 Delete type=0 #12
+2023/08/07-22:00:56.851652 7f5afcdf86c0 Delete type=0 #28
-2023/08/03-22:32:17.513990 7f0151bfb6c0 Level-0 table #17: started
+2023/08/07-22:18:10.668942 7f58677fe6c0 Level-0 table #33: started
-2023/08/03-22:32:17.514015 7f0151bfb6c0 Level-0 table #17: 0 bytes OK
+2023/08/07-22:18:10.668989 7f58677fe6c0 Level-0 table #33: 0 bytes OK
-2023/08/03-22:32:17.520642 7f0151bfb6c0 Delete type=0 #15
+2023/08/07-22:18:10.675320 7f58677fe6c0 Delete type=0 #31
-2023/08/03-22:32:17.521009 7f0151bfb6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/07-22:18:10.691036 7f58677fe6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
-2023/08/03-22:32:17.521478 7f0151bfb6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/07-22:18:10.691069 7f58677fe6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)

packs/perks/CURRENT

@@ -1 +1 @@
-MANIFEST-000026
+MANIFEST-000042

packs/perks/LOG

@@ -1,8 +1,8 @@
-2023/08/03-22:40:14.361180 7f01523fc6c0 Recovering log #24
+2023/08/07-22:18:14.015482 7f5afcdf86c0 Recovering log #40
-2023/08/03-22:40:14.470422 7f01523fc6c0 Delete type=3 #22
+2023/08/07-22:18:14.031405 7f5afcdf86c0 Delete type=3 #38
-2023/08/03-22:40:14.470476 7f01523fc6c0 Delete type=0 #24
+2023/08/07-22:18:14.031513 7f5afcdf86c0 Delete type=0 #40
-2023/08/04-06:57:06.091250 7f0151bfb6c0 Level-0 table #29: started
+2023/08/07-23:27:51.019445 7f58677fe6c0 Level-0 table #45: started
-2023/08/04-06:57:06.091271 7f0151bfb6c0 Level-0 table #29: 0 bytes OK
+2023/08/07-23:27:51.019492 7f58677fe6c0 Level-0 table #45: 0 bytes OK
-2023/08/04-06:57:06.097212 7f0151bfb6c0 Delete type=0 #27
+2023/08/07-23:27:51.026550 7f58677fe6c0 Delete type=0 #43
-2023/08/04-06:57:06.097326 7f0151bfb6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/07-23:27:51.040470 7f58677fe6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
-2023/08/04-06:57:06.097346 7f0151bfb6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/07-23:27:51.040607 7f58677fe6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)

packs/perks/LOG.old

@@ -1,8 +1,8 @@
-2023/08/03-22:32:11.542387 7f01523fc6c0 Recovering log #20
+2023/08/07-22:00:56.836453 7f5afd5f96c0 Recovering log #36
-2023/08/03-22:32:11.560297 7f01523fc6c0 Delete type=3 #18
+2023/08/07-22:00:56.950488 7f5afd5f96c0 Delete type=3 #34
-2023/08/03-22:32:11.560512 7f01523fc6c0 Delete type=0 #20
+2023/08/07-22:00:56.950642 7f5afd5f96c0 Delete type=0 #36
-2023/08/03-22:32:17.493642 7f0151bfb6c0 Level-0 table #25: started
+2023/08/07-22:18:10.683235 7f58677fe6c0 Level-0 table #41: started
-2023/08/03-22:32:17.493688 7f0151bfb6c0 Level-0 table #25: 0 bytes OK
+2023/08/07-22:18:10.683286 7f58677fe6c0 Level-0 table #41: 0 bytes OK
-2023/08/03-22:32:17.500316 7f0151bfb6c0 Delete type=0 #23
+2023/08/07-22:18:10.690928 7f58677fe6c0 Delete type=0 #39
-2023/08/03-22:32:17.520920 7f0151bfb6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/07-22:18:10.691057 7f58677fe6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
-2023/08/03-22:32:17.521020 7f0151bfb6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/07-22:18:10.691082 7f58677fe6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)

packs/powers/CURRENT

@@ -1 +1 @@
-MANIFEST-000026
+MANIFEST-000042

packs/powers/LOG

@@ -1,8 +1,8 @@
-2023/08/03-22:40:14.154949 7f01523fc6c0 Recovering log #24
+2023/08/07-22:18:13.982354 7f5afd5f96c0 Recovering log #40
-2023/08/03-22:40:14.250244 7f01523fc6c0 Delete type=3 #22
+2023/08/07-22:18:13.997957 7f5afd5f96c0 Delete type=3 #38
-2023/08/03-22:40:14.250297 7f01523fc6c0 Delete type=0 #24
+2023/08/07-22:18:13.998008 7f5afd5f96c0 Delete type=0 #40
-2023/08/04-06:57:06.062151 7f0151bfb6c0 Level-0 table #29: started
+2023/08/07-23:27:51.005564 7f58677fe6c0 Level-0 table #45: started
-2023/08/04-06:57:06.062185 7f0151bfb6c0 Level-0 table #29: 0 bytes OK
+2023/08/07-23:27:51.005735 7f58677fe6c0 Level-0 table #45: 0 bytes OK
-2023/08/04-06:57:06.069091 7f0151bfb6c0 Delete type=0 #27
+2023/08/07-23:27:51.012861 7f58677fe6c0 Delete type=0 #43
-2023/08/04-06:57:06.076526 7f0151bfb6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/07-23:27:51.013069 7f58677fe6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
-2023/08/04-06:57:06.083902 7f0151bfb6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/07-23:27:51.013100 7f58677fe6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)

packs/powers/LOG.old

@@ -1,8 +1,8 @@
-2023/08/03-22:32:11.504542 7f01523fc6c0 Recovering log #20
+2023/08/07-22:00:56.642444 7f5afcdf86c0 Recovering log #36
-2023/08/03-22:32:11.521105 7f01523fc6c0 Delete type=3 #18
+2023/08/07-22:00:56.750892 7f5afcdf86c0 Delete type=3 #34
-2023/08/03-22:32:11.521156 7f01523fc6c0 Delete type=0 #20
+2023/08/07-22:00:56.750934 7f5afcdf86c0 Delete type=0 #36
-2023/08/03-22:32:17.471567 7f0151bfb6c0 Level-0 table #25: started
+2023/08/07-22:18:10.655429 7f58677fe6c0 Level-0 table #41: started
-2023/08/03-22:32:17.471602 7f0151bfb6c0 Level-0 table #25: 0 bytes OK
+2023/08/07-22:18:10.655482 7f58677fe6c0 Level-0 table #41: 0 bytes OK
-2023/08/03-22:32:17.480333 7f0151bfb6c0 Delete type=0 #23
+2023/08/07-22:18:10.662426 7f58677fe6c0 Delete type=0 #39
-2023/08/03-22:32:17.493507 7f0151bfb6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/07-22:18:10.668849 7f58677fe6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
-2023/08/03-22:32:17.493543 7f0151bfb6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/07-22:18:10.668882 7f58677fe6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)

packs/skills/CURRENT

@@ -1 +1 @@
-MANIFEST-000026
+MANIFEST-000042

packs/skills/LOG

@@ -1,8 +1,8 @@
-2023/08/03-22:40:14.155139 7f0153bff6c0 Recovering log #24
+2023/08/07-22:18:13.982353 7f5afddfa6c0 Recovering log #40
-2023/08/03-22:40:14.265889 7f0153bff6c0 Delete type=3 #22
+2023/08/07-22:18:13.997971 7f5afddfa6c0 Delete type=3 #38
-2023/08/03-22:40:14.265943 7f0153bff6c0 Delete type=0 #24
+2023/08/07-22:18:13.998032 7f5afddfa6c0 Delete type=0 #40
-2023/08/04-06:57:06.054905 7f0151bfb6c0 Level-0 table #29: started
+2023/08/07-23:27:50.999438 7f58677fe6c0 Level-0 table #45: started
-2023/08/04-06:57:06.054930 7f0151bfb6c0 Level-0 table #29: 0 bytes OK
+2023/08/07-23:27:50.999471 7f58677fe6c0 Level-0 table #45: 0 bytes OK
-2023/08/04-06:57:06.061802 7f0151bfb6c0 Delete type=0 #27
+2023/08/07-23:27:51.005436 7f58677fe6c0 Delete type=0 #43
-2023/08/04-06:57:06.076506 7f0151bfb6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/07-23:27:51.013039 7f58677fe6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
-2023/08/04-06:57:06.083893 7f0151bfb6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/07-23:27:51.013085 7f58677fe6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)

packs/skills/LOG.old

@@ -1,8 +1,8 @@
-2023/08/03-22:32:11.504608 7f0152bfd6c0 Recovering log #20
+2023/08/07-22:00:56.642359 7f5afd5f96c0 Recovering log #36
-2023/08/03-22:32:11.524096 7f0152bfd6c0 Delete type=3 #18
+2023/08/07-22:00:56.733205 7f5afd5f96c0 Delete type=3 #34
-2023/08/03-22:32:11.524332 7f0152bfd6c0 Delete type=0 #20
+2023/08/07-22:00:56.733486 7f5afd5f96c0 Delete type=0 #36
-2023/08/03-22:32:17.487194 7f0151bfb6c0 Level-0 table #25: started
+2023/08/07-22:18:10.649211 7f58677fe6c0 Level-0 table #41: started
-2023/08/03-22:32:17.487218 7f0151bfb6c0 Level-0 table #25: 0 bytes OK
+2023/08/07-22:18:10.649245 7f58677fe6c0 Level-0 table #41: 0 bytes OK
-2023/08/03-22:32:17.493333 7f0151bfb6c0 Delete type=0 #23
+2023/08/07-22:18:10.655255 7f58677fe6c0 Delete type=0 #39
-2023/08/03-22:32:17.493535 7f0151bfb6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/07-22:18:10.668835 7f58677fe6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
-2023/08/03-22:32:17.493560 7f0151bfb6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/07-22:18:10.668872 7f58677fe6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)

packs/talents/CURRENT

@@ -1 +1 @@
-MANIFEST-000026
+MANIFEST-000042

packs/talents/LOG

@@ -1,8 +1,8 @@
-2023/08/03-22:40:14.380282 7f0153bff6c0 Recovering log #24
+2023/08/07-22:18:14.015482 7f5afd5f96c0 Recovering log #40
-2023/08/03-22:40:14.489987 7f0153bff6c0 Delete type=3 #22
+2023/08/07-22:18:14.034395 7f5afd5f96c0 Delete type=3 #38
-2023/08/03-22:40:14.490073 7f0153bff6c0 Delete type=0 #24
+2023/08/07-22:18:14.034433 7f5afd5f96c0 Delete type=0 #40
-2023/08/04-06:57:06.084030 7f0151bfb6c0 Level-0 table #29: started
+2023/08/07-23:27:51.034000 7f58677fe6c0 Level-0 table #45: started
-2023/08/04-06:57:06.084051 7f0151bfb6c0 Level-0 table #29: 0 bytes OK
+2023/08/07-23:27:51.034031 7f58677fe6c0 Level-0 table #45: 0 bytes OK
-2023/08/04-06:57:06.091132 7f0151bfb6c0 Delete type=0 #27
+2023/08/07-23:27:51.040235 7f58677fe6c0 Delete type=0 #43
-2023/08/04-06:57:06.097307 7f0151bfb6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/07-23:27:51.040547 7f58677fe6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
-2023/08/04-06:57:06.097331 7f0151bfb6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/07-23:27:51.040656 7f58677fe6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)

packs/talents/LOG.old

@@ -1,8 +1,8 @@
-2023/08/03-22:32:11.546170 7f0152bfd6c0 Recovering log #20
+2023/08/07-22:00:56.853665 7f5afcdf86c0 Recovering log #36
-2023/08/03-22:32:11.563632 7f0152bfd6c0 Delete type=3 #18
+2023/08/07-22:00:56.969522 7f5afcdf86c0 Delete type=3 #34
-2023/08/03-22:32:11.563697 7f0152bfd6c0 Delete type=0 #20
+2023/08/07-22:00:56.969559 7f5afcdf86c0 Delete type=0 #36
-2023/08/03-22:32:17.506983 7f0151bfb6c0 Level-0 table #25: started
+2023/08/07-22:18:10.675457 7f58677fe6c0 Level-0 table #41: started
-2023/08/03-22:32:17.507022 7f0151bfb6c0 Level-0 table #25: 0 bytes OK
+2023/08/07-22:18:10.675493 7f58677fe6c0 Level-0 table #41: 0 bytes OK
-2023/08/03-22:32:17.513835 7f0151bfb6c0 Delete type=0 #23
+2023/08/07-22:18:10.683073 7f58677fe6c0 Delete type=0 #39
-2023/08/03-22:32:17.520991 7f0151bfb6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/07-22:18:10.691049 7f58677fe6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
-2023/08/03-22:32:17.521446 7f0151bfb6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/07-22:18:10.691077 7f58677fe6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)

packs/weapons/CURRENT

@@ -1 +1 @@
-MANIFEST-000026
+MANIFEST-000042

packs/weapons/LOG

@@ -1,7 +1,7 @@
-2023/08/03-22:40:14.091925 7f01523fc6c0 Recovering log #24
+2023/08/07-22:18:13.969369 7f5afddfa6c0 Recovering log #40
-2023/08/03-22:40:14.149880 7f01523fc6c0 Delete type=3 #22
+2023/08/07-22:18:13.978774 7f5afddfa6c0 Delete type=3 #38
-2023/08/03-22:40:14.149922 7f01523fc6c0 Delete type=0 #24
+2023/08/07-22:18:13.978889 7f5afddfa6c0 Delete type=0 #40
-2023/08/04-06:57:06.036393 7f0151bfb6c0 Level-0 table #29: started
+2023/08/07-23:27:50.992870 7f58677fe6c0 Level-0 table #45: started
-2023/08/04-06:57:06.036424 7f0151bfb6c0 Level-0 table #29: 0 bytes OK
+2023/08/07-23:27:50.992899 7f58677fe6c0 Level-0 table #45: 0 bytes OK
-2023/08/04-06:57:06.043560 7f0151bfb6c0 Delete type=0 #27
+2023/08/07-23:27:50.999291 7f58677fe6c0 Delete type=0 #43
-2023/08/04-06:57:06.054891 7f0151bfb6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/08/07-23:27:51.013019 7f58677fe6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)

packs/weapons/LOG.old

@@ -1,7 +1,7 @@
-2023/08/03-22:32:11.490520 7f01523fc6c0 Recovering log #20
+2023/08/07-22:00:56.587421 7f5afcdf86c0 Recovering log #36
-2023/08/03-22:32:11.500170 7f01523fc6c0 Delete type=3 #18
+2023/08/07-22:00:56.639569 7f5afcdf86c0 Delete type=3 #34
-2023/08/03-22:32:11.500333 7f01523fc6c0 Delete type=0 #20
+2023/08/07-22:00:56.639646 7f5afcdf86c0 Delete type=0 #36
-2023/08/03-22:32:17.480474 7f0151bfb6c0 Level-0 table #25: started
+2023/08/07-22:18:10.642928 7f58677fe6c0 Level-0 table #41: started
-2023/08/03-22:32:17.480502 7f0151bfb6c0 Level-0 table #25: 0 bytes OK
+2023/08/07-22:18:10.642973 7f58677fe6c0 Level-0 table #41: 0 bytes OK
-2023/08/03-22:32:17.487051 7f0151bfb6c0 Delete type=0 #23
+2023/08/07-22:18:10.649077 7f58677fe6c0 Delete type=0 #39
-2023/08/03-22:32:17.493518 7f0151bfb6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/08/07-22:18:10.668818 7f58677fe6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)

styles/simple.css

@@ -74,7 +74,7 @@
   color: rgba(224, 208, 197, 0.9);
 }
 .dialog-content, .dialog-buttons, .form-fields {
-  color: rgba(224, 208, 197, 0.9);
+  color: rgba(4, 44, 44, 0.98);
 }
 .dialog-buttons {
   color: rgba(224, 208, 197, 0.9);

system.json

@@ -100,14 +100,14 @@
   "styles": [
     "styles/simple.css"
   ],
-  "version": "11.0.0",
+  "version": "11.0.2",
   "compatibility": {
     "minimum": "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-v11.0.0.zip",   
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-hero-system-6/archive/fvtt-hero-system-6-v11.0.1.zip",   
   "url": "https://www.uberwald.me/gitea/uberwald/",
   "background": "systems/fvtt-hero-system-6/images/ui/hero_foundry_cover.webp",
   "id": "fvtt-hero-system-6"

template.json

@@ -72,7 +72,7 @@
             "category": "main",
             "value": 10,
             "base": 10,
-            "perceptionroll": 10
+            "perceptionroll": 11
           },
           "ego": {
             "label": "EGO",
@@ -90,7 +90,7 @@
           },
           "ocv": {
             "label": "OCV",
-            "hasroll": false,
+            "hasroll": true,
             "base": 3,
             "autoMod": "0",
             "userMod": "0",
@@ -108,7 +108,7 @@
           },
           "omcv": {
             "label": "OMCV",
-            "hasroll": false,
+            "hasroll": true,
             "base": 3,
             "autoMod": "0",
             "userMod": "0",
@@ -205,6 +205,7 @@
             "ismovement": true,
             "hasroll": false,
             "value": 12,
+            "ncvalue": 24,
             "base": 12
           },
           "swimming": {
@@ -212,6 +213,7 @@
             "ismovement": true,
             "hasroll": false,
             "value": 4,
+            "ncvalue": 8,
             "base": 4
           },
           "leaping": {
@@ -219,6 +221,7 @@
             "ismovement": true,
             "hasroll": false,
             "value": 4,
+            "ncvalue": 8,
             "base": 4,
             "leaping_horizontal_base": 0,
             "leaping_horizontal_total": 0,
@@ -231,25 +234,31 @@
         "movements": {
           "fly": {
             "label": "Fly",
-            "value": 0
+            "value": 0,
+            "ncvalue": 0
+
           },
           "teleport": {
             "label": "Teleport",
-            "value": 0
+            "value": 0,
+            "ncvalue": 0
           },
           "tunnel": {
             "label": "Tunnel",
-            "value": 0
+            "value": 0,
+            "ncvalue": 0
           },
           "move1": {
             "label": "N/A",
             "iseditable": true,
-            "value": 0
+            "value": 0,
+            "ncvalue": 0
           },
           "move2": {
             "label": "N/A",
             "iseditable": true,
-            "value": 0
+            "value": 0,
+            "ncvalue": 0
           }
         }
       },
@@ -343,6 +352,8 @@
         "haseffectroll": false,
         "effectroll": "standard",
         "effectrollformula": "",
+        "hascharges": false,
+        "nbcharges": 0,
         "items": {}
       }
     },

templates/actors/actor-sheet.hbs

@@ -158,13 +158,21 @@
               <li class="item flexrow list-item list-item-shadow" data-item-id="{{maneuver._id}}">
                 <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
                     src="{{maneuver.img}}" /></a>
-                <span class="item-field-label-long">{{maneuver.name}}</span>
+                <span class="item-field-label-long">{{maneuver.name}}
+                  <a class="roll-item"><i class="fas fa-dice"></i></a>
+                </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-very-short">{{maneuver.system.dcv}}</span>
 
-                <span class="item-field-text-long">{{maneuver.system.effects}}</span>
+                <span class="item-field-text-long">{{maneuver.system.effects}}
+                  {{#if maneuver.system.haseffectroll}}
+                  <a class="roll-direct" data-roll-source="Maneuver {{maneuver.name}}" data-roll-formula="{{maneuver.system.effectrollformula}}">
+                    <i class="fas fa-dice"></i>{{maneuver.system.effectrollformula}}
+                  </a>
+                  {{/if}}
+                </span>
 
                 <span class="">&nbsp;</span>
                 <div class="item-controls item-controls-fixed">
@@ -314,7 +322,7 @@
                   <label class="">Movement</label>
                 </span>
                 <span class="item-field-label-short">
-                  <label class="short-label">C</label>
+                  <label class="short-label">Combat</label>
                 </span>
                 <span class="item-field-label-short">
                   <label class="short-label">NC</label>
@@ -325,7 +333,7 @@
                   <li class="item flexrow list-item list-item-shadow" data-charac-key="{{key}}">
                     <span class="item-field-label-long">{{char.label}}</span>
                     <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.{{key}}.value" value="{{char.value}}" data-dtype="Number" />
-                    <input type="text" class="item-field-label-short" value="{{mul char.value 2}}" disabled data-dtype="Number" />
+                    <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.{{key}}.ncvalue" value="{{char.ncvalue}}" data-dtype="Number" />
                   </li>
                   {{/if}}
                 {{/each}}

templates/apps/combat-tracker.hbs

@@ -32,9 +32,12 @@
             </a>
             {{/if}}
 
+            {{log combat.flags}}
+
             {{#if combatCount}}
             {{#if combat.round}}
-            <h3 class="encounter-title noborder">Turn {{combat.turnNumber}} Segment {{combat.segmentNumber}}</h3>
+            <!--<h3 class="encounter-title noborder">Turn {{combat.turnNumber}} Segment {{combat.segmentNumber}}</h3>-->
+            <h3 class="encounter-title noborder">Turn {{combat.flags.world.turnData.turnNumber}} Segment {{combat.flags.world.turnData.segmentNumber}}</h3>
             {{else}}
             <h3 class="encounter-title noborder">{{localize 'COMBAT.NotStarted'}}</h3>
             {{/if}}

templates/items/item-skill-sheet.hbs

@@ -17,7 +17,7 @@
         <ul>
             <li class="flexrow"><label class="item-field-label-long">Type</label>
               <select class="item-field-label-medium" type="text" name="system.skilltype" value="{{system.skilltype}}" data-dtype="String">
-                {{#select system.skilltype}}
+                {{#select (lower system.skilltype)}}
                   {{#each config.skillType as |char key|}}
                   <option value="{{key}}">{{char}}</option>
                   {{/each}}
@@ -28,14 +28,14 @@
             {{#if (isSkillCustom system.skilltype)}}
             <li class="flexrow"><label class="item-field-label-long">Base characteristic</label>
               <select class="item-field-label-medium" type="text" name="system.characteristic" value="{{system.characteristic}}" data-dtype="String">
-                {{#select system.characteristic}}
+                {{#select (lower system.characteristic)}}
                   {{#each config.rollCharac as |char key|}}
                   <option value="{{key}}">{{char}}</option>
                   {{/each}}
                 {{/select}}
               </select> 
             </li>
-              {{#if (eq system.characteristic "manual")}}
+              {{#if (eq (lower system.characteristic) "manual")}}
                 <li class="flexrow"><label class="item-field-label-long">Base value</label>
                   <input type="text" class="item-field-label-medium" name="system.base" value="{{system.base}}" data-dtype="Number" {{#if (ne system.characteristic "manual")}}disabled{{/if}} />
                 </li>

templates/partials/partial-power-equipment-cost.hbs

@@ -1,6 +1,6 @@
       <li class="flexrow"><label class="item-field-label-long">Type</label>
         <select class="item-field-label-long" type="text" name="system.petype" value="{{system.petype}}" data-dtype="String">
-          {{#select system.petype}}
+          {{#select (lower system.petype)}}
             {{#each config.powerEquipmentType as |name key|}}
               <option value="{{key}}">{{name}}</option>
             {{/each}}
@@ -10,7 +10,7 @@
 
       <li class="flexrow"><label class="item-field-label-long">Type Modifier</label>
         <select class="item-field-label-long" type="text" name="system.typemodifier" value="{{system.typemodifier}}" data-dtype="String">
-          {{#select system.typemodifier}}
+          {{#select (lower system.typemodifier)}}
             {{#each config.powerTypeModifiers as |name key|}}
               <option value="{{key}}">{{name}}</option>
             {{/each}}
@@ -31,6 +31,16 @@
       <li class="flexrow"><label class="item-field-label-long">Endurance</label>
         <input type="text" class="item-field-label-short" name="system.endurance" value="{{system.endurance}}" data-dtype="Number"/>
       </li>
+
+      <li class="flexrow"><label class="item-field-label-long">Has Charges ?</label>
+        <label class="item-field-label-medium"><input type="checkbox" name="system.hascharges" {{checked system.hascharges}}/></label>
+      </li>
+      {{#if system.hascharges}}
+      <li class="flexrow"><label class="item-field-label-long">Number of Charges</label>
+        <input type="text" class="item-field-label-short" name="system.nbcharges" value="{{system.nbcharges}}" data-dtype="Number"/>
+      </li>
+      {{/if}}
+
       {{#if quantityDone}}
       {{else}}
       <li class="flexrow"><label class="item-field-label-long">Quantity</label>