Update Core to 1.2

Update Core to 1.2, pulled from dev 12/10/2020

module/apps/ability-use-dialog.js

@@ -34,15 +34,19 @@ export default class AbilityUseDialog extends Dialog {
     const quantity = itemData.quantity || 0;
     const recharge = itemData.recharge || {};
     const recharges = !!recharge.value;
+    const sufficientUses = (quantity > 0 && !uses.value) || uses.value > 0; 
 
     // Prepare dialog form data
     const data = {
       item: item.data,
       title: game.i18n.format("SW5E.AbilityUseHint", item.data),
       note: this._getAbilityUseNote(item.data, uses, recharge),
-      hasLimitedUses: uses.max || recharges,
-      canUse: recharges ? recharge.charged : (quantity > 0 && !uses.value) || uses.value > 0,
-      hasPlaceableTemplate: game.user.can("TEMPLATE_CREATE") && item.hasAreaTarget,
+      consumePowerSlot: false,
+      consumeRecharge: recharges,
+      consumeResource: !!itemData.consume.target,
+      consumeUses: uses.max,
+      canUse: recharges ? recharge.charged : sufficientUses,
+      createTemplate: game.user.can("TEMPLATE_CREATE") && item.hasAreaTarget,
       errors: []
     };
     if ( item.data.type === "power" ) this._getPowerData(actorData, itemData, data);
@@ -50,7 +54,7 @@ export default class AbilityUseDialog extends Dialog {
     // Render the ability usage template
     const html = await renderTemplate("systems/sw5e/templates/apps/ability-use.html", data);
 
-    // Create the Dialog and return as a Promise
+    // Create the Dialog and return data as a Promise
     const icon = data.isPower ? "fa-magic" : "fa-fist-raised";
     const label = game.i18n.localize("SW5E.AbilityUse" + (data.isPower ? "Cast" : "Use"));
     return new Promise((resolve) => {
@@ -61,7 +65,10 @@ export default class AbilityUseDialog extends Dialog {
           use: {
             icon: `<i class="fas ${icon}"></i>`,
             label: label,
-            callback: html => resolve(new FormData(html[0].querySelector("form")))
+            callback: html => {
+              const fd = new FormDataExtended(html[0].querySelector("form"));
+              resolve(fd.toObject());
+            }
           }
         },
         default: "use",
@@ -83,11 +90,11 @@ export default class AbilityUseDialog extends Dialog {
 
     // Determine whether the power may be up-cast
     const lvl = itemData.level;
-    const canUpcast = (lvl > 0) && CONFIG.SW5E.powerUpcastModes.includes(itemData.preparation.mode);
+    const consumePowerSlot = (lvl > 0) && CONFIG.SW5E.powerUpcastModes.includes(itemData.preparation.mode);
 
     // If can't upcast, return early and don't bother calculating available power slots
-    if (!canUpcast) {
-      data = mergeObject(data, { isPower: true, canUpcast });
+    if (!consumePowerSlot) {
+      mergeObject(data, { isPower: true, consumePowerSlot });
       return;
     }
 
@@ -122,7 +129,7 @@ export default class AbilityUseDialog extends Dialog {
     const canCast = powerLevels.some(l => l.hasSlots);
 
     // Return merged data
-    data = mergeObject(data, { isPower: true, canUpcast, powerLevels });
+    data = mergeObject(data, { isPower: true, consumePowerSlot, powerLevels });
     if ( !canCast ) data.errors.push("SW5E.PowerCastNoSlots");
   }
 

module/apps/movement-config.js

@@ -2,21 +2,27 @@
  * A simple form to set actor movement speeds
  * @implements {BaseEntitySheet}
  */
-export default class MovementConfig extends BaseEntitySheet {
+export default class ActorMovementConfig extends BaseEntitySheet {
 
   /** @override */
 	static get defaultOptions() {
 	  return mergeObject(super.defaultOptions, {
-	    title: "SW5E.MovementConfig",
       classes: ["sw5e"],
       template: "systems/sw5e/templates/apps/movement-config.html",
-      width: 240,
+      width: 300,
       height: "auto"
     });
   }
 
   /* -------------------------------------------- */
 
+  /** @override */
+  get title() {
+    return `${game.i18n.localize("SW5E.MovementConfig")}: ${this.entity.name}`;
+  }
+
+  /* -------------------------------------------- */
+
   /** @override */
   getData(options) {
     const data = {

module/apps/senses-config.js

@@ -0,0 +1,43 @@
+/**
+ * A simple form to set actor movement speeds
+ * @implements {BaseEntitySheet}
+ */
+export default class ActorSensesConfig extends BaseEntitySheet {
+
+  /** @override */
+	static get defaultOptions() {
+	  return mergeObject(super.defaultOptions, {
+      classes: ["sw5e"],
+      template: "systems/sw5e/templates/apps/senses-config.html",
+      width: 300,
+      height: "auto"
+    });
+  }
+
+  /* -------------------------------------------- */
+
+  /** @override */
+  get title() {
+    return `${game.i18n.localize("SW5E.SensesConfig")}: ${this.entity.name}`;
+  }
+
+  /* -------------------------------------------- */
+
+  /** @override */
+  getData(options) {
+    const senses = this.entity._data.data.attributes?.senses ?? {};
+    const data = {
+      senses: {},
+      special: senses.special ?? "",
+      units: senses.units, movementUnits: CONFIG.SW5E.movementUnits
+    };
+    for ( let [name, label] of Object.entries(CONFIG.SW5E.senses) ) {
+      const v = senses[name];
+      data.senses[name] = {
+        label: game.i18n.localize(label),
+        value: Number.isNumeric(v) ? v.toNearest(0.1) : 0
+      }
+    }
+    return data;
+  }
+}

module/apps/trait-selector.js

@@ -36,8 +36,8 @@ export default class TraitSelector extends FormApplication {
   getData() {
 
     // Get current values
-    let attr = getProperty(this.object._data, this.attribute) || {};
-    attr.value = attr.value || [];
+    let attr = getProperty(this.object._data, this.attribute);
+    if ( getType(attr) !== "Object" ) attr = {value: [], custom: ""};
 
 	  // Populate choices
     const choices = duplicate(this.options.choices);
@@ -85,4 +85,4 @@ export default class TraitSelector extends FormApplication {
     // Update the object
     this.object.update(updateData);
   }
-}
+}