Merge branch 'main' into feature/beastform-compendium

module/data/action/baseAction.mjs

@@ -307,7 +307,7 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
                 title: 'Roll Save',
                 roll: {
                     trait: this.save.trait,
-                    difficulty: this.save.difficulty,
+                    difficulty: this.save.difficulty ?? this.actor?.baseSaveDifficulty,
                     type: 'reaction'
                 },
                 data: target.actor.getRollData()

module/data/fields/action/saveField.mjs

@@ -8,7 +8,7 @@ export default class SaveField extends fields.SchemaField {
                 initial: null,
                 choices: CONFIG.DH.ACTOR.abilities
             }),
-            difficulty: new fields.NumberField({ nullable: true, initial: 10, integer: true, min: 0 }),
+            difficulty: new fields.NumberField({ nullable: true, initial: null, integer: true, min: 0 }),
             damageMod: new fields.StringField({
                 initial: CONFIG.DH.ACTIONS.damageOnSave.none.id,
                 choices: CONFIG.DH.ACTIONS.damageOnSave

module/data/fields/action/targetField.mjs

@@ -6,8 +6,7 @@ export default class TargetField extends fields.SchemaField {
             type: new fields.StringField({
                 choices: CONFIG.DH.ACTIONS.targetTypes,
                 initial: CONFIG.DH.ACTIONS.targetTypes.any.id,
-                nullable: true,
-                initial: null
+                nullable: true
             }),
             amount: new fields.NumberField({ nullable: true, initial: null, integer: true, min: 0 })
         };

module/data/item/_module.mjs

@@ -6,7 +6,7 @@ import DHCommunity from './community.mjs';
 import DHConsumable from './consumable.mjs';
 import DHDomainCard from './domainCard.mjs';
 import DHFeature from './feature.mjs';
-import DHMiscellaneous from './miscellaneous.mjs';
+import DHLoot from './loot.mjs';
 import DHSubclass from './subclass.mjs';
 import DHWeapon from './weapon.mjs';
 import DHBeastform from './beastform.mjs';
@@ -20,7 +20,7 @@ export {
     DHConsumable,
     DHDomainCard,
     DHFeature,
-    DHMiscellaneous,
+    DHLoot,
     DHSubclass,
     DHWeapon,
     DHBeastform
@@ -35,7 +35,7 @@ export const config = {
     consumable: DHConsumable,
     domainCard: DHDomainCard,
     feature: DHFeature,
-    miscellaneous: DHMiscellaneous,
+    loot: DHLoot,
     subclass: DHSubclass,
     weapon: DHWeapon,
     beastform: DHBeastform

module/data/item/loot.mjs

@@ -1,12 +1,11 @@
 import BaseDataItem from './base.mjs';
-import { ActionField } from '../fields/actionField.mjs';
 
-export default class DHMiscellaneous extends BaseDataItem {
+export default class DHLoot extends BaseDataItem {
     /** @inheritDoc */
     static get metadata() {
         return foundry.utils.mergeObject(super.metadata, {
-            label: 'TYPES.Item.miscellaneous',
-            type: 'miscellaneous',
+            label: 'TYPES.Item.loot',
+            type: 'loot',
             hasDescription: true,
             isQuantifiable: true,
             isInventoryItem: true,