Merge branch 'main' into bug/229-Narrative-Countdown-Window

module/data/action/action.mjs

@@ -1,4 +1,3 @@
-import CostSelectionDialog from '../../applications/costSelectionDialog.mjs';
 import { DHActionDiceData, DHActionRollData, DHDamageData, DHDamageField } from './actionDice.mjs';
 import DhpActor from '../../documents/actor.mjs';
 import D20RollDialog from '../../dialogs/d20RollDialog.mjs';
@@ -343,7 +342,9 @@ export class DHBaseAction extends foundry.abstract.DataModel {
             label: 'Attack',
             type: this.actionType,
             difficulty: this.roll?.difficulty,
-            formula: this.roll.getFormula()
+            formula: this.roll.getFormula(),
+            bonus: this.roll.bonus,
+            advantage: SYSTEM.ACTIONS.advandtageState[this.roll.advState].value
         };
         if (this.roll?.type === 'diceSet') roll.lite = true;
 
@@ -372,7 +373,7 @@ export class DHBaseAction extends foundry.abstract.DataModel {
 
     /* ROLL */
     get hasRoll() {
-        return !!this.roll?.type;
+        return !!this.roll?.type || !!this.roll?.bonus;
     }
     /* ROLL */
 
@@ -544,6 +545,29 @@ export class DHBaseAction extends foundry.abstract.DataModel {
         }
     }
     /* SAVE */
+
+    async toChat(origin) {
+        const cls = getDocumentClass('ChatMessage');
+        const systemData = {
+            title: game.i18n.localize('DAGGERHEART.ActionType.action'),
+            origin: origin,
+            img: this.img,
+            name: this.name,
+            description: this.description,
+            actions: []
+        };
+        const msg = new cls({
+            type: 'abilityUse',
+            user: game.user.id,
+            system: systemData,
+            content: await foundry.applications.handlebars.renderTemplate(
+                'systems/daggerheart/templates/chat/ability-use.hbs',
+                systemData
+            )
+        });
+
+        cls.create(msg.toObject());
+    }
 }
 
 export class DHDamageAction extends DHBaseAction {

module/data/action/actionDice.mjs

@@ -11,7 +11,8 @@ export class DHActionRollData extends foundry.abstract.DataModel {
             type: new fields.StringField({ nullable: true, initial: null, choices: SYSTEM.GENERAL.rollTypes }),
             trait: new fields.StringField({ nullable: true, initial: null, choices: SYSTEM.ACTOR.abilities }),
             difficulty: new fields.NumberField({ nullable: true, initial: null, integer: true, min: 0 }),
-            bonus: new fields.NumberField({ nullable: true, initial: null, integer: true, min: 0 }),
+            bonus: new fields.NumberField({ nullable: true, initial: null, integer: true }),
+            advState: new fields.StringField({ choices: SYSTEM.ACTIONS.advandtageState, initial: 'neutral' }),
             diceRolling: new fields.SchemaField({
                 multiplier: new fields.StringField({
                     choices: SYSTEM.GENERAL.diceSetNumbers,
@@ -62,7 +63,7 @@ export class DHActionDiceData extends foundry.abstract.DataModel {
                 label: 'Multiplier'
             }),
             flatMultiplier: new fields.NumberField({ nullable: true, initial: 1, label: 'Flat Multiplier' }),
-            dice: new fields.StringField({ choices: SYSTEM.GENERAL.diceTypes, initial: 'd6', label: 'Formula' }),
+            dice: new fields.StringField({ choices: SYSTEM.GENERAL.diceTypes, initial: 'd6', label: 'Dice' }),
             bonus: new fields.NumberField({ nullable: true, initial: null, label: 'Bonus' }),
             custom: new fields.SchemaField({
                 enabled: new fields.BooleanField({ label: 'Custom Formula' }),

module/data/actor/adversary.mjs

@@ -30,8 +30,11 @@ export default class DhpAdversary extends BaseDataActor {
                 choices: SYSTEM.ACTOR.adversaryTypes,
                 initial: SYSTEM.ACTOR.adversaryTypes.standard.id
             }),
-            motivesAndTactics: new fields.HTMLField(),
+            description: new fields.StringField(),
+            motivesAndTactics: new fields.StringField(),
+            notes: new fields.HTMLField(),
             difficulty: new fields.NumberField({ required: true, initial: 1, integer: true }),
+            hordeHp: new fields.NumberField({ required: true, initial: 1, integer: true }),
             damageThresholds: new fields.SchemaField({
                 major: new fields.NumberField({ required: true, initial: 0, integer: true }),
                 severe: new fields.NumberField({ required: true, initial: 0, integer: true })
@@ -40,6 +43,7 @@ export default class DhpAdversary extends BaseDataActor {
                 hitPoints: resourceField(),
                 stress: resourceField()
             }),
+            actions: new fields.ArrayField(new ActionField()),
             attack: new ActionField({
                 initial: {
                     name: 'Attack',
@@ -66,7 +70,7 @@ export default class DhpAdversary extends BaseDataActor {
             experiences: new fields.TypedObjectField(
                 new fields.SchemaField({
                     name: new fields.StringField(),
-                    value: new fields.NumberField({ required: true, integer: true, initial: 1 })
+                    modifier: new fields.NumberField({ required: true, integer: true, initial: 1 })
                 })
             ),
             bonuses: new fields.SchemaField({

module/data/actor/environment.mjs

@@ -1,6 +1,8 @@
 import { environmentTypes } from '../../config/actorConfig.mjs';
 import BaseDataActor from './base.mjs';
 import ForeignDocumentUUIDField from '../fields/foreignDocumentUUIDField.mjs';
+import ActionField from '../fields/actionField.mjs';
+import ForeignDocumentUUIDArrayField from '../fields/foreignDocumentUUIDArrayField.mjs';
 
 export default class DhEnvironment extends BaseDataActor {
     static LOCALIZATION_PREFIXES = ['DAGGERHEART.Sheets.Environment'];
@@ -21,15 +23,17 @@ export default class DhEnvironment extends BaseDataActor {
                 initial: SYSTEM.GENERAL.tiers.tier1.id
             }),
             type: new fields.StringField({ choices: environmentTypes }),
-            impulses: new fields.HTMLField(),
+            description: new fields.StringField(),
+            impulses: new fields.StringField(),
             difficulty: new fields.NumberField({ required: true, initial: 11, integer: true }),
             potentialAdversaries: new fields.TypedObjectField(
                 new fields.SchemaField({
                     label: new fields.StringField(),
-                    adversaries: new fields.TypedObjectField(new ForeignDocumentUUIDField({ type: 'Actor' }))
+                    adversaries: new ForeignDocumentUUIDArrayField({ type: 'Actor' })
                 })
-            )
-            /* Features pending datamodel rework */
+            ),
+            actions: new fields.ArrayField(new ActionField()),
+            notes: new fields.HTMLField()
         };
     }
 }

module/data/fields/actionField.mjs

@@ -1,9 +1,9 @@
-import { actionsTypes } from '../action/_module.mjs';
+// import { actionsTypes } from '../action/_module.mjs';
 
 // Temporary Solution
 export default class ActionField extends foundry.data.fields.ObjectField {
     getModel(value) {
-        return actionsTypes[value.type] ?? actionsTypes.attack;
+        return game.system.api.models.actionsTypes[value.type] ?? game.system.api.models.actionsTypes.attack;
     }
 
     /* -------------------------------------------- */

module/data/item/base.mjs

@@ -1,4 +1,4 @@
-import { actionsTypes } from '../action/_module.mjs';
+// import { actionsTypes } from '../action/_module.mjs';
 
 /**
  * Describes metadata about the item data model type
@@ -60,7 +60,8 @@ export default class BaseDataItem extends foundry.abstract.TypeDataModel {
         const actionType = {
                 weapon: 'attack'
             }[this.constructor.metadata.type],
-            cls = actionsTypes.attack,
+            cls = game.system.api.models.actionsTypes[actionType],
+            // cls = actionsTypes.attack,
             action = new cls(
                 {
                     _id: foundry.utils.randomID(),