Updating to Push Class skills on level up

Update from DND5E beta for Class Skills on level up and other various fixups

module/apps/ability-use-dialog.js

@@ -51,8 +51,8 @@ export default class AbilityUseDialog extends Dialog {
     const html = await renderTemplate("systems/sw5e/templates/apps/ability-use.html", data);
 
     // Create the Dialog and return as a Promise
-    const icon = data.hasPowerSlots ? "fa-magic" : "fa-fist-raised";
-    const label = game.i18n.localize("SW5E.AbilityUse" + (data.hasPowerSlots ? "Cast" : "Use"));
+    const icon = data.isPower ? "fa-magic" : "fa-fist-raised";
+    const label = game.i18n.localize("SW5E.AbilityUse" + (data.isPower ? "Cast" : "Use"));
     return new Promise((resolve) => {
       const dlg = new this(item, {
         title: `${item.name}: Usage Configuration`,
@@ -85,6 +85,12 @@ export default class AbilityUseDialog extends Dialog {
     const lvl = itemData.level;
     const canUpcast = (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 });
+      return;
+    }
+
     // Determine the levels which are feasible
     let lmax = 0;
     const powerLevels = Array.fromRange(10).reduce((arr, i) => {
@@ -97,7 +103,7 @@ export default class AbilityUseDialog extends Dialog {
       arr.push({
         level: i,
         label: i > 0 ? game.i18n.format('SW5E.PowerLevelSlot', {level: label, n: slots}) : label,
-        canCast: canUpcast && (max > 0),
+        canCast: max > 0,
         hasSlots: slots > 0
       });
       return arr;
@@ -109,14 +115,14 @@ export default class AbilityUseDialog extends Dialog {
       powerLevels.push({
         level: 'pact',
         label: `${game.i18n.format('SW5E.PowerLevelPact', {level: pact.level, n: pact.value})}`,
-        canCast: canUpcast,
+        canCast: true,
         hasSlots: pact.value > 0
       });
     }
     const canCast = powerLevels.some(l => l.hasSlots);
 
     // Return merged data
-    data = mergeObject(data, { hasPowerSlots: true, canUpcast, powerLevels });
+    data = mergeObject(data, { isPower: true, canUpcast, powerLevels });
     if ( !canCast ) data.errors.push("SW5E.PowerCastNoSlots");
   }
 

module/apps/power-cast-dialog.js

@@ -1,102 +0,0 @@
-/**
- * A specialized Dialog subclass for casting a power item at a certain level
- * @type {Dialog}
- */
-export class PowerCastDialog extends Dialog {
-  constructor(actor, item, dialogData={}, options={}) {
-    super(dialogData, options);
-    this.options.classes = ["sw5e", "dialog"];
-
-    /**
-     * Store a reference to the Actor entity which is casting the power
-     * @type {Actor5e}
-     */
-    this.actor = actor;
-
-    /**
-     * Store a reference to the Item entity which is the power being cast
-     * @type {Item5e}
-     */
-    this.item = item;
-  }
-
-  /* -------------------------------------------- */
-  /*  Rendering                                   */
-  /* -------------------------------------------- */
-
-  /**
-   * A constructor function which displays the Power Cast Dialog app for a given Actor and Item.
-   * Returns a Promise which resolves to the dialog FormData once the workflow has been completed.
-   * @param {Actor5e} actor
-   * @param {Item5e} item
-   * @return {Promise}
-   */
-  static async create(actor, item) {
-    const ad = actor.data.data;
-    const id = item.data.data;
-
-    // Determine whether the power may be upcast
-    const lvl = id.level;
-    const canUpcast = (lvl > 0) && CONFIG.SW5E.powerUpcastModes.includes(id.preparation.mode);
-
-    // Determine the levels which are feasible
-    let lmax = 0;
-    const powerLevels = Array.fromRange(10).reduce((arr, i) => {
-      if ( i < lvl ) return arr;
-      const l = ad.powers["power"+i] || {max: 0, override: null};
-      let max = parseInt(l.override || l.max || 0);
-      let slots = Math.clamped(parseInt(l.value || 0), 0, max);
-      if ( max > 0 ) lmax = i;
-      arr.push({
-        level: i,
-        label: i > 0 ? `${CONFIG.SW5E.powerLevels[i]} (${slots} Slots)` : CONFIG.SW5E.powerLevels[i],
-        canCast: canUpcast && (max > 0),
-        hasSlots: slots > 0
-      });
-      return arr;
-    }, []).filter(sl => sl.level <= lmax);
-
-    const pact = ad.powers.pact;
-    if (pact.level >= lvl) {
-      // If this character has pact slots, present them as an option for
-      // casting the power.
-      powerLevels.push({
-        level: 'pact',
-        label: game.i18n.localize('SW5E.PowerLevelPact')
-          + ` (${game.i18n.localize('SW5E.Level')} ${pact.level}) `
-          + `(${pact.value} ${game.i18n.localize('SW5E.Slots')})`,
-        canCast: canUpcast,
-        hasSlots: pact.value > 0
-      });
-    }
-
-    const canCast = powerLevels.some(l => l.hasSlots);
-
-    // Render the Power casting template
-    const html = await renderTemplate("systems/sw5e/templates/apps/power-cast.html", {
-      item: item.data,
-      canCast: canCast,
-      canUpcast: canUpcast,
-      powerLevels,
-      hasPlaceableTemplate: game.user.can("TEMPLATE_CREATE") && item.hasAreaTarget
-    });
-
-    // Create the Dialog and return as a Promise
-    return new Promise((resolve, reject) => {
-      const dlg = new this(actor, item, {
-        title: `${item.name}: Power Configuration`,
-        content: html,
-        buttons: {
-          cast: {
-            icon: '<i class="fas fa-magic"></i>',
-            label: "Cast",
-            callback: html => resolve(new FormData(html[0].querySelector("#power-config-form")))
-          }
-        },
-        default: "cast",
-        close: reject
-      });
-      dlg.render(true);
-    });
-  }
-}