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

fix: Fixes edge cases with on off items (#1832)

Browse source 
### Summary
- Generalizes the On/Off toggle items concept
- Updates the OnOffGump so it is static
- Standardizes OnOff items so they can be used by staff


### Notes
Decided to not fix #1417 because it is not clear that the clilocs or errors are for that purpose. Can't test this on OSI anyways.
This commit is contained in:
Kamron Batman 2024-06-10 18:11:35 -07:00 • committed by GitHub
parent f756cce0c7
commit 19f65dcabe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 141 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

75
Projects/UOContent/Items/Misc/GumpToggleItems.cs Normal file
View file

@ -0,0 +1,75 @@
using Server.Gumps;
using Server.Network;
namespace Server.Items;
public interface IGumpToggleItem
{
public bool IsLockedDown { get; }
public bool TurnedOn { get; set; }
}
public sealed class TurnOnGump : TurnOnOffGump<TurnOnGump>
{
public TurnOnGump(IGumpToggleItem item) : base(item)
{
}
protected override void BuildLayout(ref StaticGumpBuilder builder)
{
base.BuildLayout(ref builder);
builder.AddHtmlLocalized(45, 20, 300, 35, 1011034); // Activate this item
}
}
public sealed class TurnOffGump : TurnOnOffGump<TurnOffGump>
{
public TurnOffGump(IGumpToggleItem item) : base(item)
{
}
protected override void BuildLayout(ref StaticGumpBuilder builder)
{
base.BuildLayout(ref builder);
builder.AddHtmlLocalized(45, 20, 300, 35, 1011035); // Deactivate this item
}
}
public abstract class TurnOnOffGump<T> : StaticGump<T> where T : TurnOnOffGump<T>
{
protected readonly IGumpToggleItem _item;
public TurnOnOffGump(IGumpToggleItem item) : base(150, 200) => _item = item;
protected override void BuildLayout(ref StaticGumpBuilder builder)
{
builder.AddBackground(0, 0, 300, 150, 0xA28);
builder.AddButton(40, 53, 0xFA5, 0xFA7, 1);
builder.AddHtmlLocalized(80, 55, 65, 35, 1011036); // OKAY
builder.AddButton(150, 53, 0xFA5, 0xFA7, 0);
builder.AddHtmlLocalized(190, 55, 100, 35, 1011012); // CANCEL
}
public override void OnResponse(NetState sender, in RelayInfo info)
{
var from = sender.Mobile;
if (info.ButtonID != 1)
{
from.SendLocalizedMessage(502694); // Cancelled action.
return;
}
var newValue = !_item.TurnedOn;
_item.TurnedOn = newValue;
if (newValue && !_item.IsLockedDown)
{
from.SendLocalizedMessage(502693); // Remember, this only works when locked down.
}
}
}

51
Projects/UOContent/Items/Misc/WindChimes.cs
View file

@ -1,12 +1,10 @@
using ModernUO.Serialization;
using Server.Gumps;
using Server.Multis;
using Server.Network;
namespace Server.Items;
[SerializationGenerator(0, false)]
public abstract partial class BaseWindChimes : Item
public abstract partial class BaseWindChimes : Item, IGumpToggleItem
{
[InvalidateProperties]
[SerializableField(0)]
@ -46,55 +44,22 @@ public abstract partial class BaseWindChimes : Item
}
}
public bool IsOwner(Mobile mob) => BaseHouse.FindHouseAt(this)?.IsOwner(mob) == true;
public bool HasAccess(Mobile mob) => mob.AccessLevel >= AccessLevel.GameMaster ||
BaseHouse.FindHouseAt(this)?.IsOwner(mob) == true;
public override void OnDoubleClick(Mobile from)
{
if (IsOwner(from))
{
from.SendGump(new OnOffGump(this));
}
else
if (!HasAccess(from))
{
from.SendLocalizedMessage(502691); // You must be the owner to use this.
}
}
private class OnOffGump : Gump
{
private readonly BaseWindChimes m_Chimes;
public OnOffGump(BaseWindChimes chimes) : base(150, 200)
else if (TurnedOn)
{
m_Chimes = chimes;
AddBackground(0, 0, 300, 150, 0xA28);
AddHtmlLocalized(45, 20, 300, 35, chimes.TurnedOn ? 1011035 : 1011034); // [De]Activate this item
AddButton(40, 53, 0xFA5, 0xFA7, 1);
AddHtmlLocalized(80, 55, 65, 35, 1011036); // OKAY
AddButton(150, 53, 0xFA5, 0xFA7, 0);
AddHtmlLocalized(190, 55, 100, 35, 1011012); // CANCEL
from.SendGump(new TurnOffGump(this));
}
public override void OnResponse(NetState sender, in RelayInfo info)
else
{
var from = sender.Mobile;
if (info.ButtonID == 1)
{
var newValue = !m_Chimes.TurnedOn;
m_Chimes.TurnedOn = newValue;
if (newValue && !m_Chimes.IsLockedDown)
{
from.SendLocalizedMessage(502693); // Remember, this only works when locked down.
}
}
else
{
from.SendLocalizedMessage(502694); // Cancelled action.
}
from.SendGump(new TurnOnGump(this));
}
}
}