From baa7f6352eade600b5993f78948582203638c19c Mon Sep 17 00:00:00 2001 From: WBHarry Date: Sat, 5 Jul 2025 22:29:59 +0200 Subject: [PATCH] PR Fixes --- lang/en.json | 1 - module/applications/sheets-configs/adversary-settings.mjs | 2 +- module/applications/sheets-configs/environment-settings.mjs | 2 +- module/applications/sheets/api/base-item.mjs | 2 +- module/applications/sheets/items/class.mjs | 2 +- module/applications/sheets/items/subclass.mjs | 2 +- module/data/actor/character.mjs | 2 +- module/data/item/weapon.mjs | 4 ++-- templates/sheets-settings/adversary-settings/features.hbs | 2 +- templates/sheets-settings/environment-settings/features.hbs | 2 +- 10 files changed, 10 insertions(+), 11 deletions(-) diff --git a/lang/en.json b/lang/en.json index 4a125fe2..6052dfba 100755 --- a/lang/en.json +++ b/lang/en.json @@ -215,7 +215,6 @@ "Features": "Features", "proficiency": "Proficiency", "unarmored": "Unarmored", - "newFeature": "New Feature", "Experience": { "Single": "Experience", "plural": "Experiences" diff --git a/module/applications/sheets-configs/adversary-settings.mjs b/module/applications/sheets-configs/adversary-settings.mjs index c55bc9d5..33899020 100644 --- a/module/applications/sheets-configs/adversary-settings.mjs +++ b/module/applications/sheets-configs/adversary-settings.mjs @@ -151,7 +151,7 @@ export default class DHAdversarySettings extends HandlebarsApplicationMixin(Appl await this.actor.createEmbeddedDocuments('Item', [ { type: 'feature', - name: game.i18n.localize('DAGGERHEART.General.newFeature'), + name: game.i18n.format('DOCUMENT.New', { type: game.i18n.localize('TYPES.Item.feature') }), img: 'icons/skills/melee/weapons-crossed-swords-black.webp' } ]); diff --git a/module/applications/sheets-configs/environment-settings.mjs b/module/applications/sheets-configs/environment-settings.mjs index c008b76c..27969634 100644 --- a/module/applications/sheets-configs/environment-settings.mjs +++ b/module/applications/sheets-configs/environment-settings.mjs @@ -127,7 +127,7 @@ export default class DHEnvironmentSettings extends HandlebarsApplicationMixin(Ap await this.actor.createEmbeddedDocuments('Item', [ { type: 'feature', - name: game.i18n.localize('DAGGERHEART.General.newFeature'), + name: game.i18n.format('DOCUMENT.New', { type: game.i18n.localize('TYPES.Item.feature') }), img: 'icons/magic/perception/orb-crystal-ball-scrying-blue.webp' } ]); diff --git a/module/applications/sheets/api/base-item.mjs b/module/applications/sheets/api/base-item.mjs index e41d1d9f..5d09b942 100644 --- a/module/applications/sheets/api/base-item.mjs +++ b/module/applications/sheets/api/base-item.mjs @@ -153,7 +153,7 @@ export default class DHBaseItemSheet extends DHApplicationMixin(ItemSheetV2) { static async #addFeature(_event, _button) { const feature = await game.items.documentClass.create({ type: 'feature', - name: game.i18n.localize('DAGGERHEART.General.newFeature') + name: game.i18n.format('DOCUMENT.New', { type: game.i18n.localize('TYPES.Item.feature') }) }); await this.document.update({ 'system.features': [...this.document.system.features.filter(x => x).map(x => x.uuid), feature.uuid] diff --git a/module/applications/sheets/items/class.mjs b/module/applications/sheets/items/class.mjs index 59f483e2..f1e11623 100644 --- a/module/applications/sheets/items/class.mjs +++ b/module/applications/sheets/items/class.mjs @@ -175,7 +175,7 @@ export default class ClassSheet extends DHBaseItemSheet { const actionPath = this.getActionPath(target.dataset.type); const feature = await game.items.documentClass.create({ type: 'feature', - name: game.i18n.localize('DAGGERHEART.General.newFeature') + name: game.i18n.format('DOCUMENT.New', { type: game.i18n.localize('TYPES.Item.feature') }) }); await this.document.update({ [`system.${actionPath}`]: [ diff --git a/module/applications/sheets/items/subclass.mjs b/module/applications/sheets/items/subclass.mjs index 26e3098f..3509ebf1 100644 --- a/module/applications/sheets/items/subclass.mjs +++ b/module/applications/sheets/items/subclass.mjs @@ -40,7 +40,7 @@ export default class SubclassSheet extends DHBaseItemSheet { static async addFeature(_, target) { const feature = await game.items.documentClass.create({ type: 'feature', - name: game.i18n.localize('DAGGERHEART.General.newFeature') + name: game.i18n.format('DOCUMENT.New', { type: game.i18n.localize('TYPES.Item.feature') }) }); await this.document.update({ [`system.${target.dataset.type}`]: feature.uuid diff --git a/module/data/actor/character.mjs b/module/data/actor/character.mjs index 1938157c..f94ce7d1 100644 --- a/module/data/actor/character.mjs +++ b/module/data/actor/character.mjs @@ -205,7 +205,7 @@ export default class DhCharacter extends BaseDataActor { companionFeatures = [], features = []; - for (var item of this.parent.items) { + for (let item of this.parent.items) { if (item.system.type === CONFIG.DH.ITEM.featureTypes.ancestry.id) { ancestryFeatures.push(item); } else if (item.system.type === CONFIG.DH.ITEM.featureTypes.community.id) { diff --git a/module/data/item/weapon.mjs b/module/data/item/weapon.mjs index 6b760083..e6cfcbf0 100644 --- a/module/data/item/weapon.mjs +++ b/module/data/item/weapon.mjs @@ -61,7 +61,7 @@ export default class DHWeapon extends BaseDataItem { const removed = this.features.filter(x => !changes.system.features.includes(x)); const added = changes.system.features.filter(x => !this.features.includes(x)); - for (var weaponFeature of removed) { + for (let weaponFeature of removed) { for (var effectId of weaponFeature.effectIds) { await this.parent.effects.get(effectId).delete(); } @@ -69,7 +69,7 @@ export default class DHWeapon extends BaseDataItem { changes.system.actions = this.actions.filter(x => !weaponFeature.actionIds.includes(x._id)); } - for (var weaponFeature of added) { + for (let weaponFeature of added) { const featureData = CONFIG.DH.ITEM.weaponFeatures[weaponFeature.value]; if (featureData.effects?.length > 0) { const embeddedItems = await this.parent.createEmbeddedDocuments('ActiveEffect', [ diff --git a/templates/sheets-settings/adversary-settings/features.hbs b/templates/sheets-settings/adversary-settings/features.hbs index b5807fd5..497bf1c6 100644 --- a/templates/sheets-settings/adversary-settings/features.hbs +++ b/templates/sheets-settings/adversary-settings/features.hbs @@ -4,7 +4,7 @@ data-group='{{tabs.features.group}}' >
{{localize tabs.features.label}} diff --git a/templates/sheets-settings/environment-settings/features.hbs b/templates/sheets-settings/environment-settings/features.hbs index b5807fd5..497bf1c6 100644 --- a/templates/sheets-settings/environment-settings/features.hbs +++ b/templates/sheets-settings/environment-settings/features.hbs @@ -4,7 +4,7 @@ data-group='{{tabs.features.group}}' >
{{localize tabs.features.label}}