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

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

View file

@ -1,8 +1,12 @@
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)
{
@ -10,22 +14,7 @@ namespace Server.Items
Amount = amount;
Hue = CraftResources.GetHue(resource);
m_Resource = resource;
}
public BaseIngot(Serial serial) : base(serial)
{
}
[CommandProperty(AccessLevel.GameMaster)]
public CraftResource Resource
{
get => m_Resource;
set
{
m_Resource = value;
InvalidateProperties();
}
_resource = resource;
}
public override double DefaultWeight => 0.1;
@ -34,9 +23,9 @@ namespace Server.Items
{
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;
@ -46,26 +35,13 @@ namespace Server.Items
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true;
public override void Serialize(IGenericWriter writer)
private void Deserialize(IGenericReader reader, int version)
{
base.Serialize(writer);
writer.Write(1); // version
writer.Write((int)m_Resource);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
switch (version)
{
case 1:
{
m_Resource = (CraftResource)reader.ReadInt();
_resource = (CraftResource)reader.ReadInt();
break;
}
case 0:
@ -84,7 +60,7 @@ namespace Server.Items
_ => null
};
m_Resource = CraftResources.GetFromOreInfo(info);
_resource = CraftResources.GetFromOreInfo(info);
break;
}
}
@ -106,9 +82,9 @@ namespace Server.Items
{
base.GetProperties(list);
if (!CraftResources.IsStandard(m_Resource))
if (!CraftResources.IsStandard(_resource))
{
var num = CraftResources.GetLocalizationNumber(m_Resource);
var num = CraftResources.GetLocalizationNumber(_resource);
if (num > 0)
{
@ -116,252 +92,99 @@ namespace Server.Items
}
else
{
list.Add(CraftResources.GetName(m_Resource));
list.Add(CraftResources.GetName(_resource));
}
}
}
}
[Serializable(0, false)]
[Flippable(0x1BF2, 0x1BEF)]
public class IronIngot : BaseIngot
public partial class IronIngot : BaseIngot
{
[Constructible]
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)]
public class DullCopperIngot : BaseIngot
public partial class DullCopperIngot : BaseIngot
{
[Constructible]
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)]
public class ShadowIronIngot : BaseIngot
public partial class ShadowIronIngot : BaseIngot
{
[Constructible]
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)]
public class CopperIngot : BaseIngot
public partial class CopperIngot : BaseIngot
{
[Constructible]
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)]
public class BronzeIngot : BaseIngot
public partial class BronzeIngot : BaseIngot
{
[Constructible]
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)]
public class GoldIngot : BaseIngot
public partial class GoldIngot : BaseIngot
{
[Constructible]
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)]
public class AgapiteIngot : BaseIngot
public partial class AgapiteIngot : BaseIngot
{
[Constructible]
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)]
public class VeriteIngot : BaseIngot
public partial class VeriteIngot : BaseIngot
{
[Constructible]
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)]
public class ValoriteIngot : BaseIngot
public partial class ValoriteIngot : BaseIngot
{
[Constructible]
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();
}
}
}

View file

@ -4,7 +4,7 @@ using Server.Targeting;
namespace Server.Items
{
[Serializable(1, false)]
[Serializable(2, false)]
public abstract partial class BaseOre : Item
{
public BaseOre(CraftResource resource, int amount = 1) : base(RandomSize())
@ -38,21 +38,33 @@ namespace Server.Items
private void Deserialize(IGenericReader reader, int version)
{
var info = reader.ReadInt() switch
switch (version)
{
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
};
case 1:
{
_resource = (CraftResource)reader.ReadInt();
break;
}
case 0:
{
var info = reader.ReadInt() switch
{
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() =>

View file

@ -2,35 +2,22 @@ using System;
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]
public BigFish() : base(0x09CC)
{
Weight = Utility.RandomMinMax(
3,
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
// 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
Weight = Utility.RandomMinMax(3, 200);
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 void Carve(Mobile from, Item item)
@ -44,43 +31,18 @@ namespace Server.Items
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
}
}
public override void Serialize(IGenericWriter writer)
private void Deserialize(IGenericReader reader, int version)
{
base.Serialize(writer);
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;
}
}
Weight = Utility.RandomMinMax(3, 200);
}
}
}

View file

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

View file

@ -4,14 +4,11 @@ using Server.Spells;
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(Serial serial) : base(serial)
{
}
public virtual int Bonus => 0;
public virtual StatType Type => StatType.Str;
@ -43,141 +40,58 @@ namespace Server.Items
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]
public PrizedFish() : base(51)
{
}
public PrizedFish(Serial serial) : base(serial)
{
}
public override int Bonus => 5;
public override StatType Type => StatType.Int;
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]
public WondrousFish() : base(86)
{
}
public WondrousFish(Serial serial) : base(serial)
{
}
public override int Bonus => 5;
public override StatType Type => StatType.Dex;
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]
public TrulyRareFish() : base(76)
{
}
public TrulyRareFish(Serial serial) : base(serial)
{
}
public override int Bonus => 5;
public override StatType Type => StatType.Str;
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]
public PeculiarFish() : base(66)
{
}
public PeculiarFish(Serial serial) : base(serial)
{
}
public override int LabelNumber => 1041076; // highly peculiar fish
public override bool Apply(Mobile from)
@ -185,24 +99,5 @@ namespace Server.Items
from.Stam += 10;
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;
}
}
}
}

View file

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

View file

@ -1,6 +1,7 @@
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)
{
@ -8,24 +9,6 @@ namespace Server.Items
Amount = amount;
}
public BaseReagent(Serial serial) : base(serial)
{
}
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();
}
}
}

View file

@ -1,31 +1,14 @@
namespace Server.Items
{
public class BatWing : BaseReagent, ICommodity
[Serializable(0, false)]
public partial class BatWing : BaseReagent, ICommodity
{
[Constructible]
public BatWing(int amount = 1) : base(0xF78, amount)
{
}
public BatWing(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
}

View file

@ -1,31 +1,14 @@
namespace Server.Items
{
public class BlackPearl : BaseReagent, ICommodity
[Serializable(0, false)]
public partial class BlackPearl : BaseReagent, ICommodity
{
[Constructible]
public BlackPearl(int amount = 1) : base(0xF7A, amount)
{
}
public BlackPearl(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
}

View file

@ -1,31 +1,14 @@
namespace Server.Items
{
public class Bloodmoss : BaseReagent, ICommodity
[Serializable(0, false)]
public partial class Bloodmoss : BaseReagent, ICommodity
{
[Constructible]
public Bloodmoss(int amount = 1) : base(0xF7B, amount)
{
}
public Bloodmoss(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
}

View file

@ -1,31 +1,14 @@
namespace Server.Items
{
public class DaemonBlood : BaseReagent, ICommodity
[Serializable(0, false)]
public partial class DaemonBlood : BaseReagent, ICommodity
{
[Constructible]
public DaemonBlood(int amount = 1) : base(0xF7D, amount)
{
}
public DaemonBlood(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
}

View file

@ -1,31 +1,16 @@
namespace Server.Items
{
// TODO: Commodity?
public class DaemonBone : BaseReagent
[Serializable(0, false)]
public partial class DaemonBone : BaseReagent, ICommodity
{
[Constructible]
public DaemonBone(int amount = 1) : base(0xF80, amount)
{
}
public DaemonBone(Serial serial) : base(serial)
{
}
public override double DefaultWeight => 1.0;
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();
}
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => Core.ML;
}
}

View file

@ -1,31 +1,14 @@
namespace Server.Items
{
public class DeadWood : BaseReagent, ICommodity
[Serializable(0, false)]
public partial class DeadWood : BaseReagent, ICommodity
{
[Constructible]
public DeadWood(int amount = 1) : base(0xF90, amount)
{
}
public DeadWood(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
}

View file

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

View file

@ -1,31 +1,14 @@
namespace Server.Items
{
public class Garlic : BaseReagent, ICommodity
[Serializable(0, false)]
public partial class Garlic : BaseReagent, ICommodity
{
[Constructible]
public Garlic(int amount = 1) : base(0xF84, amount)
{
}
public Garlic(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
}

View file

@ -1,31 +1,14 @@
namespace Server.Items
{
public class Ginseng : BaseReagent, ICommodity
[Serializable(0, false)]
public partial class Ginseng : BaseReagent, ICommodity
{
[Constructible]
public Ginseng(int amount = 1) : base(0xF85, amount)
{
}
public Ginseng(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
}

View file

@ -1,31 +1,14 @@
namespace Server.Items
{
public class GraveDust : BaseReagent, ICommodity
[Serializable(0, false)]
public partial class GraveDust : BaseReagent, ICommodity
{
[Constructible]
public GraveDust(int amount = 1) : base(0xF8F, amount)
{
}
public GraveDust(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
}

View file

@ -1,31 +1,14 @@
namespace Server.Items
{
public class MandrakeRoot : BaseReagent, ICommodity
[Serializable(0, false)]
public partial class MandrakeRoot : BaseReagent, ICommodity
{
[Constructible]
public MandrakeRoot(int amount = 1) : base(0xF86, amount)
{
}
public MandrakeRoot(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
}

View file

@ -1,31 +1,14 @@
namespace Server.Items
{
public class Nightshade : BaseReagent, ICommodity
[Serializable(0, false)]
public partial class Nightshade : BaseReagent, ICommodity
{
[Constructible]
public Nightshade(int amount = 1) : base(0xF88, amount)
{
}
public Nightshade(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
}

View file

@ -1,31 +1,14 @@
namespace Server.Items
{
public class NoxCrystal : BaseReagent, ICommodity
[Serializable(0, false)]
public partial class NoxCrystal : BaseReagent, ICommodity
{
[Constructible]
public NoxCrystal(int amount = 1) : base(0xF8E, amount)
{
}
public NoxCrystal(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
}

View file

@ -1,31 +1,14 @@
namespace Server.Items
{
public class PigIron : BaseReagent, ICommodity
[Serializable(0, false)]
public partial class PigIron : BaseReagent, ICommodity
{
[Constructible]
public PigIron(int amount = 1) : base(0xF8A, amount)
{
}
public PigIron(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
}

View file

@ -1,31 +1,14 @@
namespace Server.Items
{
public class SpidersSilk : BaseReagent, ICommodity
[Serializable(0, false)]
public partial class SpidersSilk : BaseReagent, ICommodity
{
[Constructible]
public SpidersSilk(int amount = 1) : base(0xF8D, amount)
{
}
public SpidersSilk(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
}

View file

@ -1,31 +1,14 @@
namespace Server.Items
{
public class SulfurousAsh : BaseReagent, ICommodity
[Serializable(0, false)]
public partial class SulfurousAsh : BaseReagent, ICommodity
{
[Constructible]
public SulfurousAsh(int amount = 1) : base(0xF8C, amount)
{
}
public SulfurousAsh(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
}

View file

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

View file

@ -1,6 +1,7 @@
namespace Server.Items
{
public class Bone : Item, ICommodity
[Serializable(0, false)]
public partial class Bone : Item, ICommodity
{
[Constructible]
public Bone(int amount = 1) : base(0xf7e)
@ -10,25 +11,7 @@ namespace Server.Items
Weight = 1.0;
}
public Bone(Serial serial) : base(serial)
{
}
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
}

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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

View file

@ -2,7 +2,8 @@ using Server.Targeting;
namespace Server.Items
{
public abstract class BaseClothMaterial : Item, IDyable
[Serializable(0, false)]
public abstract partial class BaseClothMaterial : Item, IDyable
{
public BaseClothMaterial(int itemID, int amount = 1) : base(itemID)
{
@ -11,10 +12,6 @@ namespace Server.Items
Amount = amount;
}
public BaseClothMaterial(Serial serial) : base(serial)
{
}
public bool Dye(Mobile from, DyeTub sender)
{
if (Deleted)
@ -27,20 +24,6 @@ namespace Server.Items
return true;
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
public override void OnDoubleClick(Mobile from)
{
if (IsChildOf(from.Backpack))
@ -108,107 +91,39 @@ namespace Server.Items
}
}
public class DarkYarn : BaseClothMaterial
[Serializable(0, false)]
public partial class DarkYarn : BaseClothMaterial
{
[Constructible]
public DarkYarn(int amount = 1) : base(0xE1D, amount)
{
}
public DarkYarn(Serial serial) : base(serial)
{
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
public class LightYarn : BaseClothMaterial
[Serializable(0, false)]
public partial class LightYarn : BaseClothMaterial
{
[Constructible]
public LightYarn(int amount = 1) : base(0xE1E, amount)
{
}
public LightYarn(Serial serial) : base(serial)
{
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
public class LightYarnUnraveled : BaseClothMaterial
[Serializable(0, false)]
public partial class LightYarnUnraveled : BaseClothMaterial
{
[Constructible]
public LightYarnUnraveled(int amount = 1) : base(0xE1F, amount)
{
}
public LightYarnUnraveled(Serial serial) : base(serial)
{
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
public class SpoolOfThread : BaseClothMaterial
[Serializable(0, false)]
public partial class SpoolOfThread : BaseClothMaterial
{
[Constructible]
public SpoolOfThread(int amount = 1) : base(0xFA0, amount)
{
}
public SpoolOfThread(Serial serial) : base(serial)
{
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
}
}
}