DND5e Core 1.1.1

DND5e Core 1.1.1 with find and replace to SW5e

module/apps/ability-use-dialog.js

@@ -70,7 +70,7 @@ export default class AbilityUseDialog extends Dialog {
       dlg.render(true);
     });
   }
-  
+
   /* -------------------------------------------- */
   /*  Helpers                                     */
   /* -------------------------------------------- */

module/apps/actor-flags.js

@@ -1,9 +1,9 @@
 /**
  * An application class which provides advanced configuration for special character flags which modify an Actor
- * @extends {BaseEntitySheet}
+ * @implements {BaseEntitySheet}
  */
 export default class ActorSheetFlags extends BaseEntitySheet {
-    static get defaultOptions() {
+  static get defaultOptions() {
     const options = super.defaultOptions;
     return mergeObject(options, {
       id: "actor-flags",
@@ -16,22 +16,16 @@ export default class ActorSheetFlags extends BaseEntitySheet {
 
   /* -------------------------------------------- */
 
-  /**
-   * Configure the title of the special traits selection window to include the Actor name
-   * @type {String}
-   */
+  /** @override */
   get title() {
     return `${game.i18n.localize('SW5E.FlagsTitle')}: ${this.object.name}`;
   }
 
   /* -------------------------------------------- */
 
-  /**
-   * Prepare data used to render the special Actor traits selection UI
-   * @return {Object}
-   */
+  /** @override */
   getData() {
-    const data = super.getData();
+    const data = {};
     data.actor = this.object;
     data.flags = this._getFlags();
     data.bonuses = this._getBonuses();
@@ -43,17 +37,18 @@ export default class ActorSheetFlags extends BaseEntitySheet {
   /**
    * Prepare an object of flags data which groups flags by section
    * Add some additional data for rendering
-   * @return {Object}
+   * @return {object}
    */
   _getFlags() {
     const flags = {};
+    const baseData = this.entity._data;
     for ( let [k, v] of Object.entries(CONFIG.SW5E.characterFlags) ) {
       if ( !flags.hasOwnProperty(v.section) ) flags[v.section] = {};
       let flag = duplicate(v);
       flag.type = v.type.name;
       flag.isCheckbox = v.type === Boolean;
       flag.isSelect = v.hasOwnProperty('choices');
-      flag.value = this.entity.getFlag("sw5e", k);
+      flag.value = getProperty(baseData.flags, `sw5e.${k}`);
       flags[v.section][`flags.sw5e.${k}`] = flag;
     }
     return flags;
@@ -63,7 +58,7 @@ export default class ActorSheetFlags extends BaseEntitySheet {
 
   /**
    * Get the bonuses fields and their localization strings
-   * @return {Array}
+   * @return {Array<object>}
    * @private
    */
   _getBonuses() {
@@ -72,27 +67,24 @@ export default class ActorSheetFlags extends BaseEntitySheet {
       {name: "data.bonuses.mwak.damage", label: "SW5E.BonusMWDamage"},
       {name: "data.bonuses.rwak.attack", label: "SW5E.BonusRWAttack"},
       {name: "data.bonuses.rwak.damage", label: "SW5E.BonusRWDamage"},
-      {name: "data.bonuses.mpak.attack", label: "SW5E.BonusMPAttack"},
-      {name: "data.bonuses.mpak.damage", label: "SW5E.BonusMPDamage"},
-      {name: "data.bonuses.rpak.attack", label: "SW5E.BonusRPAttack"},
-      {name: "data.bonuses.rpak.damage", label: "SW5E.BonusRPDamage"},
+      {name: "data.bonuses.msak.attack", label: "SW5E.BonusMSAttack"},
+      {name: "data.bonuses.msak.damage", label: "SW5E.BonusMSDamage"},
+      {name: "data.bonuses.rsak.attack", label: "SW5E.BonusRSAttack"},
+      {name: "data.bonuses.rsak.damage", label: "SW5E.BonusRSDamage"},
       {name: "data.bonuses.abilities.check", label: "SW5E.BonusAbilityCheck"},
       {name: "data.bonuses.abilities.save", label: "SW5E.BonusAbilitySave"},
       {name: "data.bonuses.abilities.skill", label: "SW5E.BonusAbilitySkill"},
       {name: "data.bonuses.power.dc", label: "SW5E.BonusPowerDC"}
     ];
     for ( let b of bonuses ) {
-      b.value = getProperty(this.object.data, b.name) || "";
+      b.value = getProperty(this.object._data, b.name) || "";
     }
     return bonuses;
   }
 
   /* -------------------------------------------- */
 
-  /**
-   * Update the Actor using the configured flags
-   * Remove/unset any flags which are no longer configured
-   */
+  /** @override */
   async _updateObject(event, formData) {
     const actor = this.object;
     let updateData = expandObject(formData);
@@ -103,7 +95,7 @@ export default class ActorSheetFlags extends BaseEntitySheet {
     for ( let [k, v] of Object.entries(flags) ) {
       if ( [undefined, null, "", false, 0].includes(v) ) {
         delete flags[k];
-        if ( hasProperty(actor.data.flags, `sw5e.${k}`) ) {
+        if ( hasProperty(actor._data.flags, `sw5e.${k}`) ) {
           unset = true;
           flags[`-=${k}`] = null;
         }
@@ -118,10 +110,6 @@ export default class ActorSheetFlags extends BaseEntitySheet {
     }
 
     // Diff the data against any applied overrides and apply
-    // TODO: Remove this logical gate once 0.7.x is release channel
-    if ( !isNewerVersion("0.7.1", game.data.version) ){
-      updateData = diffObject(this.object.data, updateData);
-    }
     await actor.update(updateData, {diff: false});
   }
 }

module/apps/movement-config.js

@@ -0,0 +1,32 @@
+/**
+ * A simple form to set actor movement speeds
+ * @implements {BaseEntitySheet}
+ */
+export default class MovementConfig 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,
+      height: "auto"
+    });
+  }
+
+  /* -------------------------------------------- */
+
+  /** @override */
+  getData(options) {
+    const data = {
+      movement: duplicate(this.entity._data.data.attributes.movement),
+      units: CONFIG.SW5E.movementUnits
+    }
+    for ( let [k, v] of Object.entries(data.movement) ) {
+      if ( ["units", "hover"].includes(k) ) continue;
+      data.movement[k] = Number.isNumeric(v) ? v.toNearest(0.1) : 0;
+    }
+    return data;
+  }
+}

module/apps/short-rest.js

@@ -36,7 +36,7 @@ export default class ShortRestDialog extends Dialog {
   /** @override */
   getData() {
     const data = super.getData();
-    
+
     // Determine Hit Dice
     data.availableHD = this.actor.data.items.reduce((hd, item) => {
       if ( item.type === "class" ) {
@@ -49,7 +49,7 @@ export default class ShortRestDialog extends Dialog {
     }, {});
     data.canRoll = this.actor.data.data.attributes.hd > 0;
     data.denomination = this._denom;
-    
+
     // Determine rest type
     const variant = game.settings.get("sw5e", "restVariant");
     data.promptNewDay = variant !== "epic";     // It's never a new day when only resting 1 minute