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

2
Projects/UOContent/Engines/ConPVP/Games/BombingRun.cs
View file

@ -945,7 +945,7 @@ namespace Server.Engines.ConPVP
ac.Delete(); ac.Delete();
} }
Components.Clear(); this.Clear(Components);
// stairs // stairs
AddComponent(new AddonComponent(0x74D), -1, +1, -5); AddComponent(new AddonComponent(0x74D), -1, +1, -5);

1
Projects/UOContent/Engines/Harvest/Fishing.cs
View file

@ -1,6 +1,5 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using Server.Engines.Quests; using Server.Engines.Quests;
using Server.Engines.Quests.Collector; using Server.Engines.Quests.Collector;
using Server.Items; using Server.Items;

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

@ -54,7 +54,7 @@ namespace Server.Items
public override bool OnDragDrop(Mobile from, Item dropped) => _addon?.OnDragDrop(from, dropped) == true; public override bool OnDragDrop(Mobile from, Item dropped) => _addon?.OnDragDrop(from, dropped) == true;
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) public override void OnLocationChange(Point3D old)
{ {

2
Projects/UOContent/Items/Addons/ArcheryButteAddon.cs
View file

@ -91,7 +91,7 @@ namespace Server.Items
public void Fire(Mobile from) public void Fire(Mobile from)
{ {
if (@from.Weapon is not BaseRanged bow) if (from.Weapon is not BaseRanged bow)
{ {
SendLocalizedMessageTo(from, 500593); // You must practice with ranged weapons on this. SendLocalizedMessageTo(from, 500593); // You must practice with ranged weapons on this.
return; return;

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

@ -138,7 +138,7 @@ namespace Server.Items
return; return;
} }
Components.Add(c); this.Add(Components, c);
c.Addon = this; c.Addon = this;
c.Offset = new Point3D(x, y, z); c.Offset = new Point3D(x, y, z);

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

@ -3,8 +3,11 @@ using Server.Multis;
namespace Server.Items namespace Server.Items
{ {
public abstract class BaseAddonContainer : BaseContainer, IChoppable, IAddon [Serializable(1, false)]
public abstract partial class BaseAddonContainer : BaseContainer, IChoppable, IAddon
{ {
[SerializableField(0, setter: "private")]
private List<AddonContainerComponent> _components;
private CraftResource m_Resource; private CraftResource m_Resource;
public BaseAddonContainer(int itemID) : base(itemID) public BaseAddonContainer(int itemID) : base(itemID)
@ -14,10 +17,6 @@ namespace Server.Items
Components = new List<AddonContainerComponent>(); Components = new List<AddonContainerComponent>();
} }
public BaseAddonContainer(Serial serial) : base(serial)
{
}
public override bool DisplayWeight => false; public override bool DisplayWeight => false;
[Hue, CommandProperty(AccessLevel.GameMaster)] [Hue, CommandProperty(AccessLevel.GameMaster)]
@ -41,6 +40,7 @@ namespace Server.Items
} }
} }
[SerializableField(1)]
[CommandProperty(AccessLevel.GameMaster)] [CommandProperty(AccessLevel.GameMaster)]
public CraftResource Resource public CraftResource Resource
{ {
@ -63,8 +63,6 @@ namespace Server.Items
public virtual Point3D WallPosition => Point3D.Zero; public virtual Point3D WallPosition => Point3D.Zero;
public virtual BaseAddonContainerDeed Deed => null; public virtual BaseAddonContainerDeed Deed => null;
public List<AddonContainerComponent> Components { get; private set; }
Item IAddon.Deed => Deed; Item IAddon.Deed => Deed;
public bool CouldFit(IPoint3D p, Map map) public bool CouldFit(IPoint3D p, Map map)
@ -186,25 +184,16 @@ namespace Server.Items
} }
} }
public override void Serialize(IGenericWriter writer) // Handles v0 with old Enum -> Int casting
private void Deserialize(IGenericReader reader, int version)
{ {
base.Serialize(writer);
writer.Write(0); // version
writer.Write(Components);
writer.Write((int)m_Resource);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
Components = reader.ReadEntityList<AddonContainerComponent>(); Components = reader.ReadEntityList<AddonContainerComponent>();
m_Resource = (CraftResource)reader.ReadInt(); m_Resource = (CraftResource)reader.ReadInt();
}
[AfterDeserialization]
private void AfterDeserialization()
{
AddonComponent.ApplyLightTo(this); AddonComponent.ApplyLightTo(this);
} }
@ -223,7 +212,7 @@ namespace Server.Items
return; return;
} }
Components.Add(c); this.Add(Components, c);
c.Addon = this; c.Addon = this;
c.Offset = new Point3D(x, y, z); c.Offset = new Point3D(x, y, z);

4
Projects/UOContent/Items/Misc/FlippableAddonAttribute.cs
View file

@ -120,7 +120,7 @@ namespace Server.Items
c.Delete(); c.Delete();
} }
addon.Components.Clear(); addon.Clear(addon.Components);
} }
else if (item is BaseAddonContainer addonContainer) else if (item is BaseAddonContainer addonContainer)
{ {
@ -130,7 +130,7 @@ namespace Server.Items
c.Delete(); c.Delete();
} }
addonContainer.Components.Clear(); addonContainer.Clear(addonContainer.Components);
} }
} }
} }

243
Projects/UOContent/Items/Resources/Blacksmithing/Ingots.cs
View file

@ -1,8 +1,12 @@
namespace Server.Items namespace Server.Items
{ {
public abstract class BaseIngot : Item, ICommodity [Serializable(2, false)]
public abstract partial class BaseIngot : Item, ICommodity
{ {
private CraftResource m_Resource; [InvalidateProperties]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
[SerializableField(0)]
private CraftResource _resource;
public BaseIngot(CraftResource resource, int amount = 1) : base(0x1BF2) public BaseIngot(CraftResource resource, int amount = 1) : base(0x1BF2)
{ {
@ -10,22 +14,7 @@ namespace Server.Items
Amount = amount; Amount = amount;
Hue = CraftResources.GetHue(resource); Hue = CraftResources.GetHue(resource);
m_Resource = resource; _resource = resource;
}
public BaseIngot(Serial serial) : base(serial)
{
}
[CommandProperty(AccessLevel.GameMaster)]
public CraftResource Resource
{
get => m_Resource;
set
{
m_Resource = value;
InvalidateProperties();
}
} }
public override double DefaultWeight => 0.1; public override double DefaultWeight => 0.1;
@ -34,9 +23,9 @@ namespace Server.Items
{ {
get get
{ {
if (m_Resource >= CraftResource.DullCopper && m_Resource <= CraftResource.Valorite) if (_resource >= CraftResource.DullCopper && _resource <= CraftResource.Valorite)
{ {
return 1042684 + (m_Resource - CraftResource.DullCopper); return 1042684 + (_resource - CraftResource.DullCopper);
} }
return 1042692; return 1042692;
@ -46,26 +35,13 @@ namespace Server.Items
int ICommodity.DescriptionNumber => LabelNumber; int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true; 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) switch (version)
{ {
case 1: case 1:
{ {
m_Resource = (CraftResource)reader.ReadInt(); _resource = (CraftResource)reader.ReadInt();
break; break;
} }
case 0: case 0:
@ -84,7 +60,7 @@ namespace Server.Items
_ => null _ => null
}; };
m_Resource = CraftResources.GetFromOreInfo(info); _resource = CraftResources.GetFromOreInfo(info);
break; break;
} }
} }
@ -106,9 +82,9 @@ namespace Server.Items
{ {
base.GetProperties(list); 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) if (num > 0)
{ {
@ -116,252 +92,99 @@ namespace Server.Items
} }
else else
{ {
list.Add(CraftResources.GetName(m_Resource)); list.Add(CraftResources.GetName(_resource));
} }
} }
} }
} }
[Serializable(0, false)]
[Flippable(0x1BF2, 0x1BEF)] [Flippable(0x1BF2, 0x1BEF)]
public class IronIngot : BaseIngot public partial class IronIngot : BaseIngot
{ {
[Constructible] [Constructible]
public IronIngot(int amount = 1) : base(CraftResource.Iron, amount) public IronIngot(int amount = 1) : base(CraftResource.Iron, amount)
{ {
} }
public IronIngot(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(0x1BF2, 0x1BEF)] [Flippable(0x1BF2, 0x1BEF)]
public class DullCopperIngot : BaseIngot public partial class DullCopperIngot : BaseIngot
{ {
[Constructible] [Constructible]
public DullCopperIngot(int amount = 1) : base(CraftResource.DullCopper, amount) public DullCopperIngot(int amount = 1) : base(CraftResource.DullCopper, amount)
{ {
} }
public DullCopperIngot(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(0x1BF2, 0x1BEF)] [Flippable(0x1BF2, 0x1BEF)]
public class ShadowIronIngot : BaseIngot public partial class ShadowIronIngot : BaseIngot
{ {
[Constructible] [Constructible]
public ShadowIronIngot(int amount = 1) : base(CraftResource.ShadowIron, amount) public ShadowIronIngot(int amount = 1) : base(CraftResource.ShadowIron, amount)
{ {
} }
public ShadowIronIngot(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(0x1BF2, 0x1BEF)] [Flippable(0x1BF2, 0x1BEF)]
public class CopperIngot : BaseIngot public partial class CopperIngot : BaseIngot
{ {
[Constructible] [Constructible]
public CopperIngot(int amount = 1) : base(CraftResource.Copper, amount) public CopperIngot(int amount = 1) : base(CraftResource.Copper, amount)
{ {
} }
public CopperIngot(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(0x1BF2, 0x1BEF)] [Flippable(0x1BF2, 0x1BEF)]
public class BronzeIngot : BaseIngot public partial class BronzeIngot : BaseIngot
{ {
[Constructible] [Constructible]
public BronzeIngot(int amount = 1) : base(CraftResource.Bronze, amount) public BronzeIngot(int amount = 1) : base(CraftResource.Bronze, amount)
{ {
} }
public BronzeIngot(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(0x1BF2, 0x1BEF)] [Flippable(0x1BF2, 0x1BEF)]
public class GoldIngot : BaseIngot public partial class GoldIngot : BaseIngot
{ {
[Constructible] [Constructible]
public GoldIngot(int amount = 1) : base(CraftResource.Gold, amount) public GoldIngot(int amount = 1) : base(CraftResource.Gold, amount)
{ {
} }
public GoldIngot(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(0x1BF2, 0x1BEF)] [Flippable(0x1BF2, 0x1BEF)]
public class AgapiteIngot : BaseIngot public partial class AgapiteIngot : BaseIngot
{ {
[Constructible] [Constructible]
public AgapiteIngot(int amount = 1) : base(CraftResource.Agapite, amount) public AgapiteIngot(int amount = 1) : base(CraftResource.Agapite, amount)
{ {
} }
public AgapiteIngot(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(0x1BF2, 0x1BEF)] [Flippable(0x1BF2, 0x1BEF)]
public class VeriteIngot : BaseIngot public partial class VeriteIngot : BaseIngot
{ {
[Constructible] [Constructible]
public VeriteIngot(int amount = 1) : base(CraftResource.Verite, amount) public VeriteIngot(int amount = 1) : base(CraftResource.Verite, amount)
{ {
} }
public VeriteIngot(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(0x1BF2, 0x1BEF)] [Flippable(0x1BF2, 0x1BEF)]
public class ValoriteIngot : BaseIngot public partial class ValoriteIngot : BaseIngot
{ {
[Constructible] [Constructible]
public ValoriteIngot(int amount = 1) : base(CraftResource.Valorite, amount) public ValoriteIngot(int amount = 1) : base(CraftResource.Valorite, amount)
{ {
} }
public ValoriteIngot(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();
}
} }
} }

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

@ -4,7 +4,7 @@ using Server.Targeting;
namespace Server.Items namespace Server.Items
{ {
[Serializable(1, false)] [Serializable(2, false)]
public abstract partial class BaseOre : Item public abstract partial class BaseOre : Item
{ {
public BaseOre(CraftResource resource, int amount = 1) : base(RandomSize()) public BaseOre(CraftResource resource, int amount = 1) : base(RandomSize())
@ -38,21 +38,33 @@ namespace Server.Items
private void Deserialize(IGenericReader reader, int version) private void Deserialize(IGenericReader reader, int version)
{ {
var info = reader.ReadInt() switch switch (version)
{ {
0 => OreInfo.Iron, case 1:
1 => OreInfo.DullCopper, {
2 => OreInfo.ShadowIron, _resource = (CraftResource)reader.ReadInt();
3 => OreInfo.Copper, break;
4 => OreInfo.Bronze, }
5 => OreInfo.Gold, case 0:
6 => OreInfo.Agapite, {
7 => OreInfo.Verite, var info = reader.ReadInt() switch
8 => OreInfo.Valorite, {
_ => null 0 => OreInfo.Iron,
}; 1 => OreInfo.DullCopper,
2 => OreInfo.ShadowIron,
3 => OreInfo.Copper,
4 => OreInfo.Bronze,
5 => OreInfo.Gold,
6 => OreInfo.Agapite,
7 => OreInfo.Verite,
8 => OreInfo.Valorite,
_ => null
};
Resource = CraftResources.GetFromOreInfo(info); _resource = CraftResources.GetFromOreInfo(info);
break;
}
}
} }
private static int RandomSize() => private static int RandomSize() =>

62
Projects/UOContent/Items/Resources/Fishing/BigFish.cs
View file

@ -2,35 +2,22 @@ using System;
namespace Server.Items namespace Server.Items
{ {
public class BigFish : Item, ICarvable [Serializable(1, false)]
public partial class BigFish : Item, ICarvable
{ {
private Mobile m_Fisher; [InvalidateProperties]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
[SerializableField(0)]
private Mobile _fisher;
[Constructible] [Constructible]
public BigFish() : base(0x09CC) public BigFish() : base(0x09CC)
{ {
Weight = Utility.RandomMinMax( // TODO: Find correct formula. max on OSI currently 200, OSI dev says it's not 200 as max, and ~ 1/1,000,000 chance to get highest
3, Weight = Utility.RandomMinMax(3, 200);
200
); // TODO: Find correct formula. max on OSI currently 200, OSI dev says it's not 200 as max, and ~ 1/1,000,000 chance to get highest
Hue = Utility.RandomBool() ? 0x847 : 0x58C; Hue = Utility.RandomBool() ? 0x847 : 0x58C;
} }
public BigFish(Serial serial) : base(serial)
{
}
[CommandProperty(AccessLevel.GameMaster)]
public Mobile Fisher
{
get => m_Fisher;
set
{
m_Fisher = value;
InvalidateProperties();
}
}
public override int LabelNumber => 1041112; // a big fish public override int LabelNumber => 1041112; // a big fish
public void Carve(Mobile from, Item item) public void Carve(Mobile from, Item item)
@ -44,43 +31,18 @@ namespace Server.Items
if (Weight >= 20) if (Weight >= 20)
{ {
if (m_Fisher != null) if (_fisher != null)
{ {
list.Add(1070857, m_Fisher.Name); // Caught by ~1_fisherman~ list.Add(1070857, _fisher.Name); // Caught by ~1_fisherman~
} }
list.Add(1070858, ((int)Weight).ToString()); // ~1_weight~ stones list.Add(1070858, ((int)Weight).ToString()); // ~1_weight~ stones
} }
} }
public override void Serialize(IGenericWriter writer) private void Deserialize(IGenericReader reader, int version)
{ {
base.Serialize(writer); Weight = Utility.RandomMinMax(3, 200);
writer.Write(1); // version
writer.Write(m_Fisher);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
switch (version)
{
case 1:
{
m_Fisher = reader.ReadEntity<Mobile>();
break;
}
case 0:
{
Weight = Utility.RandomMinMax(3, 200);
break;
}
}
} }
} }
} }

21
Projects/UOContent/Items/Resources/Fishing/Fish.cs
View file

@ -1,6 +1,7 @@
namespace Server.Items namespace Server.Items
{ {
public class Fish : Item, ICarvable [Serializable(0, false)]
public partial class Fish : Item, ICarvable
{ {
[Constructible] [Constructible]
public Fish(int amount = 1) : base(Utility.Random(0x09CC, 4)) public Fish(int amount = 1) : base(Utility.Random(0x09CC, 4))
@ -10,27 +11,9 @@ namespace Server.Items
Amount = amount; Amount = amount;
} }
public Fish(Serial serial) : base(serial)
{
}
public void Carve(Mobile from, Item item) public void Carve(Mobile from, Item item)
{ {
ScissorHelper(from, new RawFishSteak(), 4); ScissorHelper(from, new RawFishSteak(), 4);
} }
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();
}
} }
} }

125
Projects/UOContent/Items/Resources/Fishing/MagicFish.cs
View file

@ -4,14 +4,11 @@ using Server.Spells;
namespace Server.Items namespace Server.Items
{ {
public abstract class BaseMagicFish : Item [Serializable(0, false)]
public abstract partial class BaseMagicFish : Item
{ {
public BaseMagicFish(int hue) : base(0xDD6) => Hue = hue; public BaseMagicFish(int hue) : base(0xDD6) => Hue = hue;
public BaseMagicFish(Serial serial) : base(serial)
{
}
public virtual int Bonus => 0; public virtual int Bonus => 0;
public virtual StatType Type => StatType.Str; public virtual StatType Type => StatType.Str;
@ -43,141 +40,58 @@ namespace Server.Items
Delete(); Delete();
} }
} }
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 PrizedFish : BaseMagicFish [Serializable(0, false)]
public partial class PrizedFish : BaseMagicFish
{ {
[Constructible] [Constructible]
public PrizedFish() : base(51) public PrizedFish() : base(51)
{ {
} }
public PrizedFish(Serial serial) : base(serial)
{
}
public override int Bonus => 5; public override int Bonus => 5;
public override StatType Type => StatType.Int; public override StatType Type => StatType.Int;
public override int LabelNumber => 1041073; // prized fish public override int LabelNumber => 1041073; // prized fish
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();
if (Hue == 151)
{
Hue = 51;
}
}
} }
public class WondrousFish : BaseMagicFish [Serializable(0, false)]
public partial class WondrousFish : BaseMagicFish
{ {
[Constructible] [Constructible]
public WondrousFish() : base(86) public WondrousFish() : base(86)
{ {
} }
public WondrousFish(Serial serial) : base(serial)
{
}
public override int Bonus => 5; public override int Bonus => 5;
public override StatType Type => StatType.Dex; public override StatType Type => StatType.Dex;
public override int LabelNumber => 1041074; // wondrous fish public override int LabelNumber => 1041074; // wondrous fish
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();
if (Hue == 286)
{
Hue = 86;
}
}
} }
public class TrulyRareFish : BaseMagicFish [Serializable(0, false)]
public partial class TrulyRareFish : BaseMagicFish
{ {
[Constructible] [Constructible]
public TrulyRareFish() : base(76) public TrulyRareFish() : base(76)
{ {
} }
public TrulyRareFish(Serial serial) : base(serial)
{
}
public override int Bonus => 5; public override int Bonus => 5;
public override StatType Type => StatType.Str; public override StatType Type => StatType.Str;
public override int LabelNumber => 1041075; // truly rare fish public override int LabelNumber => 1041075; // truly rare fish
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();
if (Hue == 376)
{
Hue = 76;
}
}
} }
public class PeculiarFish : BaseMagicFish [Serializable(0, false)]
public partial class PeculiarFish : BaseMagicFish
{ {
[Constructible] [Constructible]
public PeculiarFish() : base(66) public PeculiarFish() : base(66)
{ {
} }
public PeculiarFish(Serial serial) : base(serial)
{
}
public override int LabelNumber => 1041076; // highly peculiar fish public override int LabelNumber => 1041076; // highly peculiar fish
public override bool Apply(Mobile from) public override bool Apply(Mobile from)
@ -185,24 +99,5 @@ namespace Server.Items
from.Stam += 10; from.Stam += 10;
return true; 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();
if (Hue == 266)
{
Hue = 66;
}
}
} }
} }

693
Projects/UOContent/Items/Resources/MiscMLResources.cs
View file

@ -1,885 +1,384 @@
namespace Server.Items namespace Server.Items
{ {
public class Blight : Item [Serializable(0, false)]
public partial class Blight : Item
{ {
[Constructible] [Constructible]
public Blight(int amount = 1) public Blight(int amount = 1) : base(0x3183)
: base(0x3183)
{ {
Stackable = true; Stackable = true;
Amount = amount; Amount = amount;
} }
public Blight(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 LuminescentFungi : Item [Serializable(0, false)]
public partial class LuminescentFungi : Item
{ {
[Constructible] [Constructible]
public LuminescentFungi(int amount = 1) public LuminescentFungi(int amount = 1) : base(0x3191)
: base(0x3191)
{ {
Stackable = true; Stackable = true;
Amount = amount; Amount = amount;
} }
public LuminescentFungi(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 CapturedEssence : Item [Serializable(0, false)]
public partial class CapturedEssence : Item
{ {
[Constructible] [Constructible]
public CapturedEssence(int amount = 1) public CapturedEssence(int amount = 1) : base(0x318E)
: base(0x318E)
{ {
Stackable = true; Stackable = true;
Amount = amount; Amount = amount;
} }
public CapturedEssence(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 EyeOfTheTravesty : Item [Serializable(0, false)]
public partial class EyeOfTheTravesty : Item
{ {
[Constructible] [Constructible]
public EyeOfTheTravesty(int amountFrom, int amountTo) public EyeOfTheTravesty(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo))
: this(Utility.RandomMinMax(amountFrom, amountTo))
{ {
} }
[Constructible] [Constructible]
public EyeOfTheTravesty(int amount = 1) public EyeOfTheTravesty(int amount = 1) : base(0x318D)
: base(0x318D)
{ {
Stackable = true; Stackable = true;
Amount = amount; Amount = amount;
} }
public EyeOfTheTravesty(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 Corruption : Item [Serializable(0, false)]
public partial class Corruption : Item
{ {
[Constructible] [Constructible]
public Corruption(int amountFrom, int amountTo) public Corruption(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo))
: this(Utility.RandomMinMax(amountFrom, amountTo))
{ {
} }
[Constructible] [Constructible]
public Corruption(int amount = 1) public Corruption(int amount = 1) : base(0x3184)
: base(0x3184)
{ {
Stackable = true; Stackable = true;
Amount = amount; Amount = amount;
} }
public Corruption(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 DreadHornMane : Item [Serializable(0, false)]
public partial class DreadHornMane : Item
{ {
[Constructible] [Constructible]
public DreadHornMane(int amountFrom, int amountTo) public DreadHornMane(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo))
: this(Utility.RandomMinMax(amountFrom, amountTo))
{ {
} }
[Constructible] [Constructible]
public DreadHornMane(int amount = 1) public DreadHornMane(int amount = 1) : base(0x318A)
: base(0x318A)
{ {
Stackable = true; Stackable = true;
Amount = amount; Amount = amount;
} }
public DreadHornMane(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 ParasiticPlant : Item [Serializable(0, false)]
public partial class ParasiticPlant : Item
{ {
[Constructible] [Constructible]
public ParasiticPlant(int amountFrom, int amountTo) public ParasiticPlant(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo))
: this(Utility.RandomMinMax(amountFrom, amountTo))
{ {
} }
[Constructible] [Constructible]
public ParasiticPlant(int amount = 1) public ParasiticPlant(int amount = 1) : base(0x3190)
: base(0x3190)
{ {
Stackable = true; Stackable = true;
Amount = amount; Amount = amount;
} }
public ParasiticPlant(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 Muculent : Item [Serializable(0, false)]
public partial class Muculent : Item
{ {
[Constructible] [Constructible]
public Muculent(int amountFrom, int amountTo) public Muculent(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo))
: this(Utility.RandomMinMax(amountFrom, amountTo))
{ {
} }
[Constructible] [Constructible]
public Muculent(int amount = 1) public Muculent(int amount = 1) : base(0x3188)
: base(0x3188)
{ {
Stackable = true; Stackable = true;
Amount = amount; Amount = amount;
} }
public Muculent(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 DiseasedBark : Item [Serializable(0, false)]
public partial class DiseasedBark : Item
{ {
[Constructible] [Constructible]
public DiseasedBark(int amountFrom, int amountTo) public DiseasedBark(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo))
: this(Utility.RandomMinMax(amountFrom, amountTo))
{ {
} }
[Constructible] [Constructible]
public DiseasedBark(int amount = 1) public DiseasedBark(int amount = 1) : base(0x318B)
: base(0x318B)
{ {
Stackable = true; Stackable = true;
Amount = amount; Amount = amount;
} }
public DiseasedBark(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 BarkFragment : Item [Serializable(0, false)]
public partial class BarkFragment : Item
{ {
[Constructible] [Constructible]
public BarkFragment(int amountFrom, int amountTo) public BarkFragment(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo))
: this(Utility.RandomMinMax(amountFrom, amountTo))
{ {
} }
[Constructible] [Constructible]
public BarkFragment(int amount = 1) public BarkFragment(int amount = 1) : base(0x318F)
: base(0x318F)
{ {
Stackable = true; Stackable = true;
Amount = amount; Amount = amount;
} }
public BarkFragment(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 GrizzledBones : Item [Serializable(0, false)]
public partial class GrizzledBones : Item
{ {
[Constructible] [Constructible]
public GrizzledBones(int amountFrom, int amountTo) public GrizzledBones(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo))
: this(Utility.RandomMinMax(amountFrom, amountTo))
{ {
} }
[Constructible] [Constructible]
public GrizzledBones(int amount = 1) public GrizzledBones(int amount = 1) : base(0x318C)
: base(0x318C)
{ {
Stackable = true; Stackable = true;
Amount = amount; Amount = amount;
} }
public GrizzledBones(Serial serial)
: base(serial)
{
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(1); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
if (version <= 0 && ItemID == 0x318F)
{
ItemID = 0x318C;
}
}
} }
public class LardOfParoxysmus : Item [Serializable(0, false)]
public partial class LardOfParoxysmus : Item
{ {
[Constructible] [Constructible]
public LardOfParoxysmus(int amountFrom, int amountTo) public LardOfParoxysmus(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo))
: this(Utility.RandomMinMax(amountFrom, amountTo))
{ {
} }
[Constructible] [Constructible]
public LardOfParoxysmus(int amount = 1) public LardOfParoxysmus(int amount = 1) : base(0x3189)
: base(0x3189)
{ {
Stackable = true; Stackable = true;
Amount = amount; Amount = amount;
} }
public LardOfParoxysmus(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 PerfectEmerald : Item [Serializable(0, false)]
public partial class PerfectEmerald : Item
{ {
[Constructible] [Constructible]
public PerfectEmerald(int amountFrom, int amountTo) public PerfectEmerald(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo))
: this(Utility.RandomMinMax(amountFrom, amountTo))
{ {
} }
[Constructible] [Constructible]
public PerfectEmerald(int amount = 1) public PerfectEmerald(int amount = 1) : base(0x3194)
: base(0x3194)
{ {
Stackable = true; Stackable = true;
Amount = amount; Amount = amount;
} }
public PerfectEmerald(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 DarkSapphire : Item [Serializable(0, false)]
public partial class DarkSapphire : Item
{ {
[Constructible] [Constructible]
public DarkSapphire(int amountFrom, int amountTo) public DarkSapphire(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo))
: this(Utility.RandomMinMax(amountFrom, amountTo))
{ {
} }
[Constructible] [Constructible]
public DarkSapphire(int amount = 1) public DarkSapphire(int amount = 1) : base(0x3192)
: base(0x3192)
{ {
Stackable = true; Stackable = true;
Amount = amount; Amount = amount;
} }
public DarkSapphire(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 Turquoise : Item [Serializable(0, false)]
public partial class Turquoise : Item
{ {
[Constructible] [Constructible]
public Turquoise(int amountFrom, int amountTo) public Turquoise(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo))
: this(Utility.RandomMinMax(amountFrom, amountTo))
{ {
} }
[Constructible] [Constructible]
public Turquoise(int amount = 1) public Turquoise(int amount = 1) : base(0x3193)
: base(0x3193)
{ {
Stackable = true; Stackable = true;
Amount = amount; Amount = amount;
} }
public Turquoise(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 EcruCitrine : Item [Serializable(0, false)]
public partial class EcruCitrine : Item
{ {
[Constructible] [Constructible]
public EcruCitrine(int amountFrom, int amountTo) public EcruCitrine(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo))
: this(Utility.RandomMinMax(amountFrom, amountTo))
{ {
} }
[Constructible] [Constructible]
public EcruCitrine(int amount = 1) public EcruCitrine(int amount = 1) : base(0x3195)
: base(0x3195)
{ {
Stackable = true; Stackable = true;
Amount = amount; Amount = amount;
} }
public EcruCitrine(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 WhitePearl : Item [Serializable(0, false)]
public partial class WhitePearl : Item
{ {
[Constructible] [Constructible]
public WhitePearl(int amountFrom, int amountTo) public WhitePearl(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo))
: this(Utility.RandomMinMax(amountFrom, amountTo))
{ {
} }
[Constructible] [Constructible]
public WhitePearl(int amount = 1) public WhitePearl(int amount = 1) : base(0x3196)
: base(0x3196)
{ {
Stackable = true; Stackable = true;
Amount = amount; Amount = amount;
} }
public WhitePearl(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 FireRuby : Item [Serializable(0, false)]
public partial class FireRuby : Item
{ {
[Constructible] [Constructible]
public FireRuby(int amountFrom, int amountTo) public FireRuby(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo))
: this(Utility.RandomMinMax(amountFrom, amountTo))
{ {
} }
[Constructible] [Constructible]
public FireRuby(int amount = 1) public FireRuby(int amount = 1) : base(0x3197)
: base(0x3197)
{ {
Stackable = true; Stackable = true;
Amount = amount; Amount = amount;
} }
public FireRuby(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 BlueDiamond : Item [Serializable(0, false)]
public partial class BlueDiamond : Item
{ {
[Constructible] [Constructible]
public BlueDiamond(int amountFrom, int amountTo) public BlueDiamond(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo))
: this(Utility.RandomMinMax(amountFrom, amountTo))
{ {
} }
[Constructible] [Constructible]
public BlueDiamond(int amount = 1) public BlueDiamond(int amount = 1) : base(0x3198)
: base(0x3198)
{ {
Stackable = true; Stackable = true;
Amount = amount; Amount = amount;
} }
public BlueDiamond(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 BrilliantAmber : Item [Serializable(0, false)]
public partial class BrilliantAmber : Item
{ {
[Constructible] [Constructible]
public BrilliantAmber(int amountFrom, int amountTo) public BrilliantAmber(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo))
: this(Utility.RandomMinMax(amountFrom, amountTo))
{ {
} }
[Constructible] [Constructible]
public BrilliantAmber(int amount = 1) public BrilliantAmber(int amount = 1) : base(0x3199)
: base(0x3199)
{ {
Stackable = true; Stackable = true;
Amount = amount; Amount = amount;
} }
public BrilliantAmber(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 Scourge : Item [Serializable(0, false)]
public partial class Scourge : Item
{ {
[Constructible] [Constructible]
public Scourge(int amountFrom, int amountTo) public Scourge(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo))
: this(Utility.RandomMinMax(amountFrom, amountTo))
{ {
} }
[Constructible] [Constructible]
public Scourge(int amount = 1) public Scourge(int amount = 1) : base(0x3185)
: base(0x3185)
{ {
Stackable = true; Stackable = true;
Amount = amount; Amount = amount;
Hue = 150; Hue = 150;
} }
public Scourge(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 Putrefication : Item [Serializable(0, false)]
public partial class Putrefication : Item
{ {
[Constructible] [Constructible]
public Putrefication(int amountFrom, int amountTo) public Putrefication(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo))
: this(Utility.RandomMinMax(amountFrom, amountTo))
{ {
} }
[Constructible] [Constructible]
public Putrefication(int amount = 1) public Putrefication(int amount = 1) : base(0x3186)
: base(0x3186)
{ {
Stackable = true; Stackable = true;
Amount = amount; Amount = amount;
Hue = 883; Hue = 883;
} }
public Putrefication(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 Taint : Item [Serializable(0, false)]
public partial class Taint : Item
{ {
[Constructible] [Constructible]
public Taint(int amountFrom, int amountTo) public Taint(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo))
: this(Utility.RandomMinMax(amountFrom, amountTo))
{ {
} }
[Constructible] [Constructible]
public Taint(int amount = 1) public Taint(int amount = 1) : base(0x3187)
: base(0x3187)
{ {
Stackable = true; Stackable = true;
Amount = amount; Amount = amount;
Hue = 731; Hue = 731;
} }
public Taint(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(0x315A, 0x315B)] [Flippable(0x315A, 0x315B)]
public class PristineDreadHorn : Item public partial class PristineDreadHorn : Item
{ {
[Constructible] [Constructible]
public PristineDreadHorn() public PristineDreadHorn() : base(0x315A)
: base(0x315A)
{ {
} }
public PristineDreadHorn(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 SwitchItem : Item [Serializable(0, false)]
public partial class SwitchItem : Item
{ {
[Constructible] [Constructible]
public SwitchItem(int amountFrom, int amountTo) public SwitchItem(int amountFrom, int amountTo) : this(Utility.RandomMinMax(amountFrom, amountTo))
: this(Utility.RandomMinMax(amountFrom, amountTo))
{ {
} }
[Constructible] [Constructible]
public SwitchItem(int amount = 1) public SwitchItem(int amount = 1) : base(0x2F5F)
: base(0x2F5F)
{ {
Stackable = true; Stackable = true;
Amount = amount; Amount = amount;
} }
public SwitchItem(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();
}
} }
} }

21
Projects/UOContent/Items/Resources/Reagents/BaseReagent.cs
View file

@ -1,6 +1,7 @@
namespace Server.Items namespace Server.Items
{ {
public abstract class BaseReagent : Item [Serializable(0, false)]
public abstract partial class BaseReagent : Item
{ {
public BaseReagent(int itemID, int amount = 1) : base(itemID) public BaseReagent(int itemID, int amount = 1) : base(itemID)
{ {
@ -8,24 +9,6 @@ namespace Server.Items
Amount = amount; Amount = amount;
} }
public BaseReagent(Serial serial) : base(serial)
{
}
public override double DefaultWeight => 0.1; public override double DefaultWeight => 0.1;
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();
}
} }
} }

21
Projects/UOContent/Items/Resources/Reagents/BatWing.cs
View file

@ -1,31 +1,14 @@
namespace Server.Items namespace Server.Items
{ {
public class BatWing : BaseReagent, ICommodity [Serializable(0, false)]
public partial class BatWing : BaseReagent, ICommodity
{ {
[Constructible] [Constructible]
public BatWing(int amount = 1) : base(0xF78, amount) public BatWing(int amount = 1) : base(0xF78, amount)
{ {
} }
public BatWing(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber; int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true; 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();
}
} }
} }

21
Projects/UOContent/Items/Resources/Reagents/BlackPearl.cs
View file

@ -1,31 +1,14 @@
namespace Server.Items namespace Server.Items
{ {
public class BlackPearl : BaseReagent, ICommodity [Serializable(0, false)]
public partial class BlackPearl : BaseReagent, ICommodity
{ {
[Constructible] [Constructible]
public BlackPearl(int amount = 1) : base(0xF7A, amount) public BlackPearl(int amount = 1) : base(0xF7A, amount)
{ {
} }
public BlackPearl(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber; int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true; 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();
}
} }
} }

21
Projects/UOContent/Items/Resources/Reagents/Bloodmoss.cs
View file

@ -1,31 +1,14 @@
namespace Server.Items namespace Server.Items
{ {
public class Bloodmoss : BaseReagent, ICommodity [Serializable(0, false)]
public partial class Bloodmoss : BaseReagent, ICommodity
{ {
[Constructible] [Constructible]
public Bloodmoss(int amount = 1) : base(0xF7B, amount) public Bloodmoss(int amount = 1) : base(0xF7B, amount)
{ {
} }
public Bloodmoss(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber; int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true; 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();
}
} }
} }

21
Projects/UOContent/Items/Resources/Reagents/DaemonBlood.cs
View file

@ -1,31 +1,14 @@
namespace Server.Items namespace Server.Items
{ {
public class DaemonBlood : BaseReagent, ICommodity [Serializable(0, false)]
public partial class DaemonBlood : BaseReagent, ICommodity
{ {
[Constructible] [Constructible]
public DaemonBlood(int amount = 1) : base(0xF7D, amount) public DaemonBlood(int amount = 1) : base(0xF7D, amount)
{ {
} }
public DaemonBlood(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber; int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true; 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();
}
} }
} }

23
Projects/UOContent/Items/Resources/Reagents/DaemonBone.cs
View file

@ -1,31 +1,16 @@
namespace Server.Items namespace Server.Items
{ {
// TODO: Commodity? [Serializable(0, false)]
public class DaemonBone : BaseReagent public partial class DaemonBone : BaseReagent, ICommodity
{ {
[Constructible] [Constructible]
public DaemonBone(int amount = 1) : base(0xF80, amount) public DaemonBone(int amount = 1) : base(0xF80, amount)
{ {
} }
public DaemonBone(Serial serial) : base(serial)
{
}
public override double DefaultWeight => 1.0; public override double DefaultWeight => 1.0;
public override void Serialize(IGenericWriter writer) int ICommodity.DescriptionNumber => LabelNumber;
{ bool ICommodity.IsDeedable => Core.ML;
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
} }
} }

21
Projects/UOContent/Items/Resources/Reagents/DeadWood.cs
View file

@ -1,31 +1,14 @@
namespace Server.Items namespace Server.Items
{ {
public class DeadWood : BaseReagent, ICommodity [Serializable(0, false)]
public partial class DeadWood : BaseReagent, ICommodity
{ {
[Constructible] [Constructible]
public DeadWood(int amount = 1) : base(0xF90, amount) public DeadWood(int amount = 1) : base(0xF90, amount)
{ {
} }
public DeadWood(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber; int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true; 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();
}
} }
} }

25
Projects/UOContent/Items/Resources/Reagents/DragonsBlood.cs
View file

@ -1,33 +1,14 @@
namespace Server.Items namespace Server.Items
{ {
public class DragonsBlood : BaseReagent, ICommodity [Serializable(0, false)]
public partial class DragonsBlood : BaseReagent, ICommodity
{ {
[Constructible] [Constructible]
public DragonsBlood(int amount = 1) public DragonsBlood(int amount = 1) : base(0x4077, amount)
: base(0x4077, amount)
{
}
public DragonsBlood(Serial serial)
: base(serial)
{ {
} }
int ICommodity.DescriptionNumber => LabelNumber; int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => Core.ML; bool ICommodity.IsDeedable => Core.ML;
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();
}
} }
} }

21
Projects/UOContent/Items/Resources/Reagents/Garlic.cs
View file

@ -1,31 +1,14 @@
namespace Server.Items namespace Server.Items
{ {
public class Garlic : BaseReagent, ICommodity [Serializable(0, false)]
public partial class Garlic : BaseReagent, ICommodity
{ {
[Constructible] [Constructible]
public Garlic(int amount = 1) : base(0xF84, amount) public Garlic(int amount = 1) : base(0xF84, amount)
{ {
} }
public Garlic(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber; int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true; 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();
}
} }
} }

21
Projects/UOContent/Items/Resources/Reagents/Ginseng.cs
View file

@ -1,31 +1,14 @@
namespace Server.Items namespace Server.Items
{ {
public class Ginseng : BaseReagent, ICommodity [Serializable(0, false)]
public partial class Ginseng : BaseReagent, ICommodity
{ {
[Constructible] [Constructible]
public Ginseng(int amount = 1) : base(0xF85, amount) public Ginseng(int amount = 1) : base(0xF85, amount)
{ {
} }
public Ginseng(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber; int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true; 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();
}
} }
} }

21
Projects/UOContent/Items/Resources/Reagents/GraveDust.cs
View file

@ -1,31 +1,14 @@
namespace Server.Items namespace Server.Items
{ {
public class GraveDust : BaseReagent, ICommodity [Serializable(0, false)]
public partial class GraveDust : BaseReagent, ICommodity
{ {
[Constructible] [Constructible]
public GraveDust(int amount = 1) : base(0xF8F, amount) public GraveDust(int amount = 1) : base(0xF8F, amount)
{ {
} }
public GraveDust(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber; int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true; 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();
}
} }
} }

21
Projects/UOContent/Items/Resources/Reagents/MandrakeRoot.cs
View file

@ -1,31 +1,14 @@
namespace Server.Items namespace Server.Items
{ {
public class MandrakeRoot : BaseReagent, ICommodity [Serializable(0, false)]
public partial class MandrakeRoot : BaseReagent, ICommodity
{ {
[Constructible] [Constructible]
public MandrakeRoot(int amount = 1) : base(0xF86, amount) public MandrakeRoot(int amount = 1) : base(0xF86, amount)
{ {
} }
public MandrakeRoot(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber; int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true; 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();
}
} }
} }

21
Projects/UOContent/Items/Resources/Reagents/Nightshade.cs
View file

@ -1,31 +1,14 @@
namespace Server.Items namespace Server.Items
{ {
public class Nightshade : BaseReagent, ICommodity [Serializable(0, false)]
public partial class Nightshade : BaseReagent, ICommodity
{ {
[Constructible] [Constructible]
public Nightshade(int amount = 1) : base(0xF88, amount) public Nightshade(int amount = 1) : base(0xF88, amount)
{ {
} }
public Nightshade(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber; int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true; 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();
}
} }
} }

21
Projects/UOContent/Items/Resources/Reagents/NoxCrystal.cs
View file

@ -1,31 +1,14 @@
namespace Server.Items namespace Server.Items
{ {
public class NoxCrystal : BaseReagent, ICommodity [Serializable(0, false)]
public partial class NoxCrystal : BaseReagent, ICommodity
{ {
[Constructible] [Constructible]
public NoxCrystal(int amount = 1) : base(0xF8E, amount) public NoxCrystal(int amount = 1) : base(0xF8E, amount)
{ {
} }
public NoxCrystal(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber; int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true; 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();
}
} }
} }

21
Projects/UOContent/Items/Resources/Reagents/PigIron.cs
View file

@ -1,31 +1,14 @@
namespace Server.Items namespace Server.Items
{ {
public class PigIron : BaseReagent, ICommodity [Serializable(0, false)]
public partial class PigIron : BaseReagent, ICommodity
{ {
[Constructible] [Constructible]
public PigIron(int amount = 1) : base(0xF8A, amount) public PigIron(int amount = 1) : base(0xF8A, amount)
{ {
} }
public PigIron(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber; int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true; 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();
}
} }
} }

21
Projects/UOContent/Items/Resources/Reagents/SpidersSilk.cs
View file

@ -1,31 +1,14 @@
namespace Server.Items namespace Server.Items
{ {
public class SpidersSilk : BaseReagent, ICommodity [Serializable(0, false)]
public partial class SpidersSilk : BaseReagent, ICommodity
{ {
[Constructible] [Constructible]
public SpidersSilk(int amount = 1) : base(0xF8D, amount) public SpidersSilk(int amount = 1) : base(0xF8D, amount)
{ {
} }
public SpidersSilk(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber; int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true; 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();
}
} }
} }

21
Projects/UOContent/Items/Resources/Reagents/SulfurousAsh.cs
View file

@ -1,31 +1,14 @@
namespace Server.Items namespace Server.Items
{ {
public class SulfurousAsh : BaseReagent, ICommodity [Serializable(0, false)]
public partial class SulfurousAsh : BaseReagent, ICommodity
{ {
[Constructible] [Constructible]
public SulfurousAsh(int amount = 1) : base(0xF8C, amount) public SulfurousAsh(int amount = 1) : base(0xF8C, amount)
{ {
} }
public SulfurousAsh(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber; int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true; 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();
}
} }
} }

21
Projects/UOContent/Items/Resources/Tailor/BoltOfCloth.cs
View file

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

21
Projects/UOContent/Items/Resources/Tailor/Bone.cs
View file

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

21
Projects/UOContent/Items/Resources/Tailor/Cloth.cs
View file

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

50
Projects/UOContent/Items/Resources/Tailor/Cotton.cs
View file

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

50
Projects/UOContent/Items/Resources/Tailor/Flax.cs
View file

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

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

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

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

@ -1,8 +1,12 @@
namespace Server.Items 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) public BaseLeather(CraftResource resource, int amount = 1) : base(0x1081)
{ {
@ -11,31 +15,16 @@ namespace Server.Items
Amount = amount; Amount = amount;
Hue = CraftResources.GetHue(resource); Hue = CraftResources.GetHue(resource);
m_Resource = resource; _resource = resource;
}
public BaseLeather(Serial serial) : base(serial)
{
}
[CommandProperty(AccessLevel.GameMaster)]
public CraftResource Resource
{
get => m_Resource;
set
{
m_Resource = value;
InvalidateProperties();
}
} }
public override int LabelNumber public override int LabelNumber
{ {
get 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; return 1047022;
@ -45,33 +34,20 @@ namespace Server.Items
int ICommodity.DescriptionNumber => LabelNumber; int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true; 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) switch (version)
{ {
case 1: case 1:
{ {
m_Resource = (CraftResource)reader.ReadInt(); _resource = (CraftResource)reader.ReadInt();
break; break;
} }
case 0: case 0:
{ {
var info = new OreInfo(reader.ReadInt(), reader.ReadInt(), reader.ReadString()); var info = new OreInfo(reader.ReadInt(), reader.ReadInt(), reader.ReadString());
m_Resource = CraftResources.GetFromOreInfo(info); _resource = CraftResources.GetFromOreInfo(info);
break; break;
} }
} }
@ -93,9 +69,9 @@ namespace Server.Items
{ {
base.GetProperties(list); 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) if (num > 0)
{ {
@ -103,117 +79,49 @@ namespace Server.Items
} }
else else
{ {
list.Add(CraftResources.GetName(m_Resource)); list.Add(CraftResources.GetName(_resource));
} }
} }
} }
} }
[Serializable(0, false)]
[Flippable(0x1081, 0x1082)] [Flippable(0x1081, 0x1082)]
public class Leather : BaseLeather public partial class Leather : BaseLeather
{ {
[Constructible] [Constructible]
public Leather(int amount = 1) : base(CraftResource.RegularLeather, amount) 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)] [Flippable(0x1081, 0x1082)]
public class SpinedLeather : BaseLeather public partial class SpinedLeather : BaseLeather
{ {
[Constructible] [Constructible]
public SpinedLeather(int amount = 1) : base(CraftResource.SpinedLeather, amount) 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)] [Flippable(0x1081, 0x1082)]
public class HornedLeather : BaseLeather public partial class HornedLeather : BaseLeather
{ {
[Constructible] [Constructible]
public HornedLeather(int amount = 1) : base(CraftResource.HornedLeather, amount) 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)] [Flippable(0x1081, 0x1082)]
public class BarbedLeather : BaseLeather public partial class BarbedLeather : BaseLeather
{ {
[Constructible] [Constructible]
public BarbedLeather(int amount = 1) : base(CraftResource.BarbedLeather, amount) 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();
}
} }
} }

21
Projects/UOContent/Items/Resources/Tailor/UncutCloth.cs
View file

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

42
Projects/UOContent/Items/Resources/Tailor/Wool.cs
View file

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

105
Projects/UOContent/Items/Resources/Tailor/YarnsAndThreads.cs
View file

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

291
Projects/UOContent/Items/Skill Items/Lumberjack/Log.cs
View file

@ -1,9 +1,13 @@
namespace Server.Items namespace Server.Items
{ {
[Serializable(2, false)]
[Flippable(0x1bdd, 0x1be0)] [Flippable(0x1bdd, 0x1be0)]
public class Log : Item, ICommodity, IAxe public partial class Log : Item, ICommodity, IAxe
{ {
private CraftResource m_Resource; [InvalidateProperties]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
[SerializableField(0)]
private CraftResource _resource;
[Constructible] [Constructible]
public Log(int amount = 1) : this(CraftResource.RegularWood, amount) public Log(int amount = 1) : this(CraftResource.RegularWood, amount)
@ -11,51 +15,26 @@ namespace Server.Items
} }
[Constructible] [Constructible]
public Log(CraftResource resource) public Log(CraftResource resource) : this(resource, 1)
: this(resource, 1)
{ {
} }
[Constructible] [Constructible]
public Log(CraftResource resource, int amount) public Log(CraftResource resource, int amount) : base(0x1BDD)
: base(0x1BDD)
{ {
Stackable = true; Stackable = true;
Weight = 2.0; Weight = 2.0;
Amount = amount; Amount = amount;
m_Resource = resource; _resource = resource;
Hue = CraftResources.GetHue(resource); Hue = CraftResources.GetHue(resource);
} }
public Log(Serial serial) : base(serial) public virtual bool Axe(Mobile from, BaseAxe axe) => TryCreateBoards(from, 0, new Board());
{
}
[CommandProperty(AccessLevel.GameMaster)] int ICommodity.DescriptionNumber => CraftResources.IsStandard(_resource)
public CraftResource Resource
{
get => m_Resource;
set
{
m_Resource = value;
InvalidateProperties();
}
}
public virtual bool Axe(Mobile from, BaseAxe axe)
{
if (!TryCreateBoards(from, 0, new Board()))
{
return false;
}
return true;
}
int ICommodity.DescriptionNumber => CraftResources.IsStandard(m_Resource)
? LabelNumber ? LabelNumber
: 1075062 + ((int)m_Resource - (int)CraftResource.RegularWood); : 1075062 + ((int)_resource - (int)CraftResource.RegularWood);
bool ICommodity.IsDeedable => true; bool ICommodity.IsDeedable => true;
@ -63,9 +42,9 @@ namespace Server.Items
{ {
base.GetProperties(list); 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) if (num > 0)
{ {
@ -73,39 +52,18 @@ namespace Server.Items
} }
else else
{ {
list.Add(CraftResources.GetName(m_Resource)); list.Add(CraftResources.GetName(_resource));
} }
} }
} }
public override void Serialize(IGenericWriter writer) private void Deserialize(IGenericReader reader, int version)
{ {
base.Serialize(writer); _resource = version switch
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: 1 => (CraftResource)reader.ReadInt(),
{ _ => CraftResource.RegularWood
m_Resource = (CraftResource)reader.ReadInt(); };
break;
}
}
if (version == 0)
{
m_Resource = CraftResource.RegularWood;
}
} }
public virtual bool TryCreateBoards(Mobile from, double skill, Item item) public virtual bool TryCreateBoards(Mobile from, double skill, Item item)
@ -128,230 +86,69 @@ namespace Server.Items
} }
} }
public class HeartwoodLog : Log [Serializable(0, false)]
public partial class HeartwoodLog : Log
{ {
[Constructible] [Constructible]
public HeartwoodLog(int amount = 1) public HeartwoodLog(int amount = 1) : base(CraftResource.Heartwood, amount)
: base(CraftResource.Heartwood, amount)
{ {
} }
public HeartwoodLog(Serial serial) : base(serial) public override bool Axe(Mobile from, BaseAxe axe) => TryCreateBoards(from, 100, new HeartwoodBoard());
{
}
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 bool Axe(Mobile from, BaseAxe axe)
{
if (!TryCreateBoards(from, 100, new HeartwoodBoard()))
{
return false;
}
return true;
}
} }
public class BloodwoodLog : Log [Serializable(0, false)]
public partial class BloodwoodLog : Log
{ {
[Constructible] [Constructible]
public BloodwoodLog(int amount = 1) public BloodwoodLog(int amount = 1) : base(CraftResource.Bloodwood, amount)
: base(CraftResource.Bloodwood, amount)
{ {
} }
public BloodwoodLog(Serial serial) public override bool Axe(Mobile from, BaseAxe axe) => TryCreateBoards(from, 100, new BloodwoodBoard());
: 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 bool Axe(Mobile from, BaseAxe axe)
{
if (!TryCreateBoards(from, 100, new BloodwoodBoard()))
{
return false;
}
return true;
}
} }
public class FrostwoodLog : Log [Serializable(0, false)]
public partial class FrostwoodLog : Log
{ {
[Constructible] [Constructible]
public FrostwoodLog(int amount = 1) public FrostwoodLog(int amount = 1) : base(CraftResource.Frostwood, amount)
: base(CraftResource.Frostwood, amount)
{ {
} }
public FrostwoodLog(Serial serial) public override bool Axe(Mobile from, BaseAxe axe) => TryCreateBoards(from, 100, new FrostwoodBoard());
: 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 bool Axe(Mobile from, BaseAxe axe)
{
if (!TryCreateBoards(from, 100, new FrostwoodBoard()))
{
return false;
}
return true;
}
} }
public class OakLog : Log [Serializable(0, false)]
public partial class OakLog : Log
{ {
[Constructible] [Constructible]
public OakLog(int amount = 1) public OakLog(int amount = 1) : base(CraftResource.OakWood, amount)
: base(CraftResource.OakWood, amount)
{ {
} }
public OakLog(Serial serial) public override bool Axe(Mobile from, BaseAxe axe) => TryCreateBoards(from, 65, new OakBoard());
: 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 bool Axe(Mobile from, BaseAxe axe)
{
if (!TryCreateBoards(from, 65, new OakBoard()))
{
return false;
}
return true;
}
} }
public class AshLog : Log [Serializable(0, false)]
public partial class AshLog : Log
{ {
[Constructible] [Constructible]
public AshLog(int amount = 1) public AshLog(int amount = 1) : base(CraftResource.AshWood, amount)
: base(CraftResource.AshWood, amount)
{ {
} }
public AshLog(Serial serial) public override bool Axe(Mobile from, BaseAxe axe) => TryCreateBoards(from, 80, new AshBoard());
: 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 bool Axe(Mobile from, BaseAxe axe)
{
if (!TryCreateBoards(from, 80, new AshBoard()))
{
return false;
}
return true;
}
} }
public class YewLog : Log [Serializable(0, false)]
public partial class YewLog : Log
{ {
[Constructible] [Constructible]
public YewLog(int amount = 1) public YewLog(int amount = 1) : base(CraftResource.YewWood, amount)
: base(CraftResource.YewWood, amount)
{ {
} }
public YewLog(Serial serial) public override bool Axe(Mobile from, BaseAxe axe) => TryCreateBoards(from, 95, new YewBoard());
: 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 bool Axe(Mobile from, BaseAxe axe)
{
if (!TryCreateBoards(from, 95, new YewBoard()))
{
return false;
}
return true;
}
} }
} }

21
Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/BlackDyeTub.cs
View file

@ -1,6 +1,7 @@
namespace Server.Items namespace Server.Items
{ {
public class BlackDyeTub : DyeTub [Serializable(0, false)]
public partial class BlackDyeTub : DyeTub
{ {
[Constructible] [Constructible]
public BlackDyeTub() public BlackDyeTub()
@ -8,23 +9,5 @@ namespace Server.Items
Hue = DyedHue = 0x0001; Hue = DyedHue = 0x0001;
Redyable = false; Redyable = false;
} }
public BlackDyeTub(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();
}
} }
} }

21
Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/BlazeDyeTub.cs
View file

@ -1,6 +1,7 @@
namespace Server.Items namespace Server.Items
{ {
public class BlazeDyeTub : DyeTub [Serializable(0, false)]
public partial class BlazeDyeTub : DyeTub
{ {
[Constructible] [Constructible]
public BlazeDyeTub() public BlazeDyeTub()
@ -8,23 +9,5 @@ namespace Server.Items
Hue = DyedHue = 0x489; Hue = DyedHue = 0x489;
Redyable = false; Redyable = false;
} }
public BlazeDyeTub(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();
}
} }
} }

58
Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/DyeTub.cs
View file

@ -11,20 +11,24 @@ namespace Server.Items
bool Dye(Mobile from, DyeTub sender); bool Dye(Mobile from, DyeTub sender);
} }
public class DyeTub : Item, ISecurable [Serializable(2, false)]
public partial class DyeTub : Item, ISecurable
{ {
private int m_DyedHue; [SerializableField(0)]
private bool m_Redyable; [SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
private SecureLevel _level;
[SerializableField(1, isVirtual: true)]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
private bool _redyable;
private int _dyedHue;
[Constructible] [Constructible]
public DyeTub() : base(0xFAB) public DyeTub() : base(0xFAB)
{ {
Weight = 10.0; Weight = 10.0;
m_Redyable = true; _redyable = true;
}
public DyeTub(Serial serial) : base(serial)
{
} }
public virtual CustomHuePicker CustomHuePicker => null; public virtual CustomHuePicker CustomHuePicker => null;
@ -39,22 +43,16 @@ namespace Server.Items
public virtual bool AllowDyables => true; public virtual bool AllowDyables => true;
[CommandProperty(AccessLevel.GameMaster)] [SerializableField(2)]
public virtual bool Redyable
{
get => m_Redyable;
set => m_Redyable = value;
}
[CommandProperty(AccessLevel.GameMaster)] [CommandProperty(AccessLevel.GameMaster)]
public int DyedHue public int DyedHue
{ {
get => m_DyedHue; get => _dyedHue;
set set
{ {
if (m_Redyable) if (_redyable)
{ {
m_DyedHue = value; _dyedHue = value;
Hue = value; Hue = value;
} }
} }
@ -69,26 +67,8 @@ namespace Server.Items
// You can not dye that. // You can not dye that.
public virtual int FailMessage => 1042083; public virtual int FailMessage => 1042083;
[CommandProperty(AccessLevel.GameMaster)] private void Deserialize(IGenericReader reader, int version)
public SecureLevel Level { get; set; }
public override void Serialize(IGenericWriter writer)
{ {
base.Serialize(writer);
writer.Write(1); // version
writer.Write((int)Level);
writer.Write(m_Redyable);
writer.Write(m_DyedHue);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
switch (version) switch (version)
{ {
case 1: case 1:
@ -98,8 +78,8 @@ namespace Server.Items
} }
case 0: case 0:
{ {
m_Redyable = reader.ReadBool(); _redyable = reader.ReadBool();
m_DyedHue = reader.ReadInt(); _dyedHue = reader.ReadInt();
break; break;
} }

42
Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/FurnitureDyeTub.cs
View file

@ -2,27 +2,25 @@ using Server.Engines.VeteranRewards;
namespace Server.Items namespace Server.Items
{ {
public class FurnitureDyeTub : DyeTub, IRewardItem [Serializable(1, false)]
public partial class FurnitureDyeTub : DyeTub, IRewardItem
{ {
[SerializableField(0)]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
private bool _isRewardItem;
[Constructible] [Constructible]
public FurnitureDyeTub() => LootType = LootType.Blessed; public FurnitureDyeTub() => LootType = LootType.Blessed;
public FurnitureDyeTub(Serial serial) : base(serial)
{
}
public override bool AllowDyables => false; public override bool AllowDyables => false;
public override bool AllowFurniture => true; public override bool AllowFurniture => true;
public override int TargetMessage => 501019; // Select the furniture to dye. public override int TargetMessage => 501019; // Select the furniture to dye.
public override int FailMessage => 501021; // That is not a piece of furniture. public override int FailMessage => 501021; // That is not a piece of furniture.
public override int LabelNumber => 1041246; // Furniture Dye Tub public override int LabelNumber => 1041246; // Furniture Dye Tub
[CommandProperty(AccessLevel.GameMaster)]
public bool IsRewardItem { get; set; }
public override void OnDoubleClick(Mobile from) public override void OnDoubleClick(Mobile from)
{ {
if (IsRewardItem && !RewardSystem.CheckIsUsableBy(from, this)) if (_isRewardItem && !RewardSystem.CheckIsUsableBy(from, this))
{ {
return; return;
} }
@ -34,36 +32,14 @@ namespace Server.Items
{ {
base.GetProperties(list); base.GetProperties(list);
if (Core.ML && IsRewardItem) if (Core.ML && _isRewardItem)
{ {
list.Add(1076217); // 1st Year Veteran Reward list.Add(1076217); // 1st Year Veteran Reward
} }
} }
public override void Serialize(IGenericWriter writer) private void Deserialize(IGenericReader reader, int version)
{ {
base.Serialize(writer);
writer.Write(1); // version
writer.Write(IsRewardItem);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
switch (version)
{
case 1:
{
IsRewardItem = reader.ReadBool();
break;
}
}
if (LootType == LootType.Regular) if (LootType == LootType.Regular)
{ {
LootType = LootType.Blessed; LootType = LootType.Blessed;

41
Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/LeatherDyeTub.cs
View file

@ -2,15 +2,16 @@ using Server.Engines.VeteranRewards;
namespace Server.Items namespace Server.Items
{ {
public class LeatherDyeTub : DyeTub, IRewardItem [Serializable(1, false)]
public partial class LeatherDyeTub : DyeTub, IRewardItem
{ {
[SerializableField(0)]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
private bool _isRewardItem;
[Constructible] [Constructible]
public LeatherDyeTub() => LootType = LootType.Blessed; public LeatherDyeTub() => LootType = LootType.Blessed;
public LeatherDyeTub(Serial serial) : base(serial)
{
}
public override bool AllowDyables => false; public override bool AllowDyables => false;
public override bool AllowLeather => true; public override bool AllowLeather => true;
public override int TargetMessage => 1042416; // Select the leather item to dye. public override int TargetMessage => 1042416; // Select the leather item to dye.
@ -18,12 +19,9 @@ namespace Server.Items
public override int LabelNumber => 1041284; // Leather Dye Tub public override int LabelNumber => 1041284; // Leather Dye Tub
public override CustomHuePicker CustomHuePicker => CustomHuePicker.LeatherDyeTub; public override CustomHuePicker CustomHuePicker => CustomHuePicker.LeatherDyeTub;
[CommandProperty(AccessLevel.GameMaster)]
public bool IsRewardItem { get; set; }
public override void OnDoubleClick(Mobile from) public override void OnDoubleClick(Mobile from)
{ {
if (IsRewardItem && !RewardSystem.CheckIsUsableBy(from, this)) if (_isRewardItem && !RewardSystem.CheckIsUsableBy(from, this))
{ {
return; return;
} }
@ -35,34 +33,17 @@ namespace Server.Items
{ {
base.GetProperties(list); base.GetProperties(list);
if (Core.ML && IsRewardItem) if (Core.ML && _isRewardItem)
{ {
list.Add(1076218); // 2nd Year Veteran Reward list.Add(1076218); // 2nd Year Veteran Reward
} }
} }
public override void Serialize(IGenericWriter writer) private void Deserialize(IGenericReader reader, int version)
{ {
base.Serialize(writer); if (LootType == LootType.Regular)
writer.Write(1); // version
writer.Write(IsRewardItem);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
switch (version)
{ {
case 1: LootType = LootType.Blessed;
{
IsRewardItem = reader.ReadBool();
break;
}
} }
} }
} }

22
Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/MetallicClothDyetub.cs
View file

@ -1,31 +1,13 @@
namespace Server.Items namespace Server.Items
{ {
public class MetallicClothDyetub : DyeTub [Serializable(0, false)]
public partial class MetallicClothDyetub : DyeTub
{ {
[Constructible] [Constructible]
public MetallicClothDyetub() => LootType = LootType.Blessed; public MetallicClothDyetub() => LootType = LootType.Blessed;
public MetallicClothDyetub(Serial serial)
: base(serial)
{
}
public override int LabelNumber => 1152920; // Metallic Cloth ... public override int LabelNumber => 1152920; // Metallic Cloth ...
public override bool MetallicHues => true; public override bool MetallicHues => 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();
}
} }
} }

22
Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/MetallicLeatherDyeTub.cs
View file

@ -1,15 +1,11 @@
namespace Server.Items namespace Server.Items
{ {
public class MetallicLeatherDyeTub : LeatherDyeTub [Serializable(0, false)]
public partial class MetallicLeatherDyeTub : LeatherDyeTub
{ {
[Constructible] [Constructible]
public MetallicLeatherDyeTub() => LootType = LootType.Blessed; public MetallicLeatherDyeTub() => LootType = LootType.Blessed;
public MetallicLeatherDyeTub(Serial serial)
: base(serial)
{
}
public override CustomHuePicker CustomHuePicker => null; public override CustomHuePicker CustomHuePicker => null;
public override int LabelNumber => 1153495; // Metallic Leather ... public override int LabelNumber => 1153495; // Metallic Leather ...
@ -25,19 +21,5 @@ namespace Server.Items
list.Add(1076221); // 5th Year Veteran Reward list.Add(1076221); // 5th Year Veteran Reward
} }
} }
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();
}
} }
} }

41
Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/RewardBlackDyeTub.cs
View file

@ -2,8 +2,13 @@ using Server.Engines.VeteranRewards;
namespace Server.Items namespace Server.Items
{ {
public class RewardBlackDyeTub : DyeTub, IRewardItem [Serializable(1, false)]
public partial class RewardBlackDyeTub : DyeTub, IRewardItem
{ {
[SerializableField(0)]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
private bool _isRewardItem;
[Constructible] [Constructible]
public RewardBlackDyeTub() public RewardBlackDyeTub()
{ {
@ -12,18 +17,11 @@ namespace Server.Items
LootType = LootType.Blessed; LootType = LootType.Blessed;
} }
public RewardBlackDyeTub(Serial serial) : base(serial)
{
}
public override int LabelNumber => 1006008; // Black Dye Tub public override int LabelNumber => 1006008; // Black Dye Tub
[CommandProperty(AccessLevel.GameMaster)]
public bool IsRewardItem { get; set; }
public override void OnDoubleClick(Mobile from) public override void OnDoubleClick(Mobile from)
{ {
if (IsRewardItem && !RewardSystem.CheckIsUsableBy(from, this)) if (_isRewardItem && !RewardSystem.CheckIsUsableBy(from, this))
{ {
return; return;
} }
@ -35,34 +33,17 @@ namespace Server.Items
{ {
base.GetProperties(list); base.GetProperties(list);
if (Core.ML && IsRewardItem) if (Core.ML && _isRewardItem)
{ {
list.Add(1076217); // 1st Year Veteran Reward list.Add(1076217); // 1st Year Veteran Reward
} }
} }
public override void Serialize(IGenericWriter writer) private void Deserialize(IGenericReader reader, int version)
{ {
base.Serialize(writer); if (LootType == LootType.Regular)
writer.Write(1); // version
writer.Write(IsRewardItem);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
switch (version)
{ {
case 1: LootType = LootType.Blessed;
{
IsRewardItem = reader.ReadBool();
break;
}
} }
} }
} }

41
Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/RunebookDyeTub.cs
View file

@ -2,15 +2,16 @@ using Server.Engines.VeteranRewards;
namespace Server.Items namespace Server.Items
{ {
public class RunebookDyeTub : DyeTub, IRewardItem [Serializable(1, false)]
public partial class RunebookDyeTub : DyeTub, IRewardItem
{ {
[SerializableField(0)]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
private bool _isRewardItem;
[Constructible] [Constructible]
public RunebookDyeTub() => LootType = LootType.Blessed; public RunebookDyeTub() => LootType = LootType.Blessed;
public RunebookDyeTub(Serial serial) : base(serial)
{
}
public override bool AllowDyables => false; public override bool AllowDyables => false;
public override bool AllowRunebooks => true; public override bool AllowRunebooks => true;
public override int TargetMessage => 1049774; // Target the runebook or runestone to dye public override int TargetMessage => 1049774; // Target the runebook or runestone to dye
@ -18,12 +19,9 @@ namespace Server.Items
public override int LabelNumber => 1049740; // Runebook Dye Tub public override int LabelNumber => 1049740; // Runebook Dye Tub
public override CustomHuePicker CustomHuePicker => CustomHuePicker.LeatherDyeTub; public override CustomHuePicker CustomHuePicker => CustomHuePicker.LeatherDyeTub;
[CommandProperty(AccessLevel.GameMaster)]
public bool IsRewardItem { get; set; }
public override void OnDoubleClick(Mobile from) public override void OnDoubleClick(Mobile from)
{ {
if (IsRewardItem && !RewardSystem.CheckIsUsableBy(from, this)) if (_isRewardItem && !RewardSystem.CheckIsUsableBy(from, this))
{ {
return; return;
} }
@ -35,34 +33,17 @@ namespace Server.Items
{ {
base.GetProperties(list); base.GetProperties(list);
if (Core.ML && IsRewardItem) if (Core.ML && _isRewardItem)
{ {
list.Add(1076220); // 4th Year Veteran Reward list.Add(1076220); // 4th Year Veteran Reward
} }
} }
public override void Serialize(IGenericWriter writer) private void Deserialize(IGenericReader reader, int version)
{ {
base.Serialize(writer); if (LootType == LootType.Regular)
writer.Write(1); // version
writer.Write(IsRewardItem);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
switch (version)
{ {
case 1: LootType = LootType.Blessed;
{
IsRewardItem = reader.ReadBool();
break;
}
} }
} }
} }

41
Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/SpecialDyeTub.cs
View file

@ -2,24 +2,22 @@ using Server.Engines.VeteranRewards;
namespace Server.Items namespace Server.Items
{ {
public class SpecialDyeTub : DyeTub, IRewardItem [Serializable(1, false)]
public partial class SpecialDyeTub : DyeTub, IRewardItem
{ {
[SerializableField(0)]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
private bool _isRewardItem;
[Constructible] [Constructible]
public SpecialDyeTub() => LootType = LootType.Blessed; public SpecialDyeTub() => LootType = LootType.Blessed;
public SpecialDyeTub(Serial serial) : base(serial)
{
}
public override CustomHuePicker CustomHuePicker => CustomHuePicker.SpecialDyeTub; public override CustomHuePicker CustomHuePicker => CustomHuePicker.SpecialDyeTub;
public override int LabelNumber => 1041285; // Special Dye Tub public override int LabelNumber => 1041285; // Special Dye Tub
[CommandProperty(AccessLevel.GameMaster)]
public bool IsRewardItem { get; set; }
public override void OnDoubleClick(Mobile from) public override void OnDoubleClick(Mobile from)
{ {
if (IsRewardItem && !RewardSystem.CheckIsUsableBy(from, this)) if (_isRewardItem && !RewardSystem.CheckIsUsableBy(from, this))
{ {
return; return;
} }
@ -31,34 +29,17 @@ namespace Server.Items
{ {
base.GetProperties(list); base.GetProperties(list);
if (Core.ML && IsRewardItem) if (Core.ML && _isRewardItem)
{ {
list.Add(1076217); // 1st Year Veteran Reward list.Add(1076217); // 1st Year Veteran Reward
} }
} }
public override void Serialize(IGenericWriter writer) private void Deserialize(IGenericReader reader, int version)
{ {
base.Serialize(writer); if (LootType == LootType.Regular)
writer.Write(1); // version
writer.Write(IsRewardItem);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
switch (version)
{ {
case 1: LootType = LootType.Blessed;
{
IsRewardItem = reader.ReadBool();
break;
}
} }
} }
} }

41
Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/StatuetteDyeTub.cs
View file

@ -2,15 +2,16 @@ using Server.Engines.VeteranRewards;
namespace Server.Items namespace Server.Items
{ {
public class StatuetteDyeTub : DyeTub, IRewardItem [Serializable(1, false)]
public partial class StatuetteDyeTub : DyeTub, IRewardItem
{ {
[SerializableField(0)]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
private bool _isRewardItem;
[Constructible] [Constructible]
public StatuetteDyeTub() => LootType = LootType.Blessed; public StatuetteDyeTub() => LootType = LootType.Blessed;
public StatuetteDyeTub(Serial serial) : base(serial)
{
}
public override bool AllowDyables => false; public override bool AllowDyables => false;
public override bool AllowStatuettes => true; public override bool AllowStatuettes => true;
public override int TargetMessage => 1049777; // Target the statuette to dye public override int TargetMessage => 1049777; // Target the statuette to dye
@ -18,12 +19,9 @@ namespace Server.Items
public override int LabelNumber => 1049741; // Reward Statuette Dye Tub public override int LabelNumber => 1049741; // Reward Statuette Dye Tub
public override CustomHuePicker CustomHuePicker => CustomHuePicker.LeatherDyeTub; public override CustomHuePicker CustomHuePicker => CustomHuePicker.LeatherDyeTub;
[CommandProperty(AccessLevel.GameMaster)]
public bool IsRewardItem { get; set; }
public override void OnDoubleClick(Mobile from) public override void OnDoubleClick(Mobile from)
{ {
if (IsRewardItem && !RewardSystem.CheckIsUsableBy(from, this)) if (_isRewardItem && !RewardSystem.CheckIsUsableBy(from, this))
{ {
return; return;
} }
@ -35,34 +33,17 @@ namespace Server.Items
{ {
base.GetProperties(list); base.GetProperties(list);
if (Core.ML && IsRewardItem) if (Core.ML && _isRewardItem)
{ {
list.Add(1076221); // 5th Year Veteran Reward list.Add(1076221); // 5th Year Veteran Reward
} }
} }
public override void Serialize(IGenericWriter writer) private void Deserialize(IGenericReader reader, int version)
{ {
base.Serialize(writer); if (LootType == LootType.Regular)
writer.Write(1); // version
writer.Write(IsRewardItem);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
switch (version)
{ {
case 1: LootType = LootType.Blessed;
{
IsRewardItem = reader.ReadBool();
break;
}
} }
} }
} }

22
Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/WhiteClothDyeTub.cs
View file

@ -1,31 +1,13 @@
namespace Server.Items /* High seas, loot from merchant ship's hold, also a "uncommon" loot item */ namespace Server.Items /* High seas, loot from merchant ship's hold, also a "uncommon" loot item */
{ {
public class WhiteClothDyeTub : DyeTub [Serializable(0, false)]
public partial class WhiteClothDyeTub : DyeTub
{ {
[Constructible] [Constructible]
public WhiteClothDyeTub() => DyedHue = Hue = 0x9C2; public WhiteClothDyeTub() => DyedHue = Hue = 0x9C2;
public WhiteClothDyeTub(Serial serial)
: base(serial)
{
}
public override int LabelNumber => 1149984; // White Cloth Dye Tub public override int LabelNumber => 1149984; // White Cloth Dye Tub
public override bool Redyable => false; public override bool Redyable => false;
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();
}
} }
} }

22
Projects/UOContent/Items/Skill Items/Tailor Items/Dyetubs/WhiteLeatherDyeTub.cs
View file

@ -1,6 +1,7 @@
namespace Server.Items namespace Server.Items
{ {
public class WhiteLeatherDyeTub : LeatherDyeTub /* OSI UO 13th anniv gift, from redeemable gift tickets */ [Serializable(0, false)]
public partial class WhiteLeatherDyeTub : LeatherDyeTub /* OSI UO 13th anniv gift, from redeemable gift tickets */
{ {
[Constructible] [Constructible]
public WhiteLeatherDyeTub() public WhiteLeatherDyeTub()
@ -9,27 +10,8 @@ namespace Server.Items
LootType = LootType.Blessed; LootType = LootType.Blessed;
} }
public WhiteLeatherDyeTub(Serial serial)
: base(serial)
{
}
public override int LabelNumber => 1149900; // White Leather Dye Tub public override int LabelNumber => 1149900; // White Leather Dye Tub
public override bool Redyable => false; public override bool Redyable => false;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(1); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
} }
} }

2
Projects/UOContent/Items/Special/MiniHouses.cs
View file

@ -39,7 +39,7 @@ namespace Server.Items
c.Delete(); c.Delete();
} }
Components.Clear(); this.Clear(Components);
var info = MiniHouseInfo.GetInfo(m_Type); var info = MiniHouseInfo.GetInfo(m_Type);

5
Projects/UOContent/Items/Special/Mutation Core/PlagueBeastInnard.cs
View file

@ -130,10 +130,7 @@ namespace Server.Items
null null
); // * You rip the organ out of the plague beast's flesh * ); // * You rip the organ out of the plague beast's flesh *
if (Organ.Components.Contains(this)) Organ.Remove(Organ.Components, this);
{
Organ.Components.Remove(this);
}
Organ = null; Organ = null;
from.PlaySound(0x1CA); from.PlaySound(0x1CA);

6
Projects/UOContent/Migrations/Server.Accounting.Account.v2.json
View file

@ -72,7 +72,8 @@
"ruleArguments": [ "ruleArguments": [
"", "",
"Server.Accounting.AccountComment", "Server.Accounting.AccountComment",
"SerializationMethodSignatureMigrationRule" "SerializationMethodSignatureMigrationRule",
""
] ]
}, },
{ {
@ -82,7 +83,8 @@
"ruleArguments": [ "ruleArguments": [
"", "",
"Server.Accounting.AccountTag", "Server.Accounting.AccountTag",
"SerializationMethodSignatureMigrationRule" "SerializationMethodSignatureMigrationRule",
""
] ]
}, },
{ {

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

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

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

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

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

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

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

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

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

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

22
Projects/UOContent/Migrations/Server.Items.BaseAddonContainer.v1.json Normal file
View file

@ -0,0 +1,22 @@
{
"version": 1,
"type": "Server.Items.BaseAddonContainer",
"properties": [
{
"name": "Components",
"type": "System.Collections.Generic.List\u003CServer.Items.AddonContainerComponent\u003E",
"rule": "ListMigrationRule",
"ruleArguments": [
"",
"Server.Items.AddonContainerComponent",
"SerializableInterfaceMigrationRule"
]
},
{
"name": "Resource",
"type": "Server.Items.CraftResource",
"rule": "EnumMigrationRule",
"ruleArguments": []
}
]
}

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

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

12
Projects/UOContent/Migrations/Server.Items.BaseHides.v2.json Normal file
View file

@ -0,0 +1,12 @@
{
"version": 2,
"type": "Server.Items.BaseHides",
"properties": [
{
"name": "Resource",
"type": "Server.Items.CraftResource",
"rule": "EnumMigrationRule",
"ruleArguments": []
}
]
}

12
Projects/UOContent/Migrations/Server.Items.BaseIngot.v2.json Normal file
View file

@ -0,0 +1,12 @@
{
"version": 2,
"type": "Server.Items.BaseIngot",
"properties": [
{
"name": "Resource",
"type": "Server.Items.CraftResource",
"rule": "EnumMigrationRule",
"ruleArguments": []
}
]
}

12
Projects/UOContent/Migrations/Server.Items.BaseLeather.v2.json Normal file
View file

@ -0,0 +1,12 @@
{
"version": 2,
"type": "Server.Items.BaseLeather",
"properties": [
{
"name": "Resource",
"type": "Server.Items.CraftResource",
"rule": "EnumMigrationRule",
"ruleArguments": []
}
]
}

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

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

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

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

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

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

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

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

12
Projects/UOContent/Migrations/Server.Items.BigFish.v1.json Normal file
View file

@ -0,0 +1,12 @@
{
"version": 1,
"type": "Server.Items.BigFish",
"properties": [
{
"name": "Fisher",
"type": "Server.Mobile",
"rule": "SerializableInterfaceMigrationRule",
"ruleArguments": []
}
]
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

24
Projects/UOContent/Migrations/Server.Items.DyeTub.v2.json Normal file
View file

@ -0,0 +1,24 @@
{
"version": 2,
"type": "Server.Items.DyeTub",
"properties": [
{
"name": "Level",
"type": "Server.Multis.SecureLevel",
"rule": "EnumMigrationRule",
"ruleArguments": []
},
{
"name": "Redyable",
"type": "bool",
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": []
},
{
"name": "DyedHue",
"type": "int",
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": []
}
]
}

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

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

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

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

Some files were not shown because too many files have changed in this diff Show more