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

Merge branch 'main' into feature/granular-action-outcomes

Browse source
This commit is contained in:
WBHarry 2026-05-14 18:51:33 +02:00
commit 482b932cd6
11 changed files with 188 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lang/en.json
View file

@ -406,7 +406,11 @@
"giveSpotlight": "Give The Spotlight", "giveSpotlight": "Give The Spotlight",
"requestingSpotlight": "Requesting The Spotlight", "requestingSpotlight": "Requesting The Spotlight",
"requestSpotlight": "Request The Spotlight", "requestSpotlight": "Request The Spotlight",
"openCountdowns": "Countdowns" "openCountdowns": "Countdowns",
"adversaryCategories": {
"friendly": "Friendly",
"adversaries": "Adversaries"
}
}, },
"CompendiumBrowserSettings": { "CompendiumBrowserSettings": {
"title": "Enable Compendiums", "title": "Enable Compendiums",

8
module/applications/ui/combatTracker.mjs
View file

@ -56,7 +56,9 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
async _prepareTrackerContext(context, options) { async _prepareTrackerContext(context, options) {
await super._prepareTrackerContext(context, options); await super._prepareTrackerContext(context, options);
const adversaries = context.turns?.filter(x => x.isNPC) ?? []; const npcs = context.turns?.filter(x => x.isNPC) ?? [];
const adversaries = npcs.filter(x => x.disposition !== CONST.TOKEN_DISPOSITIONS.FRIENDLY);
const friendlies = npcs.filter(x => x.disposition === CONST.TOKEN_DISPOSITIONS.FRIENDLY);
const characters = context.turns?.filter(x => !x.isNPC) ?? []; const characters = context.turns?.filter(x => !x.isNPC) ?? [];
const spotlightQueueEnabled = game.settings.get( const spotlightQueueEnabled = game.settings.get(
CONFIG.DH.id, CONFIG.DH.id,
@ -75,6 +77,7 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
Object.assign(context, { Object.assign(context, {
actionTokens: game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.variantRules).actionTokens, actionTokens: game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.variantRules).actionTokens,
adversaries, adversaries,
friendlies,
allCharacters: characters, allCharacters: characters,
characters: characters.filter(x => !spotlightQueueEnabled || x.system.spotlight.requestOrderIndex == 0), characters: characters.filter(x => !spotlightQueueEnabled || x.system.spotlight.requestOrderIndex == 0),
spotlightRequests spotlightRequests
@ -129,7 +132,8 @@ export default class DhCombatTracker extends foundry.applications.sidebar.tabs.C
active: index === combat.turn, active: index === combat.turn,
canPing: combatant.sceneId === canvas.scene?.id && game.user.hasPermission('PING_CANVAS'), canPing: combatant.sceneId === canvas.scene?.id && game.user.hasPermission('PING_CANVAS'),
type: combatant.actor?.system?.type, type: combatant.actor?.system?.type,
img: await this._getCombatantThumbnail(combatant) img: await this._getCombatantThumbnail(combatant),
disposition: combatant.token.disposition
}; };
turn.css = [turn.active ? 'active' : null, hidden ? 'hide' : null, isDefeated ? 'defeated' : null].filterJoin( turn.css = [turn.active ? 'active' : null, hidden ? 'hide' : null, isDefeated ? 'defeated' : null].filterJoin(

18
module/applications/ui/countdowns.mjs
View file

@ -21,10 +21,10 @@ export default class DhCountdowns extends HandlebarsApplicationMixin(Application
static DEFAULT_OPTIONS = { static DEFAULT_OPTIONS = {
id: 'countdowns', id: 'countdowns',
tag: 'div', tag: 'div',
classes: ['daggerheart', 'dh-style', 'countdowns', 'faded-ui'], classes: ['daggerheart', 'dh-style', 'countdowns'],
window: { window: {
icon: 'fa-solid fa-clock-rotate-left', icon: 'fa-solid fa-clock-rotate-left',
frame: true, frame: false,
title: 'DAGGERHEART.UI.Countdowns.title', title: 'DAGGERHEART.UI.Countdowns.title',
positioned: false, positioned: false,
resizable: false, resizable: false,
@ -62,20 +62,6 @@ export default class DhCountdowns extends HandlebarsApplicationMixin(Application
if (iconOnly) frame.classList.add('icon-only'); if (iconOnly) frame.classList.add('icon-only');
else frame.classList.remove('icon-only'); else frame.classList.remove('icon-only');
const header = frame.querySelector('.window-header');
header.querySelector('button[data-action="close"]').remove();
header.querySelector('button[data-action="toggleControls"]').remove();
if (game.user.isGM) {
const editTooltip = game.i18n.localize('DAGGERHEART.APPLICATIONS.CountdownEdit.editTitle');
const editButton = `<a style="margin-right: 8px;" class="header-control" data-tooltip="${editTooltip}" aria-label="${editTooltip}" data-action="editCountdowns"><i class="fa-solid fa-wrench"></i></a>`;
header.insertAdjacentHTML('beforeEnd', editButton);
}
const minimizeTooltip = game.i18n.localize('DAGGERHEART.UI.Countdowns.toggleIconMode');
const minimizeButton = `<a class="header-control" data-tooltip="${minimizeTooltip}" aria-label="${minimizeTooltip}" data-action="toggleViewMode"><i class="fa-solid fa-down-left-and-up-right-to-center"></i></a>`;
header.insertAdjacentHTML('beforeEnd', minimizeButton);
return frame; return frame;
} }

4
module/documents/tooltipManager.mjs
View file

@ -350,7 +350,9 @@ export default class DhTooltipManager extends foundry.helpers.interaction.Toolti
async getBattlepointHTML(combatId) { async getBattlepointHTML(combatId) {
const combat = game.combats.get(combatId); const combat = game.combats.get(combatId);
const adversaries = const adversaries =
combat.turns?.filter(x => x.actor?.isNPC)?.map(x => ({ ...x.actor, type: x.actor.system.type })) ?? []; combat.turns
?.filter(x => x.actor?.isNPC && x.token.disposition === CONST.TOKEN_DISPOSITIONS.HOSTILE)
?.map(x => ({ ...x.actor, type: x.actor.system.type })) ?? [];
const characters = combat.turns?.filter(x => !x.isNPC && x.actor) ?? []; const characters = combat.turns?.filter(x => !x.isNPC && x.actor) ?? [];
const nrCharacters = characters.length; const nrCharacters = characters.length;

1
styles/less/global/elements.less
View file

@ -269,6 +269,7 @@
border-radius: 3px; border-radius: 3px;
background-color: light-dark(@dark-blue, @golden); background-color: light-dark(@dark-blue, @golden);
color: light-dark(@beige, @dark-blue); color: light-dark(@beige, @dark-blue);
margin-bottom: var(--spacer-4);
} }
} }

10
styles/less/sheets/actors/character/biography.less
View file

@ -9,14 +9,20 @@
gap: 10px; gap: 10px;
height: 100%; height: 100%;
overflow-y: auto; overflow-y: auto;
mask-image: linear-gradient(0deg, transparent 0%, black 10%, black 98%, transparent 100%); mask-image: linear-gradient(0deg, transparent 0%, black 5%, black 98%, transparent 100%);
padding-bottom: 10px; padding-top: 8px;
padding-bottom: 20px;
height: 100%; height: 100%;
scrollbar-width: thin; scrollbar-width: thin;
scrollbar-color: light-dark(@dark-blue, @golden) transparent; scrollbar-color: light-dark(@dark-blue, @golden) transparent;
} }
.characteristics-section {
gap: 20px;
padding: 0 10px;
}
.biography-section { .biography-section {
prose-mirror { prose-mirror {
--min-height: 50px; --min-height: 50px;

220
styles/less/ui/countdown/countdown.less
View file

@ -1,28 +1,47 @@
@import '../../utils/colors.less'; @import '../../utils/colors.less';
@import '../../utils/fonts.less'; @import '../../utils/fonts.less';
.theme-dark { #interface.theme-dark {
.daggerheart.dh-style.countdowns { .daggerheart.dh-style.countdowns {
background-image: url(../assets/parchments/dh-parchment-dark.png); --background: url(../assets/parchments/dh-parchment-dark.png);
.window-header {
background-image: url(../assets/parchments/dh-parchment-dark.png);
}
} }
} }
.daggerheart.dh-style.countdowns { #interface.theme-light {
.daggerheart.dh-style.countdowns {
--background: url('../assets/parchments/dh-parchment-light.png') no-repeat center;
}
}
.daggerheart.dh-style.countdowns {
position: relative; position: relative;
border: 0; border: 0;
border-radius: 4px;
box-shadow: none; box-shadow: none;
color: var(--color-text-primary);
width: 300px; width: 300px;
pointer-events: all; pointer-events: all;
align-self: flex-end; align-self: flex-end;
transition: 0.3s right ease-in-out; transition: 0.3s right ease-in-out;
.window-title { display: flex;
font-family: @font-body; flex-direction: column;
&::before {
content: ' ';
position: absolute;
inset: 0;
background: var(--background);
border-radius: 4px;
opacity: var(--ui-fade-opacity);
transition: opacity var(--ui-fade-duration);
}
:not(.performance-low, .noblur) {
backdrop-filter: blur(5px);
}
&:hover::before {
opacity: 1;
} }
#ui-right:has(#effects-display .effect-container) & { #ui-right:has(#effects-display .effect-container) & {
@ -34,123 +53,136 @@
min-width: 180px; min-width: 180px;
} }
.window-header { .countdowns-header,
cursor: default; .countdowns-container {
border-bottom: 0; position: relative; // allow rendering over the background
} }
.window-content { .countdowns-header {
padding-top: 4px; display: flex;
padding-bottom: 16px; align-items: center;
gap: 0.25rem;
flex: 0 0 36px;
padding: 0 0.5rem;
overflow: hidden;
font-size: var(--font-size-13);
.window-title {
font-family: @font-body;
flex: 1;
}
.header-control + .header-control {
margin-left: 8px;
}
}
.countdowns-container {
display: flex;
flex-direction: column;
gap: 8px;
padding: 4px var(--spacer-16) var(--spacer-16) var(--spacer-16);
overflow: auto; overflow: auto;
max-height: 312px; max-height: 312px;
.countdowns-container { .countdown-container {
display: flex; display: flex;
flex-direction: column; width: 100%;
gap: 8px;
.countdown-container { &.icon-only {
display: flex; gap: 8px;
width: 100%;
&.icon-only { .countdown-main-container {
gap: 8px; .countdown-content {
justify-content: center;
.countdown-main-container { .countdown-tools {
.countdown-content { gap: 8px;
justify-content: center;
.countdown-tools {
gap: 8px;
}
} }
} }
} }
}
.countdown-main-container { .countdown-main-container {
width: 100%; width: 100%;
display: flex;
align-items: center;
gap: 16px;
img {
width: 44px;
height: 44px;
border-radius: 6px;
}
.countdown-content {
flex: 1;
display: flex; display: flex;
align-items: center; flex-direction: column;
gap: 16px; justify-content: space-between;
img { .countdown-tools {
width: 44px;
height: 44px;
border-radius: 6px;
}
.countdown-content {
flex: 1;
display: flex; display: flex;
flex-direction: column; align-items: center;
justify-content: space-between; justify-content: space-between;
.countdown-tools { .countdown-tool-controls {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; gap: 16px;
}
.countdown-tool-controls { .progress-tag {
display: flex; border: 1px solid;
align-items: center; border-radius: 4px;
gap: 16px; padding: 2px 4px;
} background-color: light-dark(@beige, @dark-blue);
}
.progress-tag { .countdown-tool-icons {
border: 1px solid; display: flex;
border-radius: 4px; align-items: center;
gap: 8px;
.looping-container {
position: relative;
border: 1px solid light-dark(@dark-blue, white);
border-radius: 6px;
padding: 2px 4px; padding: 2px 4px;
background-color: light-dark(@beige, @dark-blue);
}
.countdown-tool-icons { &.should-loop {
display: flex; background: light-dark(@golden, @golden);
align-items: center;
gap: 8px;
.looping-container { .loop-marker {
position: relative; color: light-dark(@dark-blue, @dark-blue);
border: 1px solid light-dark(@dark-blue, white);
border-radius: 6px;
padding: 2px 4px;
&.should-loop {
background: light-dark(@golden, @golden);
.loop-marker {
color: light-dark(@dark-blue, @dark-blue);
}
} }
}
.direction-marker { .direction-marker {
position: absolute; position: absolute;
font-size: 10px; font-size: 10px;
filter: drop-shadow(0 0 3px black); filter: drop-shadow(0 0 3px black);
top: -3px; top: -3px;
}
} }
} }
} }
} }
} }
/* Keep incase we want to reintroduce the player pips */
// .countdown-access-container {
// display: grid;
// grid-template-columns: 1fr 1fr 1fr;
// grid-auto-rows: min-content;
// width: 38px;
// gap: 4px;
// .countdown-access {
// height: 10px;
// width: 10px;
// border-radius: 50%;
// border: 1px solid light-dark(@dark-blue, @beige-80);
// content: '';
// }
// }
} }
/* Keep incase we want to reintroduce the player pips */
// .countdown-access-container {
// display: grid;
// grid-template-columns: 1fr 1fr 1fr;
// grid-auto-rows: min-content;
// width: 38px;
// gap: 4px;
// .countdown-access {
// height: 10px;
// width: 10px;
// border-radius: 50%;
// border: 1px solid light-dark(@dark-blue, @beige-80);
// content: '';
// }
// }
} }
} }
} }

10
templates/sheets/actors/character/biography.hbs
View file

@ -4,9 +4,7 @@
data-group='{{tabs.biography.group}}' data-group='{{tabs.biography.group}}'
> >
<div class="items-section"> <div class="items-section">
<fieldset class="flex"> <div class="characteristics-section flexrow">
<legend>{{localize 'DAGGERHEART.ACTORS.Character.story.characteristics'}}</legend>
<div class="input"> <div class="input">
<span>{{localize 'DAGGERHEART.ACTORS.Character.pronouns'}}</span> <span>{{localize 'DAGGERHEART.ACTORS.Character.pronouns'}}</span>
{{formInput systemFields.biography.fields.characteristics.fields.pronouns value=source.system.biography.characteristics.pronouns enriched=source.system.biography.characteristics.pronouns localize=true toggled=true}} {{formInput systemFields.biography.fields.characteristics.fields.pronouns value=source.system.biography.characteristics.pronouns enriched=source.system.biography.characteristics.pronouns localize=true toggled=true}}
@ -21,14 +19,14 @@
<span>{{localize 'DAGGERHEART.ACTORS.Character.faith'}}</span> <span>{{localize 'DAGGERHEART.ACTORS.Character.faith'}}</span>
{{formInput systemFields.biography.fields.characteristics.fields.faith value=source.system.biography.characteristics.faith enriched=source.system.biography.characteristics.faith localize=true toggled=true}} {{formInput systemFields.biography.fields.characteristics.fields.faith value=source.system.biography.characteristics.faith enriched=source.system.biography.characteristics.faith localize=true toggled=true}}
</div> </div>
</fieldset> </div>
<fieldset class="biography-section"> <fieldset class="glassy biography-section">
<legend>{{localize 'DAGGERHEART.ACTORS.Character.story.backgroundTitle'}}</legend> <legend>{{localize 'DAGGERHEART.ACTORS.Character.story.backgroundTitle'}}</legend>
{{formInput background.field value=background.value enriched=background.enriched toggled=true}} {{formInput background.field value=background.value enriched=background.enriched toggled=true}}
</fieldset> </fieldset>
<fieldset class="biography-section"> <fieldset class="glassy biography-section">
<legend>{{localize 'DAGGERHEART.ACTORS.Character.story.connectionsTitle'}}</legend> <legend>{{localize 'DAGGERHEART.ACTORS.Character.story.connectionsTitle'}}</legend>
{{formInput connections.field value=connections.value enriched=connections.enriched toggled=true}} {{formInput connections.field value=connections.value enriched=connections.enriched toggled=true}}
</fieldset> </fieldset>

39
templates/sheets/actors/character/features.hbs
View file

@ -2,26 +2,25 @@
data-group='{{tabs.features.group}}'> data-group='{{tabs.features.group}}'>
<div class="features-sections"> <div class="features-sections">
{{#each document.system.sheetLists as |category|}} {{#each document.system.sheetLists as |category|}}
{{#if (eq category.type 'feature' )}} {{#if (eq category.type 'feature' )}}
{{> 'daggerheart.inventory-items' {{> 'daggerheart.inventory-items'
title=category.title title=category.title
type='feature' type='feature'
actorType='character' actorType='character'
collection=category.values collection=category.values
canCreate=@root.editable canCreate=@root.editable
showActions=@root.editable showActions=@root.editable
}} }}
{{else if category.values}} {{else if category.values}}
{{> 'daggerheart.inventory-items' {{> 'daggerheart.inventory-items'
title=category.title title=category.title
type='feature' type='feature'
actorType='character' actorType='character'
collection=category.values collection=category.values
canCreate=false canCreate=false
showActions=@root.editable showActions=@root.editable
}} }}
{{/if}}
{{/if}}
{{/each}} {{/each}}
</div> </div>
</section> </section>

5
templates/ui/combatTracker/combatTracker.hbs
View file

@ -5,7 +5,10 @@
{{#if (gt this.characters.length 0)}} {{#if (gt this.characters.length 0)}}
{{> 'systems/daggerheart/templates/ui/combatTracker/combatTrackerSection.hbs' this title=(localize "DAGGERHEART.GENERAL.Character.plural") turns=this.characters}} {{> 'systems/daggerheart/templates/ui/combatTracker/combatTrackerSection.hbs' this title=(localize "DAGGERHEART.GENERAL.Character.plural") turns=this.characters}}
{{/if}} {{/if}}
{{#if (gt this.friendlies.length 0)}}
{{> 'systems/daggerheart/templates/ui/combatTracker/combatTrackerSection.hbs' this title=(localize "DAGGERHEART.APPLICATIONS.CombatTracker.adversaryCategories.friendly") turns=this.friendlies}}
{{/if}}
{{#if (gt this.adversaries.length 0)}} {{#if (gt this.adversaries.length 0)}}
{{> 'systems/daggerheart/templates/ui/combatTracker/combatTrackerSection.hbs' this title=(localize "DAGGERHEART.GENERAL.Adversary.plural") turns=this.adversaries}} {{> 'systems/daggerheart/templates/ui/combatTracker/combatTrackerSection.hbs' this title=(localize "DAGGERHEART.APPLICATIONS.CombatTracker.adversaryCategories.adversaries") turns=this.adversaries}}
{{/if}} {{/if}}
</div> </div>

10
templates/ui/countdowns.hbs
View file

@ -1,4 +1,14 @@
<div> <div>
<header class="countdowns-header">
<i class="fa-solid fa-clock-rotate-left" inert></i>
<span class="window-title">{{localize "DAGGERHEART.UI.Countdowns.title"}}</span>
<a class="header-control" data-tooltip aria-label="DAGGERHEART.APPLICATIONS.CountdownEdit.editTitle" data-action="editCountdowns">
<i class="fa-solid fa-wrench" inert></i>
</a>
<a class="header-control" data-tooltip aria-label="DAGGERHEART.UI.Countdowns.toggleIconMode" data-action="toggleViewMode">
<i class="fa-solid fa-down-left-and-up-right-to-center" inert></i>
</a>
</header>
<div class="countdowns-container"> <div class="countdowns-container">
{{#each countdowns as | countdown id |}} {{#each countdowns as | countdown id |}}
<div class="countdown-container {{#if ../iconOnly}}icon-only{{/if}}"> <div class="countdown-container {{#if ../iconOnly}}icon-only{{/if}}">