cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-04-23 07:53:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixes

Browse source
This commit is contained in:
WBHarry 2026-03-16 15:25:39 +01:00
parent f605ea7035
commit 18d9870ccf
5 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
module/canvas/placeables/token.mjs
View file

@ -21,7 +21,7 @@ export default class DhTokenPlaceable extends foundry.canvas.placeables.Token {
this.effects.overlay = null; this.effects.overlay = null;
// Categorize effects // Categorize effects
const activeEffects = getIconVisibleActiveEffects(Array.from(this.actor?.allApplicableEffects() ?? [])); const activeEffects = getIconVisibleActiveEffects(Array.from(this.actor?.getActiveEffects() ?? []));
const overlayEffect = activeEffects.findLast(e => e.img && e.getFlag?.('core', 'overlay')); const overlayEffect = activeEffects.findLast(e => e.img && e.getFlag?.('core', 'overlay'));
// Draw effects // Draw effects

2
module/documents/tooltipManager.mjs
View file

@ -182,7 +182,7 @@ export default class DhTooltipManager extends foundry.helpers.interaction.Toolti
); );
html = content; html = content;
} }
if (text && html) throw new Error('Cannot provide both text and html options to TooltipManager#activate.');
// Deactivate currently active element // Deactivate currently active element
this.deactivate(); this.deactivate();
// Check if the element still exists in the DOM. // Check if the element still exists in the DOM.

2
module/helpers/handlebarsHelper.mjs
View file

@ -49,7 +49,7 @@ export default class RegisterHandlebarsHelpers {
} }
static damageSymbols(damageParts) { static damageSymbols(damageParts) {
const symbols = [...new Set(damageParts.map(x => x.type))].map(p => CONFIG.DH.GENERAL.damageTypes[p].icon); const symbols = new Set(...damageParts.map(x => x.type)).map(p => CONFIG.DH.GENERAL.damageTypes[p].icon);
return new Handlebars.SafeString(Array.from(symbols).map(symbol => `<i class="fa-solid ${symbol}"></i>`)); return new Handlebars.SafeString(Array.from(symbols).map(symbol => `<i class="fa-solid ${symbol}"></i>`));
} }

5
module/helpers/utils.mjs
View file

@ -542,10 +542,7 @@ export function getIconVisibleActiveEffects(effects) {
return effects.filter(effect => { return effects.filter(effect => {
if (!(effect instanceof game.system.api.documents.DhActiveEffect)) return true; if (!(effect instanceof game.system.api.documents.DhActiveEffect)) return true;
const alwaysShown = effect.showIcon === CONST.ACTIVE_EFFECT_SHOW_ICON.ALWAYS; return effect.active && effect.showIcon >= CONST.ACTIVE_EFFECT_SHOW_ICON.CONDITIONAL;
const conditionalShown = effect.showIcon === CONST.ACTIVE_EFFECT_SHOW_ICON.CONDITIONAL && !effect.transfer; // TODO: system specific logic
return !effect.active && (alwaysShown || conditionalShown);
}); });
} }
export async function getFeaturesHTMLData(features) { export async function getFeaturesHTMLData(features) {

4
templates/sheets/activeEffect/conditionals.hbs
View file

@ -22,7 +22,7 @@
<label>{{localize "EFFECT.FIELDS.changes.element.key.label"}}</label> <label>{{localize "EFFECT.FIELDS.changes.element.key.label"}}</label>
<div class="form-fields"> <div class="form-fields">
<select name="{{concat "system.conditionals." index ".key"}}"> <select {{#if (eq conditional.type 'status')}}name="{{concat "system.conditionals." index ".key"}}"{{/if}}>
{{selectOptions ../statusChoices selected=conditional.key labelAttr="label" valueAttr="id" blank="" localize=true}} {{selectOptions ../statusChoices selected=conditional.key labelAttr="label" valueAttr="id" blank="" localize=true}}
</select> </select>
</div> </div>
@ -32,7 +32,7 @@
<label>{{localize "EFFECT.FIELDS.changes.element.key.label"}}</label> <label>{{localize "EFFECT.FIELDS.changes.element.key.label"}}</label>
<div class="form-fields"> <div class="form-fields">
<input type="text" class="effect-change-input" name="{{concat "system.conditionals." index ".key"}}" value="{{conditional.key}}" /> <input type="text" class="effect-change-input" {{#if (eq conditional.type 'attribute')}}name="{{concat "system.conditionals." index ".key"}}"{{/if}} value="{{conditional.key}}" />
</div> </div>
</div> </div>