Fix #24 #25 Cargo capacity

images/icons/.directory

@@ -1,6 +1,6 @@
 [Dolphin]
-SortRole=creationtime
-Timestamp=2021,4,13,9,23,48.267
+SortRole=modificationtime
+Timestamp=2022,9,8,20,43,38.73
 Version=4
 ViewMode=1
 VisibleRoles=Details_text,Details_size,Details_modificationtime,Details_creationtime,CustomizedDetails

modules/pegasus-actor-sheet.js

@@ -246,7 +246,7 @@ export class PegasusActorSheet extends ActorSheet {
       this.actor.rollPool( 'agi', false, "ranged-atk");
     });
     html.find('.defense-roll').click((event) => {
-      this.actor.rollPool( 'def', true);
+      this.actor.rollPool( 'def', true, "defence");
     });
     html.find('.damage-melee').click((event) => {
       this.actor.rollPool( 'str', false, "melee-dmg");
@@ -365,7 +365,10 @@ export class PegasusActorSheet extends ActorSheet {
     if (item == undefined) {
       item = this.actor.items.get( dragData.uuid )
     }
-    let ret = await this.actor.preprocessItem( event, item, true )
+    console.log("Dropped", item)
+    
+    let itemFull = await PegasusUtility.searchItem( item )
+    let ret = await this.actor.preprocessItem( event, itemFull, true )
     if ( ret ) {
       super._onDropItem(event, dragData)
     }

modules/pegasus-item-sheet.js

@@ -426,11 +426,15 @@ export class PegasusItemSheet extends ItemSheet {
     let data = event.dataTransfer.getData('text/plain')
     let dataItem = JSON.parse( data)
     console.log("DROP", event, dataItem )
-    const item = fromUuidSync(dataItem.uuid)
+    let item = fromUuidSync(dataItem.uuid)
+    if (item.pack) {
+      item = await PegasusUtility.searchItem(item)
+    }
     if (!item) {
       ui.notifications.warn("Unable to find relevant item  - Aborting drag&drop " + data.uuid)
       return
     }
+    console.log("DROP REULT", this.object.type, item.type)
 
     if (this.object.type == 'virtue' ) {      
       if (item.type == 'effect') {

modules/pegasus-roll-dialog.js

@@ -118,6 +118,36 @@ export class PegasusRollDialog extends Dialog {
     PegasusUtility.updateDamageDicePool(this.rollData)
   }
 
+  /* -------------------------------------------- */
+  manageVehicleWeapon( weaponIdx, toggled) {
+    let weapon = this.rollData.vehicleWeapons[weaponIdx]
+    if (weapon) {
+      this.rollData.weapon = duplicate(weapon)
+      if (toggled) {
+        this.rollData.weaponName = weapon.weapon.name
+      } else {
+        this.rollData.weaponName = undefined
+      }
+      weapon.applied = toggled
+    }
+    PegasusUtility.updateDamageDicePool(this.rollData)
+  }
+
+  /* -------------------------------------------- */
+  manageVehicleShield( shieldIdx, toggled) {
+    let shield = this.rollData.vehicleShieldList[shieldIdx]
+    if (shield) {
+      this.rollData.shield = duplicate(shield)
+      if (toggled) {
+        this.rollData.shieldName = shield.name
+      } else {
+        this.rollData.shieldName = undefined
+      }
+      shield.applied = toggled
+    }
+    PegasusUtility.updateArmorDicePool(this.rollData)
+  }
+
   /* -------------------------------------------- */
   manageEquip(equipIdx, toggled) {
     let equip = this.rollData.equipmentsList[equipIdx]
@@ -216,6 +246,19 @@ export class PegasusRollDialog extends Dialog {
       let equipIdx = $(event.currentTarget).data("equip-idx")
       this.manageEquip(equipIdx, toggled)
     })
+    html.find('.vehicle-weapon-clicked').change((event) => {
+      let toggled = event.currentTarget.checked
+      let weaponIdx = $(event.currentTarget).data("vehicle-weapon-idx")
+      this.manageVehicleWeapon(weaponIdx, toggled)
+      this.refreshDialog()
+    })
+    html.find('.vehicle-shield-clicked').change((event) => {
+      let toggled = event.currentTarget.checked
+      let shieldIdx = $(event.currentTarget).data("vehicle-shield-idx")
+      this.manageVehicleShield(shieldIdx, toggled)
+      this.refreshDialog()
+    })
+    
 
     html.find('.pool-add-dice').click(async (event) => {
       let diceKey = $(event.currentTarget).data("dice-key")

modules/pegasus-utility.js

@@ -7,7 +7,7 @@ import { PegasusRollDialog } from "./pegasus-roll-dialog.js";
 /* -------------------------------------------- */
 const __level2Dice = ["d0", "d4", "d6", "d8", "d10", "d12"]
 const __name2DiceValue = { "0": 0, "d0": 0, "d4": 4, "d6": 6, "d8": 8, "d10": 10, "d12": 12 }
-const __dice2Level = {"d0": 0, "d4": 1, "d6": 2, "d8": 3, "d10": 4, "d12": 5}
+const __dice2Level = { "d0": 0, "d4": 1, "d6": 2, "d8": 3, "d10": 4, "d12": 5 }
 
 /* -------------------------------------------- */
 export class PegasusUtility {
@@ -61,8 +61,8 @@ export class PegasusUtility {
   /* -------------------------------------------- */
   static initGenericRoll() {
     let rollData = PegasusUtility.getBasicRollData()
-    rollData.alias = "Dice Pool Roll", 
-    rollData.mode  = "generic"
+    rollData.alias = "Dice Pool Roll",
+      rollData.mode = "generic"
     rollData.title = `Dice Pool Roll`
     rollData.img = "icons/dice/d12black.svg"
     rollData.isGeneric = true
@@ -85,14 +85,14 @@ export class PegasusUtility {
           event.preventDefault()
           let rollData = PegasusUtility.initGenericRoll()
           rollData.isChatRoll = true
-          let rollDialog = await PegasusRollDialog.create( undefined, rollData)
-          rollDialog.render( true )
+          let rollDialog = await PegasusRollDialog.create(undefined, rollData)
+          rollDialog.render(true)
         })
-  
+
       }
     })
-  } 
-  
+  }
+
   /* -------------------------------------------- */
   static pushInitiativeOptions(html, options) {
     options.push({ name: "Apply -10", condition: true, icon: '<i class="fas fa-plus"></i>', callback: target => { PegasusCombat.decInitBy10(target.data('combatant-id'), -10); } })
@@ -105,20 +105,29 @@ export class PegasusUtility {
     { key: "d12", level: 5, img: "systems/fvtt-pegasus-rpg/images/dice/d12.webp" }]
   }
 
+  /* -------------------------------------------- */
+  static buildDicePool(name, level, mod = 0, effectName = undefined) {
+    let dicePool = []
+    let diceKey = PegasusUtility.getDiceFromLevel(level)
+    let diceList = diceKey.split(" ")
+    for (let myDice of diceList) {
+      myDice = myDice.trim()
+      let newDice = {
+        name: name, key: myDice, level: PegasusUtility.getLevelFromDice(myDice), mod: mod, effect: effectName,
+        img: `systems/fvtt-pegasus-rpg/images/dice/${myDice}.webp`
+      }
+      dicePool.push(newDice)
+      mod = 0 // Only first dice has modifier
+    }
+    return dicePool
+  }
+
   /* -------------------------------------------- */
   static updateEffectsBonusDice(rollData) {
     let newDicePool = rollData.dicePool.filter(dice => dice.name != "effect-bonus-dice")
     for (let effect of rollData.effectsList) {
       if (effect && effect.applied && effect.type == "effect" && effect.effect.system.bonusdice) {
-        let diceKey = PegasusUtility.getDiceFromLevel(effect.effect.system.effectlevel)
-        let diceList = diceKey.split(" ")
-        for (let myDice of diceList) {
-          let newDice = {
-            name: "effect-bonus-dice", key: myDice, level: effect.effect.system.effectlevel, effect: effect.effect.name,
-            img: `systems/fvtt-pegasus-rpg/images/dice/${myDice}.webp`
-          }
-          newDicePool.push(newDice)
-        }
+        newDicePool = newDicePool.concat( this.buildDicePool("effect-bonus-dice", effect.effect.system.effectlevel, 0, effect.effect.name ))
       }
     }
     rollData.dicePool = newDicePool
@@ -128,16 +137,8 @@ export class PegasusUtility {
   static updateHindranceBonusDice(rollData) {
     let newDicePool = rollData.dicePool.filter(dice => dice.name != "effect-hindrance")
     for (let hindrance of rollData.effectsList) {
-      if (hindrance && hindrance.applied && (hindrance.type == "hindrance" || (hindrance.type == "effect" && hindrance.effect?.system?.hindrance) ) ) {
-        let diceKey = PegasusUtility.getDiceFromLevel( (hindrance.value) ? hindrance.value : hindrance.effect.system.effectlevel)
-        let diceList = diceKey.split(" ")
-        for (let myDice of diceList) {
-          let newDice = {
-            name: "effect-hindrance", key: myDice, level: hindrance.value, effect: hindrance.name,
-            img: `systems/fvtt-pegasus-rpg/images/dice/${myDice}.webp`
-          }
-          newDicePool.push(newDice)
-        }
+      if (hindrance && hindrance.applied && (hindrance.type == "hindrance" || (hindrance.type == "effect" && hindrance.effect?.system?.hindrance))) {
+        newDicePool = newDicePool.concat( this.buildDicePool("effect-hindrance", (hindrance.value) ? hindrance.value : hindrance.effect.system.effectlevel, 0, hindrance.name ))
       }
     }
     rollData.dicePool = newDicePool
@@ -148,15 +149,13 @@ export class PegasusUtility {
     let newDicePool = rollData.dicePool.filter(dice => dice.name != "armor-shield")
     for (let armor of rollData.armorsList) {
       if (armor.applied) {
-        let diceKey = PegasusUtility.getDiceFromLevel(armor.value)
-        let diceList = diceKey.split(" ")
-        for (let myDice of diceList) {
-          let newDice = {
-            name: "armor-shield", key: myDice, level: armor.value,
-            img: `systems/fvtt-pegasus-rpg/images/dice/${myDice}.webp`
-          }
-          newDicePool.push(newDice)
-        }
+        newDicePool = newDicePool.concat( this.buildDicePool("armor-shield", armor.value, 0))
+      }
+    }
+    newDicePool = rollData.dicePool.filter(dice => dice.name != "vehicle-shield")
+    for (let shield of rollData.vehicleShieldList) {
+      if (shield.applied) {
+        newDicePool = newDicePool.concat( this.buildDicePool("vehicle-shield", shield.value, 0))
       }
     }
     rollData.dicePool = newDicePool
@@ -169,56 +168,41 @@ export class PegasusUtility {
       let newDicePool = rollData.dicePool.filter(dice => dice.name != "damage")
       for (let weapon of rollData.weaponsList) {
         if (weapon.applied && weapon.type == "damage") {
-          let diceKey = PegasusUtility.getDiceFromLevel(weapon.value)
-          let diceList = diceKey.split(" ")
-          for (let myDice of diceList) {
-            let newDice = {
-              name: "damage", key: myDice, level: weapon.value,
-              img: `systems/fvtt-pegasus-rpg/images/dice/${myDice}.webp`
-            }
-            newDicePool.push(newDice)
-          }
+          newDicePool = newDicePool.concat( this.buildDicePool("damage", weapon.value, 0))
         }
       }
+
+      for (let weapon of rollData.vehicleWeapons) {
+        if (weapon.applied) {
+          newDicePool = newDicePool.concat( this.buildDicePool("damage", weapon.value, 0))
+        }
+      }
+      rollData.dicePool = newDicePool
+    }    
+  }
+
+  /* -------------------------------------------- */
+  static updateStatDicePool(rollData) {
+    let newDicePool = rollData.dicePool.filter(dice => dice.name != "stat")
+    let statDice = rollData.dicePool.find(dice => dice.name == "stat")
+    if (statDice.level > 0) {
+      newDicePool = newDicePool.concat( this.buildDicePool( "stat", rollData.statDicesLevel, statDice.mod))
+    }
+    
+    if (rollData.vehicleStat) {
+      newDicePool = rollData.dicePool.filter(dice => dice.name != "vehiclestat")
+      if (rollData.vehicleStat.currentlevel > 0 ) {
+        newDicePool = newDicePool.concat( this.buildDicePool( "vehiclestat", rollData.vehicleStat.currentlevel, 0))
+      }
       rollData.dicePool = newDicePool
     }
   }
 
-  /* -------------------------------------------- */
-  static updateStatDicePool( rollData) {
-    let newDicePool = rollData.dicePool.filter(dice => dice.name != "stat")
-    let statDice = rollData.dicePool.find(dice => dice.name == "stat")
-    if (statDice.level > 0) {
-      let diceKey = PegasusUtility.getDiceFromLevel(rollData.statDicesLevel)
-      let diceList = diceKey.split(" ")
-      let mod = statDice.mod
-      for (let myDice of diceList) {
-        myDice = myDice.trim()
-        let newDice = {
-          name: "stat", key: myDice, level: PegasusUtility.getLevelFromDice(myDice), mod: mod,
-          img: `systems/fvtt-pegasus-rpg/images/dice/${myDice}.webp`
-        }
-        mod = 0 // Only first dice has modifier
-        newDicePool.push(newDice)
-      }
-    }
-    rollData.dicePool = newDicePool
-  }
-
   /* -------------------------------------------- */
   static updateSpecDicePool(rollData) {
     let newDicePool = rollData.dicePool.filter(dice => dice.name != "spec")
     if (rollData.specDicesLevel > 0) {
-      let diceKey = PegasusUtility.getDiceFromLevel(rollData.specDicesLevel)
-      let diceList = diceKey.split(" ")
-      for (let myDice of diceList) {
-        myDice = myDice.trim()
-        let newDice = {
-          name: "spec", key: myDice, level: PegasusUtility.getLevelFromDice(myDice),
-          img: `systems/fvtt-pegasus-rpg/images/dice/${myDice}.webp`
-        }
-        newDicePool.push(newDice)
-      }
+      newDicePool = newDicePool.concat( this.buildDicePool( "spec", rollData.specDicesLevel, 0))
     }
     rollData.dicePool = newDicePool
   }
@@ -399,7 +383,7 @@ export class PegasusUtility {
         this.rollPegasus(rollData)
         character.modifyHeroLevelRemaining(-1)
       } else {
-        ui.notifications.warn(`No more Hero Level for ${actor.name} ! Unable to reroll.`)
+        ui.notifications.warn(`No more Hero Level for ${character.name} ! Unable to reroll.`)
       }
     }
   }
@@ -410,7 +394,7 @@ export class PegasusUtility {
   }
 
   /* -------------------------------------------- */
-  static targetToken( user, token, flag) {
+  static targetToken(user, token, flag) {
     if (flag) {
       token.actor.checkIfPossible()
     }
@@ -463,7 +447,7 @@ export class PegasusUtility {
   static async getEffectFromCompendium(effectName) {
     effectName = effectName.toLowerCase()
     let effect = game.items.contents.find(item => item.type == 'effect' && item.name.toLowerCase() == effectName)
-    if (!effect ) {
+    if (!effect) {
       let effects = await this.loadCompendium('fvtt-pegasus-rpg.effects', item => item.name.toLowerCase() == effectName)
       let objs = effects.map(i => i.toObject())
       effect = objs[0]
@@ -636,7 +620,7 @@ export class PegasusUtility {
   }
 
   /* -------------------------------------------- */
-  static removeForeignEffect( effectData) {
+  static removeForeignEffect(effectData) {
     if (game.user.isGM) {
       console.log("Remote removal of effects", effectData)
       let actor = game.canvas.tokens.get(effectData.defenderTokenId).actor
@@ -714,7 +698,7 @@ export class PegasusUtility {
         if (effect.foreign) {
           if (game.user.isGM) {
             this.removeForeignEffect(effect)
-          } else { 
+          } else {
             game.socket.emit("system.fvtt-pegasus-rpg", { msg: "msg_gm_remove_effect", data: effect })
           }
         } else {
@@ -767,7 +751,6 @@ export class PegasusUtility {
 
   /* -------------------------------------------- */
   static async rollPegasus(rollData) {
-
     let actor = game.actors.get(rollData.actorId)
 
     let diceFormulaTab = []
@@ -815,6 +798,8 @@ export class PegasusUtility {
     // And save the roll
     this.saveRollData(rollData)
     actor.lastRoll = rollData
+    console.log("Rolldata performed ", rollData, diceFormula)
+
   }
 
   /* -------------------------------------------- */
@@ -905,7 +890,11 @@ export class PegasusUtility {
   static async searchItem(dataItem) {
     let item
     if (dataItem.pack) {
-      item = await fromUuid("Compendium." + dataItem.pack + "." + dataItem.id)
+      let id = dataItem.id || dataItem._id
+      let items = await this.loadCompendium( dataItem.pack, item => item.id == id)
+      //console.log(">>>>>> PACK", items)
+      item = items[0] || undefined
+      //item = await fromUuid(dataItem.pack + "." + id)
     } else {
       item = game.items.get(dataItem.id)
     }
@@ -968,10 +957,12 @@ export class PegasusUtility {
       effectsList: [],
       armorsList: [],
       weaponsList: [],
+      vehicleWeapons: [],
       equipmentsList: [],
+      vehicleShieldList: [],
       optionsDiceList: PegasusUtility.getOptionsDiceList()
     }
-    if ( !isInit) { // For init, do not display target hindrances
+    if (!isInit) { // For init, do not display target hindrances
       PegasusUtility.updateWithTarget(rollData)
     }
     return rollData
@@ -981,7 +972,7 @@ export class PegasusUtility {
   static updateWithTarget(rollData) {
     let target = PegasusUtility.getTarget()
     if (target) {
-      console.log("TARGET ", target)      
+      console.log("TARGET ", target)
       let defenderActor = target.actor
       rollData.defenderTokenId = target.id
       //rollData.attackerId = this.id

modules/pegasus-vehicle-sheet.js

@@ -40,9 +40,26 @@ export class PegasusVehicleSheet extends ActorSheet {
       effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)),
       limited: this.object.limited,
       optionsDiceList: PegasusUtility.getOptionsDiceList(),
+      vmsAvailable: objectData.system.modules.totalvms - objectData.system.modules.vmsused,
+      avgNRG: objectData.system.statistics.pc.maxnrg - objectData.system.statistics.pc.curnrg,
+      crewList: this.actor.getCrewList(),
+      totalCost: this.actor.getTotalCost(),
       optionsLevel: PegasusUtility.getOptionsLevel(),
       subActors: duplicate(this.actor.getSubActors()),
       effects: duplicate(this.actor.getEffects()),
+      combatModules: duplicate(this.actor.getCombatModules()),
+      powerCoreModules: duplicate(this.actor.getPowercoreModules()),
+      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()),
+      weapons: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getWeapons()) ),
+      armors: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getArmors())),
+      shields: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getShields()) ),
+      equipments: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquipmentsOnly()) ),
+      cargoCurrent: this.actor.getCurrentCargoCapacity(),
+      moneys: duplicate(this.actor.getMoneys()),
       options: this.options,
       owner: this.document.isOwner,
       editScore: this.options.editScore,
@@ -106,17 +123,22 @@ export class PegasusVehicleSheet extends ActorSheet {
       this.actor.createEmbeddedDocuments('Item', [{ name: "NewItem", type: dataType }], { renderSheet: true })
     })
         
-    html.find('.spec-group-activate').click(ev => {
-      const li = $(ev.currentTarget).parents(".item");
-      let itemId = li.data("item-id");
-      this.actor.specPowerActivate( itemId)
-    });      
-    html.find('.spec-group-deactivate').click(ev => {
-      const li = $(ev.currentTarget).parents(".item");
-      let itemId = li.data("item-id");
-      this.actor.specPowerDeactivate( itemId)
-    });      
+    html.find('.current-speed-change').click(ev => {
+      let speed = ev.currentTarget.value
+      this.actor.manageCurrentSpeed(speed)
+    })
 
+    html.find('.vehicle-module-activate').click(ev => {
+      const li = $(ev.currentTarget).parents(".item")
+      let itemId = li.data("item-id")
+      this.actor.activateVehicleModule( itemId)
+    });      
+    html.find('.vehicle-weapon-activate').click(ev => {
+      const li = $(ev.currentTarget).parents(".item")
+      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")
@@ -133,44 +155,11 @@ export class PegasusVehicleSheet extends ActorSheet {
       let itemId = li.data("item-id");
       this.actor.perkEffectUsed( itemId)
     });      
-
-    html.find('.perk-status').change(ev => {
-      const li = $(ev.currentTarget).parents(".item");
-      let itemId = li.data("item-id");
-      this.actor.updatePerkStatus( itemId, ev.currentTarget.value)
-      this.render()
-    });
-
-    html.find('.power-cost-spent').change(ev => {
-      const li = $(ev.currentTarget).parents(".item");
-      let itemId = li.data("item-id");
-      this.actor.updatePowerSpentCost( itemId, ev.currentTarget.value)
-    });
-
-    html.find('.power-dmg-roll').click(ev => {
+        
+    html.find('.member-delete').click(ev => {
       const li = $(ev.currentTarget).parents(".item")
-      let itemId = li.data("item-id")
-      this.actor.powerDmgRoll( itemId )
-    })
-
-    html.find('.perk-used').change(ev => {
-      const li = $(ev.currentTarget).parents(".item")
-      let itemId = li.data("item-id")
-      let index = Number($(ev.currentTarget).data("use-index") )
-      this.actor.updatePerkUsed( itemId, index, ev.currentTarget.checked )
-    });
-    
-    html.find('.subactor-edit').click(ev => {
-      const li = $(ev.currentTarget).parents(".item");
-      let actorId = li.data("actor-id");
-      let actor = game.actors.get( actorId );
-      actor.sheet.render(true);
-    });
-    
-    html.find('.subactor-delete').click(ev => {
-      const li = $(ev.currentTarget).parents(".item");
-      let actorId = li.data("actor-id");
-      this.actor.delSubActor(actorId);
+      let actorId = li.data("actor-id")
+      this.actor.delCrew(actorId)
     });
     
     html.find('.quantity-minus').click(event => {
@@ -181,10 +170,10 @@ export class PegasusVehicleSheet extends ActorSheet {
       const li = $(event.currentTarget).parents(".item");
       this.actor.incDecQuantity( li.data("item-id"), +1 );
     } )
-    html.find('.current-nrg-minus').click(event => {
+    html.find('.vehicle-current-nrg-minus').click(event => {
       this.actor.incDecNRG( -1 );
     } )
-    html.find('.current-nrg-plus').click(event => {
+    html.find('.vehicle-current-nrg-plus').click(event => {
       this.actor.incDecNRG( 1 );
     } )
     
@@ -197,11 +186,11 @@ export class PegasusVehicleSheet extends ActorSheet {
       this.actor.incDecAmmo( li.data("item-id"), +1 )
     } );
 
-    html.find('.stun-minus').click(event => {
-      this.actor.modifyStun( -1 )
+    html.find('.vehicle-stun-minus').click(event => {
+      this.actor.modifyVehicleStun( -1 )
     } )
-    html.find('.stun-plus').click(event => {
-      this.actor.modifyStun( 1 )
+    html.find('.vehicle-stun-plus').click(event => {
+      this.actor.modifyVehicleStun( 1 )
     } )
 
     
@@ -218,23 +207,24 @@ export class PegasusVehicleSheet extends ActorSheet {
     html.find('.generic-pool-roll').click((event) => {      
       this.openGenericRoll()
     } );
+
     html.find('.attack-melee').click((event) => {
-      this.actor.rollPool( 'com', false, "melee-atk");
-    });
-    html.find('.attack-ranged').click((event) => {
-      this.actor.rollPool( 'agi', false, "ranged-atk");
-    });
-    html.find('.defense-roll').click((event) => {
-      this.actor.rollPool( 'def', true);
+      this.actor.rollPoolFromVehicle( 'com', false, "melee-atk")
     });
     html.find('.damage-melee').click((event) => {
-      this.actor.rollPool( 'str', false, "melee-dmg");
+      this.actor.rollPoolFromVehicle( 'str', false, "melee-dmg")
+    });
+    html.find('.attack-ranged').click((event) => {
+      this.actor.rollPoolFromVehicle( 'agi', false, "ranged-atk")
     });
     html.find('.damage-ranged').click((event) => {
-      this.actor.rollPool( 'per', false, "ranged-dmg");
+      this.actor.rollPoolFromVehicle( 'per', false, "ranged-dmg");
+    });
+    html.find('.defense-roll').click((event) => {
+      this.actor.rollPoolFromVehicle( 'agi', true, "defence");
     });
     html.find('.damage-resistance').click((event) => {
-      this.actor.rollPool( 'phy', false, "dmg-res");
+      this.actor.rollVehicleDamageResistance( );
     });
             
     html.find('.roll-stat').click((event) => {
@@ -250,16 +240,6 @@ export class PegasusVehicleSheet extends ActorSheet {
       this.rollIDR( li.data("item-id"), diceValue)
     })    
     
-    html.find('.roll-spec').click((event) => {
-      const li = $(event.currentTarget).parents(".item");
-      const specId = li.data("item-id");
-      this.actor.rollSpec(specId);
-    });
-    html.find('.power-roll').click((event) => {
-      const li = $(event.currentTarget).parents(".item");
-      const powerId = li.data("item-id");
-      this.actor.rollPower(powerId);
-    });        
     html.find('.weapon-roll').click((event) => {
       const li = $(event.currentTarget).parents(".item");
       const weaponId = li.data("item-id");
@@ -297,35 +277,19 @@ export class PegasusVehicleSheet extends ActorSheet {
       this.actor.equipItem( li.data("item-id") );
       this.render(true);      
     });
-    html.find('.power-activate').click(ev => {
-      const li = $(ev.currentTarget).parents(".item");
-      this.actor.activatePower( li.data("item-id") );
-      this.render(true); 
-    });
-    html.find('.vice-virtue-activate').click(ev => {
-      const li = $(ev.currentTarget).parents(".item")
-      this.actor.activateViceOrVirtue( li.data("item-id") )
-      this.render(true);
-    })
-        
-    html.find('.change-worstfear').change(ev => {
-      this.actor.manageWorstFear( ev.currentTarget.checked )
-    });
-    html.find('.change-desires').change(ev => {
-      this.actor.manageDesires( ev.currentTarget.checked )
-    });
 
     html.find('.update-field').change(ev => {
       const fieldName = $(ev.currentTarget).data("field-name");
       let value = Number(ev.currentTarget.value);
       this.actor.update( { [`${fieldName}`]: value } );
-    });    
-    html.find('.perk-active').click(ev => {
-      const li = $(ev.currentTarget).parents(".item");
-      this.actor.activatePerk( li.data("item-id") );
-      this.render(true);      
-    });
+    })
 
+    html.find('.member-view').click((event) => {
+      const li = $(event.currentTarget).parents(".item")
+      let actorId = li.data("actor-id")
+      const actor = game.actors.get( actorId )
+      actor.sheet.render(true)
+    })
   }
   
   /* -------------------------------------------- */
@@ -344,12 +308,23 @@ export class PegasusVehicleSheet extends ActorSheet {
     if (item == undefined) {
       item = this.actor.items.get( dragData.uuid )
     }
-    let ret = await this.actor.preprocessItem( event, item, true )
+    let ret = await this.actor.preprocessItemVehicle( event, item, true )
     if ( ret ) {
       super._onDropItem(event, dragData)
     }
   }
 
+  /* -------------------------------------------- */
+  async _onDropActor(event, dragData) {
+    const actor = fromUuidSync(dragData.uuid)
+    if (actor) { 
+      this.actor.addCrew(actor.id)
+    }else {
+      ui.notifications.warn("This actor is not found and can't be added to the Vehicle's crew.")
+    }
+    super._onDropActor(event)
+  }
+
   /* -------------------------------------------- */
   /** @override */
   _updateObject(event, formData) {

styles/simple.css

@@ -1235,8 +1235,7 @@ ul, li {
 
 /*************************************************************/
 #pause
-{
-  font-size: 2rem;
+{  font-size: 2rem;
 }
 #pause > h3
 {
@@ -1285,6 +1284,8 @@ Focus FOC: #ff0084
   background-color: black;
   background: black;
 }
+.color-class-fc,
+.color-class-man,
 .color-class-agi,
 .color-class-ranged-attack {
   background-color: #02a41d;
@@ -1303,10 +1304,12 @@ Focus FOC: #ff0084
 .color-class-meleedmg {
   background-color: #5f3d00;
 }
+.color-class-hr,
 .color-class-phy,
 .color-class-dmgres {
   background-color: #990304;
 }
+.color-class-ad,
 .color-class-mr {
   background-color: #050505;
 }
@@ -1325,6 +1328,7 @@ Focus FOC: #ff0084
 .color-class-ranged-damage {
   background-color: #f9c801;
 }
+.color-class-pc,
 .color-class-foc {
   background-color: #ff0084;
 }
@@ -1377,8 +1381,8 @@ Focus FOC: #ff0084
   min-height: 36px;
 }
 .item-stat-roll-vehicle {
-  max-height: 96px;
-  min-height: 90px;
+  max-height: 102px;
+  min-height: 102px;
 }
 .item-stat-roll select, .item-stat-roll input {
   margin-top: 4px;

system.json

@@ -1,6 +1,5 @@
 {
   "description": "Pegasus RPG system for FoundryVTT",
-  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v10.0.4.zip",
   "esmodules": [
     "modules/pegasus-main.js"
   ],
@@ -10,7 +9,8 @@
     {
       "lang": "en",
       "name": "English",
-      "path": "lang/en.json"
+      "path": "lang/en.json",
+      "flags": {}
     }
   ],
   "authors": [
@@ -19,14 +19,11 @@
       "flags": {}
     }
   ],
-  "library": false,
   "license": "LICENSE.txt",
   "manifest": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/raw/branch/master/system.json",
-  "manifestPlusVersion": "1.0.0",
-  "media": [],
   "compatibility": {
     "minimum": "10",
-    "verified": "10.284",
+    "verified": "10.285",
     "maximum": "10"
   },
   "id": "fvtt-pegasus-rpg",
@@ -35,241 +32,217 @@
       "type": "Item",
       "label": "Specialisations",
       "name": "specialisations",
-      "path": "./packs/specialisations.db",
+      "path": "packs/specialisations.db",
       "system": "fvtt-pegasus-rpg",
-      "tags": [
-        "specialisation"
-      ]
+      "private": false,
+      "flags": {}
     },
     {
       "type": "Item",
       "label": "Racial Abilities",
       "name": "racial-abilities",
-      "path": "./packs/racial-abilities.db",
+      "path": "packs/racial-abilities.db",
       "system": "fvtt-pegasus-rpg",
-      "tags": [
-        "ability"
-      ]
+      "private": false,
+      "flags": {}
     },
     {
       "type": "Item",
       "label": "Perks",
       "name": "perk",
-      "path": "./packs/perk.db",
+      "path": "packs/perk.db",
       "system": "fvtt-pegasus-rpg",
-      "tags": [
-        "perk"
-      ]
+      "private": false,
+      "flags": {}
     },
     {
       "type": "Item",
       "label": "Powers",
       "name": "powers",
-      "path": "./packs/powers.db",
+      "path": "packs/powers.db",
       "system": "fvtt-pegasus-rpg",
-      "tags": [
-        "power"
-      ]
+      "private": false,
+      "flags": {}
     },
     {
       "type": "Item",
       "label": "Race",
       "name": "race",
-      "path": "./packs/race.db",
+      "path": "packs/race.db",
       "system": "fvtt-pegasus-rpg",
-      "tags": [
-        "race"
-      ]
+      "private": false,
+      "flags": {}
     },
     {
       "type": "Item",
       "label": "Role",
       "name": "role",
-      "path": "./packs/role.db",
+      "path": "packs/role.db",
       "system": "fvtt-pegasus-rpg",
-      "tags": [
-        "role"
-      ]
+      "private": false,
+      "flags": {}
     },
     {
       "type": "Item",
       "label": "Effects",
       "name": "effects",
-      "path": "./packs/effects.db",
+      "path": "packs/effects.db",
       "system": "fvtt-pegasus-rpg",
-      "tags": [
-        "effect"
-      ]
+      "private": false,
+      "flags": {}
     },
     {
       "type": "Item",
       "label": "Armour",
       "name": "armour",
-      "path": "./packs/armour.db",
+      "path": "packs/armour.db",
       "system": "fvtt-pegasus-rpg",
-      "tags": [
-        "armour"
-      ]
+      "private": false,
+      "flags": {}
     },
     {
       "type": "Item",
       "label": "Equipment",
       "name": "equipment",
-      "path": "./packs/equipment.db",
+      "path": "packs/equipment.db",
       "system": "fvtt-pegasus-rpg",
-      "tags": [
-        "equipment"
-      ]
+      "private": false,
+      "flags": {}
     },
     {
       "type": "Item",
       "label": "Shields",
       "name": "shields",
-      "path": "./packs/shields.db",
+      "path": "packs/shields.db",
       "system": "fvtt-pegasus-rpg",
-      "tags": [
-        "shield"
-      ]
+      "private": false,
+      "flags": {}
     },
     {
       "type": "Item",
       "label": "Melee Weapons",
       "name": "melee-weapons",
-      "path": "./packs/melee-weapons.db",
+      "path": "packs/melee-weapons.db",
       "system": "fvtt-pegasus-rpg",
-      "tags": [
-        "weapon", "melee"
-      ]
+      "private": false,
+      "flags": {}
     },
     {
       "type": "Item",
       "label": "Ranged Weapons",
       "name": "ranged-weapons",
-      "path": "./packs/ranged-weapons.db",
+      "path": "packs/ranged-weapons.db",
       "system": "fvtt-pegasus-rpg",
-      "tags": [
-        "weapon", "ranged"
-      ]
+      "private": false,
+      "flags": {}
     },
     {
       "type": "Item",
       "label": "Currency",
       "name": "currency",
-      "path": "./packs/currency.db",
+      "path": "packs/currency.db",
       "system": "fvtt-pegasus-rpg",
-      "tags": [
-        "currency", "money"
-      ]
+      "private": false,
+      "flags": {}
     },
     {
       "type": "Item",
       "label": "Macros",
       "name": "macro-commands",
-      "path": "./packs/macro-commands.db",
+      "path": "packs/macro-commands.db",
       "system": "fvtt-pegasus-rpg",
-      "tags": [
-        "macro", "command"
-      ]
+      "private": false,
+      "flags": {}
     },
     {
       "type": "Item",
       "label": "Vehicle - Weapon modules",
       "name": "vm-vehicle-weapons-modules",
-      "path": "./packs/vm-vehicle-weapons-modules.db",
+      "path": "packs/vm-vehicle-weapons-modules.db",
       "system": "fvtt-pegasus-rpg",
-      "tags": [
-        "weapon", "vehicle"
-      ]
+      "private": false,
+      "flags": {}
     },
     {
       "type": "Item",
       "label": "Vehicle - Propulsion modules",
       "name": "vm-vehicle-propulsion-modules",
-      "path": "./packs/vm-vehicle-propulsion-modules.db",
+      "path": "packs/vm-vehicle-propulsion-modules.db",
       "system": "fvtt-pegasus-rpg",
-      "tags": [
-        "propulsion", "vehicle"
-      ]
+      "private": false,
+      "flags": {}
     },
     {
       "type": "Item",
       "label": "Vehicle - Power core modules",
       "name": "vm-vehicle-power-core-module",
-      "path": "./packs/vm-vehicle-power-core-module.db",
+      "path": "packs/vm-vehicle-power-core-module.db",
       "system": "fvtt-pegasus-rpg",
-      "tags": [
-        "propulsion", "vehicle"
-      ]
+      "private": false,
+      "flags": {}
     },
     {
       "type": "Item",
       "label": "Vehicle - Modules",
       "name": "vm-vehicle-modules",
-      "path": "./packs/vm-vehicle-modules.db",
+      "path": "packs/vm-vehicle-modules.db",
       "system": "fvtt-pegasus-rpg",
-      "tags": [
-        "module", "vehicle"
-      ]
+      "private": false,
+      "flags": {}
     },
     {
       "type": "Item",
       "label": "Vehicle - Mobility module",
       "name": "vm-vehicle-mobility-module",
-      "path": "./packs/vm-vehicle-mobility-module.db",
+      "path": "packs/vm-vehicle-mobility-module.db",
       "system": "fvtt-pegasus-rpg",
-      "tags": [
-        "mobility", "vehicle"
-      ]
+      "private": false,
+      "flags": {}
     },
     {
       "type": "Item",
       "label": "Vehicle - Hull module",
       "name": "vm-vehicle-hulls",
-      "path": "./packs/vm-vehicle-hulls.db",
+      "path": "packs/vm-vehicle-hulls.db",
       "system": "fvtt-pegasus-rpg",
-      "tags": [
-        "hull", "vehicle"
-      ]
+      "private": false,
+      "flags": {}
     },
     {
       "type": "Item",
       "label": "Vehicle - Combat module",
       "name": "vm-vehicle-combat-module",
-      "path": "./packs/vm-vehicle-combat-module.db",
+      "path": "packs/vm-vehicle-combat-module.db",
       "system": "fvtt-pegasus-rpg",
-      "tags": [
-        "combat", "vehicle"
-      ]
+      "private": false,
+      "flags": {}
     },
     {
       "type": "Item",
       "label": "Vices",
       "name": "vices",
-      "path": "./packs/vices.db",
+      "path": "packs/vices.db",
       "system": "fvtt-pegasus-rpg",
-      "tags": [
-        "vice"
-      ]
+      "private": false,
+      "flags": {}
     },
     {
       "type": "Item",
       "label": "Virtues",
       "name": "virtues",
-      "path": "./packs/virtues.db",
+      "path": "packs/virtues.db",
       "system": "fvtt-pegasus-rpg",
-      "tags": [
-        "virtue"
-      ]
+      "private": false,
+      "flags": {}
     },
     {
       "type": "Item",
       "label": "ZZ-Admin-FX",
       "name": "zz-adminfx-zz",
-      "path": "./packs/zz-adminfx-zz.db",
+      "path": "packs/zz-adminfx-zz.db",
       "system": "fvtt-pegasus-rpg",
-      "tags": [
-        "fx"
-      ]
+      "private": false,
+      "flags": {}
     }
   ],
   "primaryTokenAttribute": "secondary.health",
@@ -278,9 +251,9 @@
   "styles": [
     "styles/simple.css"
   ],
-  "templateVersion": 112,
   "title": "Pegasus RPG",
   "url": "https://www.uberwald.me/data/files/fvtt-pegasus-rpg",
-  "version": "10.0.4",
-  "background" : "systems/fvtt-pegasus-rpg/images/ui/pegasus_welcome_page.webp"
-}
+  "version": "10.0.16",
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v10.0.16.zip",
+  "background": "systems/fvtt-pegasus-rpg/images/ui/pegasus_welcome_page.webp"
+}

template.json

@@ -10,6 +10,7 @@
           "name": "",
           "age": 0,
           "size": "",
+          "sizenum": 0,
           "weight": "",
           "hair": "",
           "sex": "",
@@ -199,7 +200,9 @@
         "description": ""
       },
       "vehicle": {
-        "subactors": [],
+        "crew": [],
+        "crewmax": 0,
+        "crewmin": 0,
         "statistics": {
           "fc": {
             "label": "FC",
@@ -214,6 +217,7 @@
             "dicevalue": "",
             "level": 0,
             "currentlevel": 0,
+            "turningarc45": 0,
             "col": 1
           },
           "hr": {
@@ -231,6 +235,7 @@
             "currentlevel": 0,
             "avgnrg": 0,
             "curnrg": 0,
+            "maxnrg": 0,
             "col": 2
           },
           "mr": {
@@ -264,7 +269,7 @@
           "activatedmoduleenergy": 0,
           "vdp": 0,
           "vehiculevalue": 0,
-          "availablevms": 0,
+          "totalvms": 0,
           "vmsused": 0,
           "totalcost": 0
         },
@@ -674,6 +679,7 @@
       "range": "",
       "idr": "",
       "cost": 0,
+      "size": 0,
       "space": 0
     },
     "vehicleweaponmodule": {
@@ -685,12 +691,15 @@
       "effects": [],
       "damagedicevalue": "",
       "damagetype": "",
+      "damagetypelevel": 0,
       "aoe": "",
       "range": "",
       "turret": "",
       "linkedweapon": "",
       "idr": "",
-      "cost": 0
+      "cost": 0,
+      "extradamage": false,
+      "extradamagevalue": 0
     }
   }
 }

templates/actor-sheet.html

@@ -839,17 +839,16 @@
         <div>
           <ul class="item-list alternate-list">
             <li class="item flexrow">
-              <label class="generic-label">Origin</label>
-              <input type="text" class="" name="system.biodata.origin" value="{{data.biodata.origin}}"
-                data-dtype="String" />
+              <label class="generic-label">Sex</label>
+              <input type="text" class="" name="system.biodata.sex" value="{{data.biodata.sex}}" data-dtype="String" />
             </li>
             <li class="item flexrow">
               <label class="generic-label">Age</label>
               <input type="text" class="" name="system.biodata.age" value="{{data.biodata.age}}" data-dtype="String" />
             </li>
             <li class="item flexrow">
-              <label class="generic-label">Height</label>
-              <input type="text" class="" name="system.biodata.size" value="{{data.biodata.size}}" data-dtype="String" />
+              <label class="generic-label">Height/Weight</label>
+              <input type="text" class="" name="system.biodata.weight" value="{{data.biodata.weight}}" data-dtype="String" />
             </li>
             <li class="item flexrow">
               <label class="generic-label">Eyes</label>
@@ -864,13 +863,14 @@
        <div>
           <ul>
             <li class="flexrow item">
-              <label class="generic-label">Weight</label>
-              <input type="text" class="" name="system.biodata.weight" value="{{data.biodata.weight}}"
-                data-dtype="String" />
+              <label class="generic-label">Size</label>
+              <input type="text" class="" name="system.biodata.sizenum" value="{{data.biodata.sizenum}}"
+                data-dtype="Number" />
             </li>
             <li class="flexrow item">
-              <label class="generic-label">Sex</label>
-              <input type="text" class="" name="system.biodata.sex" value="{{data.biodata.sex}}" data-dtype="String" />
+              <label class="generic-label">Origin</label>
+              <input type="text" class="" name="system.biodata.origin" value="{{data.biodata.origin}}"
+                data-dtype="String" />
             </li>
             <li class="flexrow item">
               <label class="generic-label">Preferred Hand</label>
@@ -986,6 +986,14 @@
           <label class="attribute-value checkbox"><input type="checkbox" class="change-desires"
               name="system.biodata.desiresactive" {{checked data.biodata.desiresactive}} /> Active ?</label>
         </li>
+        <li class="flexrow">
+          <label class="short-label">Morality : </label>
+          <input type="text" class="" name="system.biodata.morality" value="{{data.biodata.morality}}" data-dtype="Number" />
+        </li>
+        <li class="flexrow">
+          <label class="short-label">Morality threshold : </label>
+          <input type="text" class="" name="system.biodata.moralitythreshold" value="{{data.biodata.moralitythreshold}}" disabled data-dtype="Number" />
+        </li>
       </ul>
 
       <h3>Catchphrase : </h3>
@@ -1026,14 +1034,6 @@
           <label class="short-label">Bonus selection : </label>
           <input type="text" class="" name="system.biodata.bonusselection" value="{{data.biodata.bonusselection}}" data-dtype="String" />
         </li>        
-        <li class="flexrow">
-          <label class="short-label">Morality : </label>
-          <input type="text" class="" name="system.biodata.morality" value="{{data.biodata.morality}}" data-dtype="Number" />
-        </li>
-        <li class="flexrow">
-          <label class="short-label">Morality threshold : </label>
-          <input type="text" class="" name="system.biodata.moralitythreshold" value="{{data.biodata.moralitythreshold}}" disabled data-dtype="Number" />
-        </li>
         <li class="flexrow">
           <label class="short-label">Hero Level (max) : </label>
           <select class="status-small-label color-class-common" type="text" name="system.biodata.maxlevelremaining" value="{{data.biodata.maxlevelremaining}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>

templates/chat-generic-result.html

@@ -25,7 +25,7 @@
         <li>Weapon Damage Dice : {{weaponDamageDice}}</li>
         {{/if}}
         {{#if isResistance}}
-        <li>Armor Resistance  Dice : {{armor.data.resistanceDice}}</li>
+        <li>Armor Resistance  Dice : {{armor.system.resistanceDice}}</li>
         {{/if}}
         {{#if stat}}  
         <li>Statistic : {{stat.label}}</li>
@@ -38,7 +38,11 @@
         <li>Weapon : {{weaponName}}</li>
         {{/if}}
         {{#if weapon}}  
-        <li>Damage type : {{weapon.weapon.data.damagetype}} {{weapon.weapon.data.damagetypelevel}}</li>
+          {{#if vehicle}}
+          <li>Damage type : {{weapon.weapon.system.damagetype}}</li>
+          {{else}}
+          <li>Damage type : {{weapon.weapon.system.damagetype}} {{weapon.weapon.system.damagetypelevel}}</li>
+          {{/if}}
         {{/if}}
 
         {{#if isResistance}}

templates/item-power-sheet.html

@@ -124,7 +124,7 @@
           <input type="text" class="padd-right" name="system.deactivatedtext" value="{{data.deactivatedtext}}" data-dtype="String"/>
         </li>
 
-        <li class="flexrow"><label class="generic-label">Power Level Cost</label>
+        <li class="flexrow"><label class="generic-label">PPP Used to Purchase</label>
           <input type="text" class="input-numeric-short padd-right" name="system.powerlevelcost" value="{{data.powerlevelcost}}"
             data-dtype="Number" />
         </li>

templates/item-propulsionmodule-sheet.html

@@ -29,7 +29,7 @@
             <input type="text" class="" name="system.ad" value="{{data.ad}}" data-dtype="Number"/>
           </li>   
 
-          <li class="flexrow"><label class="generic-label">Top Speed (TS)</label>
+          <li class="flexrow"><label class="generic-label">Top Speed (TS) bonus</label>
             <input type="text" class="" name="system.topspeed" value="{{data.topspeed}}" data-dtype="Number"/>
           </li>   
 

templates/item-vehiclemodule-sheet.html

@@ -50,7 +50,7 @@
             <label class="attribute-value checkbox"><input type="checkbox" name="system.activated" {{checked data.activated}}/></label>
           </li>
 
-          <li class="flexrow"><label class="generic-label">NRG</label>
+          <li class="flexrow"><label class="generic-label">NRG Cost</label>
             <input type="text" class="" name="system.nrg" value="{{data.nrg}}" data-dtype="Number"/>
           </li>
 

templates/item-vehicleweaponmodule-sheet.html

@@ -67,7 +67,21 @@
             </select>                     
           </li>          
 
-          <li class="flexrow"><label class="generic-label">Optimal Range</label>
+          <li class="flexrow"><label class="generic-label">Damage type level</label>
+            <input type="text" class="" name="system.damagetypelevel" value="{{data.damagetypelevel}}" data-dtype="Number"/>
+          </li>
+
+          <li class="flexrow"><label class="generic-label">Extra damage ?</label>
+            <label class="attribute-value checkbox"><input type="checkbox" name="system.extradamage" {{checked data.extradamage}}/></label>
+          </li>
+
+          {{#if data.extradamage}}
+          <li class="flexrow"><label class="generic-label">Extra damage value (D12)</label>
+            <input type="text" class="" name="system.extradamagevalue" value="{{data.extradamagevalue}}" data-dtype="Number"/>
+          </li>
+          {{/if}}
+
+          <li class="flexrow"><label class="generic-label">Optimal Range</label>  
             <select class="competence-base flexrow" type="text" name="system.range" value="{{data.range}}" data-dtype="String">
               {{#select data.range}}
               {{> systems/fvtt-pegasus-rpg/templates/partial-options-range.html notapplicable=true}}

templates/partial-actor-equipment.html

@@ -7,14 +7,14 @@
   {{/if}}
 
   <span class="item-field-label-long"><label>
-    {{equip.data.quantity}}
+    {{equip.system.quantity}}
     (<a class="quantity-minus plus-minus-button">&nbsp;-</a>/<a class="quantity-plus plus-minus-button">+</a>)
   </label>
   </span>          
 
   <span class="item-field-label-medium">
-    {{#if (count equip.data.effects)}}
-      {{#if equip.data.activated}}
+    {{#if (count equip.system.effects)}}
+      {{#if equip.system.activated}}
         <a class="equip-deactivate">Deactivate</a>
       {{else}}
         <a class="equip-activate">Activate</a>
@@ -25,14 +25,14 @@
   </span>
   <span class="item-field-label-short">
     {{#if equip.data.iscontainer}}
-      {{equip.data.contentsEnc}}
+      {{equip.system.contentsEnc}}
     {{else}}
-      {{mul equip.data.weight equip.data.quantity}}
+      {{mul equip.system.weight equip.system.quantity}}
     {{/if}}
   </span>
   <span class="item-field-label-medium">
-    {{#if equip.data.idrDice}}
-    <a class="roll-idr" data-dice-value="{{equip.data.idrDice}}">{{equip.data.idrDice}}</a>
+    {{#if equip.system.idrDice}}
+    <a class="roll-idr" data-dice-value="{{equip.data.idrDice}}">{{equip.system.idrDice}}</a>
     {{else}}
     &nbsp;-&nbsp;
     {{/if}}
@@ -40,9 +40,11 @@
 
   <div class="item-filler">&nbsp;</div>
   <div class="item-controls item-controls-fixed">
-    {{#if (eq level 1)}}
-    <a class="item-control item-equip" title="Worn">{{#if equip.data.equipped}}<i
-        class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
+    {{#if canequip}}
+      {{#if (eq level 1)}}
+      <a class="item-control item-equip" title="Worn">{{#if equip.system.equipped}}<i
+          class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
+      {{/if}}
     {{/if}}
     <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
   </div>

templates/partial-options-vehicle-speed.html

@@ -1,4 +1,4 @@
-<option value="none">None</option>
+<option value="fullstop">Full stop</option>
 <option value="crawling">Crawling</option>
 <option value="slow">Slow</option>
 <option value="average">Average</option>

templates/partial-roll-select-effects.html

@@ -44,6 +44,18 @@
             {{/if}}
           {{/each}}
         {{else}}
+              
+        {{#if (eq @root.vehicleKey effect.effect.system.stataffected)}}
+          <li class="flex-group-left">
+            <label class="attribute-value checkbox"><input type="checkbox" class="effect-clicked" id="effect-{{idx}}" data-effect-idx="{{idx}}" {{checked effect.applied}}/></label>
+            {{#if effect.effect}}
+            <label class="generic-label">{{effect.label}} ({{upperFirst effect.effect.system.type}}, {{upperFirst effect.effect.system.genre}}, {{effect.value}})</label>
+            {{else}}
+            <label class="generic-label">{{effect.label}} ({{effect.value}})</label>
+            {{/if}}
+          </li>
+          {{/if}}
+
           {{#if (eq @root.statKey effect.effect.system.stataffected)}}
             <li class="flex-group-left">
               <label class="attribute-value checkbox"><input type="checkbox" class="effect-clicked" id="effect-{{idx}}" data-effect-idx="{{idx}}" {{checked effect.applied}}/></label>
@@ -76,6 +88,7 @@
               {{/if}}
             {{/if}}
           {{/if}}
+
         {{/if}}
       {{/if}}      
     {{/if}}      
@@ -125,3 +138,33 @@
 
   </ul>
 {{/if}}
+
+{{#if (notEmpty vehicleWeapons)}}
+  <label>Vehicle Weapons</label>
+  <ul>
+
+    {{#each vehicleWeapons as |weapon idx|}}
+    <li class="flex-group-left">
+      <label class="attribute-value checkbox"><input type="checkbox" class="vehicle-weapon-clicked" id="vehicle-weapon-{{idx}}" data-vehicle-weapon-idx="{{idx}}" {{checked weapon.applied}}/></label>
+      <label class="generic-label padd-right">{{weapon.label}} ({{weapon.value}})</label>
+    </li>
+    {{/each}}
+
+  </ul>
+{{/if}}
+
+{{#if (notEmpty vehicleShieldList)}}
+  <label>Vehicle Shields</label>
+  <ul>
+
+    {{#each vehicleShieldList as |shield idx|}}
+    <li class="flex-group-left">
+      <label class="attribute-value checkbox"><input type="checkbox" class="vehicle-shield-clicked" id="vehicle-shield-{{idx}}" data-vehicle-shield-idx="{{idx}}" {{checked shield.applied}}/></label>
+      <label class="generic-label padd-right">{{shield.label}} ({{shield.value}})</label>
+    </li>
+    {{/each}}
+
+  </ul>
+{{/if}}
+
+

templates/partial-vehicle-arc.html

@@ -19,7 +19,7 @@
     <span class="item-name-label-long">&nbsp;</span>
 
     <span class="item-field-label-long">
-      <select type="text" name="system.arcs.{{idx}}.topspeed" value="{{arc.topspeed}}" data-dtype="String">
+      <select type="text" name="system.arcs.{{idx}}.topspeed" value="{{arc.topspeed}}" data-dtype="String" disabled>
         {{#select arc.topspeed}}
         {{> systems/fvtt-pegasus-rpg/templates/partial-options-vehicle-speed.html}}
         {{/select}}

templates/partial-vehicle-stat-block.html

@@ -2,27 +2,89 @@
   <div class="flexcol">
     <div class="flexrow">
       <span class="stat-icon">
-        <img class="stat-icon" src="systems/fvtt-pegasus-rpg/images/icons/{{stat.abbrev}}.webp">
+        <img class="stat-icon" src="systems/fvtt-pegasus-rpg/images/icons/icon_vehicle_{{stat.abbrev}}.webp">
       </span>
       <span class="stat-label stat-margin" name="{{key}}">
         <h4 class="stat-text-white stat-margin"><a class="roll-stat stat-margin"
-            data-stat-key="{{key}}">{{stat.abbrev}}</a></h4>
+            data-stat-key="{{key}}">{{upper stat.abbrev}}</a></h4>
       </span>
       <select class="status-small-label color-class-common" type="text" name="system.statistics.{{key}}.level"
-        value="{{stat.level}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
+        value="{{stat.level}}" data-dtype="Number" disabled>
         {{#select stat.level}}
-        {{{@root.optionsDiceList}}}
+          {{#if (eq key "ad")}}
+            {{{@root.optionsLevel}}}
+          {{else}}
+            {{{@root.optionsDiceList}}}
+          {{/if}}
         {{/select}}
       </select>
     </div>
-    <div class="flexrow">
+    <div class="flexrow stat-text-white">
       <span class="stat-label stat-margin" name="{{key}}">Current level</span>
       <select class="status-small-label color-class-common" type="text" name="system.statistics.{{key}}.currentlevel"
         value="{{stat.currentlevel}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
         {{#select stat.currentlevel}}
+        {{#if (eq key "ad")}}
+          {{{@root.optionsLevel}}}
+        {{else}}
+          {{{@root.optionsDiceList}}}
+       {{/if}}
+      {{/select}}
+      </select>
+    </div>
+    {{#if (eq key "man")}}
+    <div class="flexrow stat-text-white">
+      <span class="stat-label stat-margin" name="{{key}}">45° Turning Arcs</span>
+      <select class="status-small-label color-class-common" type="text" name="system.statistics.{{key}}.turningarc45"
+        value="{{stat.turningarc45}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
+        {{#select stat.turningarc45}}
         {{{@root.optionsLevel}}}
         {{/select}}
       </select>
     </div>
+    {{/if}}
+
+    {{#if (eq key "hr")}}
+    <div class="flexrow stat-text-white">
+      <span class="stat-label stat-margin" name="{{key}}">Size</span>
+      <input type="text" class="input-numeric-short" name="system.statistics.{{key}}.size" value="{{stat.size}}" data-dtype="Number" />
+    </div>
+    {{/if}}
+
+    {{#if (eq key "pc")}}
+    <div class="flexrow stat-text-white">
+      <span class="stat-label stat-margin" name="{{key}}">Cur NRG</span>
+      <input type="text" class="input-numeric-short" name="system.statistics.{{key}}.curnrg" value="{{stat.curnrg}}" data-dtype="Number" />
+      <span class="padd-right status-small-label no-grow">
+        <a class="vehicle-current-nrg-plus plus-minus-button">+</a>
+        <a class="vehicle-current-nrg-minus plus-minus-button">&nbsp;-</a>
+      </span>  
+      <span class="stat-label stat-margin" name="{{key}}">Av NRG</span>
+      <input type="text" class="input-numeric-short" value="{{@root.avgNRG}}" data-dtype="Number" disabled/>
+      <span class="stat-label stat-margin" name="{{key}}">Max NRG</span>
+      <input type="text" class="input-numeric-short" name="system.statistics.{{key}}.maxnrg" value="{{stat.maxnrg}}" data-dtype="Number" disabled />
+    </div>
+    {{/if}}
+
+    {{#if (eq key "ad")}}
+    <div class="flexrow stat-text-white">
+      <span class="stat-label stat-margin" name="{{key}}">Acc Mode</span>
+      <select class="status-small-label color-class-common" type="text" name="system.statistics.{{key}}.accmode"
+        value="{{stat.accmode}}" data-dtype="String" {{#unless @root.editScore}}disabled{{/unless}}>
+        {{#select stat.accmode}}
+        <option value="acc">ACC</option>
+        <option value="dec">DEC</option>
+        {{/select}}
+      </select>
+      <span class="stat-label stat-margin" name="{{key}}">Curr. speed</span>
+      <select class="status-small-label color-class-common current-speed-change" type="text" name="system.statistics.{{key}}.currentspeed"
+        value="{{stat.currentspeed}}" data-dtype="String" {{#unless @root.editScore}}disabled{{/unless}}>
+        {{#select stat.currentspeed}}
+        {{> systems/fvtt-pegasus-rpg/templates/partial-options-vehicle-speed.html}}
+        {{/select}}
+      </select>
+    </div>
+    {{/if}}
+
   </div>
 </li>

templates/roll-dialog-generic.html

@@ -3,7 +3,7 @@
     {{#if img}}
     <img class="actor-icon" src="{{img}}" data-edit="img" title="{{name}}" />
     {{/if}}
-    <h1 class="dialog-roll-title roll-dialog-header">{{title}}</h1>
+    <h1 class="dialog-roll-title roll-dialog-header">{{title}} {{#if vehicle}} from {{vehicle.name}} {{/if}}</h1>
   </header>
 
   <div class="grid grid-2col">
@@ -14,7 +14,7 @@
 
       {{else}}
       <div class="flexrow">
-        <span class="roll-dialog-label">Stat Dice ({{stat.label}}) : </span>
+        <span class="roll-dialog-label">{{upper stat.label}} :</span>
         <select class="roll-dialog-label" id="statDicesLevel" type="text" name="statDicesLevel"
           value="{{statDicesLevel}}" data-dtype="Number" {{#if statKey}}disabled{{/if}}>
           {{#select statDicesLevel}}
@@ -24,6 +24,19 @@
         <span class="small-label">&nbsp;+&nbsp;{{statMod}}</span>
       </div>
 
+      {{#if statVehicle}}
+      <div class="flexrow">
+        <span class="roll-dialog-label">{{upper  statVehicle.label}} :</span>
+        <select class="roll-dialog-label" id="statVehicleLevel" type="text" name="statVehicleLevel"
+          value="{{statVehicle.currentlevel}}" data-dtype="Number" {{#if statKey}}disabled{{/if}}>
+          {{#select statVehicle.currentlevel}}
+          {{{optionsDiceList}}}
+          {{/select}}
+        </select>
+        <span class="small-label">&nbsp;</span>
+      </div>
+      {{/if}}
+
         {{#if specList}}
         <div class="flexrow">
           <span class="roll-dialog-label">Spec : </span>

templates/vehicle-sheet.html

@@ -49,6 +49,7 @@
   <nav class="sheet-tabs tabs" data-group="primary">
     <a class="item" data-tab="combat">Combat</a>
     <a class="item" data-tab="modules">Vehicle Modules</a>
+    <a class="item" data-tab="crew">Crew</a>
     <a class="item" data-tab="cargo">Cargo Hold</a>
     <a class="item" data-tab="details">Vehicle Details</a>
   </nav>
@@ -124,8 +125,8 @@
             <span class="flexrow">
               <h3>Stun</h3>
               <span class="status-small-label no-grow">
-                <a class="stun-plus plus-minus-button">+</a>
-                <a class="stun-minus plus-minus-button">&nbsp;-</a>
+                <a class="vehicle-stun-plus plus-minus-button">+</a>
+                <a class="vehicle-stun-minus plus-minus-button">&nbsp;-</a>
               </span>        
             </span>
             <ul class="stat-list alternate-list">
@@ -139,6 +140,7 @@
               </li>
             </ul>
           </div>
+
         </div>
 
         <div class="flexrow">
@@ -248,40 +250,66 @@
       </div>
     </div>
 
-    {{!-- Other Tab --}}
+    {{!-- Modules Tab --}}
     <div class="tab items" data-group="primary" data-tab="modules">
 
+      <div class="stat-item">
+        <ul class="stat-list alternate-list">
+          <li class="item stat flexrow list-item">
+            <span class="generic-label small-label "><strong>VDP</strong></span>
+            <input type="text" class="input-numeric-short padd-right" name="system.modules.vdp" value="{{data.modules.vdp}}"
+              data-dtype="Number" />              
+            <span class="generic-label small-label"><strong>Vehicle Value</strong></span>
+              <input type="text" class="input-numeric-short" name="system.modules.vehiculevalue" value="{{data.modules.vehiculevalue}}"
+                data-dtype="Number" />
+                <span class="generic-label small-label"><strong>Total cost</strong></span>
+                <input type="text" class="" value="{{totalCost}}"
+                  data-dtype="Number" disabled />
+            <span class="generic-label small-label "><strong>VMS</strong></span>
+            <span class="generic-label small-label">Total</span>
+            <input type="text" class="input-numeric-short" name="system.modules.totalvms" value="{{data.modules.totalvms}}"
+              data-dtype="Number" disabled />              
+            <span class="generic-label small-label">Available</span>
+              <input type="text" class="input-numeric-short" value="{{vmsAvailable}}"
+                data-dtype="Number" disabled />
+            <span class="generic-label small-label">Used</span>
+            <input type="text" class="input-numeric-short" name="system.modules.vmsused" value="{{data.modules.vmsused}}"
+              data-dtype="Number" disabled />
+          </li>
+        </ul>
+      </div>
+
       <ul class="stat-list alternate-list">
         <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-label-header">
-            <h3><label class="items-title-text">Specialisations</label></h3>
+          <span class="item-name-label-header-long">
+            <h3><label class="items-title-text">1 - Hull</label></h3>
           </span>
           <span class="item-field-label-short">
-            <label class="short-label">Stat</label>
+            <label class="short-label">Size</label>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="short-label">Hull Type</label>
           </span>
           <span class="item-field-label-short">
-            <label class="short-label">Dice</label>
+            <label class="short-label">HR</label>
           </span>
-          <span class="item-field-label-long">
-            <label class="short-label">Powergroup</label>
+          <span class="item-field-label-short">
+            <label class="short-label">MAN</label>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">VMS</label>
           </span>
         </li>
-        {{#each specs as |spec key|}}
-        <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{spec._id}}">
+        {{#each vehicleHull as |hull key|}}
+        <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{hull._id}}">
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-              src="{{spec.img}}" /></a>
-          <span class="item-name-label"><a class="roll-spec">{{spec.name}}</a></span>
-          <span class="item-field-label-short">{{upper spec.system.statistic}}</span>
-          <span class="item-field-label-short">{{spec.system.dice}}</span>
-          {{#if spec.system.ispowergroup}}
-          {{#if spec.system.powersactivated}}
-          <span class="item-field-label-long"><a class="spec-group-deactivate">Deactivate</a></span>
-          {{else}}
-          <span class="item-field-label-long"><a class="spec-group-activate">Activate</a></span>
-          {{/if}}
-          {{else}}
-          <span class="item-field-label-long">&nbsp;-&nbsp;</span>
-          {{/if}}
+              src="{{hull.img}}" /></a>
+          <span class="item-name-label-long"><a class="roll-spec">{{hull.name}}</a></span>
+          <span class="item-field-label-short">{{hull.system.size}}</span>
+          <span class="item-field-label-medium">{{hull.system.hulltype}}</span>
+          <span class="item-field-label-short">{{hull.system.hr}}</span>
+          <span class="item-field-label-short">{{hull.system.man}}</span>
+          <span class="item-field-label-short">{{hull.system.vms}}</span>
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
             <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
@@ -289,21 +317,292 @@
         </li>
         {{/each}}
       </ul>
-    </div>
+
+      <ul class="stat-list alternate-list">
+        <li class="item flexrow list-item items-title-bg">
+          <span class="item-name-label-header-long">
+            <h3><label class="items-title-text">2 - Power core</label></h3>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="short-label">Type</label>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">PC</label>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">NRG</label>
+          </span>
+        </li>
+        {{#each powerCoreModules as |powercore key|}}
+        <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{powercore._id}}">
+          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+              src="{{powercore.img}}" /></a>
+          <span class="item-name-label-long"><a class="roll-spec">{{powercore.name}}</a></span>
+          <span class="item-field-label-medium">{{powercore.system.coretype}}</span>
+          <span class="item-field-label-short">{{powercore.system.pc}}</span>
+          <span class="item-field-label-short">{{powercore.system.nrg}}</span>
+          <div class="item-filler">&nbsp;</div>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+          </div>
+        </li>
+        {{/each}}
+      </ul>
+
+      <ul class="stat-list alternate-list">
+        <li class="item flexrow list-item items-title-bg">
+          <span class="item-name-label-header-long">
+            <h3><label class="items-title-text">3 -Mobility</label></h3>
+          </span>
+          <span class="item-field-label-long">
+            <label class="short-label">Vehicle Category</label>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="short-label">Quality</label>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">MR</label>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">TS:F</label>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">TS:S</label>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">TS:R</label>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="short-label">MAN Adj.</label>
+          </span>
+        </li>
+        {{#each mobilityModules as |mobility key|}}
+        <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{mobility._id}}">
+          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+              src="{{mobility.img}}" /></a>
+          <span class="item-name-label-long"><a class="roll-spec">{{mobility.name}}</a></span>
+          <span class="item-field-label-long">{{mobility.system.vehiclecategory}}</span>
+          <span class="item-field-label-medium">{{mobility.system.quality}}</span>
+          <span class="item-field-label-short">{{mobility.system.mr}}</span>
+          <span class="item-field-label-short">{{mobility.system.ts_f}}</span>
+          <span class="item-field-label-short">{{mobility.system.ts_s}}</span>
+          <span class="item-field-label-short">{{mobility.system.ts_r}}</span>
+          <span class="item-field-label-medium">{{mobility.system.man}}</span>
+          <div class="item-filler">&nbsp;</div>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+          </div>
+        </li>
+        {{/each}}
+      </ul>
+
+      <ul class="stat-list alternate-list">
+        <li class="item flexrow list-item items-title-bg">
+          <span class="item-name-label-header-long">
+            <h3><label class="items-title-text">4 - Propulsion</label></h3>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="short-label">Quality</label>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">A/D</label>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="short-label">TS:F Adj.</label>
+          </span>
+        </li>
+        {{#each propulsionModules as |propulsion key|}}
+        <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{propulsion._id}}">
+          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+              src="{{propulsion.img}}" /></a>
+          <span class="item-name-label-long"><a class="roll-spec">{{propulsion.name}}</a></span>
+          <span class="item-field-label-medium">{{propulsion.system.quality}}</span>
+          <span class="item-field-label-short">{{propulsion.system.ad}}</span>
+          <span class="item-field-label-short">{{propulsion.system.topspeed}}</span>
+          <div class="item-filler">&nbsp;</div>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+          </div>
+        </li>
+        {{/each}}
+      </ul>
+
+      <ul class="stat-list alternate-list">
+        <li class="item flexrow list-item items-title-bg">
+          <span class="item-name-label-header-long">
+            <h3><label class="items-title-text">5 - Combat</label></h3>
+          </span>
+          <span class="item-field-label-long">
+            <label class="short-label">Quality</label>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">FC</label>
+          </span>
+        </li>
+        {{#each combatModules as |combat key|}}
+        <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{combat._id}}">
+          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+              src="{{combat.img}}" /></a>
+          <span class="item-name-label-long"><a class="roll-spec">{{combat.name}}</a></span>
+          <span class="item-field-label-long">{{combat.system.combattype}}</span>
+          <span class="item-field-label-short">{{combat.system.fc}}</span>
+          <div class="item-filler">&nbsp;</div>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+          </div>
+        </li>
+        {{/each}}
+      </ul>
+
+      <ul class="stat-list alternate-list">
+        <li class="item flexrow list-item items-title-bg">
+          <span class="item-name-label-header-long">
+            <h3><label class="items-title-text">Vehicles modules</label></h3>
+          </span>
+          <span class="item-field-label-long">
+            <label class="short-label">Category</label>
+          </span>
+          <span class="item-field-label-long">
+            <label class="short-label">Location</label>
+          </span>
+          <span class="item-field-label-long">
+            <label class="short-label">Security</label>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">NRG</label>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="short-label">Range</label>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">IDR</label>
+          </span>
+        </li>
+        {{#each vehicleModules as |vehiclemod key|}}
+        <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{vehiclemod._id}}">
+          <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-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>
+          <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
+              class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>          
+            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+          </div>
+        </li>
+        {{/each}}
+      </ul>
+
+      <ul class="stat-list alternate-list">
+        <li class="item flexrow list-item items-title-bg">
+          <span class="item-name-label-header-long">
+            <h3><label class="items-title-text">Vehicles weapons</label></h3>
+          </span>
+          <span class="item-field-label-long">
+            <label class="short-label">Site</label>
+          </span>
+          <span class="item-field-label-long">
+            <label class="short-label">Location</label>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">DMG</label>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="short-label">AoE</label>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="short-label">Turret</label>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">NRG</label>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">IDR</label>
+          </span>
+        </li>
+        {{#each vehicleWeaponModules as |weapon key|}}
+        <li class="item stat flexrow list-item list-item-shadow" data-item-id="{{weapon._id}}">
+          <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-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>
+          <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
+                class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
+            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+          </div>
+        </li>
+        {{/each}}
+      </ul>
+
 
     </div>
 
-    </div>
+    {{!-- Crew Tab --}}
+    <div class="tab items" data-group="primary" data-tab="crew">
 
+      <div class="stat-item">
+        <ul class="stat-list alternate-list">
+          <li class="item stat flexrow list-item">
+            <span class="generic-label small-label "><strong>Maximum Crew Capacity</strong></span>
+            <input type="text" class="input-numeric-short padd-right" name="system.crewmax" value="{{data.crewmax}}"
+              data-dtype="Number" />              
+            <span class="generic-label small-label"><strong>Minimum Crew Required</strong></span>
+              <input type="text" class="input-numeric-short" name="system.crewmin" value="{{data.crewmin}}"
+                data-dtype="Number" />
+          </li>
+        </ul>
+      </div>
+
+      <ul class="item-list alternate-list">
+        <li class="item flexrow list-item items-title-bg">
+          <span class="item-name-label-header">
+            <h3><label class="items-title-text">Crew</label></h3>
+          </span>
+          <div class="item-filler">&nbsp;</div>
+        </li>
+        {{#each crewList as |member key|}}
+        <li class="item flexrow list-item list-item-shadow" data-actor-id="{{member.id}}">
+          <a class="member-view item-name-img" title="View Actor"><img class="sheet-competence-img"
+              src="{{member.img}}" /></a>
+          <span class="item-name-label">{{member.name}}</span>
+
+          <div class="item-filler">&nbsp;</div>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control member-delete" title="Delete Member"><i class="fas fa-trash"></i></a>
+          </div>
+        </li>
+        {{/each}}
+      </ul>
+    </div>
 
     {{!-- Cargo Tab --}}
     <div class="tab equipment" data-group="primary" data-tab="cargo">
 
-      <div class="flexrow">
-        <h3>Encumbrance</h3>
-        <span class="small-label">Current : {{encCurrent}}</span>
-        <span class="small-label">Capacity : {{encCapacity}}</span>
-        <span class="small-label">Hindrance : {{encHindrance}}</span>
+      <div class="stat-item">
+        <ul class="stat-list alternate-list">
+          <li class="item stat flexrow list-item">
+            <span class="generic-label small-label "><strong>Cargo Capacity</strong></span>
+            <input type="text" class="input-numeric-short padd-right" name="system.cargocapacity" value="{{data.cargocapacity}}"
+              data-dtype="Number" />              
+            <span class="generic-label small-label"><strong>Total Cargo Capacity</strong></span>
+              <input type="text" class="input-numeric-short" value="{{cargoCurrent}}"
+                data-dtype="Number" />
+          </li>
+        </ul>
       </div>
 
       <ul class="item-list alternate-list">
@@ -431,8 +730,6 @@
 
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
-            <a class="item-control item-equip" title="Worn">{{#if weapon.system.equipped}}<i
-                class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
             <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
           </div>
         </li>
@@ -500,8 +797,6 @@
 
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
-            <a class="item-control item-equip" title="Worn">{{#if armor.system.equipped}}<i
-                class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
             <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
           </div>
         </li>
@@ -559,8 +854,6 @@
           </span>
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
-            <a class="item-control item-equip" title="Worn">{{#if shield.system.equipped}}<i
-                class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
             <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
           </div>
         </li>
@@ -590,246 +883,26 @@
           </div>
 
         </li>
-        {{#each containersTree as |equip key|}}
-        {{> systems/fvtt-pegasus-rpg/templates/partial-actor-equipment.html equip=equip level=1}}
-        <ul class="item-list list-item-shadow2 list-item-margin1">
-          {{#each equip.system.contents as |subgear key|}}
-          {{> systems/fvtt-pegasus-rpg/templates/partial-actor-equipment.html equip=subgear level=2}}
-          {{/each}}
-        </ul>
+        {{#each equipments as |equip key|}}
+        {{> systems/fvtt-pegasus-rpg/templates/partial-actor-equipment.html equip=equip level=1 canequip=false}}
         {{/each}}
       </ul>
 
       <hr>
+      <h3>Cargo information : </h3>
+      <div class="form-group editor">
+        {{editor data.cargo.cargoinformation target="system.cargo.cargoinformation" button=true owner=owner
+        editable=editable}}
+      </div>
+
+      <hr>
 
     </div>
 
     {{!-- Details Tab --}}
     <div class="tab biodata" data-group="primary" data-tab="details">
-      <div class="grid grid-2col">
-        <div>
-          <ul class="item-list alternate-list">
-            <li class="item flexrow">
-              <label class="generic-label">Origin</label>
-              <input type="text" class="" name="system.biodata.origin" value="{{data.biodata.origin}}"
-                data-dtype="String" />
-            </li>
-            <li class="item flexrow">
-              <label class="generic-label">Age</label>
-              <input type="text" class="" name="system.biodata.age" value="{{data.biodata.age}}" data-dtype="String" />
-            </li>
-            <li class="item flexrow">
-              <label class="generic-label">Height</label>
-              <input type="text" class="" name="system.biodata.size" value="{{data.biodata.size}}" data-dtype="String" />
-            </li>
-            <li class="item flexrow">
-              <label class="generic-label">Eyes</label>
-              <input type="text" class="" name="system.biodata.eyes" value="{{data.biodata.eyes}}" data-dtype="String" />
-            </li>
-            <li class="item flexrow">
-              <label class="generic-label">Hair</label>
-              <input type="text" class="" name="system.biodata.hair" value="{{data.biodata.hair}}" data-dtype="String" />
-            </li>
-          </ul>
-        </div>
-       <div>
-          <ul>
-            <li class="flexrow item">
-              <label class="generic-label">Weight</label>
-              <input type="text" class="" name="system.biodata.weight" value="{{data.biodata.weight}}"
-                data-dtype="String" />
-            </li>
-            <li class="flexrow item">
-              <label class="generic-label">Sex</label>
-              <input type="text" class="" name="system.biodata.sex" value="{{data.biodata.sex}}" data-dtype="String" />
-            </li>
-            <li class="flexrow item">
-              <label class="generic-label">Preferred Hand</label>
-              <input type="text" class="" name="system.biodata.preferredhand" value="{{data.biodata.preferredhand}}"
-                data-dtype="String" />
-            </li>
-            <li class="flexrow item" data-item-id="{{race._id}}">
-              <label class="generic-label">Race</label>
-              <a class="item-edit"><img class="stat-icon" src="{{race.img}}"></a>
-              <input type="text" class="" name="system.biodata.racename" value="{{race.name}}" disabled
-                data-dtype="String" />
-              <div class="item-controls">
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-              </div>
-            </li>
-            <li class="flexrow item" data-item-id="{{role._id}}">
-              <label class="generic-label">Role</label>
-              <a class="item-edit"><img class="stat-icon" src="{{role.img}}"></a>
-              <input type="text" class="" name="system.biodata.rolename" value="{{role.name}}" disabled
-                data-dtype="String" />
-              <div class="item-controls">
-                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-              </div>
-            </li>
-          </ul>
-        </div>
-      </div>
-
-      <div>
-        <ul class="stat-list alternate-list">
-        <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-label-header">
-            <h3><label class="items-title-text">Virtues</label></h3>
-          </span>
-          <span class="item-field-label-short">Status</label></span>
-        </li>
-        {{#each virtues as |virtue key|}}
-        <li class="item stat flexrow list-item list-item-shadow" data-arme-id="{{virtue.id}}"
-          data-item-id="{{virtue._id}}">
-          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-              src="{{virtue.img}}" /></a>
-          <span class="item-name-label">{{virtue.name}}</span>
-          <span class="item-field-label-short"><label class="short-label">
-            {{#if virtue.system.activated}}
-            Activated
-            {{else}}
-            &nbsp;-&nbsp;
-            {{/if}}
-            </label>
-          </span>
-          <div class="item-filler">&nbsp;</div>
-          <div class="item-controls item-controls-fixed">
-            <a class="item-control vice-virtue-activate" title="Activated">{{#if virtue.system.activated}}<i
-              class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
-            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-          </div>
-        </li>
-        {{/each}}
-        </ul>
-      </div>
-
-      <div>
-        <ul class="stat-list alternate-list">
-        <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-label-header">
-            <h3><label class="items-title-text">Vices</label></h3>
-          </span>
-          <span class="item-field-label-short">Status</label></span>
-        </li>
-        {{#each vices as |vice key|}}
-        <li class="item stat flexrow list-item list-item-shadow" data-arme-id="{{vice.id}}"
-          data-item-id="{{vice._id}}">
-          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
-              src="{{vice.img}}" /></a>
-          <span class="item-name-label">{{vice.name}}</span>
-          <span class="item-field-label-short"><label class="short-label">
-            {{#if vice.system.activated}}
-            Activated
-            {{else}}
-            &nbsp;-&nbsp;
-            {{/if}}
-            </label>
-          </span>
-
-          <div class="item-filler">&nbsp;</div>
-          <div class="item-controls item-controls-fixed">
-            <a class="item-control vice-virtue-activate" title="Activated">{{#if vice.system.activated}}<i
-              class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
-            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
-          </div>
-        </li>
-        {{/each}}
-        </ul>
-      </div>
-
-      <ul>
-        <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-label-header">
-            <h3><label class="items-title-text">Psychology</label></h3>
-          </span>
-        </li>
-        <li class="flexrow">
-          <label class="short-label">Worst Fear </label>
-          <input type="text" class="" name="system.biodata.worstfear" value="{{data.biodata.worstfear}}"
-            data-dtype="String" />
-          <label class="attribute-value checkbox"><input type="checkbox" class="change-worstfear"
-              name="system.biodata.worstfearactive" {{checked data.biodata.worstfearactive}} /> Active ?</label>
-        </li>
-        <li class="flexrow">
-          <label class="short-label">Desires </label>
-          <input type="text" class="" name="system.biodata.desires" value="{{data.biodata.desires}}"
-            data-dtype="String" />
-          <label class="attribute-value checkbox"><input type="checkbox" class="change-desires"
-              name="system.biodata.desiresactive" {{checked data.biodata.desiresactive}} /> Active ?</label>
-        </li>
-      </ul>
-
-      <h3>Catchphrase : </h3>
-      <ul>
-        <li class="flexrow">
-          <label class="short-label">Catchphrase </label>
-          <input type="text" class="" name="system.biodata.catchphrase" value="{{data.biodata.catchphrase}}"
-            data-dtype="String" />
-        </li>
-        <li class="flexrow">
-          <label class="short-label">Catchphrase Trigger : </label>
-          <input type="text" class="" name="system.biodata.catchphrasetrigger" value="{{data.biodata.catchphrasetrigger}}"
-            data-dtype="String" />
-        </li>
-        <li class="flexrow">
-          <label class="short-label">Catchphrase used </label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="system.biodata.catchphraseused" {{checked
-              data.biodata.catchphraseused}} /></label>
-        </li>
-      </ul>
-
-      <ul>
-        <li class="item flexrow list-item items-title-bg">
-          <span class="item-name-label-header">
-            <h3><label class="items-title-text">Development</label></h3>
-          </span>
-        </li>
-        <li class="flexrow">
-          <label class="short-label">Character Value : </label>
-          <input type="text" class="" name="system.biodata.charactervalue" value="{{data.biodata.charactervalue}}"
-            data-dtype="String" />
-        </li>
-        <li class="flexrow">
-          <label class="short-label">Character Development Points Total (CDP total) : </label>
-          <input type="text" class="" name="system.biodata.cdp" value="{{data.biodata.cdp}}" data-dtype="Number" />
-        </li>
-        <li class="flexrow">
-          <label class="short-label">Bonus selection : </label>
-          <input type="text" class="" name="system.biodata.bonusselection" value="{{data.biodata.bonusselection}}" data-dtype="String" />
-        </li>        
-        <li class="flexrow">
-          <label class="short-label">Morality : </label>
-          <input type="text" class="" name="system.biodata.morality" value="{{data.biodata.morality}}" data-dtype="Number" />
-        </li>
-        <li class="flexrow">
-          <label class="short-label">Morality threshold : </label>
-          <input type="text" class="" name="system.biodata.moralitythreshold" value="{{data.biodata.moralitythreshold}}" disabled data-dtype="Number" />
-        </li>
-        <li class="flexrow">
-          <label class="short-label">Hero Level (max) : </label>
-          <select class="status-small-label color-class-common" type="text" name="system.biodata.maxlevelremaining" value="{{data.biodata.maxlevelremaining}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
-            {{#select data.biodata.maxlevelremaining}}
-            {{{@root.maxLevelRemainingList}}}
-            {{/select}}
-          </select>
-        </li>
-        <li class="flexrow">
-          <label class="short-label">Hero Levels Remaining : </label>
-          <select class="status-small-label color-class-common" type="text" name="system.biodata.currentlevelremaining" value="{{data.biodata.currentlevelremaining}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
-            {{#select data.biodata.currentlevelremaining}}
-            {{{@root.levelRemainingList}}}
-            {{/select}}
-          </select>
-        </li>
-        <li class="flexrow">
-          <label class="short-label">Threat Level : </label>
-          <input type="text" class="" name="system.biodata.threatlevel" value="{{data.biodata.threatlevel}}"
-            data-dtype="Number" />
-        </li>
-      </ul>
-
       <hr>
-      <h3>Background : </h3>
+      <h3>Description : </h3>
       <div class="form-group editor">
         {{editor data.biodata.description target="system.biodata.description" button=true owner=owner
         editable=editable}}