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

fix(codegen): Fixes various code gen issues. Adds better embedded serialization support (#688)

Browse source 
* Adds save flag support (see `ElvenGlasses` for an example)
* Updates AOSAttributes so they are code genned
* Fixes embedded object support by adding an `IRawSerializable`
* Fixes various inconsistencies in serializing with codegen
This commit is contained in:
Kamron Batman 2021-08-17 02:43:52 -07:00 • committed by GitHub
parent 69af652a18
commit 2c8097f707
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
54 changed files with 787 additions and 507 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Projects/UOContent/Accounting/Account.cs
View file

@ -11,7 +11,7 @@ using Server.Network;
namespace Server.Accounting
{
[Serializable(2)]
[Serializable(3)]
public partial class Account : IAccount, IComparable<Account>, ISerializable
{
public static readonly TimeSpan YoungDuration = TimeSpan.FromHours(40.0);
@ -348,16 +348,18 @@ namespace Server.Accounting
}
}
// Handle old deserialization before codegen
private void Deserialize(IGenericReader reader, int version)
{
// Due to a bug where we were not versioning at all, reset so we don't have an issue deserializing
reader.Seek(0, SeekOrigin.Begin);
if (version != 2)
{
// Due to a bug where we were not versioning at all, reset so we don't have an issue deserializing
reader.Seek(0, SeekOrigin.Begin);
}
_username = reader.ReadString();
_passwordAlgorithm = (PasswordProtectionAlgorithm)reader.ReadInt();
_passwordAlgorithm = version < 2 ? (PasswordProtectionAlgorithm)reader.ReadInt() : reader.ReadEnum<PasswordProtectionAlgorithm>();
_password = reader.ReadString();
_accessLevel = (AccessLevel)reader.ReadInt();
_accessLevel = version < 2 ? (AccessLevel)reader.ReadInt() : reader.ReadEnum<AccessLevel>();
_flags = reader.ReadInt();
_created = reader.ReadDateTime();
_lastLogin = reader.ReadDateTime();
@ -390,9 +392,16 @@ namespace Server.Accounting
_loginIPs = new IPAddress[length];
for (int i = 0; i < length; i++)
{
if (IPAddress.TryParse(reader.ReadString(), out var address))
if (version < 2)
{
_loginIPs[i] = Utility.Intern(address);
if (IPAddress.TryParse(reader.ReadString(), out var address))
{
_loginIPs[i] = Utility.Intern(address);
}
}
else
{
_loginIPs[i] = reader.ReadIPAddress();
}
}
@ -405,6 +414,8 @@ namespace Server.Accounting
_totalGameTime = reader.ReadTimeSpan();
_email = reader.ReadString();
Timer.StartTimer(AfterDeserialization);
}

11
Projects/UOContent/Engines/Bulk Orders/LargeBOD.cs
View file

@ -2,7 +2,7 @@ using Server.Mobiles;
namespace Server.Engines.BulkOrders
{
[Serializable(0)]
[Serializable(1)]
public abstract partial class LargeBOD : BaseBOD
{
[InvalidateProperties]
@ -148,5 +148,14 @@ namespace Server.Engines.BulkOrders
}
}
}
private void Deserialize(IGenericReader reader, int version)
{
_entries = new LargeBulkEntry[reader.ReadInt()];
for (var i = 0; i < _entries.Length; i++)
{
_entries[i] = new LargeBulkEntry(reader, this);
}
}
}
}

16
Projects/UOContent/Items/Addons/BaseAddon.cs
View file

@ -20,10 +20,10 @@ namespace Server.Items
bool CouldFit(IPoint3D p, Map map);
}
[Serializable(2, false)]
[Serializable(3, false)]
public abstract partial class BaseAddon : Item, IChoppable, IAddon
{
private CraftResource m_Resource;
private CraftResource _resource;
public BaseAddon() : base(1)
{
@ -67,13 +67,13 @@ namespace Server.Items
[SerializableField(1)]
public CraftResource Resource
{
get => m_Resource;
get => _resource;
set
{
if (m_Resource != value)
if (_resource != value)
{
m_Resource = value;
Hue = CraftResources.GetHue(m_Resource);
_resource = value;
Hue = CraftResources.GetHue(_resource);
InvalidateProperties();
this.MarkDirty();
@ -281,9 +281,9 @@ namespace Server.Items
{
_components = reader.ReadEntityList<AddonComponent>();
if (version < 1 && Weight == 0)
if (version == 2)
{
Weight = -1;
_resource = (CraftResource)reader.ReadEncodedInt();
}
}
}

21
Projects/UOContent/Items/Addons/BaseAddonContainer.cs
View file

@ -3,12 +3,13 @@ using Server.Multis;
namespace Server.Items
{
[Serializable(1, false)]
[Serializable(2, false)]
public abstract partial class BaseAddonContainer : BaseContainer, IChoppable, IAddon
{
[SerializableField(0, setter: "private")]
private List<AddonContainerComponent> _components;
private CraftResource m_Resource;
private CraftResource _resource;
public BaseAddonContainer(int itemID) : base(itemID)
{
@ -44,13 +45,13 @@ namespace Server.Items
[CommandProperty(AccessLevel.GameMaster)]
public CraftResource Resource
{
get => m_Resource;
get => _resource;
set
{
if (m_Resource != value)
if (_resource != value)
{
m_Resource = value;
Hue = CraftResources.GetHue(m_Resource);
_resource = value;
Hue = CraftResources.GetHue(_resource);
InvalidateProperties();
this.MarkDirty();
@ -169,9 +170,9 @@ namespace Server.Items
{
base.GetProperties(list);
if (!CraftResources.IsStandard(m_Resource))
if (!CraftResources.IsStandard(_resource))
{
list.Add(CraftResources.GetLocalizationNumber(m_Resource));
list.Add(CraftResources.GetLocalizationNumber(_resource));
}
}
@ -188,8 +189,8 @@ namespace Server.Items
// Handles v0 with old Enum -> Int casting
private void Deserialize(IGenericReader reader, int version)
{
Components = reader.ReadEntityList<AddonContainerComponent>();
m_Resource = (CraftResource)reader.ReadInt();
_components = reader.ReadEntityList<AddonContainerComponent>();
_resource = version == 1 ? reader.ReadEnum<CraftResource>() : (CraftResource)reader.ReadInt();
}
[AfterDeserialization]

7
Projects/UOContent/Items/Addons/SolenAntHole.cs
View file

@ -36,7 +36,7 @@ namespace Server.Items
}
}
[Serializable(0)]
[Serializable(1)]
public partial class SolenAntHole : BaseAddon
{
[SerializableField(0, getter: "private", setter: "private")]
@ -153,5 +153,10 @@ namespace Server.Items
return _spawned.Count < 2;
}
private void Deserialize(IGenericReader reader, int version)
{
_spawned = reader.ReadEntityList<Mobile>();
}
}
}

41
Projects/UOContent/Items/Aquarium/Aquarium.cs
View file

@ -7,7 +7,7 @@ using Server.Utilities;
namespace Server.Items
{
[Serializable(3, false)]
[Serializable(4, false)]
public partial class Aquarium : BaseAddonContainer
{
public static readonly TimeSpan EvaluationInterval = TimeSpan.FromDays(1);
@ -479,7 +479,44 @@ namespace Server.Items
private void Deserialize(IGenericReader reader, int version)
{
// If you are deserializing such an old version, you should validate all of the properties. RunUO had bugs.
switch (version)
{
case 3:
case 2:
case 1:
{
var next = reader.ReadDateTime();
if (next < Core.Now)
{
next = Core.Now;
}
_evaluateTimer = Timer.DelayCall(next - Core.Now, EvaluationInterval, Evaluate);
goto case 0;
}
case 0:
{
_liveCreatures = reader.ReadInt();
_vacationLeft = reader.ReadInt();
_food = new AquariumState(this);
_food.Deserialize(reader);
_water = new AquariumState(this);
_water.Deserialize(reader);
_events = new List<int>();
var count = reader.ReadInt();
for (var i = 0; i < count; i++)
{
_events.Add(reader.ReadInt());
}
_rewardAvailable = reader.ReadBool();
break;
}
}
}
public int FoodNumber() =>

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

@ -1173,22 +1173,18 @@ namespace Server.Items
{
var flags = (SaveFlag)reader.ReadEncodedInt();
Attributes = new AosAttributes(this);
if (GetSaveFlag(flags, SaveFlag.Attributes))
{
Attributes = new AosAttributes(this, reader);
}
else
{
Attributes = new AosAttributes(this);
Attributes.Deserialize(reader);
}
ArmorAttributes = new AosArmorAttributes(this);
if (GetSaveFlag(flags, SaveFlag.ArmorAttributes))
{
ArmorAttributes = new AosArmorAttributes(this, reader);
}
else
{
ArmorAttributes = new AosArmorAttributes(this);
ArmorAttributes.Deserialize(reader);
}
if (GetSaveFlag(flags, SaveFlag.PhysicalBonus))
@ -1356,9 +1352,11 @@ namespace Server.Items
m_Meditate = (AMA)(-1);
}
SkillBonuses = new AosSkillBonuses(this);
if (GetSaveFlag(flags, SaveFlag.SkillBonuses))
{
SkillBonuses = new AosSkillBonuses(this, reader);
SkillBonuses.Deserialize(reader);
}
if (GetSaveFlag(flags, SaveFlag.PlayerConstructed))
@ -1370,8 +1368,11 @@ namespace Server.Items
}
case 4:
{
Attributes = new AosAttributes(this, reader);
ArmorAttributes = new AosArmorAttributes(this, reader);
Attributes = new AosAttributes(this);
Attributes.Deserialize(reader);
ArmorAttributes = new AosArmorAttributes(this);
ArmorAttributes.Deserialize(reader);
goto case 3;
}
case 3:

24
Projects/UOContent/Items/Armor/Glasses/ArtsGlasses.cs
View file

@ -1,6 +1,7 @@
namespace Server.Items
{
public class ArtsGlasses : ElvenGlasses
[Serializable(0, false)]
public partial class ArtsGlasses : ElvenGlasses
{
[Constructible]
public ArtsGlasses()
@ -12,10 +13,6 @@ namespace Server.Items
Hue = 0x73;
}
public ArtsGlasses(Serial serial) : base(serial)
{
}
public override int LabelNumber => 1073363; // Reading Glasses of the Arts
public override int BasePhysicalResistance => 10;
@ -26,22 +23,5 @@ namespace Server.Items
public override int InitMinHits => 255;
public override int InitMaxHits => 255;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(1);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
if (version == 0 && Hue == 0)
{
Hue = 0x73;
}
}
}
}

108
Projects/UOContent/Items/Armor/Glasses/ElvenGlasses.cs
View file

@ -1,18 +1,13 @@
using System;
namespace Server.Items
{
public class ElvenGlasses : BaseArmor
[Serializable(0, false)]
public partial class ElvenGlasses : BaseArmor
{
[Constructible]
public ElvenGlasses() : base(0x2FB8)
{
Weight = 2;
WeaponAttributes = new AosWeaponAttributes(this);
}
public ElvenGlasses(Serial serial) : base(serial)
{
_weaponAttributes = new AosWeaponAttributes(this);
}
public override int LabelNumber => 1032216; // elven glasses
@ -35,8 +30,18 @@ namespace Server.Items
public override CraftResource DefaultResource => CraftResource.RegularLeather;
public override ArmorMeditationAllowance DefMedAllowance => ArmorMeditationAllowance.All;
[CommandProperty(AccessLevel.GameMaster, canModify: true)]
public AosWeaponAttributes WeaponAttributes { get; private set; }
[SerializableField(0, setter: "private")]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster, canModify: true)]")]
public AosWeaponAttributes _weaponAttributes;
[SerializableFieldSaveFlag(0)]
private bool ShouldSerializeWeaponAttributes() => !_weaponAttributes.IsEmpty;
[AfterDeserialization]
private void AfterDeserialization()
{
_weaponAttributes ??= new AosWeaponAttributes(this);
}
public override void AppendChildNameProperties(ObjectPropertyList list)
{
@ -44,133 +49,80 @@ namespace Server.Items
int prop;
if ((prop = WeaponAttributes.HitColdArea) != 0)
if ((prop = _weaponAttributes.HitColdArea) != 0)
{
list.Add(1060416, prop.ToString()); // hit cold area ~1_val~%
}
if ((prop = WeaponAttributes.HitDispel) != 0)
if ((prop = _weaponAttributes.HitDispel) != 0)
{
list.Add(1060417, prop.ToString()); // hit dispel ~1_val~%
}
if ((prop = WeaponAttributes.HitEnergyArea) != 0)
if ((prop = _weaponAttributes.HitEnergyArea) != 0)
{
list.Add(1060418, prop.ToString()); // hit energy area ~1_val~%
}
if ((prop = WeaponAttributes.HitFireArea) != 0)
if ((prop = _weaponAttributes.HitFireArea) != 0)
{
list.Add(1060419, prop.ToString()); // hit fire area ~1_val~%
}
if ((prop = WeaponAttributes.HitFireball) != 0)
if ((prop = _weaponAttributes.HitFireball) != 0)
{
list.Add(1060420, prop.ToString()); // hit fireball ~1_val~%
}
if ((prop = WeaponAttributes.HitHarm) != 0)
if ((prop = _weaponAttributes.HitHarm) != 0)
{
list.Add(1060421, prop.ToString()); // hit harm ~1_val~%
}
if ((prop = WeaponAttributes.HitLeechHits) != 0)
if ((prop = _weaponAttributes.HitLeechHits) != 0)
{
list.Add(1060422, prop.ToString()); // hit life leech ~1_val~%
}
if ((prop = WeaponAttributes.HitLightning) != 0)
if ((prop = _weaponAttributes.HitLightning) != 0)
{
list.Add(1060423, prop.ToString()); // hit lightning ~1_val~%
}
if ((prop = WeaponAttributes.HitLowerAttack) != 0)
if ((prop = _weaponAttributes.HitLowerAttack) != 0)
{
list.Add(1060424, prop.ToString()); // hit lower attack ~1_val~%
}
if ((prop = WeaponAttributes.HitLowerDefend) != 0)
if ((prop = _weaponAttributes.HitLowerDefend) != 0)
{
list.Add(1060425, prop.ToString()); // hit lower defense ~1_val~%
}
if ((prop = WeaponAttributes.HitMagicArrow) != 0)
if ((prop = _weaponAttributes.HitMagicArrow) != 0)
{
list.Add(1060426, prop.ToString()); // hit magic arrow ~1_val~%
}
if ((prop = WeaponAttributes.HitLeechMana) != 0)
if ((prop = _weaponAttributes.HitLeechMana) != 0)
{
list.Add(1060427, prop.ToString()); // hit mana leech ~1_val~%
}
if ((prop = WeaponAttributes.HitPhysicalArea) != 0)
if ((prop = _weaponAttributes.HitPhysicalArea) != 0)
{
list.Add(1060428, prop.ToString()); // hit physical area ~1_val~%
}
if ((prop = WeaponAttributes.HitPoisonArea) != 0)
if ((prop = _weaponAttributes.HitPoisonArea) != 0)
{
list.Add(1060429, prop.ToString()); // hit poison area ~1_val~%
}
if ((prop = WeaponAttributes.HitLeechStam) != 0)
if ((prop = _weaponAttributes.HitLeechStam) != 0)
{
list.Add(1060430, prop.ToString()); // hit stamina leech ~1_val~%
}
}
private static void SetSaveFlag(ref SaveFlag flags, SaveFlag toSet, bool setIf)
{
if (setIf)
{
flags |= toSet;
}
}
private static bool GetSaveFlag(SaveFlag flags, SaveFlag toGet) => (flags & toGet) != 0;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
var flags = SaveFlag.None;
SetSaveFlag(ref flags, SaveFlag.WeaponAttributes, !WeaponAttributes.IsEmpty);
writer.Write((int)flags);
if (GetSaveFlag(flags, SaveFlag.WeaponAttributes))
{
WeaponAttributes.Serialize(writer);
}
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
var flags = (SaveFlag)reader.ReadInt();
if (GetSaveFlag(flags, SaveFlag.WeaponAttributes))
{
WeaponAttributes = new AosWeaponAttributes(this, reader);
}
else
{
WeaponAttributes = new AosWeaponAttributes(this);
}
}
[Flags]
private enum SaveFlag
{
None = 0x00000000,
WeaponAttributes = 0x00000001
}
}
}

2
Projects/UOContent/Items/Armor/Glasses/LyricalGlasses.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
[Constructible]
public LyricalGlasses()
{
WeaponAttributes.HitLowerDefend = 20;
_weaponAttributes.HitLowerDefend = 20;
Attributes.NightSight = 1;
Attributes.ReflectPhysical = 15;

2
Projects/UOContent/Items/Armor/Glasses/MaceShieldGlasses.cs
View file

@ -5,7 +5,7 @@ namespace Server.Items
[Constructible]
public MaceShieldGlasses()
{
WeaponAttributes.HitLowerDefend = 30;
_weaponAttributes.HitLowerDefend = 30;
Attributes.BonusStr = 10;
Attributes.BonusDex = 5;

47
Projects/UOContent/Items/Clothing/BaseClothing.cs
View file

@ -1039,40 +1039,32 @@ namespace Server.Items
m_Resource = DefaultResource;
}
Attributes = new AosAttributes(this);
if (GetSaveFlag(flags, SaveFlag.Attributes))
{
Attributes = new AosAttributes(this, reader);
}
else
{
Attributes = new AosAttributes(this);
Attributes.Deserialize(reader);
}
ClothingAttributes = new AosArmorAttributes(this);
if (GetSaveFlag(flags, SaveFlag.ClothingAttributes))
{
ClothingAttributes = new AosArmorAttributes(this, reader);
}
else
{
ClothingAttributes = new AosArmorAttributes(this);
ClothingAttributes.Deserialize(reader);
}
SkillBonuses = new AosSkillBonuses(this);
if (GetSaveFlag(flags, SaveFlag.SkillBonuses))
{
SkillBonuses = new AosSkillBonuses(this, reader);
}
else
{
SkillBonuses = new AosSkillBonuses(this);
SkillBonuses.Deserialize(reader);
}
Resistances = new AosElementAttributes(this);
if (GetSaveFlag(flags, SaveFlag.Resistances))
{
Resistances = new AosElementAttributes(this, reader);
}
else
{
Resistances = new AosElementAttributes(this);
Resistances.Deserialize(reader);
}
if (GetSaveFlag(flags, SaveFlag.MaxHitPoints))
@ -1123,10 +1115,17 @@ namespace Server.Items
}
case 3:
{
Attributes = new AosAttributes(this, reader);
ClothingAttributes = new AosArmorAttributes(this, reader);
SkillBonuses = new AosSkillBonuses(this, reader);
Resistances = new AosElementAttributes(this, reader);
Attributes = new AosAttributes(this);
Attributes.Deserialize(reader);
ClothingAttributes = new AosArmorAttributes(this);
ClothingAttributes.Deserialize(reader);
SkillBonuses = new AosSkillBonuses(this);
SkillBonuses.Deserialize(reader);
Resistances = new AosElementAttributes(this);
Resistances.Deserialize(reader);
goto case 2;
}

9
Projects/UOContent/Items/Jewels/BaseJewel.cs
View file

@ -437,9 +437,12 @@ namespace Server.Items
}
case 1:
{
Attributes = new AosAttributes(this, reader);
Resistances = new AosElementAttributes(this, reader);
SkillBonuses = new AosSkillBonuses(this, reader);
Attributes = new AosAttributes(this);
Attributes.Deserialize(reader);
Resistances = new AosElementAttributes(this);
Resistances.Deserialize(reader);
SkillBonuses = new AosSkillBonuses(this);
SkillBonuses.Deserialize(reader);
var m = Parent as Mobile;

2
Projects/UOContent/Items/Minor Artifacts/ML/BrightsightLenses.cs
View file

@ -43,7 +43,7 @@ namespace Server.Items
if (version < 1)
{
WeaponAttributes.SelfRepair = 0;
_weaponAttributes.SelfRepair = 0;
ArmorAttributes.SelfRepair = 3;
}
}

8
Projects/UOContent/Items/Quivers/BaseQuiver.cs
View file

@ -511,13 +511,11 @@ namespace Server.Items
var flags = (SaveFlag)reader.ReadEncodedInt();
Attributes = new AosAttributes(this);
if (GetSaveFlag(flags, SaveFlag.Attributes))
{
Attributes = new AosAttributes(this, reader);
}
else
{
Attributes = new AosAttributes(this);
Attributes.Deserialize(reader);
}
if (GetSaveFlag(flags, SaveFlag.LowerAmmoCost))

4
Projects/UOContent/Items/Resources/Blacksmithing/Ore.cs
View file

@ -43,8 +43,8 @@ namespace Server.Items
case 1:
{
// Use this line instead if you are getting world loading issues
// _resource = (CraftResource)reader.ReadByte();
_resource = (CraftResource)reader.ReadInt();
_resource = (CraftResource)reader.ReadByte();
// _resource = (CraftResource)reader.ReadInt();
break;
}
case 0:

6
Projects/UOContent/Items/Skill Items/Magical/Spellbook.cs
View file

@ -940,8 +940,10 @@ namespace Server.Items
}
case 1:
{
Attributes = new AosAttributes(this, reader);
SkillBonuses = new AosSkillBonuses(this, reader);
Attributes = new AosAttributes(this);
Attributes.Deserialize(reader);
SkillBonuses = new AosSkillBonuses(this);
SkillBonuses.Deserialize(reader);
goto case 0;
}

162
Projects/UOContent/Items/Talismans/BaseTalisman.cs
View file

@ -893,91 +893,89 @@ namespace Server.Items
var version = reader.ReadInt();
switch (version)
var flags = (SaveFlag)reader.ReadEncodedInt();
Attributes = new AosAttributes(this);
if (GetSaveFlag(flags, SaveFlag.Attributes))
{
case 0:
{
var flags = (SaveFlag)reader.ReadEncodedInt();
Attributes = GetSaveFlag(flags, SaveFlag.Attributes)
? new AosAttributes(this, reader)
: new AosAttributes(this);
SkillBonuses = GetSaveFlag(flags, SaveFlag.SkillBonuses)
? new AosSkillBonuses(this, reader)
: new AosSkillBonuses(this);
// Backward compatibility
if (GetSaveFlag(flags, SaveFlag.Owner))
{
BlessedFor = reader.ReadEntity<Mobile>();
}
m_Protection = GetSaveFlag(flags, SaveFlag.Protection)
? new TalismanAttribute(reader)
: new TalismanAttribute();
m_Killer = GetSaveFlag(flags, SaveFlag.Killer)
? new TalismanAttribute(reader)
: new TalismanAttribute();
m_Summoner = GetSaveFlag(flags, SaveFlag.Summoner)
? new TalismanAttribute(reader)
: new TalismanAttribute();
if (GetSaveFlag(flags, SaveFlag.Removal))
{
m_Removal = (TalismanRemoval)reader.ReadEncodedInt();
}
if (GetSaveFlag(flags, SaveFlag.OldKarmaLoss))
{
Attributes.IncreasedKarmaLoss = reader.ReadEncodedInt();
}
if (GetSaveFlag(flags, SaveFlag.Skill))
{
m_Skill = (SkillName)reader.ReadEncodedInt();
}
if (GetSaveFlag(flags, SaveFlag.SuccessBonus))
{
m_SuccessBonus = reader.ReadEncodedInt();
}
if (GetSaveFlag(flags, SaveFlag.ExceptionalBonus))
{
m_ExceptionalBonus = reader.ReadEncodedInt();
}
if (GetSaveFlag(flags, SaveFlag.MaxCharges))
{
m_MaxCharges = reader.ReadEncodedInt();
}
if (GetSaveFlag(flags, SaveFlag.Charges))
{
m_Charges = reader.ReadEncodedInt();
}
if (GetSaveFlag(flags, SaveFlag.MaxChargeTime))
{
m_MaxChargeTime = reader.ReadEncodedInt();
}
if (GetSaveFlag(flags, SaveFlag.ChargeTime))
{
m_ChargeTime = reader.ReadEncodedInt();
}
if (GetSaveFlag(flags, SaveFlag.Slayer))
{
m_Slayer = (TalismanSlayerName)reader.ReadEncodedInt();
}
m_Blessed = GetSaveFlag(flags, SaveFlag.Blessed);
break;
}
Attributes.Deserialize(reader);
}
SkillBonuses = new AosSkillBonuses(this);
if (GetSaveFlag(flags, SaveFlag.SkillBonuses))
{
SkillBonuses.Deserialize(reader);
}
// Backward compatibility
if (GetSaveFlag(flags, SaveFlag.Owner))
{
BlessedFor = reader.ReadEntity<Mobile>();
}
m_Protection = GetSaveFlag(flags, SaveFlag.Protection)
? new TalismanAttribute(reader)
: new TalismanAttribute();
m_Killer = GetSaveFlag(flags, SaveFlag.Killer)
? new TalismanAttribute(reader)
: new TalismanAttribute();
m_Summoner = GetSaveFlag(flags, SaveFlag.Summoner)
? new TalismanAttribute(reader)
: new TalismanAttribute();
if (GetSaveFlag(flags, SaveFlag.Removal))
{
m_Removal = (TalismanRemoval)reader.ReadEncodedInt();
}
if (GetSaveFlag(flags, SaveFlag.OldKarmaLoss))
{
Attributes.IncreasedKarmaLoss = reader.ReadEncodedInt();
}
if (GetSaveFlag(flags, SaveFlag.Skill))
{
m_Skill = (SkillName)reader.ReadEncodedInt();
}
if (GetSaveFlag(flags, SaveFlag.SuccessBonus))
{
m_SuccessBonus = reader.ReadEncodedInt();
}
if (GetSaveFlag(flags, SaveFlag.ExceptionalBonus))
{
m_ExceptionalBonus = reader.ReadEncodedInt();
}
if (GetSaveFlag(flags, SaveFlag.MaxCharges))
{
m_MaxCharges = reader.ReadEncodedInt();
}
if (GetSaveFlag(flags, SaveFlag.Charges))
{
m_Charges = reader.ReadEncodedInt();
}
if (GetSaveFlag(flags, SaveFlag.MaxChargeTime))
{
m_MaxChargeTime = reader.ReadEncodedInt();
}
if (GetSaveFlag(flags, SaveFlag.ChargeTime))
{
m_ChargeTime = reader.ReadEncodedInt();
}
if (GetSaveFlag(flags, SaveFlag.Slayer))
{
m_Slayer = (TalismanSlayerName)reader.ReadEncodedInt();
}
m_Blessed = GetSaveFlag(flags, SaveFlag.Blessed);
if (Parent is Mobile m)
{
Attributes.AddStatBonuses(m);

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

@ -4036,22 +4036,18 @@ namespace Server.Items
m_Resource = CraftResource.Iron;
}
Attributes = new AosAttributes(this);
if (GetSaveFlag(flags, SaveFlag.xAttributes))
{
Attributes = new AosAttributes(this, reader);
}
else
{
Attributes = new AosAttributes(this);
Attributes.Deserialize(reader);
}
WeaponAttributes = new AosWeaponAttributes(this);
if (GetSaveFlag(flags, SaveFlag.xWeaponAttributes))
{
WeaponAttributes = new AosWeaponAttributes(this, reader);
}
else
{
WeaponAttributes = new AosWeaponAttributes(this);
WeaponAttributes.Deserialize(reader);
}
if (UseSkillMod && m_AccuracyLevel != WeaponAccuracyLevel.Regular && parentMobile != null)
@ -4077,13 +4073,11 @@ namespace Server.Items
PlayerConstructed = true;
}
SkillBonuses = new AosSkillBonuses(this);
if (GetSaveFlag(flags, SaveFlag.SkillBonuses))
{
SkillBonuses = new AosSkillBonuses(this, reader);
}
else
{
SkillBonuses = new AosSkillBonuses(this);
SkillBonuses.Deserialize(reader);
}
if (GetSaveFlag(flags, SaveFlag.Slayer2))
@ -4091,13 +4085,11 @@ namespace Server.Items
m_Slayer2 = (SlayerName)reader.ReadInt();
}
AosElementDamages = new AosElementAttributes(this);
if (GetSaveFlag(flags, SaveFlag.ElementalDamages))
{
AosElementDamages = new AosElementAttributes(this, reader);
}
else
{
AosElementDamages = new AosElementAttributes(this);
AosElementDamages.Deserialize(reader);
}
if (GetSaveFlag(flags, SaveFlag.EngravedText))

2
Projects/UOContent/Migrations/Server.Accounting.Account.v2.json → Projects/UOContent/Migrations/Server.Accounting.Account.v3.json
View file

@ -1,5 +1,5 @@
{
"version": 2,
"version": 3,
"type": "Server.Accounting.Account",
"properties": [
{

24
Projects/UOContent/Migrations/Server.BaseAttributes.v0.json Normal file
View file

@ -0,0 +1,24 @@
{
"version": 0,
"type": "Server.BaseAttributes",
"properties": [
{
"name": "Names",
"type": "uint",
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "Values",
"type": "int[]",
"rule": "ArrayMigrationRule",
"ruleArguments": [
"int",
"PrimitiveTypeMigrationRule",
"EncodedInt"
]
}
]
}

2
Projects/UOContent/Migrations/Server.Engines.BulkOrders.LargeBOD.v0.json → Projects/UOContent/Migrations/Server.Engines.BulkOrders.LargeBOD.v1.json
View file

@ -1,5 +1,5 @@
{
"version": 0,
"version": 1,
"type": "Server.Engines.BulkOrders.LargeBOD",
"properties": [
{

6
Projects/UOContent/Migrations/Server.Items.Aquarium.v3.json → Projects/UOContent/Migrations/Server.Items.Aquarium.v4.json
View file

@ -1,5 +1,5 @@
{
"version": 3,
"version": 4,
"type": "Server.Items.Aquarium",
"properties": [
{
@ -29,7 +29,7 @@
{
"name": "Food",
"type": "Server.Items.AquariumState",
"rule": "EmbeddedSerializableMigrationRule",
"rule": "RawSerializableMigrationRule",
"ruleArguments": [
""
]
@ -37,7 +37,7 @@
{
"name": "Water",
"type": "Server.Items.AquariumState",
"rule": "EmbeddedSerializableMigrationRule",
"rule": "RawSerializableMigrationRule",
"ruleArguments": [
""
]

5
Projects/UOContent/Migrations/Server.Items.ArtsGlasses.v0.json Normal file
View file

@ -0,0 +1,5 @@
{
"version": 0,
"type": "Server.Items.ArtsGlasses",
"properties": []
}

2
Projects/UOContent/Migrations/Server.Items.BaseAddon.v2.json → Projects/UOContent/Migrations/Server.Items.BaseAddon.v3.json
View file

@ -1,5 +1,5 @@
{
"version": 2,
"version": 3,
"type": "Server.Items.BaseAddon",
"properties": [
{

2
Projects/UOContent/Migrations/Server.Items.BaseAddonContainer.v1.json → Projects/UOContent/Migrations/Server.Items.BaseAddonContainer.v2.json
View file

@ -1,5 +1,5 @@
{
"version": 1,
"version": 2,
"type": "Server.Items.BaseAddonContainer",
"properties": [
{

15
Projects/UOContent/Migrations/Server.Items.ElvenGlasses.v0.json Normal file
View file

@ -0,0 +1,15 @@
{
"version": 0,
"type": "Server.Items.ElvenGlasses",
"properties": [
{
"name": "WeaponAttributes",
"type": "Server.AosWeaponAttributes",
"usesSaveFlag": true,
"rule": "RawSerializableMigrationRule",
"ruleArguments": [
""
]
}
]
}

2
Projects/UOContent/Migrations/Server.Items.SolenAntHole.v0.json → Projects/UOContent/Migrations/Server.Items.SolenAntHole.v1.json
View file

@ -1,5 +1,5 @@
{
"version": 0,
"version": 1,
"type": "Server.Items.SolenAntHole",
"properties": [
{

179
Projects/UOContent/Misc/AOS.cs
View file

@ -281,18 +281,11 @@ namespace Server
public sealed class AosAttributes : BaseAttributes
{
public AosAttributes(Item owner)
: base(owner)
public AosAttributes(Item owner) : base(owner)
{
}
public AosAttributes(Item owner, AosAttributes other)
: base(owner, other)
{
}
public AosAttributes(Item owner, IGenericReader reader)
: base(owner, reader)
public AosAttributes(Item owner, AosAttributes other) : base(owner, other)
{
}
@ -637,18 +630,11 @@ namespace Server
public sealed class AosWeaponAttributes : BaseAttributes
{
public AosWeaponAttributes(Item owner)
: base(owner)
public AosWeaponAttributes(Item owner) : base(owner)
{
}
public AosWeaponAttributes(Item owner, AosWeaponAttributes other)
: base(owner, other)
{
}
public AosWeaponAttributes(Item owner, IGenericReader reader)
: base(owner, reader)
public AosWeaponAttributes(Item owner, AosWeaponAttributes other) : base(owner, other)
{
}
@ -858,7 +844,7 @@ namespace Server
}
else if (obj is ElvenGlasses glasses)
{
var attrs = glasses.WeaponAttributes;
var attrs = glasses._weaponAttributes;
if (attrs != null)
{
@ -884,18 +870,11 @@ namespace Server
public sealed class AosArmorAttributes : BaseAttributes
{
public AosArmorAttributes(Item owner)
: base(owner)
public AosArmorAttributes(Item owner) : base(owner)
{
}
public AosArmorAttributes(Item owner, IGenericReader reader)
: base(owner, reader)
{
}
public AosArmorAttributes(Item owner, AosArmorAttributes other)
: base(owner, other)
public AosArmorAttributes(Item owner, AosArmorAttributes other) : base(owner, other)
{
}
@ -977,18 +956,11 @@ namespace Server
{
private List<SkillMod> m_Mods;
public AosSkillBonuses(Item owner)
: base(owner)
public AosSkillBonuses(Item owner) : base(owner)
{
}
public AosSkillBonuses(Item owner, IGenericReader reader)
: base(owner, reader)
{
}
public AosSkillBonuses(Item owner, AosSkillBonuses other)
: base(owner, other)
public AosSkillBonuses(Item owner, AosSkillBonuses other) : base(owner, other)
{
}
@ -1256,18 +1228,11 @@ namespace Server
public sealed class AosElementAttributes : BaseAttributes
{
public AosElementAttributes(Item owner)
: base(owner)
public AosElementAttributes(Item owner) : base(owner)
{
}
public AosElementAttributes(Item owner, AosElementAttributes other)
: base(owner, other)
{
}
public AosElementAttributes(Item owner, IGenericReader reader)
: base(owner, reader)
public AosElementAttributes(Item owner, AosElementAttributes other) : base(owner, other)
{
}
@ -1330,76 +1295,36 @@ namespace Server
}
[PropertyObject]
public abstract class BaseAttributes
[EmbeddedSerializable(0)]
public abstract partial class BaseAttributes
{
private static readonly int[] m_Empty = Array.Empty<int>();
private uint m_Names;
private int[] m_Values;
[SerializableField(0, setter: "private")]
private uint _names;
[EncodedInt]
[SerializableField(1, setter: "private")]
private int[] _values;
public BaseAttributes(Item owner)
{
Owner = owner;
m_Values = m_Empty;
_owner = owner;
_values = Array.Empty<int>();
}
public BaseAttributes(Item owner, BaseAttributes other)
{
Owner = owner;
m_Values = new int[other.m_Values.Length];
other.m_Values.CopyTo(m_Values, 0);
m_Names = other.m_Names;
_owner = owner;
_values = new int[other._values.Length];
other._values.CopyTo(_values, 0);
_names = other._names;
}
public BaseAttributes(Item owner, IGenericReader reader)
{
Owner = owner;
public bool IsEmpty => _names == 0;
int version = reader.ReadByte();
[SerializableParent]
private readonly Item _owner;
switch (version)
{
case 1:
{
m_Names = reader.ReadUInt();
m_Values = new int[reader.ReadEncodedInt()];
for (var i = 0; i < m_Values.Length; ++i)
{
m_Values[i] = reader.ReadEncodedInt();
}
break;
}
case 0:
{
m_Names = reader.ReadUInt();
m_Values = new int[reader.ReadInt()];
for (var i = 0; i < m_Values.Length; ++i)
{
m_Values[i] = reader.ReadInt();
}
break;
}
}
}
public bool IsEmpty => m_Names == 0;
public Item Owner { get; }
public void Serialize(IGenericWriter writer)
{
writer.Write((byte)1); // version;
writer.Write(m_Names);
writer.WriteEncodedInt(m_Values.Length);
for (var i = 0; i < m_Values.Length; ++i)
{
writer.WriteEncodedInt(m_Values[i]);
}
}
public Item Owner => _owner;
public int GetValue(int bitmask)
{
@ -1410,16 +1335,16 @@ namespace Server
var mask = (uint)bitmask;
if ((m_Names & mask) == 0)
if ((_names & mask) == 0)
{
return 0;
}
var index = GetIndex(mask);
if (index >= 0 && index < m_Values.Length)
if (index >= 0 && index < _values.Length)
{
return m_Values[index];
return _values[index];
}
return 0;
@ -1450,65 +1375,65 @@ namespace Server
if (value != 0)
{
if ((m_Names & mask) != 0)
if ((_names & mask) != 0)
{
var index = GetIndex(mask);
if (index >= 0 && index < m_Values.Length)
if (index >= 0 && index < _values.Length)
{
m_Values[index] = value;
_values[index] = value;
}
}
else
{
var index = GetIndex(mask);
if (index >= 0 && index <= m_Values.Length)
if (index >= 0 && index <= _values.Length)
{
var old = m_Values;
m_Values = new int[old.Length + 1];
var old = _values;
_values = new int[old.Length + 1];
for (var i = 0; i < index; ++i)
{
m_Values[i] = old[i];
_values[i] = old[i];
}
m_Values[index] = value;
_values[index] = value;
for (var i = index; i < old.Length; ++i)
{
m_Values[i + 1] = old[i];
_values[i + 1] = old[i];
}
m_Names |= mask;
_names |= mask;
}
}
}
else if ((m_Names & mask) != 0)
else if ((_names & mask) != 0)
{
var index = GetIndex(mask);
if (index >= 0 && index < m_Values.Length)
if (index >= 0 && index < _values.Length)
{
m_Names &= ~mask;
_names &= ~mask;
if (m_Values.Length == 1)
if (_values.Length == 1)
{
m_Values = m_Empty;
_values = Array.Empty<int>();
}
else
{
var old = m_Values;
m_Values = new int[old.Length - 1];
var old = _values;
_values = new int[old.Length - 1];
for (var i = 0; i < index; ++i)
{
m_Values[i] = old[i];
_values[i] = old[i];
}
for (var i = index + 1; i < old.Length; ++i)
{
m_Values[i - 1] = old[i];
_values[i - 1] = old[i];
}
}
}
@ -1555,7 +1480,7 @@ namespace Server
private int GetIndex(uint mask)
{
var index = 0;
var ourNames = m_Names;
var ourNames = _names;
uint currentBit = 1;
while (currentBit != mask)