Fix #105 review target

modules/pegasus-actor.js

@@ -195,7 +195,7 @@ export class PegasusActor extends Actor {
     return comp;
   }
   getVehicleWeaponModules() {
-    let comp = this.items.filter(item => item.type == 'vehicleweaponmodule');
+    let comp = this.items.filter(item => item.type == 'vehicleweaponmodule' && item.system.activated);
     return comp;
   }
 
@@ -334,7 +334,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) {
@@ -1823,12 +1823,18 @@ export class PegasusActor extends Actor {
         }
       }
       if (this.type == "vehicle"  && rollData.statKey == "man" && this.system.statistics.ad.currentspeed == "fast") {
-        ChatMessage.create({ content: `Vehicle 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` })
+        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: `Vehicle 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` })
+        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` })
+      }
+  }
   }
 
   /* -------------------------------------------- */
@@ -2487,6 +2493,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)
@@ -2503,13 +2537,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 }])
       }
     }
@@ -2531,8 +2572,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
       }
@@ -2549,15 +2595,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-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.3",
-  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v10.1.3.zip",
+  "version": "10.1.5",
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v10.1.5.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
           }
         }

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