Merge 8082cb3a18 into 4b651836ff

lang/en.json

@@ -144,6 +144,10 @@
                 "resultBased": {
                     "label": "Formula based on Hope/Fear result."
                 },
+                "fullRestore": {
+                    "label": "Fully restore the resource.",
+                    "inChatRoll": "Full"
+                },
                 "applyTo": {
                     "label": "Targeted Resource"
                 },
@@ -1277,6 +1281,11 @@
                     "name": "Fear",
                     "abbreviation": "FR",
                     "inChatRoll": "Fear"
+                },
+                "weaponResource": {
+                    "name": "Weapon Resource",
+                    "abbreviation": "WR",
+                    "inChatRoll": "Reload"
                 }
             },
             "ItemResourceProgression": {
@@ -2658,6 +2667,7 @@
             },
             "Weapon": {
                 "weaponType": "Weapon Type",
+                "configureAttack": "Configure Attack",
                 "primaryWeapon": {
                     "full": "Primary Weapon",
                     "short": "Primary"
@@ -3093,6 +3103,8 @@
                     "applyHealing": "Apply Healing"
                 },
                 "markResource": "Mark {quantity} {resource}",
+                "reloadWeapon": "Reload {weapon}",
+                "restoreWeaponResource": "Restore {quantity} on {weapon}",
                 "refreshMessage": {
                     "title": "Feature Refresh",
                     "header": "Refreshed"

module/applications/sheets-configs/action-base-config.mjs

@@ -160,7 +160,7 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
             context.allDamageTypesUsed = !getUnusedDamageTypes(this.action.damage.parts).length;
 
             if (this.action.damage.hasOwnProperty('includeBase') && this.action.type === 'attack')
-                context.hasBaseDamage = !!this.action.parent.attack;
+                context.hasBaseDamage = !!this.action.parent.attack && !this.action.baseAction;
         }
 
         context.costOptions = this.getCostOptions();

module/applications/sheets/items/weapon.mjs

@@ -5,6 +5,9 @@ export default class WeaponSheet extends ItemAttachmentSheet(DHBaseItemSheet) {
     /**@inheritdoc */
     static DEFAULT_OPTIONS = {
         classes: ['weapon'],
+        actions: {
+            configureAttack: WeaponSheet.#configureAttack
+        },
         tagifyConfigs: [
             {
                 selector: '.features-input',
@@ -46,6 +49,13 @@ export default class WeaponSheet extends ItemAttachmentSheet(DHBaseItemSheet) {
         return context;
     }
 
+    /**
+     * Open the action configuration sheet for the weapon's base attack.
+     */
+    static #configureAttack() {
+        this.document.system.attack.sheet.render({ force: true });
+    }
+
     /**
      * Callback function used by `tagifyElement`.
      * @param {Array<Object>} selectedOptions - The currently selected tag objects.

module/config/generalConfig.mjs

@@ -191,6 +191,11 @@ export const healingTypes = {
         id: 'fear',
         label: 'DAGGERHEART.CONFIG.HealingType.fear.name',
         abbreviation: 'DAGGERHEART.CONFIG.HealingType.fear.abbreviation'
+    },
+    weaponResource: {
+        id: 'weaponResource',
+        label: 'DAGGERHEART.CONFIG.HealingType.weaponResource.name',
+        abbreviation: 'DAGGERHEART.CONFIG.HealingType.weaponResource.abbreviation'
     }
 };
 

module/data/fields/action/costField.mjs

@@ -197,11 +197,29 @@ export default class CostField extends fields.ArrayField {
 
     static getItemIdCostUpdate(r) {
         switch (r.key) {
-            case CONFIG.DH.GENERAL.itemAbilityCosts.resource.id:
+            case CONFIG.DH.GENERAL.itemAbilityCosts.resource.id: {
+                const resource = r.target.system.resource;
+                let max = Number(resource.max);
+                if (!Number.isFinite(max) && resource.max) {
+                    try {
+                        max = Roll.safeEval(Roll.replaceFormulaData(resource.max, r.target.getRollData()));
+                    } catch {
+                        max = null;
+                    }
+                }
+                const hasMax = Number.isFinite(max) && max > 0;
+                if (r.clear) {
+                    return {
+                        path: 'system.resource.value',
+                        value: hasMax ? max : resource.value
+                    };
+                }
+                const newValue = resource.value + r.value;
                 return {
                     path: 'system.resource.value',
-                    value: r.target.system.resource.value + r.value
+                    value: Math.max(hasMax ? Math.min(newValue, max) : newValue, 0)
                 };
+            }
             case CONFIG.DH.GENERAL.itemAbilityCosts.quantity.id:
                 return {
                     path: 'system.quantity',

module/data/fields/action/damageField.mjs

@@ -45,9 +45,10 @@ export default class DamageField extends fields.SchemaField {
             return;
 
         let formulas = this.damage.parts.map(p => ({
-            formula: DamageField.getFormulaValue.call(this, p, config).getFormula(this.actor),
+            formula: p.fullRestore ? '0' : DamageField.getFormulaValue.call(this, p, config).getFormula(this.actor),
             damageTypes: p.applyTo === 'hitPoints' && !p.type.size ? new Set(['physical']) : p.type,
-            applyTo: p.applyTo
+            applyTo: p.applyTo,
+            fullRestore: p.fullRestore
         }));
 
         if (!formulas.length) return false;
@@ -67,6 +68,7 @@ export default class DamageField extends fields.SchemaField {
 
         if (DamageField.getAutomation() === CONFIG.DH.SETTINGS.actionAutomationChoices.always.id)
             damageConfig.dialog.configure = false;
+        if (formulas.every(f => f.fullRestore)) damageConfig.dialog.configure = false;
         if (config.hasSave) config.onSave = damageConfig.onSave = this.save.damageMod;
 
         damageConfig.source.message = messageId;
@@ -305,6 +307,10 @@ export class DHResourceData extends foundry.abstract.DataModel {
                 initial: false,
                 label: 'DAGGERHEART.ACTIONS.Settings.resultBased.label'
             }),
+            fullRestore: new fields.BooleanField({
+                initial: false,
+                label: 'DAGGERHEART.ACTIONS.Settings.fullRestore.label'
+            }),
             value: new fields.EmbeddedDataField(DHActionDiceData),
             valueAlt: new fields.EmbeddedDataField(DHActionDiceData)
         };

module/documents/actor.mjs

@@ -774,17 +774,21 @@ export default class DhpActor extends Actor {
         Object.entries(healings).forEach(([key, healing]) => {
             healing.parts.forEach(part => {
                 const update = updates.find(u => u.key === key);
-                if (update) update.value += part.total;
+                if (update) {
-                else updates.push({ value: part.total, key });
+                    update.value += part.total;
+                    update.clear ||= !!part.fullRestore;
+                } else updates.push({ value: part.total, key, clear: !!part.fullRestore });
             });
         });
 
-        updates.forEach(
+        updates.forEach(u => {
-            u =>
+            if (u.key === CONFIG.DH.GENERAL.healingTypes.weaponResource.id) return;
-                (u.value = !(u.key === 'fear' || this.system?.resources?.[u.key]?.isReversed === false)
+            u.value = !(u.key === 'fear' || this.system?.resources?.[u.key]?.isReversed === false)
-                    ? u.value * -1
+                ? u.value * -1
-                    : u.value)
+                : u.value;
-        );
+        });
+
+        this.convertResourceHealingToReload(updates);
 
         await this.modifyResource(updates);
 
@@ -810,7 +814,7 @@ export default class DhpActor extends Actor {
         resources.forEach(r => {
             if (r.itemId) {
                 const { path, value } = game.system.api.fields.ActionFields.CostField.getItemIdCostUpdate(r);
-                updates.items[r.key] = {
+                updates.items[`${r.itemId}-${r.key}`] = {
                     target: r.target,
                     resources: { [path]: value }
                 };
@@ -881,6 +885,22 @@ export default class DhpActor extends Actor {
         return damage >= this.system.damageThresholds.severe ? 3 : damage >= this.system.damageThresholds.major ? 2 : 1;
     }
 
+    convertResourceHealingToReload(updates) {
+        const resourceIndex = updates.findIndex(u => u.key === CONFIG.DH.GENERAL.healingTypes.weaponResource.id);
+        if (resourceIndex === -1) return;
+        const [reload] = updates.splice(resourceIndex, 1);
+        const weapons = this.items.filter(i => i.type === 'weapon' && i.system.equipped && i.system.resource);
+        for (const weapon of weapons) {
+            updates.push({
+                key: CONFIG.DH.GENERAL.itemAbilityCosts.resource.id,
+                value: reload.value,
+                clear: reload.clear,
+                itemId: weapon.id,
+                target: weapon
+            });
+        }
+    }
+
     convertStressDamageToHP(resources) {
         const stressDamage = resources.find(r => r.key === 'stress'),
             newValue = this.system.resources.stress.value + stressDamage.value;

src/packs/journals/journal_Welcome___Information_g7NhKvwltwafmMyR.json

@@ -132,7 +132,7 @@
       "image": {},
       "text": {
         "format": 1,
-        "content": "<blockquote><p>This product includes materials from the Daggerheart System Reference Document 1.0, © Critical Role, LLC. under the terms of the Darrington Press Community Gaming (DPCGL) License. More information can be found at <a href=\"https://www.daggerheart.com/\" title=\"Daggerheart Official Website\">https://www.daggerheart.com</a>. There are no previous modifications by others.</p><p></p></blockquote><h1>The Foundryborne Team</h1><p></p><p>The Foundryborne Team consists of:</p><p></p><ul><li><p>@harryfuralle</p></li><li><p>@cptn_cosmo</p></li><li><p>@molilo</p></li><li><p>@joaquinp98</p></li><li><p>@dapoulp</p></li><li><p>@ikraik</p></li><li><p>@irktheimp</p></li><li><p>@jacobwojo</p></li><li><p>@vyrth</p></li><li><p>@.ontaro</p></li><li><p>@saatsin</p></li><li><p>@david.xyz</p></li><li><p>@lazjen</p></li></ul><p></p><p>With Art from:</p><p></p><ul><li><p>@molilo (Foundryborne User Interface &amp; Domain Card Placeholder Artwork)</p></li><li><p>@UsernameIsInUse (Foundryborne Logo, Website Design, Duality Roll Icon</p></li><li><p>@CyrensMaps (Combat Wheelchair Icons)</p></li></ul><p></p><p>And special thanks to our hard working community testers:<br /></p><ul><li><p>@lazjen</p></li></ul><p></p><p>We would also like to thank the FoundryVTT team for their support in publishing this system, as well as providing countless Icons to be used in many places.</p><p>And, of course, special thanks to the teams at Critical Role and Darrington Press for making such a wonderful game and updating the license to allow a FoundryVTT version of the system.</p><p></p><h1>The Foundryborne Community</h1><p></p><p>Without our amazing community this project would not have been possible.</p><p>You kept us going with both direct contributions and just endless support!</p><p>We thank you with all our hearts.</p><p><a href=\"https://foundryborne.online/\" title=\"Foundryborne official website\">Come join us!</a></p>"
+        "content": "<blockquote><p>This product includes materials from the Daggerheart System Reference Document 1.0, © Critical Role, LLC. under the terms of the Darrington Press Community Gaming (DPCGL) License. More information can be found at <a href=\"https://www.daggerheart.com/\" title=\"Daggerheart Official Website\">https://www.daggerheart.com</a>. There are no previous modifications by others.</p><p></p></blockquote><h1>The Foundryborne Team</h1><p></p><p>The Foundryborne Team consists of:</p><p></p><ul><li><p>@harryfuralle</p></li><li><p>@cptn_cosmo</p></li><li><p>@molilo</p></li><li><p>@joaquinp98</p></li><li><p>@dapoulp</p></li><li><p>@ikraik</p></li><li><p>@irktheimp</p></li><li><p>@jacobwojo</p></li><li><p>@vyrth</p></li><li><p>@.ontaro</p></li><li><p>@saatsin</p></li><li><p>@david.xyz</p></li><li><p>@lazjen</p></li><li><p>@Skarlso</p></li></ul><p></p><p>With Art from:</p><p></p><ul><li><p>@molilo (Foundryborne User Interface &amp; Domain Card Placeholder Artwork)</p></li><li><p>@UsernameIsInUse (Foundryborne Logo, Website Design, Duality Roll Icon</p></li><li><p>@CyrensMaps (Combat Wheelchair Icons)</p></li></ul><p></p><p>And special thanks to our hard working community testers:<br /></p><ul><li><p>@lazjen</p></li></ul><p></p><p>We would also like to thank the FoundryVTT team for their support in publishing this system, as well as providing countless Icons to be used in many places.</p><p>And, of course, special thanks to the teams at Critical Role and Darrington Press for making such a wonderful game and updating the license to allow a FoundryVTT version of the system.</p><p></p><h1>The Foundryborne Community</h1><p></p><p>Without our amazing community this project would not have been possible.</p><p>You kept us going with both direct contributions and just endless support!</p><p>We thank you with all our hearts.</p><p><a href=\"https://foundryborne.online/\" title=\"Foundryborne official website\">Come join us!</a></p>"
       },
       "video": {
         "controls": true,

styles/less/sheets/items/index.less

@@ -4,3 +4,5 @@
 @import './domain-card.less';
 @import './feature.less';
 @import './heritage.less';
+@import './item-sheet-shared.less';
+@import './weapon.less';

styles/less/sheets/items/weapon.less

@@ -0,0 +1,6 @@
+.application.sheet.daggerheart.dh-style.weapon {
+    section.tab {
+        height: 400px;
+        overflow-y: auto;
+    }
+}

templates/actionTypes/damage.hbs

@@ -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}}

templates/sheets/items/weapon/settings.hbs

@@ -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>

templates/ui/chat/damageSummary.hbs

@@ -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"

templates/ui/chat/parts/damage-part.hbs

@@ -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}}