Fix level remaining

modules/pegasus-actor.js

@@ -23,7 +23,8 @@ 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 }
 const __bonusEffect = {
   name: "Crawling MAN Bonus", type: "effect", img: "systems/fvtt-pegasus-rpg/images/icons/icon_effect.webp",
   system: {
@@ -743,17 +744,20 @@ export class PegasusActor extends Actor {
   /* -------------------------------------------- */
   getSubActors() {
     let subActors = [];
-    for (let id of this.system.subactors) {
-      subActors.push(duplicate(game.actors.get(id)))
+    if (this.system.subactors) {
+      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 +1120,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 +1395,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 +1433,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 +1473,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 +1648,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)
       }
@@ -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) {
-    if (this.system.statistics.ad.currentspeed == speed) {
-      if (!this.items.find(effect => effect.system.isspeed == speed)) {
-        let effect = duplicate(__bonusEffect)
-        effect.name = name
-        effect.system.stataffected = stat
-        effect.system.effectlevel = level
-        effect.system.isspeed = speed
-        this.createEmbeddedDocuments("Item", [effect])
-      }
-    } else {
-      let effect = this.items.find(effect => effect.system.isspeed == speed)
-      if (effect) {
-        this.deleteEmbeddedDocuments("Item", [effect.id])
-      }
-    }
+  async manageVehicleSpeedBonus(speed, name, stat, level) {
+    let effect = duplicate(__bonusEffect)
+    effect.id = randomID(16)
+    effect.name = name
+    effect.system.stataffected = stat
+    effect.system.effectlevel = level
+    effect.system.isspeed = speed
+    await this.createEmbeddedDocuments("Item", [effect])
   }
 
   /* -------------------------------------------- */
@@ -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)
-
   }
 
   /* -------------------------------------------- */
@@ -2056,6 +2067,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 +2128,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,7 +2142,7 @@ export class PegasusActor extends Actor {
       let rollData = this.getCommonRollData("hr")
       rollData.mode = "stat"
       rollData.title = `Stat ${stat.label}`;
-      
+
       this.addVehicleShields(rollData)
       this.startRoll(rollData)
     }
@@ -2140,4 +2155,17 @@ export class PegasusActor extends Actor {
       this.updateEmbeddedDocuments('Item', [{ _id: mod.id, 'system.activated': !mod.system.activated }])
     }
   }
+
+  /* -------------------------------------------- */
+  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 += q * cargo.system.weight
+      }
+    }
+    return capacity
+  }
+  
 }

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,12 @@ 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()) ),
+      cargoCurrent: this.actor.getCurrentCargoCapacity(),
+      moneys: duplicate(this.actor.getMoneys()),
       options: this.options,
       owner: this.document.isOwner,
       editScore: this.options.editScore,
@@ -215,7 +221,7 @@ 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( );

system.json

@@ -253,7 +253,7 @@
   ],
   "title": "Pegasus RPG",
   "url": "https://www.uberwald.me/data/files/fvtt-pegasus-rpg",
-  "version": "10.0.14",
-  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v10.0.14.zip",
+  "version": "10.0.17",
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v10.0.17.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",

templates/partial-actor-equipment.html

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

templates/partial-roll-select-effects.html

@@ -44,6 +44,18 @@
             {{/if}}
           {{/each}}
         {{else}}
+              
+        {{#if (eq @root.vehicleKey effect.effect.system.stataffected)}}
+          <li class="flex-group-left">
+            <label class="attribute-value checkbox"><input type="checkbox" class="effect-clicked" id="effect-{{idx}}" data-effect-idx="{{idx}}" {{checked effect.applied}}/></label>
+            {{#if effect.effect}}
+            <label class="generic-label">{{effect.label}} ({{upperFirst effect.effect.system.type}}, {{upperFirst effect.effect.system.genre}}, {{effect.value}})</label>
+            {{else}}
+            <label class="generic-label">{{effect.label}} ({{effect.value}})</label>
+            {{/if}}
+          </li>
+          {{/if}}
+
           {{#if (eq @root.statKey effect.effect.system.stataffected)}}
             <li class="flex-group-left">
               <label class="attribute-value checkbox"><input type="checkbox" class="effect-clicked" id="effect-{{idx}}" data-effect-idx="{{idx}}" {{checked effect.applied}}/></label>
@@ -76,6 +88,7 @@
               {{/if}}
             {{/if}}
           {{/if}}
+
         {{/if}}
       {{/if}}      
     {{/if}}      

templates/partial-vehicle-stat-block.html

@@ -11,7 +11,11 @@
       <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>
@@ -20,8 +24,12 @@
       <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}}
+        {{#if (eq key "ad")}}
+          {{{@root.optionsLevel}}}
+        {{else}}
+          {{{@root.optionsDiceList}}}
+       {{/if}}
+      {{/select}}
       </select>
     </div>
     {{#if (eq key "man")}}
@@ -30,7 +38,7 @@
       <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}}}
+        {{{@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,11 +592,17 @@
     {{!-- Cargo Tab --}}
     <div class="tab equipment" data-group="primary" data-tab="cargo">
 
-      <div class="flexrow">
-        <h3>Encumbrance</h3>
-        <span class="small-label">Current : {{encCurrent}}</span>
-        <span class="small-label">Capacity : {{encCapacity}}</span>
-        <span class="small-label">Hindrance : {{encHindrance}}</span>
+      <div class="stat-item">
+        <ul class="stat-list alternate-list">
+          <li class="item stat flexrow list-item">
+            <span class="generic-label small-label "><strong>Cargo Capacity</strong></span>
+            <input type="text" class="input-numeric-short padd-right" name="system.cargocapacity" value="{{data.cargocapacity}}"
+              data-dtype="Number" />              
+            <span class="generic-label small-label"><strong>Total Cargo Capacity</strong></span>
+              <input type="text" class="input-numeric-short" value="{{cargoCurrent}}"
+                data-dtype="Number" />
+          </li>
+        </ul>
       </div>
 
       <ul class="item-list alternate-list">
@@ -710,8 +730,6 @@
 
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
-            <a class="item-control item-equip" title="Worn">{{#if weapon.system.equipped}}<i
-                class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
             <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
           </div>
         </li>
@@ -779,8 +797,6 @@
 
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
-            <a class="item-control item-equip" title="Worn">{{#if armor.system.equipped}}<i
-                class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
             <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
           </div>
         </li>
@@ -838,8 +854,6 @@
           </span>
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
-            <a class="item-control item-equip" title="Worn">{{#if shield.system.equipped}}<i
-                class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
             <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
           </div>
         </li>
@@ -869,17 +883,19 @@
           </div>
 
         </li>
-        {{#each containersTree as |equip key|}}
-        {{> systems/fvtt-pegasus-rpg/templates/partial-actor-equipment.html equip=equip level=1}}
-        <ul class="item-list list-item-shadow2 list-item-margin1">
-          {{#each equip.system.contents as |subgear key|}}
-          {{> systems/fvtt-pegasus-rpg/templates/partial-actor-equipment.html equip=subgear level=2}}
-          {{/each}}
-        </ul>
+        {{#each equipments as |equip key|}}
+        {{> systems/fvtt-pegasus-rpg/templates/partial-actor-equipment.html equip=equip level=1 canequip=false}}
         {{/each}}
       </ul>
 
       <hr>
+      <h3>Cargo information : </h3>
+      <div class="form-group editor">
+        {{editor data.cargo.cargoinformation target="system.cargo.cargoinformation" button=true owner=owner
+        editable=editable}}
+      </div>
+
+      <hr>
 
     </div>