Fix #7 #26

modules/pegasus-actor.js

@@ -14,7 +14,7 @@ const __statBuild = [
   { modules: ["vehiclehull", "vehiclemodule"], field: "hr", itemfield: "size", subfield: "size" },
   //{ modules: ["vehiclehull"], field: "pc", itemfield: "vms", subfield: "avgnrg" },
   //{ modules: ["powercoremodule"], field: "pc", itemfield: "nrg", subfield: "avgnrg" },
-  { modules: ["vehiclehull", "mobilitymodule"], itemfield: "man", field: "man" },
+  { modules: ["vehiclehull", "mobilitymodule"], itemfield: "man", field: "man", additionnal1: "turningarc45"},
   { modules: ["powercoremodule"], field: "pc", itemfield: "pc", additionnal1: "curnrg", additionnal2: "maxnrg" },
   { modules: ["mobilitymodule"], field: "mr", itemfield: "mr" },
   { modules: ["propulsionmodule"], field: "ad", itemfield: "ad" },
@@ -23,7 +23,9 @@ const __statBuild = [
 const __isVehicleUnique = { vehiclehull: 1, powercoremodule: 1, mobilitymodule: 1, propulsionmodule: 1, combatmodule: 1 }
 const __speed2Num = { fullstop: 0, crawling: 1, slow: 2, average: 3, fast: 4, extfast: 5 }
 const __num2speed = ["fullstop", "crawling", "slow", "average", "fast", "extfast"]
-const __isVehicle = { vehiclehull: 1, powercoremodule: 1, mobilitymodule: 1, combatmodule: 1, propulsionmodule: 1, vehiclemodule: 1, vehicleweaponmodule: 1, effect: 1 }
+const __isVehicle = { vehiclehull: 1, powercoremodule: 1, mobilitymodule: 1, combatmodule: 1, 
+  propulsionmodule: 1, vehiclemodule: 1, vehicleweaponmodule: 1, effect: 1, equipment: 1, weapon: 1, armor: 1, shield:1, money: 1, cargo: 1 }
+const __isVehicleCargo = {equipment: 1, weapon: 1, armor: 1, shield:1, money: 1, cargo: 1}
 const __bonusEffect = {
   name: "Crawling MAN Bonus", type: "effect", img: "systems/fvtt-pegasus-rpg/images/icons/icon_effect.webp",
   system: {
@@ -158,32 +160,30 @@ export class PegasusActor extends Actor {
     let comp = this.items.filter(item => item.type == 'combatmodule');
     return comp;
   }
-  /* -------------------------------------------- */
+  getCargos() {
+    let comp = this.items.filter(item => item.type == 'cargo');
+    return comp;
+  }
   getVehicleHull() {
     let comp = this.items.filter(item => item.type == 'vehiclehull');
     return comp;
   }
-  /* -------------------------------------------- */
   getPowercoreModules() {
     let comp = this.items.filter(item => item.type == 'powercoremodule');
     return comp;
   }
-  /* -------------------------------------------- */
   getMobilityModules() {
     let comp = this.items.filter(item => item.type == 'mobilitymodule');
     return comp;
   }
-  /* -------------------------------------------- */
   getPropulsionModules() {
     let comp = this.items.filter(item => item.type == 'propulsionmodule');
     return comp;
   }
-  /* -------------------------------------------- */
   getVehicleModules() {
     let comp = this.items.filter(item => item.type == 'vehiclemodule');
     return comp;
   }
-  /* -------------------------------------------- */
   getVehicleWeaponModules() {
     let comp = this.items.filter(item => item.type == 'vehicleweaponmodule');
     return comp;
@@ -743,17 +743,20 @@ export class PegasusActor extends Actor {
   /* -------------------------------------------- */
   getSubActors() {
     let subActors = [];
-    for (let id of this.system.subactors) {
+    if (this.system.subactors) {
-      subActors.push(duplicate(game.actors.get(id)))
+      for (let id of this.system.subactors) {
+        subActors.push(duplicate(game.actors.get(id)))
+      }
     }
     return subActors;
   }
   /* -------------------------------------------- */
   async addSubActor(subActorId) {
-    let subActors = duplicate(this.system.subactors);
+    let subActors = duplicate(this.system.subactors || []);
     subActors.push(subActorId);
     await this.update({ 'system.subactors': subActors });
   }
+
   /* -------------------------------------------- */
   async delSubActor(subActorId) {
     let newArray = [];
@@ -1116,13 +1119,13 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   getLevelRemaining() {
-    return this.system.biodata.currentlevelremaining
+    return this.system.biodata?.currentlevelremaining || 0
   }
   /* -------------------------------------------- */
   modifyHeroLevelRemaining(incDec) {
     let biodata = duplicate(this.system.biodata)
     biodata.currentlevelremaining = Math.max(biodata.currentlevelremaining + incDec, 0)
-    this.update({ "data.biodata": biodata })
+    this.update({ "system.biodata": biodata })
     ChatMessage.create({ content: `${this.name} has used a Hero Level to reroll !` })
     return biodata.currentlevelremaining
   }
@@ -1391,26 +1394,31 @@ export class PegasusActor extends Actor {
     let newItems = []
     if (ability.system.effectsgained) {
       for (let effect of ability.system.effectsgained) {
+        if (!effect.system) effect.system = effect.data
         newItems.push(effect);
       }
     }
     if (ability.system.powersgained) {
       for (let power of ability.system.powersgained) {
+        if (!power.system) power.system = power.data
         newItems.push(power);
       }
     }
     if (ability.system.specialisations) {
       for (let spec of ability.system.specialisations) {
+        if (!spec.system) spec.system = spec.data
         newItems.push(spec);
       }
     }
     if (ability.system.attackgained) {
       for (let weapon of ability.system.attackgained) {
+        if (!weapon.system) weapon.system = weapon.data
         newItems.push(weapon);
       }
     }
     if (ability.system.armorgained) {
       for (let armor of ability.system.armorgained) {
+        if (!armor.system) armor.system = armor.data
         newItems.push(armor);
       }
     }
@@ -1424,14 +1432,16 @@ export class PegasusActor extends Actor {
     let newItems = []
     await this.deleteAllItemsByType('race')
     newItems.push(race);
-    
+
     console.log("DROPPED RACE", race)
     for (let ability of race.system.abilities) {
+      if (!ability.system) ability.system = ability.data
       newItems.push(ability)
       this.applyAbility(ability, updates)
     }
     if (race.system.perksgained) {
       for (let power of race.system.perks) {
+        if (!power.system) power.system = power.data
         newItems.push(power);
       }
     }
@@ -1462,7 +1472,7 @@ export class PegasusActor extends Actor {
     this.getIncreaseStatValue(updates, role.system.statincrease2)
 
     if (role.system.specialability.length > 0) {
-      console.log("Adding ability", role.system.specialability)
+      //console.log("Adding ability", role.system.specialability)
       newItems = newItems.concat(duplicate(role.system.specialability)) // Add new ability
       this.applyAbility(role.system.specialability[0], newItems)
     }
@@ -1637,22 +1647,26 @@ export class PegasusActor extends Actor {
             ui.notifications.warn("MR not added to Melee Damage due to Full Stop.")
           } else {
             rollData.statVehicle = vehicle.system.statistics.mr
+            rollData.vehicleKey = "mr"
           }
           this.addVehicleWeapons(rollData, vehicle)
         }
         if (subKey == "ranged-atk") {
           rollData.statVehicle = vehicle.system.statistics.fc
+          rollData.vehicleKey = "fc"
         }
         if (subKey == "ranged-dmg") {
           this.addVehicleWeapons(rollData, vehicle)
         }
-        if (subKey == "defense") {
+        if (subKey == "defence") {
           if (vehicle.isVehicleFullStop()) {
             ui.notifications.warn("MAN not added to Defense due to Full Stop.")
           } else {
             rollData.statVehicle = vehicle.system.statistics.man
+            rollData.vehicleKey = "man"
           }
         }
+        vehicle.addEffects(rollData, false, false, false)
         //this.addVehiculeHindrances(rollData.effectsList, vehicle)
         //this.addVehicleBonus(rollData, vehicle)
       }
@@ -1662,7 +1676,8 @@ export class PegasusActor extends Actor {
       if (statKey.toLowerCase() == "mr") {
         rollData.img = "systems/fvtt-pegasus-rpg/images/icons/MR.webp"
       } else {
-        rollData.img = `systems/fvtt-pegasus-rpg/images/icons/${rollData.stat.abbrev}.webp`
+        let abbrev = rollData.stat.abbrev.toUpperCase()
+        rollData.img = `systems/fvtt-pegasus-rpg/images/icons/${abbrev}.webp`
       }
       rollData.dicePool = rollData.dicePool.concat(PegasusUtility.buildDicePool("stat", rollData.statDicesLevel, rollData.stat.mod))
       if (rollData.statVehicle) {
@@ -1848,24 +1863,35 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   /* VEHICLE STUFF */
-  manageCurrentSpeed(speed) {
+  async manageCurrentSpeed(speed) {
+    // Delete any previous effect
+    let effect = this.items.find(effect => effect.system.isspeed != undefined)
+    if (effect) {
+      await this.deleteEmbeddedDocuments("Item", [effect.id])
+    }
+
     if (speed == "fullstop") {
       this.update({ 'system.secondary.moverange': "nomovement" })
     }
     if (speed == "crawling") {
-      this.update({ 'system.secondary.moverange': "threatzone" })
+      await this.update({ 'system.secondary.moverange': "threatzone" })
+      await this.manageVehicleSpeedBonus("crawling", "Crawling MAN Bonus", "man", 3)
     }
     if (speed == "slow") {
-      this.update({ 'system.secondary.moverange': "close" })
+      await this.update({ 'system.secondary.moverange': "close" })
+      await this.manageVehicleSpeedBonus("slow", "Slow MAN Bonus", "man", 1)
     }
     if (speed == "average") {
-      this.update({ 'system.secondary.moverange': "medium" })
+      await this.update({ 'system.secondary.moverange': "medium" })
+      await this.manageVehicleSpeedBonus("average", "Avoid attack Bonus", "all", 1)
     }
     if (speed == "fast") {
-      this.update({ 'system.secondary.moverange': "long" })
+      await this.update({ 'system.secondary.moverange': "long" })
+      await this.manageVehicleSpeedBonus("fast", "Avoid attack Bonus", "all", 3)
     }
     if (speed == "extfast") {
-      this.update({ 'system.secondary.moverange': "extreme" })
+      await this.update({ 'system.secondary.moverange': "extreme" })
+      await this.manageVehicleSpeedBonus("extfast", "Avoid attack Bonus", "all", 5)
     }
   }
 
@@ -1884,22 +1910,14 @@ export class PegasusActor extends Actor {
   }
 
   /* -------------------------------------------- */
-  manageVehicleSpeedBonus(speed, name, stat, level) {
+  async manageVehicleSpeedBonus(speed, name, stat, level) {
-    if (this.system.statistics.ad.currentspeed == speed) {
+    let effect = duplicate(__bonusEffect)
-      if (!this.items.find(effect => effect.system.isspeed == speed)) {
+    effect.id = randomID(16)
-        let effect = duplicate(__bonusEffect)
+    effect.name = name
-        effect.name = name
+    effect.system.stataffected = stat
-        effect.system.stataffected = stat
+    effect.system.effectlevel = level
-        effect.system.effectlevel = level
+    effect.system.isspeed = speed
-        effect.system.isspeed = speed
+    await this.createEmbeddedDocuments("Item", [effect])
-        this.createEmbeddedDocuments("Item", [effect])
-      }
-    } else {
-      let effect = this.items.find(effect => effect.system.isspeed == speed)
-      if (effect) {
-        this.deleteEmbeddedDocuments("Item", [effect.id])
-      }
-    }
   }
 
   /* -------------------------------------------- */
@@ -1988,13 +2006,6 @@ export class PegasusActor extends Actor {
       }
 
     }
-    // Speed effect management
-    this.manageVehicleSpeedBonus("crawling", "Crawling MAN Bonus", "man", 3)
-    this.manageVehicleSpeedBonus("slow", "Slow MAN Bonus", "man", 1)
-    this.manageVehicleSpeedBonus("average", "Avoid attack Bonus", "all", 1)
-    this.manageVehicleSpeedBonus("fast", "Avoid attack Bonus", "all", 3)
-    this.manageVehicleSpeedBonus("extfast", "Avoid attack Bonus", "all", 5)
-
   }
 
   /* -------------------------------------------- */
@@ -2033,12 +2044,26 @@ export class PegasusActor extends Actor {
     }
     // Check size
     if (item.type == "vehiclemodule" || item.type == "vehicleweaponmodule") {
-      item.system.space = item.system.space || 0
+      item.system.space = item.system?.space || 0
       if (this.system.modules.usedvms + Number(item.system.space) > this.system.modules.totalvms) {
         ChatMessage.create({ content: `No more room available to host module ${item.name}. Module is not added to the vehicle.` })
         return false
       }
     }
+    if( __isVehicleCargo[item.type]) {
+      let capacity = this.getCurrentCargoCapacity()
+      if ( item.type == "cargo") {
+        capacity += Number(item.system.capacity)
+      } else {
+        let q = item.system.quantity  ||  1
+        capacity += Number(q) * Number(item.system.weight)
+      }
+      console.log("capa", capacity, this.system.cargo.cargocapacity)
+      if ( capacity > this.system.cargo.cargocapacity)  {
+        ui.notifications.warn("Your cargo capacity is already full, unable to add this content : " + item.name)
+        return false
+      }
+    }
     return true
   }
 
@@ -2056,6 +2081,10 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   addCrew(actorId) {
+    if (this.system.crew.length >= this.system.crewmax) {
+      ui.notifications.warn("Vehicle crew is already full.")
+      return
+    }
     let crewList = duplicate(this.system.crew.filter(actorDef => actorDef.id != actorId) || [])
     crewList.push({ id: actorId })
     this.update({ 'system.crew': crewList })
@@ -2113,7 +2142,7 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   addVehicleShields(rollData) {
-    let shields = this.items.filter( shield => shield.type == "vehiclemodule" && shield.system.activated && shield.system.shielddicevalue > 0) || []
+    let shields = this.items.filter(shield => shield.type == "vehiclemodule" && shield.system.activated && shield.system.shielddicevalue > 0) || []
     for (let shield of shields) {
       rollData.vehicleShieldList.push({ label: `${shield.name} (${shield.system.arccoverage})`, type: "vehicleshield", applied: false, value: shield.system.shielddicevalue })
     }
@@ -2127,9 +2156,10 @@ export class PegasusActor extends Actor {
       let rollData = this.getCommonRollData("hr")
       rollData.mode = "stat"
       rollData.title = `Stat ${stat.label}`;
-      
+
       this.addVehicleShields(rollData)
       this.startRoll(rollData)
+      this.modifyVehicleStun( 1 )
     }
   }
 
@@ -2140,4 +2170,25 @@ export class PegasusActor extends Actor {
       this.updateEmbeddedDocuments('Item', [{ _id: mod.id, 'system.activated': !mod.system.activated }])
     }
   }
+
+  /* -------------------------------------------- */
+  setTurningArc( currentLevel) {
+    this.update(  { 'system.statistics.man.turningarc45': currentLevel })
+  }
+
+  /* -------------------------------------------- */
+  getCurrentCargoCapacity( ) {
+    let capacity = 0
+    for (let cargo of this.items) {
+      if (cargo.type == "equipment" || cargo.type == "weapon" || cargo.type == "armor" || cargo.type == "money" || cargo.type == "shield" ) {
+        let q = cargo.system.quantity || 1
+        capacity += Number(q) * Number(cargo.system.weight)
+      }
+      if (cargo.type == "cargo" ) {
+        capacity += Number(cargo.system.capacity)
+      }
+    }
+    return capacity
+  }
+  
 }

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-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,7 +124,7 @@ 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)
     })
@@ -215,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, "defence");
+      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");
@@ -302,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.14",
+  "version": "10.0.19",
-  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v10.0.14.zip",
+  "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": "",
@@ -697,7 +703,14 @@
       "idr": "",
       "cost": 0,
       "extradamage": false,
-      "extradamagevalue": 0
+      "extradamagevalue": 0,
+      "description": ""
+    },
+    "cargo": {
+      "capacity": 0,
+      "idr": "",
+      "value": 0,
+      "description": ""
     }
   }
 }

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="agitator">Agitator</option>
-                <option value="defender">Defender</option>, 
+                <option value="defender">Defender</option> 
-                <option value="enhancer">Enhancer</option>, 
+                <option value="enhancer">Enhancer</option> 
-                <option value="scrapper">Scrapper</option>, 
+                <option value="scrapper">Scrapper</option> 
-                <option value="ranged">Ranged</option>, 
+                <option value="ranged">Ranged</option> 
-                <option value="tactician">Tactician</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 class="flexrow"><label class="generic-label">Role category for available perks</label>
-              </li>
+              <select class="competence-base flexrow" type="text" name="system.perksrole" value="{{data.perksrole}}" data-dtype="String">
-              {{#each data.specincrease as |spec idx|}}
+                {{#select data.perksrole}}
-              <li class="flexrow">
+                <option value="agitator">Agitator</option>
-                <label name="system.specincrease[{{idx}}].name"><a class="view-subitem" data-type="specincrease" data-index="{{idx}}">{{spec.name}}</a></label>
+                <option value="defender">Defender</option> 
-                <div class="item-controls padd-left">
+                <option value="enhancer">Enhancer</option> 
-                  <a class="item-control delete-subitem padd-left" data-type="specincrease" data-index="{{idx}}" title="Delete Spec"><i class="fas fa-trash"></i></a>
+                <option value="scrapper">Scrapper</option> 
-                </div>   
+                <option value="ranged">Ranged</option> 
-              </li>
+                <option value="tactician">Tactician</option>
-            {{/each}}
+                {{/select}}
-            </ul>              
+              </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/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 (count equip.system.effects)}}
-      {{#if equip.data.activated}}
+      {{#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}}
+    {{#if equip.system.idrDice}}
-    <a class="roll-idr" data-dice-value="{{equip.data.idrDice}}">{{equip.data.idrDice}}</a>
+    <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)}}
+    {{#if canequip}}
-    <a class="item-control item-equip" title="Worn">{{#if equip.data.equipped}}<i
+      {{#if (eq level 1)}}
-        class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
+      <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}}      

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"
+      <select class="status-small-label color-class-common currentlevel-change" type="text" name="system.statistics.{{key}}.currentlevel"
-        value="{{stat.currentlevel}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
+        value="{{stat.currentlevel}}" data-stat-key="{{key}}" data-dtype="Number" {{#unless @root.editScore}}disabled{{/unless}}>
         {{#select stat.currentlevel}}
-        {{{@root.optionsDiceList}}}
+        {{#if (eq key "ad")}}
-        {{/select}}
+          {{{@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/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}}"
@@ -553,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">
@@ -578,13 +592,67 @@
     {{!-- Cargo Tab --}}
     <div class="tab equipment" data-group="primary" data-tab="cargo">
 
-      <div class="flexrow">
+      <div class="stat-item">
-        <h3>Encumbrance</h3>
+        <ul class="stat-list alternate-list">
-        <span class="small-label">Current : {{encCurrent}}</span>
+          <li class="item stat flexrow list-item">
-        <span class="small-label">Capacity : {{encCapacity}}</span>
+            <span class="generic-label small-label "><strong>Cargo Capacity</strong></span>
-        <span class="small-label">Hindrance : {{encHindrance}}</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">
@@ -710,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>
@@ -779,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>
@@ -838,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>
@@ -869,17 +931,19 @@
           </div>
 
         </li>
-        {{#each containersTree as |equip key|}}
+        {{#each equipments as |equip key|}}
-        {{> systems/fvtt-pegasus-rpg/templates/partial-actor-equipment.html equip=equip level=1}}
+        {{> systems/fvtt-pegasus-rpg/templates/partial-actor-equipment.html equip=equip level=1 canequip=false}}
-        <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}}
       </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>