Start vehicle automation

images/icons/.directory

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

modules/pegasus-actor.js

@@ -9,8 +9,21 @@ const __subkey2title = {
   "melee-dmg": "Melee Damage", "melee-atk": "Melee Attack", "ranged-atk": "Ranged Attack",
   "ranged-dmg": "Ranged Damage", "dmg-res": "Damare Resistance"
 }
+const __statBuild = [
+  { modules: ["vehiclehull"], field: "hr", itemfield: "hr" },
+  { 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: ["powercoremodule"], field: "pc", itemfield: "pc", },
+  { modules: ["mobilitymodule"], field: "mr", itemfield: "mr", },
+  { modules: ["propulsionmodule"], field: "ad", itemfield: "ad", },
+  { modules: ["combatmodule"], field: "fc", itemfield: "fc", },
+]
+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"]
 
-/* -------------------------------------------- */
 /* -------------------------------------------- */
 /**
  * Extend the base Actor entity by defining a custom roll data structure which is ideal for the Simple system.
@@ -71,7 +84,9 @@ export class PegasusActor extends Actor {
       this.system.encCapacity = this.getEncumbranceCapacity()
       this.buildContainerTree()
     }
-
+    if (this.type == 'vehicle') {
+      this.computeVehicleStats();
+    }
     super.prepareDerivedData();
   }
 
@@ -106,6 +121,42 @@ export class PegasusActor extends Actor {
     let comp = this.items.filter(item => item.type == 'effect');
     return comp;
   }
+  /* -------------------------------------------- */
+  getCombatModules() {
+    let comp = this.items.filter(item => item.type == 'combatmodule');
+    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;
+  }
+
   /* -------------------------------------------- */
   getPowers() {
     let comp = this.items.filter(item => item.type == 'power');
@@ -210,7 +261,8 @@ export class PegasusActor extends Actor {
   /* -------------------------------------------- */
   async manageDesires(flag) {
     if (flag) {
-      let effect = await PegasusUtility.getEffectFromCompendium("Desires")
+      let effect = await PegasusUtility.getEffectFromCompendium("Desire")
+      //console.log("EFFECT", effect)
       effect.system.desires = true
       this.createEmbeddedDocuments('Item', [effect])
     } else {
@@ -576,6 +628,7 @@ export class PegasusActor extends Actor {
   /* -------------------------------------------- */
   async preprocessItem(event, item, onDrop = false) {
 
+
     // Pre-filter effects
     if (item.type == 'effect') {
       if (this.checkMentalDisruption() && item.system.type == "mental" && item.system.genre == "positive") {
@@ -623,7 +676,7 @@ export class PegasusActor extends Actor {
         return false
       }
     }
-    if (item.type == "power" && item.system.purchasedtext.length > 0 ) {
+    if (item.type == "power" && item.system.purchasedtext.length > 0) {
       ChatMessage.create({ content: `Power ${item.name} puchased : ${item.system.purchasedtext}` })
     }
     let dropID = $(event.target).parents(".item").attr("data-item-id") // Only relevant if container drop
@@ -712,8 +765,8 @@ export class PegasusActor extends Actor {
     if (spec) {
       let powers = []
       for (let power of spec.system.powers) {
-        if ( power.data ) {
-          power.system = power.data  
+        if (power.data) {
+          power.system = power.data
         }
         power.system.specId = specId
         powers.push(power)
@@ -860,10 +913,18 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   incDecNRG(value) {
-    let nrg = duplicate(this.system.nrg)
-    nrg.value += value
-    if (nrg.value >= 0 && nrg.value <= nrg.max) {
-      this.update({ 'data.nrg': nrg })
+    if (this.type == "character") {
+      let nrg = duplicate(this.system.nrg)
+      nrg.value += value
+      if (nrg.value >= 0 && nrg.value <= nrg.max) {
+        this.update({ 'data.nrg': nrg })
+      }
+    } else {
+      let pc = duplicate(this.system.statistics.pc)
+      pc.curnrg += value
+      if (pc.curnrg >= 0) {
+        this.update({ 'system.statistics.pc': pc })
+      }
     }
   }
 
@@ -931,7 +992,7 @@ export class PegasusActor extends Actor {
       if (status == "activated") {
         // Add effects linked to the perk
         let effects = []
-        for (let effect of item.system.effectsgained) {          
+        for (let effect of item.system.effectsgained) {
           if (effect.data) {
             effect.system = effect.data
           }
@@ -1098,8 +1159,10 @@ export class PegasusActor extends Actor {
     }
   }
 
+
   /* -------------------------------------------- */
   async computeNRGHealth() {
+
     if (this.isOwner || game.user.isGM) {
       let updates = {}
       let phyDiceValue = PegasusUtility.getDiceValue(this.system.statistics.phy.value) + this.system.secondary.health.bonus + this.system.statistics.phy.mod;
@@ -1262,24 +1325,24 @@ export class PegasusActor extends Actor {
     if (ability.system.affectedstat != "notapplicable") {
       let stat = duplicate(this.system.statistics[ability.system.affectedstat])
       stat.mod += Number(ability.system.statmodifier)
-      updates[`data.statistics.${ability.system.affectedstat}`] = stat
+      updates[`system.statistics.${ability.system.affectedstat}`] = stat
     }
     // manage status bonus
     if (ability.system.statusaffected != "notapplicable") {
       if (ability.system.statusaffected == 'nrg') {
         let nrg = duplicate(this.system.nrg)
         nrg.mod += Number(ability.system.statusmodifier)
-        updates[`data.nrg`] = nrg
+        updates[`system.nrg`] = nrg
       }
       if (ability.system.statusaffected == 'health') {
         let health = duplicate(this.system.secondary.health)
         health.bonus += Number(ability.system.statusmodifier)
-        updates[`data.secondary.health`] = health
+        updates[`system.secondary.health`] = health
       }
       if (ability.system.statusaffected == 'delirium') {
         let delirium = duplicate(this.system.secondary.delirium)
         delirium.bonus += Number(ability.system.statusmodifier)
-        updates[`data.secondary.delirium`] = delirium
+        updates[`system.secondary.delirium`] = delirium
       }
     }
     if (directUpdate) {
@@ -1690,4 +1753,141 @@ export class PegasusActor extends Actor {
       ui.notifications.warn("Power not found !", powerId);
     }
   }
+
+  /* -------------------------------------------- */
+  /* VEHICLE STUFF */
+  manageCurrentSpeed(speed) {
+    if (speed == "fullstop") {
+      this.update({ 'system.secondary.moverange': "nomovement" })
+    }
+    if (speed == "crawling") {
+      this.update({ 'system.secondary.moverange': "threatzone" })
+    }
+    if (speed == "slow") {
+      this.update({ 'system.secondary.moverange': "close" })
+    }
+    if (speed == "average") {
+      this.update({ 'system.secondary.moverange': "medium" })
+    }
+    if (speed == "fast") {
+      this.update({ 'system.secondary.moverange': "long" })
+    }
+    if (speed == "extfast") {
+      this.update({ 'system.secondary.moverange': "extreme" })
+    }
+  }
+
+  /* -------------------------------------------- */
+  modifyVehicleStun(incDec) {
+    let stun = this.system.stun.value + incDec
+    this.update({ 'stun.value': stun })
+  }
+
+  /* -------------------------------------------- */
+  addTopSpeedBonus( topspeed, bonus) {
+    let num = __speed2Num[topspeed] + Number(bonus)
+    num = Math.max(0, num)
+    num = Math.min(num, __num2speed.length-1)
+    return __num2speed[num]
+  }
+
+  /* -------------------------------------------- */
+  async computeVehicleStats() {
+
+    if (this.type == "vehicle") {
+
+      for (let statDef of __statBuild) {
+        let sum = 0
+        let list = []
+        for (let moduleType of statDef.modules) {
+          list = list.concat(this.items.filter(item => item.type == moduleType))
+        }
+        if (list && list.length > 0) {
+          sum = list.reduce((value, item2) => value + Number(item2.system[statDef.itemfield]), 0)
+        }
+        //console.log("Processing", statDef.field, this.system.statistics[statDef.field].level, list, sum)
+        if (statDef.subfield){
+          if (sum != Number(this.system.statistics[statDef.field][statDef.subfield])) {
+            //console.log("Update", statDef.field, statDef.subfield, sum, this.system.statistics[statDef.field][statDef.subfield])
+            this.update({ [`system.statistics.${statDef.field}.${statDef.subfield}`]: sum } )
+          }
+        } else {
+          if (sum != Number(this.system.statistics[statDef.field].level)) {
+            this.update({ [`system.statistics.${statDef.field}.level`]: sum, [`system.statistics.${statDef.field}.currentlevel`]: sum })
+          }
+        }
+      }
+
+      // Top speed management
+      let mobility = this.items.find( item => item.type == "mobilitymodule")
+      let arcs = duplicate(this.system.arcs)
+      if (mobility) {
+        let propulsion = this.items.find( item => item.type == "propulsionmodule")
+        let bonus = (propulsion) ? propulsion.system.topspeed : 0
+        arcs.frontarc.topspeed = this.addTopSpeedBonus(mobility.system.ts_f, bonus)
+        arcs.rightarc.topspeed = mobility.system.ts_s
+        arcs.leftarc.topspeed = mobility.system.ts_s
+        arcs.toparc.topspeed = mobility.system.ts_s
+        arcs.bottomarc.topspeed = mobility.system.ts_s
+        arcs.reararc.topspeed = mobility.system.ts_r 
+      } else  {        
+        arcs.frontarc.topspeed = "fullstop"
+        arcs.rightarc.topspeed = "fullstop"
+        arcs.leftarc.topspeed = "fullstop"
+        arcs.toparc.topspeed = "fullstop"
+        arcs.bottomarc.topspeed = "fullstop"
+        arcs.reararc.topspeed = "fullstop"
+      }
+      for (let key in this.system.arcs) {        
+        if (this.system.arcs[key].topspeed != arcs[key].topspeed) {
+          this.update( { 'system.arcs': arcs})
+        }
+      }
+      
+      // VMS management
+      let hull = this.items.find( item => item.type == "vehiclehull")
+      let modules = duplicate(this.system.modules)
+      if (hull  ) {
+        modules.totalvms = Number(hull.system.vms)
+      } else {
+        modules.totalvms = 0
+      }
+      let spaceList = this.items.filter(item => item.type == "vehiclemodule") || []
+      spaceList = spaceList.concat(this.items.filter(item => item.type == "vehicleweaponmodule") || [])
+      let space = 0
+      if (spaceList && spaceList.length> 0) {
+        space = spaceList.reduce((value, item2) => value + Number(item2.system.space), 0) 
+      }
+      modules.usedvms = space
+      if ( modules.totalvms != this.system.modules.totalvms || modules.usedvms != this.system.modules.usedvms) {
+        this.update( {'system.modules': modules})
+      }
+      if (modules.usedvms > modules.totalvms ) {
+        ui.notifications.warn("Warning! No more space available in cargo !!")
+      }
+
+    }
+
+    // Manage top speed
+  }
+
+  /* -------------------------------------------- */
+  async preprocessItemVehicle(event, item, onDrop = false) {
+    //console.log(">>>>> item", item.type, __isVehicleUnique[item.type])
+    if ( __isVehicleUnique[item.type] ) {
+      let toDelList = []
+      for (let toDel of this.items) {
+        if ( toDel.type == item.type) {
+          toDelList.push( toDel.id )
+        }
+      }
+      //console.log("TODEL : ", toDelList)
+      if ( toDelList.length > 0 ) {
+        await this.deleteEmbeddedDocuments('Item', toDelList)
+      }
+    }
+
+    return true
+  }
+
 }

modules/pegasus-main.js

@@ -11,6 +11,7 @@
 import { PegasusActor } from "./pegasus-actor.js";
 import { PegasusItemSheet } from "./pegasus-item-sheet.js";
 import { PegasusActorSheet } from "./pegasus-actor-sheet.js";
+import { PegasusVehicleSheet } from "./pegasus-vehicle-sheet.js";
 import { PegasusNPCSheet } from "./pegasus-npc-sheet.js";
 import { PegasusUtility } from "./pegasus-utility.js";
 import { PegasusCombat } from "./pegasus-combat.js";
@@ -62,8 +63,8 @@ Hooks.once("init", async function () {
   /* -------------------------------------------- */
   // Register sheet application classes
   Actors.unregisterSheet("core", ActorSheet);
-  Actors.registerSheet("fvtt-pegasus", PegasusActorSheet, { types: ["character"], makeDefault: true });
-  //Actors.registerSheet("fvtt-pegasus", PegasusVehicleSheet, { types: ["vehicle"], makeDefault: false });
+  Actors.registerSheet("fvtt-pegasus", PegasusActorSheet, { types: ["character"], makeDefault: true })
+  Actors.registerSheet("fvtt-pegasus", PegasusVehicleSheet, { types: ["vehicle"], makeDefault: false })
 
   Items.unregisterSheet("core", ItemSheet);
   Items.registerSheet("fvtt-pegasus", PegasusItemSheet, { makeDefault: true });

modules/pegasus-utility.js

@@ -302,14 +302,16 @@ export class PegasusUtility {
 
   /* -------------------------------------------- */
   static async loadCompendiumData(compendium) {
-    const pack = game.packs.get(compendium);
-    return await pack?.getDocuments() ?? [];
+    const pack = game.packs.get(compendium)
+    console.log("PACK", pack, compendium)
+    return await pack?.getDocuments() ?? []
   }
 
   /* -------------------------------------------- */
   static async loadCompendium(compendium, filter = item => true) {
-    let compendiumData = await PegasusUtility.loadCompendiumData(compendium);
-    return compendiumData.filter(filter);
+    let compendiumData = await PegasusUtility.loadCompendiumData(compendium)
+    //console.log("Comp data", compendiumData)
+    return compendiumData.filter(filter)
   }
 
   /* -------------------------------------------- */
@@ -397,7 +399,7 @@ export class PegasusUtility {
         this.rollPegasus(rollData)
         character.modifyHeroLevelRemaining(-1)
       } else {
-        ui.notifications.warn(`No more Hero Level for ${actor.name} ! Unable to reroll.`)
+        ui.notifications.warn(`No more Hero Level for ${character.name} ! Unable to reroll.`)
       }
     }
   }
@@ -447,6 +449,8 @@ export class PegasusUtility {
       'systems/fvtt-pegasus-rpg/templates/partial-equipment-effects.html',
       'systems/fvtt-pegasus-rpg/templates/partial-actor-stat-block.html',
       'systems/fvtt-pegasus-rpg/templates/partial-actor-status.html',
+      'systems/fvtt-pegasus-rpg/templates/partial-vehicle-stat-block.html',
+      'systems/fvtt-pegasus-rpg/templates/partial-vehicle-arc.html',
       'systems/fvtt-pegasus-rpg/templates/partial-item-nav.html',
       'systems/fvtt-pegasus-rpg/templates/partial-item-description.html',
       'systems/fvtt-pegasus-rpg/templates/partial-actor-equipment.html',
@@ -459,8 +463,8 @@ export class PegasusUtility {
   static async getEffectFromCompendium(effectName) {
     effectName = effectName.toLowerCase()
     let effect = game.items.contents.find(item => item.type == 'effect' && item.name.toLowerCase() == effectName)
-    if (!effect) {
-      let effects = await this.loadCompendium('fvtt-pegasus.effect', item => item.name.toLowerCase() == effectName)
+    if (!effect ) {
+      let effects = await this.loadCompendium('fvtt-pegasus-rpg.effects', item => item.name.toLowerCase() == effectName)
       let objs = effects.map(i => i.toObject())
       effect = objs[0]
     } else {
@@ -660,19 +664,6 @@ export class PegasusUtility {
     return chatData;
   }
 
-  /* -------------------------------------------- */
-  static async loadCompendiumData(compendium) {
-    const pack = game.packs.get(compendium);
-    return await pack?.getDocuments() ?? [];
-  }
-
-  /* -------------------------------------------- */
-  static async loadCompendium(compendium, filter = item => true) {
-    let compendiumData = await this.loadCompendiumData(compendium);
-    //console.log("Compendium", compendiumData);
-    return compendiumData.filter(filter);
-  }
-
   /* -------------------------------------------- */
   static async showDiceSoNice(roll, rollMode) {
     if (game.modules.get("dice-so-nice")?.active) {

modules/pegasus-vehicle-sheet.js

@@ -0,0 +1,301 @@
+/**
+ * Extend the basic ActorSheet with some very simple modifications
+ * @extends {ActorSheet}
+ */
+
+import { PegasusUtility } from "./pegasus-utility.js"
+import { PegasusRollDialog } from "./pegasus-roll-dialog.js"
+
+/* -------------------------------------------- */
+export class PegasusVehicleSheet extends ActorSheet {
+
+  /** @override */
+  static get defaultOptions() {
+
+    return mergeObject(super.defaultOptions, {
+      classes: ["fvtt-pegasus-rpg", "sheet", "actor"],
+      template: "systems/fvtt-pegasus-rpg/templates/vehicle-sheet.html",
+      width: 960,
+      height: 720,
+      tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "combat" }],
+      dragDrop: [{ dragSelector: ".item-list .item", dropSelector: null }],
+      editScore: true
+    });
+  }
+
+  /* -------------------------------------------- */
+  async getData() {
+    const objectData = this.object    
+    let actorData = duplicate(this.object)
+
+    let formData = {
+      title: this.title,
+      id: objectData.id,
+      type: objectData.type,
+      img: objectData.img,
+      name: objectData.name,
+      editable: this.isEditable,
+      cssClass: this.isEditable ? "editable" : "locked",
+      data: actorData.system,
+      effects: this.object.effects.map(e => foundry.utils.deepClone(e.data)),
+      limited: this.object.limited,
+      optionsDiceList: PegasusUtility.getOptionsDiceList(),
+      optionsLevel: PegasusUtility.getOptionsLevel(),
+      subActors: duplicate(this.actor.getSubActors()),
+      effects: duplicate(this.actor.getEffects()),
+      combatModules: duplicate(this.actor.getCombatModules()),
+      powerCoreModules: duplicate(this.actor.getPowercoreModules()),
+      vehicleHull: duplicate(this.actor.getVehicleHull()),
+      mobilityModules: duplicate(this.actor.getMobilityModules()),
+      propulsionModules: duplicate(this.actor.getPropulsionModules()),
+      vehicleModules: duplicate(this.actor.getVehicleModules()),
+      vehicleWeaponModules: duplicate(this.actor.getVehicleWeaponModules()),
+      options: this.options,
+      owner: this.document.isOwner,
+      editScore: this.options.editScore,
+      isGM: game.user.isGM
+    }
+    this.formData = formData;
+
+    console.log("VEHICLE : ", formData, this.object);
+    return formData;
+  }
+
+  /* -------------------------------------------- */
+  async openGenericRoll() {
+    let rollData = PegasusUtility.initGenericRoll()
+    rollData.traumaState = this.actor.getTraumaState()
+    
+    let rollDialog = await PegasusRollDialog.create( this.actor, rollData);
+    rollDialog.render( true );
+  }
+
+  /* -------------------------------------------- */
+  async rollIDR( itemId, diceValue) { 
+    let item = this.actor.items.get( itemId) ?? {name: "Unknown"}
+    let myRoll = new Roll(diceValue+"x").roll({ async: false })
+    await PegasusUtility.showDiceSoNice(myRoll, game.settings.get("core", "rollMode"))
+    let chatData = {
+      user: game.user.id,
+      rollMode: game.settings.get("core", "rollMode"),
+      whisper: [game.user.id].concat(ChatMessage.getWhisperRecipients('GM')),
+      content: `${this.actor.name} has roll IDR for ${item.name} : ${myRoll.total}`
+    }
+    ChatMessage.create(chatData)
+  }
+
+  /* -------------------------------------------- */
+  /** @override */
+  activateListeners(html) {
+    super.activateListeners(html);
+
+    // Everything below here is only needed if the sheet is editable
+    if (!this.options.editable) return;
+    
+    html.bind("keydown", function(e) { // Ignore Enter in actores sheet
+      if (e.keyCode === 13) return false;
+    });  
+
+    // Update Inventory Item
+    html.find('.item-edit').click(ev => {
+      const li = $(ev.currentTarget).parents(".item")
+      let itemId = li.data("item-id")
+      const item = this.actor.items.get( itemId );
+      item.sheet.render(true);
+    });
+    // Delete Inventory Item
+    html.find('.item-delete').click(ev => {
+      const li = $(ev.currentTarget).parents(".item")
+      PegasusUtility.confirmDelete(this, li)
+    })
+    html.find('.item-add').click(ev => {
+      let dataType = $(ev.currentTarget).data("type")
+      this.actor.createEmbeddedDocuments('Item', [{ name: "NewItem", type: dataType }], { renderSheet: true })
+    })
+        
+    html.find('.current-speed-change').click(ev => {
+      let speed = ev.currentTarget.value
+      this.actor.manageCurrentSpeed(speed)
+    });      
+
+    html.find('.equip-activate').click(ev => {
+      const li = $(ev.currentTarget).parents(".item")
+      let itemId = li.data("item-id")
+      this.actor.equipActivate( itemId)
+    });      
+    html.find('.equip-deactivate').click(ev => {
+      const li = $(ev.currentTarget).parents(".item")
+      let itemId = li.data("item-id")
+      this.actor.equipDeactivate( itemId)
+    });      
+
+    html.find('.effect-used').click(ev => {
+      const li = $(ev.currentTarget).parents(".item");
+      let itemId = li.data("item-id");
+      this.actor.perkEffectUsed( itemId)
+    });      
+    
+    html.find('.subactor-edit').click(ev => {
+      const li = $(ev.currentTarget).parents(".item");
+      let actorId = li.data("actor-id");
+      let actor = game.actors.get( actorId );
+      actor.sheet.render(true);
+    });
+    
+    html.find('.subactor-delete').click(ev => {
+      const li = $(ev.currentTarget).parents(".item");
+      let actorId = li.data("actor-id");
+      this.actor.delSubActor(actorId);
+    });
+    
+    html.find('.quantity-minus').click(event => {
+      const li = $(event.currentTarget).parents(".item");
+      this.actor.incDecQuantity( li.data("item-id"), -1 );
+    } )
+    html.find('.quantity-plus').click(event => {
+      const li = $(event.currentTarget).parents(".item");
+      this.actor.incDecQuantity( li.data("item-id"), +1 );
+    } )
+    html.find('.vehicle-current-nrg-minus').click(event => {
+      this.actor.incDecNRG( -1 );
+    } )
+    html.find('.vehicle-current-nrg-plus').click(event => {
+      this.actor.incDecNRG( 1 );
+    } )
+    
+    html.find('.ammo-minus').click(event => {
+      const li = $(event.currentTarget).parents(".item")
+      this.actor.incDecAmmo( li.data("item-id"), -1 );
+    } );
+    html.find('.ammo-plus').click(event => {
+      const li = $(event.currentTarget).parents(".item")
+      this.actor.incDecAmmo( li.data("item-id"), +1 )
+    } );
+
+    html.find('.vehicle-stun-minus').click(event => {
+      this.actor.modifyVehicleStun( -1 )
+    } )
+    html.find('.vehicle-stun-plus').click(event => {
+      this.actor.modifyVehicleStun( 1 )
+    } )
+
+    
+    html.find('.momentum-minus').click(event => {
+      this.actor.modifyMomentum( -1 )
+    } )
+    html.find('.momentum-plus').click(event => {
+      this.actor.modifyMomentum( 1 )
+    } )
+
+    html.find('.unarmed-attack').click((event) => {
+      this.actor.rollUnarmedAttack();
+    });
+    html.find('.generic-pool-roll').click((event) => {      
+      this.openGenericRoll()
+    } );
+    html.find('.attack-melee').click((event) => {
+      this.actor.rollPool( 'com', false, "melee-atk");
+    });
+    html.find('.attack-ranged').click((event) => {
+      this.actor.rollPool( 'agi', false, "ranged-atk");
+    });
+    html.find('.defense-roll').click((event) => {
+      this.actor.rollPool( 'def', true);
+    });
+    html.find('.damage-melee').click((event) => {
+      this.actor.rollPool( 'str', false, "melee-dmg");
+    });
+    html.find('.damage-ranged').click((event) => {
+      this.actor.rollPool( 'per', false, "ranged-dmg");
+    });
+    html.find('.damage-resistance').click((event) => {
+      this.actor.rollPool( 'phy', false, "dmg-res");
+    });
+            
+    html.find('.roll-stat').click((event) => {
+      const statId = $(event.currentTarget).data("stat-key");
+      this.actor.rollStat(statId);
+    });
+    html.find('.roll-mr').click((event) => {
+      this.actor.rollMR();
+    });
+    html.find('.roll-idr').click((event) => {
+      const diceValue = $(event.currentTarget).data("dice-value")
+      const li = $(event.currentTarget).parents(".item")
+      this.rollIDR( li.data("item-id"), diceValue)
+    })    
+    
+    html.find('.weapon-roll').click((event) => {
+      const li = $(event.currentTarget).parents(".item");
+      const weaponId = li.data("item-id");
+      this.actor.rollWeapon(weaponId);
+    });
+    html.find('.armor-roll').click((event) => {
+      const li = $(event.currentTarget).parents(".item");
+      const armorId = li.data("item-id");
+      this.actor.rollArmor(armorId);
+    });
+    
+    html.find('.weapon-damage-roll').click((event) => {
+      const li = $(event.currentTarget).parents(".item");
+      const weaponId = li.data("item-id");
+      this.actor.rollWeapon(weaponId, true);
+    });
+    
+    html.find('.weapon-damage').click((event) => {
+      const li = $(event.currentTarget).parents(".item");
+      const weapon = this.actor.getOwnedItem(li.data("item-id"));
+      this.actor.rollDamage(weapon, 'damage');
+    });
+    
+    html.find('.lock-unlock-sheet').click((event) => {
+      this.options.editScore = !this.options.editScore;
+      this.render(true);
+    });    
+    html.find('.item-link a').click((event) => {
+      const itemId = $(event.currentTarget).data("item-id");
+      const item = this.actor.getOwnedItem(itemId);
+      item.sheet.render(true);
+    });    
+    html.find('.item-equip').click(ev => {
+      const li = $(ev.currentTarget).parents(".item");
+      this.actor.equipItem( li.data("item-id") );
+      this.render(true);      
+    });
+
+    html.find('.update-field').change(ev => {
+      const fieldName = $(ev.currentTarget).data("field-name");
+      let value = Number(ev.currentTarget.value);
+      this.actor.update( { [`${fieldName}`]: value } );
+    });    
+  }
+  
+  /* -------------------------------------------- */
+  /** @override */
+  setPosition(options = {}) {
+    const position = super.setPosition(options);
+    const sheetBody = this.element.find(".sheet-body");
+    const bodyHeight = position.height - 192;
+    sheetBody.css("height", bodyHeight);
+    return position;
+  }
+
+  /* -------------------------------------------- */
+  async _onDropItem(event, dragData) {
+    const item = fromUuidSync(dragData.uuid)
+    if (item == undefined) {
+      item = this.actor.items.get( dragData.uuid )
+    }
+    let ret = await this.actor.preprocessItemVehicle( event, item, true )
+    if ( ret ) {
+      super._onDropItem(event, dragData)
+    }
+  }
+
+  /* -------------------------------------------- */
+  /** @override */
+  _updateObject(event, formData) {
+    // Update the Actor
+    return this.object.update(formData)
+  }
+}

styles/simple.css

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

system.json

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

template.json

@@ -10,6 +10,7 @@
           "name": "",
           "age": 0,
           "size": "",
+          "sizenum": 0,
           "weight": "",
           "hair": "",
           "sex": "",
@@ -199,26 +200,31 @@
         "description": ""
       },
       "vehicle": {
+        "subactors": [],
         "statistics": {
           "fc": {
             "label": "FC",
             "abbrev": "fc",
             "level": 0,
-            "currentlevel": 0
+            "currentlevel": 0,
+            "col": 1
           },
           "man": {
-            "label": "FC",
-            "abbrev": "fc",
+            "label": "MAN",
+            "abbrev": "man",
             "dicevalue": "",
             "level": 0,
-            "currentlevel": 0
+            "currentlevel": 0,
+            "turningarc45": 0,
+            "col": 1
           },
           "hr": {
             "label": "HR",
             "abbrev": "hr",
             "level": 0,
             "currentlevel": 0,
-            "size": 0
+            "size": 0,
+            "col": 2
           },
           "pc": {
             "label": "PC",
@@ -226,13 +232,15 @@
             "level": 0,
             "currentlevel": 0,
             "avgnrg": 0,
-            "curnrg": 0
+            "curnrg": 0,
+            "col": 2
           },
           "mr": {
             "label": "MR",
             "abbrev": "mr",
             "level": 0,
-            "currentlevel": 0
+            "currentlevel": 0,
+            "col": 3
           },
           "ad": {
             "label": "A/D",
@@ -240,7 +248,8 @@
             "level": 0,
             "currentlevel": 0,
             "accmode": "",
-            "currentspeed": ""
+            "currentspeed": "",
+            "col": 3
           }
         },
         "stun": {
@@ -257,7 +266,7 @@
           "activatedmoduleenergy": 0,
           "vdp": 0,
           "vehiculevalue": 0,
-          "availablevms": 0,
+          "totalvms": 0,
           "vmsused": 0,
           "totalcost": 0
         },
@@ -275,34 +284,46 @@
         },
         "arcs": {
           "frontarc": {
+            "label": "Fore Arc",
             "topspeed": "",
             "shieldlevel": 0,
-            "armourlevel": 0
+            "armourlevel": 0,
+            "is3D": false          
           },
           "reararc": {
+            "label": "Rear Arc",
             "topspeed": "",
             "shieldlevel": 0,
-            "armourlevel": 0
+            "armourlevel": 0,
+            "is3D": false          
           },
           "rightarc": {
+            "label": "Right Arc",
             "topspeed": "",
             "shieldlevel": 0,
-            "armourlevel": 0
+            "armourlevel": 0,
+            "is3D": false          
           },
           "leftarc": {
+            "label": "Left Arc",
             "topspeed": "",
             "shieldlevel": 0,
-            "armourlevel": 0
+            "armourlevel": 0,
+            "is3D": false          
           },
           "toparc": {
+            "label": "Top Arc",
             "topspeed": "",
             "shieldlevel": 0,
-            "armourlevel": 0
+            "armourlevel": 0,
+            "is3D": true          
           },
           "bottomarc": {
+            "label": "Bottom Arc",
             "topspeed": "",
             "shieldlevel": 0,
-            "armourlevel": 0
+            "armourlevel": 0,
+            "is3D": true          
           }
         }
       }
@@ -655,6 +676,7 @@
       "range": "",
       "idr": "",
       "cost": 0,
+      "size": 0,
       "space": 0
     },
     "vehicleweaponmodule": {

templates/actor-sheet.html

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

templates/item-power-sheet.html

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

templates/item-propulsionmodule-sheet.html

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

templates/item-race-sheet.html

@@ -54,12 +54,12 @@
       <ul>
         <li class="flexrow"><label class="generic-label">Selectable Stats ?</label>
           <label class="attribute-value checkbox"><input type="checkbox" name="system.selectablestats" {{checked
-              data.selectablestats}} /></label>
+            system.selectablestats}} /></label>
         </li>
         {{#if data.selectablestats}}
         <li class="flexrow"><label class="generic-label">Select 1 stat only once?</label>
           <label class="attribute-value checkbox"><input type="checkbox" name="system.statsonlyonce" {{checked
-              data.statsonlyonce}} /></label>
+            system.statsonlyonce}} /></label>
         </li>
         <li class="flexrow"><label class="generic-label">Number of selectable stats</label>
           <input type="text" class="input-numeric-short padd-right" name="system.numberstats" value="{{data.numberstats}}"

templates/item-vehiclemodule-sheet.html

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

templates/partial-options-vehicle-speed.html

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

templates/partial-roll-select-effects.html

@@ -4,10 +4,10 @@
 <ul>
   {{#each effectsList as |effect idx|}}
 
-    {{#if effect.effect.data.hindrance}}
+    {{#if effect.effect.system.hindrance}}
     <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>
-      <label class="generic-label">Target Hindrance : {{effect.label}} ({{upperFirst effect.effect.data.type}}, {{upperFirst effect.effect.data.genre}}, {{effect.value}})</label>
+      <label class="generic-label">Target Hindrance : {{effect.label}} ({{upperFirst effect.effect.system.type}}, {{upperFirst effect.effect.system.genre}}, {{effect.value}})</label>
     </li>
     {{else}}
       {{#if (eq type "hindrance")}}
@@ -30,13 +30,13 @@
         </li>
         {{/if}}
 
-        {{#if (count effect.effect.data.specaffected)}}
-          {{#each effect.effect.data.specaffected as |spec idx2|}}
+        {{#if (count effect.effect.system.specaffected)}}
+          {{#each effect.effect.system.specaffected as |spec idx2|}}
             {{#if (eq @root.specName spec.name)}}
               <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.data.type}}, {{upperFirst effect.effect.data.genre}}, {{effect.value}})</label>
+                <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}}
@@ -44,31 +44,31 @@
             {{/if}}
           {{/each}}
         {{else}}
-          {{#if (eq @root.statKey effect.effect.data.stataffected)}}
+          {{#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>
               {{#if effect.effect}}
-              <label class="generic-label">{{effect.label}} ({{upperFirst effect.effect.data.type}}, {{upperFirst effect.effect.data.genre}}, {{effect.value}})</label>
+              <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>
           {{else}}
-            {{#if (eq @root.subKey effect.effect.data.stataffected)}}
+            {{#if (eq @root.subKey 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.data.type}}, {{upperFirst effect.effect.data.genre}}, {{effect.value}})</label>
+              <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>
             {{else}}
-              {{#if (eq effect.effect.data.stataffected "all")}}
+              {{#if (eq effect.effect.system.stataffected "all")}}
               <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.data.type}}, {{upperFirst effect.effect.data.genre}}, {{effect.value}})</label>
+                <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}}

templates/partial-vehicle-arc.html

@@ -0,0 +1,46 @@
+<ul class="stat-list alternate-list">
+  <li class="item flexrow list-item items-title-bg">
+    <span class="item-name-label-header-long">
+      <h3><label class="items-title-text">{{arc.label}}</label></h3>
+    </span>
+    <span class="item-field-label-long">
+      <label class="short-label">Top speed</label>
+    </span>
+    <span class="item-field-label-long">
+      <label class="short-label">Shield</label>
+    </span>
+    <span class="item-field-label-long">
+      <label class="short-label">Armour</label>
+    </span>
+  </li>
+  <li class="item flexrow list-item list-item-shadow" data-arc-name="{{idx}}">
+
+    <span class="item-name-img">&nbsp;</span>
+    <span class="item-name-label-long">&nbsp;</span>
+
+    <span class="item-field-label-long">
+      <select type="text" name="system.arcs.{{idx}}.topspeed" value="{{arc.topspeed}}" data-dtype="String" disabled>
+        {{#select arc.topspeed}}
+        {{> systems/fvtt-pegasus-rpg/templates/partial-options-vehicle-speed.html}}
+        {{/select}}
+        </select>
+    </span>
+
+    <span class="item-field-label-long">
+      <select type="text" name="system.arcs.{{idx}}.shieldlevel" value="{{arc.shieldlevel}}" data-dtype="Number">
+        {{#select arc.shieldlevel}}
+        {{{@root.optionsDiceList}}}
+        {{/select}}
+        </select>
+    </span>
+
+    <span class="item-field-label-long">
+      <select type="text" name="system.arcs.{{idx}}.armourlevel" value="{{arc.armourlevel}}" data-dtype="Number">
+        {{#select arc.armourlevel}}
+        {{{@root.optionsDiceList}}}
+        {{/select}}
+        </select>
+    </span>
+
+  </li>
+</ul>

templates/partial-vehicle-stat-block.html

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