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

fix: Code gens items. Fixes code genning of ore (#684)

Browse source 
### THIS IS A BREAKING CHANGE IF YOU ARE ALREADY USING CODEGEN. IF YOUR WORLD HAS ERRORS LOADING PLEASE CONTACT ME ON DISCORD. ORE MIGHT FAIL TO LOAD.
 
### Changes
* Fixes Components from addons not marking dirty
* Code gens BaseAddonContainer
* Code gens Ingots
* Fixes code gen deserialization for Ore
* Code gens dyetubs
* Code gens reagents
* Code gens tailor commodities
* Code gens fish
This commit is contained in:
Kamron Batman 2021-08-14 22:16:42 -07:00 • committed by GitHub
parent 2de4717390
commit 25fa9b397b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
163 changed files with 1128 additions and 2494 deletions
Download patch file Download diff file Expand all files Collapse all files

138
Projects/UOContent/Items/Resources/Tailor/Hides.cs
View file

@ -1,8 +1,12 @@
namespace Server.Items
{
public abstract class BaseHides : Item, ICommodity
[Serializable(2, false)]
public abstract partial class BaseHides : Item, ICommodity
{
private CraftResource m_Resource;
[InvalidateProperties]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
[SerializableField(0)]
private CraftResource _resource;
public BaseHides(CraftResource resource, int amount = 1) : base(0x1079)
{
@ -11,31 +15,16 @@ namespace Server.Items
Amount = amount;
Hue = CraftResources.GetHue(resource);
m_Resource = resource;
}
public BaseHides(Serial serial) : base(serial)
{
}
[CommandProperty(AccessLevel.GameMaster)]
public CraftResource Resource
{
get => m_Resource;
set
{
m_Resource = value;
InvalidateProperties();
}
_resource = resource;
}
public override int LabelNumber
{
get
{
if (m_Resource >= CraftResource.SpinedLeather && m_Resource <= CraftResource.BarbedLeather)
if (_resource >= CraftResource.SpinedLeather && _resource <= CraftResource.BarbedLeather)
{
return 1049687 + (m_Resource - CraftResource.SpinedLeather);
return 1049687 + (_resource - CraftResource.SpinedLeather);
}
return 1047023;
@ -45,33 +34,20 @@ namespace Server.Items
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true;
public override void Serialize(IGenericWriter writer)
private void Deserialize(IGenericReader reader, int version)
{
base.Serialize(writer);
writer.Write(1); // version
writer.Write((int)m_Resource);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
switch (version)
{
case 1:
{
m_Resource = (CraftResource)reader.ReadInt();
_resource = (CraftResource)reader.ReadInt();
break;
}
case 0:
{
var info = new OreInfo(reader.ReadInt(), reader.ReadInt(), reader.ReadString());
m_Resource = CraftResources.GetFromOreInfo(info);
_resource = CraftResources.GetFromOreInfo(info);
break;
}
}
@ -93,9 +69,9 @@ namespace Server.Items
{
base.GetProperties(list);
if (!CraftResources.IsStandard(m_Resource))
if (!CraftResources.IsStandard(_resource))
{
var num = CraftResources.GetLocalizationNumber(m_Resource);
var num = CraftResources.GetLocalizationNumber(_resource);
if (num > 0)
{
@ -103,24 +79,21 @@ namespace Server.Items
}
else
{
list.Add(CraftResources.GetName(m_Resource));
list.Add(CraftResources.GetName(_resource));
}
}
}
}
[Serializable(0, false)]
[Flippable(0x1079, 0x1078)]
public class Hides : BaseHides, IScissorable
public partial class Hides : BaseHides, IScissorable
{
[Constructible]
public Hides(int amount = 1) : base(CraftResource.RegularLeather, amount)
{
}
public Hides(Serial serial) : base(serial)
{
}
public bool Scissor(Mobile from, Scissors scissors)
{
if (Deleted || !from.CanSee(this))
@ -138,34 +111,17 @@ namespace Server.Items
return true;
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
[Serializable(0, false)]
[Flippable(0x1079, 0x1078)]
public class SpinedHides : BaseHides, IScissorable
public partial class SpinedHides : BaseHides, IScissorable
{
[Constructible]
public SpinedHides(int amount = 1) : base(CraftResource.SpinedLeather, amount)
{
}
public SpinedHides(Serial serial) : base(serial)
{
}
public bool Scissor(Mobile from, Scissors scissors)
{
if (Deleted || !from.CanSee(this))
@ -183,34 +139,17 @@ namespace Server.Items
return true;
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
[Serializable(0, false)]
[Flippable(0x1079, 0x1078)]
public class HornedHides : BaseHides, IScissorable
public partial class HornedHides : BaseHides, IScissorable
{
[Constructible]
public HornedHides(int amount = 1) : base(CraftResource.HornedLeather, amount)
{
}
public HornedHides(Serial serial) : base(serial)
{
}
public bool Scissor(Mobile from, Scissors scissors)
{
if (Deleted || !from.CanSee(this))
@ -228,34 +167,17 @@ namespace Server.Items
return true;
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
[Serializable(0, false)]
[Flippable(0x1079, 0x1078)]
public class BarbedHides : BaseHides, IScissorable
public partial class BarbedHides : BaseHides, IScissorable
{
[Constructible]
public BarbedHides(int amount = 1) : base(CraftResource.BarbedLeather, amount)
{
}
public BarbedHides(Serial serial) : base(serial)
{
}
public bool Scissor(Mobile from, Scissors scissors)
{
if (Deleted || !from.CanSee(this))
@ -273,19 +195,5 @@ namespace Server.Items
return true;
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
}