cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-07-21 18:09:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'main' into feature/combo-dice-modifier

Browse source
This commit is contained in:
WBHarry 2026-07-12 19:57:21 +02:00
commit 0779443d4a
421 changed files with 2867 additions and 4508 deletions
Download patch file Download diff file Expand all files Collapse all files

2
templates/dialogs/groupRollDialog/initialization.hbs
View file

@ -9,7 +9,7 @@
</section>
<header><span>{{localize "DAGGERHEART.APPLICATIONS.GroupRollSelect.members"}}</span></header>
<div class="hint">{{"DAGGERHEART.APPLICATIONS.GroupRollSelect.selectParticipantsHint"}}</div>
<div class="hint">{{localize "DAGGERHEART.APPLICATIONS.GroupRollSelect.selectParticipantsHint"}}</div>
<div class="members-container">
{{#each memberSelection as |member|}}
<button

2
templates/sheets/activeEffect/changes.hbs
View file

@ -14,7 +14,7 @@
{{/each}}
</ol>
<fieldset class="armor-change-container optional">
<fieldset class="armor-change-container optional {{#if typeChanges.armor}}active{{/if}}">
<legend>
{{localize "DAGGERHEART.GENERAL.armor"}}
<input type="checkbox" class="armor-change-checkbox" data-index="{{typedChanges.armor.index}}" {{checked typedChanges.armor}} />

19
templates/sheets/activeEffect/settings.hbs
View file

@ -1,5 +1,5 @@
<section class="tab{{#if tab.active}} active{{/if}}" data-group="{{tab.group}}" data-tab="{{tab.id}}">
<fieldset class="one-column optional">
<fieldset class="one-column optional {{#if source.system.stacking}}active{{/if}}">
<legend>
{{localize "DAGGERHEART.ACTIVEEFFECT.Config.stacking.title"}}
<input type="checkbox" class="stacking-change-checkbox" {{checked source.system.stacking}} />
@ -13,14 +13,19 @@
{{/if}}
</fieldset>
<fieldset class="one-column">
<legend>{{localize "DAGGERHEART.ACTIVEEFFECT.Config.rangeDependence.title"}}</legend>
<fieldset class="one-column optional {{#if source.system.rangeDependence}}active{{/if}}">
<legend>
{{localize "DAGGERHEART.ACTIVEEFFECT.Config.rangeDependence.title"}}
<input type="checkbox" class="range-dependence-change-checkbox" {{checked source.system.rangeDependence}} />
</legend>
{{formGroup systemFields.rangeDependence.fields.enabled value=source.system.rangeDependence.enabled localize=true }}
{{formGroup systemFields.rangeDependence.fields.type value=source.system.rangeDependence.type localize=true }}
{{formGroup systemFields.rangeDependence.fields.target value=source.system.rangeDependence.target localize=true }}
{{formGroup systemFields.rangeDependence.fields.range value=source.system.rangeDependence.range localize=true }}
{{#if source.system.rangeDependence}}
{{formGroup systemFields.rangeDependence.fields.type value=source.system.rangeDependence.type localize=true }}
{{formGroup systemFields.rangeDependence.fields.target value=source.system.rangeDependence.target localize=true }}
{{formGroup systemFields.rangeDependence.fields.range value=source.system.rangeDependence.range localize=true }}
{{/if}}
</fieldset>
<fieldset class="one-column">
<legend>{{localize "EFFECT.DURATION.Label"}}</legend>

1
templates/sheets/actors/character/inventory.hbs
View file

@ -30,7 +30,6 @@
collection=@root.inventory.armor
isGlassy=true
canCreate=@root.editable
hideResources=true
}}
{{> 'daggerheart.inventory-items'
title='TYPES.Item.consumable'

83
templates/sheets/actors/character/loadout.hbs
View file

@ -1,42 +1,43 @@
<section class='tab {{tabs.loadout.cssClass}} {{tabs.loadout.id}}' data-tab='{{tabs.loadout.id}}'
data-group='{{tabs.loadout.group}}'>
<div class="search-section">
<div class="search-bar">
<div class="icon">
<i class="fa-solid fa-magnifying-glass"></i>
</div>
<input type="search" name="search" class="search-loadout" placeholder="{{localize "DAGGERHEART.GENERAL.searchPlaceholder"}}">
</div>
<a class="filter-button">
<i class="fa-solid fa-filter"></i>
</a>
<button type="button" class="btn-toggle-view" data-action="toggleLoadoutView" data-value="{{not cardView}}">
<span class="{{ifThen cardView '' 'list-active'}} list-icon">
<i class="fa-solid fa-bars"></i>
</span>
<span class="{{ifThen cardView 'grid-active' ''}} grid-icon">
<i class="fa-solid fa-grip"></i>
</span>
</button>
</div>
<div class="items-section">
{{> 'daggerheart.inventory-items'
title='DAGGERHEART.GENERAL.Tabs.loadout'
type='domainCard'
isGlassy=true
cardView=cardView
collection=document.system.domainCards.loadout
canCreate=@root.editable
}}
{{> 'daggerheart.inventory-items'
title='DAGGERHEART.GENERAL.Tabs.vault'
type='domainCard'
isGlassy=true
cardView=cardView
collection=document.system.domainCards.vault
canCreate=@root.editable
inVault=true
}}
</div>
<section class='tab {{tabs.loadout.cssClass}} {{tabs.loadout.id}}' data-tab='{{tabs.loadout.id}}'
data-group='{{tabs.loadout.group}}'>
<div class="search-section">
<div class="search-bar">
<div class="icon">
<i class="fa-solid fa-magnifying-glass"></i>
</div>
<input type="search" name="search" class="search-loadout" placeholder="{{localize "DAGGERHEART.GENERAL.searchPlaceholder"}}">
</div>
<a class="filter-button">
<i class="fa-solid fa-filter"></i>
</a>
<button type="button" class="btn-toggle-view" data-action="toggleLoadoutView" data-value="{{not cardView}}">
<span class="{{ifThen cardView '' 'list-active'}} list-icon">
<i class="fa-solid fa-bars"></i>
</span>
<span class="{{ifThen cardView 'grid-active' ''}} grid-icon">
<i class="fa-solid fa-grip"></i>
</span>
</button>
</div>
<div class="items-section">
{{> 'daggerheart.inventory-items'
title='DAGGERHEART.GENERAL.Tabs.loadout'
type='domainCard'
isGlassy=true
cardView=cardView
collection=document.system.domainCards.loadout
canCreate=@root.editable
inVault=false
}}
{{> 'daggerheart.inventory-items'
title='DAGGERHEART.GENERAL.Tabs.vault'
type='domainCard'
isGlassy=true
cardView=cardView
collection=document.system.domainCards.vault
canCreate=@root.editable
inVault=true
}}
</div>
</section>

11
templates/sheets/actors/character/sidebar.hbs
View file

@ -110,7 +110,7 @@
{{/each}}
</ul>
</div>
<div class="loadout-section">
<div class="loadout-section" data-in-vault="false">
<div class="title">
<side-line-div class="invert"></side-line-div>
<h3>{{localize "DAGGERHEART.GENERAL.loadout"}}</h3>
@ -118,11 +118,10 @@
</div>
<ul class="items-sidebar-list">
{{#each document.system.domainCards.loadout as |card|}}
{{> 'daggerheart.inventory-item-compact'
item=card
type='domainCard'
}}
{{> 'daggerheart.inventory-item-compact'
item=card
type='domainCard'
}}
{{/each}}
</ul>
</div>

63
templates/sheets/actors/party/party-members.hbs
View file

@ -23,12 +23,12 @@
</button>
</div>
{{#if @root.showStats}}
<ul class="actors-list">
{{#each partyMembers as |member id|}}
<li class="actor-resources">
<div class="actor-img-frame">
<img class="actor-img" src="{{member.img}}">
<ul class="actors-list{{#unless @root.showStats}} limited{{/unless}}">
{{#each partyMembers as |member id|}}
<li class="actor-resources">
<div class="actor-img-frame">
<img class="actor-img" src="{{member.img}}">
{{#if @root.showStats}}
{{#if member.weapons}}
<div class="equipped-weapons">
{{#each member.weapons as |weapon|}}
@ -51,12 +51,16 @@
<h4 class="threshold-label">{{localize "DAGGERHEART.ACTORS.Party.Thresholds.severe"}}</h4>
</div>
{{/unless}}
</div>
<header>
<h2 class="actor-name">
<a data-action="openDocument" data-uuid="{{member.uuid}}">{{member.name}}</a>
{{/if}}
</div>
<header>
<h2 class="actor-name">
<a data-action="openDocument" data-uuid="{{member.uuid}}">{{member.name}}</a>
{{#if @root.editable}}
<a class="delete-icon" data-action="deletePartyMember" data-uuid="{{member.uuid}}"><i class="fa-regular fa-times" inert></i></a>
</h2>
{{/if}}
</h2>
{{#if @root.showStats}}
<div>
{{#unless (or (eq member.type 'companion') (eq member.type 'adversary') (eq member.type 'npc')) }}
<div class="hope-section">
@ -73,10 +77,12 @@
</div>
{{/unless}}
</div>
{{#if member.subtitle}}
<span class="subtitle">{{member.subtitle}}</span>
{{/if}}
</header>
{{/if}}
{{#if member.subtitle}}
<span class="subtitle">{{member.subtitle}}</span>
{{/if}}
</header>
{{#if @root.showStats}}
<section class="body">
<section class="resources">
{{#unless (or (eq member.type 'companion') (eq member.type 'npc')) }}
@ -160,29 +166,10 @@
</div>
{{/if}}
</section>
</li>
{{/each}}
</ul>
{{else}}
<ul class="actors-list limited">
{{#each partyMembers as |member id|}}
<li class="actor-resources">
<div class="actor-img-frame">
<img class="actor-img" src="{{member.img}}">
</div>
<header>
<h2 class="actor-name">
<a data-action="openDocument" data-uuid="{{member.uuid}}">{{member.name}}</a>
<a class="delete-icon" data-action="deletePartyMember" data-uuid="{{member.uuid}}"><i class="fa-regular fa-times" inert></i></a>
</h2>
{{#if member.subtitle}}
<span class="subtitle">{{member.subtitle}}</span>
{{/if}}
</header>
</li>
{{/each}}
</ul>
{{/if}}
{{/if}}
</li>
{{/each}}
</ul>
{{#unless document.system.partyMembers.length}}
<div class="actors-dragger">
<span>{{localize "DAGGERHEART.GENERAL.dropActorsHere"}}</span>

2
templates/sheets/global/partials/inventory-fieldset-items-V2.hbs
View file

@ -26,7 +26,7 @@ Parameters:
- showActions {boolean} : If true show feature's actions.
--}}
<fieldset class="{{#if isGlassy}}glassy{{/if}} drop-section">
<fieldset class="{{#if isGlassy}}glassy{{/if}} drop-section" {{#unless (isNullish inVault)}}data-in-vault="{{inVault}}"{{/unless}}>
<legend>
{{localize title}}
{{#if canCreate}}

2
templates/sheets/items/armor/settings.hbs
View file

@ -19,4 +19,6 @@
{{ formField systemFields.baseThresholds.fields.severe value=source.system.baseThresholds.severe label=(localize "DAGGERHEART.ITEMS.Armor.baseThresholds.severe") }}
</div>
</fieldset>
{{> "systems/daggerheart/templates/sheets/global/partials/resource-section/resource-section.hbs" }}
</section>

2
templates/ui/tooltip/domainCard.hbs
View file

@ -23,7 +23,7 @@
</div>
</div>
{{#if description}}
<div class="tooltip-description">{{{description}}}</div>
<div class="tooltip-description">{{{description}}}</div>
{{/if}}
<p class="tooltip-hint">