Merge pull request #2014 from crnormand/feature/warlock_knight

Feature/warlock knight

changelog.md

@@ -2,6 +2,10 @@
 
 Release 0.17.14
 
+- Bugfix: Size modifier is not being imported.
+- Bugfix: `system.equippedparry` and `system.equippedblock` now return the *best* value, not the first.
+- Feature: Hit locations and trackers can be referenced by name (for macros). Eg. `system.hitlocationNames['Torso'].import` and `system.trackersByName['Control Points'].value`.
+
 Release 0.17.13 10/12/2024
 
 - Bugfix: fix switching target in the effect modifier window. #1992 (user @StefanLang)

lib/utilities.js

@@ -21,14 +21,14 @@ structure that can be displayed with the following:
   data.posturemods = makeSelect(GURPS.CoverPostureModifiers);
 
   <select id="modposture">
-	<option>{{posturemods.title}}</option>
-	{{#each posturemods.groups}}
-	  <optgroup label="{{this.group}}">
-	  {{#each this.options}}
-		<option value="{{this}}">{{this}}</option>
-	  {{/each}}
-	  </optgroup>
-	{{/each}}
+  <option>{{posturemods.title}}</option>
+  {{#each posturemods.groups}}
+    <optgroup label="{{this.group}}">
+    {{#each this.options}}
+    <option value="{{this}}">{{this}}</option>
+    {{/each}}
+    </optgroup>
+  {{/each}}
   </select>
 */
 /**
@@ -137,7 +137,7 @@ export function isNiceDiceEnabled() {
   let niceDice = false
   try {
     niceDice = !!game.settings.get('dice-so-nice', 'settings') // no longer have the enabled flag
-  } catch {}
+  } catch { }
   return niceDice
 }
 
@@ -265,7 +265,7 @@ export function convertRollStringToArrayOfInt(text) {
 export function recurselist(list, fn, parentkey = '', depth = 0) {
   if (!!list)
     for (const [key, value] of Object.entries(list)) {
-      if (fn(value, parentkey + key, depth) != false) {
+      if (fn(value, parentkey + key, depth) !== false) {
         recurselist(value.contains, fn, parentkey + key + '.contains.', depth + 1)
         recurselist(value.collapsed, fn, parentkey + key + '.collapsed.', depth + 1)
       }
@@ -587,13 +587,13 @@ export function makeElementDraggable(element, type, cssClass, payload, dragImage
 
 export function arrayBuffertoBase64(buffer) {
   /*  var binary = ''
-	var bytes = new Uint8Array(buffer)
-	var len = bytes.byteLength
-	for (var i = 0; i < len; i++) {
-	  binary += String.fromCharCode(bytes[i])
-	}
-	return binary
-	*/
+  var bytes = new Uint8Array(buffer)
+  var len = bytes.byteLength
+  for (var i = 0; i < len; i++) {
+    binary += String.fromCharCode(bytes[i])
+  }
+  return binary
+  */
   // User fixc for UTF characers on Mac and Linux hosts
   return new TextDecoder().decode(buffer)
 }

module/actor/actor-importer.js

@@ -1644,7 +1644,7 @@ export class ActorImporter {
     ts.eyes = p.eyes || ''
     ts.hair = p.hair || ''
     ts.skin = p.skin || ''
-    ts.sizeod = p.SM || '+0'
+    ts.sizemod = p.SM || '+0'
 
     const r = {
       'system.-=traits': null,