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

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

@ -1,6 +1,7 @@
namespace Server.Items
{
public class BlackDyeTub : DyeTub
[Serializable(0, false)]
public partial class BlackDyeTub : DyeTub
{
[Constructible]
public BlackDyeTub()
@ -8,23 +9,5 @@ namespace Server.Items
Hue = DyedHue = 0x0001;
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
{
public class BlazeDyeTub : DyeTub
[Serializable(0, false)]
public partial class BlazeDyeTub : DyeTub
{
[Constructible]
public BlazeDyeTub()
@ -8,23 +9,5 @@ namespace Server.Items
Hue = DyedHue = 0x489;
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);
}
public class DyeTub : Item, ISecurable
[Serializable(2, false)]
public partial class DyeTub : Item, ISecurable
{
private int m_DyedHue;
private bool m_Redyable;
[SerializableField(0)]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
private SecureLevel _level;
[SerializableField(1, isVirtual: true)]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
private bool _redyable;
private int _dyedHue;
[Constructible]
public DyeTub() : base(0xFAB)
{
Weight = 10.0;
m_Redyable = true;
}
public DyeTub(Serial serial) : base(serial)
{
_redyable = true;
}
public virtual CustomHuePicker CustomHuePicker => null;
@ -39,22 +43,16 @@ namespace Server.Items
public virtual bool AllowDyables => true;
[CommandProperty(AccessLevel.GameMaster)]
public virtual bool Redyable
{
get => m_Redyable;
set => m_Redyable = value;
}
[SerializableField(2)]
[CommandProperty(AccessLevel.GameMaster)]
public int DyedHue
{
get => m_DyedHue;
get => _dyedHue;
set
{
if (m_Redyable)
if (_redyable)
{
m_DyedHue = value;
_dyedHue = value;
Hue = value;
}
}
@ -69,26 +67,8 @@ namespace Server.Items
// You can not dye that.
public virtual int FailMessage => 1042083;
[CommandProperty(AccessLevel.GameMaster)]
public SecureLevel Level { get; set; }
public override void Serialize(IGenericWriter writer)
private void Deserialize(IGenericReader reader, int version)
{
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)
{
case 1:
@ -98,8 +78,8 @@ namespace Server.Items
}
case 0:
{
m_Redyable = reader.ReadBool();
m_DyedHue = reader.ReadInt();
_redyable = reader.ReadBool();
_dyedHue = reader.ReadInt();
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
{
public class FurnitureDyeTub : DyeTub, IRewardItem
[Serializable(1, false)]
public partial class FurnitureDyeTub : DyeTub, IRewardItem
{
[SerializableField(0)]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
private bool _isRewardItem;
[Constructible]
public FurnitureDyeTub() => LootType = LootType.Blessed;
public FurnitureDyeTub(Serial serial) : base(serial)
{
}
public override bool AllowDyables => false;
public override bool AllowFurniture => true;
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 LabelNumber => 1041246; // Furniture Dye Tub
[CommandProperty(AccessLevel.GameMaster)]
public bool IsRewardItem { get; set; }
public override void OnDoubleClick(Mobile from)
{
if (IsRewardItem && !RewardSystem.CheckIsUsableBy(from, this))
if (_isRewardItem && !RewardSystem.CheckIsUsableBy(from, this))
{
return;
}
@ -34,36 +32,14 @@ namespace Server.Items
{
base.GetProperties(list);
if (Core.ML && IsRewardItem)
if (Core.ML && _isRewardItem)
{
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)
{
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
{
public class LeatherDyeTub : DyeTub, IRewardItem
[Serializable(1, false)]
public partial class LeatherDyeTub : DyeTub, IRewardItem
{
[SerializableField(0)]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
private bool _isRewardItem;
[Constructible]
public LeatherDyeTub() => LootType = LootType.Blessed;
public LeatherDyeTub(Serial serial) : base(serial)
{
}
public override bool AllowDyables => false;
public override bool AllowLeather => true;
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 CustomHuePicker CustomHuePicker => CustomHuePicker.LeatherDyeTub;
[CommandProperty(AccessLevel.GameMaster)]
public bool IsRewardItem { get; set; }
public override void OnDoubleClick(Mobile from)
{
if (IsRewardItem && !RewardSystem.CheckIsUsableBy(from, this))
if (_isRewardItem && !RewardSystem.CheckIsUsableBy(from, this))
{
return;
}
@ -35,34 +33,17 @@ namespace Server.Items
{
base.GetProperties(list);
if (Core.ML && IsRewardItem)
if (Core.ML && _isRewardItem)
{
list.Add(1076218); // 2nd 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)
if (LootType == LootType.Regular)
{
case 1:
{
IsRewardItem = reader.ReadBool();
break;
}
LootType = LootType.Blessed;
}
}
}

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

@ -1,31 +1,13 @@
namespace Server.Items
{
public class MetallicClothDyetub : DyeTub
[Serializable(0, false)]
public partial class MetallicClothDyetub : DyeTub
{
[Constructible]
public MetallicClothDyetub() => LootType = LootType.Blessed;
public MetallicClothDyetub(Serial serial)
: base(serial)
{
}
public override int LabelNumber => 1152920; // Metallic Cloth ...
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
{
public class MetallicLeatherDyeTub : LeatherDyeTub
[Serializable(0, false)]
public partial class MetallicLeatherDyeTub : LeatherDyeTub
{
[Constructible]
public MetallicLeatherDyeTub() => LootType = LootType.Blessed;
public MetallicLeatherDyeTub(Serial serial)
: base(serial)
{
}
public override CustomHuePicker CustomHuePicker => null;
public override int LabelNumber => 1153495; // Metallic Leather ...
@ -25,19 +21,5 @@ namespace Server.Items
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
{
public class RewardBlackDyeTub : DyeTub, IRewardItem
[Serializable(1, false)]
public partial class RewardBlackDyeTub : DyeTub, IRewardItem
{
[SerializableField(0)]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
private bool _isRewardItem;
[Constructible]
public RewardBlackDyeTub()
{
@ -12,18 +17,11 @@ namespace Server.Items
LootType = LootType.Blessed;
}
public RewardBlackDyeTub(Serial serial) : base(serial)
{
}
public override int LabelNumber => 1006008; // Black Dye Tub
[CommandProperty(AccessLevel.GameMaster)]
public bool IsRewardItem { get; set; }
public override void OnDoubleClick(Mobile from)
{
if (IsRewardItem && !RewardSystem.CheckIsUsableBy(from, this))
if (_isRewardItem && !RewardSystem.CheckIsUsableBy(from, this))
{
return;
}
@ -35,34 +33,17 @@ namespace Server.Items
{
base.GetProperties(list);
if (Core.ML && IsRewardItem)
if (Core.ML && _isRewardItem)
{
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)
if (LootType == LootType.Regular)
{
case 1:
{
IsRewardItem = reader.ReadBool();
break;
}
LootType = LootType.Blessed;
}
}
}

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

@ -2,15 +2,16 @@ using Server.Engines.VeteranRewards;
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]
public RunebookDyeTub() => LootType = LootType.Blessed;
public RunebookDyeTub(Serial serial) : base(serial)
{
}
public override bool AllowDyables => false;
public override bool AllowRunebooks => true;
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 CustomHuePicker CustomHuePicker => CustomHuePicker.LeatherDyeTub;
[CommandProperty(AccessLevel.GameMaster)]
public bool IsRewardItem { get; set; }
public override void OnDoubleClick(Mobile from)
{
if (IsRewardItem && !RewardSystem.CheckIsUsableBy(from, this))
if (_isRewardItem && !RewardSystem.CheckIsUsableBy(from, this))
{
return;
}
@ -35,34 +33,17 @@ namespace Server.Items
{
base.GetProperties(list);
if (Core.ML && IsRewardItem)
if (Core.ML && _isRewardItem)
{
list.Add(1076220); // 4th 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)
if (LootType == LootType.Regular)
{
case 1:
{
IsRewardItem = reader.ReadBool();
break;
}
LootType = LootType.Blessed;
}
}
}

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

@ -2,24 +2,22 @@ using Server.Engines.VeteranRewards;
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]
public SpecialDyeTub() => LootType = LootType.Blessed;
public SpecialDyeTub(Serial serial) : base(serial)
{
}
public override CustomHuePicker CustomHuePicker => CustomHuePicker.SpecialDyeTub;
public override int LabelNumber => 1041285; // Special Dye Tub
[CommandProperty(AccessLevel.GameMaster)]
public bool IsRewardItem { get; set; }
public override void OnDoubleClick(Mobile from)
{
if (IsRewardItem && !RewardSystem.CheckIsUsableBy(from, this))
if (_isRewardItem && !RewardSystem.CheckIsUsableBy(from, this))
{
return;
}
@ -31,34 +29,17 @@ namespace Server.Items
{
base.GetProperties(list);
if (Core.ML && IsRewardItem)
if (Core.ML && _isRewardItem)
{
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)
if (LootType == LootType.Regular)
{
case 1:
{
IsRewardItem = reader.ReadBool();
break;
}
LootType = LootType.Blessed;
}
}
}

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

@ -2,15 +2,16 @@ using Server.Engines.VeteranRewards;
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]
public StatuetteDyeTub() => LootType = LootType.Blessed;
public StatuetteDyeTub(Serial serial) : base(serial)
{
}
public override bool AllowDyables => false;
public override bool AllowStatuettes => true;
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 CustomHuePicker CustomHuePicker => CustomHuePicker.LeatherDyeTub;
[CommandProperty(AccessLevel.GameMaster)]
public bool IsRewardItem { get; set; }
public override void OnDoubleClick(Mobile from)
{
if (IsRewardItem && !RewardSystem.CheckIsUsableBy(from, this))
if (_isRewardItem && !RewardSystem.CheckIsUsableBy(from, this))
{
return;
}
@ -35,34 +33,17 @@ namespace Server.Items
{
base.GetProperties(list);
if (Core.ML && IsRewardItem)
if (Core.ML && _isRewardItem)
{
list.Add(1076221); // 5th 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)
if (LootType == LootType.Regular)
{
case 1:
{
IsRewardItem = reader.ReadBool();
break;
}
LootType = LootType.Blessed;
}
}
}

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 */
{
public class WhiteClothDyeTub : DyeTub
[Serializable(0, false)]
public partial class WhiteClothDyeTub : DyeTub
{
[Constructible]
public WhiteClothDyeTub() => DyedHue = Hue = 0x9C2;
public WhiteClothDyeTub(Serial serial)
: base(serial)
{
}
public override int LabelNumber => 1149984; // White Cloth Dye Tub
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
{
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]
public WhiteLeatherDyeTub()
@ -9,27 +10,8 @@ namespace Server.Items
LootType = LootType.Blessed;
}
public WhiteLeatherDyeTub(Serial serial)
: base(serial)
{
}
public override int LabelNumber => 1149900; // White Leather Dye Tub
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();
}
}
}