mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-01-14 04:31:07 +01:00
Merge branch 'development' into feature/313-preset-measured-templates
This commit is contained in:
commit
bea6140c66
26 changed files with 700 additions and 154 deletions
|
|
@ -7,7 +7,11 @@
|
|||
<label>{{localize "DAGGERHEART.SETTINGS.Automation.FIELDS.hopeFear.label"}}</label>
|
||||
{{formGroup settingFields.schema.fields.hopeFear.fields.gm value=settingFields._source.hopeFear.gm localize=true}}
|
||||
{{formGroup settingFields.schema.fields.hopeFear.fields.players value=settingFields._source.hopeFear.players localize=true}}
|
||||
|
||||
</div>
|
||||
<div class="form-group setting-two-values">
|
||||
<label>{{localize "DAGGERHEART.SETTINGS.Automation.FIELDS.summaryMessages.label"}}</label>
|
||||
{{formGroup settingFields.schema.fields.summaryMessages.fields.damage value=settingFields._source.summaryMessages.damage localize=true}}
|
||||
{{formGroup settingFields.schema.fields.summaryMessages.fields.effects value=settingFields._source.summaryMessages.effects localize=true}}
|
||||
</div>
|
||||
{{formGroup settingFields.schema.fields.actionPoints value=settingFields._source.actionPoints localize=true}}
|
||||
{{formGroup settingFields.schema.fields.hordeDamage value=settingFields._source.hordeDamage localize=true}}
|
||||
|
|
|
|||
|
|
@ -13,5 +13,9 @@
|
|||
{{formGroup settingFields.schema.fields.defeated.fields.characterDefault value=settingFields._source.defeated.characterDefault labelAttr="name" localize=true}}
|
||||
{{formGroup settingFields.schema.fields.defeated.fields.adversaryDefault value=settingFields._source.defeated.adversaryDefault labelAttr="name" localize=true}}
|
||||
{{formGroup settingFields.schema.fields.defeated.fields.companionDefault value=settingFields._source.defeated.companionDefault labelAttr="name" localize=true}}
|
||||
|
||||
{{formGroup settingFields.schema.fields.defeated.fields.deadIcon value=settingFields._source.defeated.deadIcon localize=true}}
|
||||
{{formGroup settingFields.schema.fields.defeated.fields.defeatedIcon value=settingFields._source.defeated.defeatedIcon localize=true}}
|
||||
{{formGroup settingFields.schema.fields.defeated.fields.unconsciousIcon value=settingFields._source.defeated.unconsciousIcon localize=true}}
|
||||
</fieldset>
|
||||
</section>
|
||||
|
|
@ -78,13 +78,9 @@
|
|||
<side-line-div></side-line-div>
|
||||
</div>
|
||||
<ul class="items-sidebar-list">
|
||||
{{> 'daggerheart.inventory-item'
|
||||
{{> 'daggerheart.inventory-item-compact'
|
||||
item=document.system.attack
|
||||
type='action'
|
||||
hideTags=true
|
||||
hideDescription=true
|
||||
hideResources=true
|
||||
noExtensible=true
|
||||
noCompendiumEdit=true
|
||||
}}
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -116,24 +116,16 @@
|
|||
</div>
|
||||
<ul class="items-sidebar-list">
|
||||
{{#if document.system.usedUnarmed}}
|
||||
{{> 'daggerheart.inventory-item'
|
||||
{{> 'daggerheart.inventory-item-compact'
|
||||
item=document.system.usedUnarmed
|
||||
type='action'
|
||||
hideTags=true
|
||||
hideDescription=true
|
||||
hideResources=true
|
||||
noExtensible=true
|
||||
}}
|
||||
{{/if}}
|
||||
{{#each document.items as |item|}}
|
||||
{{#if item.system.equipped}}
|
||||
{{> 'daggerheart.inventory-item'
|
||||
{{> 'daggerheart.inventory-item-compact'
|
||||
item=item
|
||||
type=item.type
|
||||
hideTags=true
|
||||
hideDescription=true
|
||||
hideResources=true
|
||||
noExtensible=true
|
||||
}}
|
||||
{{/if}}
|
||||
{{/each}}
|
||||
|
|
@ -147,13 +139,9 @@
|
|||
</div>
|
||||
<ul class="items-sidebar-list">
|
||||
{{#each document.system.domainCards.loadout as |card|}}
|
||||
{{> 'daggerheart.inventory-item'
|
||||
{{> 'daggerheart.inventory-item-compact'
|
||||
item=card
|
||||
type='domainCard'
|
||||
hideTags=true
|
||||
hideDescription=true
|
||||
hideResources=true
|
||||
noExtensible=true
|
||||
}}
|
||||
|
||||
{{/each}}
|
||||
|
|
|
|||
|
|
@ -8,11 +8,9 @@
|
|||
</div>
|
||||
{{#if document.system.partner}}
|
||||
<ul class="items-list">
|
||||
{{> 'daggerheart.inventory-item'
|
||||
{{> 'daggerheart.inventory-item-compact'
|
||||
item=document.system.partner
|
||||
type='companion'
|
||||
hideTags=true
|
||||
hideDescription=true
|
||||
isActor=true
|
||||
hideTooltip=true
|
||||
}}
|
||||
|
|
@ -28,11 +26,9 @@
|
|||
<side-line-div></side-line-div>
|
||||
</div>
|
||||
<ul class="items-list">
|
||||
{{> 'daggerheart.inventory-item'
|
||||
{{> 'daggerheart.inventory-item-compact'
|
||||
item=document.system.attack
|
||||
type='action'
|
||||
hideTags=true
|
||||
hideDescription=true
|
||||
hideTooltip=true
|
||||
}}
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -48,20 +48,6 @@ Parameters:
|
|||
</div>
|
||||
{{/each}}
|
||||
</div>
|
||||
{{else if (not ../hideLabels)}}
|
||||
<div class="item-labels">
|
||||
<div class="label">
|
||||
{{#each this._getLabels as |label|}}
|
||||
{{ifThen label.value label.value label}}
|
||||
{{#each label.icons as |icon|}}
|
||||
<i class="fa-solid {{icon}}"></i>
|
||||
{{/each}}
|
||||
{{#if (not @last)}}
|
||||
<span>-</span>
|
||||
{{/if}}
|
||||
{{/each}}
|
||||
</div>
|
||||
</div>
|
||||
{{/if}}
|
||||
{{/with}}
|
||||
{{!--Tags End --}}
|
||||
|
|
|
|||
85
templates/sheets/global/partials/inventory-item-compact.hbs
Normal file
85
templates/sheets/global/partials/inventory-item-compact.hbs
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
<li class="inventory-item inventory-item-compact" data-item-id="{{item.id}}" {{#if (or (eq type 'action' ) (eq type 'attack' ))}}
|
||||
data-action-id="{{item.id}}" {{/if}} data-item-uuid="{{item.uuid}}" data-type="{{type}}" data-no-compendium-edit="{{noCompendiumEdit}}" draggable="true">
|
||||
{{!-- Image --}}
|
||||
<div class="img-portait" data-action='{{ifThen (or (hasProperty item "use") (eq type "attack")) "useItem" (ifThen
|
||||
(hasProperty item "toChat" ) "toChat" "editDoc" ) }}' {{#unless hideTooltip}} {{#if (eq type 'attack' )}}
|
||||
data-tooltip="#attack#{{item.actor.uuid}}" {{else}} data-tooltip="#item#{{item.uuid}}" {{/if}} {{/unless}}>
|
||||
<img src="{{item.img}}" class="item-img {{#if isActor}}actor-img{{/if}}" />
|
||||
{{#if (or item.system.actionsList.size item.system.actionsList.length item.actionType)}}
|
||||
{{#if @root.isNPC}}
|
||||
<img class="roll-img d20" src="systems/daggerheart/assets/icons/dice/default/d20.svg" alt="d20">
|
||||
{{else}}
|
||||
<img class="roll-img duality" src="systems/daggerheart/assets/icons/dice/duality/DualityBW.svg" alt="2d12">
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
</div>
|
||||
|
||||
{{!-- Item Name --}}
|
||||
<span class="item-name">{{localize item.name}}</span>
|
||||
|
||||
{{!-- Tags Start --}}
|
||||
{{#with item}}
|
||||
<div class="item-labels">
|
||||
<div class="label">
|
||||
{{#each this._getLabels as |label|}}
|
||||
{{ifThen label.value label.value label}}
|
||||
{{#each label.icons as |icon|}}
|
||||
<i class="fa-solid {{icon}}"></i>
|
||||
{{/each}}
|
||||
{{#if (not @last)}}
|
||||
<span>-</span>
|
||||
{{/if}}
|
||||
{{/each}}
|
||||
</div>
|
||||
</div>
|
||||
{{/with}}
|
||||
{{!--Tags End --}}
|
||||
|
||||
{{!-- Controls --}}
|
||||
{{#unless hideControls}}
|
||||
<div class="controls">
|
||||
{{#if isActor}}
|
||||
<a data-action="editDoc" data-tooltip="DAGGERHEART.UI.Tooltip.openActorWorld">
|
||||
<i class="fa-solid fa-fw fa-globe"></i>
|
||||
</a>
|
||||
{{#if (eq type 'adversary')}}
|
||||
<a data-action='deleteAdversary' data-category="{{categoryAdversary}}" data-tooltip="CONTROLS.CommonDelete">
|
||||
<i class='fas fa-fw fa-trash'></i>
|
||||
</a>
|
||||
{{/if}}
|
||||
{{else}}
|
||||
{{#if (eq type 'weapon')}}
|
||||
<a class="{{#unless item.system.equipped}}unequipped{{/unless}}" data-action="toggleEquipItem"
|
||||
data-tooltip="DAGGERHEART.UI.Tooltip.{{ifThen item.system.equipped 'unequip' 'equip' }}">
|
||||
<i class="fa-solid fa-fw fa-hands"></i>
|
||||
</a>
|
||||
{{else if (eq type 'armor')}}
|
||||
<a class="{{#unless item.system.equipped}}unequipped{{/unless}}" data-action="toggleEquipItem"
|
||||
data-tooltip="DAGGERHEART.UI.Tooltip.{{ifThen item.system.equipped 'unequip' 'equip' }}">
|
||||
<i class="fa-solid fa-fw fa-shield"></i>
|
||||
</a>
|
||||
{{else if (eq type 'domainCard')}}
|
||||
<a data-action="toggleVault"
|
||||
data-tooltip="DAGGERHEART.UI.Tooltip.{{ifThen item.system.inVault 'sendToLoadout' 'sendToVault' }}">
|
||||
<i class="fa-solid fa-fw {{ifThen item.system.inVault 'fa-arrow-up' 'fa-arrow-down'}}"></i>
|
||||
</a>
|
||||
{{else if (eq type 'effect')}}
|
||||
<a data-action="toggleEffect"
|
||||
data-tooltip="DAGGERHEART.UI.Tooltip.{{ifThen item.disabled 'enableEffect' 'disableEffect' }}">
|
||||
<i class="fa-solid fa-fw {{ifThen item.disabled 'fa-toggle-off' 'fa-toggle-on'}}"></i>
|
||||
</a>
|
||||
{{/if}}
|
||||
{{#if (hasProperty item "toChat")}}
|
||||
<a data-action="toChat" data-tooltip="DAGGERHEART.UI.Tooltip.sendToChat">
|
||||
<i class="fa-regular fa-fw fa-message"></i>
|
||||
</a>
|
||||
{{/if}}
|
||||
{{#unless hideContextMenu}}
|
||||
<a data-action="triggerContextMenu" data-tooltip="DAGGERHEART.UI.Tooltip.moreOptions">
|
||||
<i class="fa-solid fa-ellipsis-vertical"></i>
|
||||
</a>
|
||||
{{/unless}}
|
||||
{{/if}}
|
||||
</div>
|
||||
{{/unless}}
|
||||
</li>
|
||||
33
templates/ui/chat/damageSummary.hbs
Normal file
33
templates/ui/chat/damageSummary.hbs
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
<ul class="daggerheart chat damage-summary">
|
||||
{{#each targets}}
|
||||
<li class="token-target-container" data-token="{{this.token.id}}">
|
||||
<header>
|
||||
<img src="{{this.token.texture.src}}" />
|
||||
<h2 class="actor-name">{{this.token.name}}</h2>
|
||||
</header>
|
||||
<ul class="damage-container">
|
||||
{{#each this.updates}}
|
||||
<li class="damage-row">
|
||||
{{#if (gte this.value 0)}}
|
||||
<span>
|
||||
{{
|
||||
localize "DAGGERHEART.UI.Chat.markResource"
|
||||
quantity=this.value
|
||||
resource=(localize (concat "DAGGERHEART.CONFIG.HealingType." this.key ".name"))
|
||||
}}
|
||||
</span>
|
||||
{{else}}
|
||||
<span>
|
||||
{{
|
||||
localize "DAGGERHEART.UI.Chat.clearResource"
|
||||
quantity=(positive this.value)
|
||||
resource=(localize (concat "DAGGERHEART.CONFIG.HealingType." this.key ".name"))
|
||||
}}
|
||||
</span>
|
||||
{{/if}}
|
||||
</li>
|
||||
{{/each}}
|
||||
</ul>
|
||||
</li>
|
||||
{{/each}}
|
||||
</ul>
|
||||
33
templates/ui/chat/effectSummary.hbs
Normal file
33
templates/ui/chat/effectSummary.hbs
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
<div class="daggerheart chat effect-summary">
|
||||
<div class="effect-header">
|
||||
<span>{{localize "DAGGERHEART.GENERAL.Effect.plural"}}</span>
|
||||
</div>
|
||||
<div class="effects-container">
|
||||
{{#each effects}}
|
||||
<details class="effect-target-container">
|
||||
<summary class="effect-label">
|
||||
<img class="effect-img" src="{{this.img}}" />
|
||||
<h2 class="title">{{this.name}}</h2>
|
||||
<i class="fa-solid fa-chevron-down"></i>
|
||||
</summary>
|
||||
<div class="description">
|
||||
{{{this.description}}}
|
||||
</div>
|
||||
</details>
|
||||
{{/each}}
|
||||
</div>
|
||||
|
||||
{{#if targets}}
|
||||
<div class="actor-header">
|
||||
<span>{{localize "DAGGERHEART.UI.Chat.appliedTo"}}</span>
|
||||
</div>
|
||||
<div class="targets-container">
|
||||
{{#each targets}}
|
||||
<div class="token-target-container" data-token="{{this.id}}">
|
||||
<img src="{{this.texture.src}}" />
|
||||
<h2 class="title">{{this.name}}</h2>
|
||||
</div>
|
||||
{{/each}}
|
||||
</div>
|
||||
{{/if}}
|
||||
</div>
|
||||
Loading…
Add table
Add a link
Reference in a new issue