warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Codegens talismans - Fixes memory leak (#1469)

Browse source
This commit is contained in:
Kamron Batman 2023-08-23 22:41:48 -07:00 • committed by GitHub
parent ca89b8b08b
commit ffb0b24e1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
41 changed files with 1979 additions and 2256 deletions
Download patch file Download diff file Expand all files Collapse all files

34
Projects/UOContent/Items/Talismans/Items/EnchantedSwitch.cs
View file

@ -1,28 +1,12 @@
namespace Server.Items
using ModernUO.Serialization;
namespace Server.Items;
[SerializationGenerator(0, false)]
public partial class EnchantedSwitch : Item
{
public class EnchantedSwitch : Item
{
[Constructible]
public EnchantedSwitch() : base(0x2F5C) => Weight = 1.0;
[Constructible]
public EnchantedSwitch() : base(0x2F5C) => Weight = 1.0;
public EnchantedSwitch(Serial serial) : base(serial)
{
}
public override int LabelNumber => 1072893; // enchanted switch
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 int LabelNumber => 1072893; // enchanted switch
}

34
Projects/UOContent/Items/Talismans/Items/HollowPrism.cs
View file

@ -1,28 +1,12 @@
namespace Server.Items
using ModernUO.Serialization;
namespace Server.Items;
[SerializationGenerator(0, false)]
public partial class HollowPrism : Item
{
public class HollowPrism : Item
{
[Constructible]
public HollowPrism() : base(0x2F5D) => Weight = 1.0;
[Constructible]
public HollowPrism() : base(0x2F5D) => Weight = 1.0;
public HollowPrism(Serial serial) : base(serial)
{
}
public override int LabelNumber => 1072895; // hollow prism
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 int LabelNumber => 1072895; // hollow prism
}

34
Projects/UOContent/Items/Talismans/Items/JeweledFiligree.cs
View file

@ -1,28 +1,12 @@
namespace Server.Items
using ModernUO.Serialization;
namespace Server.Items;
[SerializationGenerator(0, false)]
public partial class JeweledFiligree : Item
{
public class JeweledFiligree : Item
{
[Constructible]
public JeweledFiligree() : base(0x2F5E) => Weight = 1.0;
[Constructible]
public JeweledFiligree() : base(0x2F5E) => Weight = 1.0;
public JeweledFiligree(Serial serial) : base(serial)
{
}
public override int LabelNumber => 1072894; // jeweled filigree
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 int LabelNumber => 1072894; // jeweled filigree
}

34
Projects/UOContent/Items/Talismans/Items/RunedPrism.cs
View file

@ -1,28 +1,12 @@
namespace Server.Items
using ModernUO.Serialization;
namespace Server.Items;
[SerializationGenerator(0, false)]
public partial class RunedPrism : Item
{
public class RunedPrism : Item
{
[Constructible]
public RunedPrism() : base(0x2F57) => Weight = 1.0;
[Constructible]
public RunedPrism() : base(0x2F57) => Weight = 1.0;
public RunedPrism(Serial serial) : base(serial)
{
}
public override int LabelNumber => 1073465; // runed prism
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 int LabelNumber => 1073465; // runed prism
}

102
Projects/UOContent/Items/Talismans/Items/RunedSwitch.cs
View file

@ -1,78 +1,64 @@
using ModernUO.Serialization;
using Server.Targeting;
namespace Server.Items
namespace Server.Items;
[SerializationGenerator(0, false)]
public partial class RunedSwitch : Item
{
public class RunedSwitch : Item
[Constructible]
public RunedSwitch() : base(0x2F61) => Weight = 1.0;
public RunedSwitch(Serial serial) : base(serial)
{
[Constructible]
public RunedSwitch() : base(0x2F61) => Weight = 1.0;
}
public RunedSwitch(Serial serial) : base(serial)
public override int LabelNumber => 1072896; // runed switch
public override void OnDoubleClick(Mobile from)
{
if (IsChildOf(from.Backpack))
{
from.SendLocalizedMessage(1075101); // Please select an item to recharge.
from.Target = new InternalTarget(this);
}
public override int LabelNumber => 1072896; // runed switch
public override void OnDoubleClick(Mobile from)
else
{
if (IsChildOf(from.Backpack))
from.SendLocalizedMessage(1060640); // The item must be in your backpack to use it.
}
}
private class InternalTarget : Target
{
private readonly RunedSwitch _item;
public InternalTarget(RunedSwitch item) : base(0, false, TargetFlags.None) => _item = item;
protected override void OnTarget(Mobile from, object o)
{
if (_item?.Deleted != false)
{
from.SendLocalizedMessage(1075101); // Please select an item to recharge.
from.Target = new InternalTarget(this);
return;
}
else
if (o is BaseTalisman talisman)
{
from.SendLocalizedMessage(1060640); // The item must be in your backpack to use it.
}
}
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();
}
private class InternalTarget : Target
{
private readonly RunedSwitch m_Item;
public InternalTarget(RunedSwitch item) : base(0, false, TargetFlags.None) => m_Item = item;
protected override void OnTarget(Mobile from, object o)
{
if (m_Item?.Deleted != false)
if (talisman.Charges == 0)
{
return;
}
if (o is BaseTalisman talisman)
{
if (talisman.Charges == 0)
{
talisman.Charges = talisman.MaxCharges;
m_Item.Delete();
from.SendLocalizedMessage(1075100); // The item has been recharged.
}
else
{
from.SendLocalizedMessage(
1075099
); // You cannot recharge that item until all of its current charges have been used.
}
talisman.Charges = talisman.MaxCharges;
_item.Delete();
from.SendLocalizedMessage(1075100); // The item has been recharged.
}
else
{
from.SendLocalizedMessage(1046439); // That is not a valid target.
// You cannot recharge that item until all of its current charges have been used.
from.SendLocalizedMessage(1075099);
}
}
else
{
from.SendLocalizedMessage(1046439); // That is not a valid target.
}
}
}
}