Fix #115 fix negative effect

modules/pegasus-actor.js

@@ -15,7 +15,7 @@ const __statBuild = [
   //{ modules: ["vehiclehull"], field: "pc", itemfield: "vms", subfield: "avgnrg" },
   //{ modules: ["powercoremodule"], field: "pc", itemfield: "nrg", subfield: "avgnrg" },
   { modules: ["vehiclehull", "mobilitymodule"], itemfield: "man", field: "man", additionnal1: "turningarc45" },
-  { modules: ["powercoremodule"], field: "pc", itemfield: "pc", additionnal1: "curnrg", additionnal2: "maxnrg" },
+  { modules: ["powercoremodule"], field: "pc", itemfield: "pc" },
   { modules: ["mobilitymodule"], field: "mr", itemfield: "mr" },
   { modules: ["propulsionmodule"], field: "ad", itemfield: "ad" },
   { modules: ["combatmodule"], field: "fc", itemfield: "fc" },
@@ -194,8 +194,13 @@ export class PegasusActor extends Actor {
     let comp = this.items.filter(item => item.type == 'vehiclemodule');
     return comp;
   }
-  getVehicleWeaponModules() {
-    let comp = this.items.filter(item => item.type == 'vehicleweaponmodule');
+  getVehicleWeaponModules( activated = false ) {
+    let comp = []
+    if (activated ) {
+      comp = this.items.filter(item => item.type == 'vehicleweaponmodule' && item.system.activated)
+    } else {
+      comp = this.items.filter(item => item.type == 'vehicleweaponmodule' )    
+    }
     return comp;
   }
 
@@ -334,7 +339,7 @@ export class PegasusActor extends Actor {
     if (item.system.resistance) {
       item.system.resistanceDice = PegasusUtility.getDiceFromLevel(item.system.resistance)
     }
-    if (item.system.idr) {
+    if (item.system.idr && Number(item.system.idr) > 0) {
       item.system.idrDice = PegasusUtility.getDiceFromLevel(item.system.idr)
     }
     if (item.system.damage) {
@@ -811,9 +816,11 @@ export class PegasusActor extends Actor {
         ChatMessage.create({ content: "Effects of this type cannot be applied while Immunity is applied" })
         return
       }
+      if (item.system.droptext && item.system.droptext.length > 0) {
+        ChatMessage.create({ content: `Effect ${item.name} message : ${item.system.droptext}` })
+      }
     }
 
-
     if (item.type == 'race') {
       this.applyRace(item)
     } else if (item.type == 'role') {
@@ -912,12 +919,16 @@ export class PegasusActor extends Actor {
   getStat(statKey) {
     let stat
     if (this.type == "character" && statKey == 'mr') {
-      stat = duplicate(this.system.mr);
+      stat = duplicate(this.system.mr)
     } else {
-      stat = duplicate(this.system.statistics[statKey]);
+      stat = duplicate(this.system.statistics[statKey])
     }
-    stat.dice = PegasusUtility.getDiceFromLevel(stat.value || stat.level);
-    return stat;
+    if (stat.currentlevel) {
+      stat.dice = PegasusUtility.getDiceFromLevel(stat.currentlevel)
+    } else {
+      stat.dice = PegasusUtility.getDiceFromLevel(stat.value || stat.level)
+    }
+    return stat
   }
 
   /* -------------------------------------------- */
@@ -1448,17 +1459,27 @@ export class PegasusActor extends Actor {
     if (this.system.biodata.noautobonus) { // If we are in "no-bonus mode
       return
     }
-    let effects = this.items.filter(effect => effect.type == "effect" && effect.system.genre == "positive" && effect.system.statdice)
+    let effectsPlus = this.items.filter(effect => effect.type == "effect" && effect.system.genre == "positive" && effect.system.statdice)
+    let effectsMinus = this.items.filter(effect => effect.type == "effect" && effect.system.genre == "negative" && effect.system.reducedicevalue)
     for (let statKey in this.system.statistics) {
       let stat = duplicate(this.system.statistics[statKey])
       let bonus = 0
-      for (let effect of effects) {
+      for (let effect of effectsPlus) {
         if (effect.system.stataffected == statKey) {
           bonus += Number(effect.system.effectlevel)
         }
       }
+      for (let effect of effectsMinus) {
+        if (effect.system.stataffected == statKey) {
+          bonus -= Number(effect.system.effectlevel)
+        }
+      }
       if (bonus != stat.bonuseffect) {
         stat.bonuseffect = bonus
+        if ( stat.bonuseffect + stat.value < 1) {
+          stat.value = 1
+          stat.bonuseffect = 0
+        }
         this.update({ [`system.statistics.${statKey}`]: stat })
       }
     }
@@ -1733,7 +1754,7 @@ export class PegasusActor extends Actor {
     let effects = this.items.filter(item => item.type == 'effect')
     for (let effect of effects) {
       effect = duplicate(effect)
-      if (!effect.system.hindrance && !effect.system.statdice
+      if (!effect.system.hindrance && !effect.system.statdice && !effect.system.reducedicevalue
         && (effect.system.stataffected != "notapplicable" || effect.system.specaffected.length > 0)
         && effect.system.stataffected != "special"
         && effect.system.stataffected != "powerroll"
@@ -1795,7 +1816,7 @@ export class PegasusActor extends Actor {
   }
   addVehicleWeapons(rollData, vehicle) {
     if (vehicle) {
-      let modules = vehicle.items.filter(vehicle => vehicle.type == "vehicleweaponmodule")
+      let modules = vehicle.items.filter(item => item.type == "vehicleweaponmodule" && item.system.activated)
       if (modules && modules.length > 0) {
         for (let module of modules) {
           rollData.vehicleWeapons.push({ label: `Weapon ${module.name}`, type: "item", applied: false, weapon: module, value: module.system.damagedicevalue })
@@ -1804,6 +1825,33 @@ export class PegasusActor extends Actor {
     }
   }
 
+  /* -------------------------------------------- */
+  processVehicleTargetMessage(rollData) {
+    if (rollData.defenderTokenId) {
+      let vehicle = game.canvas.tokens.get(rollData.defenderTokenId).actor
+      if (vehicle.type == "vehicle") {
+        if (rollData.subKey == "defence" && vehicle.system.statistics.ad.currentspeed == "crawling") {
+          ChatMessage.create({ content: `${vehicle.name} is moving at Crawling speed : add a D8 to your Attack Dice Pool against this Vehicle` })
+        }
+        if (rollData.subKey == "defence" && vehicle.system.statistics.ad.currentspeed == "slow") {
+          ChatMessage.create({ content: `${vehicle.name} is moving at Slow speed : add a D4 to your Attack Dice Pool against this Vehicle` })
+        }
+      }
+      if (this.type == "vehicle"  && rollData.statKey == "man" && this.system.statistics.ad.currentspeed == "fast") {
+        ChatMessage.create({ content: `${this.name} is moving at Fast speed : anyone using the vehicles MAN Dice Pool suffers a D8 Hindrance which is added to the Difficulty Dice Pool against this Vehicle` })
+      }
+      if (this.type == "vehicle"  && rollData.statKey == "man" && this.system.statistics.ad.currentspeed == "extfast") {
+        ChatMessage.create({ content: `${this.name} is moving at Extremely Fast speed : anyone using the vehicles MAN Dice Pool suffers a D12 Hindrance which is added to the Difficulty Dice Pool against this Vehicle` })
+      }
+      if (rollData.subKey == "defence" && rollData.vehicle && rollData.vehicle.system.statistics.ad.currentspeed == "crawling") {
+        ChatMessage.create({ content: `${this.name} is moving at Crawling speed : add a D8 to your Attack Dice Pool against this Vehicle` })
+      }
+      if (rollData.subKey == "defence" && rollData.vehicle && rollData.vehicle.system.statistics.ad.currentspeed == "slow") {
+        ChatMessage.create({ content: `${this.name} is moving at Slow speed : add a D4 to your Attack Dice Pool against this Vehicle` })
+      }
+  }
+  }
+
   /* -------------------------------------------- */
   getCommonRollData(statKey = undefined, useShield = false, isInit = false, isPower = false, subKey = "", vehicle = undefined) {
     let rollData = PegasusUtility.getBasicRollData(isInit)
@@ -1828,8 +1876,12 @@ export class PegasusActor extends Actor {
       rollData.stat = this.getStat(statKey)
       if (rollData.stat.value != undefined) {
         rollData.stat.level = rollData.stat.value // Normalize
+        rollData.statDicesLevel = rollData.stat.level + rollData.stat.bonuseffect
+      }
+      if (rollData.stat.currentlevel) {
+        rollData.stat.level = rollData.stat.currentlevel
+        rollData.statDicesLevel = rollData.stat.currentlevel
       }
-      rollData.statDicesLevel = rollData.stat.level + rollData.stat.bonuseffect
       rollData.statMod = rollData.stat.mod
       if (vehicle) {
         rollData.vehicle = duplicate(vehicle)
@@ -1859,8 +1911,6 @@ export class PegasusActor extends Actor {
           vehicle.addVehicleShields(rollData)
         }
         vehicle.addEffects(rollData, false, false, false)
-        //this.addVehiculeHindrances(rollData.effectsList, vehicle)
-        //this.addVehicleBonus(rollData, vehicle)
       }
 
       rollData.specList = this.getRelevantSpec(statKey)
@@ -1904,6 +1954,8 @@ export class PegasusActor extends Actor {
     this.addArmorsShields(rollData, statKey, useShield, subKey)
     this.addWeapons(rollData, statKey, useShield)
     this.addEquipments(rollData, statKey)
+    this.processVehicleTargetMessage(rollData)
+
     console.log("ROLLDATA", rollData)
 
     return rollData
@@ -1912,7 +1964,14 @@ export class PegasusActor extends Actor {
   /* -------------------------------------------- */
   processSizeBonus(rollData) {
     if (rollData.defenderTokenId) {
-      let diffSize = rollData.defenderSize - this.system.biodata.sizenum + this.system.biodata.sizebonus
+      let diffSize = 0
+      if (this.type == "character") {
+        this.system.biodata.sizenum = this.system.biodata?.sizenum ?? 0
+        this.system.biodata.sizebonus = this.system.biodata?.sizebonus ?? 0
+        diffSize = rollData.defenderSize - this.system.biodata.sizenum + this.system.biodata.sizebonus
+      } else {
+        diffSize = rollData.defenderSize - this.system.statistics.hr.size
+      }
       //console.log("Diffsize", diffSize)
       if (rollData.subKey == "melee-atk" || rollData.subKey == "ranged-atk") {
         if (diffSize > 0) {
@@ -2009,7 +2068,7 @@ export class PegasusActor extends Actor {
 
   /*-------------------------------------------- */
   rollStat(statKey) {
-    let stat = this.getStat(statKey);
+    let stat = this.getStat(statKey)
     if (stat) {
       let rollData = this.getCommonRollData(statKey)
       rollData.mode = "stat"
@@ -2165,22 +2224,35 @@ export class PegasusActor extends Actor {
   }
   /* -------------------------------------------- */
   processVehicleStatEffects() {
-    let effects = this.items.filter(effect => effect.type == "effect" && effect.system.genre == "positive" && effect.system.statdice)
+    let effectsPlus = this.items.filter(effect => effect.type == "effect" && effect.system.genre == "positive" && effect.system.statdice)
+    let effectsMinus = this.items.filter(effect => effect.type == "effect" && effect.system.genre == "negative" && effect.system.reducedicevalue)
     for (let statKey in this.system.statistics) {
       let stat = duplicate(this.system.statistics[statKey])
       let bonus = 0
-      for (let effect of effects) {
+      for (let effect of effectsPlus) {
         if (effect.system.stataffected == statKey) {
           bonus += Number(effect.system.effectlevel)
         }
       }
+      for (let effect of effectsMinus) {
+        if (effect.system.stataffected == statKey) {
+          bonus -= Number(effect.system.effectlevel)
+        }
+      }
       if (bonus != stat.bonuseffect) {
         stat.bonuseffect = bonus
+        if ( stat.bonuseffect + stat.level < 1) {
+          stat.level = 1
+          stat.bonuseffect = 0
+        }
+        if (stat.currentlevel > stat.bonuseffect+stat.level) {
+          stat.currentlevel = stat.bonuseffect+stat.level
+        }
         this.update({ [`system.statistics.${statKey}`]: stat })
-      }
+      }  
     }
   }
-  
+
   /* -------------------------------------------- */
   async computeVehicleStats() {
 
@@ -2296,6 +2368,9 @@ export class PegasusActor extends Actor {
       return
     }
 
+    if (item.type == "effect" && item.system.droptext && item.system.droptext.length > 0) {
+      ChatMessage.create({ content: `Effect ${item.name} message : ${item.system.droptext}` })
+    }
     //console.log(">>>>> item", item.type, __isVehicleUnique[item.type])
     if (__isVehicleUnique[item.type]) {
       let toDelList = []
@@ -2317,6 +2392,13 @@ export class PegasusActor extends Actor {
         return false
       }
     }
+    // NRG max management
+    if (item.type == "powercoremodule" ) {
+      if (this.system.statistics.pc.maxnrg != item.system.nrg ) {
+          this.update( {'system.statistics.pc.maxnrg': item.system.nrg })
+      }
+    }
+    
     // Cargo management
     if (__isVehicleCargo[item.type]) {
       let capacity = this.getCurrentCargoCapacity()
@@ -2446,6 +2528,34 @@ export class PegasusActor extends Actor {
     }
   }
 
+  /* -------------------------------------------- */
+  async addVehicleModuleEffects( mod) {
+    let effects = []
+    for (let effect of mod.system.effects) {
+      if (!effect.system) {
+        effect.system = effect.data
+      }
+      effect.system.effectId = mod.id // Link to the perk, in order to dynamically remove them
+      effects.push(effect)
+    }
+    if (effects.length) {
+      await this.createEmbeddedDocuments('Item', effects)
+    }
+  }
+  /* -------------------------------------------- */
+  async removeVehicleModuleEffects( mod) {
+    let toRem = []
+    for (let item of this.items) {
+      if (item.type == 'effect' && item.system.effectId == mod.id) {
+        toRem.push(item.id)
+      }
+    }
+    console.log("TODEL", toRem)
+    if (toRem.length) {
+      await this.deleteEmbeddedDocuments('Item', toRem)
+    }
+  }
+
   /* -------------------------------------------- */
   async activateVehicleModule(itemId) {
     let mod = this.items.get(itemId)
@@ -2462,13 +2572,20 @@ export class PegasusActor extends Actor {
           pc.maxnrg -= Number(mod.system.nrg)
           pc.curnrg -= Number(mod.system.nrg)
           this.update({ 'system.statistics.pc': pc })
+          this.addVehicleModuleEffects(mod)
         } else { // Now deactivated
           pc.actnrg -= Number(mod.system.nrg)
           pc.maxnrg += Number(mod.system.nrg)
           this.update({ 'system.statistics.pc': pc })
           await this.updateEmbeddedDocuments('Item', [{ _id: mod.id, 'system.activated': !mod.system.activated }])
+          this.removeVehicleModuleEffects(mod)
         }
       } else {
+        if ( mod.system.activated)  {
+          this.removeVehicleModuleEffects(mod)
+        } else {
+          this.addVehicleModuleEffects(mod)
+        }
         await this.updateEmbeddedDocuments('Item', [{ _id: mod.id, 'system.activated': !mod.system.activated }])
       }
     }
@@ -2490,8 +2607,13 @@ export class PegasusActor extends Actor {
     for (let loc of __LocationsArmour) {
       let arcKey = loc + "arc"
       let arc = duplicate(this.system.arcs[arcKey])
-      if (level != Number(arc.shieldlevel)) {
-        arc.shieldlevel = level
+      if (level != Number(arc.maxshieldlevel)) {
+        let lvChanged = level - arc.maxshieldlevel
+        arc.maxshieldlevel = level
+        arc.shieldlevel += lvChanged
+        if ( arc.shieldlevel <= 0 || arc.shieldlevel > level) {
+          arc.shieldlevel = level
+        }
         setTimeout(shift, this.update({ [`system.arcs.${arcKey}`]: arc }))
         shift += 200
       }
@@ -2508,15 +2630,20 @@ export class PegasusActor extends Actor {
           level += Number(armour.system.armourdicevalue)
         }
       }
-      if (level != Number(arc.armourlevel)) {
-        arc.armourlevel = level
+      if (level != Number(arc.maxarmourlevel)) {
+        let lvChanged = level - arc.maxarmourlevel
+        arc.maxarmourlevel = level
+        arc.armourlevel += lvChanged
+        if ( arc.armourlevel <= 0 || arc.armourlevel > arc.maxarmourlevel) {
+          arc.armourlevel = level
+        }
         setTimeout(500, this.update({ [`system.arcs.${arcKey}`]: arc }))
       }
     }
   }
   /* -------------------------------------------- */
   updateMaxNrg(currentLevel) {
-    this.update({ 'system.statistics.pc.maxnrg': Number(currentLevel) })
+    this.update({ 'system.statistics.pc.maxnrg': Number( PegasusUtility.getDiceValue(currentLevel) ) })
   }
   /* -------------------------------------------- */
   setTurningArc(currentLevel) {

modules/pegasus-utility.js

@@ -544,7 +544,7 @@ export class PegasusUtility {
 
   /* -------------------------------------------- */
   static getDiceFromLevel(level = 0) {
-    level = Number(level)
+    level = Math.max( Number(level), 0)
     return this.diceList[level];
   }
   /* -------------------------------------------- */
@@ -1210,9 +1210,6 @@ export class PegasusUtility {
     let agitatorTokens = canvas.tokens.placeables.filter(token => token.actor.isAgitator() && !token.document.hidden)
     for (let token of agitatorTokens) {
       token.refresh()
-      if (token.document.disposition == 0) {
-        continue
-      }
       let ennemies = []
       if (token.document.disposition == -1) {
         ennemies = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && (newToken.document.disposition == 1 || newToken.document.disposition == 0 ))

modules/pegasus-vehicle-sheet.js

@@ -51,8 +51,8 @@ export class PegasusVehicleSheet extends ActorSheet {
       vehicleHull: duplicate(this.actor.getVehicleHull()),
       mobilityModules: duplicate(this.actor.getMobilityModules()),
       propulsionModules: duplicate(this.actor.getPropulsionModules()),
-      vehicleModules: duplicate(this.actor.getVehicleModules()),
-      vehicleWeaponModules: duplicate(this.actor.getVehicleWeaponModules()),
+      vehicleModules: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getVehicleModules())),
+      vehicleWeaponModules: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getVehicleWeaponModules())),
       cargos: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getCargos()) ),
       cargoCurrent: this.actor.getCurrentCargoCapacity(),
       moneys: duplicate(this.actor.getMoneys()),
@@ -134,19 +134,7 @@ export class PegasusVehicleSheet extends ActorSheet {
       let itemId = li.data("item-id")
       this.actor.activateVehicleModule( itemId)
     });      
-    
-    html.find('.equip-activate').click(ev => {
-      const li = $(ev.currentTarget).parents(".item")
-      let itemId = li.data("item-id")
-      this.actor.equipActivate( itemId)
-    });      
-    html.find('.equip-deactivate').click(ev => {
-      const li = $(ev.currentTarget).parents(".item")
-      let itemId = li.data("item-id")
-      this.actor.equipDeactivate( itemId)
-    });      
-
-    html.find('.effect-used').click(ev => {
+        html.find('.effect-used').click(ev => {
       const li = $(ev.currentTarget).parents(".item");
       let itemId = li.data("item-id");
       this.actor.perkEffectUsed( itemId)

system.json

@@ -253,7 +253,7 @@
   ],
   "title": "Pegasus RPG",
   "url": "https://www.uberwald.me/data/files/fvtt-pegasus-rpg",
-  "version": "10.1.2",
-  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v10.1.2.zip",
+  "version": "10.1.9",
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v10.1.9.zip",
   "background": "systems/fvtt-pegasus-rpg/images/ui/pegasus_welcome_page.webp"
 }

template.json

@@ -310,6 +310,8 @@
             "topspeed": "",
             "shieldlevel": 0,
             "armourlevel": 0,
+            "maxshieldlevel": 0,
+            "maxarmourlevel": 0,
             "is3D": false
           },
           "reararc": {
@@ -317,13 +319,17 @@
             "topspeed": "",
             "shieldlevel": 0,
             "armourlevel": 0,
-            "is3D": false
+            "maxshieldlevel": 0,
+            "maxarmourlevel": 0,
+            "is3D": false            
           },
           "rightarc": {
             "label": "Right Arc",
             "topspeed": "",
             "shieldlevel": 0,
             "armourlevel": 0,
+            "maxshieldlevel": 0,
+            "maxarmourlevel": 0,
             "is3D": false
           },
           "leftarc": {
@@ -331,6 +337,8 @@
             "topspeed": "",
             "shieldlevel": 0,
             "armourlevel": 0,
+            "maxshieldlevel": 0,
+            "maxarmourlevel": 0,
             "is3D": false
           },
           "toparc": {
@@ -338,6 +346,8 @@
             "topspeed": "",
             "shieldlevel": 0,
             "armourlevel": 0,
+            "maxshieldlevel": 0,
+            "maxarmourlevel": 0,
             "is3D": true
           },
           "bottomarc": {
@@ -345,6 +355,8 @@
             "topspeed": "",
             "shieldlevel": 0,
             "armourlevel": 0,
+            "maxshieldlevel": 0,
+            "maxarmourlevel": 0,
             "is3D": true
           }
         }
@@ -417,6 +429,7 @@
       "affectstatus": false,
       "affectedstatus": "",
       "locked": false,
+      "droptext": "",
       "description": ""
     },
     "race": {

templates/item-effect-sheet.html

@@ -85,7 +85,10 @@
             <li class="flexrow"><label class="generic-label">Locked (Only GM can change/edit) ?</label>
               <label class="attribute-value checkbox"><input type="checkbox" name="system.locked" {{checked data.locked}}/></label>
             </li>
-
+            <li class="flexrow"><label class="generic-label">Display Text when added to Actor</label>
+              <input type="text" class="input-numeric-short padd-right" name="system.droptext" value="{{data.droptext}}" data-dtype="String"/>
+            </li>
+            
             <li class="flexrow"><label class="generic-label">Affect Status?</label>
               <label class="attribute-value checkbox"><input type="checkbox" name="system.affectstatus" {{checked data.affectstatus}}/></label>
             </li>

templates/item-vehicleweaponmodule-sheet.html

@@ -105,8 +105,8 @@
 
 
           <li class="flexrow"><label class="generic-label">Turret</label>
-            <select class="competence-base flexrow" type="text" name="system.turret" value="{{data.turret}}" data-dtype="Number">
-              {{#select data.turret}} F Front, F Left, F Right, F Rear, F Up, F Down, T 180 Front, T 180 Left, T 180 Rear, T 180 Right, T 360
+            <select class="competence-base flexrow" type="text" name="system.turret" value="{{data.turret}}" data-dtype="String">
+              {{#select data.turret}} 
               <option value="ffront">F Front</option>
               <option value="fleft">F Left</option>
               <option value="fright">F Right</option>

templates/partial-vehicle-arc.html

@@ -9,9 +9,15 @@
     <span class="item-field-label-long">
       <label class="short-label">Shield</label>
     </span>
+    <span class="item-field-label-short">
+      <label class="short-label">Max</label>
+    </span>
     <span class="item-field-label-long">
       <label class="short-label">Armour</label>
     </span>
+    <span class="item-field-label-short">
+      <label class="short-label">Max</label>
+    </span>
   </li>
   <li class="item flexrow list-item list-item-shadow" data-arc-name="{{idx}}">
 
@@ -31,16 +37,18 @@
         {{#select arc.shieldlevel}}
         {{{@root.optionsDiceList}}}
         {{/select}}
-        </select>
+      </select>
     </span>
+    <span class="item-field-label-short"><label class="short-label">{{getDice arc.maxshieldlevel}}</label></span>
 
     <span class="item-field-label-long">
       <select type="text" name="system.arcs.{{idx}}.armourlevel" value="{{arc.armourlevel}}" data-dtype="Number">
         {{#select arc.armourlevel}}
         {{{@root.optionsDiceList}}}
         {{/select}}
-        </select>
+      </select>
     </span>
+    <span class="item-field-label-short"><label class="short-label">{{getDice arc.maxarmourlevel}}</label></span>
 
   </li>
 </ul>

templates/vehicle-sheet.html

@@ -456,10 +456,10 @@
           <span class="item-name-label-header-long">
             <h3><label class="items-title-text">Vehicles modules</label></h3>
           </span>
-          <span class="item-field-label-long">
+          <span class="item-field-label-medium">
             <label class="short-label">Category</label>
           </span>
-          <span class="item-field-label-long">
+          <span class="item-field-label-medium">
             <label class="short-label">Location</label>
           </span>
           <span class="item-field-label-long">
@@ -480,12 +480,20 @@
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
               src="{{vehiclemod.img}}" /></a>
           <span class="item-name-label-long"><a class="roll-spec">{{vehiclemod.name}}</a></span>
-          <span class="item-field-label-long">{{vehiclemod.system.category}}</span>
-          <span class="item-field-label-long">{{vehiclemod.system.location}}</span>
+          <span class="item-field-label-medium">{{vehiclemod.system.category}}</span>
+          <span class="item-field-label-medium">{{vehiclemod.system.location}}</span>
           <span class="item-field-label-long">{{vehiclemod.system.security}}</span>
           <span class="item-field-label-short">{{vehiclemod.system.nrg}}</span>
           <span class="item-field-label-medium">{{vehiclemod.system.range}}</span>
-          <span class="item-field-label-short">{{vehiclemod.system.idr}}</span>
+
+          <span class="item-field-label-short">
+              {{#if vehiclemod.system.idrDice}}
+            <a class="roll-idr" data-dice-value="{{vehiclemod.system.idrDice}}">{{vehiclemod.system.idrDice}}</a>
+            {{else}}
+            &nbsp;-&nbsp;
+            {{/if}}
+          </span>
+
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
             <a class="item-control vehicle-module-activate" title="Activated">{{#if vehiclemod.system.activated}}<i
@@ -501,10 +509,10 @@
           <span class="item-name-label-header-long">
             <h3><label class="items-title-text">Vehicles weapons</label></h3>
           </span>
-          <span class="item-field-label-long">
+          <span class="item-field-label-medium">
             <label class="short-label">Site</label>
           </span>
-          <span class="item-field-label-long">
+          <span class="item-field-label-medium">
             <label class="short-label">Location</label>
           </span>
           <span class="item-field-label-short">
@@ -528,13 +536,21 @@
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
               src="{{weapon.img}}" /></a>
           <span class="item-name-label-long"><a class="roll-spec">{{weapon.name}}</a></span>
-          <span class="item-field-label-long">{{weapon.system.site}}</span>
-          <span class="item-field-label-long">{{weapon.system.location}}</span>
+          <span class="item-field-label-medium">{{weapon.system.site}}</span>
+          <span class="item-field-label-medium">{{weapon.system.location}}</span>
           <span class="item-field-label-short">{{weapon.system.dmg}}</span>
           <span class="item-field-label-medium">{{weapon.system.aoe}}</span>
-          <span class="item-field-label-medium">{{weapon.system.turrent}}</span>
+          <span class="item-field-label-medium">{{weapon.system.turret}}</span>
           <span class="item-field-label-short">{{weapon.system.nrg}}</span>
-          <span class="item-field-label-short">{{weapon.system.idr}}</span>
+
+          <span class="item-field-label-short">
+            {{#if weapon.system.idrDice}}
+            <a class="roll-idr" data-dice-value="{{weapon.system.idrDice}}">{{weapon.system.idrDice}}</a>
+            {{else}}
+            &nbsp;-&nbsp;
+            {{/if}}
+          </span>
+
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
             <a class="item-control vehicle-weapon-activate" title="Activated">{{#if weapon.system.activated}}<i