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

perf: Migrate vendor management gumps to DynamicGump/StaticGump (#2431)

Browse source 
## Summary
Converts `ReclaimVendorGump`, `VendorInventoryGump`, and the five gumps in `VendorRentalGumps.cs` from legacy `Gump` to `DynamicGump` / `StaticGump<T>` with the static `DisplayTo` entry-point pattern.

| Gump | Target | Reason |
|---|---|---|
| `ReclaimVendorGump` | DynamicGump | Variable vendor inventory list count. |
| `VendorInventoryGump` | DynamicGump | Variable inventory list; keeps `from` (per-row button depends on owner check). |
| `BaseVendorRentalGump` (abstract) → `VendorRentalContractGump`, `VendorRentalOfferGump`, `RenterVendorRentalGump`, `LandlordVendorRentalGump` | DynamicGump | Layout has many conditional sections driven by `GumpType` enum. |
| `VendorRentalRefundGump` | StaticGump | Fixed layout; vendor name, shop name, refund amount in `BuildStrings` placeholders. |

All builder labels and string slots use `$"{value}"` interpolated-string-handler form for zero-allocation text.

Updates callers in `PlayerMobile`, `HouseSign`, `RentedVendor`, and `VendorRentalContract`.
This commit is contained in:
Kamron Batman 2026-05-03 10:19:12 -07:00 • committed by GitHub
parent 14f9d682e8
commit 402f3bc934
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 864 additions and 790 deletions
Download patch file Download diff file Expand all files Collapse all files

127
Projects/UOContent/Gumps/ReclaimVendorGump.cs
View file

@ -1,85 +1,94 @@
using System.Collections.Generic;
using System.Linq;
using Server.Multis;
using Server.Network;
namespace Server.Gumps
namespace Server.Gumps;
public class ReclaimVendorGump : DynamicGump
{
public class ReclaimVendorGump : Gump
private readonly BaseHouse _house;
private readonly Mobile[] _vendors;
public override bool Singleton => true;
private ReclaimVendorGump(BaseHouse house) : base(50, 50)
{
private readonly BaseHouse m_House;
private readonly List<Mobile> m_Vendors;
_house = house;
_vendors = house.InternalizedVendors.ToArray();
}
public override bool Singleton => true;
public ReclaimVendorGump(BaseHouse house) : base(50, 50)
public static void DisplayTo(Mobile from, BaseHouse house)
{
if (from?.NetState != null && house?.Deleted == false && house.InternalizedVendors.Count != 0)
{
m_House = house;
m_Vendors = house.InternalizedVendors.ToList();
from.SendGump(new ReclaimVendorGump(house));
}
}
AddBackground(0, 0, 170, 50 + m_Vendors.Count * 20, 0x13BE);
protected override void BuildLayout(ref DynamicGumpBuilder builder)
{
builder.AddPage();
AddImageTiled(10, 10, 150, 20, 0xA40);
AddHtmlLocalized(10, 10, 150, 20, 1061827, 0x7FFF); // <CENTER>Reclaim Vendor</CENTER>
builder.AddBackground(0, 0, 170, 50 + _vendors.Length * 20, 0x13BE);
AddImageTiled(10, 40, 150, m_Vendors.Count * 20, 0xA40);
builder.AddImageTiled(10, 10, 150, 20, 0xA40);
builder.AddHtmlLocalized(10, 10, 150, 20, 1061827, 0x7FFF); // <CENTER>Reclaim Vendor</CENTER>
for (var i = 0; i < m_Vendors.Count; i++)
{
var m = m_Vendors[i];
builder.AddImageTiled(10, 40, 150, _vendors.Length * 20, 0xA40);
var y = 40 + i * 20;
for (var i = 0; i < _vendors.Length; i++)
{
var m = _vendors[i];
AddButton(10, y, 0xFA5, 0xFA7, i + 1);
AddLabel(45, y, 0x481, m.Name);
}
var y = 40 + i * 20;
builder.AddButton(10, y, 0xFA5, 0xFA7, i + 1);
builder.AddLabel(45, y, 0x481, m.Name);
}
}
public override void OnResponse(NetState sender, in RelayInfo info)
{
var from = sender.Mobile;
if (info.ButtonID == 0 || !_house.IsActive || !_house.IsInside(from) || !_house.IsOwner(from) || !from.CheckAlive())
{
return;
}
public override void OnResponse(NetState sender, in RelayInfo info)
var index = info.ButtonID - 1;
if (index < 0 || index >= _vendors.Length)
{
var from = sender.Mobile;
return;
}
if (info.ButtonID == 0 || !m_House.IsActive || !m_House.IsInside(from) || !m_House.IsOwner(from) ||
!from.CheckAlive())
var mob = _vendors[index];
if (!_house.InternalizedVendors.Contains(mob))
{
return;
}
if (mob.Deleted)
{
_house.InternalizedVendors.Remove(mob);
}
else
{
BaseHouse.IsThereVendor(from.Location, from.Map, out var vendor, out var contract);
if (vendor)
{
return;
from.SendLocalizedMessage(1062677); // You cannot place a vendor or barkeep at this location.
}
var index = info.ButtonID - 1;
if (index < 0 || index >= m_Vendors.Count)
else if (contract)
{
return;
}
var mob = m_Vendors[index];
if (!m_House.InternalizedVendors.Contains(mob))
{
return;
}
if (mob.Deleted)
{
m_House.InternalizedVendors.Remove(mob);
from.SendLocalizedMessage(1062678); // You cannot place a vendor or barkeep on top of a rental contract!
}
else
{
BaseHouse.IsThereVendor(from.Location, from.Map, out var vendor, out var contract);
if (vendor)
{
from.SendLocalizedMessage(1062677); // You cannot place a vendor or barkeep at this location.
}
else if (contract)
{
from.SendLocalizedMessage(1062678); // You cannot place a vendor or barkeep on top of a rental contract!
}
else
{
m_House.InternalizedVendors.Remove(mob);
mob.MoveToWorld(from.Location, from.Map);
}
_house.InternalizedVendors.Remove(mob);
mob.MoveToWorld(from.Location, from.Map);
}
}
}

237
Projects/UOContent/Gumps/VendorInventoryGump.cs
View file

@ -4,138 +4,147 @@ using Server.Mobiles;
using Server.Multis;
using Server.Network;
namespace Server.Gumps
namespace Server.Gumps;
public class VendorInventoryGump : DynamicGump
{
public class VendorInventoryGump : Gump
private readonly BaseHouse _house;
private readonly Mobile _from;
private readonly VendorInventory[] _inventories;
public override bool Singleton => true;
private VendorInventoryGump(BaseHouse house, Mobile from) : base(50, 50)
{
private readonly BaseHouse m_House;
private readonly List<VendorInventory> m_Inventories;
_house = house;
_from = from;
_inventories = house.VendorInventories.ToArray();
}
public override bool Singleton => true;
public VendorInventoryGump(BaseHouse house, Mobile from) : base(50, 50)
public static void DisplayTo(Mobile from, BaseHouse house)
{
if (from?.NetState != null && house?.Deleted == false && house.VendorInventories.Count != 0)
{
m_House = house;
m_Inventories = house.VendorInventories.ToList();
from.SendGump(new VendorInventoryGump(house, from));
}
}
AddBackground(0, 0, 420, 50 + 20 * m_Inventories.Count, 0x13BE);
protected override void BuildLayout(ref DynamicGumpBuilder builder)
{
builder.AddPage();
AddImageTiled(10, 10, 400, 20, 0xA40);
AddHtmlLocalized(15, 10, 200, 20, 1062435, 0x7FFF); // Reclaim Vendor Inventory
AddHtmlLocalized(330, 10, 50, 20, 1062465, 0x7FFF); // Expires
builder.AddBackground(0, 0, 420, 50 + 20 * _inventories.Length, 0x13BE);
AddImageTiled(10, 40, 400, 20 * m_Inventories.Count, 0xA40);
builder.AddImageTiled(10, 10, 400, 20, 0xA40);
builder.AddHtmlLocalized(15, 10, 200, 20, 1062435, 0x7FFF); // Reclaim Vendor Inventory
builder.AddHtmlLocalized(330, 10, 50, 20, 1062465, 0x7FFF); // Expires
for (var i = 0; i < m_Inventories.Count; i++)
builder.AddImageTiled(10, 40, 400, 20 * _inventories.Length, 0xA40);
for (var i = 0; i < _inventories.Length; i++)
{
var inventory = _inventories[i];
var y = 40 + 20 * i;
if (inventory.Owner == _from)
{
var inventory = m_Inventories[i];
builder.AddButton(10, y, 0xFA5, 0xFA7, i + 1);
}
var y = 40 + 20 * i;
builder.AddLabel(45, y, 0x481, $"{inventory.ShopName} ({inventory.VendorName})");
if (inventory.Owner == from)
{
AddButton(10, y, 0xFA5, 0xFA7, i + 1);
}
var expire = inventory.ExpireTime - Core.Now;
var hours = (int)expire.TotalHours;
AddLabel(45, y, 0x481, $"{inventory.ShopName} ({inventory.VendorName})");
builder.AddLabel(320, y, 0x481, $"{hours}");
builder.AddHtmlLocalized(350, y, 50, 20, 1062466, 0x7FFF); // hour(s)
}
}
var expire = inventory.ExpireTime - Core.Now;
var hours = (int)expire.TotalHours;
public override void OnResponse(NetState sender, in RelayInfo info)
{
if (info.ButtonID == 0)
{
return;
}
AddLabel(320, y, 0x481, hours.ToString());
AddHtmlLocalized(350, y, 50, 20, 1062466, 0x7FFF); // hour(s)
var from = sender.Mobile;
var sign = _house.Sign;
if (_house.Deleted || sign?.Deleted != false || !from.CheckAlive())
{
return;
}
if (from.Map != sign.Map || !from.InRange(sign, 5))
{
from.SendLocalizedMessage(1062429); // You must be within five paces of the house sign to use this option.
return;
}
var index = info.ButtonID - 1;
if (index < 0 || index >= _inventories.Length)
{
return;
}
var inventory = _inventories[index];
if (inventory.Owner != from || !_house.VendorInventories.Contains(inventory))
{
return;
}
var totalItems = 0;
var givenToBackpack = 0;
var givenToBankBox = 0;
for (var i = inventory.Items.Count - 1; i >= 0; i--)
{
var item = inventory.Items[i];
if (item.Deleted)
{
inventory.Items.RemoveAt(i);
continue;
}
totalItems += 1 + item.TotalItems;
if (from.PlaceInBackpack(item))
{
inventory.Items.RemoveAt(i);
givenToBackpack += 1 + item.TotalItems;
}
else if (from.BankBox.TryDropItem(from, item, false))
{
inventory.Items.RemoveAt(i);
givenToBankBox += 1 + item.TotalItems;
}
}
public override void OnResponse(NetState sender, in RelayInfo info)
// The vendor you selected had ~1_COUNT~ items in its inventory, and ~2_AMOUNT~ gold in its account.
from.SendLocalizedMessage(1062436, $"{totalItems}\t{inventory.Gold}");
var givenGold = Banker.DepositUpTo(from, inventory.Gold);
inventory.Gold -= givenGold;
// ~1_AMOUNT~ gold has been deposited into your bank box.
from.SendLocalizedMessage(1060397, givenGold.ToString());
// ~1_COUNT~ items have been removed from the shop inventory and placed in your backpack.
// ~2_BANKCOUNT~ items were removed from the shop inventory and placed in your bank box.
from.SendLocalizedMessage(1062437, $"{givenToBackpack}\t{givenToBankBox}");
if (inventory.Gold > 0 || inventory.Items.Count > 0)
{
if (info.ButtonID == 0)
{
return;
}
var from = sender.Mobile;
var sign = m_House.Sign;
if (m_House.Deleted || sign?.Deleted != false || !from.CheckAlive())
{
return;
}
if (from.Map != sign.Map || !from.InRange(sign, 5))
{
from.SendLocalizedMessage(1062429); // You must be within five paces of the house sign to use this option.
return;
}
var index = info.ButtonID - 1;
if (index < 0 || index >= m_Inventories.Count)
{
return;
}
var inventory = m_Inventories[index];
if (inventory.Owner != from || !m_House.VendorInventories.Contains(inventory))
{
return;
}
var totalItems = 0;
var givenToBackpack = 0;
var givenToBankBox = 0;
for (var i = inventory.Items.Count - 1; i >= 0; i--)
{
var item = inventory.Items[i];
if (item.Deleted)
{
inventory.Items.RemoveAt(i);
continue;
}
totalItems += 1 + item.TotalItems;
if (from.PlaceInBackpack(item))
{
inventory.Items.RemoveAt(i);
givenToBackpack += 1 + item.TotalItems;
}
else if (from.BankBox.TryDropItem(from, item, false))
{
inventory.Items.RemoveAt(i);
givenToBankBox += 1 + item.TotalItems;
}
}
from.SendLocalizedMessage(
1062436,
$"{totalItems}\t{inventory.Gold}"
); // The vendor you selected had ~1_COUNT~ items in its inventory, and ~2_AMOUNT~ gold in its account.
var givenGold = Banker.DepositUpTo(from, inventory.Gold);
inventory.Gold -= givenGold;
from.SendLocalizedMessage(
1060397,
givenGold.ToString()
); // ~1_AMOUNT~ gold has been deposited into your bank box.
from.SendLocalizedMessage(
1062437,
$"{givenToBackpack}\t{givenToBankBox}"
); // ~1_COUNT~ items have been removed from the shop inventory and placed in your backpack. ~2_BANKCOUNT~ items were removed from the shop inventory and placed in your bank box.
if (inventory.Gold > 0 || inventory.Items.Count > 0)
{
from.SendLocalizedMessage(
1062440
); // Some of the shop inventory would not fit in your backpack or bank box. Please free up some room and try again.
}
else
{
inventory.Delete();
from.SendLocalizedMessage(1062438); // The shop is now empty of inventory and funds, so it has been deleted.
}
// Some of the shop inventory would not fit in your backpack or bank box. Please free up some room and try again.
from.SendLocalizedMessage(1062440);
}
else
{
inventory.Delete();
from.SendLocalizedMessage(1062438); // The shop is now empty of inventory and funds, so it has been deleted.
}
}
}

1276
Projects/UOContent/Gumps/VendorRentalGumps.cs
View file

File diff suppressed because it is too large Load diff