Fix Adversary attack multiplier

module/applications/config/Action.mjs

@@ -38,6 +38,8 @@ export default class DHActionConfig extends DaggerheartSheet(ApplicationV2) {
         }
     };
 
+    static CLEAN_ARRAYS = ["damage.parts", "cost", "effects"];
+
     _getTabs() {
         const tabs = {
             base: { active: true, cssClass: '', group: 'primary', id: 'base', icon: null, label: 'Base' },
@@ -64,7 +66,6 @@ export default class DHActionConfig extends DaggerheartSheet(ApplicationV2) {
         context.getRealIndex = this.getRealIndex.bind(this);
         context.disableOption = this.disableOption.bind(this);
         context.isNPC = this.action.actor.type !== 'character';
-        
         return context;
     }
 
@@ -88,6 +89,19 @@ export default class DHActionConfig extends DaggerheartSheet(ApplicationV2) {
 
     _prepareSubmitData(event, formData) {
         const submitData = foundry.utils.expandObject(formData.object);
+        for ( const keyPath of this.constructor.CLEAN_ARRAYS ) {
+            const data = foundry.utils.getProperty(submitData, keyPath);
+            if ( data ) foundry.utils.setProperty(submitData, keyPath, Object.values(data));
+            /* const data = foundry.utils.getProperty(submitData, keyPath),
+                originalData = foundry.utils.getProperty(this.action.toObject(), keyPath);
+            if ( data ) {
+                const aData = Object.values(data);
+                originalData.forEach((v,i) => {
+                    aData[i] = {...originalData[i], ...aData[i]};
+                })
+                foundry.utils.setProperty(submitData, keyPath, aData);
+            } */
+        }
         // this.element.querySelectorAll("fieldset[disabled] :is(input, select)").forEach(input => {
         //     foundry.utils.setProperty(submitData, input.name, input.value);
         // });
@@ -96,7 +110,7 @@ export default class DHActionConfig extends DaggerheartSheet(ApplicationV2) {
 
     static async updateForm(event, _, formData) {
         const submitData = this._prepareSubmitData(event, formData),
-            data = foundry.utils.expandObject(foundry.utils.mergeObject(this.action.toObject(), submitData)),
+            data = foundry.utils.mergeObject(this.action.toObject(), submitData),
             container = foundry.utils.getProperty(this.action.parent, this.action.systemPath);
         let newActions;
         if(Array.isArray(container)) {

module/applications/roll.mjs

@@ -71,7 +71,6 @@ export class DHRoll extends Roll {
                 user: game.user.id,
                 sound: config.mute ? null : CONFIG.sounds.dice,
                 system: config,
-                // content: this.messageTemplate,
                 content: await this.messageTemplate(config),
                 rolls: [roll]
             };

module/applications/sheets/adversary.mjs

@@ -55,7 +55,6 @@ export default class AdversarySheet extends DaggerheartSheet(ActorSheetV2) {
         context.tabs = super._getTabs(this.constructor.TABS);
         context.systemFields.attack.fields = this.document.system.attack.schema.fields;
         context.isNPC = true;
-        console.log(context)
         return context;
     }
 

module/applications/sheets/character.mjs

@@ -32,7 +32,7 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
             selectSubclass: this.selectSubclass,
             selectAncestry: this.selectAncestry,
             selectCommunity: this.selectCommunity,
-            viewObject: this.viewObject,
+            // viewObject: this.viewObject,
             useItem: this.useItem,
             useFeature: this.useFeature,
             takeShortRest: this.takeShortRest,
@@ -537,7 +537,7 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
         item.use(event);
     }
 
-    static async viewObject(_, button) {
+    /* static async viewObject(_, button) {
         const object = await fromUuid(button.dataset.value);
         if (!object) return;
 
@@ -547,7 +547,7 @@ export default class CharacterSheet extends DaggerheartSheet(ActorSheetV2) {
         if (object.sheet.editMode) object.sheet.editMode = false;
 
         object.sheet.render(true);
-    }
+    } */
 
     editItem(event) {
         const uuid = event.target.closest('[data-item-id]').dataset.itemId,

module/data/actor/adversary.mjs

@@ -1,6 +1,4 @@
-import DhpItem from '../../documents/item.mjs';
 import ActionField from '../fields/actionField.mjs';
-import DHWeapon from '../item/weapon.mjs';
 import BaseDataActor from './base.mjs';
 
 const resourceField = () =>
@@ -42,39 +40,6 @@ export default class DhpAdversary extends BaseDataActor {
                 hitPoints: resourceField(),
                 stress: resourceField()
             }),
-            /* attack: new fields.SchemaField({
-                name: new fields.StringField({}),
-                modifier: new fields.NumberField({ required: true, integer: true, initial: 0 }),
-                range: new fields.StringField({
-                    required: true,
-                    choices: SYSTEM.GENERAL.range,
-                    initial: SYSTEM.GENERAL.range.melee.id
-                }),
-                damage: new fields.SchemaField({
-                    value: new fields.StringField(),
-                    type: new fields.StringField({
-                        required: true,
-                        choices: SYSTEM.GENERAL.damageTypes,
-                        initial: SYSTEM.GENERAL.damageTypes.physical.id
-                    })
-                })
-            }), */
-            /* attack: new fields.EmbeddedDocumentField(DhpItem,
-                {
-                    // type: 'weapon'
-                //    initial: new DhpItem(
-                //         {
-                //             name: 'Attack',
-                //             type: 'weapon'
-                //         },
-                //         {
-                //             parent: this.parent,
-                //             parentCollection: 'items'
-                //         }
-                //     )
-                    // initial: {type: 'weapon'}
-                }
-            ), */
             attack: new ActionField({
                 initial: {
                     name: 'Attack',
@@ -91,7 +56,10 @@ export default class DhpAdversary extends BaseDataActor {
                     },
                     damage: {
                         parts: [{
-                            multiplier: 'flat'
+                            multiplier: 'flat',
+                            dice: 'd20',
+                            bonus: 2,
+                            flatMultiplier: 3
                         }]
                     }
                 }
@@ -102,24 +70,6 @@ export default class DhpAdversary extends BaseDataActor {
                     value: new fields.NumberField({ required: true, integer: true, initial: 1 })
                 })
             )
-            /* Features waiting on pseudo-document data model addition */
         };
     }
-
-    prepareBaseData() {
-        // console.log(this.attack)
-        /* if(!this.attack) {
-            this.attack = new DhpItem(
-                {
-                    name: 'Attack',
-                    type: 'weapon',
-                    _id: foundry.utils.randomID()
-                },
-                {
-                    parent: this.parent,
-                    parentCollection: 'items'
-                }
-            )
-        } */
-    }
 }

module/documents/actor.mjs

@@ -265,7 +265,8 @@ export default class DhpActor extends Actor {
      * @param {object} [config.costs]
      */
     async diceRoll(config, action) {
-        config.source = {...(config.source ?? {}), actor: this._id};
+        // config.source = {...(config.source ?? {}), actor: this._id};
+        config.source = {...(config.source ?? {}), actor: this.uuid};
         config.data = this.getRollData()
         const roll = await CONFIG.Dice.daggerheart[this.type === 'character' ? 'DualityRoll' : 'D20Roll'].build(config)
         return config;

module/ui/chatLog.mjs

@@ -60,8 +60,9 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
         super.close(options);
     }
 
-    getActor(id) {
+    async getActor(id) {
-        return game.actors.get(id);
+        // return game.actors.get(id);
+        return await fromUuid(id);
     }
 
     getAction(actor, itemId, actionId) {
@@ -72,7 +73,7 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
 
     onRollDamage = async (event, message) => {
         event.stopPropagation();
-        const actor = this.getActor(message.system.source.actor);
+        const actor = await this.getActor(message.system.source.actor);
         if (!actor || !game.user.isGM) return true;
         if(message.system.source.item && message.system.source.action) {
             const action = this.getAction(actor, message.system.source.item, message.system.source.action);

templates/sheets/actors/adversary/main.hbs

@@ -63,7 +63,7 @@
             <div>
                 <fieldset class="action-category">
                     <legend class="action-category-label" data-action="toggleSection" data-section="range">
-                        <div>Bonus</div>
+                        <div>Bonus to Hit</div>
                     </legend>
                     <div class="action-category-data open">
                         {{formField systemFields.attack.fields.roll.fields.bonus value=source.system.attack.roll.bonus name="system.attack.roll.bonus"}}
@@ -75,17 +75,6 @@
             <div style="grid-column: 1 / -1;">
                 {{> 'systems/daggerheart/templates/views/actionTypes/effect.hbs'}}
             </div>
-
-
-
-            {{!-- <legend>{{localize "DAGGERHEART.Sheets.Adversary.Attack"}}</legend>
-
-            {{formGroup systemFields.attack.fields.name value=source.system.attack.name}}
-            <button data-action="attackRoll">Attack</button>
-            {{formGroup systemFields.attack.fields.modifier value=source.system.attack.modifier}}
-            {{formGroup systemFields.attack.fields.range value=source.system.attack.range localize=true}}
-            {{formGroup systemFields.attack.fields.damage.fields.value value=source.system.attack.damage.value}}
-            {{formGroup systemFields.attack.fields.damage.fields.type value=source.system.attack.damage.type localize=true}} --}}
         </fieldset> 
     </div>
 </section>

templates/sheets/global/partials/inventory-item.hbs

@@ -1,5 +1,5 @@
-<li class="inventory-item">
+<li class="inventory-item" data-item-id="{{item.uuid}}">
-    <img src="{{item.img}}" data-action="viewObject" data-value="{{item.uuid}}" class="item-img" />
+    <img src="{{item.img}}" data-action="useItem" class="item-img" />
     <div class="item-label">
         <div class="item-name">{{item.name}}</div>
         {{#if  (eq type 'weapon')}}

templates/views/actionTypes/damage.hbs

@@ -16,15 +16,18 @@
         {{#each source.parts as |dmg index|}}
             {{#if @root.isNPC}}
                 {{formField ../fields.custom.fields.enabled value=dmg.custom.enabled name=(concat ../path "damage.parts." index ".custom.enabled")}}
+                {{!-- {{formField ../fields.multiplier value=dmg.multiplier name=(concat ../path "damage.parts." index ".multiplier") localize=true}} --}}
+                <input type="hidden" name="{{../path}}damage.parts.{{index}}.multiplier" value="{{dmg.multiplier}}">
                 {{#if dmg.custom.enabled}}
                     {{formField ../fields.custom.fields.formula value=dmg.custom.formula name=(concat ../path "damage.parts." index ".custom.formula") localize=true}}
                 {{else}}
                     <div class="multi-display">
-                        {{formField ../fields.flatMultiplier value=dmg.flatMultiplier name=(concat "damage.parts." realIndex ".flatMultiplier") label="Multiplier" }}
+                        {{formField ../fields.flatMultiplier value=dmg.flatMultiplier name=(concat ../path "damage.parts." index ".flatMultiplier") label="Multiplier" }}
                         {{formField ../fields.dice value=dmg.dice name=(concat ../path "damage.parts." index ".dice")}}
                         {{formField ../fields.bonus value=dmg.bonus name=(concat ../path "damage.parts." index ".bonus") localize=true}}
                     </div>
                 {{/if}}
+                {{formField ../fields.type value=dmg.type name=(concat ../path "damage.parts." index ".type") localize=true}}
             {{else}}
                 {{#with (@root.getRealIndex index) as | realIndex |}}
                 <fieldset{{#if dmg.base}} disabled{{/if}}>