Managev9/v10 + search button

modules/pegasus-utility.js

@@ -1210,9 +1210,6 @@ export class PegasusUtility {
     let agitatorTokens = canvas.tokens.placeables.filter(token => token.actor.isAgitator() && !token.document.hidden)
     for (let token of agitatorTokens) {
       token.refresh()
-      if (token.document.disposition == 0) {
-        continue
-      }
       let ennemies = []
       if (token.document.disposition == -1) {
         ennemies = canvas.tokens.placeables.filter(newToken => newToken.actor.type == "character" && !newToken.document.hidden && (newToken.document.disposition == 1 || newToken.document.disposition == 0 ))

modules/pegasus-vehicle-sheet.js

@@ -51,8 +51,8 @@ export class PegasusVehicleSheet extends ActorSheet {
       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()),
+      vehicleModules: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getVehicleModules())),
+      vehicleWeaponModules: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getVehicleWeaponModules())),
       cargos: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getCargos()) ),
       cargoCurrent: this.actor.getCurrentCargoCapacity(),
       moneys: duplicate(this.actor.getMoneys()),
@@ -134,19 +134,7 @@ export class PegasusVehicleSheet extends ActorSheet {
       let itemId = li.data("item-id")
       this.actor.activateVehicleModule( itemId)
     });      
-    
-    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 => {
+        html.find('.effect-used').click(ev => {
       const li = $(ev.currentTarget).parents(".item");
       let itemId = li.data("item-id");
       this.actor.perkEffectUsed( itemId)

system.json

@@ -23,7 +23,7 @@
   "manifest": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/raw/branch/master/system.json",
   "compatibility": {
     "minimum": "10",
-    "verified": "10.285",
+    "verified": "10.286",
     "maximum": "10"
   },
   "id": "fvtt-pegasus-rpg",
@@ -253,7 +253,7 @@
   ],
   "title": "Pegasus RPG",
   "url": "https://www.uberwald.me/data/files/fvtt-pegasus-rpg",
-  "version": "10.1.1",
-  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v10.1.1.zip",
+  "version": "10.1.7",
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-pegasus-rpg/archive/fvtt-pegasus-rpg-v10.1.7.zip",
   "background": "systems/fvtt-pegasus-rpg/images/ui/pegasus_welcome_page.webp"
 }

template.json

@@ -310,6 +310,8 @@
             "topspeed": "",
             "shieldlevel": 0,
             "armourlevel": 0,
+            "maxshieldlevel": 0,
+            "maxarmourlevel": 0,
             "is3D": false
           },
           "reararc": {
@@ -317,13 +319,17 @@
             "topspeed": "",
             "shieldlevel": 0,
             "armourlevel": 0,
-            "is3D": false
+            "maxshieldlevel": 0,
+            "maxarmourlevel": 0,
+            "is3D": false            
           },
           "rightarc": {
             "label": "Right Arc",
             "topspeed": "",
             "shieldlevel": 0,
             "armourlevel": 0,
+            "maxshieldlevel": 0,
+            "maxarmourlevel": 0,
             "is3D": false
           },
           "leftarc": {
@@ -331,6 +337,8 @@
             "topspeed": "",
             "shieldlevel": 0,
             "armourlevel": 0,
+            "maxshieldlevel": 0,
+            "maxarmourlevel": 0,
             "is3D": false
           },
           "toparc": {
@@ -338,6 +346,8 @@
             "topspeed": "",
             "shieldlevel": 0,
             "armourlevel": 0,
+            "maxshieldlevel": 0,
+            "maxarmourlevel": 0,
             "is3D": true
           },
           "bottomarc": {
@@ -345,6 +355,8 @@
             "topspeed": "",
             "shieldlevel": 0,
             "armourlevel": 0,
+            "maxshieldlevel": 0,
+            "maxarmourlevel": 0,
             "is3D": true
           }
         }
@@ -417,6 +429,7 @@
       "affectstatus": false,
       "affectedstatus": "",
       "locked": false,
+      "droptext": "",
       "description": ""
     },
     "race": {

templates/item-effect-sheet.html

@@ -85,7 +85,10 @@
             <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">Display Text when added to Actor</label>
+              <input type="text" class="input-numeric-short padd-right" name="system.droptext" value="{{data.droptext}}" data-dtype="String"/>
+            </li>
+            
             <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>

templates/item-vehicleweaponmodule-sheet.html

@@ -105,8 +105,8 @@
 
 
           <li class="flexrow"><label class="generic-label">Turret</label>
-            <select class="competence-base flexrow" type="text" name="system.turret" value="{{data.turret}}" data-dtype="Number">
-              {{#select data.turret}} F Front, F Left, F Right, F Rear, F Up, F Down, T 180 Front, T 180 Left, T 180 Rear, T 180 Right, T 360
+            <select class="competence-base flexrow" type="text" name="system.turret" value="{{data.turret}}" data-dtype="String">
+              {{#select data.turret}} 
               <option value="ffront">F Front</option>
               <option value="fleft">F Left</option>
               <option value="fright">F Right</option>

templates/partial-vehicle-arc.html

@@ -9,9 +9,15 @@
     <span class="item-field-label-long">
       <label class="short-label">Shield</label>
     </span>
+    <span class="item-field-label-short">
+      <label class="short-label">Max</label>
+    </span>
     <span class="item-field-label-long">
       <label class="short-label">Armour</label>
     </span>
+    <span class="item-field-label-short">
+      <label class="short-label">Max</label>
+    </span>
   </li>
   <li class="item flexrow list-item list-item-shadow" data-arc-name="{{idx}}">
 
@@ -31,16 +37,18 @@
         {{#select arc.shieldlevel}}
         {{{@root.optionsDiceList}}}
         {{/select}}
-        </select>
+      </select>
     </span>
+    <span class="item-field-label-short"><label class="short-label">{{getDice arc.maxshieldlevel}}</label></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>
+      </select>
     </span>
+    <span class="item-field-label-short"><label class="short-label">{{getDice arc.maxarmourlevel}}</label></span>
 
   </li>
 </ul>

templates/partial-vehicle-stat-block.html

@@ -14,7 +14,7 @@
       </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}}
+        {{#select (add stat.level stat.bonuseffect)}}
           {{#if (eq key "ad")}}
             {{{@root.optionsLevel}}}
           {{else}}

templates/vehicle-sheet.html

@@ -456,10 +456,10 @@
           <span class="item-name-label-header-long">
             <h3><label class="items-title-text">Vehicles modules</label></h3>
           </span>
-          <span class="item-field-label-long">
+          <span class="item-field-label-medium">
             <label class="short-label">Category</label>
           </span>
-          <span class="item-field-label-long">
+          <span class="item-field-label-medium">
             <label class="short-label">Location</label>
           </span>
           <span class="item-field-label-long">
@@ -480,12 +480,20 @@
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
               src="{{vehiclemod.img}}" /></a>
           <span class="item-name-label-long"><a class="roll-spec">{{vehiclemod.name}}</a></span>
-          <span class="item-field-label-long">{{vehiclemod.system.category}}</span>
-          <span class="item-field-label-long">{{vehiclemod.system.location}}</span>
+          <span class="item-field-label-medium">{{vehiclemod.system.category}}</span>
+          <span class="item-field-label-medium">{{vehiclemod.system.location}}</span>
           <span class="item-field-label-long">{{vehiclemod.system.security}}</span>
           <span class="item-field-label-short">{{vehiclemod.system.nrg}}</span>
           <span class="item-field-label-medium">{{vehiclemod.system.range}}</span>
-          <span class="item-field-label-short">{{vehiclemod.system.idr}}</span>
+
+          <span class="item-field-label-short">
+              {{#if vehiclemod.system.idrDice}}
+            <a class="roll-idr" data-dice-value="{{vehiclemod.system.idrDice}}">{{vehiclemod.system.idrDice}}</a>
+            {{else}}
+            &nbsp;-&nbsp;
+            {{/if}}
+          </span>
+
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
             <a class="item-control vehicle-module-activate" title="Activated">{{#if vehiclemod.system.activated}}<i
@@ -501,10 +509,10 @@
           <span class="item-name-label-header-long">
             <h3><label class="items-title-text">Vehicles weapons</label></h3>
           </span>
-          <span class="item-field-label-long">
+          <span class="item-field-label-medium">
             <label class="short-label">Site</label>
           </span>
-          <span class="item-field-label-long">
+          <span class="item-field-label-medium">
             <label class="short-label">Location</label>
           </span>
           <span class="item-field-label-short">
@@ -528,13 +536,21 @@
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
               src="{{weapon.img}}" /></a>
           <span class="item-name-label-long"><a class="roll-spec">{{weapon.name}}</a></span>
-          <span class="item-field-label-long">{{weapon.system.site}}</span>
-          <span class="item-field-label-long">{{weapon.system.location}}</span>
+          <span class="item-field-label-medium">{{weapon.system.site}}</span>
+          <span class="item-field-label-medium">{{weapon.system.location}}</span>
           <span class="item-field-label-short">{{weapon.system.dmg}}</span>
           <span class="item-field-label-medium">{{weapon.system.aoe}}</span>
-          <span class="item-field-label-medium">{{weapon.system.turrent}}</span>
+          <span class="item-field-label-medium">{{weapon.system.turret}}</span>
           <span class="item-field-label-short">{{weapon.system.nrg}}</span>
-          <span class="item-field-label-short">{{weapon.system.idr}}</span>
+
+          <span class="item-field-label-short">
+            {{#if weapon.system.idrDice}}
+            <a class="roll-idr" data-dice-value="{{weapon.system.idrDice}}">{{weapon.system.idrDice}}</a>
+            {{else}}
+            &nbsp;-&nbsp;
+            {{/if}}
+          </span>
+
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
             <a class="item-control vehicle-weapon-activate" title="Activated">{{#if weapon.system.activated}}<i