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

fix: Codegens spellbooks (#1349)

Browse source
This commit is contained in:
Kamron Batman 2023-02-24 19:04:21 -08:00 • committed by GitHub
parent 8e49fb4da4
commit 10b26741c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 1386 additions and 1509 deletions
Download patch file Download diff file Expand all files Collapse all files

45
Projects/UOContent/Items/Skill Items/Magical/BookOfBushido.cs
View file

@ -1,36 +1,15 @@
namespace Server.Items
using ModernUO.Serialization;
namespace Server.Items;
[SerializationGenerator(0, false)]
public partial class BookOfBushido : Spellbook
{
public class BookOfBushido : Spellbook
{
[Constructible]
public BookOfBushido(ulong content = 0x3F) : base(content, 0x238C) =>
Layer = Core.ML ? Layer.OneHanded : Layer.Invalid;
[Constructible]
public BookOfBushido(ulong content = 0x3F) : base(content, 0x238C) =>
Layer = Core.ML ? Layer.OneHanded : Layer.Invalid;
public BookOfBushido(Serial serial) : base(serial)
{
}
public override SpellbookType SpellbookType => SpellbookType.Samurai;
public override int BookOffset => 400;
public override int BookCount => 6;
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 && Core.ML)
{
Layer = Layer.OneHanded;
}
}
}
public override SpellbookType SpellbookType => SpellbookType.Samurai;
public override int BookOffset => 400;
public override int BookCount => 6;
}

45
Projects/UOContent/Items/Skill Items/Magical/BookOfChivalry.cs
View file

@ -1,36 +1,15 @@
namespace Server.Items
using ModernUO.Serialization;
namespace Server.Items;
[SerializationGenerator(0, false)]
public partial class BookOfChivalry : Spellbook
{
public class BookOfChivalry : Spellbook
{
[Constructible]
public BookOfChivalry(ulong content = 0x3FF) : base(content, 0x2252) =>
Layer = Core.ML ? Layer.OneHanded : Layer.Invalid;
[Constructible]
public BookOfChivalry(ulong content = 0x3FF) : base(content, 0x2252) =>
Layer = Core.ML ? Layer.OneHanded : Layer.Invalid;
public BookOfChivalry(Serial serial) : base(serial)
{
}
public override SpellbookType SpellbookType => SpellbookType.Paladin;
public override int BookOffset => 200;
public override int BookCount => 10;
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 && Core.ML)
{
Layer = Layer.OneHanded;
}
}
}
public override SpellbookType SpellbookType => SpellbookType.Paladin;
public override int BookOffset => 200;
public override int BookCount => 10;
}

45
Projects/UOContent/Items/Skill Items/Magical/BookOfNinjitsu.cs
View file

@ -1,36 +1,15 @@
namespace Server.Items
using ModernUO.Serialization;
namespace Server.Items;
[SerializationGenerator(0, false)]
public partial class BookOfNinjitsu : Spellbook
{
public class BookOfNinjitsu : Spellbook
{
[Constructible]
public BookOfNinjitsu(ulong content = 0xFF) : base(content, 0x23A0) =>
Layer = Core.ML ? Layer.OneHanded : Layer.Invalid;
[Constructible]
public BookOfNinjitsu(ulong content = 0xFF) : base(content, 0x23A0) =>
Layer = Core.ML ? Layer.OneHanded : Layer.Invalid;
public BookOfNinjitsu(Serial serial) : base(serial)
{
}
public override SpellbookType SpellbookType => SpellbookType.Ninja;
public override int BookOffset => 500;
public override int BookCount => 8;
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 && Core.ML)
{
Layer = Layer.OneHanded;
}
}
}
public override SpellbookType SpellbookType => SpellbookType.Ninja;
public override int BookOffset => 500;
public override int BookCount => 8;
}

42
Projects/UOContent/Items/Skill Items/Magical/MysticSpellbook.cs
View file

@ -1,35 +1,15 @@
namespace Server.Items
using ModernUO.Serialization;
namespace Server.Items;
[SerializationGenerator(0, false)]
public partial class MysticSpellbook : Spellbook
{
public class MysticSpellbook : Spellbook
{
[Constructible]
public MysticSpellbook(ulong content = 0)
: base(content, 0x2D9D) =>
Layer = Layer.OneHanded;
[Constructible]
public MysticSpellbook(ulong content = 0) : base(content, 0x2D9D) => Layer = Layer.OneHanded;
public MysticSpellbook(Serial serial)
: base(serial)
{
}
public override SpellbookType SpellbookType => SpellbookType.Mystic;
public override SpellbookType SpellbookType => SpellbookType.Mystic;
public override int BookOffset => 677;
public override int BookCount => 16;
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
/*int version = */
reader.ReadInt();
}
}
public override int BookOffset => 677;
public override int BookCount => 16;
}

45
Projects/UOContent/Items/Skill Items/Magical/NecromancerSpellbook.cs
View file

@ -1,36 +1,15 @@
namespace Server.Items
using ModernUO.Serialization;
namespace Server.Items;
[SerializationGenerator(0, false)]
public partial class NecromancerSpellbook : Spellbook
{
public class NecromancerSpellbook : Spellbook
{
[Constructible]
public NecromancerSpellbook(ulong content = 0) : base(content, 0x2253) =>
Layer = Core.ML ? Layer.OneHanded : Layer.Invalid;
[Constructible]
public NecromancerSpellbook(ulong content = 0) : base(content, 0x2253) =>
Layer = Core.ML ? Layer.OneHanded : Layer.Invalid;
public NecromancerSpellbook(Serial serial) : base(serial)
{
}
public override SpellbookType SpellbookType => SpellbookType.Necromancer;
public override int BookOffset => 100;
public override int BookCount => Core.SE ? 17 : 16;
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 && Core.ML)
{
Layer = Layer.OneHanded;
}
}
}
public override SpellbookType SpellbookType => SpellbookType.Necromancer;
public override int BookOffset => 100;
public override int BookCount => Core.SE ? 17 : 16;
}

828
Projects/UOContent/Items/Skill Items/Magical/Runebook.cs
View file

@ -1,519 +1,431 @@
using System;
using System.Collections.Generic;
using ModernUO.Serialization;
using Server.ContextMenus;
using Server.Engines.Craft;
using Server.Gumps;
using Server.Mobiles;
using Server.Multis;
namespace Server.Items
namespace Server.Items;
[SerializationGenerator(4, false)]
public partial class Runebook : Item, ISecurable, ICraftable
{
public class Runebook : Item, ISecurable, ICraftable
public static readonly TimeSpan UseDelay = TimeSpan.FromSeconds(7.0);
[InvalidateProperties]
[SerializableField(0)]
[SerializedCommandProperty(AccessLevel.GameMaster)]
private BookQuality _quality;
[InvalidateProperties]
[SerializableField(1)]
[SerializedCommandProperty(AccessLevel.GameMaster)]
private string _crafter;
[SerializableField(2)]
[SerializedCommandProperty(AccessLevel.GameMaster)]
private SecureLevel _level;
[SerializableField(3, setter: "private")]
private List<RunebookEntry> _entries;
[InvalidateProperties]
[SerializableField(4)]
[SerializedCommandProperty(AccessLevel.GameMaster)]
private string _description;
[SerializableField(5)]
[SerializedCommandProperty(AccessLevel.GameMaster)]
private int _curCharges;
[SerializableField(6)]
[SerializedCommandProperty(AccessLevel.GameMaster)]
private int _maxCharges;
[SerializableField(7, getter: "private", setter: "private")]
private int _defaultIndex;
[Constructible]
public Runebook() : this(Core.SE ? 12 : 6)
{
public static readonly TimeSpan UseDelay = TimeSpan.FromSeconds(7.0);
private Mobile m_Crafter;
private int m_DefaultIndex;
}
private string m_Description;
[Constructible]
public Runebook(int maxCharges) : base(Core.AOS ? 0x22C5 : 0xEFA)
{
Weight = Core.SE ? 1.0 : 3.0;
LootType = LootType.Blessed;
Hue = 0x461;
private BookQuality m_Quality;
Layer = Core.AOS ? Layer.Invalid : Layer.OneHanded;
[Constructible]
public Runebook() : this(Core.SE ? 12 : 6)
_entries = new List<RunebookEntry>();
_maxCharges = maxCharges;
_defaultIndex = -1;
_level = SecureLevel.CoOwners;
}
[CommandProperty(AccessLevel.GameMaster)]
public DateTime NextUse { get; set; }
public List<Mobile> Openers { get; set; } = new();
public override int LabelNumber => 1041267; // runebook
public RunebookEntry Default
{
get
{
if (_defaultIndex >= 0 && _defaultIndex < Entries.Count)
{
return Entries[_defaultIndex];
}
return null;
}
set => DefaultIndex = value == null ? -1 : Entries.IndexOf(value);
}
public override bool DisplayLootType => Core.AOS;
public int OnCraft(
int quality, bool makersMark, Mobile from, CraftSystem craftSystem, Type typeRes, BaseTool tool,
CraftItem craftItem, int resHue
)
{
var charges = Math.Min(5 + quality + (int)(from.Skills.Inscribe.Value / 30), 10);
MaxCharges = Core.SE ? charges * 2 : charges;
if (makersMark)
{
Crafter = from.RawName;
}
[Constructible]
public Runebook(int maxCharges) : base(Core.AOS ? 0x22C5 : 0xEFA)
Quality = (BookQuality)(quality - 1);
return quality;
}
public override bool AllowEquippedCast(Mobile from) => true;
public override void GetContextMenuEntries(Mobile from, List<ContextMenuEntry> list)
{
base.GetContextMenuEntries(from, list);
SetSecureLevelEntry.AddTo(from, this, list);
}
private void Deserialize(IGenericReader reader, int version)
{
base.Deserialize(reader);
_quality = (BookQuality)reader.ReadByte();
_crafter = reader.ReadEntity<Mobile>()?.RawName;
_level = (SecureLevel)reader.ReadInt();
var count = reader.ReadInt();
Entries = new List<RunebookEntry>(count);
for (var i = 0; i < count; ++i)
{
Weight = Core.SE ? 1.0 : 3.0;
LootType = LootType.Blessed;
Hue = 0x461;
Layer = Core.AOS ? Layer.Invalid : Layer.OneHanded;
Entries = new List<RunebookEntry>();
MaxCharges = maxCharges;
m_DefaultIndex = -1;
Level = SecureLevel.CoOwners;
Entries.Add(new RunebookEntry(reader));
}
public Runebook(Serial serial) : base(serial)
_description = reader.ReadString();
_curCharges = reader.ReadInt();
_maxCharges = reader.ReadInt();
_defaultIndex = reader.ReadInt();
}
public void DropRune(Mobile from, RunebookEntry e, int index)
{
if (_defaultIndex > index)
{
DefaultIndex -= 1;
}
else if (_defaultIndex == index)
{
DefaultIndex = -1;
}
[CommandProperty(AccessLevel.GameMaster)]
public BookQuality Quality
this.RemoveAt(_entries, index);
var rune = new RecallRune
{
get => m_Quality;
set
{
m_Quality = value;
InvalidateProperties();
}
}
Target = e.Location,
TargetMap = e.Map,
Description = e.Description,
House = e.House,
Marked = true
};
[CommandProperty(AccessLevel.GameMaster)]
public DateTime NextUse { get; set; }
from.AddToBackpack(rune);
[CommandProperty(AccessLevel.GameMaster)]
public Mobile Crafter
from.SendLocalizedMessage(502421); // You have removed the rune.
}
public bool IsOpen(Mobile toCheck)
{
var ns = toCheck.NetState;
if (ns == null)
{
get => m_Crafter;
set
{
m_Crafter = value;
InvalidateProperties();
}
}
[CommandProperty(AccessLevel.GameMaster)]
public string Description
{
get => m_Description;
set
{
m_Description = value;
InvalidateProperties();
}
}
[CommandProperty(AccessLevel.GameMaster)]
public int CurCharges { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public int MaxCharges { get; set; }
public List<Mobile> Openers { get; set; } = new();
public override int LabelNumber => 1041267; // runebook
public List<RunebookEntry> Entries { get; private set; }
public RunebookEntry Default
{
get
{
if (m_DefaultIndex >= 0 && m_DefaultIndex < Entries.Count)
{
return Entries[m_DefaultIndex];
}
return null;
}
set
{
if (value == null)
{
m_DefaultIndex = -1;
}
else
{
m_DefaultIndex = Entries.IndexOf(value);
}
}
}
public override bool DisplayLootType => Core.AOS;
public int OnCraft(
int quality, bool makersMark, Mobile from, CraftSystem craftSystem, Type typeRes, BaseTool tool,
CraftItem craftItem, int resHue
)
{
var charges = 5 + quality + (int)(from.Skills.Inscribe.Value / 30);
if (charges > 10)
{
charges = 10;
}
MaxCharges = Core.SE ? charges * 2 : charges;
if (makersMark)
{
Crafter = from;
}
m_Quality = (BookQuality)(quality - 1);
return quality;
}
[CommandProperty(AccessLevel.GameMaster)]
public SecureLevel Level { get; set; }
public override bool AllowEquippedCast(Mobile from) => true;
public override void GetContextMenuEntries(Mobile from, List<ContextMenuEntry> list)
{
base.GetContextMenuEntries(from, list);
SetSecureLevelEntry.AddTo(from, this, list);
}
public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);
writer.Write(3);
writer.Write((byte)m_Quality);
writer.Write(m_Crafter);
writer.Write((int)Level);
writer.Write(Entries.Count);
for (var i = 0; i < Entries.Count; ++i)
{
Entries[i].Serialize(writer);
}
writer.Write(m_Description);
writer.Write(CurCharges);
writer.Write(MaxCharges);
writer.Write(m_DefaultIndex);
}
public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);
LootType = LootType.Blessed;
if (Core.SE && Weight == 3.0)
{
Weight = 1.0;
}
var version = reader.ReadInt();
switch (version)
{
case 3:
{
m_Quality = (BookQuality)reader.ReadByte();
goto case 2;
}
case 2:
{
m_Crafter = reader.ReadEntity<Mobile>();
goto case 1;
}
case 1:
{
Level = (SecureLevel)reader.ReadInt();
goto case 0;
}
case 0:
{
var count = reader.ReadInt();
Entries = new List<RunebookEntry>(count);
for (var i = 0; i < count; ++i)
{
Entries.Add(new RunebookEntry(reader));
}
m_Description = reader.ReadString();
CurCharges = reader.ReadInt();
MaxCharges = reader.ReadInt();
m_DefaultIndex = reader.ReadInt();
break;
}
}
}
public void DropRune(Mobile from, RunebookEntry e, int index)
{
if (m_DefaultIndex > index)
{
m_DefaultIndex -= 1;
}
else if (m_DefaultIndex == index)
{
m_DefaultIndex = -1;
}
Entries.RemoveAt(index);
var rune = new RecallRune();
rune.Target = e.Location;
rune.TargetMap = e.Map;
rune.Description = e.Description;
rune.House = e.House;
rune.Marked = true;
from.AddToBackpack(rune);
from.SendLocalizedMessage(502421); // You have removed the rune.
}
public bool IsOpen(Mobile toCheck)
{
var ns = toCheck.NetState;
if (ns == null)
{
return false;
}
foreach (var gump in ns.Gumps)
{
if (gump is RunebookGump bookGump && bookGump.Book == this)
{
return true;
}
}
return false;
}
public override void GetProperties(IPropertyList list)
foreach (var gump in ns.Gumps)
{
base.GetProperties(list);
if (m_Quality == BookQuality.Exceptional)
{
list.Add(1063341); // exceptional
}
if (m_Crafter != null)
{
list.Add(1050043, m_Crafter.Name); // crafted by ~1_NAME~
}
if (!string.IsNullOrEmpty(m_Description))
{
list.Add(m_Description);
}
}
public override bool OnDragLift(Mobile from)
{
if (from.HasGump<RunebookGump>())
{
from.SendLocalizedMessage(500169); // You cannot pick that up.
return false;
}
foreach (var m in Openers)
{
if (IsOpen(m))
{
m.CloseGump<RunebookGump>();
}
}
Openers.Clear();
return true;
}
public override void OnSingleClick(Mobile from)
{
if (m_Description?.Length > 0)
{
LabelTo(from, m_Description);
}
base.OnSingleClick(from);
if (m_Crafter != null)
{
LabelTo(from, 1050043, m_Crafter.Name);
}
}
public override void OnDoubleClick(Mobile from)
{
if (from.InRange(GetWorldLocation(), Core.ML ? 3 : 1) && CheckAccess(from))
{
if (RootParent is BaseCreature)
{
from.SendLocalizedMessage(502402); // That is inaccessible.
return;
}
if (Core.Now < NextUse)
{
from.SendLocalizedMessage(502406); // This book needs time to recharge.
return;
}
from.CloseGump<RunebookGump>();
from.SendGump(new RunebookGump(from, this));
Openers.Add(from);
}
}
public virtual void OnTravel()
{
if (!Core.SA)
{
NextUse = Core.Now + UseDelay;
}
}
public override void OnAfterDuped(Item newItem)
{
if (newItem is not Runebook book)
{
return;
}
book.Entries = new List<RunebookEntry>();
for (var i = 0; i < Entries.Count; i++)
{
var entry = Entries[i];
book.Entries.Add(new RunebookEntry(entry.Location, entry.Map, entry.Description, entry.House));
}
}
public bool CheckAccess(Mobile m)
{
if (!IsLockedDown || m.AccessLevel >= AccessLevel.GameMaster)
if ((gump as RunebookGump)?.Book == this)
{
return true;
}
var house = BaseHouse.FindHouseAt(this);
return (house?.IsAosRules != true || house.Public && !house.IsBanned(m) || house.HasAccess(m)) &&
house?.HasSecureAccess(m, Level) == true;
}
public override bool OnDragDrop(Mobile from, Item dropped)
return false;
}
public override void GetProperties(IPropertyList list)
{
base.GetProperties(list);
if (_quality == BookQuality.Exceptional)
{
if (dropped is RecallRune rune)
{
if (IsLockedDown && from.AccessLevel < AccessLevel.GameMaster)
{
from.SendLocalizedMessage(502413, null, 0x35); // That cannot be done while the book is locked down.
}
else if (IsOpen(from))
{
from.SendLocalizedMessage(1005571); // You cannot place objects in the book while viewing the contents.
}
else if (Entries.Count < 16)
{
if (rune.Marked && rune.TargetMap != null)
{
Entries.Add(new RunebookEntry(rune.Target, rune.TargetMap, rune.Description, rune.House));
list.Add(1063341); // exceptional
}
rune.Delete();
if (_crafter != null)
{
list.Add(1050043, _crafter); // crafted by ~1_NAME~
}
from.SendSound(0x42, GetWorldLocation());
from.SendMessage((rune.Description?.Trim()).DefaultIfNullOrEmpty("(indescript)"));
return true;
}
from.SendLocalizedMessage(502409); // This rune does not have a marked location.
}
else
{
from.SendLocalizedMessage(502401); // This runebook is full.
}
}
else if (dropped is RecallScroll)
{
if (CurCharges < MaxCharges)
{
from.SendSound(0x249, GetWorldLocation());
var amount = dropped.Amount;
if (amount > MaxCharges - CurCharges)
{
dropped.Consume(MaxCharges - CurCharges);
CurCharges = MaxCharges;
}
else
{
CurCharges += amount;
dropped.Delete();
return true;
}
}
else
{
from.SendLocalizedMessage(502410); // This book already has the maximum amount of charges.
}
}
return false;
if (!string.IsNullOrEmpty(_description))
{
list.Add(_description);
}
}
public class RunebookEntry
public override bool OnDragLift(Mobile from)
{
public RunebookEntry(Point3D loc, Map map, string desc, BaseHouse house = null)
if (from.HasGump<RunebookGump>())
{
Location = loc;
Map = map;
Description = desc;
House = house;
from.SendLocalizedMessage(500169); // You cannot pick that up.
return false;
}
public RunebookEntry(IGenericReader reader)
foreach (var m in Openers)
{
int version = reader.ReadByte();
switch (version)
if (IsOpen(m))
{
case 1:
{
House = reader.ReadEntity<BaseHouse>();
goto case 0;
}
case 0:
{
Location = reader.ReadPoint3D();
Map = reader.ReadMap();
Description = reader.ReadString();
break;
}
m.CloseGump<RunebookGump>();
}
}
public Point3D Location { get; }
Openers.Clear();
public Map Map { get; }
return true;
}
public string Description { get; }
public BaseHouse House { get; }
public void Serialize(IGenericWriter writer)
public override void OnSingleClick(Mobile from)
{
if (_description?.Length > 0)
{
if (House?.Deleted == false)
{
writer.Write((byte)1); // version
LabelTo(from, _description);
}
writer.Write(House);
base.OnSingleClick(from);
if (_crafter != null)
{
LabelTo(from, 1050043, _crafter);
}
}
public override void OnDoubleClick(Mobile from)
{
if (from.InRange(GetWorldLocation(), Core.ML ? 3 : 1) && CheckAccess(from))
{
if (RootParent is BaseCreature)
{
from.SendLocalizedMessage(502402); // That is inaccessible.
return;
}
if (Core.Now < NextUse)
{
from.SendLocalizedMessage(502406); // This book needs time to recharge.
return;
}
from.CloseGump<RunebookGump>();
from.SendGump(new RunebookGump(from, this));
Openers.Add(from);
}
}
public virtual void OnTravel()
{
if (!Core.SA)
{
NextUse = Core.Now + UseDelay;
}
}
public override void OnAfterDuped(Item newItem)
{
if (newItem is not Runebook book)
{
return;
}
book.Entries = new List<RunebookEntry>();
for (var i = 0; i < Entries.Count; i++)
{
var entry = Entries[i];
book.Entries.Add(new RunebookEntry(entry.Location, entry.Map, entry.Description, entry.House));
}
}
public bool CheckAccess(Mobile m)
{
if (!IsLockedDown || m.AccessLevel >= AccessLevel.GameMaster)
{
return true;
}
var house = BaseHouse.FindHouseAt(this);
return (house?.IsAosRules != true || house.Public && !house.IsBanned(m) || house.HasAccess(m)) &&
house?.HasSecureAccess(m, Level) == true;
}
public override bool OnDragDrop(Mobile from, Item dropped)
{
if (dropped is RecallRune rune)
{
if (IsLockedDown && from.AccessLevel < AccessLevel.GameMaster)
{
from.SendLocalizedMessage(502413, null, 0x35); // That cannot be done while the book is locked down.
return false;
}
if (IsOpen(from))
{
from.SendLocalizedMessage(1005571); // You cannot place objects in the book while viewing the contents.
return false;
}
if (Entries.Count >= 16)
{
from.SendLocalizedMessage(502401); // This runebook is full.
return false;
}
if (rune.Marked && rune.TargetMap != null)
{
Entries.Add(new RunebookEntry(rune.Target, rune.TargetMap, rune.Description, rune.House));
rune.Delete();
from.SendSound(0x42, GetWorldLocation());
from.SendMessage((rune.Description?.Trim()).DefaultIfNullOrEmpty("(indescript)"));
return true;
}
from.SendLocalizedMessage(502409); // This rune does not have a marked location.
return false;
}
if (dropped is RecallScroll)
{
if (CurCharges >= MaxCharges)
{
from.SendLocalizedMessage(502410); // This book already has the maximum amount of charges.
return false;
}
from.SendSound(0x249, GetWorldLocation());
var amount = dropped.Amount;
if (amount > MaxCharges - CurCharges)
{
dropped.Consume(MaxCharges - CurCharges);
CurCharges = MaxCharges;
}
else
{
writer.Write((byte)0); // version
}
CurCharges += amount;
dropped.Delete();
writer.Write(Location);
writer.Write(Map);
writer.Write(Description);
return true;
}
}
return false;
}
}
[ManualDirtyChecking]
public class RunebookEntry
{
public RunebookEntry(Point3D loc, Map map, string description, BaseHouse house = null)
{
Location = loc;
Map = map;
Description = description;
House = house;
}
public RunebookEntry(IGenericReader reader)
{
var version = reader.ReadByte();
switch (version)
{
case 1:
{
House = reader.ReadEntity<BaseHouse>();
goto case 0;
}
case 0:
{
Location = reader.ReadPoint3D();
Map = reader.ReadMap();
Description = reader.ReadString();
break;
}
}
}
public void Serialize(IGenericWriter writer)
{
if (House?.Deleted == false)
{
writer.Write((byte)1); // version
writer.Write(House);
}
else
{
writer.Write((byte)0); // version
}
writer.Write(Location);
writer.Write(Map);
writer.Write(Description);
}
public BaseHouse House { get; }
public Point3D Location { get; }
public Map Map { get; }
public string Description { get; }
}

1605
Projects/UOContent/Items/Skill Items/Magical/Spellbook.cs
View file

File diff suppressed because it is too large Load diff

46
Projects/UOContent/Items/Skill Items/Magical/SpellweavingBook.cs
View file

@ -1,35 +1,19 @@
namespace Server.Items
using ModernUO.Serialization;
namespace Server.Items;
[SerializationGenerator(0)]
public partial class SpellweavingBook : Spellbook
{
public class SpellweavingBook : Spellbook
[Constructible]
public SpellweavingBook(ulong content = 0) : base(content, 0x2D50)
{
[Constructible]
public SpellweavingBook(ulong content = 0) : base(content, 0x2D50)
{
Hue = 0x8A2;
Layer = Layer.OneHanded;
}
public SpellweavingBook(Serial serial) : base(serial)
{
}
public override SpellbookType SpellbookType => SpellbookType.Arcanist;
public override int BookOffset => 600;
public override int BookCount => 16;
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();
}
Hue = 0x8A2;
Layer = Layer.OneHanded;
}
public override SpellbookType SpellbookType => SpellbookType.Arcanist;
public override int BookOffset => 600;
public override int BookCount => 16;
}

4
Projects/UOContent/Migrations/Server.Items.BookOfBushido.v0.json generated Normal file
View file

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

4
Projects/UOContent/Migrations/Server.Items.BookOfChivalry.v0.json generated Normal file
View file

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

4
Projects/UOContent/Migrations/Server.Items.BookOfNinjitsu.v0.json generated Normal file
View file

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

4
Projects/UOContent/Migrations/Server.Items.MysticSpellbook.v0.json generated Normal file
View file

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

4
Projects/UOContent/Migrations/Server.Items.NecromancerSpellbook.v0.json generated Normal file
View file

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

66
Projects/UOContent/Migrations/Server.Items.Runebook.v4.json generated Normal file
View file

@ -0,0 +1,66 @@
{
"version": 4,
"type": "Server.Items.Runebook",
"properties": [
{
"name": "Quality",
"type": "Server.Items.BookQuality",
"rule": "EnumMigrationRule"
},
{
"name": "Crafter",
"type": "string",
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "Level",
"type": "Server.Multis.SecureLevel",
"rule": "EnumMigrationRule"
},
{
"name": "Entries",
"type": "System.Collections.Generic.List\u003CServer.Items.RunebookEntry\u003E",
"rule": "ListMigrationRule",
"ruleArguments": [
"Server.Items.RunebookEntry",
"SerializationMethodSignatureMigrationRule",
""
]
},
{
"name": "Description",
"type": "string",
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "CurCharges",
"type": "int",
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "MaxCharges",
"type": "int",
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "DefaultIndex",
"type": "int",
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
}
]
}

35
Projects/UOContent/Migrations/Server.Items.RunebookEntry.v2.json generated Normal file
View file

@ -0,0 +1,35 @@
{
"version": 2,
"type": "Server.Items.RunebookEntry",
"properties": [
{
"name": "House",
"type": "Server.Multis.BaseHouse",
"rule": "SerializableInterfaceMigrationRule"
},
{
"name": "Location",
"type": "Server.Point3D",
"rule": "PrimitiveUOTypeMigrationRule",
"ruleArguments": [
"Point3D"
]
},
{
"name": "Map",
"type": "Server.Map",
"rule": "PrimitiveUOTypeMigrationRule",
"ruleArguments": [
"Map"
]
},
{
"name": "Description",
"type": "string",
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
}
]
}

69
Projects/UOContent/Migrations/Server.Items.Spellbook.v6.json generated Normal file
View file

@ -0,0 +1,69 @@
{
"version": 6,
"type": "Server.Items.Spellbook",
"properties": [
{
"name": "Quality",
"type": "Server.Items.BookQuality",
"rule": "EnumMigrationRule"
},
{
"name": "EngravedText",
"type": "string",
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "Crafter",
"type": "string",
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "Slayer",
"type": "Server.Items.SlayerName",
"rule": "EnumMigrationRule"
},
{
"name": "Slayer2",
"type": "Server.Items.SlayerName",
"rule": "EnumMigrationRule"
},
{
"name": "Attributes",
"type": "Server.AosAttributes",
"rule": "RawSerializableMigrationRule",
"ruleArguments": [
"DeserializationRequiresParent"
]
},
{
"name": "SkillBonuses",
"type": "Server.AosSkillBonuses",
"rule": "RawSerializableMigrationRule",
"ruleArguments": [
"DeserializationRequiresParent"
]
},
{
"name": "Content",
"type": "ulong",
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
},
{
"name": "SpellCount",
"type": "int",
"rule": "PrimitiveTypeMigrationRule",
"ruleArguments": [
""
]
}
]
}

4
Projects/UOContent/Migrations/Server.Items.SpellweavingBook.v0.json generated Normal file
View file

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