fix: Fixes weapon and armor quality default value (#1710)

modernuo · Mar 28, 2024 · 70575e1 · 70575e1
1 parent f3d1fb8
commit 70575e1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Projects/UOContent/Items/Armor/BaseArmor.cs b/Projects/UOContent/Items/Armor/BaseArmor.cs
@@ -102,9 +102,6 @@ public abstract partial class BaseArmor : Item, IScissorable, IFactionItem, ICra
         [SerializableFieldSaveFlag(10)]
         private bool ShouldSerializeCrafter() => _crafter != null;
 
-        // Field 11
-        private ArmorQuality _quality = ArmorQuality.Regular;
-
         [SerializableFieldSaveFlag(14)]
         private bool ShouldSerializeResource() => _resource != DefaultResource;
 
@@ -155,6 +152,7 @@ public BaseArmor(int itemID) : base(itemID)
         {
             _crafter = null;
 
+            _quality = ArmorQuality.Regular;
             _resource = DefaultResource;
             Hue = CraftResources.GetHue(_resource);
 
@@ -193,7 +191,7 @@ public BaseArmor(int itemID) : base(itemID)
         public virtual int OldDexReq => 0;
         public virtual int OldIntReq => 0;
 
-        [SerializableProperty(11, useField: nameof(_quality))]
+        [SerializableProperty(11)]
         [CommandProperty(AccessLevel.GameMaster)]
         public ArmorQuality Quality
         {
@@ -209,6 +207,9 @@ public ArmorQuality Quality
         [SerializableFieldSaveFlag(11)]
         private bool ShouldSerializeArmorQuality() => _quality != ArmorQuality.Regular;
 
+        [SerializableFieldDefault(11)]
+        private ArmorQuality QualityDefaultValue() => ArmorQuality.Regular;
+
         [SerializableProperty(12)]
         [CommandProperty(AccessLevel.GameMaster)]
         public ArmorDurabilityLevel Durability

diff --git a/Projects/UOContent/Items/Weapons/BaseWeapon.cs b/Projects/UOContent/Items/Weapons/BaseWeapon.cs
@@ -362,6 +362,9 @@ public WeaponQuality Quality
     [SerializableFieldSaveFlag(3)]
     private bool ShouldSerializeQuality() => _quality != WeaponQuality.Regular;
 
+    [SerializableFieldDefault(3)]
+    private WeaponQuality QualityDefaultValue() => WeaponQuality.Regular;
+
     [SerializableProperty(4)]
     [CommandProperty(AccessLevel.GameMaster)]
     public int HitPoints