Merge pull request #1633 from crnormand/main

0.15.7
crnormand · Oct 10, 2022 · b09fa2c · b09fa2c
2 parents b4c0015 + 4a7815c
commit b09fa2c
Show file tree

Hide file tree

Showing 6 changed files with 117 additions and 9 deletions.
diff --git a/changelog.md b/changelog.md
@@ -2,12 +2,19 @@
 
 If you can't access the Google doc, here is a [PDF](https://github.com/crnormand/gurps/raw/main/docs/Guide%20for%20GURPS%204e%20on%20Foundry%20VTT.pdf) of the latest version.
 
+Release 0.15.7
+
+- Fixed chat commands not returning true/false (for use in /if commands)
+- Fixed trackers not setting max value on import.
+- Fixed UI being moved off-screen when expanding damage calculation.
+
 Release 0.15.6
 
 - Fixed GCS 5 import when melee attack has no level.
 - Fixed GCS 5 disad calculations.
 - Added support for /st + standing to allow you to clear other postures (to help supoprt TAH feature)
-
+- Update to JB2A 0.5.0
+
 Release 0.15.5 9/28/2022
 
 - Fixed drag and drop items between non-GM characters

diff --git a/module/actor/actor.js b/module/actor/actor.js
@@ -3436,6 +3436,7 @@ export class GurpsActor extends Actor {
         value = getProperty(this, 'system.' + template.initialValue)
       }
     }
+    template.tracker.max = value
     template.tracker.value = template.tracker.isDamageTracker ? template.tracker.min : value
 
     // remove whatever is there

diff --git a/module/gurps.js b/module/gurps.js
@@ -521,6 +521,7 @@ if (!globalThis.GURPS) {
       // @ts-ignore - someone somewhere must have added chatmsgData to the MouseEvent.
       let ret = await GURPS.ChatProcessors.startProcessingLines(chat, event?.chatmsgData, event)
       if (savedActor) GURPS.SetLastActor(savedActor)
+      return ret
     },
     /**
      * @param {Object} data

diff --git a/system.json b/system.json
@@ -25,10 +25,15 @@
   "compatibility": {
     "minimum": "10",
     "verified": "10.286",
-    "maximum": 10
+    "maximum": "10"
   },
-  "esmodules": ["module/gurps.js", "lib/xregexp-all.js"],
-  "scripts": ["scripts/jquery.tinycolorpicker.js"],
+  "esmodules": [
+    "module/gurps.js",
+    "lib/xregexp-all.js"
+  ],
+  "scripts": [
+    "scripts/jquery.tinycolorpicker.js"
+  ],
   "styles": [
     "styles/simple.css",
     "styles/css_boilerplate.css",
@@ -75,8 +80,8 @@
   "primaryTokenAttribute": "HP",
   "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.6.zip",
+  "manifest": "https://raw.githubusercontent.com/crnormand/gurps/release/system.json",
+  "download": "https://github.com/crnormand/gurps/releases/download/0.15.6/system.zip",
   "socket": true,
   "license": "LICENSE.txt"
-}
+}
diff --git a/utils/JB2A_DnD5e.txt b/utils/JB2A_DnD5e.txt
@@ -288,6 +288,7 @@
 ./Library/Generic/Butterflies/Butterflies_01_Regular_Orange_Many_400x400.webm,width=400
 ./Library/Generic/Butterflies/Butterflies_01_Regular_Orange_Single_400x400.webm,width=400
 ./Library/Generic/Celestial_Bodies/PlanetAtmo_01_Regular_BlueOrange_800x800.webm,width=800
+./Library/Generic/Celestial_Bodies/PlanetAtmo_05_Regular_Red_800x800.webm,width=800
 ./Library/Generic/Celestial_Bodies/PlanetGasGiant_01_Regular_Blue_800x800.webm,width=800
 ./Library/Generic/Celestial_Bodies/PlanetNoAtmo_03_Regular_Grey_800x800.webm,width=800
 ./Library/Generic/Conditions/Dizzy_Stars/DizzyStars_01_BlueOrange_200x200.webm,width=200
@@ -658,6 +659,19 @@
 ./Library/Generic/Nature/GroupVineNatureLoop01_01_Regular_Green_300x300.webm,width=300
 ./Library/Generic/Nature/GroupVineNatureLoop02_01_Regular_Green_300x300.webm,width=300
 ./Library/Generic/Nature/GroupVineNatureLoop03_01_Regular_Green_300x300.webm,width=300
+./Library/Generic/Nature/PlantGrowthRing02_01_Regular_GreenRed_500x500.webm,width=500
+./Library/Generic/Nature/PlantGrowthRing03_01_Regular_GreenYellow_500x500.webm,width=500
+./Library/Generic/Nature/PlantGrowthRingLoop03_01_Regular_GreenYellow_500x500.webm,width=500
+./Library/Generic/Nature/PlantGrowthRingPulse02_01_Regular_GreenRed_500x500.webm,width=500
+./Library/Generic/Nature/PlantGrowthRingPulse03_01_Regular_GreenYellow_500x500.webm,width=500
+./Library/Generic/Nature/PlantGrowthRound03_01_Regular_GreenYellow_300x300.webm,width=500
+./Library/Generic/Nature/PlantGrowthRound03_01_Regular_GreenYellow_500x500.webm,width=500
+./Library/Generic/Nature/PlantGrowthRoundLoop03_01_Regular_GreenYellow_300x300.webm,width=300
+./Library/Generic/Nature/PlantGrowthRoundLoop03_01_Regular_GreenYellow_500x500.webm,width=500
+./Library/Generic/Nature/PlantGrowthSquare03_01_Regular_GreenYellow_300x300.webm,width=300
+./Library/Generic/Nature/PlantGrowthSquare03_01_Regular_GreenYellow_500x500.webm,width=500
+./Library/Generic/Nature/PlantGrowthSquareLoop03_01_Regular_GreenYellow_300x300.webm,width=300
+./Library/Generic/Nature/PlantGrowthSquareLoop03_01_Regular_GreenYellow_500x500.webm,width=500
 ./Library/Generic/Nature/SwirlingLeaves01_01_Regular_GreenOrange_05ft_600x400.webm,width=600
 ./Library/Generic/Nature/SwirlingLeaves01_01_Regular_GreenOrange_15ft_1000x400.webm,width=1000
 ./Library/Generic/Nature/SwirlingLeaves01_01_Regular_GreenOrange_30ft_1600x400.webm,width=1600