Update Core 1.2.2

Update core to 1.2.2.  Sheets are broken

module/actor/sheets/newSheet/base.js

@@ -119,22 +119,44 @@ export default class ActorSheet5e extends ActorSheet {
   /* -------------------------------------------- */
 
   /**
-   * Prepare the display of movement speed data for the Actor
-   * @param {object} actorData
+   * Prepare the display of movement speed data for the Actor*
+   * @param {object} actorData                The Actor data being prepared.
+   * @param {boolean} [largestPrimary=false]  Show the largest movement speed as "primary", otherwise show "walk"
    * @returns {{primary: string, special: string}}
    * @private
    */
-  _getMovementSpeed(actorData) {
+  _getMovementSpeed(actorData, largestPrimary=false) {
     const movement = actorData.data.attributes.movement || {};
-    const speeds = [
+
+    // Prepare an array of available movement speeds
+    let speeds = [
       [movement.burrow, `${game.i18n.localize("SW5E.MovementBurrow")} ${movement.burrow}`],
       [movement.climb, `${game.i18n.localize("SW5E.MovementClimb")} ${movement.climb}`],
       [movement.fly, `${game.i18n.localize("SW5E.MovementFly")} ${movement.fly}` + (movement.hover ? ` (${game.i18n.localize("SW5E.MovementHover")})` : "")],
       [movement.swim, `${game.i18n.localize("SW5E.MovementSwim")} ${movement.swim}`]
-    ].filter(s => !!s[0]).sort((a, b) => b[0] - a[0]);
-    return {
-      primary: `${movement.walk || 0} ${movement.units}`,
-      special: speeds.length ? speeds.map(s => s[1]).join(", ") : ""
+    ]
+    if ( largestPrimary ) {
+      speeds.push([movement.walk, `${game.i18n.localize("SW5E.MovementWalk")} ${movement.walk}`]);
+    }
+
+    // Filter and sort speeds on their values
+    speeds = speeds.filter(s => !!s[0]).sort((a, b) => b[0] - a[0]);
+
+    // Case 1: Largest as primary
+    if ( largestPrimary ) {
+      let primary = speeds.shift();
+      return {
+        primary: `${primary ? primary[1] : "0"} ${movement.units}`,
+        special: speeds.map(s => s[1]).join(", ")
+      }
+    }
+
+    // Case 2: Walk as primary
+    else {
+      return {
+        primary: `${movement.walk || 0} ${movement.units}`,
+        special: speeds.length ? speeds.map(s => s[1]).join(", ") : ""
+      }
     }
   }
 
@@ -352,7 +374,7 @@ export default class ActorSheet5e extends ActorSheet {
       1: '<i class="fas fa-check"></i>',
       2: '<i class="fas fa-check-double"></i>'
     };
-    return icons[level];
+    return icons[level] || icons[0];
   }
 
   /* -------------------------------------------- */

module/actor/sheets/newSheet/character.js

@@ -57,6 +57,9 @@ export default class ActorSheet5eCharacterNew extends ActorSheet5e {
     // Experience Tracking
     sheetData["disableExperience"] = game.settings.get("sw5e", "disableExperienceTracking");
     sheetData["classLabels"] = this.actor.itemTypes.class.map(c => c.name).join(", ");
+    sheetData["multiclassLabels"] = this.actor.itemTypes.class.map(c => {
+      return [c.data.data.archetype, c.name, c.data.data.levels].filterJoin(' ')
+    }).join(', ');
 
     // Return data for rendering
     return sheetData;
@@ -86,6 +89,18 @@ export default class ActorSheet5eCharacterNew extends ActorSheet5e {
       // Item details
       item.img = item.img || DEFAULT_TOKEN;
       item.isStack = Number.isNumeric(item.data.quantity) && (item.data.quantity !== 1);
+      item.attunement = {
+        [CONFIG.SW5E.attunementTypes.REQUIRED]: {
+          icon: "fa-sun",
+          cls: "not-attuned",
+          title: "SW5E.AttunementRequired"
+        },
+        [CONFIG.SW5E.attunementTypes.ATTUNED]: {
+          icon: "fa-sun",
+          cls: "attuned",
+          title: "SW5E.AttunementAttuned"
+        }
+      }[item.data.attunement];
 
       // Item usage
       item.hasUses = item.data.uses && (item.data.uses.max > 0);

module/actor/sheets/newSheet/npc.js

@@ -115,7 +115,7 @@ export default class ActorSheet5eNPCNew extends ActorSheet5e {
   /** @override */
 	activateListeners(html) {
     super.activateListeners(html);
-    html.find(".health .rollable").click(this._onRollHealthFormula.bind(this));
+    html.find(".health .rollable").click(this._onRollHPFormula.bind(this));
   }
 
   /* -------------------------------------------- */
@@ -125,7 +125,7 @@ export default class ActorSheet5eNPCNew extends ActorSheet5e {
    * @param {Event} event     The original click event
    * @private
    */
-  _onRollHealthFormula(event) {
+  _onRollHPFormula(event) {
     event.preventDefault();
     const formula = this.actor.data.data.attributes.hp.formula;
     if ( !formula ) return;

module/actor/sheets/newSheet/vehicle.js

@@ -56,6 +56,13 @@ export default class ActorSheet5eVehicle extends ActorSheet5e {
 
   /* -------------------------------------------- */
 
+  /** @override */
+  _getMovementSpeed(actorData, largestPrimary=true) {
+    return super._getMovementSpeed(actorData, largestPrimary);
+  }
+
+  /* -------------------------------------------- */
+
   /**
    * Prepare items that are mounted to a vehicle and require one or more crew
    * to operate.
@@ -86,13 +93,6 @@ export default class ActorSheet5eVehicle extends ActorSheet5e {
 
   /* -------------------------------------------- */
 
-  /** @override */
-  _getMovementSpeed(actorData) {
-    return {primary: "", special: ""};
-  }
-
-  /* -------------------------------------------- */
-
   /**
    * Organize Owned Items for rendering the Vehicle sheet.
    * @private

module/actor/sheets/oldSheets/base.js

@@ -119,22 +119,44 @@ export default class ActorSheet5e extends ActorSheet {
   /* -------------------------------------------- */
 
   /**
-   * Prepare the display of movement speed data for the Actor
-   * @param {object} actorData
+   * Prepare the display of movement speed data for the Actor*
+   * @param {object} actorData                The Actor data being prepared.
+   * @param {boolean} [largestPrimary=false]  Show the largest movement speed as "primary", otherwise show "walk"
    * @returns {{primary: string, special: string}}
    * @private
    */
-  _getMovementSpeed(actorData) {
+  _getMovementSpeed(actorData, largestPrimary=false) {
     const movement = actorData.data.attributes.movement || {};
-    const speeds = [
+
+    // Prepare an array of available movement speeds
+    let speeds = [
       [movement.burrow, `${game.i18n.localize("SW5E.MovementBurrow")} ${movement.burrow}`],
       [movement.climb, `${game.i18n.localize("SW5E.MovementClimb")} ${movement.climb}`],
       [movement.fly, `${game.i18n.localize("SW5E.MovementFly")} ${movement.fly}` + (movement.hover ? ` (${game.i18n.localize("SW5E.MovementHover")})` : "")],
       [movement.swim, `${game.i18n.localize("SW5E.MovementSwim")} ${movement.swim}`]
-    ].filter(s => !!s[0]).sort((a, b) => b[0] - a[0]);
-    return {
-      primary: `${movement.walk || 0} ${movement.units}`,
-      special: speeds.length ? speeds.map(s => s[1]).join(", ") : ""
+    ]
+    if ( largestPrimary ) {
+      speeds.push([movement.walk, `${game.i18n.localize("SW5E.MovementWalk")} ${movement.walk}`]);
+    }
+
+    // Filter and sort speeds on their values
+    speeds = speeds.filter(s => !!s[0]).sort((a, b) => b[0] - a[0]);
+
+    // Case 1: Largest as primary
+    if ( largestPrimary ) {
+      let primary = speeds.shift();
+      return {
+        primary: `${primary ? primary[1] : "0"} ${movement.units}`,
+        special: speeds.map(s => s[1]).join(", ")
+      }
+    }
+
+    // Case 2: Walk as primary
+    else {
+      return {
+        primary: `${movement.walk || 0} ${movement.units}`,
+        special: speeds.length ? speeds.map(s => s[1]).join(", ") : ""
+      }
     }
   }
 
@@ -352,7 +374,7 @@ export default class ActorSheet5e extends ActorSheet {
       1: '<i class="fas fa-check"></i>',
       2: '<i class="fas fa-check-double"></i>'
     };
-    return icons[level];
+    return icons[level] || icons[0];
   }
 
   /* -------------------------------------------- */

module/actor/sheets/oldSheets/character.js

@@ -46,6 +46,9 @@ export default class ActorSheet5eCharacter extends ActorSheet5e {
     // Experience Tracking
     sheetData["disableExperience"] = game.settings.get("sw5e", "disableExperienceTracking");
     sheetData["classLabels"] = this.actor.itemTypes.class.map(c => c.name).join(", ");
+    sheetData["multiclassLabels"] = this.actor.itemTypes.class.map(c => {
+      return [c.data.data.archetype, c.name, c.data.data.levels].filterJoin(' ')
+    }).join(', ');
 
     // Return data for rendering
     return sheetData;
@@ -76,12 +79,12 @@ export default class ActorSheet5eCharacter extends ActorSheet5e {
       item.img = item.img || DEFAULT_TOKEN;
       item.isStack = Number.isNumeric(item.data.quantity) && (item.data.quantity !== 1);
       item.attunement = {
-        1: {
+        [CONFIG.SW5E.attunementTypes.REQUIRED]: {
           icon: "fa-sun",
           cls: "not-attuned",
           title: "SW5E.AttunementRequired"
         },
-        2: {
+        [CONFIG.SW5E.attunementTypes.ATTUNED]: {
           icon: "fa-sun",
           cls: "attuned",
           title: "SW5E.AttunementAttuned"

module/actor/sheets/oldSheets/vehicle.js

@@ -56,6 +56,13 @@ export default class ActorSheet5eVehicle extends ActorSheet5e {
 
   /* -------------------------------------------- */
 
+  /** @override */
+  _getMovementSpeed(actorData, largestPrimary=true) {
+    return super._getMovementSpeed(actorData, largestPrimary);
+  }
+
+  /* -------------------------------------------- */
+
   /**
    * Prepare items that are mounted to a vehicle and require one or more crew
    * to operate.
@@ -86,13 +93,6 @@ export default class ActorSheet5eVehicle extends ActorSheet5e {
 
   /* -------------------------------------------- */
 
-  /** @override */
-  _getMovementSpeed(actorData) {
-    return {primary: "", special: ""};
-  }
-
-  /* -------------------------------------------- */
-
   /**
    * Organize Owned Items for rendering the Vehicle sheet.
    * @private