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

fix(content): Adds addons to code gen (#624)

Browse source 
* Codegens more addons.
* Fixes up some source generation issues.
This commit is contained in:
Kamron Batman 2021-08-14 16:53:18 -07:00 • committed by GitHub
parent 360143478a
commit 2de4717390
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 345 additions and 697 deletions
Download patch file Download diff file Expand all files Collapse all files

122
Projects/UOContent/Items/Addons/AddonContainerComponent.cs
View file

@ -3,7 +3,8 @@ using Server.ContextMenus;
namespace Server.Items
{
public class AddonContainerComponent : Item, IChoppable
[Serializable(0, false)]
public partial class AddonContainerComponent : Item, IChoppable
{
[Constructible]
public AddonContainerComponent(int itemID) : base(itemID)
@ -13,18 +14,16 @@ namespace Server.Items
AddonComponent.ApplyLightTo(this);
}
public AddonContainerComponent(Serial serial) : base(serial)
{
}
public virtual bool NeedsWall => false;
public virtual Point3D WallPosition => Point3D.Zero;
[CommandProperty(AccessLevel.GameMaster)]
public BaseAddonContainer Addon { get; set; }
[SerializableField(0)]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
public BaseAddonContainer _addon;
[CommandProperty(AccessLevel.GameMaster)]
public Point3D Offset { get; set; }
[SerializableField(1)]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
public Point3D _offset;
[Hue, CommandProperty(AccessLevel.GameMaster)]
public override int Hue
@ -34,18 +33,18 @@ namespace Server.Items
{
base.Hue = value;
if (Addon?.ShareHue == true)
if (_addon?.ShareHue == true)
{
Addon.Hue = value;
_addon.Hue = value;
}
}
}
public virtual void OnChop(Mobile from)
{
if (Addon != null && from.InRange(GetWorldLocation(), 3))
if (_addon != null && from.InRange(GetWorldLocation(), 3))
{
Addon.OnChop(from);
_addon.OnChop(from);
}
else
{
@ -53,39 +52,26 @@ namespace Server.Items
}
}
public override bool OnDragDrop(Mobile from, Item dropped)
{
if (Addon != null)
{
return Addon.OnDragDrop(from, dropped);
}
public override bool OnDragDrop(Mobile from, Item dropped) => _addon?.OnDragDrop(from, dropped) == true;
return false;
}
public override void OnDoubleClick(Mobile from)
{
Addon?.OnComponentUsed(this, from);
}
public override void OnDoubleClick(Mobile from) => _addon?.OnComponentUsed(this, @from);
public override void OnLocationChange(Point3D old)
{
if (Addon != null)
if (_addon != null)
{
Addon.Location = new Point3D(X - Offset.X, Y - Offset.Y, Z - Offset.Z);
_addon.Location = new Point3D(X - _offset.X, Y - _offset.Y, Z - _offset.Z);
}
}
public override void GetContextMenuEntries(Mobile from, List<ContextMenuEntry> list)
{
Addon?.GetContextMenuEntries(from, list);
}
public override void GetContextMenuEntries(Mobile from, List<ContextMenuEntry> list) =>
_addon?.GetContextMenuEntries(from, list);
public override void OnMapChange()
{
if (Addon != null)
if (_addon != null)
{
Addon.Map = Map;
_addon.Map = Map;
}
}
@ -93,73 +79,25 @@ namespace Server.Items
{
base.OnAfterDelete();
Addon?.Delete();
_addon?.Delete();
}
public override void Serialize(IGenericWriter writer)
[AfterDeserialization]
private void AfterDeserialization()
{
base.Serialize(writer);
writer.Write(0); // version
writer.Write(Addon);
writer.Write(Offset);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
Addon = reader.ReadEntity<BaseAddonContainer>();
Offset = reader.ReadPoint3D();
Addon?.OnComponentLoaded(this);
_addon?.OnComponentLoaded(this);
AddonComponent.ApplyLightTo(this);
}
}
public class LocalizedContainerComponent : AddonContainerComponent
[Serializable(0, false)]
public partial class LocalizedContainerComponent : AddonContainerComponent
{
private int m_LabelNumber;
[SerializableField(0, setter: "private")]
private int _number;
public LocalizedContainerComponent(int itemID, int labelNumber) : base(itemID) => m_LabelNumber = labelNumber;
public LocalizedContainerComponent(int itemID, int labelNumber) : base(itemID) => _number = labelNumber;
public LocalizedContainerComponent(Serial serial) : base(serial)
{
}
public override int LabelNumber
{
get
{
if (m_LabelNumber > 0)
{
return m_LabelNumber;
}
return base.LabelNumber;
}
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
writer.Write(m_LabelNumber);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
m_LabelNumber = reader.ReadInt();
}
public override int LabelNumber => _number > 0 ? _number : base.LabelNumber;
}
}