Merge pull request #59 from crash1115/dev

v0.6.2
crash1115 · Jun 29, 2021 · 3e256bd · 3e256bd
2 parents 65ac15b + d0f1ac6
commit 3e256bd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,8 @@
+# Version 0.6.2
+- Compatibility with Foundry 0.8.8
+- Fixed a bug causing newly created Monster Blocks sheets to be unable to expand properly
+- Fixed a bug causing Macro activities to not save macro names
+
 # Version 0.6.1
 - Compatibility with Foundry 0.8.7
 - Fixed logic that determines which users can perform migrations on which actors. Asst / GM's should be able to do all actors now, and Trusted/Players should be able to do the ones they own.

diff --git a/module.json b/module.json
@@ -6,9 +6,9 @@
   "url": "https://github.com/crash1115/5e-training",
   "readme": "https://github.com/crash1115/5e-training/blob/master/README.md",
   "bugs": "https://github.com/crash1115/5e-training/issues",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "minimumCoreVersion": "0.8.2",
-  "compatibleCoreVersion": "0.8.7",
+  "compatibleCoreVersion": "0.8.8",
   "minimumSystemVersion": "1.3.0",
   "esmodules": [
     "scripts/crash-5e-training.js"
@@ -42,5 +42,5 @@
     }
   ],
   "manifest": "https://raw.githubusercontent.com/crash1115/5e-training/master/module.json",
-  "download": "https://github.com/crash1115/5e-training/releases/download/v0.6.1/5e-training.zip"
+  "download": "https://github.com/crash1115/5e-training/releases/download/v0.6.2/5e-training.zip"
 }
diff --git a/scripts/crash-5e-training.js b/scripts/crash-5e-training.js
@@ -219,8 +219,9 @@ function adjustSheetWidth(app){
   let currentWidth = app.position.width;
   let defaultWidth = app.options.width;
   let sheetIsSmaller = currentWidth < (defaultWidth + game.settings.get("5e-training", "extraSheetWidth"));
+  let sheetIsMonsterBlock = app.options.classes.includes("monsterblock");
 
-  return settingEnabled && sheetHasTab && sheetIsSmaller;
+  return settingEnabled && sheetHasTab && sheetIsSmaller && !sheetIsMonsterBlock;
 }
 
 async function migrateAllActors(){

diff --git a/templates/partials/macro.html b/templates/partials/macro.html
@@ -2,7 +2,7 @@
 <div class="form-group">
   <label for="macroName">{{ localize 'C5ETRAINING.MacroName' }}</label>
   <div class="form-fields">
-    <input type="text" name="macroNameInput" id="macroNameInput" value="{{item.macroName}}">
+    <input type="text" name="macroName" id="macroNameInput" value="{{item.macroName}}">
     <label class="help">
       <i class="fas fa-question-circle"></i>
       <span class="tooltip">{{ localize 'C5ETRAINING.MacroNameInputHelpText' }}</span>