Le massive export update

module/applications/_module.mjs

@@ -1,22 +1,8 @@
-export { default as DhCharacterSheet } from './sheets/actors/character.mjs';
-export { default as DhpAdversarySheet } from './sheets/actors/adversary.mjs';
-export { default as DhCompanionSheet } from './sheets/actors/companion.mjs';
-export { default as DhpClassSheet } from './sheets/items/class.mjs';
-export { default as DhpSubclass } from './sheets/items/subclass.mjs';
-export { default as DhpFeatureSheet } from './sheets/items/feature.mjs';
-export { default as DhpDomainCardSheet } from './sheets/items/domainCard.mjs';
-export { default as DhpAncestry } from './sheets/items/ancestry.mjs';
-export { default as DhpCommunity } from './sheets/items/community.mjs';
-export { default as DhpMiscellaneous } from './sheets/items/miscellaneous.mjs';
-export { default as DhpConsumable } from './sheets/items/consumable.mjs';
-export { default as DhpWeapon } from './sheets/items/weapon.mjs';
-export { default as DhpArmor } from './sheets/items/armor.mjs';
-export { default as DhpEnvironment } from './sheets/actors/environment.mjs';
-export { default as DhActiveEffectConfig } from './sheets/activeEffectConfig.mjs';
-export { default as DhContextMenu } from './ux/contextMenu.mjs';
-export { default as DhBeastform } from './sheets/items/beastform.mjs';
-
-export * as config from '../config/_module.mjs';
-export * as api from './sheets/api/_modules.mjs';
+export * as characterCreation from './characterCreation/_module.mjs';
+export * as dialogs from './dialogs/_module.mjs';
+export * as levelup from './levelup/_module.mjs';
+export * as settings from './settings/_module.mjs';
+export * as sheets from './sheets/_module.mjs';
+export * as sheetConfigs from './sheets-configs/_module.mjs';
 export * as ui from './ui/_module.mjs';
 export * as ux from './ux/_module.mjs';

module/applications/characterCreation/_module.mjs

@@ -0,0 +1 @@
+export { default as CharacterCreation } from './characterCreation.mjs';

module/applications/dialogs/_module.mjs

@@ -0,0 +1,9 @@
+export { default as BeastformDialog } from './beastformDialog.mjs';
+export { default as costSelectionDialog } from './costSelectionDialog.mjs';
+export { default as d20RollDialog } from './d20RollDialog.mjs';
+export { default as DamageDialog } from './damageDialog.mjs';
+export { default as DamageReductionDialog } from './damageReductionDialog.mjs';
+export { default as DamageSelectionDialog } from './damageSelectionDialog.mjs';
+export { default as DeathMove } from './deathMove.mjs';
+export { default as Downtime } from './downtime.mjs';
+export { default as OwnershipSelection } from './ownershipSelection.mjs';

module/applications/dialogs/downtime.mjs

@@ -1,5 +1,3 @@
-import { actionsTypes } from '../../data/_module.mjs';
-
 const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
 
 export default class DhpDowntime extends HandlebarsApplicationMixin(ApplicationV2) {

module/applications/levelup/_module.mjs

@@ -0,0 +1,3 @@
+export { default as CharacterLevelup } from './characterLevelup.mjs';
+export { default as CompanionLevelup } from './companionLevelup.mjs';
+export { default as Levelup } from './levelup.mjs';

module/applications/settings/_module.mjs

@@ -1,13 +1,5 @@
-import DhAppearanceSettings from './appearanceSettings.mjs';
-import DhAutomationSettings from './automationSettings.mjs';
-import DhHomebrewSettings from './homebrewSettings.mjs';
-import DhRangeMeasurementSettings from './rangeMeasurementSettings.mjs';
-import DhVariantRuleSettings from './variantRuleSettings.mjs';
-
-export {
-    DhAppearanceSettings,
-    DhAutomationSettings,
-    DhHomebrewSettings,
-    DhRangeMeasurementSettings,
-    DhVariantRuleSettings
-};
+export { default as DhAppearanceSettings } from './appearanceSettings.mjs';
+export { default as DhAutomationSettings } from './automationSettings.mjs';
+export { default as DhHomebrewSettings } from './homebrewSettings.mjs';
+export { default as DhRangeMeasurementSettings } from './rangeMeasurementSettings.mjs';
+export { default as DhVariantRuleSettings } from './variantRuleSettings.mjs';

module/applications/settings/components/settingsActionsView.mjs

@@ -1,5 +1,5 @@
-import { actionsTypes } from '../../../data/_module.mjs';
-import DHActionConfig from '../../../config/Action.mjs';
+import { actionsTypes } from '../../../data/action/_module.mjs';
+import DHActionConfig from '../../sheets-configs/action-config.mjs';
 
 const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
 

module/applications/sheets-configs/_module.mjs

@@ -0,0 +1,5 @@
+export { default as ActionConfig } from './action-config.mjs';
+export { default as AdversarySettings } from './adversary-settings.mjs';
+export { default as CompanionSettings } from './companion-settings.mjs';
+export { default as EnvironmentSettings } from './environment-settings.mjs';
+export { default as ActiveEffectConfig } from './activeEffectConfig.mjs';

module/applications/sheets-configs/action-config.mjs

@@ -0,0 +1,199 @@
+import DaggerheartSheet from '../sheets/daggerheart-sheet.mjs';
+
+const { ApplicationV2 } = foundry.applications.api;
+export default class DHActionConfig extends DaggerheartSheet(ApplicationV2) {
+    constructor(action) {
+        super({});
+
+        this.action = action;
+        this.openSection = null;
+    }
+
+    static DEFAULT_OPTIONS = {
+        tag: 'form',
+        id: 'daggerheart-action',
+        classes: ['daggerheart', 'views', 'action'],
+        position: { width: 600, height: 'auto' },
+        actions: {
+            toggleSection: this.toggleSection,
+            addEffect: this.addEffect,
+            removeEffect: this.removeEffect,
+            addElement: this.addElement,
+            removeElement: this.removeElement,
+            editEffect: this.editEffect,
+            addDamage: this.addDamage,
+            removeDamage: this.removeDamage
+        },
+        form: {
+            handler: this.updateForm,
+            submitOnChange: true,
+            closeOnSubmit: false
+        }
+    };
+
+    static PARTS = {
+        form: {
+            id: 'action',
+            template: 'systems/daggerheart/templates/config/action.hbs'
+        }
+    };
+
+    static CLEAN_ARRAYS = ['damage.parts', 'cost', 'effects'];
+
+    _getTabs() {
+        const tabs = {
+            base: { active: true, cssClass: '', group: 'primary', id: 'base', icon: null, label: 'Base' },
+            config: { active: false, cssClass: '', group: 'primary', id: 'config', icon: null, label: 'Configuration' },
+            effect: { active: false, cssClass: '', group: 'primary', id: 'effect', icon: null, label: 'Effect' }
+        };
+
+        for (const v of Object.values(tabs)) {
+            v.active = this.tabGroups[v.group] ? this.tabGroups[v.group] === v.id : v.active;
+            v.cssClass = v.active ? 'active' : '';
+        }
+
+        return tabs;
+    }
+
+    async _prepareContext(_options) {
+        const context = await super._prepareContext(_options, 'action');
+        context.source = this.action.toObject(false);
+        context.openSection = this.openSection;
+        context.tabs = this._getTabs();
+        context.config = CONFIG.DH;
+        if (!!this.action.effects) context.effects = this.action.effects.map(e => this.action.item.effects.get(e._id));
+        if (this.action.damage?.hasOwnProperty('includeBase') && this.action.type === 'attack')
+            context.hasBaseDamage = !!this.action.parent.damage;
+        context.getRealIndex = this.getRealIndex.bind(this);
+        context.getEffectDetails = this.getEffectDetails.bind(this);
+        context.disableOption = this.disableOption.bind(this);
+        context.isNPC = this.action.actor && this.action.actor.type !== 'character';
+        context.hasRoll = this.action.hasRoll;
+
+        const settingsTiers = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LevelTiers).tiers;
+        context.tierOptions = [
+            { key: 1, label: game.i18n.localize('DAGGERHEART.Tiers.tier1') },
+            ...Object.values(settingsTiers).map(x => ({ key: x.tier, label: x.name }))
+        ];
+
+        return context;
+    }
+
+    static toggleSection(_, button) {
+        this.openSection = button.dataset.section === this.openSection ? null : button.dataset.section;
+        this.render(true);
+    }
+
+    disableOption(index, options, choices) {
+        const filtered = foundry.utils.deepClone(options);
+        Object.keys(filtered).forEach(o => {
+            if (choices.find((c, idx) => c.type === o && index !== idx)) delete filtered[o];
+        });
+        return filtered;
+    }
+
+    getRealIndex(index) {
+        const data = this.action.toObject(false);
+        return data.damage.parts.find(d => d.base) ? index - 1 : index;
+    }
+
+    getEffectDetails(id) {
+        return this.action.item.effects.get(id);
+    }
+
+    _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));
+        }
+        return submitData;
+    }
+
+    static async updateForm(event, _, formData) {
+        const submitData = this._prepareSubmitData(event, formData),
+            data = foundry.utils.mergeObject(this.action.toObject(), submitData),
+            container = foundry.utils.getProperty(this.action.parent, this.action.systemPath);
+        let newActions;
+        if (Array.isArray(container)) {
+            newActions = foundry.utils.getProperty(this.action.parent, this.action.systemPath).map(x => x.toObject()); // Find better way
+            if (!newActions.findSplice(x => x._id === data._id, data)) newActions.push(data);
+        } else newActions = data;
+
+        const updates = await this.action.parent.parent.update({ [`system.${this.action.systemPath}`]: newActions });
+        if (!updates) return;
+        this.action = Array.isArray(container)
+            ? foundry.utils.getProperty(updates.system, this.action.systemPath)[this.action.index]
+            : foundry.utils.getProperty(updates.system, this.action.systemPath);
+        this.render();
+    }
+
+    static addElement(event) {
+        const data = this.action.toObject(),
+            key = event.target.closest('.action-category-data').dataset.key;
+        if (!this.action[key]) return;
+        data[key].push({});
+        this.constructor.updateForm.bind(this)(null, null, { object: foundry.utils.flattenObject(data) });
+    }
+
+    static removeElement(event) {
+        event.stopPropagation();
+        const data = this.action.toObject(),
+            key = event.target.closest('.action-category-data').dataset.key,
+            index = event.target.dataset.index;
+        data[key].splice(index, 1);
+        this.constructor.updateForm.bind(this)(null, null, { object: foundry.utils.flattenObject(data) });
+    }
+
+    static addDamage(event) {
+        if (!this.action.damage.parts) return;
+        const data = this.action.toObject();
+        data.damage.parts.push({});
+        this.constructor.updateForm.bind(this)(null, null, { object: foundry.utils.flattenObject(data) });
+    }
+
+    static removeDamage(event) {
+        if (!this.action.damage.parts) return;
+        const data = this.action.toObject(),
+            index = event.target.dataset.index;
+        data.damage.parts.splice(index, 1);
+        this.constructor.updateForm.bind(this)(null, null, { object: foundry.utils.flattenObject(data) });
+    }
+
+    static async addEffect(event) {
+        if (!this.action.effects) return;
+        const effectData = this._addEffectData.bind(this)(),
+            [created] = await this.action.item.createEmbeddedDocuments('ActiveEffect', [effectData], { render: false }),
+            data = this.action.toObject();
+        data.effects.push({ _id: created._id });
+        this.constructor.updateForm.bind(this)(null, null, { object: foundry.utils.flattenObject(data) });
+        this.action.item.effects.get(created._id).sheet.render(true);
+    }
+
+    /**
+     * The data for a newly created applied effect.
+     * @returns {object}
+     * @protected
+     */
+    _addEffectData() {
+        return {
+            name: this.action.item.name,
+            img: this.action.item.img,
+            origin: this.action.item.uuid,
+            transfer: false
+        };
+    }
+
+    static removeEffect(event) {
+        if (!this.action.effects) return;
+        const index = event.target.dataset.index,
+            effectId = this.action.effects[index]._id;
+        this.constructor.removeElement.bind(this)(event);
+        this.action.item.deleteEmbeddedDocuments('ActiveEffect', [effectId]);
+    }
+
+    static editEffect(event) {
+        const id = event.target.closest('[data-effect-id]')?.dataset?.effectId;
+        this.action.item.effects.get(id).sheet.render(true);
+    }
+}

module/applications/sheets-configs/adversary-settings.mjs

@@ -1,6 +1,6 @@
-import DHActionConfig from '../../../config/Action.mjs';
-import DHBaseItemSheet from '../api/base-item.mjs';
-import { actionsTypes } from '../../../data/_module.mjs';
+import DHActionConfig from './action-config.mjs';
+import DHBaseItemSheet from '../sheets/api/base-item.mjs';
+import { actionsTypes } from '../../data/action/_module.mjs';
 
 const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
 

module/applications/sheets-configs/companion-settings.mjs

@@ -1,5 +1,5 @@
-import { GMUpdateEvent, socketEvent } from '../../../systemRegistration/socket.mjs';
-import DhCompanionlevelUp from '../../levelup/companionLevelup.mjs';
+import { GMUpdateEvent, socketEvent } from '../../systemRegistration/socket.mjs';
+import DhCompanionlevelUp from '../levelup/companionLevelup.mjs';
 
 const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
 

module/applications/sheets-configs/environment-settings.mjs

@@ -1,6 +1,6 @@
-import DHActionConfig from '../../../config/Action.mjs';
-import DHBaseItemSheet from '../api/base-item.mjs';
-import { actionsTypes } from '../../../data/_module.mjs';
+import DHActionConfig from './action-config.mjs';
+import DHBaseItemSheet from '../sheets/api/base-item.mjs';
+import { actionsTypes } from '../../data/action/_module.mjs';
 
 const { HandlebarsApplicationMixin, ApplicationV2 } = foundry.applications.api;
 

module/applications/sheets/_module.mjs

@@ -0,0 +1,3 @@
+export * as actors from './actors/_module.mjs';
+export * as api from './api/_modules.mjs';
+export * as items from './items/_module.mjs';

module/applications/sheets/actors/_module.mjs

@@ -0,0 +1,4 @@
+export { default as Adversary } from './adversary.mjs';
+export { default as Character } from './character.mjs';
+export { default as Companion } from './companion.mjs';
+export { default as Environment } from './environment.mjs';

module/applications/sheets/actors/adversary.mjs

@@ -1,6 +1,6 @@
-import DHActionConfig from '../../../config/Action.mjs';
+import DHActionConfig from '../../sheets-configs/action-config.mjs';
 import DaggerheartSheet from '../daggerheart-sheet.mjs';
-import DHAdversarySettings from '../applications/adversary-settings.mjs';
+import DHAdversarySettings from '../../sheets-configs/adversary-settings.mjs';
 
 const { ActorSheetV2 } = foundry.applications.sheets;
 export default class AdversarySheet extends DaggerheartSheet(ActorSheetV2) {

module/applications/sheets/actors/character.mjs

@@ -6,7 +6,7 @@ import { abilities } from '../../../config/actorConfig.mjs';
 import DhCharacterlevelUp from '../../levelup/characterLevelup.mjs';
 import DhCharacterCreation from '../../characterCreation/characterCreation.mjs';
 import FilterMenu from '../../ux/filter-menu.mjs';
-import DHActionConfig from '../../../config/Action.mjs';
+import DHActionConfig from '../../sheets-configs/action-config.mjs';
 
 const { ActorSheetV2 } = foundry.applications.sheets;
 const { TextEditor } = foundry.applications.ux;

module/applications/sheets/actors/companion.mjs

@@ -1,5 +1,5 @@
 import DaggerheartSheet from '../daggerheart-sheet.mjs';
-import DHCompanionSettings from '../applications/companion-settings.mjs';
+import DHCompanionSettings from '../../sheets-configs/companion-settings.mjs';
 
 const { ActorSheetV2 } = foundry.applications.sheets;
 export default class DhCompanionSheet extends DaggerheartSheet(ActorSheetV2) {

module/applications/sheets/actors/environment.mjs

@@ -1,5 +1,5 @@
 import DaggerheartSheet from '../daggerheart-sheet.mjs';
-import DHEnvironmentSettings from '../applications/environment-settings.mjs';
+import DHEnvironmentSettings from '../../sheets-configs/environment-settings.mjs';
 
 const { ActorSheetV2 } = foundry.applications.sheets;
 export default class DhpEnvironment extends DaggerheartSheet(ActorSheetV2) {

module/applications/sheets/api/base-item.mjs

@@ -1,6 +1,6 @@
 import DHApplicationMixin from './application-mixin.mjs';
-import { actionsTypes } from '../../../data/_module.mjs';
-import DHActionConfig from '../../../config/Action.mjs';
+import DHActionConfig from '../../sheets-configs/action-config.mjs';
+import { actionsTypes } from '../../../data/action/_module.mjs';
 
 const { ItemSheetV2 } = foundry.applications.sheets;
 

module/applications/sheets/items/_module.mjs

@@ -0,0 +1,11 @@
+export { default as Ancestry } from './ancestry.mjs';
+export { default as Armor } from './armor.mjs';
+export { default as Beastform } from './beastform.mjs';
+export { default as Class } from './class.mjs';
+export { default as Community } from './community.mjs';
+export { default as Consumable } from './consumable.mjs';
+export { default as DomainCard } from './domainCard.mjs';
+export { default as Feature } from './feature.mjs';
+export { default as Miscellaneous } from './miscellaneous.mjs';
+export { default as Subclass } from './subclass.mjs';
+export { default as Weapon } from './weapon.mjs';

module/applications/sheets/items/class.mjs

@@ -1,6 +1,6 @@
 import DHBaseItemSheet from '../api/base-item.mjs';
-import { actionsTypes } from '../../../data/_module.mjs';
-import DHActionConfig from '../../../config/Action.mjs';
+import DHActionConfig from '../../sheets-configs/action-config.mjs';
+import { actionsTypes } from '../../../data/action/_module.mjs';
 
 const { TextEditor } = foundry.applications.ux;
 

module/applications/sheets/items/subclass.mjs

@@ -1,6 +1,6 @@
 import DHBaseItemSheet from '../api/base-item.mjs';
-import { actionsTypes } from '../../../data/_module.mjs';
-import DHActionConfig from '../../../config/Action.mjs';
+import DHActionConfig from '../../sheets-configs/action-config.mjs';
+import { actionsTypes } from '../../../data/action/_module.mjs';
 
 export default class SubclassSheet extends DHBaseItemSheet {
     /**@inheritdoc */

module/applications/ui/_module.mjs

@@ -1,6 +1,4 @@
-import { default as DhChatLog } from './chatLog.mjs';
-import { default as DhCombatTracker } from './combatTracker.mjs';
-import * as DhCountdowns from './countdowns.mjs';
-import { default as DhFearTracker } from './fearTracker.mjs';
-
-export { DhChatLog, DhCombatTracker, DhCountdowns, DhFearTracker };
+export { default as DhChatLog } from './chatLog.mjs';
+export { default as DhCombatTracker } from './combatTracker.mjs';
+export * as DhCountdowns from './countdowns.mjs';
+export { default as DhFearTracker } from './fearTracker.mjs';

module/applications/ui/chatLog.mjs

@@ -1,5 +1,3 @@
-import { actionsTypes } from '../../data/_module.mjs';
-
 export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLog {
     constructor() {
         super();
@@ -260,10 +258,10 @@ export default class DhpChatLog extends foundry.applications.sidebar.tabs.ChatLo
 
     actionUseButton = async (_, message) => {
         const parent = await foundry.utils.fromUuid(message.system.actor);
-        const testAction = Object.values(message.system.moves)[0].actions[0];
-        const cls = actionsTypes[testAction.type];
+        const actionType = Object.values(message.system.moves)[0].actions[0];
+        const cls = CONFIG.DH.ACTIONS.actionTypes[actionType.type];
         const action = new cls(
-            { ...testAction, _id: foundry.utils.randomID(), name: game.i18n.localize(testAction.name) },
+            { ...actionType, _id: foundry.utils.randomID(), name: game.i18n.localize(actionType.name) },
             { parent: parent }
         );
 

module/applications/ux/_module.mjs

@@ -1 +1,2 @@
 export { default as FilterMenu } from './filter-menu.mjs';
+export { default as ContextMenu } from './contextMenu.mjs';