Fixes from 29th of june

modules/hero6-actor-sheet.js

@@ -66,6 +66,7 @@ export class Hero6ActorSheet extends ActorSheet {
       notes5: await TextEditor.enrichHTML(this.object.system.biodata.notes5, {async: true}),
       containersTree: this.actor.containersTree,
       encCurrent: this.actor.encCurrent,
+      totalValue: this.actor.totalValue,
       options: this.options,
       owner: this.document.isOwner,
       editScore: this.options.editScore,

modules/hero6-actor.js

@@ -323,13 +323,18 @@ export class Hero6Actor extends Actor {
   buildContainerTree() {
     let equipments = duplicate(this.items.filter(item => item.type == "equipment") || []);
     let enc = 0
+    let value = 0
     for (let equip1 of equipments) {
       if (Number(equip1.system.weight) && Number(equip1.system.quantity)) {
         enc += equip1.system.weight * equip1.system.quantity
       }
+      if (Number(equip1.system.value) && Number(equip1.system.quantity)) {
+        value += equip1.system.value * equip1.system.quantity
+      }
     }
     // Store local values
     this.encCurrent = enc
+    this.totalValue = value
   }
 
   /* -------------------------------------------- */
@@ -427,7 +432,7 @@ export class Hero6Actor extends Actor {
   /* -------------------------------------------- */
   prepareCharacValues(charac) {
     charac.total = charac.value
-    charac.roll = 9 + Math.floor((charac.value) / 5)
+    charac.roll = 9 + Math.round((charac.value) / 5)
   }
   prepareCharac() {
     let characs = duplicate(this.system.characteristics)
@@ -579,6 +584,7 @@ export class Hero6Actor extends Actor {
     let rollData = this.getCommonRollData()
     rollData.mode = "damage"
     rollData.item = duplicate(item)
+    rollData.title = item.name
     rollData.diceFormula = Hero6Utility.convertRollHeroSyntax(item.system.damage)
     let myRoll = new Roll(rollData.diceFormula).roll({ async: false })
     await Hero6Utility.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
@@ -587,9 +593,13 @@ export class Hero6Actor extends Actor {
     rollData.result = myRoll.total
     rollData.bodyValue = Hero6Utility.computeBodyValue(myRoll)
 
-    let msg = await Hero6Utility.createChatWithRollMode(rollData.alias, {
+    let msgFlavor = await renderTemplate(`systems/fvtt-hero-system-6/templates/chat/chat-damage-result.hbs`, rollData)
-      content: await renderTemplate(`systems/fvtt-hero-system-6/templates/chat/chat-damage-result.hbs`, rollData)
+    let msg = await rollData.roll.toMessage({
+      user: game.user.id,
+      rollMode: game.settings.get("core", "rollMode"),
+      flavor: msgFlavor
     })
+    rollData.roll = duplicate(rollData.roll) // Convert to object
     msg.setFlag("world", "rolldata", rollData)
     console.log("Rolldata result", rollData)
   }
@@ -602,12 +612,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, {
+    let msgFlavor = await renderTemplate(`systems/fvtt-hero-system-6/templates/chat/chat-lift-dice-result.hbs`, rollData)
-      content: 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,
     });
@@ -21,6 +21,7 @@ export class Hero6Combat extends Combat {
   }
   /* -------------------------------------------- */
   static pushMenuOptions(html, options) {
+    console.log(">>>>>>>>>>>>>>>>>>>>>>>< MENU OPTIONS!!!!!")
     let newOpt
     for (let i = 0; i < options.length; i++) {
       let option = options[i];
@@ -62,7 +63,7 @@ export class Hero6Combat extends Combat {
   constructor(data, context) {
     super(data, context);
 
-    this.turnNumber = 1;
+    this.turnNumber = 0;
     this.segmentNumber = 12;
   }
 
@@ -104,13 +105,13 @@ export class Hero6Combat extends Combat {
 
     let turnData = this.getFlag("world", "hero6-turn-data")
     if (!turnData) {
-      turnData = { turnNumber: 1, segmentNumber: 12 }
+      turnData = { turnNumber: 0, segmentNumber: 12 }
       this.setFlag("world", "hero6-turn-data", turnData)
     }
     turnData = duplicate(turnData)
-    turnData.segmentNumber -= 1
+    turnData.segmentNumber += 1
-    if (turnData.segmentNumber <= 0) {
+    if (turnData.segmentNumber > 12) {
-      turnData.segmentNumber = 12
+      turnData.segmentNumber = 1
       turnData.turnNumber++
     }
     this.setFlag("world", "hero6-turn-data", turnData)

modules/hero6-main.js

@@ -96,6 +96,8 @@ Hooks.once("ready", function () {
   welcomeMessage();
   Hero6Utility.ready()
   Hero6Commands.ready()
+  Hero6Combat.init()
+  
 })
 
 /* -------------------------------------------- */

modules/hero6-utility.js

@@ -41,7 +41,7 @@ export class Hero6Utility {
       return list.length > 0;
     })
     Handlebars.registerHelper('mul', function (a, b) {
-      return parseInt(a) * parseInt(b);
+      return Number(a) * Number(b);
     })
     Handlebars.registerHelper('locationLabel', function (key) {
       return __locationNames[key]
@@ -388,15 +388,22 @@ export class Hero6Utility {
     // Ensure we have no space at all
     //hero6Formula = hero6Formula.replace(/\s/g, '')
     let hasHalfDice = ""
-    if (hero6Formula.match("1/2d6")) {
+    let newFormula = hero6Formula
-      hero6Formula = hero6Formula.replace("1/2d6", "d6")
+
-      hasHalfDice = "+round(1d6)"
+    let form1 = hero6Formula.match(/\s*(\d*)\s*1\/2d6/)
+    if ( form1 ) { 
+      let nbDice = form1[1] || 0
+      newFormula = nbDice+"d6+round(1d6/2)"
     }
 
-    let foundryFormula = hero6Formula + hasHalfDice
+    let form3 = hero6Formula.match(/\s*(\d*)\.5d6/)
-    foundryFormula = foundryFormula.replace(' ', '')
+    if ( form3 ) {
-    console.log("Parsed formula : ", hero6Formula, foundryFormula)
+      let nbDice = form3[1] || 0
-    return foundryFormula
+      newFormula = nbDice+"d6+round(1d6/2)"
+    }
+
+    console.log("Parsed formula : ", hero6Formula, newFormula)
+    return newFormula
   }
 
   /* -------------- ----------------------------- */

styles/simple.css

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

template.json

@@ -351,8 +351,8 @@
       ],
       "maneuvertype": "general",
       "pha": "",
-      "ocv": 0,
+      "ocv": "",
-      "dcv" : 0,
+      "dcv" : "",
       "isstock": false,
       "active": false
     },

templates/actors/actor-sheet.hbs

@@ -129,22 +129,9 @@
               <label class="item-field-label-medium">Lift</label>
               <input type="text" class="item-field-label-short update-field" disabled data-field-name="system.characteristics.str.lift" value="{{characteristics.str.lift}}" data-dtype="String" />
               <label class="item-field-label-short">&nbsp;</label>
-            </li>
-            <li class="item">
               <label class="item-field-label-medium">STR END</label>
               <input type="text" class="item-field-label-short update-field" data-field-name="system.characteristics.str.strend" disabled value="{{characteristics.str.strend}}" data-dtype="Number" />
-              <select class="actor-computer-str-end" name="system.characteristics.str.strendmode" value="{{system.characteristics.str.strendmode}}">
+
-                {{#select system.characteristics.str.strendmode}}
-                  <option value="str20">STR/20 (half normal)</option>
-                  <option value="str10">STR/10 (normal, half heroic)</option>
-                  <option value="str5">STR/5 (heroic)</option>
-                  <option value="0">0</option>
-                {{/select}}
-              </select> 
-            </li>
-            <li class="flexrow item">
-              <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>
             </li>
           </ul>
 
@@ -152,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>
@@ -173,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-very-short">{{maneuver.system.pha}}</span>
-                <span class="item-field-label-short">{{maneuver.system.ocv}}</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>
@@ -193,6 +181,12 @@
             <li class="flexrow item">
               <label class="item-field-label-medium">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>
+
+              <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>
+
             </li>
           </ul>
 
@@ -604,6 +598,7 @@
         <h3>Encumbrance</h3>
         <span class="small-label">Current : {{encCurrent}}</span>
         <span class="small-label">Capacity : {{encCapacity}}</span>
+        <span class="small-label">Total value : {{totalValue}}</span>
       </div>
 
       {{> systems/fvtt-hero-system-6/templates/partials/partial-actor-equipment-section.hbs title="Weapons" items=weapons}}

templates/chat/chat-damage-result.hbs

@@ -18,10 +18,9 @@
 
     <div>
       <ul>
+        <li>Name : {{title}}</li>
         <li>Damage formula : {{diceFormula}}</li>
-
+        <li><strong>TOTAL : {{result}}</strong></li>
-        <li><strong>Result : {{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

@@ -3,6 +3,9 @@
           <span class="item-name-img">
             <label class="">&nbsp;</label>
           </span>
+          <span class="item-field-label-short">
+            <label class="item-field-label-short">Q.</label>
+          </span>
           <span class="item-field-label-long3">
             <label class="item-field-label-long3">{{title}}</label>
           </span>

templates/partials/partial-actor-equipment.hbs

@@ -1,5 +1,8 @@
 <li class="item flexrow list-item list-item-shadow" data-item-id="{{equip._id}}">
   <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img" src="{{equip.img}}" /></a>
+
+  <span class="item-field-label-short"><label>{{equip.system.quantity}}</label>  </span>          
+
   <span class="item-field-label-long3">{{equip.name}}</span>
 
   <span class="item-field-label-long"><label>{{equip.system.displayname}}
@@ -18,9 +21,9 @@
 
   <span class="item-field-label-short"><label>{{equip.system.endurance}}</label>  </span>          
 
-  <span class="item-field-label-short"><label>{{equip.system.value}}</label>  </span>          
+  <span class="item-field-label-short"><label>{{mul equip.system.quantity equip.system.value}}</label>  </span>          
 
-  <span class="item-field-label-short"><label>{{equip.system.weight}}</label>  </span>          
+  <span class="item-field-label-short"><label>{{mul equip.system.quantity equip.system.weight}}</label>  </span>          
 
   <div class="item-filler">&nbsp;</div>
   <div class="item-controls item-controls-fixed">

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

@@ -1,26 +1,40 @@
-
 <li class="item stat flexrow list-item list-item-shadow" data-attr-key="{{key}}">
 
-  <input type="text" class="item-field-label-medium" name="system.characteristics.{{key}}.value" value="{{charac.value}}" data-dtype="Number"/>  
+  <input type="text" class="item-field-label-medium" name="system.characteristics.{{key}}.value"
+    value="{{charac.value}}" data-dtype="Number" />
 
   <span class="item-field-label-medium" name="{{key}}">
     <h4 class="item-field-label-medium margin-item-list">{{charac.label}}</a></h4>
   </span>
-  
+
   <h4 class="item-field-label-short margin-item-list">{{charac.base}}</h4>
-  
+
   {{#if charac.hasroll}}
-  <h4 class="item-field-label-short margin-item-list"><a class="roll-charac" data-charac-key="{{key}}"><i class="fas fa-dice"></i>{{charac.roll}}-</a></h4>
+  <h4 class="item-field-label-short margin-item-list"><a class="roll-charac" data-charac-key="{{key}}"><i
+        class="fas fa-dice"></i>{{charac.roll}}-</a></h4>
   {{else}}
   <h4 class="item-field-label-short margin-item-list">&nbsp;</h4>
   {{/if}}
 
-  <input type="text" class="item-field-label-long2" name="system.characteristics.{{key}}.notes" value="{{charac.notes}}" data-dtype="String"/>  
+  <input type="text" class="item-field-label-long2" name="system.characteristics.{{key}}.notes" value="{{charac.notes}}"
+    data-dtype="String" />
 
   {{#if charac.lift}}
-    <h4 class="item-field-label-short margin-item-list">&nbsp;&nbsp;</h4>
+  <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">{{charac.lift}}</h4>
-    <h4 class="item-field-label-short margin-item-list"><a class="roll-lift-dice" data-charac-key="{{key}}"><i class="fas fa-dice"></i>{{charac.liftDice}}</a></h4>
+  <h4 class="item-field-label-short 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"
+    value="{{charac.strendmode}}">
+    {{#select charac.strendmode}}
+    <option value="str20">STR/20 (half normal)</option>
+    <option value="str10">STR/10 (normal, half heroic)</option>
+    <option value="str5">STR/5 (heroic)</option>
+    <option value="0">0</option>
+    {{/select}}
+  </select>
+
   {{/if}}
 
 </li>