diff --git a/module/applications/sheets-configs/action-config.mjs b/module/applications/sheets-configs/action-config.mjs index d5adb79c..f991187f 100644 --- a/module/applications/sheets-configs/action-config.mjs +++ b/module/applications/sheets-configs/action-config.mjs @@ -28,10 +28,8 @@ export default class DHActionConfig extends DHActionBaseConfig { game.system.api.data.activeEffects.BaseEffect.getDefaultObject({ transfer: false }) ]); - if (areaIndex !== undefined) - data.area[areaIndex].effects.push(created[0]._id); - else - data.effects.push({ _id: created[0]._id }); + if (areaIndex !== undefined) data.area[areaIndex].effects.push(created[0]._id); + else data.effects.push({ _id: created[0]._id }); this.constructor.updateForm.bind(this)(null, null, { object: foundry.utils.flattenObject(data) }); this.action.item.effects.get(created[0]._id).sheet.render(true); } @@ -57,14 +55,14 @@ export default class DHActionConfig extends DHActionBaseConfig { static removeEffect(event, button) { if (!this.action.effects) return; - const { areaIndex, index } = button.dataset; - let effectId = null; + const { areaIndex, index } = button.dataset; + let effectId = null; if (areaIndex !== undefined) { effectId = this.action.area[areaIndex].effects[index]; const data = this.action.toObject(); data.area[areaIndex].effects.splice(index, 1); this.constructor.updateForm.call(this, null, null, { object: foundry.utils.flattenObject(data) }); - } else { + } else { effectId = this.action.effects[index]._id; this.constructor.removeElement.call(this, event, button); } diff --git a/module/applications/sheets-configs/action-settings-config.mjs b/module/applications/sheets-configs/action-settings-config.mjs index 5ec9fb5f..fd62f621 100644 --- a/module/applications/sheets-configs/action-settings-config.mjs +++ b/module/applications/sheets-configs/action-settings-config.mjs @@ -40,10 +40,8 @@ export default class DHActionSettingsConfig extends DHActionBaseConfig { this.sheetUpdate(data, effectData); this.effects = [...this.effects, effectData]; - if(areaIndex !== undefined) - data.area[areaIndex].effects.push(effectData.id); - else - data.effects.push({ _id: effectData.id }); + if (areaIndex !== undefined) data.area[areaIndex].effects.push(effectData.id); + else data.effects.push({ _id: effectData.id }); this.constructor.updateForm.bind(this)(null, null, { object: foundry.utils.flattenObject(data) }); } @@ -62,7 +60,6 @@ export default class DHActionSettingsConfig extends DHActionBaseConfig { this.constructor.removeElement.call(this, event, button); } - this.sheetUpdate( this.action.toObject(), this.effects.find(x => x.id === effectId), diff --git a/module/canvas/placeables/regionLayer.mjs b/module/canvas/placeables/regionLayer.mjs index 44a5e630..56f3084b 100644 --- a/module/canvas/placeables/regionLayer.mjs +++ b/module/canvas/placeables/regionLayer.mjs @@ -100,7 +100,11 @@ export default class DhRegionLayer extends foundry.canvas.layers.RegionLayer { const { line, rectangle, inFront, cone } = CONFIG.DH.GENERAL.templateTypes; const usedAngle = - type === cone.id ? (angle ?? CONFIG.MeasuredTemplate.defaults.angle) : type === inFront.id ? '180' : undefined; + type === cone.id + ? (angle ?? CONFIG.MeasuredTemplate.defaults.angle) + : type === inFront.id + ? '180' + : undefined; const { grid, distance } = CONFIG.Scene.documentClass.schema.fields.grid.fields; const sceneGridSize = canvas.scene?.grid.size ?? grid.size.initial; @@ -109,7 +113,8 @@ export default class DhRegionLayer extends foundry.canvas.layers.RegionLayer { const rangeNumber = Number(range); const settings = canvas.scene?.rangeSettings; - const baseDistance = (!Number.isNaN(rangeNumber) ? rangeNumber : (settings ? settings[range] : 0)) * dimensionConstant; + const baseDistance = + (!Number.isNaN(rangeNumber) ? rangeNumber : settings ? settings[range] : 0) * dimensionConstant; const length = baseDistance; const radius = length; diff --git a/module/config/actionConfig.mjs b/module/config/actionConfig.mjs index 38e85805..a6c04e18 100644 --- a/module/config/actionConfig.mjs +++ b/module/config/actionConfig.mjs @@ -121,4 +121,4 @@ export const areaTypes = { id: 'placed', label: 'Placed Area' } -}; \ No newline at end of file +}; diff --git a/module/config/generalConfig.mjs b/module/config/generalConfig.mjs index e7b2614d..6fc85ec5 100644 --- a/module/config/generalConfig.mjs +++ b/module/config/generalConfig.mjs @@ -1124,4 +1124,4 @@ export const simpleDispositions = { id: 1, label: 'TOKEN.DISPOSITION.FRIENDLY' } -}; \ No newline at end of file +}; diff --git a/module/data/activeEffect/baseEffect.mjs b/module/data/activeEffect/baseEffect.mjs index 46de63b0..4037ca0e 100644 --- a/module/data/activeEffect/baseEffect.mjs +++ b/module/data/activeEffect/baseEffect.mjs @@ -94,9 +94,12 @@ export default class BaseEffect extends foundry.data.ActiveEffectTypeDataModel { }, { nullable: true, initial: null } ), - targetDispositions: new fields.SetField(new fields.NumberField({ - choices: CONFIG.DH.GENERAL.simpleDispositions, - }), { label: 'Affected Dispositions' }), + targetDispositions: new fields.SetField( + new fields.NumberField({ + choices: CONFIG.DH.GENERAL.simpleDispositions + }), + { label: 'Affected Dispositions' } + ) }; } diff --git a/module/data/chat-message/abilityUse.mjs b/module/data/chat-message/abilityUse.mjs index 3c209355..f5986d0f 100644 --- a/module/data/chat-message/abilityUse.mjs +++ b/module/data/chat-message/abilityUse.mjs @@ -11,7 +11,7 @@ export default class DHAbilityUse extends foundry.abstract.TypeDataModel { actor: new fields.StringField(), item: new fields.StringField(), action: new fields.StringField() - }), + }) }; } diff --git a/module/data/fields/action/areaField.mjs b/module/data/fields/action/areaField.mjs index 28db74fe..a45af8dc 100644 --- a/module/data/fields/action/areaField.mjs +++ b/module/data/fields/action/areaField.mjs @@ -33,8 +33,8 @@ export default class AreaField extends fields.ArrayField { initial: CONFIG.DH.GENERAL.range.veryClose.id, label: 'DAGGERHEART.ACTIONS.Config.area.size' }), - effects: new fields.ArrayField(new fields.DocumentIdField()), + effects: new fields.ArrayField(new fields.DocumentIdField()) }); super(element, options, context); } -} \ No newline at end of file +} diff --git a/module/data/fields/actionField.mjs b/module/data/fields/actionField.mjs index d4698d4a..7bdd75f8 100644 --- a/module/data/fields/actionField.mjs +++ b/module/data/fields/actionField.mjs @@ -287,7 +287,7 @@ export function ActionMixin(Base) { source: { actor: this.actor.uuid, item: this.item.id, - action: this.id, + action: this.id }, itemOrigin: this.item, description: this.description || (this.item instanceof Item ? this.item.system.description : '') diff --git a/module/data/regionBehavior/_module.mjs b/module/data/regionBehavior/_module.mjs index 7a8893de..d0c8172d 100644 --- a/module/data/regionBehavior/_module.mjs +++ b/module/data/regionBehavior/_module.mjs @@ -1 +1 @@ -export { default as applyActiveEffect } from './applyActiveEffect.mjs'; \ No newline at end of file +export { default as applyActiveEffect } from './applyActiveEffect.mjs'; diff --git a/module/data/regionBehavior/applyActiveEffect.mjs b/module/data/regionBehavior/applyActiveEffect.mjs index 4be262c2..51406cfa 100644 --- a/module/data/regionBehavior/applyActiveEffect.mjs +++ b/module/data/regionBehavior/applyActiveEffect.mjs @@ -1,38 +1,40 @@ export default class DhApplyActiveEffect extends CONFIG.RegionBehavior.dataModels.applyActiveEffect { static async #getApplicableEffects(token) { const effects = await Promise.all(this.effects.map(foundry.utils.fromUuid)); - return effects.filter(effect => !effect.system.targetDispositions.size || effect.system.targetDispositions.has(token.disposition)); + return effects.filter( + effect => !effect.system.targetDispositions.size || effect.system.targetDispositions.has(token.disposition) + ); } static async #onTokenEnter(event) { - if ( !event.user.isSelf ) return; - const {token, movement} = event.data; + if (!event.user.isSelf) return; + const { token, movement } = event.data; const actor = token.actor; - if ( !actor ) return; + if (!actor) return; const resumeMovement = movement ? token.pauseMovement() : undefined; const effects = await DhApplyActiveEffect.#getApplicableEffects.bind(this)(event.data.token); const toCreate = []; - for ( const effect of effects ) { - const data = effect.toObject(); - delete data._id; - if ( effect.compendium ) { - data._stats.duplicateSource = null; - data._stats.compendiumSource = effect.uuid; - } else { - data._stats.duplicateSource = effect.uuid; - data._stats.compendiumSource = null; + for (const effect of effects) { + const data = effect.toObject(); + delete data._id; + if (effect.compendium) { + data._stats.duplicateSource = null; + data._stats.compendiumSource = effect.uuid; + } else { + data._stats.duplicateSource = effect.uuid; + data._stats.compendiumSource = null; + } + data._stats.exportSource = null; + data.origin = this.parent.uuid; + toCreate.push(data); } - data._stats.exportSource = null; - data.origin = this.parent.uuid; - toCreate.push(data); - } - if ( toCreate.length ) await actor.createEmbeddedDocuments("ActiveEffect", toCreate); + if (toCreate.length) await actor.createEmbeddedDocuments('ActiveEffect', toCreate); await resumeMovement?.(); } - /** @override */ - static events = { - ...CONFIG.RegionBehavior.dataModels.applyActiveEffect.events, - [CONST.REGION_EVENTS.TOKEN_ENTER]: this.#onTokenEnter, - }; -} \ No newline at end of file + /** @override */ + static events = { + ...CONFIG.RegionBehavior.dataModels.applyActiveEffect.events, + [CONST.REGION_EVENTS.TOKEN_ENTER]: this.#onTokenEnter + }; +} diff --git a/module/documents/chatMessage.mjs b/module/documents/chatMessage.mjs index 4839e433..6f3080f4 100644 --- a/module/documents/chatMessage.mjs +++ b/module/documents/chatMessage.mjs @@ -137,7 +137,7 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage { element.addEventListener('click', this.onApplyEffect.bind(this)) ); - html.querySelectorAll('.action-areas').forEach(element => + html.querySelectorAll('.action-areas').forEach(element => element.addEventListener('click', this.onCreateAreas.bind(this)) ); @@ -254,9 +254,9 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage { } async onCreateAreas(event) { - const createArea = async (selectedArea) => { + const createArea = async selectedArea => { const effects = selectedArea.effects.map(effect => this.system.action.item.effects.get(effect).uuid); - const { shape: type, size: range } = selectedArea; + const { shape: type, size: range } = selectedArea; const shapeData = CONFIG.Canvas.layers.regions.layerClass.getTemplateShape({ type, range }); await canvas.regions.placeRegion( @@ -264,13 +264,15 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage { name: selectedArea.name, shapes: [shapeData], restriction: { enabled: false, type: 'move', priority: 0 }, - behaviors: [{ - name: game.i18n.localize('TYPES.RegionBehavior.applyActiveEffect'), - type: 'applyActiveEffect', - system: { - effects: effects + behaviors: [ + { + name: game.i18n.localize('TYPES.RegionBehavior.applyActiveEffect'), + type: 'applyActiveEffect', + system: { + effects: effects + } } - }], + ], displayMeasurements: true, locked: false, ownership: { default: CONST.DOCUMENT_OWNERSHIP_LEVELS.NONE }, @@ -278,18 +280,17 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage { }, { create: true } ); - } + }; - if (this.system.action.area.length === 1) - createArea(this.system.action.area[0]); - else if(this.system.action.area.length > 1) { - /* Pop a selection. Possibly a context menu? */ + if (this.system.action.area.length === 1) createArea(this.system.action.area[0]); + else if (this.system.action.area.length > 1) { + /* Pop a selection. Possibly a context menu? */ new foundry.applications.ux.ContextMenu.implementation( event.target, '.action-areas', this.system.action.area.map((area, index) => ({ name: area.name, - callback: () => createArea(this.system.action.area[index]), + callback: () => createArea(this.system.action.area[index]) })), { jQuery: false, diff --git a/module/enrichers/TemplateEnricher.mjs b/module/enrichers/TemplateEnricher.mjs index 1480b8d0..8db3ec14 100644 --- a/module/enrichers/TemplateEnricher.mjs +++ b/module/enrichers/TemplateEnricher.mjs @@ -61,7 +61,7 @@ export const renderMeasuredTemplate = async event => { type, angle, range, - direction, + direction }); await canvas.regions.placeRegion( @@ -77,4 +77,4 @@ export const renderMeasuredTemplate = async event => { }, { create: true } ); -}; \ No newline at end of file +}; diff --git a/module/helpers/handlebarsHelper.mjs b/module/helpers/handlebarsHelper.mjs index 80e8df92..7f30d970 100644 --- a/module/helpers/handlebarsHelper.mjs +++ b/module/helpers/handlebarsHelper.mjs @@ -16,7 +16,7 @@ export default class RegisterHandlebarsHelpers { empty: this.empty, pluralize: this.pluralize, positive: this.positive, - isNullish: this.isNullish, + isNullish: this.isNullish }); } static add(a, b) {