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

fix: Adds quest items to serialization generator (#2086)

Browse source
This commit is contained in:
Kamron Batman 2025-01-23 21:59:15 -08:00 • committed by GitHub
parent 8e48177cd4
commit 2a97db34e8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
23 changed files with 162 additions and 421 deletions
Download patch file Download diff file Expand all files Collapse all files

130
Projects/UOContent/Engines/Khaldun/Books/LysanderNotebook.cs
View file

@ -1,6 +1,9 @@
using ModernUO.Serialization;
namespace Server.Items;
public class LysanderNotebook1 : BaseBook
[SerializationGenerator(0)]
public partial class LysanderNotebook1 : BaseBook
{
public static readonly BookContent Content = new(
"Lysander's Notebook",
@ -35,28 +38,11 @@ public class LysanderNotebook1 : BaseBook
{
}
public LysanderNotebook1(Serial serial) : base(serial)
{
}
public override BookContent DefaultContent => Content;
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();
}
}
public class LysanderNotebook2 : BaseBook
[SerializationGenerator(0)]
public partial class LysanderNotebook2 : BaseBook
{
public static readonly BookContent Content = new(
"Lysander's Notebook",
@ -124,28 +110,11 @@ public class LysanderNotebook2 : BaseBook
{
}
public LysanderNotebook2(Serial serial) : base(serial)
{
}
public override BookContent DefaultContent => Content;
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();
}
}
public class LysanderNotebook3 : BaseBook
[SerializationGenerator(0)]
public partial class LysanderNotebook3 : BaseBook
{
public static readonly BookContent Content = new(
"Lysander's Notebook",
@ -207,28 +176,11 @@ public class LysanderNotebook3 : BaseBook
{
}
public LysanderNotebook3(Serial serial) : base(serial)
{
}
public override BookContent DefaultContent => Content;
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();
}
}
public class LysanderNotebook7 : BaseBook
[SerializationGenerator(0)]
public partial class LysanderNotebook7 : BaseBook
{
public static readonly BookContent Content = new(
"Lysander's Notebook",
@ -305,28 +257,11 @@ public class LysanderNotebook7 : BaseBook
{
}
public LysanderNotebook7(Serial serial) : base(serial)
{
}
public override BookContent DefaultContent => Content;
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();
}
}
public class LysanderNotebook8 : BaseBook
[SerializationGenerator(0)]
public partial class LysanderNotebook8 : BaseBook
{
public static readonly BookContent Content = new(
"Lysander's Notebook",
@ -394,28 +329,11 @@ public class LysanderNotebook8 : BaseBook
{
}
public LysanderNotebook8(Serial serial) : base(serial)
{
}
public override BookContent DefaultContent => Content;
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();
}
}
public class LysanderNotebook11 : BaseBook
[SerializationGenerator(0)]
public partial class LysanderNotebook11 : BaseBook
{
public static readonly BookContent Content = new(
"Lysander's Notebook",
@ -480,23 +398,5 @@ public class LysanderNotebook11 : BaseBook
{
}
public LysanderNotebook11(Serial serial) : base(serial)
{
}
public override BookContent DefaultContent => Content;
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();
}
}
}

277
Projects/UOContent/Engines/Khaldun/Books/TavarasJournal.cs
View file

@ -1,6 +1,9 @@
using ModernUO.Serialization;
namespace Server.Items;
public class TavarasJournal1 : BaseBook
[SerializationGenerator(0)]
public partial class TavarasJournal1 : BaseBook
{
public static readonly BookContent Content = new(
"Journal: Discovery of the Tomb",
@ -66,28 +69,11 @@ public class TavarasJournal1 : BaseBook
{
}
public TavarasJournal1(Serial serial) : base(serial)
{
}
public override BookContent DefaultContent => Content;
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();
}
}
public class TavarasJournal2 : BaseBook
[SerializationGenerator(0)]
public partial class TavarasJournal2 : BaseBook
{
public static readonly BookContent Content = new(
"Journal: Discovery of the Tomb",
@ -186,28 +172,11 @@ public class TavarasJournal2 : BaseBook
{
}
public TavarasJournal2(Serial serial) : base(serial)
{
}
public override BookContent DefaultContent => Content;
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();
}
}
public class TavarasJournal3 : BaseBook
[SerializationGenerator(0)]
public partial class TavarasJournal3 : BaseBook
{
public static readonly BookContent Content = new(
"Journal: Discovery of the Tomb",
@ -277,28 +246,11 @@ public class TavarasJournal3 : BaseBook
{
}
public TavarasJournal3(Serial serial) : base(serial)
{
}
public override BookContent DefaultContent => Content;
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();
}
}
public class TavarasJournal6 : BaseBook
[SerializationGenerator(0)]
public partial class TavarasJournal6 : BaseBook
{
public static readonly BookContent Content = new(
"Journal: Discovery of the Tomb",
@ -380,28 +332,11 @@ public class TavarasJournal6 : BaseBook
{
}
public TavarasJournal6(Serial serial) : base(serial)
{
}
public override BookContent DefaultContent => Content;
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();
}
}
public class TavarasJournal7 : BaseBook
[SerializationGenerator(0)]
public partial class TavarasJournal7 : BaseBook
{
public static readonly BookContent Content = new(
"Journal: Discovery of the Tomb",
@ -472,28 +407,11 @@ public class TavarasJournal7 : BaseBook
{
}
public TavarasJournal7(Serial serial) : base(serial)
{
}
public override BookContent DefaultContent => Content;
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();
}
}
public class TavarasJournal8 : BaseBook
[SerializationGenerator(0)]
public partial class TavarasJournal8 : BaseBook
{
public static readonly BookContent Content = new(
"Journal: Discovery of the Tomb",
@ -582,28 +500,11 @@ public class TavarasJournal8 : BaseBook
{
}
public TavarasJournal8(Serial serial) : base(serial)
{
}
public override BookContent DefaultContent => Content;
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();
}
}
public class TavarasJournal9 : BaseBook
[SerializationGenerator(0)]
public partial class TavarasJournal9 : BaseBook
{
public static readonly BookContent Content = new(
"Journal: Discovery of the Tomb",
@ -670,28 +571,11 @@ public class TavarasJournal9 : BaseBook
{
}
public TavarasJournal9(Serial serial) : base(serial)
{
}
public override BookContent DefaultContent => Content;
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();
}
}
public class TavarasJournal11 : BaseBook
[SerializationGenerator(0)]
public partial class TavarasJournal11 : BaseBook
{
public static readonly BookContent Content = new(
"Journal: Discovery of the Tomb",
@ -780,28 +664,11 @@ public class TavarasJournal11 : BaseBook
{
}
public TavarasJournal11(Serial serial) : base(serial)
{
}
public override BookContent DefaultContent => Content;
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();
}
}
public class TavarasJournal14 : BaseBook
[SerializationGenerator(0)]
public partial class TavarasJournal14 : BaseBook
{
public static readonly BookContent Content = new(
"Journal: Discovery of the Tomb",
@ -882,28 +749,11 @@ public class TavarasJournal14 : BaseBook
{
}
public TavarasJournal14(Serial serial) : base(serial)
{
}
public override BookContent DefaultContent => Content;
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();
}
}
public class TavarasJournal16 : BaseBook
[SerializationGenerator(0)]
public partial class TavarasJournal16 : BaseBook
{
public static readonly BookContent Content = new(
"Journal: Discovery of the Tomb",
@ -995,28 +845,11 @@ public class TavarasJournal16 : BaseBook
{
}
public TavarasJournal16(Serial serial) : base(serial)
{
}
public override BookContent DefaultContent => Content;
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();
}
}
public class TavarasJournal16b : BaseBook
[SerializationGenerator(0)]
public partial class TavarasJournal16b : BaseBook
{
public static readonly BookContent Content = new(
"Journal: Discovery of the Tomb",
@ -1098,28 +931,11 @@ public class TavarasJournal16b : BaseBook
{
}
public TavarasJournal16b(Serial serial) : base(serial)
{
}
public override BookContent DefaultContent => Content;
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();
}
}
public class TavarasJournal17 : BaseBook
[SerializationGenerator(0)]
public partial class TavarasJournal17 : BaseBook
{
public static readonly BookContent Content = new(
"Journal: Discovery of the Tomb",
@ -1165,28 +981,11 @@ public class TavarasJournal17 : BaseBook
{
}
public TavarasJournal17(Serial serial) : base(serial)
{
}
public override BookContent DefaultContent => Content;
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();
}
}
public class TavarasJournal19 : BaseBook
[SerializationGenerator(0)]
public partial class TavarasJournal19 : BaseBook
{
public static readonly BookContent Content = new(
"Journal: Discovery of the Tomb",
@ -1222,23 +1021,5 @@ public class TavarasJournal19 : BaseBook
{
}
public TavarasJournal19(Serial serial) : base(serial)
{
}
public override BookContent DefaultContent => Content;
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();
}
}
}

96
Projects/UOContent/Engines/ML Quests/Definitions/LostItems.cs
View file

@ -1,69 +1,49 @@
using System;
using ModernUO.Serialization;
using Server.Engines.MLQuests.Items;
using Server.Engines.MLQuests.Objectives;
using Server.Engines.MLQuests.Rewards;
namespace Server.Engines.MLQuests.Definitions
namespace Server.Engines.MLQuests.Definitions;
// TODO: Assassination Contract, Evidence, Lost in Transit, Last Words
public class LostAndFound : MLQuest
{
// TODO: Assassination Contract, Evidence, Lost in Transit, Last Words
public class LostAndFound : MLQuest
public LostAndFound()
{
public LostAndFound()
{
Activated = true;
Title = 1072370; // Lost and Found
Description =
1072589; // The battered, old bucket is inscribed with barely legible writing that indicates it belongs to someone named "Dallid". Maybe they'd pay for its return?
RefusalMessage =
1072590; // You're right, who cares if Dallid might pay for his battered old bucket back. This way you can carry it around with you!
InProgressMessage = 1072591; // Whoever this "Dallid" might be, he's probably looking for his bucket.
CompletionMessage =
1074580; // Is that my bucket? I had to ditch my favorite bucket when a group of ratmen jumped me!
Activated = true;
Title = 1072370; // Lost and Found
Description =
1072589; // The battered, old bucket is inscribed with barely legible writing that indicates it belongs to someone named "Dallid". Maybe they'd pay for its return?
RefusalMessage =
1072590; // You're right, who cares if Dallid might pay for his battered old bucket back. This way you can carry it around with you!
InProgressMessage = 1072591; // Whoever this "Dallid" might be, he's probably looking for his bucket.
CompletionMessage =
1074580; // Is that my bucket? I had to ditch my favorite bucket when a group of ratmen jumped me!
Objectives.Add(
new TimedDeliverObjective(
TimeSpan.FromSeconds(600),
typeof(BatteredBucket),
1,
"battered bucket",
typeof(Dallid),
false
)
);
Objectives.Add(
new TimedDeliverObjective(
TimeSpan.FromSeconds(600),
typeof(BatteredBucket),
1,
"battered bucket",
typeof(Dallid),
false
)
);
Rewards.Add(ItemReward.BagOfTrinkets);
}
}
public class BatteredBucket : TransientQuestGiverItem
{
[Constructible]
public BatteredBucket()
: base(0x2004, TimeSpan.FromMinutes(10)) =>
LootType = LootType.Blessed;
public BatteredBucket(Serial serial)
: base(serial)
{
}
// Original label, doesn't fit the expiration message well
// public override int LabelNumber => 1073129; // A battered bucket.
public override string DefaultName => "battered bucket";
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();
}
Rewards.Add(ItemReward.BagOfTrinkets);
}
}
[SerializationGenerator(0, false)]
public partial class BatteredBucket : TransientQuestGiverItem
{
[Constructible]
public BatteredBucket() : base(0x2004, TimeSpan.FromMinutes(10)) => LootType = LootType.Blessed;
// Original label, doesn't fit the expiration message well
// public override int LabelNumber => 1073129; // A battered bucket.
public override string DefaultName => "battered bucket";
}

4
Projects/UOContent/Migrations/Server.Engines.MLQuests.Definitions.BatteredBucket.v0.json generated Normal file
View file

@ -0,0 +1,4 @@
{
"version": 0,
"type": "Server.Engines.MLQuests.Definitions.BatteredBucket"
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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