Minor fixes

modules/pegasus-actor-sheet.js

@@ -160,6 +160,7 @@ export class PegasusActorSheet extends ActorSheet {
       const li = $(ev.currentTarget).parents(".item");
       let itemId = li.data("item-id");
       this.actor.updatePerkStatus( itemId, ev.currentTarget.value)
+      this.render()
     });
 
     html.find('.power-cost-spent').change(ev => {

modules/pegasus-actor.js

@@ -858,7 +858,8 @@ export class PegasusActor extends Actor {
 
       if (item.data.data.status == status) return;// Ensure we are really changing the status
       if (this.checkNoPerksAllowed() ) {
-        ChatMessage( {content: "No perks activation allowed due to effect !"})
+        await this.updateEmbeddedDocuments('Item', [{ _id: item.id, 'data.status': "ready" }])
+        ChatMessage.create( {content: "No perks activation allowed due to effect !"})
         return
       }
 
@@ -908,7 +909,7 @@ export class PegasusActor extends Actor {
         }
         this.disableWeaverPerk(item)
         PegasusUtility.createChatWithRollMode(item.name, {
-          content: await renderTemplate(`systems/fvtt-pegasus-rpg/templates/chat-perk-ready.html`, { name: this.name, perk: item })
+          content: await renderTemplate(`systems/fvtt-pegasus-rpg/templates/chat-perk-ready.html`, { name: this.name, perk: duplicate(item) })
         })
       }
       if (status == "activated") {
@@ -954,7 +955,7 @@ export class PegasusActor extends Actor {
           await this.update({ 'data.nrg': nrg })
         }
         PegasusUtility.createChatWithRollMode(item.name, {
-          content: await renderTemplate(`systems/fvtt-pegasus-rpg/templates/chat-perk-activated.html`, { name: this.name, perk: item })
+          content: await renderTemplate(`systems/fvtt-pegasus-rpg/templates/chat-perk-activated.html`, { name: this.name, perk: duplicate(item) })
         })
         this.enableWeaverPerk(item)
       }
@@ -1387,7 +1388,7 @@ export class PegasusActor extends Actor {
         if (effect.data.effectstatlevel) {
           effect.data.effectlevel = this.data.data.statistics[effect.data.effectstat].value
         }
-        if (this.getTraumaState() == "none") {
+        if (this.getTraumaState() == "none" && !this.checkNoBonusDice()) {
           rollData.effectsList.push({ label: effect.name, type: "effect", applied: false, effect: effect, value: effect.data.effectlevel })
         } else {
           if (!effect.data.bonusdice) { // Do not push bonus dice effect when TraumaState is activated

modules/pegasus-item.js

@@ -17,6 +17,13 @@ export const defaultItemImg = {
   money: "systems/fvtt-pegasus-rpg/images/icons/icon_money.webp",
   vice: "systems/fvtt-pegasus-rpg/images/icons/icon_vice.webp",
   virtue: "systems/fvtt-pegasus-rpg/images/icons/icon_virtue.webp",
+  vehiclehull:"systems/fvtt-pegasus-rpg/images/icons/icon_vehicule_hull.webp",
+  powercoremodule:"systems/fvtt-pegasus-rpg/images/icons/icon_vehicule_powercore.webp",
+  mobilitymodule: "systems/fvtt-pegasus-rpg/images/icons/icon_vehicle_mobilitymodule.webp",
+  combatmodule: "systems/fvtt-pegasus-rpg/images/icons/icon_vehicule_combatmodule.webp",
+  propulsionmodule: "systems/fvtt-pegasus-rpg/images/icons/icon_vehicle_propulsionmodule.webp",
+  vehiclemodule: "systems/fvtt-pegasus-rpg/images/icons/icon_vehicule_module.webp",
+  vehicleweaponmodule: "systems/fvtt-pegasus-rpg/images/icons/icon_vehicule_combatmodule.webp"
 }
 
 /**

modules/pegasus-utility.js

@@ -35,7 +35,7 @@ export class PegasusUtility {
     PegasusCommands.init();
 
     Handlebars.registerHelper('count', function (list) {
-      return list.length;
+      return (list) ? list.length : 0;
     })
     Handlebars.registerHelper('includes', function (array, val) {
       return array.includes(val);
@@ -443,7 +443,8 @@ export class PegasusUtility {
       'systems/fvtt-pegasus-rpg/templates/partial-actor-status.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'
+      'systems/fvtt-pegasus-rpg/templates/partial-actor-equipment.html',
+      "systems/fvtt-pegasus-rpg/templates/partial-options-vehicle-speed.html"
     ]
     return loadTemplates(templatePaths);
   }

system.json

@@ -180,9 +180,9 @@
   "styles": [
     "styles/simple.css"
   ],
-  "templateVersion": 100,
+  "templateVersion": 103,
   "title": "Pegasus RPG",
   "url": "https://www.uberwald.me/data/files/fvtt-pegasus-rpg",
-  "version": "0.6.10",
+  "version": "0.6.13",
   "background" : "./images/ui/pegasus_welcome_page.webp"
 }

template.json

@@ -339,9 +339,9 @@
       "powercoremodule",
       "mobilitymodule",
       "combatmodule",
+      "propulsionmodule",
       "vehiclemodule",
-      "vehicleweaponmodule",
-      "propulsionmodule"
+      "vehicleweaponmodule"
     ],
     "effect": {
       "type": "",
@@ -512,6 +512,7 @@
       "action": "",
       "type": "",
       "powersource": "",
+      "powerlevel": 0,
       "effects": "",
       "activated": false,
       "purchasedeffects": "",
@@ -600,12 +601,15 @@
       "hulltype": "",
       "hr": 0,
       "man": 0,
-      "vms": 0
+      "vms": 0,
+      "cost": 0
     },
     "powercoremodule": {
       "coretype": "",
       "pc": 0,
-      "nrg": 0
+      "nrg": 0,
+      "cost": 0,
+      "space": 0
     },
     "mobilitymodule": {
       "vehiclecategory": "",
@@ -614,15 +618,21 @@
       "ts_f": "",
       "ts_s": "",
       "ts_r": "",
-      "man": ""
+      "man": "",
+      "cost": 0,
+      "space": 0
     },
     "propulsionmodule": {
       "quality": "",
-      "ad": ""
+      "ad": "",
+      "cost": 0,
+      "space": 0
     },
     "combatmodule": {
       "combattype": "",
-      "fc": ""
+      "fc": "",
+      "cost": 0,
+      "space": 0
     },
     "vehiclemodule": {
       "category": "",
@@ -636,7 +646,9 @@
       "shielddicevalue": "",
       "securitydicevalue": "",
       "range": "",
-      "idr": ""
+      "idr": "",
+      "cost": 0,
+      "space": 0
     },
     "vehicleweaponmodule": {
       "location": "",
@@ -651,7 +663,8 @@
       "range": "",
       "turret": "",
       "linkedweapon": "",
-      "idr": ""
+      "idr": "",
+      "cost": 0
     }
   }
 }

templates/actor-sheet.html

@@ -430,6 +430,9 @@
             <span class="item-field-label-medium">
               <label class="short-label">NRG Spent</label>
             </span>
+            <span class="item-field-label-medium">
+              <label class="short-label">PL</label>
+            </span>
           </li>
 
           {{#each powers as |power key|}}
@@ -469,6 +472,8 @@
               <input type="text" class="padd-right input-numeric-short power-cost-spent"
                 value="{{power.data.costspent}}" data-dtype="Number" />
             </span>
+            
+            <span class="item-field-label-medium">{{power.data.powerlevel}}</span>
 
             <div class="item-filler">&nbsp;</div>
             <div class="item-controls item-controls-fixed">

templates/chat-generic-result.html

@@ -36,10 +36,9 @@
 
         {{#if weaponName}}  
         <li>Weapon : {{weaponName}}</li>
-        Damage Type: Piercing 1
         {{/if}}
         {{#if weapon}}  
-        <li>Damage type : {{weapon.data.damagetype}} {{weapon.data.damagetypelevel}}</li>
+        <li>Damage type : {{weapon.weapon.data.damagetype}} {{weapon.weapon.data.damagetypelevel}}</li>
         {{/if}}
 
         {{#if isResistance}}

templates/item-combatmodule-sheet.html

@@ -34,6 +34,15 @@
               {{/select}}
             </select>           
           </li>          
+
+          <li class="flexrow"><label class="generic-label">Space</label>
+            <input type="text" class="" name="data.space" value="{{data.space}}" data-dtype="Number"/>
+          </li>
+
+          <li class="flexrow"><label class="generic-label">Cost</label>
+            <input type="text" class="" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
+          </li>
+
       </ul>
     </div>
 

templates/item-effect-sheet.html

@@ -40,7 +40,7 @@
             <li class="flexrow"><label class="generic-label">Ignore health penalty?</label>
               <label class="attribute-value checkbox"><input type="checkbox" name="data.ignorehealthpenalty" {{checked data.ignorehealthpenalty}}/></label>
             </li>
-            <li class="flexrow"><label class="generic-label">Is this possible ?</label>
+            <li class="flexrow"><label class="generic-label">Display Text when targetted</label>
               <input type="text" class="padd-right" name="data.isthispossible" value="{{data.isthispossible}}" data-dtype="String"/>
             </li>
             <li class="flexrow"><label class="generic-label">Mental disruption ?</label>
@@ -61,7 +61,7 @@
             <li class="flexrow"><label class="generic-label">No perks allowed ?</label>
               <label class="attribute-value checkbox"><input type="checkbox" name="data.noperksallowed" {{checked data.noperksallowed}}/></label>
             </li>
-            
+
             <li class="flexrow"><label class="generic-label">Effect Level is a Stat?</label>
               <label class="attribute-value checkbox"><input type="checkbox" name="data.effectstatlevel" {{checked data.effectstatlevel}}/></label>
             </li>

templates/item-mobilitymodule-sheet.html

@@ -84,6 +84,13 @@
               {{/select}}
             </select> 
           </li>
+          <li class="flexrow"><label class="generic-label">Space</label>
+            <input type="text" class="" name="data.space" value="{{data.space}}" data-dtype="Number"/>
+          </li>
+
+          <li class="flexrow"><label class="generic-label">Cost</label>
+            <input type="text" class="" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
+          </li>
 
 
       </ul>

templates/item-power-sheet.html

@@ -58,6 +58,11 @@
           <input type="text" class="input-numeric-short padd-right" name="data.costspent" value="{{data.costspent}}"
             data-dtype="Number" />
         </li>
+                
+        <li class="flexrow"><label class="generic-label">Power Level</label>
+          <input type="text" class="input-numeric-short padd-right" name="data.powerlevel" value="{{data.powerlevel}}" data-dtype="Number"/>
+        </li>            
+
         <li class="flexrow"><label class="generic-label">Range</label>
           <select class="competence-base flexrow" type="text" name="data.range" value="{{data.range}}"
             data-dtype="String">

templates/item-powercoremodule-sheet.html

@@ -37,6 +37,13 @@
           <li class="flexrow"><label class="generic-label">NRG</label>
             <input type="text" class="" name="data.nrg" value="{{data.nrg}}" data-dtype="Number"/>
           </li>
+          <li class="flexrow"><label class="generic-label">Space</label>
+            <input type="text" class="" name="data.space" value="{{data.space}}" data-dtype="Number"/>
+          </li>
+
+          <li class="flexrow"><label class="generic-label">Cost</label>
+            <input type="text" class="" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
+          </li>
 
       </ul>
     </div>

templates/item-propulsionmodule-sheet.html

@@ -31,7 +31,15 @@
               {{{optionsDiceList}}}
               {{/select}}
             </select>           
-          </li>          
+          </li>   
+          <li class="flexrow"><label class="generic-label">Space</label>
+            <input type="text" class="" name="data.space" value="{{data.space}}" data-dtype="Number"/>
+          </li>
+
+          <li class="flexrow"><label class="generic-label">Cost</label>
+            <input type="text" class="" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
+          </li>
+
       </ul>
     </div>
 

templates/item-vehiclemodule-sheet.html

@@ -108,6 +108,13 @@
               {{/select}}
             </select> 
           </li>
+          <li class="flexrow"><label class="generic-label">Space</label>
+            <input type="text" class="" name="data.space" value="{{data.space}}" data-dtype="Number"/>
+          </li>
+
+          <li class="flexrow"><label class="generic-label">Cost</label>
+            <input type="text" class="" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
+          </li>
 
         </ul>
     </div>

templates/item-vehicleweaponmodule-sheet.html

@@ -31,10 +31,6 @@
             <input type="text" class="" name="data.size" value="{{data.size}}" data-dtype="Number"/>
           </li>
 
-          <li class="flexrow"><label class="generic-label">Space</label>
-            <input type="text" class="" name="data.space" value="{{data.space}}" data-dtype="Number"/>
-          </li>
-
           <li class="flexrow"><label class="generic-label">Activated ?</label>
             <label class="attribute-value checkbox"><input type="checkbox" name="data.activated" {{checked data.activated}}/></label>
           </li>
@@ -124,6 +120,14 @@
             </select> 
           </li>
 
+          <li class="flexrow"><label class="generic-label">Space</label>
+            <input type="text" class="" name="data.space" value="{{data.space}}" data-dtype="Number"/>
+          </li>
+
+          <li class="flexrow"><label class="generic-label">Cost</label>
+            <input type="text" class="" name="data.cost" value="{{data.cost}}" data-dtype="Number"/>
+          </li>
+
         </ul>
     </div>