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

### 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

View file

@ -2,8 +2,9 @@ using Server.Network;
namespace Server.Items
{
[Serializable(0, false)]
[Flippable(0xF95, 0xF96, 0xF97, 0xF98, 0xF99, 0xF9A, 0xF9B, 0xF9C)]
public class BoltOfCloth : Item, IScissorable, IDyable, ICommodity
public partial class BoltOfCloth : Item, IScissorable, IDyable, ICommodity
{
[Constructible]
public BoltOfCloth(int amount = 1) : base(0xF95)
@ -13,10 +14,6 @@ namespace Server.Items
Amount = amount;
}
public BoltOfCloth(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true;
@ -44,20 +41,6 @@ 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();
}
public override void OnSingleClick(Mobile from)
{
var number = Amount == 1 ? 1049122 : 1049121;

View file

@ -1,6 +1,7 @@
namespace Server.Items
{
public class Bone : Item, ICommodity
[Serializable(0, false)]
public partial class Bone : Item, ICommodity
{
[Constructible]
public Bone(int amount = 1) : base(0xf7e)
@ -10,25 +11,7 @@ namespace Server.Items
Weight = 1.0;
}
public Bone(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => 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();
}
}
}

View file

@ -2,8 +2,9 @@ using Server.Network;
namespace Server.Items
{
[Serializable(0, false)]
[Flippable(0x1766, 0x1768)]
public class Cloth : Item, IScissorable, IDyable, ICommodity
public partial class Cloth : Item, IScissorable, IDyable, ICommodity
{
[Constructible]
public Cloth(int amount = 1) : base(0x1766)
@ -12,10 +13,6 @@ namespace Server.Items
Amount = amount;
}
public Cloth(Serial serial) : base(serial)
{
}
public override double DefaultWeight => 0.1;
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true;
@ -44,20 +41,6 @@ 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();
}
public override void OnSingleClick(Mobile from)
{
var number = Amount == 1 ? 1049124 : 1049123;

View file

@ -2,7 +2,8 @@ using Server.Targeting;
namespace Server.Items
{
public class Cotton : Item, IDyable
[Serializable(0, false)]
public partial class Cotton : Item, IDyable
{
[Constructible]
public Cotton(int amount = 1) : base(0xDF9)
@ -12,10 +13,6 @@ namespace Server.Items
Amount = amount;
}
public Cotton(Serial serial) : base(serial)
{
}
public bool Dye(Mobile from, DyeTub sender)
{
if (Deleted)
@ -28,20 +25,6 @@ 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();
}
public override void OnDoubleClick(Mobile from)
{
if (IsChildOf(from.Backpack))
@ -84,25 +67,24 @@ namespace Server.Items
wheel = component.Addon as ISpinningWheel;
}
if (wheel is Item)
if (wheel is not Item)
{
if (!m_Cotton.IsChildOf(from.Backpack))
{
from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it.
}
else if (wheel.Spinning)
{
from.SendLocalizedMessage(502656); // That spinning wheel is being used.
}
else
{
m_Cotton.Consume();
wheel.BeginSpin(m_Cotton.OnSpun, from, m_Cotton.Hue);
}
from.SendLocalizedMessage(502658); // Use that on a spinning wheel.
return;
}
if (!m_Cotton.IsChildOf(from.Backpack))
{
from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it.
}
else if (wheel.Spinning)
{
from.SendLocalizedMessage(502656); // That spinning wheel is being used.
}
else
{
from.SendLocalizedMessage(502658); // Use that on a spinning wheel.
m_Cotton.Consume();
wheel.BeginSpin(m_Cotton.OnSpun, from, m_Cotton.Hue);
}
}
}

View file

@ -2,7 +2,8 @@ using Server.Targeting;
namespace Server.Items
{
public class Flax : Item
[Serializable(0, false)]
public partial class Flax : Item
{
[Constructible]
public Flax(int amount = 1) : base(0x1A9C)
@ -12,24 +13,6 @@ namespace Server.Items
Amount = amount;
}
public Flax(Serial serial) : base(serial)
{
}
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();
}
public override void OnDoubleClick(Mobile from)
{
if (IsChildOf(from.Backpack))
@ -72,25 +55,24 @@ namespace Server.Items
wheel = component.Addon as ISpinningWheel;
}
if (wheel is Item)
if (wheel is not Item)
{
if (!m_Flax.IsChildOf(from.Backpack))
{
from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it.
}
else if (wheel.Spinning)
{
from.SendLocalizedMessage(502656); // That spinning wheel is being used.
}
else
{
m_Flax.Consume();
wheel.BeginSpin(m_Flax.OnSpun, from, m_Flax.Hue);
}
from.SendLocalizedMessage(502658); // Use that on a spinning wheel.
return;
}
if (!m_Flax.IsChildOf(from.Backpack))
{
from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it.
}
else if (wheel.Spinning)
{
from.SendLocalizedMessage(502656); // That spinning wheel is being used.
}
else
{
from.SendLocalizedMessage(502658); // Use that on a spinning wheel.
m_Flax.Consume();
wheel.BeginSpin(m_Flax.OnSpun, from, m_Flax.Hue);
}
}
}

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();
}
}
}

View file

@ -1,8 +1,12 @@
namespace Server.Items
{
public abstract class BaseLeather : Item, ICommodity
[Serializable(2, false)]
public abstract partial class BaseLeather : Item, ICommodity
{
private CraftResource m_Resource;
[InvalidateProperties]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
[SerializableField(0)]
private CraftResource _resource;
public BaseLeather(CraftResource resource, int amount = 1) : base(0x1081)
{
@ -11,31 +15,16 @@ namespace Server.Items
Amount = amount;
Hue = CraftResources.GetHue(resource);
m_Resource = resource;
}
public BaseLeather(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 1049684 + (m_Resource - CraftResource.SpinedLeather);
return 1049684 + (_resource - CraftResource.SpinedLeather);
}
return 1047022;
@ -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,117 +79,49 @@ namespace Server.Items
}
else
{
list.Add(CraftResources.GetName(m_Resource));
list.Add(CraftResources.GetName(_resource));
}
}
}
}
[Serializable(0, false)]
[Flippable(0x1081, 0x1082)]
public class Leather : BaseLeather
public partial class Leather : BaseLeather
{
[Constructible]
public Leather(int amount = 1) : base(CraftResource.RegularLeather, amount)
{
}
public Leather(Serial serial) : base(serial)
{
}
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(0x1081, 0x1082)]
public class SpinedLeather : BaseLeather
public partial class SpinedLeather : BaseLeather
{
[Constructible]
public SpinedLeather(int amount = 1) : base(CraftResource.SpinedLeather, amount)
{
}
public SpinedLeather(Serial serial) : base(serial)
{
}
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(0x1081, 0x1082)]
public class HornedLeather : BaseLeather
public partial class HornedLeather : BaseLeather
{
[Constructible]
public HornedLeather(int amount = 1) : base(CraftResource.HornedLeather, amount)
{
}
public HornedLeather(Serial serial) : base(serial)
{
}
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(0x1081, 0x1082)]
public class BarbedLeather : BaseLeather
public partial class BarbedLeather : BaseLeather
{
[Constructible]
public BarbedLeather(int amount = 1) : base(CraftResource.BarbedLeather, amount)
{
}
public BarbedLeather(Serial serial) : base(serial)
{
}
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();
}
}
}

View file

@ -2,8 +2,9 @@ using Server.Network;
namespace Server.Items
{
[Serializable(0, false)]
[Flippable(0x1765, 0x1767)]
public class UncutCloth : Item, IScissorable, IDyable, ICommodity
public partial class UncutCloth : Item, IScissorable, IDyable, ICommodity
{
[Constructible]
public UncutCloth(int amount = 1) : base(0x1767)
@ -12,10 +13,6 @@ namespace Server.Items
Amount = amount;
}
public UncutCloth(Serial serial) : base(serial)
{
}
public override double DefaultWeight => 0.1;
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true;
@ -44,20 +41,6 @@ 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();
}
public override void OnSingleClick(Mobile from)
{
var number = Amount == 1 ? 1049124 : 1049123;

View file

@ -2,7 +2,8 @@ using Server.Targeting;
namespace Server.Items
{
public class Wool : Item, IDyable
[Serializable(0, false)]
public partial class Wool : Item, IDyable
{
[Constructible]
public Wool(int amount = 1) : base(0xDF8)
@ -12,10 +13,6 @@ namespace Server.Items
Amount = amount;
}
public Wool(Serial serial) : base(serial)
{
}
public bool Dye(Mobile from, DyeTub sender)
{
if (Deleted)
@ -28,20 +25,6 @@ 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();
}
public override void OnDoubleClick(Mobile from)
{
if (IsChildOf(from.Backpack))
@ -108,7 +91,8 @@ namespace Server.Items
}
}
public class TaintedWool : Wool
[Serializable(0, false)]
public partial class TaintedWool : Wool
{
[Constructible]
public TaintedWool(int amount = 1) : base(0x101F)
@ -118,24 +102,6 @@ namespace Server.Items
Amount = amount;
}
public TaintedWool(Serial serial) : base(serial)
{
}
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();
}
public override void OnSpun(ISpinningWheel wheel, Mobile from, int hue)
{
Item item = new DarkYarn();

View file

@ -2,7 +2,8 @@ using Server.Targeting;
namespace Server.Items
{
public abstract class BaseClothMaterial : Item, IDyable
[Serializable(0, false)]
public abstract partial class BaseClothMaterial : Item, IDyable
{
public BaseClothMaterial(int itemID, int amount = 1) : base(itemID)
{
@ -11,10 +12,6 @@ namespace Server.Items
Amount = amount;
}
public BaseClothMaterial(Serial serial) : base(serial)
{
}
public bool Dye(Mobile from, DyeTub sender)
{
if (Deleted)
@ -27,20 +24,6 @@ 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();
}
public override void OnDoubleClick(Mobile from)
{
if (IsChildOf(from.Backpack))
@ -108,107 +91,39 @@ namespace Server.Items
}
}
public class DarkYarn : BaseClothMaterial
[Serializable(0, false)]
public partial class DarkYarn : BaseClothMaterial
{
[Constructible]
public DarkYarn(int amount = 1) : base(0xE1D, amount)
{
}
public DarkYarn(Serial serial) : base(serial)
{
}
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();
}
}
public class LightYarn : BaseClothMaterial
[Serializable(0, false)]
public partial class LightYarn : BaseClothMaterial
{
[Constructible]
public LightYarn(int amount = 1) : base(0xE1E, amount)
{
}
public LightYarn(Serial serial) : base(serial)
{
}
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();
}
}
public class LightYarnUnraveled : BaseClothMaterial
[Serializable(0, false)]
public partial class LightYarnUnraveled : BaseClothMaterial
{
[Constructible]
public LightYarnUnraveled(int amount = 1) : base(0xE1F, amount)
{
}
public LightYarnUnraveled(Serial serial) : base(serial)
{
}
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();
}
}
public class SpoolOfThread : BaseClothMaterial
[Serializable(0, false)]
public partial class SpoolOfThread : BaseClothMaterial
{
[Constructible]
public SpoolOfThread(int amount = 1) : base(0xFA0, amount)
{
}
public SpoolOfThread(Serial serial) : base(serial)
{
}
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();
}
}
}