f

module/data/fields/_module.mjs

@@ -2,3 +2,4 @@ export { ActionCollection } from './actionField.mjs';
 export { default as FormulaField } from './formulaField.mjs';
 export { default as ForeignDocumentUUIDField } from './foreignDocumentUUIDField.mjs';
 export { default as ForeignDocumentUUIDArrayField } from './foreignDocumentUUIDArrayField.mjs';
+export { default as MappingField } from './mappingField.mjs';

module/data/fields/action/_module.mjs

@@ -0,0 +1,7 @@
+export { default as CostField } from './costField.mjs';
+export { default as UsesField } from './usesField.mjs';
+export { default as RangeField } from './rangeField.mjs';
+export { default as TargetField } from './targetField.mjs';
+export { default as EffectField } from './effectField.mjs';
+export { default as SaveField } from './saveField.mjs';
+export { default as BeastformField } from './beastformField.mjs';

module/data/fields/action/beastformField.mjs

@@ -0,0 +1,12 @@
+const fields = foundry.data.fields;
+
+export default class BeastformField extends fields.SchemaField {
+    constructor(options={}, context={}) {
+        const beastformFields = {
+            tierAccess: new fields.SchemaField({
+                exact: new fields.NumberField({ integer: true, nullable: true, initial: null })
+            })
+        };
+        super(beastformFields, options, context);
+    }
+}

module/data/fields/action/costField.mjs

@@ -0,0 +1,18 @@
+const fields = foundry.data.fields;
+
+export default class CostField extends fields.ArrayField {
+    constructor(options={}, context={}) {
+        const element = new fields.SchemaField({
+            key: new fields.StringField({
+                nullable: false,
+                required: true,
+                initial: 'hope'
+            }),
+            keyIsID: new fields.BooleanField(),
+            value: new fields.NumberField({ nullable: true, initial: 1 }),
+            scalable: new fields.BooleanField({ initial: false }),
+            step: new fields.NumberField({ nullable: true, initial: null })
+        });
+        super(element, options, context);
+    }
+}

module/data/fields/action/effectField.mjs

@@ -0,0 +1,11 @@
+const fields = foundry.data.fields;
+
+export default class EffectField extends fields.ArrayField {
+    constructor(options={}, context={}) {
+        const element = new fields.SchemaField({
+            _id: new fields.DocumentIdField(),
+            onSave: new fields.BooleanField({ initial: false })
+        });
+        super(element, options, context);
+    }
+}

module/data/fields/action/rangeField.mjs

@@ -0,0 +1,12 @@
+const fields = foundry.data.fields;
+
+export default class RangeField extends fields.StringField {
+    constructor(context={}) {
+        const options = {
+            choices: CONFIG.DH.GENERAL.range,
+            required: false,
+            blank: true
+        };
+        super(options, context);
+    }
+}

module/data/fields/action/saveField.mjs

@@ -0,0 +1,19 @@
+const fields = foundry.data.fields;
+
+export default class SaveField extends fields.SchemaField {
+    constructor(options={}, context={}) {
+        const saveFields = {
+            trait: new fields.StringField({
+                nullable: true,
+                initial: null,
+                choices: CONFIG.DH.ACTOR.abilities
+            }),
+            difficulty: new fields.NumberField({ nullable: true, initial: 10, integer: true, min: 0 }),
+            damageMod: new fields.StringField({
+                initial: CONFIG.DH.ACTIONS.damageOnSave.none.id,
+                choices: CONFIG.DH.ACTIONS.damageOnSave
+            })
+        };
+        super(saveFields, options, context);
+    }
+}

module/data/fields/action/targetField.mjs

@@ -0,0 +1,16 @@
+const fields = foundry.data.fields;
+
+export default class TargetField extends fields.SchemaField {
+    constructor(options={}, context={}) {
+        const targetFields = {
+            type: new fields.StringField({
+                choices: CONFIG.DH.ACTIONS.targetTypes,
+                initial: CONFIG.DH.ACTIONS.targetTypes.any.id,
+                nullable: true,
+                initial: null
+            }),
+            amount: new fields.NumberField({ nullable: true, initial: null, integer: true, min: 0 })
+        };
+        super(targetFields, options, context);
+    }
+}

module/data/fields/action/usesField.mjs

@@ -0,0 +1,16 @@
+const fields = foundry.data.fields;
+
+export default class UsesField extends fields.SchemaField {
+    constructor(options={}, context={}) {
+        const usesFields = {
+            value: new fields.NumberField({ nullable: true, initial: null }),
+            max: new fields.NumberField({ nullable: true, initial: null }),
+            recovery: new fields.StringField({
+                choices: CONFIG.DH.GENERAL.refreshTypes,
+                initial: null,
+                nullable: true
+            })
+        };
+        super(usesFields, options, context);
+    }
+}

module/data/fields/actionField.mjs

@@ -1,4 +1,5 @@
 import DHActionConfig from "../../applications/sheets-configs/action-config.mjs";
+import MappingField from "./mappingField.mjs";
 
 /**
  * Specialized collection type for stored actions.
@@ -56,137 +57,6 @@ export class ActionCollection extends Collection {
 
 /* -------------------------------------------- */
 
-/**
- * A subclass of ObjectField that represents a mapping of keys to the provided DataField type.
- *
- * @param {DataField} model                    The class of DataField which should be embedded in this field.
- * @param {MappingFieldOptions} [options={}]   Options which configure the behavior of the field.
- * @property {string[]} [initialKeys]          Keys that will be created if no data is provided.
- * @property {MappingFieldInitialValueBuilder} [initialValue]  Function to calculate the initial value for a key.
- * @property {boolean} [initialKeysOnly=false]  Should the keys in the initialized data be limited to the keys provided
- *                                              by `options.initialKeys`?
- */
-export class MappingField extends foundry.data.fields.ObjectField {
-  constructor(model, options) {
-    if ( !(model instanceof foundry.data.fields.DataField) ) {
-      throw new Error("MappingField must have a DataField as its contained element");
-    }
-    super(options);
-
-    /**
-     * The embedded DataField definition which is contained in this field.
-     * @type {DataField}
-     */
-    this.model = model;
-    model.parent = this;
-  }
-
-  /* -------------------------------------------- */
-
-  /** @inheritDoc */
-  static get _defaults() {
-    return foundry.utils.mergeObject(super._defaults, {
-      initialKeys: null,
-      initialValue: null,
-      initialKeysOnly: false
-    });
-  }
-
-  /* -------------------------------------------- */
-
-  /** @inheritDoc */
-  _cleanType(value, options) {
-    Object.entries(value).forEach(([k, v]) => {
-      if ( k.startsWith("-=") ) return;
-      value[k] = this.model.clean(v, options);
-    });
-    return value;
-  }
-
-  /* -------------------------------------------- */
-
-  /** @inheritDoc */
-  getInitialValue(data) {
-    let keys = this.initialKeys;
-    const initial = super.getInitialValue(data);
-    if ( !keys || !foundry.utils.isEmpty(initial) ) return initial;
-    if ( !(keys instanceof Array) ) keys = Object.keys(keys);
-    for ( const key of keys ) initial[key] = this._getInitialValueForKey(key);
-    return initial;
-  }
-
-  /* -------------------------------------------- */
-
-  /**
-   * Get the initial value for the provided key.
-   * @param {string} key       Key within the object being built.
-   * @param {object} [object]  Any existing mapping data.
-   * @returns {*}              Initial value based on provided field type.
-   */
-  _getInitialValueForKey(key, object) {
-    const initial = this.model.getInitialValue();
-    return this.initialValue?.(key, initial, object) ?? initial;
-  }
-
-  /* -------------------------------------------- */
-
-  /** @override */
-  _validateType(value, options={}) {
-    if ( foundry.utils.getType(value) !== "Object" ) throw new Error("must be an Object");
-    const errors = this._validateValues(value, options);
-    if ( !foundry.utils.isEmpty(errors) ) {
-      const failure = new foundry.data.validation.DataModelValidationFailure();
-      failure.elements = Object.entries(errors).map(([id, failure]) => ({ id, failure }));
-      throw failure.asError();
-    }
-  }
-
-  /* -------------------------------------------- */
-
-  /**
-   * Validate each value of the object.
-   * @param {object} value     The object to validate.
-   * @param {object} options   Validation options.
-   * @returns {Record<string, Error>}  An object of value-specific errors by key.
-   */
-  _validateValues(value, options) {
-    const errors = {};
-    for ( const [k, v] of Object.entries(value) ) {
-      if ( k.startsWith("-=") ) continue;
-      const error = this.model.validate(v, options);
-      if ( error ) errors[k] = error;
-    }
-    return errors;
-  }
-
-  /* -------------------------------------------- */
-
-  /** @override */
-  initialize(value, model, options={}) {
-    if ( !value ) return value;
-    const obj = {};
-    const initialKeys = (this.initialKeys instanceof Array) ? this.initialKeys : Object.keys(this.initialKeys ?? {});
-    const keys = this.initialKeysOnly ? initialKeys : Object.keys(value);
-    for ( const key of keys ) {
-      const data = value[key] ?? this._getInitialValueForKey(key, value);
-      obj[key] = this.model.initialize(data, model, options);
-    }
-    return obj;
-  }
-
-  /* -------------------------------------------- */
-
-  /** @inheritDoc */
-  _getField(path) {
-    if ( path.length === 0 ) return this;
-    else if ( path.length === 1 ) return this.model;
-    path.shift();
-    return this.model._getField(path);
-  }
-}
-
-/* -------------------------------------------- */
-
 /**
  * Field that stores actions.
  */

module/data/fields/mappingField.mjs

@@ -0,0 +1,128 @@
+/**
+ * A subclass of ObjectField that represents a mapping of keys to the provided DataField type.
+ *
+ * @param {DataField} model                    The class of DataField which should be embedded in this field.
+ * @param {MappingFieldOptions} [options={}]   Options which configure the behavior of the field.
+ * @property {string[]} [initialKeys]          Keys that will be created if no data is provided.
+ * @property {MappingFieldInitialValueBuilder} [initialValue]  Function to calculate the initial value for a key.
+ * @property {boolean} [initialKeysOnly=false]  Should the keys in the initialized data be limited to the keys provided
+ *                                              by `options.initialKeys`?
+ */
+export default class MappingField extends foundry.data.fields.ObjectField {
+  constructor(model, options) {
+    if ( !(model instanceof foundry.data.fields.DataField) ) {
+      throw new Error("MappingField must have a DataField as its contained element");
+    }
+    super(options);
+
+    /**
+     * The embedded DataField definition which is contained in this field.
+     * @type {DataField}
+     */
+    this.model = model;
+    model.parent = this;
+  }
+
+  /* -------------------------------------------- */
+
+  /** @inheritDoc */
+  static get _defaults() {
+    return foundry.utils.mergeObject(super._defaults, {
+      initialKeys: null,
+      initialValue: null,
+      initialKeysOnly: false
+    });
+  }
+
+  /* -------------------------------------------- */
+
+  /** @inheritDoc */
+  _cleanType(value, options) {
+    Object.entries(value).forEach(([k, v]) => {
+      if ( k.startsWith("-=") ) return;
+      value[k] = this.model.clean(v, options);
+    });
+    return value;
+  }
+
+  /* -------------------------------------------- */
+
+  /** @inheritDoc */
+  getInitialValue(data) {
+    let keys = this.initialKeys;
+    const initial = super.getInitialValue(data);
+    if ( !keys || !foundry.utils.isEmpty(initial) ) return initial;
+    if ( !(keys instanceof Array) ) keys = Object.keys(keys);
+    for ( const key of keys ) initial[key] = this._getInitialValueForKey(key);
+    return initial;
+  }
+
+  /* -------------------------------------------- */
+
+  /**
+   * Get the initial value for the provided key.
+   * @param {string} key       Key within the object being built.
+   * @param {object} [object]  Any existing mapping data.
+   * @returns {*}              Initial value based on provided field type.
+   */
+  _getInitialValueForKey(key, object) {
+    const initial = this.model.getInitialValue();
+    return this.initialValue?.(key, initial, object) ?? initial;
+  }
+
+  /* -------------------------------------------- */
+
+  /** @override */
+  _validateType(value, options={}) {
+    if ( foundry.utils.getType(value) !== "Object" ) throw new Error("must be an Object");
+    const errors = this._validateValues(value, options);
+    if ( !foundry.utils.isEmpty(errors) ) {
+      const failure = new foundry.data.validation.DataModelValidationFailure();
+      failure.elements = Object.entries(errors).map(([id, failure]) => ({ id, failure }));
+      throw failure.asError();
+    }
+  }
+
+  /* -------------------------------------------- */
+
+  /**
+   * Validate each value of the object.
+   * @param {object} value     The object to validate.
+   * @param {object} options   Validation options.
+   * @returns {Record<string, Error>}  An object of value-specific errors by key.
+   */
+  _validateValues(value, options) {
+    const errors = {};
+    for ( const [k, v] of Object.entries(value) ) {
+      if ( k.startsWith("-=") ) continue;
+      const error = this.model.validate(v, options);
+      if ( error ) errors[k] = error;
+    }
+    return errors;
+  }
+
+  /* -------------------------------------------- */
+
+  /** @override */
+  initialize(value, model, options={}) {
+    if ( !value ) return value;
+    const obj = {};
+    const initialKeys = (this.initialKeys instanceof Array) ? this.initialKeys : Object.keys(this.initialKeys ?? {});
+    const keys = this.initialKeysOnly ? initialKeys : Object.keys(value);
+    for ( const key of keys ) {
+      const data = value[key] ?? this._getInitialValueForKey(key, value);
+      obj[key] = this.model.initialize(data, model, options);
+    }
+    return obj;
+  }
+
+  /* -------------------------------------------- */
+
+  /** @inheritDoc */
+  _getField(path) {
+    if ( path.length === 0 ) return this;
+    else if ( path.length === 1 ) return this.model;
+    path.shift();
+    return this.model._getField(path);
+  }
+}