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

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

View file

@ -3,7 +3,7 @@
"isRoot": true, "isRoot": true,
"tools": { "tools": {
"modernuoschemagenerator": { "modernuoschemagenerator": {
"version": "2.6.4", "version": "2.7.2",
"commands": [ "commands": [
"ModernUOSchemaGenerator" "ModernUOSchemaGenerator"
] ]

View file

@ -38,7 +38,7 @@
<PackageReference Include="Zlib.Bindings" Version="1.11.0" /> <PackageReference Include="Zlib.Bindings" Version="1.11.0" />
<PackageReference Include="ModernUO.Serialization.Annotations" Version="2.6.0" /> <PackageReference Include="ModernUO.Serialization.Annotations" Version="2.6.0" />
<PackageReference Include="ModernUO.Serialization.Generator" Version="2.6.4" /> <PackageReference Include="ModernUO.Serialization.Generator" Version="2.7.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<AdditionalFiles Include="Migrations/*.v*.json" /> <AdditionalFiles Include="Migrations/*.v*.json" />

View file

@ -0,0 +1,132 @@
using System;
namespace Server.Items;
public partial class BaseTalisman
{
private void Deserialize(IGenericReader reader, int version)
{
var flags = (OldSaveFlag)reader.ReadEncodedInt();
Attributes = new AosAttributes(this);
if (GetOldSaveFlag(flags, OldSaveFlag.Attributes))
{
Attributes.Deserialize(reader);
}
SkillBonuses = new AosSkillBonuses(this);
if (GetOldSaveFlag(flags, OldSaveFlag.SkillBonuses))
{
SkillBonuses.Deserialize(reader);
}
// Backward compatibility
if (GetOldSaveFlag(flags, OldSaveFlag.Owner))
{
BlessedFor = reader.ReadEntity<Mobile>();
}
_protection = new TalismanAttribute();
if (GetOldSaveFlag(flags, OldSaveFlag.Protection))
{
_protection.Deserialize(reader);
}
_killer = new TalismanAttribute();
if (GetOldSaveFlag(flags, OldSaveFlag.Killer))
{
_killer.Deserialize(reader);
}
_summoner = new TalismanAttribute();
if (GetOldSaveFlag(flags, OldSaveFlag.Summoner))
{
_summoner.Deserialize(reader);
}
if (GetOldSaveFlag(flags, OldSaveFlag.Removal))
{
_removal = (TalismanRemoval)reader.ReadEncodedInt();
}
if (GetOldSaveFlag(flags, OldSaveFlag.OldKarmaLoss))
{
Attributes.IncreasedKarmaLoss = reader.ReadEncodedInt();
}
if (GetOldSaveFlag(flags, OldSaveFlag.Skill))
{
_skill = (SkillName)reader.ReadEncodedInt();
}
if (GetOldSaveFlag(flags, OldSaveFlag.SuccessBonus))
{
_successBonus = reader.ReadEncodedInt();
}
if (GetOldSaveFlag(flags, OldSaveFlag.ExceptionalBonus))
{
_exceptionalBonus = reader.ReadEncodedInt();
}
if (GetOldSaveFlag(flags, OldSaveFlag.MaxCharges))
{
_maxCharges = reader.ReadEncodedInt();
}
if (GetOldSaveFlag(flags, OldSaveFlag.Charges))
{
_charges = reader.ReadEncodedInt();
}
if (GetOldSaveFlag(flags, OldSaveFlag.MaxChargeTime))
{
_maxChargeTime = reader.ReadEncodedInt();
}
if (GetOldSaveFlag(flags, OldSaveFlag.ChargeTime))
{
_chargeTime = reader.ReadEncodedInt();
}
if (GetOldSaveFlag(flags, OldSaveFlag.Slayer))
{
_slayer = (TalismanSlayerName)reader.ReadEncodedInt();
}
_blessed = GetOldSaveFlag(flags, OldSaveFlag.Blessed);
}
private static void SetOldSaveFlag(ref OldSaveFlag flags, OldSaveFlag toSet, bool setIf)
{
if (setIf)
{
flags |= toSet;
}
}
private static bool GetOldSaveFlag(OldSaveFlag flags, OldSaveFlag toGet) => (flags & toGet) != 0;
[Flags]
private enum OldSaveFlag
{
None = 0x00000000,
Attributes = 0x00000001,
SkillBonuses = 0x00000002,
Owner = 0x00000004,
Protection = 0x00000008,
Killer = 0x00000010,
Summoner = 0x00000020,
Removal = 0x00000040,
OldKarmaLoss = 0x00000080,
Skill = 0x00000100,
SuccessBonus = 0x00000200,
ExceptionalBonus = 0x00000400,
MaxCharges = 0x00000800,
Charges = 0x00001000,
MaxChargeTime = 0x00002000,
ChargeTime = 0x00004000,
Blessed = 0x00008000,
Slayer = 0x00010000
}
}

File diff suppressed because it is too large Load diff

View file

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

View file

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

View file

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

View file

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

View file

@ -1,8 +1,10 @@
using ModernUO.Serialization;
using Server.Targeting; using Server.Targeting;
namespace Server.Items namespace Server.Items;
{
public class RunedSwitch : Item [SerializationGenerator(0, false)]
public partial class RunedSwitch : Item
{ {
[Constructible] [Constructible]
public RunedSwitch() : base(0x2F61) => Weight = 1.0; public RunedSwitch() : base(0x2F61) => Weight = 1.0;
@ -26,29 +28,15 @@ namespace Server.Items
} }
} }
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 class InternalTarget : Target
{ {
private readonly RunedSwitch m_Item; private readonly RunedSwitch _item;
public InternalTarget(RunedSwitch item) : base(0, false, TargetFlags.None) => m_Item = item; public InternalTarget(RunedSwitch item) : base(0, false, TargetFlags.None) => _item = item;
protected override void OnTarget(Mobile from, object o) protected override void OnTarget(Mobile from, object o)
{ {
if (m_Item?.Deleted != false) if (_item?.Deleted != false)
{ {
return; return;
} }
@ -58,14 +46,13 @@ namespace Server.Items
if (talisman.Charges == 0) if (talisman.Charges == 0)
{ {
talisman.Charges = talisman.MaxCharges; talisman.Charges = talisman.MaxCharges;
m_Item.Delete(); _item.Delete();
from.SendLocalizedMessage(1075100); // The item has been recharged. from.SendLocalizedMessage(1075100); // The item has been recharged.
} }
else else
{ {
from.SendLocalizedMessage( // You cannot recharge that item until all of its current charges have been used.
1075099 from.SendLocalizedMessage(1075099);
); // You cannot recharge that item until all of its current charges have been used.
} }
} }
else else
@ -75,4 +62,3 @@ namespace Server.Items
} }
} }
} }
}

View file

@ -1,5 +1,5 @@
namespace Server.Items namespace Server.Items;
{
public class RandomTalisman : BaseTalisman public class RandomTalisman : BaseTalisman
{ {
[Constructible] [Constructible]
@ -59,4 +59,3 @@ namespace Server.Items
var version = reader.ReadInt(); var version = reader.ReadInt();
} }
} }
}

View file

@ -1,11 +1,25 @@
using System; using System;
using ModernUO.Serialization;
namespace Server.Items;
namespace Server.Items
{
[PropertyObject] [PropertyObject]
public class TalismanAttribute [SerializationGenerator(1, false)]
public partial class TalismanAttribute
{ {
public TalismanAttribute() : this(null, 0) [SerializableField(0)]
[SerializedCommandProperty(AccessLevel.GameMaster)]
private Type _type;
[SerializableField(1)]
[SerializedCommandProperty(AccessLevel.GameMaster)]
private TextDefinition _name;
[SerializableField(2)]
[SerializedCommandProperty(AccessLevel.GameMaster)]
private int _amount;
public TalismanAttribute() : this(null, null)
{ {
} }
@ -13,105 +27,46 @@ namespace Server.Items
{ {
if (copy != null) if (copy != null)
{ {
Type = copy.Type; _type = copy.Type;
Name = copy.Name; _name = copy.Name;
Amount = copy.Amount; _amount = copy.Amount;
} }
} }
public TalismanAttribute(Type type, TextDefinition name, int amount = 0) public TalismanAttribute(Type type, TextDefinition name, int amount = 0)
{ {
Type = type; _type = type;
Name = name; _name = name;
Amount = amount; _amount = amount;
} }
public TalismanAttribute(IGenericReader reader) private void Deserialize(IGenericReader reader, int version)
{ {
var version = reader.ReadInt(); var flags = reader.ReadEncodedInt();
var flags = (SaveFlag)reader.ReadEncodedInt(); if ((flags & 0x1) != 0)
if (GetSaveFlag(flags, SaveFlag.Type))
{ {
Type = AssemblyHandler.FindTypeByFullName(reader.ReadString()); _type = AssemblyHandler.FindTypeByFullName(reader.ReadString());
} }
if (GetSaveFlag(flags, SaveFlag.Name)) if ((flags & 0x2) != 0)
{ {
Name = reader.ReadTextDefinition(); _name = reader.ReadTextDefinition();
} }
if (GetSaveFlag(flags, SaveFlag.Amount)) if ((flags & 0x4) != 0)
{ {
Amount = reader.ReadEncodedInt(); _amount = reader.ReadEncodedInt();
} }
} }
[CommandProperty(AccessLevel.GameMaster)] [CommandProperty(AccessLevel.GameMaster)]
public Type Type { get; set; } public bool IsEmpty => _type == null;
[CommandProperty(AccessLevel.GameMaster)] [CommandProperty(AccessLevel.GameMaster)]
public TextDefinition Name { get; set; } public bool IsItem => _type.IsAssignableTo(typeof(Item));
[CommandProperty(AccessLevel.GameMaster)] public override string ToString() => _type?.Name ?? "None";
public int Amount { get; set; }
[CommandProperty(AccessLevel.GameMaster)] public int DamageBonus(Mobile to) => to?.GetType() == _type ? _amount : 0;
public bool IsEmpty => Type == null;
[CommandProperty(AccessLevel.GameMaster)]
public bool IsItem => Type?.Namespace == "Server.Items";
public override string ToString() => Type?.Name ?? "None";
private static void SetSaveFlag(ref SaveFlag flags, SaveFlag toSet, bool setIf)
{
if (setIf)
{
flags |= toSet;
}
}
private static bool GetSaveFlag(SaveFlag flags, SaveFlag toGet) => (flags & toGet) != 0;
public virtual void Serialize(IGenericWriter writer)
{
writer.Write(0); // version
var flags = SaveFlag.None;
SetSaveFlag(ref flags, SaveFlag.Type, Type != null);
SetSaveFlag(ref flags, SaveFlag.Name, Name != null);
SetSaveFlag(ref flags, SaveFlag.Amount, Amount != 0);
writer.WriteEncodedInt((int)flags);
if (GetSaveFlag(flags, SaveFlag.Type))
{
writer.Write(Type!.FullName);
}
if (GetSaveFlag(flags, SaveFlag.Name))
{
writer.Write(Name);
}
if (GetSaveFlag(flags, SaveFlag.Amount))
{
writer.WriteEncodedInt(Amount);
}
}
public int DamageBonus(Mobile to) => to?.GetType() == Type ? Amount : 0;
[Flags]
private enum SaveFlag
{
None = 0x00000000,
Type = 0x00000001,
Name = 0x00000002,
Amount = 0x00000004
}
}
} }

View file

@ -2,8 +2,8 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using Server.Mobiles; using Server.Mobiles;
namespace Server.Items namespace Server.Items;
{
public enum TalismanSlayerName public enum TalismanSlayerName
{ {
None, None,
@ -104,4 +104,3 @@ namespace Server.Items
return false; return false;
} }
} }
}

View file

@ -1,11 +1,13 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using ModernUO.Serialization;
using Server.ContextMenus; using Server.ContextMenus;
using Server.Items; using Server.Items;
namespace Server.Mobiles namespace Server.Mobiles;
{
public class BaseTalismanSummon : BaseCreature [SerializationGenerator(0)]
public partial class BaseTalismanSummon : BaseCreature
{ {
// public override bool IsInvulnerable => true; // TODO: Wailing banshees are NOT invulnerable, are any of the others? // public override bool IsInvulnerable => true; // TODO: Wailing banshees are NOT invulnerable, are any of the others?
@ -14,10 +16,6 @@ namespace Server.Mobiles
// TODO: Stats/skills // TODO: Stats/skills
} }
public BaseTalismanSummon(Serial serial) : base(serial)
{
}
public override bool Commandable => false; public override bool Commandable => false;
public override bool InitialInnocent => true; public override bool InitialInnocent => true;
@ -29,20 +27,6 @@ namespace Server.Mobiles
} }
} }
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadEncodedInt();
}
private class TalismanReleaseEntry : ContextMenuEntry private class TalismanReleaseEntry : ContextMenuEntry
{ {
private readonly Mobile m_Mobile; private readonly Mobile m_Mobile;
@ -66,7 +50,8 @@ namespace Server.Mobiles
} }
} }
public class SummonedAntLion : BaseTalismanSummon [SerializationGenerator(0)]
public partial class SummonedAntLion : BaseTalismanSummon
{ {
[Constructible] [Constructible]
public SummonedAntLion() public SummonedAntLion()
@ -75,28 +60,12 @@ namespace Server.Mobiles
BaseSoundID = 1006; BaseSoundID = 1006;
} }
public SummonedAntLion(Serial serial) : base(serial)
{
}
public override string DefaultName => "an ant lion"; public override string DefaultName => "an ant lion";
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt(0); // version
} }
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadEncodedInt(); [SerializationGenerator(0)]
} public partial class SummonedArcticOgreLord : BaseTalismanSummon
}
public class SummonedArcticOgreLord : BaseTalismanSummon
{ {
[Constructible] [Constructible]
public SummonedArcticOgreLord() public SummonedArcticOgreLord()
@ -105,28 +74,11 @@ namespace Server.Mobiles
BaseSoundID = 427; BaseSoundID = 427;
} }
public SummonedArcticOgreLord(Serial serial) : base(serial)
{
}
public override string DefaultName => "an arctic ogre lord"; public override string DefaultName => "an arctic ogre lord";
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt(0); // version
} }
public override void Deserialize(IGenericReader reader) [SerializationGenerator(0)]
{ public partial class SummonedBakeKitsune : BaseTalismanSummon
base.Deserialize(reader);
var version = reader.ReadEncodedInt();
}
}
public class SummonedBakeKitsune : BaseTalismanSummon
{ {
[Constructible] [Constructible]
public SummonedBakeKitsune() public SummonedBakeKitsune()
@ -135,28 +87,11 @@ namespace Server.Mobiles
BaseSoundID = 0x4DD; BaseSoundID = 0x4DD;
} }
public SummonedBakeKitsune(Serial serial) : base(serial)
{
}
public override string DefaultName => "a bake kitsune"; public override string DefaultName => "a bake kitsune";
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt(0); // version
} }
public override void Deserialize(IGenericReader reader) [SerializationGenerator(0)]
{ public partial class SummonedBogling : BaseTalismanSummon
base.Deserialize(reader);
var version = reader.ReadEncodedInt();
}
}
public class SummonedBogling : BaseTalismanSummon
{ {
[Constructible] [Constructible]
public SummonedBogling() public SummonedBogling()
@ -165,28 +100,11 @@ namespace Server.Mobiles
BaseSoundID = 422; BaseSoundID = 422;
} }
public SummonedBogling(Serial serial) : base(serial)
{
}
public override string DefaultName => "a bogling"; public override string DefaultName => "a bogling";
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt(0); // version
} }
public override void Deserialize(IGenericReader reader) [SerializationGenerator(0)]
{ public partial class SummonedBullFrog : BaseTalismanSummon
base.Deserialize(reader);
var version = reader.ReadEncodedInt();
}
}
public class SummonedBullFrog : BaseTalismanSummon
{ {
[Constructible] [Constructible]
public SummonedBullFrog() public SummonedBullFrog()
@ -196,28 +114,11 @@ namespace Server.Mobiles
BaseSoundID = 0x266; BaseSoundID = 0x266;
} }
public SummonedBullFrog(Serial serial) : base(serial)
{
}
public override string DefaultName => "a bull frog"; public override string DefaultName => "a bull frog";
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt(0); // version
} }
public override void Deserialize(IGenericReader reader) [SerializationGenerator(0)]
{ public partial class SummonedChicken : BaseTalismanSummon
base.Deserialize(reader);
var version = reader.ReadEncodedInt();
}
}
public class SummonedChicken : BaseTalismanSummon
{ {
[Constructible] [Constructible]
public SummonedChicken() public SummonedChicken()
@ -226,28 +127,11 @@ namespace Server.Mobiles
BaseSoundID = 0x6E; BaseSoundID = 0x6E;
} }
public SummonedChicken(Serial serial) : base(serial)
{
}
public override string DefaultName => "a chicken"; public override string DefaultName => "a chicken";
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt(0); // version
} }
public override void Deserialize(IGenericReader reader) [SerializationGenerator(0)]
{ public partial class SummonedCow : BaseTalismanSummon
base.Deserialize(reader);
var version = reader.ReadEncodedInt();
}
}
public class SummonedCow : BaseTalismanSummon
{ {
[Constructible] [Constructible]
public SummonedCow() public SummonedCow()
@ -256,28 +140,11 @@ namespace Server.Mobiles
BaseSoundID = 0x78; BaseSoundID = 0x78;
} }
public SummonedCow(Serial serial) : base(serial)
{
}
public override string DefaultName => "a cow"; public override string DefaultName => "a cow";
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt(0); // version
} }
public override void Deserialize(IGenericReader reader) [SerializationGenerator(0)]
{ public partial class SummonedDoppleganger : BaseTalismanSummon
base.Deserialize(reader);
var version = reader.ReadEncodedInt();
}
}
public class SummonedDoppleganger : BaseTalismanSummon
{ {
[Constructible] [Constructible]
public SummonedDoppleganger() public SummonedDoppleganger()
@ -286,28 +153,11 @@ namespace Server.Mobiles
BaseSoundID = 0x451; BaseSoundID = 0x451;
} }
public SummonedDoppleganger(Serial serial) : base(serial)
{
}
public override string DefaultName => "a doppleganger"; public override string DefaultName => "a doppleganger";
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt(0); // version
} }
public override void Deserialize(IGenericReader reader) [SerializationGenerator(0)]
{ public partial class SummonedFrostSpider : BaseTalismanSummon
base.Deserialize(reader);
var version = reader.ReadEncodedInt();
}
}
public class SummonedFrostSpider : BaseTalismanSummon
{ {
[Constructible] [Constructible]
public SummonedFrostSpider() public SummonedFrostSpider()
@ -316,28 +166,11 @@ namespace Server.Mobiles
BaseSoundID = 0x388; BaseSoundID = 0x388;
} }
public SummonedFrostSpider(Serial serial) : base(serial)
{
}
public override string DefaultName => "a frost spider"; public override string DefaultName => "a frost spider";
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt(0); // version
} }
public override void Deserialize(IGenericReader reader) [SerializationGenerator(0)]
{ public partial class SummonedGreatHart : BaseTalismanSummon
base.Deserialize(reader);
var version = reader.ReadEncodedInt();
}
}
public class SummonedGreatHart : BaseTalismanSummon
{ {
[Constructible] [Constructible]
public SummonedGreatHart() public SummonedGreatHart()
@ -346,28 +179,11 @@ namespace Server.Mobiles
BaseSoundID = 0x82; BaseSoundID = 0x82;
} }
public SummonedGreatHart(Serial serial) : base(serial)
{
}
public override string DefaultName => "a great hart"; public override string DefaultName => "a great hart";
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt(0); // version
} }
public override void Deserialize(IGenericReader reader) [SerializationGenerator(0)]
{ public partial class SummonedLavaSerpent : BaseTalismanSummon
base.Deserialize(reader);
var version = reader.ReadEncodedInt();
}
}
public class SummonedLavaSerpent : BaseTalismanSummon
{ {
[Constructible] [Constructible]
public SummonedLavaSerpent() public SummonedLavaSerpent()
@ -376,10 +192,6 @@ namespace Server.Mobiles
BaseSoundID = 219; BaseSoundID = 219;
} }
public SummonedLavaSerpent(Serial serial) : base(serial)
{
}
public override string DefaultName => "a lava serpent"; public override string DefaultName => "a lava serpent";
public override void OnThink() public override void OnThink()
@ -390,20 +202,6 @@ namespace Server.Mobiles
*/ */
} }
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadEncodedInt();
}
/* /*
// An area attack that only damages staff, wtf? // An area attack that only damages staff, wtf?
@ -441,7 +239,8 @@ namespace Server.Mobiles
*/ */
} }
public class SummonedOrcBrute : BaseTalismanSummon [SerializationGenerator(0)]
public partial class SummonedOrcBrute : BaseTalismanSummon
{ {
[Constructible] [Constructible]
public SummonedOrcBrute() public SummonedOrcBrute()
@ -450,28 +249,11 @@ namespace Server.Mobiles
BaseSoundID = 0x45A; BaseSoundID = 0x45A;
} }
public SummonedOrcBrute(Serial serial) : base(serial)
{
}
public override string DefaultName => "an orc brute"; public override string DefaultName => "an orc brute";
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt(0); // version
} }
public override void Deserialize(IGenericReader reader) [SerializationGenerator(0)]
{ public partial class SummonedPanther : BaseTalismanSummon
base.Deserialize(reader);
var version = reader.ReadEncodedInt();
}
}
public class SummonedPanther : BaseTalismanSummon
{ {
[Constructible] [Constructible]
public SummonedPanther() public SummonedPanther()
@ -481,28 +263,11 @@ namespace Server.Mobiles
BaseSoundID = 0x462; BaseSoundID = 0x462;
} }
public SummonedPanther(Serial serial) : base(serial)
{
}
public override string DefaultName => "a panther"; public override string DefaultName => "a panther";
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt(0); // version
} }
public override void Deserialize(IGenericReader reader) [SerializationGenerator(0)]
{ public partial class SummonedSheep : BaseTalismanSummon
base.Deserialize(reader);
var version = reader.ReadEncodedInt();
}
}
public class SummonedSheep : BaseTalismanSummon
{ {
[Constructible] [Constructible]
public SummonedSheep() public SummonedSheep()
@ -511,28 +276,11 @@ namespace Server.Mobiles
BaseSoundID = 0xD6; BaseSoundID = 0xD6;
} }
public SummonedSheep(Serial serial) : base(serial)
{
}
public override string DefaultName => "a sheep"; public override string DefaultName => "a sheep";
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt(0); // version
} }
public override void Deserialize(IGenericReader reader) [SerializationGenerator(0)]
{ public partial class SummonedSkeletalKnight : BaseTalismanSummon
base.Deserialize(reader);
var version = reader.ReadEncodedInt();
}
}
public class SummonedSkeletalKnight : BaseTalismanSummon
{ {
[Constructible] [Constructible]
public SummonedSkeletalKnight() public SummonedSkeletalKnight()
@ -541,28 +289,11 @@ namespace Server.Mobiles
BaseSoundID = 451; BaseSoundID = 451;
} }
public SummonedSkeletalKnight(Serial serial) : base(serial)
{
}
public override string DefaultName => "a skeletal knight"; public override string DefaultName => "a skeletal knight";
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt(0); // version
} }
public override void Deserialize(IGenericReader reader) [SerializationGenerator(0)]
{ public partial class SummonedVorpalBunny : BaseTalismanSummon
base.Deserialize(reader);
var version = reader.ReadEncodedInt();
}
}
public class SummonedVorpalBunny : BaseTalismanSummon
{ {
[Constructible] [Constructible]
public SummonedVorpalBunny() public SummonedVorpalBunny()
@ -574,10 +305,6 @@ namespace Server.Mobiles
Timer.StartTimer(TimeSpan.FromMinutes(30.0), BeginTunnel); Timer.StartTimer(TimeSpan.FromMinutes(30.0), BeginTunnel);
} }
public SummonedVorpalBunny(Serial serial) : base(serial)
{
}
public override string DefaultName => "a vorpal bunny"; public override string DefaultName => "a vorpal bunny";
public virtual void BeginTunnel() public virtual void BeginTunnel()
@ -596,23 +323,10 @@ namespace Server.Mobiles
Timer.StartTimer(TimeSpan.FromSeconds(5.0), Delete); Timer.StartTimer(TimeSpan.FromSeconds(5.0), Delete);
} }
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt(0); // version
} }
public override void Deserialize(IGenericReader reader) [SerializationGenerator(0)]
{ public partial class SummonedWailingBanshee : BaseTalismanSummon
base.Deserialize(reader);
var version = reader.ReadEncodedInt();
}
}
public class SummonedWailingBanshee : BaseTalismanSummon
{ {
[Constructible] [Constructible]
public SummonedWailingBanshee() public SummonedWailingBanshee()
@ -621,24 +335,5 @@ namespace Server.Mobiles
BaseSoundID = 0x482; BaseSoundID = 0x482;
} }
public SummonedWailingBanshee(Serial serial) : base(serial)
{
}
public override string DefaultName => "a wailing banshee"; public override string DefaultName => "a wailing banshee";
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
var version = reader.ReadEncodedInt();
}
}
} }

View file

@ -0,0 +1,132 @@
{
"version": 1,
"type": "Server.Items.BaseTalisman",
"properties": [
{
"name": "Attributes",
"type": "Server.AosAttributes",
"usesSaveFlag": true,
"rule": "RawSerializableMigrationRule",
"ruleArguments": [
"DeserializationRequiresParent"
]
},
{
"name": "SkillBonuses",
"type": "Server.AosSkillBonuses",
"usesSaveFlag": true,
"rule": "RawSerializableMigrationRule",
"ruleArguments": [
"DeserializationRequiresParent"
]
},
{
"name": "Protection",
"type": "Server.Items.TalismanAttribute",
"usesSaveFlag": true,
"rule": "RawSerializableMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "Killer",
"type": "Server.Items.TalismanAttribute",
"usesSaveFlag": true,
"rule": "RawSerializableMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "Summoner",
"type": "Server.Items.TalismanAttribute",
"usesSaveFlag": true,
"rule": "RawSerializableMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "Removal",
"type": "Server.Items.TalismanRemoval",
"usesSaveFlag": true,
"rule": "EnumMigrationRule"
},
{
"name": "Skill",
"type": "Server.SkillName",
"usesSaveFlag": true,
"rule": "EnumMigrationRule"
},
{
"name": "SuccessBonus",
"type": "int",
"usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
"EncodedInt"
]
},
{
"name": "ExceptionalBonus",
"type": "int",
"usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
"EncodedInt"
]
},
{
"name": "MaxCharges",
"type": "int",
"usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
"EncodedInt"
]
},
{
"name": "Charges",
"type": "int",
"usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "MaxChargeTime",
"type": "int",
"usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
"EncodedInt"
]
},
{
"name": "ChargeTime",
"type": "int",
"usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
"EncodedInt"
]
},
{
"name": "Blessed",
"type": "bool",
"usesSaveFlag": true,
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "Slayer",
"type": "Server.Items.TalismanSlayerName",
"usesSaveFlag": true,
"rule": "EnumMigrationRule"
}
]
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Items.EnchantedSwitch"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Items.HollowPrism"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Items.JeweledFiligree"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Items.RunedPrism"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Items.RunedSwitch"
}

View file

@ -0,0 +1,27 @@
{
"version": 1,
"type": "Server.Items.TalismanAttribute",
"properties": [
{
"name": "Type",
"type": "System.Type",
"rule": "PrimitiveTypeMigrationRule"
},
{
"name": "Name",
"type": "Server.TextDefinition",
"rule": "PrimitiveUOTypeMigrationRule",
"ruleArguments": [
"TextDefinition"
]
},
{
"name": "Amount",
"type": "int",
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
}
]
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.BaseTalismanSummon"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.SummonedAntLion"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.SummonedArcticOgreLord"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.SummonedBakeKitsune"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.SummonedBogling"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.SummonedBullFrog"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.SummonedChicken"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.SummonedCow"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.SummonedDoppleganger"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.SummonedFrostSpider"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.SummonedGreatHart"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.SummonedLavaSerpent"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.SummonedOrcBrute"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.SummonedPanther"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.SummonedSheep"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.SummonedSkeletalKnight"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.SummonedVorpalBunny"
}

View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Mobiles.SummonedWailingBanshee"
}

View file

@ -3515,11 +3515,21 @@ namespace Server.Mobiles
} }
public static bool Summon(BaseCreature creature, Mobile caster, Point3D p, int sound, TimeSpan duration) => public static bool Summon(BaseCreature creature, Mobile caster, Point3D p, int sound, TimeSpan duration) =>
Summon(creature, true, caster, p, sound, duration); Summon(creature, true, caster, p, sound, duration, null);
public static bool Summon(
BaseCreature creature, Mobile caster, Point3D p, int sound, TimeSpan duration,
Action onUnsummon
) => Summon(creature, true, caster, p, sound, duration, onUnsummon);
public static bool Summon( public static bool Summon(
BaseCreature creature, bool controlled, Mobile caster, Point3D p, int sound, BaseCreature creature, bool controlled, Mobile caster, Point3D p, int sound,
TimeSpan duration TimeSpan duration
) => Summon(creature, controlled, caster, p, sound, duration, null);
public static bool Summon(
BaseCreature creature, bool controlled, Mobile caster, Point3D p, int sound,
TimeSpan duration, Action onUnsummon
) )
{ {
if (caster.Followers + creature.ControlSlots > caster.FollowersMax) if (caster.Followers + creature.ControlSlots > caster.FollowersMax)
@ -3556,7 +3566,7 @@ namespace Server.Mobiles
} }
} }
new UnsummonTimer(creature, duration).Start(); new UnsummonTimer(creature, duration, onUnsummon).Start();
creature.SummonEnd = Core.Now + duration; creature.SummonEnd = Core.Now + duration;
creature.MoveToWorld(p, caster.Map); creature.MoveToWorld(p, caster.Map);

View file

@ -10,6 +10,7 @@ public class UnsummonTimer : Timer
// Track timers since some of them are really long and might hold references to long dead/deleted mobs // Track timers since some of them are really long and might hold references to long dead/deleted mobs
private static readonly Dictionary<BaseCreature, UnsummonTimer> _timers = new(); private static readonly Dictionary<BaseCreature, UnsummonTimer> _timers = new();
private BaseCreature _creature; private BaseCreature _creature;
private Action _onUnsummon;
public static void StopTimer(BaseCreature creature) public static void StopTimer(BaseCreature creature)
{ {
@ -19,8 +20,9 @@ public class UnsummonTimer : Timer
} }
} }
public UnsummonTimer(BaseCreature creature, TimeSpan delay) : base(delay) public UnsummonTimer(BaseCreature creature, TimeSpan delay, Action onUnsummon = null) : base(delay)
{ {
_onUnsummon = onUnsummon;
_creature = creature; _creature = creature;
ref var timer = ref CollectionsMarshal.GetValueRefOrAddDefault(_timers, creature, out bool exists); ref var timer = ref CollectionsMarshal.GetValueRefOrAddDefault(_timers, creature, out bool exists);
@ -36,5 +38,6 @@ public class UnsummonTimer : Timer
{ {
// BaseCreature.OnAfterDelete will remove the creature from the timers table // BaseCreature.OnAfterDelete will remove the creature from the timers table
_creature?.Delete(); _creature?.Delete();
_onUnsummon?.Invoke();
} }
} }

View file

@ -39,7 +39,7 @@
<PackageReference Include="Zstd.Binaries" Version="1.6.0" /> <PackageReference Include="Zstd.Binaries" Version="1.6.0" />
<PackageReference Include="ModernUO.Serialization.Annotations" Version="2.6.0" /> <PackageReference Include="ModernUO.Serialization.Annotations" Version="2.6.0" />
<PackageReference Include="ModernUO.Serialization.Generator" Version="2.6.4" /> <PackageReference Include="ModernUO.Serialization.Generator" Version="2.7.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<AdditionalFiles Include="Migrations/*.v*.json" /> <AdditionalFiles Include="Migrations/*.v*.json" />