Skip to content

Bugfixes #296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ClipplerBlood merged 2 commits into from
Feb 20, 2026
Merged

Bugfixes #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf5fa27
BugFix: specialDuration expiration removal
Feb 19, 2026
11e42d7
BugFix: dlHideItem2025Trait HandleBars helper
Feb 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/lang/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,7 @@
"DL.DialogDoYouStartYourTurnWithLOSCreature":"Do you start your turn with line of sight to the following creature?",
"DL.DialogDoYouStartYourTurnWithLOSCreatures":"Do you start your turn with line of sight to the following creatures?",
"DL.DialogInvalidRollFormula": "Invalid Roll Formula: {rollFormula}!",
"DL.DialogEffectsWillNotExpire": "Source actor is not on the scene! Effects with special duration 'TurnStartSource' and 'TurnEndSource' will NOT expire.",
"DL.DialogFortuneAwarded": "Awarded a Fortune point.",
"DL.DialogFortuneExpended": "Expended a Fortune point.",
"DL.DialogHealedFor": "Healed ",
Expand Down
4 changes: 3 additions & 1 deletion src/module/chat/chat-listeners.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,10 @@ async function _onChatApplyEffect(event) {
let aeUuid = activeEffect.uuid
let effectOrigin = aeUuid.substr(0, aeUuid.search('.ActiveEffect.'))
let effectOriginName = fromUuidSync(effectOrigin).name
if (activeEffect.origin.startsWith('Compendium')) {
if (activeEffect.origin.startsWith('Compendium') || ['TurnStartSource', 'TurnEndSource'].includes(foundry.utils.getProperty(effectData, `flags.${game.system.id}.specialDuration`))) {
effectData.origin = effectOrigin
if (['TurnStartSource', 'TurnEndSource'].includes(foundry.utils.getProperty(effectData, `flags.${game.system.id}.specialDuration`)) && effectData.origin.startsWith('Actor'))
ui.notifications.warn(game.i18n.localize('DL.DialogEffectsWillNotExpire'))
}
if (effectData.name !== effectOriginName) effectData.name = `${effectData.name} [${effectOriginName}]`

Expand Down
2 changes: 1 addition & 1 deletion src/module/utils/handlebars-helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export function registerHandlebarsHelpers() {
})

Handlebars.registerHelper('dlHideItem2025Trait', function (a) {
return ( game.settings.get('demonlord', 'optionalRuleHide2025FHTraits') && !game.settings.get('demonlord', 'optionalRuleTraitMode2025') && [game.i18n.localize('DL.CreatureHorrifying').toLowerCase(), game.i18n.localize('DL.CreatureFrightening').toLowerCase()].find(x => x === a.toLowerCase()!== undefined))
return ( game.settings.get('demonlord', 'optionalRuleHide2025FHTraits') && !game.settings.get('demonlord', 'optionalRuleTraitMode2025') && ([game.i18n.localize('DL.CreatureHorrifying').toLowerCase(), game.i18n.localize('DL.CreatureFrightening').toLowerCase()].find(x => x === a.toLowerCase()) !== undefined))
})

Handlebars.registerHelper('enrichHTMLUnrolled', async (x) => await TextEditor.enrichHTML(x, { unrolled: true }))
Expand Down