ab738d90af
Pet and summon bugs found by the master-reference audit for #2592 (comments there have the full inventory). Independent of delta saves. ## Releasing a pet never finished The Release order ran two half-releases that never met: - The order handler cleared the master. That set `Controlled` to false, so `Obey` never ran again and the think-side `DoOrderRelease` (re-home, three-day delete timer, backpack drop) was dead code: a released pet kept its pack and never despawned. - The loyalty drain called `DoOrderRelease` directly, so a pet whose loyalty hit zero got the countdown and dropped its pack but kept its master and its owner's follower slots, the opposite of the code comment's intent. `DoOrderRelease` is now the whole release (targets, bonding, `SetControlMaster(null)`, re-home, delete or countdown, pack drop) and runs once, synchronously, from the handler or the loyalty drain. Summons still die on release, as before. Two tests pin both entry points: master cleared, follower slots returned, countdown running, home anchored. This is the one place the `PetOrders` / `PetOrderHandlers` split bit; the wider audit of that duplication is a separate task. ## Summon master follows the pet Transfer, stable claim, GM "obey" and Ball of Summoning copied `SummonMaster` only when `Summoned`, so a talisman summon (`Summoned` is false, `SummonMaster` set) kept its original summoner after a transfer: two different masters on one creature, with the original summoner's area spells still exempting it. They now mirror the summon master whenever it is set. Jail stabling cleared only `ControlMaster`, so a jailed talisman summon kept charging the summoner's follower slots; it now clears both, like the stable master and auto-stable already do. ## Small ones - The faction horse breeder set `Controlled`/`ControlMaster` directly; it now goes through `SetControlMaster` and tells the buyer why it refused (1049607) instead of silently deleting the horse. - `Notoriety` dereferenced `SummonMaster` on a summoned creature without a null check. ## Tests UOContent.Tests 778 green (two new).
94 lines
No EOL
2.7 KiB
C#
94 lines
No EOL
2.7 KiB
C#
using Server.Gumps;
|
|
using Server.Items;
|
|
using Server.Mobiles;
|
|
using Server.Network;
|
|
|
|
namespace Server.Factions;
|
|
|
|
public class HorseBreederGump : FactionGump
|
|
{
|
|
private readonly Faction m_Faction;
|
|
private readonly PlayerMobile m_From;
|
|
|
|
public HorseBreederGump(PlayerMobile from, Faction faction) : base(20, 30)
|
|
{
|
|
m_From = from;
|
|
m_Faction = faction;
|
|
|
|
AddPage(0);
|
|
|
|
AddBackground(0, 0, 320, 280, 5054);
|
|
AddBackground(10, 10, 300, 260, 3000);
|
|
|
|
AddHtmlText(20, 30, 300, 25, faction.Definition.Header, false, false);
|
|
|
|
AddHtmlLocalized(20, 60, 300, 25, 1018306); // Purchase a Faction War Horse
|
|
AddItem(70, 120, 0x3FFE);
|
|
|
|
AddItem(150, 120, 0xEF2);
|
|
AddLabel(190, 122, 0x3E3, FactionWarHorse.SilverPrice.ToString("N0")); // NOTE: Added 'N0'
|
|
|
|
AddItem(150, 150, 0xEEF);
|
|
AddLabel(190, 152, 0x3E3, FactionWarHorse.GoldPrice.ToString("N0")); // NOTE: Added 'N0'
|
|
|
|
AddHtmlLocalized(55, 210, 200, 25, 1011011); // CONTINUE
|
|
AddButton(20, 210, 4005, 4007, 1);
|
|
|
|
AddHtmlLocalized(55, 240, 200, 25, 1011012); // CANCEL
|
|
AddButton(20, 240, 4005, 4007, 0);
|
|
}
|
|
|
|
public override void OnResponse(NetState sender, in RelayInfo info)
|
|
{
|
|
if (info.ButtonID != 1)
|
|
{
|
|
return;
|
|
}
|
|
|
|
if (Faction.Find(m_From) != m_Faction)
|
|
{
|
|
return;
|
|
}
|
|
|
|
var pack = m_From.Backpack;
|
|
|
|
if (pack == null)
|
|
{
|
|
return;
|
|
}
|
|
|
|
var horse = new FactionWarHorse(m_Faction);
|
|
|
|
if (m_From.Followers + horse.ControlSlots > m_From.FollowersMax)
|
|
{
|
|
m_From.SendLocalizedMessage(1049607); // You have too many followers to control that creature.
|
|
horse.Delete();
|
|
}
|
|
else
|
|
{
|
|
if (pack.GetAmount(typeof(Silver)) < FactionWarHorse.SilverPrice)
|
|
{
|
|
sender.Mobile.SendLocalizedMessage(1042204); // You do not have enough silver.
|
|
horse.Delete();
|
|
}
|
|
else if (pack.GetAmount(typeof(Gold)) < FactionWarHorse.GoldPrice)
|
|
{
|
|
sender.Mobile.SendLocalizedMessage(1042205); // You do not have enough gold.
|
|
horse.Delete();
|
|
}
|
|
else if (pack.ConsumeTotal(typeof(Silver), FactionWarHorse.SilverPrice) &&
|
|
pack.ConsumeTotal(typeof(Gold), FactionWarHorse.GoldPrice))
|
|
{
|
|
horse.SetControlMaster(m_From);
|
|
horse.ControlOrder = OrderType.Follow;
|
|
horse.ControlTarget = m_From;
|
|
|
|
horse.MoveToWorld(m_From.Location, m_From.Map);
|
|
}
|
|
else
|
|
{
|
|
horse.Delete();
|
|
}
|
|
}
|
|
}
|
|
} |