cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-04-21 15:03:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Run lint fix on action areas PR (#1820)

Browse source
This commit is contained in:
Carlos Fernandez 2026-04-21 00:13:18 -04:00 • committed by GitHub
parent f348b64aae
commit c57266e596
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 72 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

6
module/applications/sheets-configs/action-config.mjs
View file

@ -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);
}

7
module/applications/sheets-configs/action-settings-config.mjs
View file

@ -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),

9
module/canvas/placeables/regionLayer.mjs
View file

@ -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;

9
module/data/activeEffect/baseEffect.mjs
View file

@ -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' }
)
};
}

2
module/data/chat-message/abilityUse.mjs
View file

@ -11,7 +11,7 @@ export default class DHAbilityUse extends foundry.abstract.TypeDataModel {
actor: new fields.StringField(),
item: new fields.StringField(),
action: new fields.StringField()
}),
})
};
}

2
module/data/fields/action/areaField.mjs
View file

@ -33,7 +33,7 @@ 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);
}

2
module/data/fields/actionField.mjs
View file

@ -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 : '')

18
module/data/regionBehavior/applyActiveEffect.mjs
View file

@ -1,21 +1,23 @@
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 ) {
for (const effect of effects) {
const data = effect.toObject();
delete data._id;
if ( effect.compendium ) {
if (effect.compendium) {
data._stats.duplicateSource = null;
data._stats.compendiumSource = effect.uuid;
} else {
@ -26,13 +28,13 @@ export default class DhApplyActiveEffect extends CONFIG.RegionBehavior.dataModel
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,
[CONST.REGION_EVENTS.TOKEN_ENTER]: this.#onTokenEnter
};
}

17
module/documents/chatMessage.mjs
View file

@ -254,7 +254,7 @@ 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 shapeData = CONFIG.Canvas.layers.regions.layerClass.getTemplateShape({ type, range });
@ -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: [{
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) {
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,

2
module/enrichers/TemplateEnricher.mjs
View file

@ -61,7 +61,7 @@ export const renderMeasuredTemplate = async event => {
type,
angle,
range,
direction,
direction
});
await canvas.regions.placeRegion(

2
module/helpers/handlebarsHelper.mjs
View file

@ -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) {