Fix #84

modules/pegasus-actor.js

@@ -771,6 +771,9 @@ export class PegasusActor extends Actor {
     if (this.type == 'character') {
       this.rollMR(true, combatId, combatantId)
     }
+    if (this.type == 'vehicle') {
+      this.rollMR(true, combatId, combatantId)
+    }
     console.log("Init required !!!!")
     return -1;
   }
@@ -1344,6 +1347,7 @@ export class PegasusActor extends Actor {
       this.getTraumaState()
       this.cleanupPerksIfTrauma()
       this.parseStatEffects()
+      this.parseStatusEffects()
     }
   }
 
@@ -1365,6 +1369,37 @@ export class PegasusActor extends Actor {
     }
   }
 
+  /* -------------------------------------------- */
+  parseStatusEffects() {
+    let effects = this.items.filter(effect => effect.type == "effect" && effect.system.affectstatus && (Number(effect.system.effectlevel) > 0) )
+    for (let statusKey in this.system.secondary) {
+      let status = duplicate(this.system.secondary[statusKey])
+      let bonus = 0
+      for (let effect of effects) { 
+        if ( effect.system.affectedstatus && effect.system.affectedstatus == statusKey) {
+          bonus += Number(effect.system.effectlevel)
+        }
+      }
+      if ( bonus != status.bonus) {
+        status.bonus = bonus
+        this.update( { [`system.secondary.${statusKey}`]: status} )
+      }
+    }
+
+    let nrg = duplicate(this.system.nrg)
+    let bonus = 0
+    for (let effect of effects) { 
+      if ( effect.system.affectedstatus && effect.system.affectedstatus == "nrg") {
+        bonus += Number(effect.system.effectlevel)
+      }
+    }
+    if ( bonus != nrg.mod) {
+      nrg.mod = bonus
+      this.update( { [`system.nrg`]: nrg} )
+    }
+
+  }
+
   /* -------------------------------------------- */
   async modStat(key, inc = 1) {
     let stat = duplicate(this.system.statistics[key])
@@ -1887,7 +1922,8 @@ export class PegasusActor extends Actor {
 
   /* -------------------------------------------- */
   async rollMR(isInit = false, combatId = 0, combatantId = 0) {
-    let mr = duplicate(this.system.mr)
+    
+    let mr = duplicate((this.type =="vehicle") ? this.system.statistics.mr : this.system.mr)
     if (mr) {
       mr.dice = PegasusUtility.getDiceFromLevel(mr.value);
 
@@ -2261,12 +2297,12 @@ export class PegasusActor extends Actor {
     if (actor) {
       let stat = this.getStat("hr")
       let rollData = this.getCommonRollData("hr")
+      rollData.isVehicleStun = true
       rollData.mode = "stat"
-      rollData.title = `Stat ${stat.label}`;
+      rollData.title = `Stat ${stat.label}`
 
       this.addVehicleArmors(rollData)
       this.startRoll(rollData)
-      this.modifyVehicleStun(1)
     }
   }
 

modules/pegasus-utility.js

@@ -302,7 +302,7 @@ export class PegasusUtility {
           item = this.actor.items.get(data.uuid)
         }
         let itemFull = await PegasusUtility.searchItem(item)
-        console.log("DROPPED DATA", data.uuid)
+        //console.log("DROPPED DATA", data.uuid)
         if (game.user.isGM || token.actor.isOwner) {
           this.addItemDropToActor(token.actor, itemFull)
         } else {
@@ -575,6 +575,21 @@ export class PegasusUtility {
     return undefined;
   }
 
+  /* -------------------------------------------- */
+  static computeDistance() {
+    let mytarget = game.user.targets.first()
+    console.log("target", mytarget, mytarget)
+    let mytoken = _token
+
+    if (mytarget) {
+      let dist = canvas.grid.measureDistances(
+        [{ ray: new Ray(mytoken.center, mytarget.center) }],
+        { gridSpaces: true });
+      console.log("DIST", dist)
+    } else {
+      console.log("NO TARGET")
+    }
+  }
   /* -------------------------------------------- */
   static getDefenseState(actorId) {
     return this.defenderStore[actorId];
@@ -816,10 +831,13 @@ export class PegasusUtility {
       combat.updateEmbeddedDocuments("Combatant", [{ _id: rollData.combatantId, initiative: rollData.finalScore }])
     }
 
-    // Stun specific -> Suffere a stun level when dmg-res
+    // Stun specific -> Suffer a stun level when dmg-res for character
     if (rollData.subKey && rollData.subKey == "dmg-res") {
       actor.modifyStun(+1)
     }
+    if (rollData.isVehicleStun) {
+      this.modifyVehicleStun(1)
+    }
 
     //this.removeUsedPerkEffects( rollData) // Unused for now
     this.removeOneUseEffects(rollData) // Unused for now

system.json

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

template.json

@@ -154,6 +154,7 @@
           "label": "MR (Initiative)",
           "type": "dice",
           "value": 0,
+          "bonuseffect": 0,
           "mod": 0
         },
         "momentum": {
@@ -412,6 +413,9 @@
       "physicalimmunity": false,
       "nobonusdice": false,
       "noperksallowed": false,
+      "affectstatus": false,
+      "affectedstatus": "",
+      "locked": false,
       "description": ""
     },
     "race": {
@@ -444,7 +448,7 @@
       "perks": [],
       "perksrole": "",
       "description": "",
-      "rolelevel": 0
+      "rolelevel": 1
     },
     "ability": {
       "affectedstat": "str",

templates/actor-sheet.html

@@ -302,18 +302,30 @@
           </li>
 
           {{#each effects as |effect key|}}
-          <li class="item stat flexrow list-item list-item-shadow" data-arme-id="{{effect.id}}"
+          <li class="item stat flexrow list-item list-item-shadow" data-arme-id="{{effect.id}}" data-item-id="{{effect._id}}">
-            data-item-id="{{effect._id}}">
+            {{#if effect.system.locked}}
-            <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+              {{#if @root.isGM}}
-                src="{{effect.img}}" /></a>
+                <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img" src="{{effect.img}}" /></a>
+              {{else}}
+                <img class="sheet-competence-img" src="{{effect.img}}" />
+              {{/if}}
+            {{else}}
+              <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img" src="{{effect.img}}" /></a>
+            {{/if}}
             <span class="item-name-label-long2">{{effect.name}}</span>
             <span class="item-field-label-short">{{effect.system.effectlevel}}</span>
             <span class="item-field-label-short">{{upperFirst effect.system.type}}</span>
-            <span class="item-field-label-short">{{upperFirst effect.datsystema.genre}}</span>
+            <span class="item-field-label-short">{{upperFirst effect.system.genre}}</span>
             <span class="item-field-label-short">{{upper effect.system.stataffected}}</span>
             <div class="item-filler">&nbsp;</div>
             <div class="item-controls item-controls-fixed">
+              {{#if effect.system.locked}}
+                {{#if  @root.isGM}}
                   <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+                {{/if}}
+              {{else}}
+                <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+              {{/if}}
             </div>
           </li>
           {{/each}}

templates/item-effect-sheet.html

@@ -61,11 +61,13 @@
             <li class="flexrow"><label class="generic-label">No perks allowed ?</label>
               <label class="attribute-value checkbox"><input type="checkbox" name="system.noperksallowed" {{checked data.noperksallowed}}/></label>
             </li>
+            <li class="flexrow"><label class="generic-label">Locked (Only GM can change/edit) ?</label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.locked" {{checked data.locked}}/></label>
+            </li>
 
             <li class="flexrow"><label class="generic-label">Effect Level is a Stat?</label>
               <label class="attribute-value checkbox"><input type="checkbox" name="system.effectstatlevel" {{checked data.effectstatlevel}}/></label>
             </li>
-
             {{#if data.effectstatlevel}}
               <li class="flexrow"><label class="generic-label">Stat to use for Effect Level</label>
                 <select class="competence-base flexrow" type="text" name="system.effectstat" value="{{data.effectstat}}" data-dtype="String">
@@ -83,6 +85,23 @@
               </li>              
             {{/if}}
 
+            <li class="flexrow"><label class="generic-label">Affect Status?</label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.affectstatus" {{checked data.affectstatus}}/></label>
+            </li>
+            {{#if data.affectstatus}}
+              <li class="flexrow"><label class="generic-label">Affected status</label>
+                <select class="competence-base flexrow" type="text" name="system.affectedstatus" value="{{data.affectedstatus}}" data-dtype="String">
+                  {{#select data.affectedstatus}}
+                  <option value="health">Health</option>
+                  <option value="delirium">Delirium</option>
+                  <option value="socialhealth">Social Health</option>
+                  <option value="stealthhealth">Stealth Health</option>
+                  <option value="nrg">NRG</option>
+                  {{/select}}
+                </select> 
+              </li>
+            {{/if}}
+
             <li class="flexrow"> <label class="generic-label">Affected Specialisations </label></li>
             <li class="flexrow">
               <ul class="ul-level1">

templates/item-power-sheet.html

@@ -13,16 +13,20 @@
 
     <div class="tab description" data-group="primary" data-tab="description">
       <div class="medium-editor item-text-long-line">
-        <label class="generic-label">Power Ups</label>
+        <label class="generic-label"><strong>Power Ups</strong></label>
           {{editor purchasedeffects target="system.purchasedeffects" button=true owner=owner
           editable=editable}}
       </div>
+      <span><label>&nbsp;</label></span>
+      <hr>
       <div class="long-editor item-text-long-line">
-        <label class="generic-label">Description</label>
+        <label class="generic-label"><strong>Description</strong></label>
         {{editor description target="system.description" button=true owner=owner editable=editable}}
       </div>
+      <span><label>&nbsp;</label></span>
+      <hr>
       <div class="medium-editor item-text-long-line">
-        <label class="generic-label">Available Upgrades</label>
+        <label class="generic-label"><strong>Available Upgrades</strong></label>
         {{editor effects target="system.effects" button=true owner=owner editable=editable}}
       </div>
     </div>
@@ -30,8 +34,8 @@
     <div class="tab details" data-group="primary" data-tab="details">
       <ul>
         <li class="flexrow"><label class="generic-label">Roll Needed ?</label>
-          <label class="attribute-value checkbox"><input type="checkbox" name="system.rollneeded" {{checked
+          <label class="attribute-value checkbox">
-              data.rollneeded}} /></label>
+          <input type="checkbox" name="system.rollneeded" {{checked data.rollneeded}} /></label>
         </li>
         {{#if data.rollneeded}}
         <li class="flexrow"><label class="generic-label">Related Statistic (only if roll is needed)</label>

templates/partial-actor-status.html

@@ -18,7 +18,7 @@
         </label>
       </span>
       <input type="text" class="padd-right status-small-label no-grow" name="system.secondary.{{key}}.value" value="{{stat2.value}}" data-dtype="Number"/>
-      <input type="text" class="padd-right status-small-label no-grow" name="system.secondary.{{key}}.bonus" value="{{stat2.bonus}}" data-dtype="Number"/>
+      <input type="text" class="padd-right status-small-label no-grow" name="system.secondary.{{key}}.bonus" value="{{stat2.bonus}}" data-dtype="Number" disabled/>
       <input type="text" class="padd-right status-small-label no-grow" name="system.secondary.{{key}}.max" value="{{stat2.max}}" data-dtype="Number"/>
     </li>
   {{/each}}
@@ -27,7 +27,7 @@
       <label class="status-small-label"><strong>{{data.nrg.label}}</strong></label>               
     </span>
     <input type="text" class="padd-right status-small-label no-grow" name="system.nrg.value" value="{{data.nrg.value}}" data-dtype="Number"/>
-    <input type="text" class="padd-right status-small-label no-grow" name="system.nrg.mod" value="{{data.nrg.mod}}" data-dtype="Number"/>
+    <input type="text" class="padd-right status-small-label no-grow" name="system.nrg.mod" value="{{data.nrg.mod}}" data-dtype="Number" disabled/>
     <input type="text" class="padd-right status-small-label no-grow" name="system.nrg.max" value="{{data.nrg.max}}" data-dtype="Number"/>
     <span class="small-label status-small-label">&nbsp;/ {{data.nrg.absolutemax}}</span>
   </li>

templates/roll-dialog-generic.html

@@ -119,10 +119,9 @@
           <option value="d4">Slight cover d4</option>
           <option value="d8">Half cover d8</option>
           <option value="d12">Full cover d12</option>
-          <option value="d12">Full cover d12</option>
           <option value="none2">===== Cover Damage Resistance</option>
           <option value="d4">Soft cover d4</option>
-          <option value="d6">Dense cover d16</option>
+          <option value="d6">Dense cover d6</option>
           <option value="d8">Light cover d8</option>
           <option value="d10">Thick cover d10</option>
           <option value="d12">Solid cover d12</option>
@@ -131,7 +130,7 @@
           <option value="d6">Outnumbered 2 Extra Allies d6</option>
           <option value="d8">Outnumbered 3 Extra Allies d8</option>
           <option value="d10">Outnumbered 4 Extra Allies d10</option>
-          <option value="d12">Outnumbered 5 Extra Allies d1<option>
+          <option value="d12">Outnumbered 5 Extra Allies d12<option>
           <option value="none4">===== Called DMG Shot Bonus</option>
           <option value="d12">Eyes/head d12<option>
           <option value="none4">===== Impact DMG Bonus</option>