warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Kamron Batman 2024-03-28 10:30:42 -07:00 • committed by GitHub
parent f3d1fb82d8
commit 70575e1517
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Projects/UOContent/Items/Armor/BaseArmor.cs
View file

@ -102,9 +102,6 @@ namespace Server.Items
[SerializableFieldSaveFlag(10)] [SerializableFieldSaveFlag(10)]
private bool ShouldSerializeCrafter() => _crafter != null; private bool ShouldSerializeCrafter() => _crafter != null;
// Field 11
private ArmorQuality _quality = ArmorQuality.Regular;
[SerializableFieldSaveFlag(14)] [SerializableFieldSaveFlag(14)]
private bool ShouldSerializeResource() => _resource != DefaultResource; private bool ShouldSerializeResource() => _resource != DefaultResource;
@ -155,6 +152,7 @@ namespace Server.Items
{ {
_crafter = null; _crafter = null;
_quality = ArmorQuality.Regular;
_resource = DefaultResource; _resource = DefaultResource;
Hue = CraftResources.GetHue(_resource); Hue = CraftResources.GetHue(_resource);
@ -193,7 +191,7 @@ namespace Server.Items
public virtual int OldDexReq => 0; public virtual int OldDexReq => 0;
public virtual int OldIntReq => 0; public virtual int OldIntReq => 0;
[SerializableProperty(11, useField: nameof(_quality))] [SerializableProperty(11)]
[CommandProperty(AccessLevel.GameMaster)] [CommandProperty(AccessLevel.GameMaster)]
public ArmorQuality Quality public ArmorQuality Quality
{ {
@ -209,6 +207,9 @@ namespace Server.Items
[SerializableFieldSaveFlag(11)] [SerializableFieldSaveFlag(11)]
private bool ShouldSerializeArmorQuality() => _quality != ArmorQuality.Regular; private bool ShouldSerializeArmorQuality() => _quality != ArmorQuality.Regular;
[SerializableFieldDefault(11)]
private ArmorQuality QualityDefaultValue() => ArmorQuality.Regular;
[SerializableProperty(12)] [SerializableProperty(12)]
[CommandProperty(AccessLevel.GameMaster)] [CommandProperty(AccessLevel.GameMaster)]
public ArmorDurabilityLevel Durability public ArmorDurabilityLevel Durability

3
Projects/UOContent/Items/Weapons/BaseWeapon.cs
View file

@ -362,6 +362,9 @@ public abstract partial class BaseWeapon : Item, IWeapon, IFactionItem, ICraftab
[SerializableFieldSaveFlag(3)] [SerializableFieldSaveFlag(3)]
private bool ShouldSerializeQuality() => _quality != WeaponQuality.Regular; private bool ShouldSerializeQuality() => _quality != WeaponQuality.Regular;
[SerializableFieldDefault(3)]
private WeaponQuality QualityDefaultValue() => WeaponQuality.Regular;
[SerializableProperty(4)] [SerializableProperty(4)]
[CommandProperty(AccessLevel.GameMaster)] [CommandProperty(AccessLevel.GameMaster)]
public int HitPoints public int HitPoints