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

Merge 8082cb3a18 into 4b651836ff

Browse source
This commit is contained in:
Gergely Bräutigam 2026-07-18 18:33:28 +02:00 • committed by GitHub
commit 01dbc14207
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 117 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

5
templates/actionTypes/damage.hbs
View file

@ -31,6 +31,10 @@
{{/unless}}
</legend>
{{#if (eq dmg.applyTo 'weaponResource')}}
{{formField ../fields.fullRestore value=dmg.fullRestore name=(concat ../path "damage.parts." dmg.applyTo ".fullRestore") localize=true classes="checkbox"}}
{{/if}}
{{#unless dmg.fullRestore}}
{{#if (and (not @root.isNPC) @root.hasRoll (not dmg.base))}}
{{formField ../fields.resultBased value=dmg.resultBased name=(concat "damage.parts." dmg.applyTo ".resultBased") localize=true classes="checkbox"}}
{{/if}}
@ -48,6 +52,7 @@
{{else}}
{{> formula fields=../fields.value.fields type=../fields.type dmg=dmg source=dmg.value target="value" key=dmg.applyTo path=../path}}
{{/if}}
{{/unless}}
{{#if (and (eq dmg.applyTo 'hitPoints') (ne @root.source.type 'healing'))}}
{{formField ../fields.type value=dmg.type name=(concat ../path "damage.parts." dmg.applyTo ".type") localize=true}}

5
templates/sheets/items/weapon/settings.hbs
View file

@ -4,7 +4,10 @@
data-group='{{tabs.settings.group}}'
>
<fieldset class="two-columns">
<legend>{{localize tabs.settings.label}}</legend>
<legend>
{{localize tabs.settings.label}}
<a data-action="configureAttack" data-tooltip="{{localize 'DAGGERHEART.ITEMS.Weapon.configureAttack'}}"><i class="fa-solid fa-wrench icon-button"></i></a>
</legend>
<span>{{localize "DAGGERHEART.GENERAL.Tiers.singular"}}</span>
{{formInput systemFields.tier value=source.system.tier}}
<span>{{localize "DAGGERHEART.ITEMS.Weapon.secondaryWeapon.full"}}</span>

10
templates/ui/chat/damageSummary.hbs
View file

@ -8,7 +8,15 @@
<ul class="damage-container">
{{#each this.updates}}
<li class="damage-row">
{{#if (gte this.value 0)}}
{{#if this.itemId}}
<span>
{{#if this.clear}}
{{localize "DAGGERHEART.UI.Chat.reloadWeapon" weapon=this.target.name}}
{{else}}
{{localize "DAGGERHEART.UI.Chat.restoreWeaponResource" quantity=this.value weapon=this.target.name}}
{{/if}}
</span>
{{else if (gte this.value 0)}}
<span>
{{
localize "DAGGERHEART.UI.Chat.markResource"

6
templates/ui/chat/parts/damage-part.hbs
View file

@ -11,7 +11,7 @@
<div class="roll-part-extra on-reduced">
<div class="wrapper">
{{#each damage as | roll index | }}
<div class="roll-formula">{{localize (concat 'DAGGERHEART.CONFIG.HealingType.' index '.inChatRoll')}}: {{total}}</div>
<div class="roll-formula">{{localize (concat 'DAGGERHEART.CONFIG.HealingType.' index '.inChatRoll')}}: {{#if parts.[0].fullRestore}}{{localize "DAGGERHEART.ACTIONS.Settings.fullRestore.inChatRoll"}}{{else}}{{total}}{{/if}}</div>
{{/each}}
</div>
</div>
@ -21,7 +21,7 @@
{{#each damage as | roll index | }}
<fieldset>
<legend>
{{#if ../hasHealing}}{{localize (concat 'DAGGERHEART.CONFIG.HealingType.' index '.name')}}{{else}}{{localize (concat 'DAGGERHEART.CONFIG.HealingType.' index '.inChatRoll')}}{{/if}} <div class="roll-formula">{{localize "DAGGERHEART.GENERAL.total"}}: {{roll.total}}</div>{{#if (and (eq index "hitPoints") ../isDirect)}} <div class="roll-formula">{{localize "DAGGERHEART.CONFIG.DamageType.direct.short"}}</div>{{/if}}
{{#if ../hasHealing}}{{localize (concat 'DAGGERHEART.CONFIG.HealingType.' index '.name')}}{{else}}{{localize (concat 'DAGGERHEART.CONFIG.HealingType.' index '.inChatRoll')}}{{/if}} <div class="roll-formula">{{localize "DAGGERHEART.GENERAL.total"}}: {{#if roll.parts.[0].fullRestore}}{{localize "DAGGERHEART.ACTIONS.Settings.fullRestore.inChatRoll"}}{{else}}{{roll.total}}{{/if}}</div>{{#if (and (eq index "hitPoints") ../isDirect)}} <div class="roll-formula">{{localize "DAGGERHEART.CONFIG.DamageType.direct.short"}}</div>{{/if}}
</legend>
{{#each roll.parts}}
{{#if (and (not @root.hasHealing) damageTypes.length)}}
@ -32,6 +32,7 @@
{{/each}}
<div class="roll-formula">{{total}}</div></span></label>
{{/if}}
{{#unless fullRestore}}
<div class="roll-dice">
{{#if dice.length}}
{{#each dice}}
@ -60,6 +61,7 @@
</div>
{{/if}}
</div>
{{/unless}}
{{/each}}
</fieldset>
{{/each}}