diff --git a/lang/en.json b/lang/en.json index e358977f..0186ae3e 100755 --- a/lang/en.json +++ b/lang/en.json @@ -2405,6 +2405,14 @@ "hideAttribution": { "label": "Hide Attribution" }, + "showTokenDistance": { + "label": "Show Token Distance on Hover", + "choices": { + "always": "Always", + "encounters": "Encounters", + "never": "Never" + } + }, "expandedTitle": "Auto-expand Descriptions", "extendCharacterDescriptions": { "label": "Characters" diff --git a/module/applications/settings/homebrewSettings.mjs b/module/applications/settings/homebrewSettings.mjs index cecd12d7..38fe9ece 100644 --- a/module/applications/settings/homebrewSettings.mjs +++ b/module/applications/settings/homebrewSettings.mjs @@ -165,7 +165,8 @@ export default class DhHomebrewSettings extends HandlebarsApplicationMixin(Appli name: game.i18n.localize('DAGGERHEART.SETTINGS.Homebrew.newDowntimeMove'), img: 'icons/magic/life/cross-worn-green.webp', description: '', - actions: [] + actions: [], + effects: [] } }); } else if (['armorFeatures', 'weaponFeatures'].includes(type)) { diff --git a/module/canvas/placeables/measuredTemplate.mjs b/module/canvas/placeables/measuredTemplate.mjs index ef7d284b..e1ea79f5 100644 --- a/module/canvas/placeables/measuredTemplate.mjs +++ b/module/canvas/placeables/measuredTemplate.mjs @@ -18,8 +18,9 @@ export default class DhMeasuredTemplate extends foundry.canvas.placeables.Measur static getRangeLabels(distanceValue, settings) { let result = { distance: distanceValue, units: '' }; - const sceneRangeMeasurement = canvas.scene.flags.daggerheart?.rangeMeasurement; + if (!settings.enabled) return result; + const sceneRangeMeasurement = canvas.scene.flags.daggerheart?.rangeMeasurement; const { disable, custom } = CONFIG.DH.GENERAL.sceneRangeMeasurementSetting; if (sceneRangeMeasurement?.setting === disable.id) { result.distance = distanceValue; @@ -27,31 +28,9 @@ export default class DhMeasuredTemplate extends foundry.canvas.placeables.Measur return result; } - const melee = sceneRangeMeasurement?.setting === custom.id ? sceneRangeMeasurement.melee : settings.melee; - const veryClose = - sceneRangeMeasurement?.setting === custom.id ? sceneRangeMeasurement.veryClose : settings.veryClose; - const close = sceneRangeMeasurement?.setting === custom.id ? sceneRangeMeasurement.close : settings.close; - const far = sceneRangeMeasurement?.setting === custom.id ? sceneRangeMeasurement.far : settings.far; - if (distanceValue <= melee) { - result.distance = game.i18n.localize('DAGGERHEART.CONFIG.Range.melee.name'); - return result; - } - if (distanceValue <= veryClose) { - result.distance = game.i18n.localize('DAGGERHEART.CONFIG.Range.veryClose.name'); - return result; - } - if (distanceValue <= close) { - result.distance = game.i18n.localize('DAGGERHEART.CONFIG.Range.close.name'); - return result; - } - if (distanceValue <= far) { - result.distance = game.i18n.localize('DAGGERHEART.CONFIG.Range.far.name'); - return result; - } - if (distanceValue > far) { - result.distance = game.i18n.localize('DAGGERHEART.CONFIG.Range.veryFar.name'); - } - + const ranges = sceneRangeMeasurement?.setting === custom.id ? sceneRangeMeasurement : settings; + const distanceKey = ['melee', 'veryClose', 'close', 'far'].find(r => ranges[r] >= distanceValue); + result.distance = game.i18n.localize(`DAGGERHEART.CONFIG.Range.${distanceKey ?? 'veryFar'}.name`); return result; } } diff --git a/module/canvas/placeables/token.mjs b/module/canvas/placeables/token.mjs index 2266d0da..7bd92226 100644 --- a/module/canvas/placeables/token.mjs +++ b/module/canvas/placeables/token.mjs @@ -1,3 +1,5 @@ +import DhMeasuredTemplate from './measuredTemplate.mjs'; + export default class DhTokenPlaceable extends foundry.canvas.placeables.Token { /** @inheritdoc */ async _draw(options) { @@ -78,6 +80,60 @@ export default class DhTokenPlaceable extends foundry.canvas.placeables.Token { return canvas.grid.measurePath([adjustedOriginPoint, adjustDestinationPoint]).distance; } + _onHoverIn(event, options) { + super._onHoverIn(event, options); + + // Check if the setting is enabled + const setting = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.appearance).showTokenDistance; + if (setting === 'never' || (setting === 'encounters' && !game.combat?.started)) return; + + // Check if this token isn't invisible and is actually being hovered + const isTokenValid = + this.visible && + this.hover && + !this.isPreview && + !this.document.isSecret && + !this.controlled && + !this.animation; + if (!isTokenValid) return; + + // Ensure we have a single controlled token + const originToken = canvas.tokens.controlled[0]; + if (!originToken || canvas.tokens.controlled.length > 1) return; + + // Determine the actual range + const ranges = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.variantRules).rangeMeasurement; + const distanceNum = originToken.distanceTo(this); + const distanceResult = DhMeasuredTemplate.getRangeLabels(distanceNum, ranges); + const distanceLabel = `${distanceResult.distance} ${distanceResult.units}`.trim(); + + // Create the element + const element = document.createElement('div'); + element.id = 'token-hover-distance'; + element.classList.add('waypoint-label', 'last'); + const ruler = document.createElement('i'); + ruler.classList.add('fa-solid', 'fa-ruler'); + element.appendChild(ruler); + const labelEl = document.createElement('span'); + labelEl.classList.add('total-measurement'); + labelEl.textContent = distanceLabel; + element.appendChild(labelEl); + + // Position the element and add to the DOM + const center = this.getCenterPoint(); + element.style.setProperty('--transformY', 'calc(-100% - 10px)'); + element.style.setProperty('--position-y', `${this.y}px`); + element.style.setProperty('--position-x', `${center.x}px`); + element.style.setProperty('--ui-scale', String(canvas.dimensions.uiScale)); + document.querySelector('#token-hover-distance')?.remove(); + document.querySelector('#measurement').appendChild(element); + } + + _onHoverOut(...args) { + super._onHoverOut(...args); + document.querySelector('#token-hover-distance')?.remove(); + } + /** Returns the point at which a line starting at origin and ending at destination intersects the edge of the bounds */ #getEdgeBoundary(bounds, originPoint, destinationPoint) { const points = [ diff --git a/module/data/action/baseAction.mjs b/module/data/action/baseAction.mjs index 115e6463..e843027b 100644 --- a/module/data/action/baseAction.mjs +++ b/module/data/action/baseAction.mjs @@ -114,9 +114,24 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel * Return Item the action is attached too. */ get item() { + if (!this.parent.parent && this.systemPath) + return foundry.utils.getProperty(this.parent, this.systemPath).get(this.id); + return this.parent.parent; } + get applyEffects() { + if (this.item.systemPath) { + const itemEffectIds = this.item.effects.map(x => x._id); + const movePathSplit = this.item.systemPath.split('.'); + movePathSplit.pop(); + const move = foundry.utils.getProperty(this.parent, movePathSplit.join('.')); + return new Collection(itemEffectIds.map(id => [id, move.effects.find(x => x.id === id)])); + } + + return this.item.effects; + } + /** * Return the first Actor parent found. */ @@ -125,7 +140,7 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel ? this.item : this.item?.parent instanceof DhpActor ? this.item.parent - : this.item?.actor; + : null; } static getRollType(parent) { diff --git a/module/data/fields/action/effectsField.mjs b/module/data/fields/action/effectsField.mjs index 2233a383..6afd470b 100644 --- a/module/data/fields/action/effectsField.mjs +++ b/module/data/fields/action/effectsField.mjs @@ -73,7 +73,7 @@ export default class EffectsField extends fields.ArrayField { }); effects.forEach(async e => { - const effect = this.item.effects.get(e._id); + const effect = (this.item.applyEffects ?? this.item.effects).get(e._id); if (!token.actor || !effect) return; await EffectsField.applyEffect(effect, token.actor); }); @@ -96,7 +96,7 @@ export default class EffectsField extends fields.ArrayField { content: await foundry.applications.handlebars.renderTemplate( 'systems/daggerheart/templates/ui/chat/effectSummary.hbs', { - effects: this.effects.map(e => this.item.effects.get(e._id)), + effects: this.effects.map(e => (this.item.applyEffects ?? this.item.effects).get(e._id)), targets: messageTargets } ) @@ -123,7 +123,7 @@ export default class EffectsField extends fields.ArrayField { // Otherwise, create a new effect on the target const effectData = foundry.utils.mergeObject({ - ...effect.toObject(), + ...(effect.toObject?.() ?? effect), disabled: false, transfer: false, origin: effect.uuid diff --git a/module/data/fields/actionField.mjs b/module/data/fields/actionField.mjs index d0cc808b..21dafd60 100644 --- a/module/data/fields/actionField.mjs +++ b/module/data/fields/actionField.mjs @@ -159,6 +159,7 @@ export function ActionMixin(Base) { } get uuid() { + if (!(this.item instanceof game.system.api.documents.DHItem)) return null; return `${this.item.uuid}.${this.documentName}.${this.id}`; } diff --git a/module/data/settings/Appearance.mjs b/module/data/settings/Appearance.mjs index 2b8d3b27..d7a638d7 100644 --- a/module/data/settings/Appearance.mjs +++ b/module/data/settings/Appearance.mjs @@ -42,6 +42,25 @@ export default class DhAppearance extends foundry.abstract.DataModel { damage: new BooleanField(), target: new BooleanField() }), + showTokenDistance: new StringField({ + required: true, + choices: { + always: { + value: 'always', + label: 'DAGGERHEART.SETTINGS.Appearance.FIELDS.showTokenDistance.choices.always' + }, + encounters: { + value: 'encounters', + label: 'DAGGERHEART.SETTINGS.Appearance.FIELDS.showTokenDistance.choices.encounters' + }, + never: { + value: 'never', + label: 'DAGGERHEART.SETTINGS.Appearance.FIELDS.showTokenDistance.choices.never' + } + }, + nullable: false, + initial: 'always' + }), hideAttribution: new BooleanField(), showGenericStatusEffects: new BooleanField({ initial: true }) }; diff --git a/module/data/settings/Homebrew.mjs b/module/data/settings/Homebrew.mjs index 0138713c..b8804fa7 100644 --- a/module/data/settings/Homebrew.mjs +++ b/module/data/settings/Homebrew.mjs @@ -12,6 +12,20 @@ const currencyField = (initial, label, icon) => icon: new foundry.data.fields.StringField({ required: true, nullable: false, blank: true, initial: icon }) }); +const restMoveField = () => + new foundry.data.fields.SchemaField({ + name: new foundry.data.fields.StringField({ required: true }), + icon: new foundry.data.fields.StringField({ required: true }), + img: new foundry.data.fields.FilePathField({ + initial: 'icons/magic/life/cross-worn-green.webp', + categories: ['IMAGE'], + base64: false + }), + description: new foundry.data.fields.HTMLField(), + actions: new ActionsField(), + effects: new foundry.data.fields.ArrayField(new foundry.data.fields.ObjectField()) + }); + export default class DhHomebrew extends foundry.abstract.DataModel { static defineSchema() { const fields = foundry.data.fields; @@ -105,37 +119,11 @@ export default class DhHomebrew extends foundry.abstract.DataModel { restMoves: new fields.SchemaField({ longRest: new fields.SchemaField({ nrChoices: new fields.NumberField({ required: true, integer: true, min: 1, initial: 2 }), - moves: new fields.TypedObjectField( - new fields.SchemaField({ - name: new fields.StringField({ required: true }), - icon: new fields.StringField({ required: true }), - img: new fields.FilePathField({ - initial: 'icons/magic/life/cross-worn-green.webp', - categories: ['IMAGE'], - base64: false - }), - description: new fields.HTMLField(), - actions: new ActionsField() - }), - { initial: defaultRestOptions.longRest() } - ) + moves: new fields.TypedObjectField(restMoveField(), { initial: defaultRestOptions.longRest() }) }), shortRest: new fields.SchemaField({ nrChoices: new fields.NumberField({ required: true, integer: true, min: 1, initial: 2 }), - moves: new fields.TypedObjectField( - new fields.SchemaField({ - name: new fields.StringField({ required: true }), - icon: new fields.StringField({ required: true }), - img: new fields.FilePathField({ - initial: 'icons/magic/life/cross-worn-green.webp', - categories: ['IMAGE'], - base64: false - }), - description: new fields.HTMLField(), - actions: new ActionsField() - }), - { initial: defaultRestOptions.shortRest() } - ) + moves: new fields.TypedObjectField(restMoveField(), { initial: defaultRestOptions.shortRest() }) }) }), domains: new fields.TypedObjectField( diff --git a/module/documents/token.mjs b/module/documents/token.mjs index 317f3acf..b9507c2f 100644 --- a/module/documents/token.mjs +++ b/module/documents/token.mjs @@ -269,7 +269,7 @@ export default class DHToken extends CONFIG.Token.documentClass { // Hexagon symmetry if (columns) { - const rowData = BaseToken.#getHexagonalShape(height, width, shape, false); + const rowData = DHToken.#getHexagonalShape(height, width, shape, false); if (!rowData) return null; // Transpose the offsets/points of the shape in row orientation diff --git a/templates/settings/appearance-settings/main.hbs b/templates/settings/appearance-settings/main.hbs index 75a7e634..32dd9e63 100644 --- a/templates/settings/appearance-settings/main.hbs +++ b/templates/settings/appearance-settings/main.hbs @@ -16,6 +16,10 @@ value=setting.showGenericStatusEffects localize=true}} {{formGroup + fields.showTokenDistance + value=setting.showTokenDistance + localize=true}} + {{formGroup fields.hideAttribution value=setting.hideAttribution localize=true}}