Skip to content

Commit

Permalink
fix: Codegens Heartwood quest givers (#1687)
Browse files Browse the repository at this point in the history
### Summary
- Codegens quest givers (mostly heartwood)
- Removes their `RandomList` calls in favor of random bool or switch.
  • Loading branch information
kamronbatman committed Feb 19, 2024
1 parent e994505 commit 1fdef9f
Show file tree
Hide file tree
Showing 65 changed files with 3,413 additions and 4,270 deletions.
1 change: 0 additions & 1 deletion Projects/UOContent/Engines/Harvest/Fishing.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System;
using Server.Engines.Quests;
using Server.Engines.Quests.Collector;
using Server.Items;
using Server.Mobiles;
Expand Down
63 changes: 11 additions & 52 deletions Projects/UOContent/Engines/ML Quests/Definitions/BlightedGrove.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using ModernUO.Serialization;
using Server.Engines.MLQuests.Objectives;
using Server.Engines.MLQuests.Rewards;
using Server.Items;
Expand Down Expand Up @@ -176,11 +177,11 @@ public SubContracting()
}

[QuesterName("Jamal (near Blighted Grove)")]
public class Jamal : BaseCreature
[SerializationGenerator(0, false)]
public partial class Jamal : BaseCreature
{
[Constructible]
public Jamal()
: base(AIType.AI_Vendor, FightMode.None, 2)
public Jamal() : base(AIType.AI_Vendor, FightMode.None, 2)
{
Title = "the Fisherman";
Body = 400;
Expand All @@ -196,35 +197,17 @@ public Jamal()
AddItem(new Backpack());
}

public Jamal(Serial serial)
: base(serial)
{
}

public override bool IsInvulnerable => true;
public override string DefaultName => "Jamal";

public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);

writer.Write(0); // version
}

public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);

reader.ReadInt();
}
}

[QuesterName("Iosep (Jhelom)")]
public class Iosep : BaseCreature
[SerializationGenerator(0, false)]
public partial class Iosep : BaseCreature
{

[Constructible]
public Iosep()
: base(AIType.AI_Vendor, FightMode.None, 2)
public Iosep() : base(AIType.AI_Vendor, FightMode.None, 2)
{
Title = "the Exporter";
Body = 400;
Expand All @@ -237,40 +220,16 @@ public Iosep()
AddItem(new Backpack());
}

public Iosep(Serial serial)
: base(serial)
{
}

public override bool IsInvulnerable => true;
public override string DefaultName => "Iosep";

public override bool CanShout => true;

public override void Shout(PlayerMobile pm)
{
MLQuestSystem.Tell(
this,
pm,
Utility.RandomList(
1074209, // Hey, could you help me out with something?
1074215 // Don’t test my patience you sniveling worm!
)
);
}

public override void Serialize(IGenericWriter writer)
{
base.Serialize(writer);

writer.Write(0); // version
}

public override void Deserialize(IGenericReader reader)
{
base.Deserialize(reader);

reader.ReadInt();
// Hey, could you help me out with something?
// Don’t test my patience you sniveling worm!
MLQuestSystem.Tell(this, pm, Utility.RandomBool() ? 1074209 : 1074215 );
}
}
}
45 changes: 5 additions & 40 deletions Projects/UOContent/Engines/ML Quests/Definitions/Britannia.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using ModernUO.Serialization;
using Server.Engines.MLQuests.Objectives;
using Server.Engines.MLQuests.Rewards;
using Server.Items;
Expand Down Expand Up @@ -105,7 +106,8 @@ public EmbracingHumanity()
}
}

public class Aurelia : BaseCreature
[SerializationGenerator(0, false)]
public partial class Aurelia : BaseCreature
{
[Constructible]
public Aurelia() : base(AIType.AI_Vendor, FightMode.None, 2)
Expand Down Expand Up @@ -136,31 +138,13 @@ public Aurelia() : base(AIType.AI_Vendor, FightMode.None, 2)
AddItem(new FancyShirt(Utility.RandomRedHue()));
}

public Aurelia(Serial serial)
: base(serial)
{
}

public override bool IsInvulnerable => true;
public override string DefaultName => "Aurelia";

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();
}
}

[QuesterName("Szandor")]
public class SkeletonOfSzandor : BaseCreature
[SerializationGenerator(0, false)]
public partial class SkeletonOfSzandor : BaseCreature
{
[Constructible]
public SkeletonOfSzandor() : base(AIType.AI_Vendor, FightMode.None, 2)
Expand All @@ -173,26 +157,7 @@ public SkeletonOfSzandor() : base(AIType.AI_Vendor, FightMode.None, 2)
InitStats(100, 100, 25);
}

public SkeletonOfSzandor(Serial serial)
: base(serial)
{
}

public override bool IsInvulnerable => true;
public override string DefaultName => "Skeleton of Szandor";

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();
}
}
}

0 comments on commit 1fdef9f

Please sign in to comment.