Raised version

* Fixes

* .

.github/workflows/deploy.yml

@@ -35,7 +35,7 @@ jobs:
       env:
         version: ${{steps.get_version.outputs.version-without-v}}
         url: https://github.com/${{github.repository}}
-        manifest: https://github.com/${{github.repository}}/releases/latest/download/system.json
+        manifest: https://raw.githubusercontent.com/${{github.repository}}/V13/system.json
         download: https://github.com/${{github.repository}}/releases/download/${{github.event.release.tag_name}}/system.zip
 
     # Create a zip file with all files required by the module to add to the release

daggerheart.mjs

@@ -405,6 +405,8 @@ Hooks.on('chatMessage', (_, message) => {
 });
 
 const updateActorsRangeDependentEffects = async token => {
+    if (!token) return;
+
     const rangeMeasurement = game.settings.get(
         CONFIG.DH.id,
         CONFIG.DH.SETTINGS.gameSettings.variantRules

lang/en.json

@@ -71,9 +71,7 @@
                     "name": "Summon",
                     "tooltip": "Create tokens in the scene.",
                     "error": "You do not have permission to summon tokens or there is no active scene.",
-                    "invalidDrop": "You can only drop Actor entities to summon.",
+                    "invalidDrop": "You can only drop Actor entities to summon."
-                    "chatMessageTitle": "Test2",
-                    "chatMessageHeaderTitle": "Summoning"
                 },
                 "transform": {
                     "name": "Transform",
@@ -87,9 +85,7 @@
             },
             "Config": {
                 "beastform": {
-                    "exact": "Beastform Max Tier",
+                    "exact": { "label": "Beastform Max Tier", "hint": "The Character's Tier is used if empty" }
-                    "exactHint": "The Character's Tier is used if empty",
-                    "label": "Beastform"
                 },
                 "countdown": {
                     "defaultOwnership": "Default Ownership",
@@ -198,7 +194,10 @@
                     "type": { "label": "Type" }
                 },
                 "hordeDamage": "Horde Damage",
-                "horderHp": "Horde/HP"
+                "horderHp": "Horde/HP",
+                "adversaryReactionRoll": {
+                    "headerTitle": "Adversary Reaction Roll"
+                }
             },
             "Character": {
                 "advantageSources": {
@@ -440,6 +439,10 @@
                 "defaultOwnershipTooltip": "The default player ownership of countdowns",
                 "hideNewCountdowns": "Hide New Countdowns"
             },
+            "CreateItemDialog": {
+                "createItem": "Create Item",
+                "browseCompendium": "Browse Compendium"
+            },
             "DaggerheartMenu": {
                 "title": "GM Tools",
                 "refreshFeatures": "Refresh Features"
@@ -653,6 +656,12 @@
                 "noPlayers": "No players to assign ownership to",
                 "default": "Default Ownership"
             },
+            "PendingReactionsDialog": {
+                "title": "Pending Reaction Rolls Found",
+                "unfinishedRolls": "Some Tokens still need to roll their Reaction Roll.",
+                "confirmation": "Are you sure you want to continue ?",
+                "warning": "Undone reaction rolls will be considered as failed"
+            },
             "ReactionRoll": {
                 "title": "Reaction Roll: {trait}"
             },
@@ -684,7 +693,13 @@
                 "damageNotRolled": "Damage not rolled in chat message yet",
                 "insufficientHope": "The initiating character doesn't have enough hope",
                 "createTagTeam": "Create TagTeam Roll",
-                "chatMessageRollTitle": "Roll"
+                "chatMessageRollTitle": "Roll",
+                "cancelConfirmTitle": "Cancel Tag Team Roll",
+                "cancelConfirmText": "Are you sure you want to cancel the Tag Team Roll? This will close it for all other players too.",
+                "hints": {
+                    "completeRolls": "Set up and complete the rolls for the characters",
+                    "selectRoll": "Select which roll value to be used for the Tag Team"
+                }
             },
             "TokenConfig": {
                 "actorSizeUsed": "Actor size is set, determining the dimensions"
@@ -1215,6 +1230,11 @@
                 "on": "On",
                 "onWithToggle": "On With Toggle"
             },
+            "SceneRangeMeasurementTypes": {
+                "disable": "Disable Daggerheart Range Measurement",
+                "default": "Default",
+                "custom": "Custom"
+            },
             "SelectAction": {
                 "selectType": "Select Action Type",
                 "selectAction": "Action Selection"
@@ -1894,6 +1914,10 @@
                     "hint": "Multiply any damage dealt to you by this number"
                 }
             },
+            "Battlepoints": {
+                "full": "Battlepoints",
+                "short": "BP"
+            },
             "Bonuses": {
                 "rest": {
                     "downtimeAction": "Downtime Action",
@@ -2305,8 +2329,10 @@
             "multiclass": "Multiclass",
             "newCategory": "New Category",
             "newThing": "New {thing}",
+            "next": "Next",
             "none": "None",
             "noTarget": "No current target",
+            "optionalThing": "Optional {thing}",
             "partner": "Partner",
             "player": {
                 "single": "Player",
@@ -2329,9 +2355,11 @@
             "rollDamage": "Roll Damage",
             "rollWith": "{roll} Roll",
             "save": "Save",
+            "saveSettings": "Save Settings",
             "scalable": "Scalable",
             "scars": "Scars",
             "situationalBonus": "Situational Bonus",
+            "searchPlaceholder": "Search...",
             "spent": "Spent",
             "step": "Step",
             "stress": "Stress",
@@ -2482,8 +2510,14 @@
             },
             "Weapon": {
                 "weaponType": "Weapon Type",
-                "primaryWeapon": "Primary Weapon",
+                "primaryWeapon": {
-                "secondaryWeapon": "Secondary Weapon"
+                    "full": "Primary Weapon",
+                    "short": "Primary"
+                },
+                "secondaryWeapon": {
+                    "full": "Secondary Weapon",
+                    "short": "Secondary"
+                }
             }
         },
         "MACROS": {
@@ -2915,6 +2949,9 @@
                 "resourceRoll": {
                     "playerMessage": "{user} rerolled their {name}"
                 },
+                "saveRoll": {
+                    "reactionRollAllTargets": "Reaction Roll All Targets"
+                },
                 "tagTeam": {
                     "title": "Tag Team",
                     "membersTitle": "Members"
@@ -2941,9 +2978,9 @@
             },
             "ItemBrowser": {
                 "title": "Daggerheart Compendium Browser",
+                "windowTitle": "Compendium Browser",
                 "hint": "Select a Folder in sidebar to start browsing through the compendium",
                 "browserSettings": "Browser Settings",
-                "searchPlaceholder": "Search...",
                 "columnName": "Name",
                 "tooltipFilters": "Filters",
                 "tooltipErase": "Erase",
@@ -2979,7 +3016,7 @@
                     "weapons": "Weapons",
                     "armors": "Armors",
                     "consumables": "Consumables",
-                    "loots": "Loots"
+                    "loots": "Loot"
                 }
             },
             "Notifications": {
@@ -3070,6 +3107,7 @@
                     "companion": "Level {level} - {partner}",
                     "companionNoPartner": "No Partner",
                     "duplicateToNewTier": "Duplicate to New Tier",
+                    "createAdversary": "Create Adversary",
                     "pickTierTitle": "Pick a new tier for this adversary"
                 },
                 "daggerheartMenu": {

module/applications/characterCreation/characterCreation.mjs

@@ -11,7 +11,10 @@ export default class DhCharacterCreation extends HandlebarsApplicationMixin(Appl
         this.character = character;
 
         this.setup = {
-            traits: this.character.system.traits,
+            traits: Object.keys(this.character.system.traits).reduce((acc, key) => {
+                acc[key] = { value: null };
+                return acc;
+            }, {}),
             ancestryName: {
                 primary: '',
                 secondary: ''
@@ -377,8 +380,10 @@ export default class DhCharacterCreation extends HandlebarsApplicationMixin(Appl
         ];
         return Object.values(this.setup.traits).reduce((acc, x) => {
             const index = traitCompareArray.indexOf(x.value);
+            if (index === -1) return acc;
+
             traitCompareArray.splice(index, 1);
-            acc += index !== -1;
+            acc += 1;
             return acc;
         }, 0);
     }

module/applications/dialogs/downtime.mjs

@@ -259,8 +259,9 @@ export default class DhpDowntime extends HandlebarsApplicationMixin(ApplicationV
                 const resetValue = increasing
                     ? 0
                     : feature.system.resource.max
-                      ? Roll.replaceFormulaData(feature.system.resource.max, this.actor)
+                      ? new Roll(Roll.replaceFormulaData(feature.system.resource.max, this.actor)).evaluateSync().total
                       : 0;
+
                 await feature.update({ 'system.resource.value': resetValue });
             }
 

module/applications/settings/appearanceSettings.mjs

@@ -118,8 +118,13 @@ export default class DHAppearanceSettings extends HandlebarsApplicationMixin(App
                 break;
             case 'footer':
                 partContext.buttons = [
-                    { type: 'button', action: 'reset', icon: 'fa-solid fa-arrow-rotate-left', label: 'Reset' },
+                    {
-                    { type: 'submit', icon: 'fa-solid fa-floppy-disk', label: 'Save Changes' }
+                        type: 'button',
+                        action: 'reset',
+                        icon: 'fa-solid fa-arrow-rotate-left',
+                        label: game.i18n.localize('Reset')
+                    },
+                    { type: 'submit', icon: 'fa-solid fa-floppy-disk', label: game.i18n.localize('EDITOR.Save') }
                 ];
                 break;
         }

module/applications/sheets/actors/adversary.mjs

@@ -217,8 +217,8 @@ export default class AdversarySheet extends DHBaseActorSheet {
     static #reactionRoll(event) {
         const config = {
             event,
-            title: `Reaction Roll: ${this.actor.name}`,
+            title: game.i18n.localize('DAGGERHEART.GENERAL.reactionRoll'),
-            headerTitle: 'Adversary Reaction Roll',
+            headerTitle: game.i18n.localize('DAGGERHEART.ACTORS.Adversary.adversaryReactionRoll.headerTitle'),
             roll: {
                 type: 'trait'
             },

module/applications/sheets/actors/party.mjs

@@ -229,7 +229,7 @@ export default class Party extends DHBaseActorSheet {
                 title: game.i18n.localize(`DAGGERHEART.APPLICATIONS.Downtime.${button.dataset.type}.title`),
                 icon: button.dataset.type === 'shortRest' ? 'fa-solid fa-utensils' : 'fa-solid fa-bed'
             },
-            content: 'This will trigger a dialog to players make their downtime moves, are you sure?',
+            content: game.i18n.localize('DAGGERHEART.ACTORS.Party.triggerRestContent'),
             classes: ['daggerheart', 'dialog', 'dh-style']
         });
 

module/applications/sheets/api/application-mixin.mjs

@@ -652,12 +652,12 @@ export default function DHApplicationMixin(Base) {
                 buttons: [
                     {
                         action: 'create',
-                        label: 'Create Item',
+                        label: game.i18n.localize('DAGGERHEART.APPLICATIONS.CreateItemDialog.createItem'),
                         icon: 'fa-solid fa-plus'
                     },
                     {
                         action: 'browse',
-                        label: 'Browse Compendium',
+                        label: game.i18n.localize('DAGGERHEART.APPLICATIONS.CreateItemDialog.browseCompendium'),
                         icon: 'fa-solid fa-book'
                     }
                 ]

module/applications/sidebar/tabs/actorDirectory.mjs

@@ -76,7 +76,7 @@ export default class DhActorDirectory extends foundry.applications.sidebar.tabs.
                     window: { title: 'DAGGERHEART.UI.Sidebar.actorDirectory.pickTierTitle' },
                     content,
                     ok: {
-                        label: 'Create Adversary',
+                        label: 'DAGGERHEART.UI.Sidebar.actorDirectory.createAdversary',
                         callback: (event, button, dialog) => Number(button.form.elements.tier.value)
                     }
                 });

module/applications/ui/fearTracker.mjs

@@ -22,7 +22,7 @@ export default class FearTracker extends HandlebarsApplicationMixin(ApplicationV
         tag: 'div',
         window: {
             frame: true,
-            title: 'Fear',
+            title: 'DAGGERHEART.GENERAL.fear',
             positioned: true,
             resizable: true,
             minimizable: false

module/applications/ui/itemBrowser.mjs

@@ -37,7 +37,7 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
         tag: 'div',
         window: {
             frame: true,
-            title: 'Compendium Browser',
+            title: 'DAGGERHEART.UI.ItemBrowser.windowTitle',
             icon: 'fa-solid fa-book-atlas',
             positioned: true,
             resizable: true
@@ -207,8 +207,23 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
             label: game.i18n.localize(col.label)
         }));
 
+        const splitPath = folderId?.split('.') ?? [];
+        const { pathLabels } = splitPath.reduce(
+            (acc, curr) => {
+                acc.currentPath = !acc.currentPath ? curr : [acc.currentPath, curr].join('.');
+                if (curr === 'folder') return acc;
+
+                const label = foundry.utils.getProperty(this.config, acc.currentPath)?.label;
+                if (label) acc.pathLabels.push(game.i18n.localize(label));
+
+                return acc;
+            },
+            { pathLabels: [], currentPath: '' }
+        );
+
         this.selectedMenu = {
-            path: folderId?.split('.') ?? [],
+            path: splitPath,
+            pathLabels: pathLabels,
             data: {
                 ...folderData,
                 columns: columns
@@ -568,7 +583,9 @@ export class ItemBrowser extends HandlebarsApplicationMixin(ApplicationV2) {
         const { itemUuid } = event.target.closest('[data-item-uuid]').dataset,
             item = await foundry.utils.fromUuid(itemUuid),
             dragData = item.toDragData();
+
         event.dataTransfer.setData('text/plain', JSON.stringify(dragData));
+        event.dataTransfer.setDragImage(event.target.querySelector('img'), 0, 0);
     }
 
     _canDragStart() {

module/applications/ux/filter-menu.mjs

@@ -188,7 +188,7 @@ export default class FilterMenu extends foundry.applications.ux.ContextMenu {
         }));
 
         const damageTypeFilter = Object.values(CONFIG.DH.GENERAL.damageTypes).map(({ id, abbreviation }) => ({
-            group: 'Damage Type', //TODO localize
+            group: game.i18n.localize('DAGGERHEART.GENERAL.damageType'),
             name: game.i18n.localize(abbreviation),
             filter: {
                 field: 'system.damage.type',

module/canvas/placeables/measuredTemplate.mjs

@@ -18,7 +18,7 @@ export default class DhMeasuredTemplate extends foundry.canvas.placeables.Measur
 
     static getRangeLabels(distanceValue, settings) {
         let result = { distance: distanceValue, units: '' };
-        if (!settings.enabled) return result;
+        if (!settings.enabled || !canvas.scene) return result;
 
         const sceneRangeMeasurement = canvas.scene.flags.daggerheart?.rangeMeasurement;
         const { disable, custom } = CONFIG.DH.GENERAL.sceneRangeMeasurementSetting;

module/config/generalConfig.mjs

@@ -943,14 +943,14 @@ export const countdownAppMode = {
 export const sceneRangeMeasurementSetting = {
     disable: {
         id: 'disable',
-        label: 'Disable Daggerheart Range Measurement'
+        label: 'DAGGERHEART.CONFIG.SceneRangeMeasurementTypes.disable'
     },
     default: {
         id: 'default',
-        label: 'Default'
+        label: 'DAGGERHEART.CONFIG.SceneRangeMeasurementTypes.default'
     },
     custom: {
         id: 'custom',
-        label: 'Custom'
+        label: 'DAGGERHEART.CONFIG.SceneRangeMeasurementTypes.custom'
     }
 };

module/config/itemBrowserConfig.mjs

@@ -7,7 +7,12 @@ export const typeConfig = {
             },
             {
                 key: 'system.type',
-                label: 'DAGGERHEART.GENERAL.type'
+                label: 'DAGGERHEART.GENERAL.type',
+                format: type => {
+                    if (!type) return '-';
+
+                    return CONFIG.DH.ACTOR.allAdversaryTypes()[type].label;
+                }
             }
         ],
         filters: [
@@ -69,12 +74,13 @@ export const typeConfig = {
         columns: [
             {
                 key: 'type',
-                label: 'DAGGERHEART.GENERAL.type'
+                label: 'DAGGERHEART.GENERAL.type',
+                format: type => type ? `TYPES.Item.${type}` : '-'
             },
             {
                 key: 'system.secondary',
                 label: 'DAGGERHEART.UI.ItemBrowser.subtype',
-                format: isSecondary => (isSecondary ? 'secondary' : isSecondary === false ? 'primary' : '-')
+                format: isSecondary => (isSecondary ? 'DAGGERHEART.ITEMS.Weapon.secondaryWeapon.short' : isSecondary === false ? 'DAGGERHEART.ITEMS.Weapon.primaryWeapon.short' : '-')
             },
             {
                 key: 'system.tier',
@@ -94,8 +100,8 @@ export const typeConfig = {
                 key: 'system.secondary',
                 label: 'DAGGERHEART.UI.ItemBrowser.subtype',
                 choices: [
-                    { value: false, label: 'DAGGERHEART.ITEMS.Weapon.primaryWeapon' },
+                    { value: false, label: 'DAGGERHEART.ITEMS.Weapon.primaryWeapon.full' },
-                    { value: true, label: 'DAGGERHEART.ITEMS.Weapon.secondaryWeapon' }
+                    { value: true, label: 'DAGGERHEART.ITEMS.Weapon.secondaryWeapon.full' }
                 ]
             },
             {
@@ -253,11 +259,13 @@ export const typeConfig = {
         columns: [
             {
                 key: 'system.type',
-                label: 'DAGGERHEART.GENERAL.type'
+                label: 'DAGGERHEART.GENERAL.type',
+                format: type => type ? `DAGGERHEART.CONFIG.DomainCardTypes.${type}` : '-'
             },
             {
                 key: 'system.domain',
-                label: 'DAGGERHEART.GENERAL.Domain.single'
+                label: 'DAGGERHEART.GENERAL.Domain.single',
+                format: domain => domain ? CONFIG.DH.DOMAIN.allDomains()[domain].label : '-'
             },
             {
                 key: 'system.level',
@@ -318,7 +326,14 @@ export const typeConfig = {
             },
             {
                 key: 'system.domains',
-                label: 'DAGGERHEART.GENERAL.Domain.plural'
+                label: 'DAGGERHEART.GENERAL.Domain.plural',
+                format: domains => {
+                    const config = CONFIG.DH.DOMAIN.allDomains();
+                    return domains
+                        .map(x => (x ? game.i18n.localize(config[x].label) : null))
+                        .filter(x => x)
+                        .join(', ');
+                }
             }
         ],
         filters: [
@@ -362,18 +377,19 @@ export const typeConfig = {
         columns: [
             {
                 key: 'system.linkedClass',
-                label: 'Class',
+                label: 'TYPES.Item.class',
                 format: linkedClass => linkedClass?.name ?? 'DAGGERHEART.UI.ItemBrowser.missing'
             },
             {
                 key: 'system.spellcastingTrait',
-                label: 'DAGGERHEART.ITEMS.Subclass.spellcastingTrait'
+                label: 'DAGGERHEART.ITEMS.Subclass.spellcastingTrait',
+                format: trait => (trait ? `DAGGERHEART.CONFIG.Traits.${trait}.name` : '-')
             }
         ],
         filters: [
             {
                 key: 'system.linkedClass.uuid',
-                label: 'Class',
+                label: 'TYPES.Item.class',
                 choices: items => {
                     const list = items
                         .filter(item => item.system.linkedClass)
@@ -397,7 +413,8 @@ export const typeConfig = {
             },
             {
                 key: 'system.mainTrait',
-                label: 'DAGGERHEART.GENERAL.Trait.single'
+                label: 'DAGGERHEART.GENERAL.Trait.single',
+                format: trait => (trait ? `DAGGERHEART.CONFIG.Traits.${trait}.name` : '-')
             }
         ],
         filters: [

module/config/settingsConfig.mjs

@@ -46,18 +46,14 @@ export const gameSettings = {
 export const actionAutomationChoices = {
     never: {
         id: 'never',
-        label: 'Never'
+        label: 'DAGGERHEART.CONFIG.ActionAutomationChoices.never'
     },
     showDialog: {
         id: 'showDialog',
-        label: 'Show Dialog only'
+        label: 'DAGGERHEART.CONFIG.ActionAutomationChoices.showDialog'
     },
-    // npcOnly: {
-    // id: "npcOnly",
-    // label: "Always for non-characters"
-    // },
     always: {
         id: 'always',
-        label: 'Always'
+        label: 'DAGGERHEART.CONFIG.ActionAutomationChoices.always'
     }
 };

module/data/fields/action/beastformField.mjs

@@ -28,7 +28,8 @@ export default class BeastformField extends fields.SchemaField {
                             { 1: game.i18n.localize('DAGGERHEART.GENERAL.Tiers.1') }
                         );
                     },
-                    hint: 'DAGGERHEART.ACTIONS.Config.beastform.exactHint'
+                    label: 'DAGGERHEART.ACTIONS.Config.beastform.exact.label',
+                    hint: 'DAGGERHEART.ACTIONS.Config.beastform.exact.hint'
                 })
             })
         };

module/data/fields/action/damageField.mjs

@@ -295,7 +295,7 @@ export class DHDamageData extends DHResourceData {
                     required: true
                 }),
                 {
-                    label: 'Type'
+                    label: game.i18n.localize('DAGGERHEART.GENERAL.type')
                 }
             )
         };

module/documents/chatMessage.mjs

@@ -197,8 +197,8 @@ export default class DhpChatMessage extends foundry.documents.ChatMessage {
             const pendingingSaves = targets.filter(t => t.saved.success === null);
             if (pendingingSaves.length) {
                 const confirm = await foundry.applications.api.DialogV2.confirm({
-                    window: { title: 'Pending Reaction Rolls found' },
+                    window: { title: game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.title') },
-                    content: `<p>Some Tokens still need to roll their Reaction Roll.</p><p>Are you sure you want to continue ?</p><p><i>Undone reaction rolls will be considered as failed</i></p>`
+                    content: `<p>${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.unfinishedRolls')}</p><p>${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.confirmation')}</p><p><i>${game.i18n.localize('DAGGERHEART.APPLICATIONS.PendingReactionsDialog.warning')}</i></p>`
                 });
                 if (!confirm) return;
             }

module/documents/tokenManager.mjs

@@ -95,7 +95,7 @@ export default class DhTokenManager {
             : this.#actor;
         const tokenData = await actor.getTokenDocument();
         const result = await canvas.scene.createEmbeddedDocuments('Token', [
-            { ...tokenData, x: this.#activePreview.document.x, y: this.#activePreview.document.y }
+            { ...tokenData.toObject(), x: this.#activePreview.document.x, y: this.#activePreview.document.y }
         ]);
 
         this.#activePreview = undefined;

module/enrichers/TemplateEnricher.mjs

@@ -65,13 +65,7 @@ export const renderMeasuredTemplate = async event => {
               ? '180'
               : undefined;
 
-    let baseDistance = range;
+    const distance = getTemplateDistance(range, type);
-    if (Number.isNaN(Number(range))) {
-        baseDistance = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.variantRules).rangeMeasurement[
-            range
-        ];
-    }
-    const distance = type === CONFIG.DH.GENERAL.templateTypes.EMANATION ? baseDistance + 2.5 : baseDistance;
 
     const { width, height } = game.canvas.scene.dimensions;
     const data = {
@@ -86,3 +80,23 @@ export const renderMeasuredTemplate = async event => {
 
     CONFIG.ux.TemplateManager.createPreview(data);
 };
+
+const getTemplateDistance = (range, type) => {
+    const rangeNumber = Number(range);
+    if (!Number.isNaN(rangeNumber)) return rangeNumber;
+
+    const { custom } = CONFIG.DH.GENERAL.sceneRangeMeasurementSetting;
+    const sceneMeasurements = canvas.scene?.flags.daggerheart?.rangeMeasurement;
+    const globalMeasurements = game.settings.get(
+        CONFIG.DH.id,
+        CONFIG.DH.SETTINGS.gameSettings.variantRules
+    ).rangeMeasurement;
+
+    const settings = sceneMeasurements?.setting === custom.id ? sceneMeasurements : globalMeasurements;
+    const baseDistance = settings[range];
+
+    if (type !== CONFIG.DH.GENERAL.templateTypes.EMANATION) return baseDistance;
+
+    const emanationAddDistance = settings.melee / 2;
+    return baseDistance + emanationAddDistance;
+};

src/packs/ancestries/feature_Retract_UFR67BUOhNGLFyg9.json

@@ -80,7 +80,7 @@
         {
           "key": "system.disadvantageSources",
           "mode": 2,
-          "value": "Retract",
+          "value": "Action Rolls",
           "priority": null
         }
       ],

src/packs/communities/feature_Low_Light_Living_aMla3xQuCHEwORGD.json

@@ -35,19 +35,7 @@
         {
           "key": "system.advantageSources",
           "mode": 2,
-          "value": "In an area with low light or heavy shadow: hide, investigate, or perceive",
+          "value": "Rolls to hide, investigate, or perceive details in low light",
-          "priority": null
-        },
-        {
-          "key": "system.advantageSources",
-          "mode": 2,
-          "value": "",
-          "priority": null
-        },
-        {
-          "key": "",
-          "mode": 2,
-          "value": "",
           "priority": null
         }
       ],
@@ -61,7 +49,7 @@
         "startRound": null,
         "startTurn": null
       },
-      "description": "",
+      "description": "<p>When you’re in an area with low light or heavy shadow, you have advantage on rolls to hide, investigate, or perceive details within that area.</p>",
       "origin": null,
       "tint": "#ffffff",
       "transfer": true,

src/packs/domains/domainCard_Battle_Cry_Ef1JsUG50LIoKx2F.json

@@ -138,7 +138,7 @@
         {
           "key": "system.advantageSources",
           "mode": 2,
-          "value": "1",
+          "value": "Attack Rolls",
           "priority": null
         }
       ],
@@ -152,7 +152,7 @@
         "startRound": null,
         "startTurn": null
       },
-      "description": "",
+      "description": "<p>You gain advantage on attack rolls until you or an ally rolls a failure with Fear.</p>",
       "tint": "#ffffff",
       "statuses": [],
       "sort": 0,

src/packs/domains/domainCard_Rain_of_Blades_Ucenef6JpjQxwXni.json

@@ -36,7 +36,8 @@
               "resultBased": false,
               "value": {
                 "custom": {
-                  "enabled": false
+                  "enabled": false,
+                  "formula": ""
                 },
                 "multiplier": "prof",
                 "dice": "d8",
@@ -44,7 +45,9 @@
                 "flatMultiplier": 1
               },
               "applyTo": "hitPoints",
-              "type": [],
+              "type": [
+                "magical"
+              ],
               "base": false,
               "valueAlt": {
                 "multiplier": "prof",
@@ -52,7 +55,8 @@
                 "dice": "d6",
                 "bonus": null,
                 "custom": {
-                  "enabled": false
+                  "enabled": false,
+                  "formula": ""
                 }
               }
             }
@@ -87,57 +91,6 @@
         "name": "Cast",
         "img": "icons/skills/melee/spear-tips-three-green.webp",
         "range": "veryClose"
-      },
-      "CUKoYyDxQhNc0pLs": {
-        "type": "damage",
-        "_id": "CUKoYyDxQhNc0pLs",
-        "systemPath": "actions",
-        "description": "<p>If a target you hit is <em>Vulnerable</em>, they take an extra <strong>1d8</strong> damage.</p>",
-        "chatDisplay": true,
-        "actionType": "action",
-        "cost": [],
-        "uses": {
-          "value": null,
-          "max": "",
-          "recovery": null
-        },
-        "damage": {
-          "parts": [
-            {
-              "value": {
-                "custom": {
-                  "enabled": false
-                },
-                "multiplier": "flat",
-                "flatMultiplier": 1,
-                "dice": "d8",
-                "bonus": null
-              },
-              "applyTo": "hitPoints",
-              "type": [],
-              "base": false,
-              "resultBased": false,
-              "valueAlt": {
-                "multiplier": "prof",
-                "flatMultiplier": 1,
-                "dice": "d6",
-                "bonus": null,
-                "custom": {
-                  "enabled": false
-                }
-              }
-            }
-          ],
-          "includeBase": false
-        },
-        "target": {
-          "type": "any",
-          "amount": null
-        },
-        "effects": [],
-        "name": "Damage Against Vulnerable",
-        "img": "icons/skills/melee/spear-tips-three-purple.webp",
-        "range": ""
       }
     },
     "attribution": {

src/packs/items/weapons/weapon_Labrys_Axe_ijWppQzSOqVCb3rE.json

@@ -5,22 +5,14 @@
   "_id": "ijWppQzSOqVCb3rE",
   "img": "icons/weapons/axes/axe-battle-jagged.webp",
   "system": {
-    "description": "",
+    "description": "<strong>Protective</strong>: +1 to Armor Score",
     "actions": {},
     "attached": [],
     "tier": 3,
     "equipped": false,
     "secondary": false,
     "burden": "twoHanded",
-    "weaponFeatures": [
+    "weaponFeatures": [],
-      {
-        "value": "protective",
-        "effectIds": [
-          "qTxADRsQnKiYfOiQ"
-        ],
-        "actionIds": []
-      }
-    ],
     "attack": {
       "name": "Attack",
       "img": "icons/skills/melee/blood-slash-foam-red.webp",
@@ -111,13 +103,13 @@
   "effects": [
     {
       "name": "Protective",
-      "description": "Add your character's Tier to your Armor Score",
+      "description": "+1 to Armor Score",
-      "img": "icons/skills/melee/shield-block-gray-orange.webp",
+      "img": "icons/magic/defensive/shield-barrier-deflect-teal.webp",
       "changes": [
         {
           "key": "system.armorScore",
           "mode": 2,
-          "value": "ITEM.@system.tier"
+          "value": "1"
         }
       ],
       "_id": "qTxADRsQnKiYfOiQ",

styles/less/dialog/character-creation/selections-container.less

@@ -175,6 +175,11 @@
                 opacity: 0.2;
             }
 
+            &.no-horizontal-padding {
+                padding-left: 0;
+                padding-right: 0;
+            }
+
             legend {
                 margin-left: auto;
                 margin-right: auto;
@@ -274,6 +279,15 @@
                 flex-direction: column;
                 gap: 5px;
 
+                &.separated {
+                    border-bottom: 2px solid;
+                    padding-bottom: 8px;
+                }
+
+                .form-group {
+                    padding: 0 0.75rem;
+                }
+
                 .experience-inner-container {
                     position: relative;
                     display: flex;

styles/less/global/prose-mirror.less

@@ -24,7 +24,7 @@
             }
             h4 {
                 font-size: var(--font-size-16);
-                color: @beige;
+                color: light-dark(@dark, @beige);
                 font-weight: 600;
             }
 

styles/less/ui/combat-sidebar/encounter-controls.less

@@ -10,6 +10,7 @@
         .encounter-battlepoints {
             display: flex;
             cursor: help;
+            color: light-dark(@dark, @beige);
         }
 
         .inner-controls {

system.json

@@ -2,12 +2,15 @@
     "id": "daggerheart",
     "title": "Daggerheart",
     "description": "An unofficial implementation of the Daggerheart system",
-    "version": "1.9.6",
+    "version": "1.9.10",
     "compatibility": {
         "minimum": "13.346",
         "verified": "13.351",
         "maximum": "13"
     },
+    "url": "https://github.com/Foundryborne/daggerheart",
+    "manifest": "https://raw.githubusercontent.com/Foundryborne/daggerheart/V13/system.json",
+    "download": "https://github.com/Foundryborne/daggerheart/releases/download/1.9.10/system.zip",
     "authors": [
         {
             "name": "WBHarry"
@@ -296,8 +299,5 @@
     },
     "background": "systems/daggerheart/assets/logos/FoundrybornBackgroundLogo.png",
     "primaryTokenAttribute": "resources.hitPoints",
-    "secondaryTokenAttribute": "resources.stress",
+    "secondaryTokenAttribute": "resources.stress"
-    "url": "https://your/hosted/system/repo/",
-    "manifest": "https://your/hosted/system/repo/system.json",
-    "download": "https://your/packaged/download/archive.zip"
 }

templates/actionTypes/beastform.hbs

@@ -1,4 +1,4 @@
 <fieldset>
-    <legend>{{localize "DAGGERHEART.ACTIONS.Config.beastform.label"}}</legend>
+    <legend>{{localize "DAGGERHEART.ACTIONS.TYPES.beastform.name"}}</legend>
     {{formGroup fields.tierAccess.fields.exact value=source.tierAccess.exact name="beastform.tierAccess.exact" labelAttr="label" valueAttr="key" localize=true blank=""}}
 </fieldset>

templates/characterCreation/footer.hbs

@@ -1,8 +1,8 @@
 <section class="creation-action-footer">
-    <button data-action="close">{{localize "Cancel"}}</button>
+    <button data-action="close">{{localize "COMMON.Cancel"}}</button>
     {{#if isLastTab}}
         <button data-action="finish">{{localize "DAGGERHEART.APPLICATIONS.CharacterCreation.finishCreation"}}</button>
     {{else}}
-        <button data-action="setupGoNext" {{disabled nextDisabled}}>{{localize "Next"}}</button>
+        <button data-action="setupGoNext" {{disabled nextDisabled}}>{{localize "DAGGERHEART.GENERAL.next"}}</button>
     {{/if}}
 </section>

templates/characterCreation/tabs/experience.hbs

@@ -4,18 +4,26 @@
     data-group='{{tabs.experience.group}}'
 >
     <div class="main-selections-container">
-        <fieldset class="section-container">
+        <fieldset class="section-container no-horizontal-padding">
             <legend>{{localize "DAGGERHEART.APPLICATIONS.CharacterCreation.initialExperiences"}} {{experience.nrSelected}}/{{experience.nrTotal}}</legend>
             <div class="experiences-inner-container">
                 {{#each experience.values as |experience id|}}
-                    <div class="experience-container">
+                    <div class="experience-container {{#unless @last}}separated{{/unless}}">
+                        <div class="form-group">
+                            <label>{{localize "DAGGERHEART.GENERAL.label"}}</label>
                             <div class="experience-inner-container">
                                 <input class="experience-description" type="text" name="{{concat "experiences." id ".name" }}" value="{{experience.name}}" placeholder="{{localize "DAGGERHEART.APPLICATIONS.CharacterCreation.newExperience"}}" />
                                 <span class="experience-value">{{numberFormat this.value sign=true}}</span>
                             </div>
+                        </div>
 
+                        <div class="form-group">
+                            <label>{{localize "DAGGERHEART.GENERAL.optionalThing" thing=(localize "DAGGERHEART.GENERAL.description")}}</label>
+                            <div class="form-fields">
                                 <textarea name="{{concat "experiences." id ".description"}}">{{experience.description}}</textarea>
                             </div>
+                        </div>
+                    </div>
                 {{/each}}
             </div>
         </fieldset>

templates/dialogs/compendiumBrowserSettingsDialog/footer.hbs

@@ -1,3 +1,3 @@
 <footer>
-    <button data-action="finish">{{localize "Save Settings"}}</button>
+    <button data-action="finish">{{localize "DAGGERHEART.GENERAL.saveSettings"}}</button>
 </footer>

templates/dialogs/deathMove.hbs

@@ -17,7 +17,7 @@
     </div>
     <footer class="flexrow">
         <button data-action="close">
-            <span>{{localize "Cancel"}}</span>
+            <span>{{localize "COMMON.Cancel"}}</span>
         </button>
         <button data-action="takeMove" {{#if (not this.selectedMove)}}disabled{{/if}}>
             <span>

templates/dialogs/dice-roll/damageSelection.hbs

@@ -35,7 +35,7 @@
             </span>
         </div>
         <div class="form-group">
-            <input type="text" value="{{extraFormula}}" name="roll.{{ @index }}.extraFormula" placeholder="Situational Bonus">
+            <input type="text" value="{{extraFormula}}" name="roll.{{ @index }}.extraFormula" placeholder="{{localize "DAGGERHEART.GENERAL.situationalBonus"}}">
         </div>
     {{/each}}
     {{#unless (empty @root.modifiers)}}

templates/dialogs/dice-roll/rollSelection.hbs

@@ -175,7 +175,7 @@
                             </select>
                         {{/if}}
                         {{#if (eq @root.rollType 'DualityRoll')}}<span class="formula-label">{{localize "DAGGERHEART.GENERAL.situationalBonus"}}</span>{{/if}}
-                        <input type="text" value="{{extraFormula}}" name="extraFormula" placeholder="{{#if (eq @root.rollType 'DualityRoll')}}Ex: 1d6 + 5{{else}}Situational Bonus{{/if}}">
+                        <input type="text" value="{{extraFormula}}" name="extraFormula" placeholder="{{#if (eq @root.rollType 'DualityRoll')}}Ex: 1d6 + 5{{else}}{{localize "DAGGERHEART.GENERAL.situationalBonus"}}{{/if}}">
                     </fieldset>
                 {{/if}}
             {{/unless}}

templates/dialogs/downtime/downtime.hbs

@@ -28,7 +28,7 @@
     </fieldset>
 
     <footer>
-        <button type="button" data-action="close">{{localize "Cancel"}}</button>
+        <button type="button" data-action="close">{{localize "COMMON.Cancel"}}</button>
         <button type="button" data-action="takeDowntime" {{#if disabledDowntime}}disabled{{/if}}>{{localize "DAGGERHEART.APPLICATIONS.Downtime.takeDowntime"}}</button>
     </footer>
 </div>

templates/dialogs/image-select/footer.hbs

@@ -1,4 +1,4 @@
 <div class="footer">
-    <button data-action="close">{{localize "Cancel"}}</button>
+    <button data-action="close">{{localize "COMMON.Cancel"}}</button>
     <button type="button" data-action="finishSelection">{{localize "DAGGERHEART.APPLICATIONS.ImageSelect.selectImage"}}</button>
 </div>

templates/dialogs/multiclassChoice.hbs

@@ -16,7 +16,7 @@
         </div>
 
         <footer>
-            <button data-action="close">{{localize "Cancel"}}</button>
+            <button data-action="close">{{localize "COMMON.Cancel"}}</button>
             <button data-action="save" {{disabled multiclassDisabled}}>{{localize "DAGGERHEART.GENERAL.multiclass"}}</button>
         </footer>
     </div>

templates/levelup/tabs/footer.hbs

@@ -20,7 +20,7 @@
     {{/if}}
     {{#unless levelupAuto}}
         <div class="levelup-footer">
-            <button type="button" data-action="close">{{localize "Cancel"}}</button>
+            <button type="button" data-action="close">{{localize "COMMON.Cancel"}}</button>
             <button type="button" data-action="save">{{localize "Save"}}</button>
         </div>
     {{/unless}}

templates/settings/automation-settings/footer.hbs

@@ -5,6 +5,6 @@
     </button>
     <button data-action="save" >
         <i class="fa-solid fa-floppy-disk"></i>
-        <span>{{localize "Save Changes"}}</span>
+        <span>{{localize "EDITOR.Save"}}</span>
     </button>
 </footer>

templates/settings/downtime-config/footer.hbs

@@ -1,4 +1,4 @@
 <section class='tab-form-footer spaced'>
-    <button data-action="close">{{localize "Cancel"}}</button>
+    <button data-action="close">{{localize "COMMON.Cancel"}}</button>
     <button data-action="saveForm"><i class="fa-solid fa-floppy-disk"></i> {{localize "Save"}}</button>
 </section>

templates/settings/homebrew-settings/footer.hbs

@@ -5,6 +5,6 @@
     </button>
     <button type="button" data-action="save" >
         <i class="fa-solid fa-floppy-disk"></i>
-        <span>{{localize "Save Changes"}}</span>
+        <span>{{localize "EDITOR.Save"}}</span>
     </button>
 </footer>

templates/settings/metagaming-settings/footer.hbs

@@ -5,6 +5,6 @@
     </button>
     <button data-action="save" >
         <i class="fa-solid fa-floppy-disk"></i>
-        <span>{{localize "Save Changes"}}</span>
+        <span>{{localize "EDITOR.Save"}}</span>
     </button>
 </footer>

templates/settings/variant-rules.hbs

@@ -36,7 +36,7 @@
         </button>
         <button data-action="save" >
             <i class="fa-solid fa-floppy-disk"></i>
-            <span>{{localize "Save Changes"}}</span>
+            <span>{{localize "EDITOR.Save"}}</span>
         </button>
     </footer>
 </div>

templates/sheets/actors/character/inventory.hbs

@@ -5,7 +5,7 @@
             <div class="icon">
                 <i class="fa-solid fa-magnifying-glass"></i>
             </div>
-            <input type="search" name="search" class="search-inventory" placeholder="Search...">
+            <input type="search" name="search" class="search-inventory" placeholder="{{localize "DAGGERHEART.GENERAL.searchPlaceholder"}}">
         </div>
         <a class="filter-button">
             <i class="fa-solid fa-filter"></i>

templates/sheets/actors/character/loadout.hbs

@@ -5,7 +5,7 @@
             <div class="icon">
                 <i class="fa-solid fa-magnifying-glass"></i>
             </div>
-            <input type="search" name="search" class="search-loadout" placeholder="Search...">
+            <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>

templates/sheets/actors/party/inventory.hbs

@@ -5,7 +5,7 @@
             <div class="icon">
                 <i class="fa-solid fa-magnifying-glass"></i>
             </div>
-            <input type="search" name="search" class="search-inventory" placeholder="Search...">
+            <input type="search" name="search" class="search-inventory" placeholder="{{localize "DAGGERHEART.GENERAL.searchPlaceholder"}}">
         </div>
         <a class="filter-button">
             <i class="fa-solid fa-filter"></i>

templates/sheets/actors/party/party-members.hbs

@@ -7,11 +7,11 @@
     <div class="actions-section">
         <button data-action="tagTeamRoll">
             <i class="fa-solid fa-user-group"></i>
-            <span>Tag Team Roll</span>
+            <span>{{localize "DAGGERHEART.APPLICATIONS.TagTeamSelect.title"}}</span>
         </button>
         <button data-action="groupRoll">
             <i class="fa-solid fa-users"></i>
-            <span>Group Roll</span>
+            <span>{{localize "DAGGERHEART.APPLICATIONS.GroupRollSelect.title"}}</span>
         </button>
         {{!-- NOT YET IMPLEMENTED --}}
         {{!-- <button>

templates/sheets/items/armor/description.hbs

@@ -1,9 +1,9 @@
-<div class="item-description-outer-container">
+{{#if features.length}}
-    {{#if features.length}}
+    <div class="item-description-outer-container"> 
         <div class="item-description-container">
             {{#each features as | feature |}}
                 <div><strong>{{localize feature.label}}</strong>: {{{localize feature.description}}}</div>
             {{/each}}
         </div>
-    {{/if}}
+    </div>
-</div>
+{{/if}}

templates/sheets/items/weapon/description.hbs

@@ -1,9 +1,9 @@
-<div class="item-description-outer-container">
+{{#if features.length}}
-    {{#if features.length}}
+    <div class="item-description-outer-container">
         <div class="item-description-container">
             {{#each features as | feature |}}
                 <div><strong>{{localize feature.label}}</strong>: {{{localize feature.description}}}</div>
             {{/each}}
         </div>
-    {{/if}}
+    </div>
-</div>
+{{/if}}

templates/sheets/items/weapon/header.hbs

@@ -5,9 +5,9 @@
         <h1 class='item-name'><input type='text' name='name' value='{{source.name}}' /></h1>
         <div class='item-description'>
             {{#if source.system.secondary}}
-                <h3>{{localize "DAGGERHEART.ITEMS.Weapon.secondaryWeapon"}}</h3>
+                <h3>{{localize "DAGGERHEART.ITEMS.Weapon.secondaryWeapon.full"}}</h3>
             {{else}}
-                <h3>{{localize "DAGGERHEART.ITEMS.Weapon.primaryWeapon"}}</h3>
+                <h3>{{localize "DAGGERHEART.ITEMS.Weapon.primaryWeapon.full"}}</h3>
             {{/if}}
             <h3>
                 {{localize (concat 'DAGGERHEART.CONFIG.Traits.' source.system.attack.roll.trait '.short')}}

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

@@ -24,7 +24,7 @@
                         <div class="roll-part-header"><div></div></div>
                     </div>
                 {{/if}}
-                {{#if (and hasSave currentTargets.length)}}<div class="roll-part-extra roll-all-save-button">Reaction Roll All Targets<i class="fa-solid fa-shield fa-lg"></i></div>{{/if}}
+                {{#if (and hasSave currentTargets.length)}}<div class="roll-part-extra roll-all-save-button">{{localize "DAGGERHEART.UI.Chat.saveRoll.reactionRollAllTargets"}}<i class="fa-solid fa-shield fa-lg"></i></div>{{/if}}
                 {{#each currentTargets}}
                     <div class="roll-target" data-token="{{id}}">
                         <img class="target-img" src="{{img}}">

templates/ui/itemBrowser/itemBrowser.hbs

@@ -1,14 +1,14 @@
 <div class="compendium-results">
     {{#if menu.path.length }}
         <div class="menu-path">
-            {{#each menu.path}}
+            {{#each menu.pathLabels}}
-                {{#if (eq this "folders")}}
+                {{#unless @first}}
                     <span class="path-link">
                         /
                     </span>
-                {{else}}
+                {{/unless}}
+
                 <span class="item-path">{{this}}</span>
-                {{/if}}
             {{/each}}
         </div>
         <div class="item-filter">
@@ -17,7 +17,7 @@
                     <div class="icon">
                         <i class="fa-solid fa-magnifying-glass"></i>
                     </div>
-                    <input type="search" name="search" class="search-input" placeholder="{{localize 'DAGGERHEART.UI.ItemBrowser.searchPlaceholder'}}">
+                    <input type="search" name="search" class="search-input" placeholder="{{localize 'DAGGERHEART.GENERAL.searchPlaceholder'}}">
                 </div>
                 <a data-tooltip="{{localize 'DAGGERHEART.UI.ItemBrowser.tooltipFilters'}}" data-action="expandContent" disabled><i class="fa-solid fa-filter"></i></a>
                 <a data-tooltip="{{localize 'DAGGERHEART.UI.ItemBrowser.tooltipErase'}}" data-action="resetFilters"><i class="fa-solid fa-eraser"></i></a>

templates/ui/tooltip/action.hbs

@@ -16,7 +16,7 @@
         {{#if (gt item.cost.length 0)}}
             {{#each item.cost as | cost |}}
                 <div class="tag">
-                  <span>{{localize "Type"}} {{#with (lookup @root.config.GENERAL.abilityCosts cost.type) as | type |}}{{localize type.label}}{{/with}}</span>
+                  <span>{{localize "DAGGERHEART.GENERAL.type"}} {{#with (lookup @root.config.GENERAL.abilityCosts cost.type) as | type |}}{{localize type.label}}{{/with}}</span>
                 </div>
                 <div class="tag">
                   <span>{{localize "DAGGERHEART.GENERAL.value"}} {{cost.value}}</span>

templates/ui/tooltip/adversary.hbs

@@ -11,7 +11,7 @@
             {{/with}}
         </div>
         <div class="tooltip-information">
-            <label>{{localize "Type"}}</label>
+            <label>{{localize "DAGGERHEART.GENERAL.type"}}</label>
             {{#with (lookup adversaryTypes item.system.type) as | type |}}
                 <div>{{localize type.label}}</div>
             {{/with}}

templates/ui/tooltip/battlepoints.hbs

@@ -1,15 +1,15 @@
 <div class="daggerheart dh-style tooltip">
     
-    <div class="tooltip-header"><h2>{{localize "Adversaries"}} ({{currentBP}}/{{maxBP}})</h2></div>
+    <div class="tooltip-header"><h2>{{localize "DAGGERHEART.GENERAL.Adversary.plural"}} ({{currentBP}}/{{maxBP}})</h2></div>
     <div class="battlepoint-categories-container">
         <div class="battlepoint-categories-inner-container">
             {{#each categories as |category key|}}
                 {{#each category as |grouping index|}}
                     <div class="battlepoint-grouping-container">
                         {{#if grouping.nr}}
-                            <label>{{key}} BP: {{concat (localize grouping.description) ' ' '('grouping.nr 'x)'}}</label>
+                            <label>{{key}} {{localize "DAGGERHEART.GENERAL.Battlepoints.short"}} - {{concat (localize grouping.description) ' ' '('grouping.nr 'x)'}}</label>
                         {{else}}
-                            <label class="unselected-grouping">{{key}} BP - {{localize grouping.description}}</label>
+                            <label class="unselected-grouping">{{key}} {{localize "DAGGERHEART.GENERAL.Battlepoints.short"}} - {{localize grouping.description}}</label>
                         {{/if}}
                     </div>
                 {{/each}}
@@ -17,7 +17,7 @@
         </div>
     </div>
 
-    <div class="tooltip-header"><h2>{{localize "Modifiers"}}</h2></div>
+    <div class="tooltip-header"><h2>{{localize "DAGGERHEART.GENERAL.Modifier.plural"}}</h2></div>
     <div class="battlepoint-toggles-container">
         {{#each toggles as |toggle|}}
             <div class="battlepoint-toggle-container {{#if (and toggle.disabled (not toggle.checked))}}inactive{{/if}}">
@@ -26,7 +26,7 @@
                 {{else}}
                     <input type="checkbox" data-combat-id="{{@root.combatId}}" data-category="{{toggle.categoryKey}}" data-grouping="{{toggle.toggleKey}}" {{checked toggle.checked}} />
                 {{/if}}
-                <label class="unselected-grouping">{{toggle.categoryKey}} BP: {{localize toggle.description}}</label>
+                <label class="unselected-grouping">{{toggle.categoryKey}} {{localize "DAGGERHEART.GENERAL.Battlepoints.short"}}: {{localize toggle.description}}</label>
             </div>
         {{/each}}
     </div>

templates/ui/tooltip/weapon.hbs

@@ -3,7 +3,7 @@
     <h2 class="tooltip-title">{{item.name}}</h2>
     <div class="tags">
         <div class="tag">
-            <span>{{#if item.system.secondary}}{{localize "DAGGERHEART.ITEMS.Weapon.secondaryWeapon"}}{{else}}{{localize "DAGGERHEART.ITEMS.Weapon.primaryWeapon"}}{{/if}}</span>
+            <span>{{#if item.system.secondary}}{{localize "DAGGERHEART.ITEMS.Weapon.secondaryWeapon.full"}}{{else}}{{localize "DAGGERHEART.ITEMS.Weapon.primaryWeapon.full"}}{{/if}}</span>
         </div>
         <div class="tag">
             {{#with (lookup config.GENERAL.burden item.system.burden) as | burden |}}