From 8a02a60f80bd3a76a29451beb4b51694f388bc21 Mon Sep 17 00:00:00 2001
From: Crome696 <jsiems87@gmail.com>
Date: Sat, 11 Jul 2026 16:25:57 +0200
Subject: [PATCH] fix(items): preserve BaseWeapon migrations after rebase

---
 .../Items/Weapons/BaseWeapon.Migrations.cs    |   2 +-
 .../UOContent/Items/Weapons/BaseWeapon.cs     |   1 +
 .../Server.Items.BaseWeapon.v14.json          | 287 ++++++++++++++++++
 3 files changed, 289 insertions(+), 1 deletion(-)
 create mode 100644 Projects/UOContent/Migrations/Server.Items.BaseWeapon.v14.json

diff --git a/Projects/UOContent/Items/Weapons/BaseWeapon.Migrations.cs b/Projects/UOContent/Items/Weapons/BaseWeapon.Migrations.cs
index 750f4cd49..d07f1ea74 100644
--- a/Projects/UOContent/Items/Weapons/BaseWeapon.Migrations.cs
+++ b/Projects/UOContent/Items/Weapons/BaseWeapon.Migrations.cs
@@ -149,7 +149,7 @@ public abstract partial class BaseWeapon
         _engravedText = content.EngravedText;
         _extendedWeaponAttributes = content.ExtendedWeaponAttributes ?? ExtendedWeaponAttributesDefaultValue();
         _negativeAttributes = content.NegativeAttributes ?? NegativeAttributesDefaultValue();
-        _unwieldyOriginalWeight = content.UnwieldyOriginalWeight ?? -1;
+        _unwieldyOriginalWeight = content.UnwieldyOriginalWeight;
         _absorptionAttributes = AbsorptionAttributesDefaultValue();
     }
 }
diff --git a/Projects/UOContent/Items/Weapons/BaseWeapon.cs b/Projects/UOContent/Items/Weapons/BaseWeapon.cs
index ec85a241e..7867dce3e 100644
--- a/Projects/UOContent/Items/Weapons/BaseWeapon.cs
+++ b/Projects/UOContent/Items/Weapons/BaseWeapon.cs
@@ -3190,6 +3190,7 @@ public abstract partial class BaseWeapon
         NegativeAttributes.GetProperties(list);
         ExtendedWeaponAttributes.GetProperties(list);
         WeaponAttributes.GetProperties(list);
+        AbsorptionAttributes.GetProperties(list);
 
         if (ImmolatingWeaponSpell.IsImmolating(this))
         {
diff --git a/Projects/UOContent/Migrations/Server.Items.BaseWeapon.v14.json b/Projects/UOContent/Migrations/Server.Items.BaseWeapon.v14.json
new file mode 100644
index 000000000..490704041
--- /dev/null
+++ b/Projects/UOContent/Migrations/Server.Items.BaseWeapon.v14.json
@@ -0,0 +1,287 @@
+{
+  "version": 14,
+  "type": "Server.Items.BaseWeapon",
+  "properties": [
+    {
+      "name": "DamageLevel",
+      "type": "Server.Items.WeaponDamageLevel",
+      "usesSaveFlag": true,
+      "rule": "EnumMigrationRule"
+    },
+    {
+      "name": "AccuracyLevel",
+      "type": "Server.Items.WeaponAccuracyLevel",
+      "usesSaveFlag": true,
+      "rule": "EnumMigrationRule"
+    },
+    {
+      "name": "DurabilityLevel",
+      "type": "Server.Items.WeaponDurabilityLevel",
+      "usesSaveFlag": true,
+      "rule": "EnumMigrationRule"
+    },
+    {
+      "name": "Quality",
+      "type": "Server.Items.WeaponQuality",
+      "usesSaveFlag": true,
+      "rule": "EnumMigrationRule"
+    },
+    {
+      "name": "HitPoints",
+      "type": "int",
+      "usesSaveFlag": true,
+      "rule": "PrimitiveTypeMigrationRule",
+      "ruleArguments": [
+        ""
+      ]
+    },
+    {
+      "name": "MaxHitPoints",
+      "type": "int",
+      "usesSaveFlag": true,
+      "rule": "PrimitiveTypeMigrationRule",
+      "ruleArguments": [
+        ""
+      ]
+    },
+    {
+      "name": "Slayer",
+      "type": "Server.Items.SlayerName",
+      "usesSaveFlag": true,
+      "rule": "EnumMigrationRule"
+    },
+    {
+      "name": "Poison",
+      "type": "Server.Poison",
+      "usesSaveFlag": true,
+      "rule": "PrimitiveUOTypeMigrationRule",
+      "ruleArguments": [
+        "Poison"
+      ]
+    },
+    {
+      "name": "PoisonCharges",
+      "type": "int",
+      "usesSaveFlag": true,
+      "rule": "PrimitiveTypeMigrationRule",
+      "ruleArguments": [
+        ""
+      ]
+    },
+    {
+      "name": "Crafter",
+      "type": "string",
+      "usesSaveFlag": true,
+      "rule": "PrimitiveTypeMigrationRule",
+      "ruleArguments": [
+        ""
+      ]
+    },
+    {
+      "name": "Identified",
+      "type": "bool",
+      "usesSaveFlag": true,
+      "rule": "PrimitiveTypeMigrationRule",
+      "ruleArguments": [
+        ""
+      ]
+    },
+    {
+      "name": "StrRequirement",
+      "type": "int",
+      "usesSaveFlag": true,
+      "rule": "PrimitiveTypeMigrationRule",
+      "ruleArguments": [
+        ""
+      ]
+    },
+    {
+      "name": "DexRequirement",
+      "type": "int",
+      "usesSaveFlag": true,
+      "rule": "PrimitiveTypeMigrationRule",
+      "ruleArguments": [
+        ""
+      ]
+    },
+    {
+      "name": "IntRequirement",
+      "type": "int",
+      "usesSaveFlag": true,
+      "rule": "PrimitiveTypeMigrationRule",
+      "ruleArguments": [
+        ""
+      ]
+    },
+    {
+      "name": "MinDamage",
+      "type": "int",
+      "usesSaveFlag": true,
+      "rule": "PrimitiveTypeMigrationRule",
+      "ruleArguments": [
+        ""
+      ]
+    },
+    {
+      "name": "MaxDamage",
+      "type": "int",
+      "usesSaveFlag": true,
+      "rule": "PrimitiveTypeMigrationRule",
+      "ruleArguments": [
+        ""
+      ]
+    },
+    {
+      "name": "HitSound",
+      "type": "int",
+      "usesSaveFlag": true,
+      "rule": "PrimitiveTypeMigrationRule",
+      "ruleArguments": [
+        ""
+      ]
+    },
+    {
+      "name": "MissSound",
+      "type": "int",
+      "usesSaveFlag": true,
+      "rule": "PrimitiveTypeMigrationRule",
+      "ruleArguments": [
+        ""
+      ]
+    },
+    {
+      "name": "Speed",
+      "type": "float",
+      "usesSaveFlag": true,
+      "rule": "PrimitiveTypeMigrationRule",
+      "ruleArguments": [
+        ""
+      ]
+    },
+    {
+      "name": "MaxRange",
+      "type": "int",
+      "usesSaveFlag": true,
+      "rule": "PrimitiveTypeMigrationRule",
+      "ruleArguments": [
+        ""
+      ]
+    },
+    {
+      "name": "Skill",
+      "type": "Server.SkillName",
+      "usesSaveFlag": true,
+      "rule": "EnumMigrationRule"
+    },
+    {
+      "name": "Type",
+      "type": "Server.Items.WeaponType",
+      "usesSaveFlag": true,
+      "rule": "EnumMigrationRule"
+    },
+    {
+      "name": "Animation",
+      "type": "Server.Items.WeaponAnimation",
+      "usesSaveFlag": true,
+      "rule": "EnumMigrationRule"
+    },
+    {
+      "name": "Resource",
+      "type": "Server.Items.CraftResource",
+      "usesSaveFlag": true,
+      "rule": "EnumMigrationRule"
+    },
+    {
+      "name": "Attributes",
+      "type": "Server.AosAttributes",
+      "usesSaveFlag": true,
+      "rule": "RawSerializableMigrationRule",
+      "ruleArguments": [
+        "DeserializationRequiresParent"
+      ]
+    },
+    {
+      "name": "WeaponAttributes",
+      "type": "Server.AosWeaponAttributes",
+      "usesSaveFlag": true,
+      "rule": "RawSerializableMigrationRule",
+      "ruleArguments": [
+        "DeserializationRequiresParent"
+      ]
+    },
+    {
+      "name": "PlayerConstructed",
+      "type": "bool",
+      "usesSaveFlag": true,
+      "rule": "PrimitiveTypeMigrationRule",
+      "ruleArguments": [
+        ""
+      ]
+    },
+    {
+      "name": "SkillBonuses",
+      "type": "Server.AosSkillBonuses",
+      "usesSaveFlag": true,
+      "rule": "RawSerializableMigrationRule",
+      "ruleArguments": [
+        "DeserializationRequiresParent"
+      ]
+    },
+    {
+      "name": "Slayer2",
+      "type": "Server.Items.SlayerName",
+      "usesSaveFlag": true,
+      "rule": "EnumMigrationRule"
+    },
+    {
+      "name": "AosElementDamages",
+      "type": "Server.AosElementAttributes",
+      "usesSaveFlag": true,
+      "rule": "RawSerializableMigrationRule",
+      "ruleArguments": [
+        "DeserializationRequiresParent"
+      ]
+    },
+    {
+      "name": "EngravedText",
+      "type": "string",
+      "usesSaveFlag": true,
+      "rule": "PrimitiveTypeMigrationRule",
+      "ruleArguments": [
+        ""
+      ]
+    },
+    {
+      "name": "ExtendedWeaponAttributes",
+      "type": "Server.ExtendedWeaponAttributes",
+      "rule": "RawSerializableMigrationRule",
+      "ruleArguments": [
+        "DeserializationRequiresParent"
+      ]
+    },
+    {
+      "name": "NegativeAttributes",
+      "type": "Server.NegativeAttributes",
+      "rule": "RawSerializableMigrationRule",
+      "ruleArguments": [
+        "DeserializationRequiresParent"
+      ]
+    },
+    {
+      "name": "UnwieldyOriginalWeight",
+      "type": "double",
+      "rule": "PrimitiveTypeMigrationRule",
+      "ruleArguments": [
+        ""
+      ]
+    },
+    {
+      "name": "AbsorptionAttributes",
+      "type": "Server.AbsorptionAttributes",
+      "rule": "RawSerializableMigrationRule",
+      "ruleArguments": [
+        "DeserializationRequiresParent"
+      ]
+    }
+  ]
+}
\ No newline at end of file