Merge pull request #1627 from crnormand/gcs5-items

Updated Item Import for GCS 5

module/actor/actor.js

@@ -526,7 +526,7 @@ export class GurpsActor extends Actor {
 
       for (let enckey in encs) {
         let enc = encs[enckey]
-        let threshold = 10 - (2 * parseInt(enc.level)) // each encumbrance level reduces move by 20%
+        let threshold = 10 - 2 * parseInt(enc.level) // each encumbrance level reduces move by 20%
         threshold /= 10 // JS likes to calculate 0.2*3 = 3.99999, but handles 2*3/10 fine.
         enc.currentmove = this._getCurrentMove(effectiveMove, threshold) //Math.max(1, Math.floor(m * t))
         enc.currentdodge = isNaN(effectiveDodge) ? '–' : Math.max(1, effectiveDodge - parseInt(enc.level))

module/damage/damagechat.js

@@ -487,10 +487,11 @@ export default class DamageChat {
     } else {
       messageData.sound = CONFIG.sounds.dice
     }
-    ChatMessage.create(messageData).then(arg => {
-      let messageId = arg.id // 'qHz1QQuzpJiavH3V'
-      $(`[data-message-id='${messageId}']`).on('click', handleOnPdf)
-    })
+    ChatMessage.create(messageData)
+    // ChatMessage.create(messageData).then(arg => {
+    //   let messageId = arg.id // 'qHz1QQuzpJiavH3V'
+    //   $(`[data-message-id='${messageId}']`).on('click', handleOnPdf)
+    // })
   }
 }
 

module/item-import.js

@@ -20,7 +20,7 @@ export class ItemImporter {
     if (j.type !== 'equipment_list') {
       return ui.notifications.error('The file you uploaded is not a GCS Equipment Library!')
     }
-    if (j.version !== 2) {
+    if (![2, 4].includes(j.version)) {
       return ui.notifications.error('The file you uploaded is not of the right version!')
     }
     let pack = game.packs.find(p => p.metadata.name === filename)

system.json

@@ -2,7 +2,7 @@
   "id": "gurps",
   "title": "GURPS 4e Game Aid (Unofficial)",
   "description": "A game aid to help play GURPS 4e for Foundry VTT",
-  "version": "0.15.5",
+  "version": "0.15.6",
   "authors": [
     {
       "name": "Chris Normand",
@@ -76,7 +76,7 @@
   "secondaryTokenAttribute": "FP",
   "url": "https://github.com/crnormand/gurps",
   "manifest": "https://github.com/crnormand/gurps/releases/latest/download/system.json",
-  "download": "https://github.com/crnormand/gurps/archive/0.15.5.zip",
+  "download": "https://github.com/crnormand/gurps/archive/0.15.6.zip",
   "socket": true,
   "license": "LICENSE.txt"
 }