Fix #7 #26

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-create-char.js

@@ -21,6 +21,8 @@ export class PegasusActorCreate {
     this.roles = rolesPack.map(i => i.toObject())
     const perksPack = await PegasusUtility.loadCompendium("fvtt-pegasus-rpg.perk")
     this.perks = perksPack.map(i => i.toObject())
+    const specPack = await PegasusUtility.loadCompendium("fvtt-pegasus-rpg.specialisations")
+    this.specs = specPack.map(i => i.toObject())
 
     this.showRaces()
   }
@@ -44,6 +46,23 @@ export class PegasusActorCreate {
     return formData;
   }
 
+  /* -------------------------------------------- */
+  getSpecFromRoleStat( role)  {
+    let specList = []
+    for(let stat of role.system.statincreasechoice) {
+      if (stat.flag) {
+        specList = specList.concat( this.specs.filter( spec => spec.system.statistic.toLowerCase() == stat.name.toLowerCase() ))
+      }
+    }
+    return specList
+  }
+
+  /* -------------------------------------------- */
+  getPerksFromRole( role ) {
+    let perks = this.perks.filter( perk => perk.system.category.toLowerCase() == role.system.perksrole.toLowerCase())
+    return perks
+  }
+
   /* -------------------------------------------- */
   processChatEvent( event ) {
     const step = $(event.currentTarget).data("step-name");
@@ -54,12 +73,12 @@ export class PegasusActorCreate {
       this.currentRace = race;
       this.actor.applyRace( race);
       PegasusUtility.removeChatMessageId(PegasusUtility.findChatMessageId(event.currentTarget));
-      if ( race.data.nboptionnal > 0 && race.data.optionnalabilities.length > 0) {
+      if ( race.system.nboptionnal > 0 && race.system.optionnalabilities.length > 0) {
         this.manageOptionnalAbilities(race);
       } else {
-        if ( race.data.selectablestats ) {
+        if ( race.system.selectablestats ) {
           this.manageSelectableStats(race);
-        } else if ( race.data.perksgained) {
+        } else if ( race.system.perksgained) {
           this.manageRacePerks(race);
         } else {
           this.showRoles()
@@ -107,7 +126,7 @@ export class PegasusActorCreate {
       this.actor.applyRole( role );
       this.currentRole = role;
       this.nbRoleStat = 2;
-      this.roleStats = duplicate(role.data.statincreasechoice)
+      this.roleStats = duplicate(role.system.statincreasechoice)
       this.showRoleStartSpec( );
     }
 
@@ -136,7 +155,7 @@ export class PegasusActorCreate {
       }
       this.nbRoleStat--;
       if ( this.nbRoleStat == 0 || this.roleStats.length == 0) {
-        this.roleSpec = duplicate(this.currentRole.data.specincrease)
+        this.roleSpec = this.getSpecFromRoleStat( this.currentRole )
         this.nbDT2 = 1;
         this.nbDT1 = 2;
         this.showRoleSpecialisations()
@@ -157,7 +176,7 @@ export class PegasusActorCreate {
       }
       this.roleSpec = this.roleSpec.filter( item => item._id != itemId);//Remove selected spec
       if ( this.nbDT1 == 0 || this.roleSpec.length == 0) {
-        this.rolePerks =  duplicate(this.currentRole.data.perks)
+        this.rolePerks =  this.getPerksFromRole( this.currentRole ) // duplicate(this.currentRole.data.perks)
         this.nbPerks = 2;
         this.showRolePerks()
       } else {
@@ -293,7 +312,7 @@ export class PegasusActorCreate {
     if ( this.raceOptionnalAbilities.nboptionnal == 0) {
       if ( this.raceSelectableStats ) {
         this.manageSelectableStats(this.currentrace);
-      } else if ( this.currentRace.data.perksgained) {
+      } else if ( this.currentRace.system.perksgained) {
         this.manageRacePerks(this.currentRace);
       } else {
         this.showRoles()
@@ -319,7 +338,9 @@ export class PegasusActorCreate {
   /* -------------------------------  ------------- */
   async showRoleStartSpec() {
     if ( !this.roleSpecStart) {
-      this.roleSpecStart = duplicate(this.currentRole.data.specialisationsplus1)
+      this.roleSpecStart = this.specs.filter(spec => spec.system.statistic.toUpperCase() ==  this.currentRole.system.statincrease1.toUpperCase() || spec.system.statistic.toUpperCase() ==  this.currentRole.system.statincrease2.toUpperCase() )
+      console.log("SPEC FOUND", this.roleSpecStart)
+      //this.roleSpecStart = duplicate(this.currentRole.data.specialisationsplus1)
       this.nbRoleSpecStart = 2;
     }
     let formData = this.createFormData("select-role-start-spec")
@@ -334,7 +355,7 @@ export class PegasusActorCreate {
     formData.rolestats = []
     for(let stat of this.roleStats) {
       if (stat.flag) {
-        formData.rolestats.push( duplicate(this.actor.data.data.statistics[stat.name.toLowerCase()]) )
+        formData.rolestats.push( duplicate(this.actor.system.statistics[stat.name.toLowerCase()]) )
       }
     } 
     //console.log("STAT", this.roleStats, formData)

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

@@ -133,6 +133,21 @@ export class PegasusRollDialog extends Dialog {
     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]
@@ -237,6 +252,13 @@ export class PegasusRollDialog extends Dialog {
       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

@@ -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: PegasusUtility.getLevelFromDice(myDice), 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
@@ -129,15 +138,7 @@ export class PegasusUtility {
     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: PegasusUtility.getLevelFromDice(myDice), effect: hindrance.name,
-            img: `systems/fvtt-pegasus-rpg/images/dice/${myDice}.webp`
-          }
-          newDicePool.push(newDice)
-        }
+        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: PegasusUtility.getLevelFromDice(myDice),
-            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,29 +168,13 @@ 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: PegasusUtility.getLevelFromDice(myDice),
-              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) {
-          let diceKey = PegasusUtility.getDiceFromLevel(weapon.value)
-          let diceList = diceKey.split(" ")
-          for (let myDice of diceList) {
-            let newDice = {
-              name: "damage", key: myDice, level: PegasusUtility.getLevelFromDice(myDice),
-              img: `systems/fvtt-pegasus-rpg/images/dice/${myDice}.webp`
-            }
-            newDicePool.push(newDice)
-          }
+          newDicePool = newDicePool.concat( this.buildDicePool("damage", weapon.value, 0))
         }
       }
       rollData.dicePool = newDicePool
@@ -203,36 +186,23 @@ export class PegasusUtility {
     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)
-      }
+      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
     }
-    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
   }
@@ -920,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)
     }
@@ -985,6 +959,7 @@ export class PegasusUtility {
       weaponsList: [],
       vehicleWeapons: [],
       equipmentsList: [],
+      vehicleShieldList: [],
       optionsDiceList: PegasusUtility.getOptionsDiceList()
     }
     if (!isInit) { // For init, do not display target hindrances

modules/pegasus-vehicle-sheet.js

@@ -54,6 +54,13 @@ export class PegasusVehicleSheet extends ActorSheet {
       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()) ),
+      cargos: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getCargos()) ),
+      cargoCurrent: this.actor.getCurrentCargoCapacity(),
+      moneys: duplicate(this.actor.getMoneys()),
       options: this.options,
       owner: this.document.isOwner,
       editScore: this.options.editScore,
@@ -117,11 +124,22 @@ export class PegasusVehicleSheet extends ActorSheet {
       this.actor.createEmbeddedDocuments('Item', [{ name: "NewItem", type: dataType }], { renderSheet: true })
     })
         
-    html.find('.current-speed-change').click(ev => {
+    html.find('.current-speed-change').change(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")
@@ -204,11 +222,17 @@ export class PegasusVehicleSheet extends ActorSheet {
       this.actor.rollPoolFromVehicle( 'per', false, "ranged-dmg");
     });
     html.find('.defense-roll').click((event) => {
-      this.actor.rollPoolFromVehicle( 'def', true, "defense");
+      this.actor.rollPoolFromVehicle( 'agi', true, "defence");
     });
     html.find('.damage-resistance').click((event) => {
       this.actor.rollVehicleDamageResistance( );
     });
+    html.find('.currentlevel-change').change((event) => {
+      const statKey = $(event.currentTarget).data("stat-key");
+      if ( statKey == "man") {
+        this.actor.setTurningArc(event.currentTarget.value)  
+      }
+    })
             
     html.find('.roll-stat').click((event) => {
       const statId = $(event.currentTarget).data("stat-key");
@@ -291,7 +315,8 @@ export class PegasusVehicleSheet extends ActorSheet {
     if (item == undefined) {
       item = this.actor.items.get( dragData.uuid )
     }
-    let ret = await this.actor.preprocessItemVehicle( event, item, true )
+    let itemFull = await PegasusUtility.searchItem( item )
+    let ret = await this.actor.preprocessItemVehicle( event, itemFull, true )
     if ( ret ) {
       super._onDropItem(event, dragData)
     }

system.json

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

template.json

@@ -201,6 +201,8 @@
       },
       "vehicle": {
         "crew": [],
+        "crewmax": 0,
+        "crewmin": 0,
         "statistics": {
           "fc": {
             "label": "FC",
@@ -289,42 +291,42 @@
             "topspeed": "",
             "shieldlevel": 0,
             "armourlevel": 0,
-            "is3D": false          
+            "is3D": false
           },
           "reararc": {
             "label": "Rear Arc",
             "topspeed": "",
             "shieldlevel": 0,
             "armourlevel": 0,
-            "is3D": false          
+            "is3D": false
           },
           "rightarc": {
             "label": "Right Arc",
             "topspeed": "",
             "shieldlevel": 0,
             "armourlevel": 0,
-            "is3D": false          
+            "is3D": false
           },
           "leftarc": {
             "label": "Left Arc",
             "topspeed": "",
             "shieldlevel": 0,
             "armourlevel": 0,
-            "is3D": false          
+            "is3D": false
           },
           "toparc": {
             "label": "Top Arc",
             "topspeed": "",
             "shieldlevel": 0,
             "armourlevel": 0,
-            "is3D": true          
+            "is3D": true
           },
           "bottomarc": {
             "label": "Bottom Arc",
             "topspeed": "",
             "shieldlevel": 0,
             "armourlevel": 0,
-            "is3D": true          
+            "is3D": true
           }
         }
       }
@@ -363,7 +365,8 @@
       "combatmodule",
       "propulsionmodule",
       "vehiclemodule",
-      "vehicleweaponmodule"
+      "vehicleweaponmodule",
+      "cargo"
     ],
     "effect": {
       "type": "",
@@ -408,6 +411,7 @@
       "perksall": false,
       "perksnumber": 0,
       "perks": [],
+      "perksrole": "",
       "statistics": ""
     },
     "role": {
@@ -420,6 +424,7 @@
       "specialability": [],
       "specincrease": [],
       "perks": [],
+      "perksrole": "",
       "description": ""
     },
     "ability": {
@@ -678,7 +683,8 @@
       "idr": "",
       "cost": 0,
       "size": 0,
-      "space": 0
+      "space": 0,      
+      "description": ""
     },
     "vehicleweaponmodule": {
       "location": "",
@@ -689,12 +695,22 @@
       "effects": [],
       "damagedicevalue": "",
       "damagetype": "",
+      "damagetypelevel": 0,
       "aoe": "",
       "range": "",
       "turret": "",
       "linkedweapon": "",
       "idr": "",
-      "cost": 0
+      "cost": 0,
+      "extradamage": false,
+      "extradamagevalue": 0,
+      "description": ""
+    },
+    "cargo": {
+      "capacity": 0,
+      "idr": "",
+      "value": 0,
+      "description": ""
     }
   }
 }

templates/actor-sheet.html

@@ -839,9 +839,8 @@
         <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>
@@ -869,8 +868,9 @@
                 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>

templates/item-cargo-sheet.html

@@ -0,0 +1,36 @@
+<form class="{{cssClass}}" autocomplete="off">
+  <header class="sheet-header">
+      <img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}"/>
+      <div class="header-fields">
+          <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name"/></h1>
+      </div>
+  </header>
+  {{> systems/fvtt-pegasus-rpg/templates/partial-item-nav.html}}
+
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+
+    {{> systems/fvtt-pegasus-rpg/templates/partial-item-description.html}}
+
+    <div class="tab details" data-group="primary" data-tab="details">
+      <ul>
+          <li class="flexrow"><label class="generic-label">IDR</label>
+            <select class="competence-base flexrow" type="text" name="system.idr" value="{{data.idr}}" data-dtype="String">
+              {{#select data.idr}}
+              {{{optionsDiceList}}}
+              {{/select}}
+            </select> 
+          </li>
+          <li class="flexrow"><label class="generic-label">Capacity</label>
+            <input type="text" class="" name="system.capacity" value="{{data.capacity}}" data-dtype="Number"/>
+          </li>
+
+          <li class="flexrow"><label class="generic-label">Value</label>
+            <input type="text" class="" name="system.value" value="{{data.value}}" data-dtype="Number"/>
+          </li>
+
+        </ul>
+    </div>
+
+  </section>
+</form>

templates/item-perk-sheet.html

@@ -21,12 +21,12 @@
               <select class="competence-base flexrow" type="text" name="system.category" value="{{data.category}}" data-dtype="String">
                 {{#select data.category}}
                 <option value="general">General</option>
-                <option value="agitator">Agitator</option>, 
-                <option value="defender">Defender</option>, 
-                <option value="enhancer">Enhancer</option>, 
-                <option value="scrapper">Scrapper</option>, 
-                <option value="ranged">Ranged</option>, 
-                <option value="tactician">Tactician</option>, 
+                <option value="agitator">Agitator</option>
+                <option value="defender">Defender</option> 
+                <option value="enhancer">Enhancer</option> 
+                <option value="scrapper">Scrapper</option> 
+                <option value="ranged">Ranged</option> 
+                <option value="tactician">Tactician</option>
                 {{/select}}
               </select> 
             </li>

templates/item-role-sheet.html

@@ -30,27 +30,7 @@
                 {{/select}}
               </select> 
             </li>
-            <li class="flexrow">
-              <label class="generic-label">Starting Specialisation at +1 DT (Two to be selected)</label>
-            </li>
-            <ul class="ul-level1">
-              <li class="flexrow"> 
-                <label class="generic-label">Starting Specialisations : </label>
-              </li>
-              <li class="flexrow"> 
-                <input type="text" class="padd-right" name="system.messagespecplus1" value="{{data.messagespecplus1}}" data-dtype="String"/>
-              </li>
-              <li class="flexrow"><div class="drop-spec1"><label>Drop Specialisations here !</label></div>
-              </li>
-              {{#each data.specialisationsplus1 as |spec idx|}}
-                <li class="flexrow">
-                  <label name="system.specialisationsplus1[{{idx}}].name"><a class="view-subitem" data-type="specialisationsplus1" data-index="{{idx}}">{{spec.name}}</a></label>
-                  <div class="item-controls padd-left">
-                    <a class="item-control delete-subitem padd-left" data-type="specialisationsplus1" data-index="{{idx}}" title="Delete Spec"><i class="fas fa-trash"></i></a>
-                  </div>   
-                </li>
-              {{/each}}
-            </ul>
+
             <li class="flexrow">
               <label class="generic-label">Role Ability</label>
               </li>
@@ -77,37 +57,23 @@
                 {{/each}}
               </li>
             </ul>
-            <li class="flexrow"><label class="generic-label">Available specialisations (Choose 1 at +2 DT, Choose 2 at +1 DT)</label>
             </li>
-            <ul class="ul-level1">
-              <li class="flexrow"><div class="drop-spec2"><label>Drop Specialisations here !</label></div>
-              </li>
-              {{#each data.specincrease as |spec idx|}}
-              <li class="flexrow">
-                <label name="system.specincrease[{{idx}}].name"><a class="view-subitem" data-type="specincrease" data-index="{{idx}}">{{spec.name}}</a></label>
-                <div class="item-controls padd-left">
-                  <a class="item-control delete-subitem padd-left" data-type="specincrease" data-index="{{idx}}" title="Delete Spec"><i class="fas fa-trash"></i></a>
-                </div>   
-              </li>
-            {{/each}}
-            </ul>              
+
+            <li class="flexrow"><label class="generic-label">Role category for available perks</label>
+              <select class="competence-base flexrow" type="text" name="system.perksrole" value="{{data.perksrole}}" data-dtype="String">
+                {{#select data.perksrole}}
+                <option value="agitator">Agitator</option>
+                <option value="defender">Defender</option> 
+                <option value="enhancer">Enhancer</option> 
+                <option value="scrapper">Scrapper</option> 
+                <option value="ranged">Ranged</option> 
+                <option value="tactician">Tactician</option>
+                {{/select}}
+              </select> 
             </li>
-            <li class="flexrow"><label class="generic-label">Available perks (Choose 2)</label>
-            </li>  
-              <ul class="ul-level1">
-                <li class="flexrow"><div class="drop-perk2"><label>Drop Perks here !</label></div>
-                </li>
-                {{#each data.perks as |perk idx|}}
-                <li class="flexrow">
-                  <label name="system.perk[{{idx}}].name"><a class="view-subitem" data-type="perks" data-index="{{idx}}">{{perk.name}}</a></label>
-                  <div class="item-controls padd-left">
-                    <a class="item-control delete-subitem padd-left" data-type="perks" data-index="{{idx}}" title="Delete Perk"><i class="fas fa-trash"></i></a>
-                  </div>   
-                </li>
-              {{/each}}
-              </ul>              
-              </li>
+
           </ul>
+
         </div>
 
     </section>

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-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}}      
@@ -139,3 +152,19 @@
 
   </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-stat-block.html

@@ -5,32 +5,44 @@
         <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}}">
+        {{#if (eq key "ad")}}
+        <h4 class="stat-text-white stat-margin">{{upper stat.abbrev}}</h4>
+      {{else}}
         <h4 class="stat-text-white stat-margin"><a class="roll-stat stat-margin"
             data-stat-key="{{key}}">{{upper stat.abbrev}}</a></h4>
+        {{/if}}
       </span>
       <select class="status-small-label color-class-common" type="text" name="system.statistics.{{key}}.level"
         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 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 class="status-small-label color-class-common currentlevel-change" type="text" name="system.statistics.{{key}}.currentlevel"
+        value="{{stat.currentlevel}}" data-stat-key="{{key}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
         {{#select stat.currentlevel}}
-        {{{@root.optionsDiceList}}}
-        {{/select}}
+        {{#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}}>
+        value="{{stat.turningarc45}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}} disabled>
         {{#select stat.turningarc45}}
-        {{{@root.optionsDiceList}}}
+        {{{@root.optionsLevel}}}
         {{/select}}
       </select>
     </div>

templates/roll-dialog-generic.html

@@ -14,7 +14,7 @@
 
       {{else}}
       <div class="flexrow">
-        <span class="roll-dialog-label">Stat ({{stat.label}} {{#if statVehicle}}+{{statVehicle.label}}{{/if}}) : </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

@@ -270,7 +270,7 @@
             <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" name="system.modules.vmsavailable" value="{{data.modules.vmsAvailable}}"
+              <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}}"
@@ -491,6 +491,8 @@
           <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>
@@ -538,6 +540,8 @@
           <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>
@@ -549,6 +553,20 @@
 
     {{!-- 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">
@@ -574,13 +592,67 @@
     {{!-- 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.cargo.cargocapacity" value="{{data.cargo.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">
+        <li class="item flexrow list-item items-title-bg">
+          <span class="item-name-label-header">
+            <h3><label class="items-title-text">Cargo</label></h3>
+          </span>
+          <span class="item-field-label-long">
+            <label class="short-label">Capacity</label>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="short-label">Value</label>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="short-label">IDR</label>
+          </span>
+          <div class="item-filler">&nbsp;</div>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-add" data-type="cargo" title="Create Item"><i class="fas fa-plus"></i></a>
+          </div>
+        </li>
+        {{#each cargos as |cargo key|}}
+        <li class="item flexrow list-item list-item-shadow" data-item-id="{{money._id}}">
+          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+              src="{{cargo.img}}" /></a>
+          <span class="item-name-label">{{cargo.name}}</span>
+
+          <span class="item-field-label-long"><label>
+              {{cargo.system.capacity}}
+            </label>
+          </span>
+          <span class="item-field-label-medium">
+            <label>{{cargo.system.value}}</label>
+          </span>
+          <span class="item-field-label-medium">
+            {{#if cargo.system.idrDice}}
+            <a class="roll-idr" data-dice-value="{{cargo.system.idrDice}}">{{cargo.system.idrDice}}</a>
+            {{else}}
+            &nbsp;-&nbsp;
+            {{/if}}
+          </span>
+
+          <div class="item-filler">&nbsp;</div>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+          </div>
+        </li>
+        {{/each}}
+      </ul>
+
       <ul class="item-list alternate-list">
         <li class="item flexrow list-item items-title-bg">
           <span class="item-name-label-header">
@@ -706,8 +778,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>
@@ -775,8 +845,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>
@@ -834,8 +902,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>
@@ -865,17 +931,19 @@
           </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>