fix(codegen): Codegens clothing (#714)

This commit is contained in:
Kamron Batman 2021-08-24 23:11:59 -07:00 • committed by GitHub
parent 13931ddf1d
commit ca3faec01d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
105 changed files with 1175 additions and 2477 deletions

View file

@ -2,116 +2,63 @@ using Server.Engines.VeteranRewards;
namespace Server.Items
{
public abstract class BaseCloak : BaseClothing
[Serializable(0, false)]
public abstract partial class BaseCloak : BaseClothing
{
public BaseCloak(int itemID, int hue = 0) : base(itemID, Layer.Cloak, hue)
{
}
public BaseCloak(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();
}
}
[Flippable]
public class Cloak : BaseCloak, IArcaneEquip
[Serializable(2, false)]
public partial class Cloak : BaseCloak, IArcaneEquip
{
private int m_MaxArcaneCharges, m_CurArcaneCharges;
private int _maxArcaneCharges;
private int _curArcaneCharges;
[Constructible]
public Cloak(int hue = 0) : base(0x1515, hue) => Weight = 5.0;
public Cloak(Serial serial) : base(serial)
{
}
[CommandProperty(AccessLevel.GameMaster)]
public int MaxArcaneCharges
{
get => m_MaxArcaneCharges;
set
{
m_MaxArcaneCharges = value;
InvalidateProperties();
Update();
}
}
[EncodedInt]
[SerializableField(0)]
[CommandProperty(AccessLevel.GameMaster)]
public int CurArcaneCharges
{
get => m_CurArcaneCharges;
get => _curArcaneCharges;
set
{
m_CurArcaneCharges = value;
_curArcaneCharges = value;
this.MarkDirty();
InvalidateProperties();
Update();
}
}
[EncodedInt]
[SerializableField(1)]
[CommandProperty(AccessLevel.GameMaster)]
public int MaxArcaneCharges
{
get => _maxArcaneCharges;
set
{
_maxArcaneCharges = value;
this.MarkDirty();
InvalidateProperties();
Update();
}
}
[CommandProperty(AccessLevel.GameMaster)]
public bool IsArcane => m_MaxArcaneCharges > 0 && m_CurArcaneCharges >= 0;
public bool IsArcane => _maxArcaneCharges > 0 && _curArcaneCharges >= 0;
public override void Serialize(IGenericWriter writer)
private void Deserialize(IGenericReader reader, int version)
{
base.Serialize(writer);
writer.Write(1); // version
if (IsArcane)
if (reader.ReadBool())
{
writer.Write(true);
writer.Write(m_CurArcaneCharges);
writer.Write(m_MaxArcaneCharges);
}
else
{
writer.Write(false);
}
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
switch (version)
{
case 1:
{
if (reader.ReadBool())
{
m_CurArcaneCharges = reader.ReadInt();
m_MaxArcaneCharges = reader.ReadInt();
if (Hue == 2118)
{
Hue = ArcaneGem.DefaultArcaneHue;
}
}
break;
}
}
if (Weight == 4.0)
{
Weight = 5.0;
_curArcaneCharges = reader.ReadInt();
_maxArcaneCharges = reader.ReadInt();
}
}
@ -126,7 +73,7 @@ namespace Server.Items
ItemID = 0x1515;
}
if (IsArcane && CurArcaneCharges == 0)
if (IsArcane && _curArcaneCharges == 0)
{
Hue = 0;
}
@ -138,7 +85,7 @@ namespace Server.Items
if (IsArcane)
{
list.Add(1061837, "{0}\t{1}", m_CurArcaneCharges, m_MaxArcaneCharges); // arcane charges: ~1_val~ / ~2_val~
list.Add(1061837, "{0}\t{1}", _curArcaneCharges, _maxArcaneCharges); // arcane charges: ~1_val~ / ~2_val~
}
}
@ -148,27 +95,33 @@ namespace Server.Items
if (IsArcane)
{
LabelTo(from, 1061837, $"{m_CurArcaneCharges}\t{m_MaxArcaneCharges}");
LabelTo(from, 1061837, $"{_curArcaneCharges}\t{_maxArcaneCharges}");
}
}
public void Flip()
{
if (ItemID == 0x1515)
ItemID = ItemID switch
{
ItemID = 0x1530;
}
else if (ItemID == 0x1530)
{
ItemID = 0x1515;
}
0x1515 => 0x1530,
0x1530 => 0x1515,
_ => ItemID
};
}
}
[Flippable]
public class RewardCloak : BaseCloak, IRewardItem
[Serializable(0, false)]
public partial class RewardCloak : BaseCloak, IRewardItem
{
private int m_LabelNumber;
[InvalidateProperties]
[SerializableField(0)]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
private int _number;
[SerializableField(1)]
[SerializableFieldAttr("[CommandProperty(AccessLevel.GameMaster)]")]
private bool _isRewardItem;
[Constructible]
public RewardCloak(int hue = 0, int labelNumber = 0) : base(0x1515, hue)
@ -176,42 +129,13 @@ namespace Server.Items
Weight = 5.0;
LootType = LootType.Blessed;
m_LabelNumber = labelNumber;
_number = labelNumber;
}
public RewardCloak(Serial serial) : base(serial)
{
}
[CommandProperty(AccessLevel.GameMaster)]
public int Number
{
get => m_LabelNumber;
set
{
m_LabelNumber = value;
InvalidateProperties();
}
}
public override int LabelNumber
{
get
{
if (m_LabelNumber > 0)
{
return m_LabelNumber;
}
return base.LabelNumber;
}
}
public override int LabelNumber => _number > 0 ? _number : base.LabelNumber;
public override int BasePhysicalResistance => 3;
[CommandProperty(AccessLevel.GameMaster)]
public bool IsRewardItem { get; set; }
public override void OnAdded(IEntity parent)
{
base.OnAdded(parent);
@ -244,51 +168,18 @@ namespace Server.Items
if (Core.ML && IsRewardItem)
{
list.Add(
RewardSystem.GetRewardYearLabel(
this,
new object[] { Hue, m_LabelNumber }
)
); // X Year Veteran Reward
// X Year Veteran Reward
list.Add(RewardSystem.GetRewardYearLabel(this, new object[] { Hue, _number }));
}
}
public override bool CanEquip(Mobile m)
public override bool CanEquip(Mobile m) =>
base.CanEquip(m) &&
(!IsRewardItem || RewardSystem.CheckIsUsableBy(m, this, new object[] { Hue, _number }));
[AfterDeserialization]
private void AfterDeserialization()
{
if (!base.CanEquip(m))
{
return false;
}
return !IsRewardItem || RewardSystem.CheckIsUsableBy(m, this, new object[] { Hue, m_LabelNumber });
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
writer.Write(m_LabelNumber);
writer.Write(IsRewardItem);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadInt();
switch (version)
{
case 0:
{
m_LabelNumber = reader.ReadInt();
IsRewardItem = reader.ReadBool();
break;
}
}
if (Parent is Mobile mobile)
{
mobile.VirtualArmorMod += 2;
@ -297,27 +188,10 @@ namespace Server.Items
}
[Flippable(0x230A, 0x2309)]
public class FurCape : BaseCloak
[Serializable(0, false)]
public partial class FurCape : BaseCloak
{
[Constructible]
public FurCape(int hue = 0) : base(0x230A, hue) => Weight = 4.0;
public FurCape(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();
}
}
}