Merge pull request foundryvtt#3928 from foundryvtt/activity/other-for…

…mula

[foundryvtt#1964] Add arbitrary roll to `UtilityActivity`

lang/en.json

@@ -2323,7 +2323,20 @@
 },
 
 "DND5E.UTILITY": {
-  "Title": "Utility"
+  "Title": "Utility",
+  "FIELDS": {
+    "roll": {
+      "label": "Utility Roll",
+      "formula": {
+        "label": "Roll Formula",
+        "hint": "Formula for an arbitrary roll."
+      },
+      "name": {
+        "label": "Roll Label",
+        "hint": "Display name for the rolling button."
+      }
+    }
+  }
 },
 
 "DND5E.Vehicle": "Vehicle",

module/applications/activity/_module.mjs

@@ -1,5 +1,6 @@
 export {default as ActivitySheet} from "./activity-sheet.mjs";
 export {default as AttackSheet} from "./attack-sheet.mjs";
 export {default as SummonSheet} from "./summon-sheet.mjs";
+export {default as UtilitySheet} from "./utility-sheet.mjs";
 
 export {default as ActivityUsageDialog} from "./activity-usage-dialog.mjs";

module/applications/activity/utility-sheet.mjs

@@ -0,0 +1,23 @@
+import ActivitySheet from "./activity-sheet.mjs";
+
+/**
+ * Sheet for the utility activity.
+ */
+export default class UtilitySheet extends ActivitySheet {
+
+  /** @inheritDoc */
+  static DEFAULT_OPTIONS = {
+    classes: ["utility-activity"]
+  };
+
+  /* -------------------------------------------- */
+
+  /** @inheritDoc */
+  static PARTS = {
+    ...super.PARTS,
+    effect: {
+      template: "systems/dnd5e/templates/activity/utility-effect.hbs",
+      templates: super.PARTS.effect.templates
+    }
+  };
+}

module/data/activity/_module.mjs

@@ -2,3 +2,4 @@ export {default as BaseActivityData} from "./base-activity.mjs";
 
 export {default as AttackActivityData} from "./attack-data.mjs";
 export {default as SummonActivityData} from "./summon-data.mjs";
+export {default as UtilityActivityData} from "./utility-data.mjs";

module/data/activity/utility-data.mjs

@@ -0,0 +1,24 @@
+import FormulaField from "../fields/formula-field.mjs";
+import BaseActivityData from "./base-activity.mjs";
+
+const { SchemaField, StringField } = foundry.data.fields;
+
+/**
+ * Data model for an utility activity.
+ *
+ * @property {object} roll
+ * @property {string} roll.formula  Arbitrary formula that can be rolled.
+ * @property {string} roll.name     Label for the rolling button.
+ */
+export default class UtilityActivityData extends BaseActivityData {
+  /** @inheritDoc */
+  static defineSchema() {
+    return {
+      ...super.defineSchema(),
+      roll: new SchemaField({
+        formula: new FormulaField(),
+        name: new StringField()
+      })
+    };
+  }
+}

module/documents/activity/utility.mjs

@@ -1,11 +1,11 @@
-import ActivitySheet from "../../applications/activity/activity-sheet.mjs";
-import BaseActivityData from "../../data/activity/base-activity.mjs";
+import UtilitySheet from "../../applications/activity/utility-sheet.mjs";
+import UtilityActivityData from "../../data/activity/utility-data.mjs";
 import ActivityMixin from "./mixin.mjs";
 
 /**
  * Generic activity for applying effects and rolling an arbitrary die.
  */
-export default class UtilityActivity extends ActivityMixin(BaseActivityData) {
+export default class UtilityActivity extends ActivityMixin(UtilityActivityData) {
   /* -------------------------------------------- */
   /*  Model Configuration                         */
   /* -------------------------------------------- */
@@ -21,7 +21,7 @@ export default class UtilityActivity extends ActivityMixin(BaseActivityData) {
       type: "utility",
       img: "systems/dnd5e/icons/svg/activity/utility.svg",
       title: "DND5E.UTILITY.Title",
-      sheetClass: ActivitySheet
+      sheetClass: UtilitySheet
     }, { inplace: false })
   );
 }

templates/activity/utility-effect.hbs

@@ -0,0 +1,8 @@
+<section class="tab activity-{{ tab.id }} {{ tab.cssClass }}" data-tab="{{ tab.id }}" data-group="{{ tab.group }}">
+    {{> "systems/dnd5e/templates/activity/parts/activity-effects.hbs" }}
+    <fieldset>
+        <legend>{{ localize "DND5E.UTILITY.FIELDS.roll.label" }}</legend>
+        {{ formField fields.roll.fields.name value=source.roll.name }}
+        {{ formField fields.roll.fields.formula value=source.roll.formula }}
+    </fieldset>
+</section>