Merge branch 'main' of https://github.com/Foundryborne/daggerheart

lang/en.json

@@ -475,18 +475,21 @@
                 },
                 "takeLevelUp": "Finish Level Up",
                 "tier2": {
+                    "name": "Tier 2",
                     "label": "Levels 2-4",
                     "infoLabel": "At Level 2, gain an additional Experience at +2 and gain a +1 bonus to your Proficiency.",
                     "pretext": "Choose two options from the list below",
                     "posttext": "Take an additional domain card of your level or lower from a domain you have access to."
                 },
                 "tier3": {
+                    "name": "Tier 3",
                     "label": "Levels 5-7",
                     "infoLabel": "At Level 5, take an additional Experience and clear all marks on Character Traits.",
                     "pretext": "When you level up, record it on your character sheet, then choose two from the list below or any unmarked from the previous tier.",
                     "posttext": "Take an additional domain card of your level or lower from a domain you have access to."
                 },
                 "tier4": {
+                    "name": "Tier 4",
                     "label": "Levels 8-10",
                     "infoLabel": "At Level 8, take an additional Experience and clear all marks on Character Traits.",
                     "pretext": "When you level up, record it on your character sheet, then choose two from the list below or any unmarked from the previous tier.",
@@ -989,6 +992,12 @@
                 "selectType": "Select Action Type",
                 "selectAction": "Action Selection"
             },
+            "TargetTypes": {
+                "any": "Any",
+                "friendly": "Friendly",
+                "hostile": "Hostile",
+                "self": "Self"
+            },
             "TemplateTypes": {
                 "circle": "Circle",
                 "cone": "Cone",
@@ -1877,7 +1886,9 @@
                 "tier4": "tier 4",
                 "domains": "Domains",
                 "downtime": "Downtime",
-                "rules": "Rules"
+                "rules": "Rules",
+                "configuration": "Configuration",
+                "base": "Base"
             },
             "Tiers": {
                 "singular": "Tier",
@@ -1978,6 +1989,8 @@
             "save": "Save",
             "scalable": "Scalable",
             "situationalBonus": "Situational Bonus",
+            "spent": "Spent",
+            "step": "Step",
             "stress": "Stress",
             "subclasses": "Subclasses",
             "success": "Success",

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

@@ -66,7 +66,7 @@ export default class DHActionConfig extends DaggerheartSheet(ApplicationV2) {
             group: 'primary',
             id: 'base',
             icon: null,
-            label: 'Base'
+            label: 'DAGGERHEART.GENERAL.Tabs.base'
         },
         config: {
             active: false,
@@ -74,7 +74,7 @@ export default class DHActionConfig extends DaggerheartSheet(ApplicationV2) {
             group: 'primary',
             id: 'config',
             icon: null,
-            label: 'Configuration'
+            label: 'DAGGERHEART.GENERAL.Tabs.configuration'
         },
         effect: {
             active: false,
@@ -82,7 +82,7 @@ export default class DHActionConfig extends DaggerheartSheet(ApplicationV2) {
             group: 'primary',
             id: 'effect',
             icon: null,
-            label: 'Effect'
+            label: 'DAGGERHEART.GENERAL.Tabs.effects'
         }
     };
 

module/config/generalConfig.mjs

@@ -90,22 +90,22 @@ export const rangeInclusion = {
 export const otherTargetTypes = {
     friendly: {
         id: 'friendly',
-        label: 'Friendly'
+        label: 'DAGGERHEART.CONFIG.TargetTypes.friendly'
     },
     hostile: {
         id: 'hostile',
-        label: 'Hostile'
+        label: 'DAGGERHEART.CONFIG.TargetTypes.hostile'
     },
     any: {
         id: 'any',
-        label: 'Any'
+        label: 'DAGGERHEART.CONFIG.TargetTypes.any'
     }
 };
 
 export const targetTypes = {
     self: {
         id: 'self',
-        label: 'Self'
+        label: 'DAGGERHEART.CONFIG.TargetTypes.self'
     },
     ...otherTargetTypes
 };

module/data/fields/action/costField.mjs

@@ -94,7 +94,8 @@ export default class CostField extends fields.ArrayField {
     }
 
     static getRealCosts(costs) {
-        const realCosts = costs?.length ? costs.filter(c => c.enabled) : [];
+        const cloneCosts = foundry.utils.deepClone(costs),
+            realCosts = cloneCosts?.length ? cloneCosts.filter(c => c.enabled) : [];
         let mergedCosts = [];
         realCosts.forEach(c => {
             const getCost = Object.values(mergedCosts).find(gc => gc.key === c.key);

module/data/levelTier.mjs

@@ -169,7 +169,7 @@ export const defaultLevelTiers = {
     tiers: {
         2: {
             tier: 2,
-            name: 'Tier 2',
+            name: 'DAGGERHEART.APPLICATIONS.Levelup.tier2.name',
             levels: {
                 start: 2,
                 end: 4
@@ -232,7 +232,7 @@ export const defaultLevelTiers = {
         },
         3: {
             tier: 3,
-            name: 'Tier 3',
+            name: 'DAGGERHEART.APPLICATIONS.Levelup.tier3.name',
             levels: {
                 start: 5,
                 end: 7
@@ -313,7 +313,7 @@ export const defaultLevelTiers = {
         },
         4: {
             tier: 4,
-            name: 'Tier 4',
+            name: 'DAGGERHEART.APPLICATIONS.Levelup.tier4.name',
             levels: {
                 start: 8,
                 end: 10

module/data/levelup.mjs

@@ -234,7 +234,7 @@ export class DhLevelup extends foundry.abstract.DataModel {
             const subclassInTier = subclasses.some(x => x.tier === Number(tierKey));
 
             return {
-                name: tier.name,
+                name: game.i18n.localize(tier.name),
                 active: this.currentLevel >= Math.min(...tier.belongingLevels),
                 groups: Object.keys(tier.options).map(optionKey => {
                     const option = tier.options[optionKey];

module/documents/chatMessage.mjs

@@ -169,7 +169,7 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
         if (this.system.source.item && this.system.source.action) {
             const action = this.getAction(actor, this.system.source.item, this.system.source.action);
             if (!action || !action?.applyEffects) return;
-            const targets = this.getTargetList();
+            const targets = this.system.hitTargets;
             if (targets.length === 0)
                 ui.notifications.info(game.i18n.localize('DAGGERHEART.UI.Notifications.noTargetsSelected'));
             this.consumeOnSuccess();

src/packs/adversaries/adversary_Oak_Treant_XK78QUfY8c8Go8Uv.json

@@ -105,19 +105,20 @@
       "img": "icons/skills/melee/blood-slash-foam-red.webp",
       "type": "attack",
       "chatDisplay": false
-    }
+    },
+    "motivesAndTactics": "Hide in plain sight, preserve the forest, root down, swing branches"
   },
   "flags": {},
   "_stats": {
     "compendiumSource": null,
     "duplicateSource": null,
     "exportSource": null,
-    "coreVersion": "13.347",
+    "coreVersion": "13.348",
     "systemId": "daggerheart",
-    "systemVersion": "0.0.1",
+    "systemVersion": "1.1.2",
     "createdTime": 1753922784314,
-    "modifiedTime": 1755259462770,
+    "modifiedTime": 1757057641714,
-    "lastModifiedBy": "VZIeX2YDvX338Zvr"
+    "lastModifiedBy": "mdk78Q6pOyHh6aBg"
   },
   "_id": "XK78QUfY8c8Go8Uv",
   "sort": 3400000,

templates/actionTypes/cost.hbs

@@ -1,6 +1,6 @@
 <fieldset class="one-column" data-key="cost">
     <legend>
-        Cost
+        {{localize "DAGGERHEART.GENERAL.Cost.single"}}
         <a><i class="fa-solid fa-plus icon-button" data-action="addElement"></i></a>
     </legend>
     {{#each source as |cost index|}}
@@ -8,10 +8,10 @@
             {{formField ../fields.consumeOnSuccess value=cost.consumeOnSuccess name=(concat "cost." index ".consumeOnSuccess") classes="checkbox" rootId=partId localize=true}}
         {{/if}}
         <div class="nest-inputs">
-            {{formField ../fields.scalable label="Scalable" value=cost.scalable name=(concat "cost." index ".scalable") classes="checkbox"}}
+            {{formField ../fields.scalable label="DAGGERHEART.GENERAL.scalable" value=cost.scalable name=(concat "cost." index ".scalable") classes="checkbox" localize=true}}
-            {{formField ../fields.key choices=(@root.disableOption index @root.costOptions ../source) label="Resource" value=cost.key name=(concat "cost." index ".key") localize=true blank=false}}
+            {{formField ../fields.key choices=(@root.disableOption index @root.costOptions ../source) label="DAGGERHEART.GENERAL.resource" value=cost.key name=(concat "cost." index ".key") localize=true blank=false}}
-            {{formField ../fields.value label="Amount" value=cost.value name=(concat "cost." index ".value")}}
+            {{formField ../fields.value label="DAGGERHEART.GENERAL.amount" value=cost.value name=(concat "cost." index ".value") localize=true}}
-            {{formField ../fields.step label="Step" value=cost.step name=(concat "cost." index ".step") disabled=(not cost.scalable)}}
+            {{formField ../fields.step label="DAGGERHEART.GENERAL.step" value=cost.step name=(concat "cost." index ".step") disabled=(not cost.scalable) localize=true}}
             <a class="btn" data-tooltip="{{localize "CONTROLS.CommonDelete"}}" data-action="removeElement" data-index="{{index}}"><i class="fas fa-trash"></i></a>
         </div>
     {{/each}}

templates/actionTypes/range-target.hbs

@@ -1,12 +1,12 @@
 <fieldset class="one-column">
     <legend>{{localize "DAGGERHEART.GENERAL.range"}}{{#if fields.target}} & {{localize "DAGGERHEART.GENERAL.Target.single"}}{{/if}}</legend>
-    {{formField fields.range value=source.range label="Range" name=(concat path "range") localize=true}}
+    {{formField fields.range value=source.range label="DAGGERHEART.GENERAL.range" name=(concat path "range") localize=true}}
     {{#if fields.target}}
     <div class="nest-inputs">
         {{#if (and source.target.type (not (eq source.target.type 'self')))}}
-            {{ formField fields.target.amount value=source.target.amount label="Amount" name=(concat path "target.amount") }}
+            {{ formField fields.target.amount value=source.target.amount label="DAGGERHEART.GENERAL.amount" name=(concat path "target.amount")  localize=true}}
         {{/if}}
-        {{ formField fields.target.type value=source.target.type label="Target" name=(concat path "target.type") localize=true }}
+        {{ formField fields.target.type value=source.target.type label="DAGGERHEART.GENERAL.Target.single" name=(concat path "target.type") localize=true }}
     </div>
     {{/if}}
 </fieldset>

templates/actionTypes/uses.hbs

@@ -4,8 +4,8 @@
         {{formField fields.consumeOnSuccess value=source.consumeOnSuccess name="uses.consumeOnSuccess" classes="checkbox" rootId=partId localize=true}}
     {{/if}}
     <div class="nest-inputs">
-        {{formField fields.value label="Spent" value=source.value name="uses.value" rootId=partId}}
+        {{formField fields.value label="DAGGERHEART.GENERAL.spent" value=source.value name="uses.value" rootId=partId localize=true}}
-        {{formField fields.max label="Max" value=source.max name="uses.max" rootId=partId}}
+        {{formField fields.max label="DAGGERHEART.GENERAL.max" value=source.max name="uses.max" rootId=partId localize=true}}
     </div>
-    {{formField fields.recovery label="Recovery" value=source.recovery name="uses.recovery" rootId=partId localize=true}}
+    {{formField fields.recovery label="DAGGERHEART.GENERAL.recovery" value=source.recovery name="uses.recovery" rootId=partId localize=true}}
 </fieldset>

templates/dialogs/dice-roll/rollSelection.hbs

@@ -148,7 +148,7 @@
                 <select class="roll-mode-select" name="selectedRollMode">
                     {{selectOptions rollModes selected=selectedRollMode valueAttr="action" labelAttr="label" localize=true}}
                 </select>
-                <button class="sunmit-btn" data-action="submitRoll"{{#unless canRoll}} disabled{{/unless}}>
+                <button class="submit-btn" data-action="submitRoll"{{#unless canRoll}} disabled{{/unless}}>
                     <i class="fa-solid fa-dice"></i>
                     <span class="label">
                         {{#if @root.rollConfig.roll.difficulty}}
@@ -164,7 +164,7 @@
             {{> 'systems/daggerheart/templates/dialogs/dice-roll/costSelection.hbs'}}
         {{/if}}
         <div class="roll-dialog-controls">
-            <button class="sunmit-btn" data-action="submitRoll"{{#unless canRoll}} disabled{{/unless}}>
+            <button class="submit-btn" data-action="submitRoll"{{#unless canRoll}} disabled{{/unless}}>
                 <span class="label">{{localize "DAGGERHEART.GENERAL.continue"}}</span>
             </button>
         </div>