From f5febe74fe17120c2a815d28624bb0ecb7124243 Mon Sep 17 00:00:00 2001
From: WBHarry <89362246+WBHarry@users.noreply.github.com>
Date: Thu, 7 Aug 2025 10:20:05 +0200
Subject: [PATCH] . (#675)

---
 .../characterCreation/characterCreation.mjs          | 12 +++++++++++-
 module/helpers/utils.mjs                             |  1 +
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/module/applications/characterCreation/characterCreation.mjs b/module/applications/characterCreation/characterCreation.mjs
index 2b251a8b..cdc80bef 100644
--- a/module/applications/characterCreation/characterCreation.mjs
+++ b/module/applications/characterCreation/characterCreation.mjs
@@ -370,13 +370,18 @@ export default class DhCharacterCreation extends HandlebarsApplicationMixin(Appl
                 );
                 context.armor = {
                     ...this.equipment.armor,
-                    suggestion: { ...suggestions.armor, taken: suggestions.armor?.uuid === this.equipment.armor?.uuid },
+                    suggestion: {
+                        ...suggestions.armor,
+                        uuid: suggestions.armor?.uuid,
+                        taken: suggestions.armor?.uuid === this.equipment.armor?.uuid
+                    },
                     compendium: 'armors'
                 };
                 context.primaryWeapon = {
                     ...this.equipment.primaryWeapon,
                     suggestion: {
                         ...suggestions.primaryWeapon,
+                        uuid: suggestions.primaryWeapon?.uuid,
                         taken: suggestions.primaryWeapon?.uuid === this.equipment.primaryWeapon?.uuid
                     },
                     compendium: 'weapons'
@@ -385,6 +390,7 @@ export default class DhCharacterCreation extends HandlebarsApplicationMixin(Appl
                     ...this.equipment.secondaryWeapon,
                     suggestion: {
                         ...suggestions.secondaryWeapon,
+                        uuid: suggestions.secondaryWeapon?.uuid,
                         taken: suggestions.secondaryWeapon?.uuid === this.equipment.secondaryWeapon?.uuid
                     },
                     disabled: this.equipment.primaryWeapon?.system?.burden === burden.twoHanded.value,
@@ -679,6 +685,10 @@ export default class DhCharacterCreation extends HandlebarsApplicationMixin(Appl
                 return;
             }
 
+            if (item.system.burden === CONFIG.DH.GENERAL.burden.twoHanded.value) {
+                this.equipment.secondaryWeapon = {};
+            }
+
             this.equipment.primaryWeapon = { ...item, uuid: item.uuid };
         } else if (item.type === 'weapon' && event.target.closest('.secondary-weapon-card')) {
             if (this.equipment.primaryWeapon?.system?.burden === burden.twoHanded.value) {
diff --git a/module/helpers/utils.mjs b/module/helpers/utils.mjs
index 2447727a..89088dad 100644
--- a/module/helpers/utils.mjs
+++ b/module/helpers/utils.mjs
@@ -362,6 +362,7 @@ export async function createEmbeddedItemWithEffects(actor, baseData, update) {
     const [doc] = await actor.createEmbeddedDocuments('Item', [
         {
             ...(update ?? data),
+            ...baseData,
             id: data.id,
             uuid: data.uuid,
             effects: data.effects?.map(effect => effect.toObject())