fix: Optimizes gump relay info (Prep for Static Gumps) (#1698)
This commit is contained in:
parent
50fcee12dc
commit
cfe9e04c78
220 changed files with 364 additions and 402 deletions
|
|
@ -401,7 +401,7 @@ public class AdvancedSearchGump : Gump
|
|||
}
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState state, RelayInfo info)
|
||||
public override void OnResponse(NetState state, in RelayInfo info)
|
||||
{
|
||||
var from = state.Mobile;
|
||||
if (from == null)
|
||||
|
|
@ -430,21 +430,21 @@ public class AdvancedSearchGump : Gump
|
|||
Filter.FilterRegion = info.IsSwitched(319);
|
||||
Filter.FilterTerMur = info.IsSwitched(320);
|
||||
|
||||
var rangeText = info.GetTextEntry(100)?.Text;
|
||||
var rangeText = info.GetTextEntry(100);
|
||||
Filter.Range = rangeText != null ? Utility.ToInt32(rangeText) : null;
|
||||
|
||||
var filterText = info.GetTextEntry(101)?.Text;
|
||||
var filterText = info.GetTextEntry(101);
|
||||
Filter.Type = filterText != null ? AssemblyHandler.FindTypeByName(filterText) : null;
|
||||
|
||||
Filter.Name = info.GetTextEntry(102)?.Text;
|
||||
Filter.PropertyTest = info.GetTextEntry(104)?.Text;
|
||||
Filter.Name = info.GetTextEntry(102);
|
||||
Filter.PropertyTest = info.GetTextEntry(104);
|
||||
|
||||
var ageText = info.GetTextEntry(105)?.Text;
|
||||
var ageText = info.GetTextEntry(105);
|
||||
Filter.Age = ageText != null ? Utility.ToTimeSpan(ageText) : null;
|
||||
|
||||
Filter.RegionName = info.GetTextEntry(106)?.Text;
|
||||
Filter.RegionName = info.GetTextEntry(106);
|
||||
|
||||
CommandString = info.GetTextEntry(301)?.Text;
|
||||
CommandString = info.GetTextEntry(301);
|
||||
|
||||
var buttonId = info.ButtonID;
|
||||
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ public abstract class AdvancedSearchWarningGump : Gump
|
|||
AddHtmlLocalized(40 + (width - 20) / 2, height - 30, 170, 20, 1011012, 32767); // CANCEL
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info) => OnClickResponse(sender, info.ButtonID == 1);
|
||||
public override void OnResponse(NetState sender, in RelayInfo info) => OnClickResponse(sender, info.ButtonID == 1);
|
||||
|
||||
protected abstract void OnClickResponse(NetState sender, bool okay);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -154,7 +154,7 @@ namespace Server.Engines.BulkOrders
|
|||
}
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
var f = m_From.UseOwnFilter ? m_From.BOBFilter : m_Book.Filter;
|
||||
|
||||
|
|
|
|||
|
|
@ -525,7 +525,7 @@ namespace Server.Engines.BulkOrders
|
|||
return "Invalid";
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
var index = info.ButtonID;
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ namespace Server.Engines.BulkOrders
|
|||
AddHtmlLocalized(152, 130, 100, 24, 1011036); // OKAY
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID != 2)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ namespace Server.Engines.BulkOrders
|
|||
AddHtmlLocalized(310, 216 + entries.Length * 24, 120, 20, 1011012, 0x7FFF);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID == 1) // Ok
|
||||
{
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ namespace Server.Engines.BulkOrders
|
|||
AddHtmlLocalized(160, 192 + entries.Length * 24, 120, 20, 1011441, 0x7FFF); // EXIT
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (m_Deed.Deleted || !m_Deed.IsChildOf(m_From.Backpack))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ namespace Server.Engines.BulkOrders
|
|||
AddHtmlLocalized(310, 240, 120, 20, 1011012, 0x7FFF); // CANCEL
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID == 1) // Ok
|
||||
{
|
||||
|
|
|
|||
|
|
@ -69,7 +69,7 @@ namespace Server.Engines.BulkOrders
|
|||
AddHtmlLocalized(160, 216, 120, 20, 1011441, 0x7FFF); // EXIT
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (m_Deed.Deleted || !m_Deed.IsChildOf(m_From.Backpack))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -170,7 +170,7 @@ namespace Server.Engines.ConPVP
|
|||
return false;
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID != 1 || !m_Active || !m_Context.Registered)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -301,7 +301,7 @@ namespace Server.Engines.ConPVP
|
|||
}
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
var from = m_From;
|
||||
var mob = m_Requested;
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@ namespace Server.Engines.ConPVP
|
|||
sb.Append(le.Mobile.Name);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID != 1)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -314,7 +314,7 @@ namespace Server.Engines.ConPVP
|
|||
AddButton(x + 3, y + 3, 0xD8, 0xD8, bid);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID == 1 && info.IsSwitched(1))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ namespace Server.Engines.ConPVP
|
|||
AddHtml(x + 25, y, 200, 20, text);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (!Context.Registered)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -221,7 +221,7 @@ namespace Server.Engines.ConPVP
|
|||
};
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
var from = sender.Mobile;
|
||||
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ namespace Server.Engines.ConPVP
|
|||
AddHtml(x + 25, y, 200, 20, text);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (!Context.Registered)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ namespace Server.Engines.ConPVP
|
|||
|
||||
public string Center(string text) => $"<CENTER>{text}</CENTER>";
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (m_Context?.Registered == false)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ namespace Server.Engines.ConPVP
|
|||
|
||||
public string Center(string text) => $"<CENTER>{text}</CENTER>";
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -200,7 +200,7 @@ namespace Server.Engines.ConPVP
|
|||
AddButton(x + 3, y + 3, 0xD8, 0xD8, bid);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (!m_Context.Registered || !m_Context.ReadyWait)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ namespace Server.Engines.ConPVP
|
|||
AddButton(x + 3, y + 3, 0xD8, 0xD8, bid);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (m_DuelContext?.Registered == false)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -767,7 +767,7 @@ namespace Server.Engines.ConPVP
|
|||
}
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (!FromButtonID(info.ButtonID, out var type, out var index))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -227,7 +227,7 @@ namespace Server.Engines.ConPVP
|
|||
}
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (m_Entry == null)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -458,7 +458,7 @@ namespace Server.Engines.Craft
|
|||
}
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID <= 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -297,7 +297,7 @@ namespace Server.Engines.Craft
|
|||
}
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
// Back Button
|
||||
if (info.ButtonID == 0)
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ namespace Server.Engines.Craft
|
|||
AddButton(20, 125, 4005, 4007, 0);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
var makersMark = info.ButtonID == 1;
|
||||
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ namespace Server.Factions
|
|||
AddHtmlLocalized(55, 140, 350, 20, 1011012); // CANCEL
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
switch (info.ButtonID)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -161,7 +161,7 @@ namespace Server.Factions
|
|||
public static string FormatTimeSpan(TimeSpan ts) =>
|
||||
$"{ts.Days:D2}:{ts.Hours % 24:D2}:{ts.Minutes % 60:D2}:{ts.Seconds % 60:D2}";
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
var from = sender.Mobile;
|
||||
var bid = info.ButtonID;
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ namespace Server.Factions
|
|||
AddButton(20, 230, 4005, 4007, 0);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID == 1)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -259,7 +259,7 @@ namespace Server.Factions
|
|||
|
||||
public override int ButtonTypes => 4;
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (!FromButtonID(info.ButtonID, out var type, out var index))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -165,7 +165,7 @@ namespace Server.Factions
|
|||
|
||||
public override int ButtonTypes => 2;
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (!m_Town.IsFinance(m_From) || m_Town.Owner != m_Faction)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ namespace Server.Factions
|
|||
AddButton(20, 240, 4005, 4007, 0);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID != 1)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ namespace Server.Factions
|
|||
AddHtmlLocalized(335, 400, 200, 20, 1011012); // CANCEL
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID == 1)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ namespace Server.Factions
|
|||
AddButton(135, 80, 4005, 4007, 2);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
switch (info.ButtonID)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ namespace Server.Factions
|
|||
AddItem(x + (w - rc.Width) / 2 - rc.X, y + (h - rc.Height) / 2 - rc.Y, itemID);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (!m_Town.IsSheriff(m_From) || m_Town.Owner != m_Faction)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ namespace Server.Factions
|
|||
AddButton(20, 210, 4005, 4007, 0);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (m_Town.Owner != m_Faction || !m_Faction.IsCommander(m_From))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ namespace Server.Factions
|
|||
AddHtmlLocalized(55, 310, 100, 20, 1011012); // CANCEL
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID == 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -333,7 +333,7 @@ namespace Server.Engines.Help
|
|||
return false;
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState state, RelayInfo info)
|
||||
public override void OnResponse(NetState state, in RelayInfo info)
|
||||
{
|
||||
var from = state.Mobile;
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ namespace Server.Engines.Help
|
|||
AddButton(405, 355, 2073, 2072, 0); // Cancel
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID == 0)
|
||||
{
|
||||
|
|
@ -38,8 +38,7 @@ namespace Server.Engines.Help
|
|||
}
|
||||
else
|
||||
{
|
||||
var entry = info.GetTextEntry(0);
|
||||
var text = entry?.Text.Trim() ?? "";
|
||||
var text = info.GetTextEntry(0)?.Trim() ?? "";
|
||||
|
||||
if (text.Length == 0)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ namespace Server.Engines.Help
|
|||
AddHtmlLocalized(34, 28, 65, 24, 3001002, 0xFFFFFF); // Message
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState state, RelayInfo info)
|
||||
public override void OnResponse(NetState state, in RelayInfo info)
|
||||
{
|
||||
m_Mobile.SendGump(new PageResponseGump(m_Mobile, m_Name, m_Text));
|
||||
|
||||
|
|
@ -112,7 +112,7 @@ namespace Server.Engines.Help
|
|||
}
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState state, RelayInfo info)
|
||||
public override void OnResponse(NetState state, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID >= 1 && info.ButtonID <= m_List.Length)
|
||||
{
|
||||
|
|
@ -350,7 +350,7 @@ namespace Server.Engines.Help
|
|||
AddTextEntry(x + 3, y + 1, w - 4, h - 2, 0x480, id, def);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (m_From.AccessLevel < AccessLevel.Administrator)
|
||||
{
|
||||
|
|
@ -436,12 +436,7 @@ namespace Server.Engines.Help
|
|||
}
|
||||
case 2:
|
||||
{
|
||||
var te = info.GetTextEntry(0);
|
||||
|
||||
if (te != null)
|
||||
{
|
||||
m_Response.Title = te.Text;
|
||||
}
|
||||
m_Response.Title = info.GetTextEntry(0);
|
||||
|
||||
PredefinedResponse.Save();
|
||||
m_From.SendGump(new PredefGump(m_From, m_Response));
|
||||
|
|
@ -450,12 +445,7 @@ namespace Server.Engines.Help
|
|||
}
|
||||
case 3:
|
||||
{
|
||||
var te = info.GetTextEntry(1);
|
||||
|
||||
if (te != null)
|
||||
{
|
||||
m_Response.Message = te.Text;
|
||||
}
|
||||
m_Response.Message = info.GetTextEntry(1);
|
||||
|
||||
PredefinedResponse.Save();
|
||||
m_From.SendGump(new PredefGump(m_From, m_Response));
|
||||
|
|
@ -612,7 +602,7 @@ namespace Server.Engines.Help
|
|||
g.SendTo(state);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState state, RelayInfo info)
|
||||
public override void OnResponse(NetState state, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID != 0 && PageQueue.List.IndexOf(m_Entry) < 0)
|
||||
{
|
||||
|
|
@ -799,7 +789,7 @@ namespace Server.Engines.Help
|
|||
if (text != null)
|
||||
// m_Entry.AddResponse(state.Mobile, "[Response] " + text.Text);
|
||||
{
|
||||
m_Entry.Sender.SendGump(new MessageSentGump(m_Entry.Sender, state.Mobile.Name, text.Text));
|
||||
m_Entry.Sender.SendGump(new MessageSentGump(m_Entry.Sender, state.Mobile.Name, text));
|
||||
}
|
||||
// m_Entry.Sender.SendMessage( 0x482, "{0} tells you:", state.Mobile.Name );
|
||||
// m_Entry.Sender.SendMessage( 0x482, text.Text );
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ namespace Server.Engines.Help
|
|||
AddButton(475, 417, 2073, 2072, 0); // CANCEL
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID != 1)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -105,7 +105,7 @@ namespace Server.Engines.Help
|
|||
}
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
var from = sender.Mobile;
|
||||
|
||||
|
|
|
|||
|
|
@ -187,7 +187,7 @@ namespace Server.Menus.Questions
|
|||
m_Mobile.Frozen = false;
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState state, RelayInfo info)
|
||||
public override void OnResponse(NetState state, in RelayInfo info)
|
||||
{
|
||||
StopClose();
|
||||
|
||||
|
|
|
|||
|
|
@ -737,7 +737,7 @@ namespace Server.Items
|
|||
}
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (m_Chest.Deleted || info.ButtonID == 0 || !m_From.CheckAlive())
|
||||
{
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ namespace Server.Engines.MLQuests.Gumps
|
|||
AddButton(265, 220, 0xF7, 0xF8, 7);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (m_Instance.Removed)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ namespace Server.Engines.MLQuests.Gumps
|
|||
AddRewardsPage(quest);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (m_Instance.Removed)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ namespace Server.Engines.MLQuests.Gumps
|
|||
}
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID < 6)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ namespace Server.Engines.MLQuests.Gumps
|
|||
AddRewardsPage(quest);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (sender.Mobile is not PlayerMobile pm)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ namespace Server.Engines.MLQuests.Gumps
|
|||
AddConversation(quest.CompletionMessage);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID == 4)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ namespace Server.Engines.MLQuests.Gumps
|
|||
AddRewards(quest);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID == 1)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ namespace Server.Engines.MLQuests.Gumps
|
|||
AddButton(90, 95, 0xF2, 0xF1, 0);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
switch (info.ButtonID)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ namespace Server.Engines.Plants
|
|||
}
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
var from = sender.Mobile;
|
||||
|
||||
|
|
|
|||
|
|
@ -254,7 +254,7 @@ namespace Server.Engines.Plants
|
|||
}
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
var from = sender.Mobile;
|
||||
|
||||
|
|
|
|||
|
|
@ -125,7 +125,7 @@ namespace Server.Engines.Plants
|
|||
}
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
var from = sender.Mobile;
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ namespace Server.Engines.Plants
|
|||
AddItem(227, 118, 0xCF0);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
var from = sender.Mobile;
|
||||
|
||||
|
|
|
|||
|
|
@ -133,7 +133,7 @@ public class ReportMurdererGump : Gump
|
|||
AddHtmlLocalized(400, 300, 300, 50, 1046363); // No
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState state, RelayInfo info)
|
||||
public override void OnResponse(NetState state, in RelayInfo info)
|
||||
{
|
||||
var from = (PlayerMobile)state.Mobile;
|
||||
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ public class SheetMusicOfferGump : BaseQuestGump
|
|||
AddButton(340, 390, 0xF7, 0xF8, 1);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID != 1 || !info.IsSwitched(1))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ namespace Server.Engines.Quests
|
|||
}
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
for (var i = m_Conversations.Count - 1; i >= 0; --i)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ namespace Server.Engines.Quests
|
|||
AddButton(30, 15, 5575, 5576, 1);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID == 1)
|
||||
{
|
||||
|
|
@ -231,7 +231,7 @@ namespace Server.Engines.Quests
|
|||
}
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
for (var i = m_Objectives.Count - 1; i >= 0; --i)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -591,7 +591,7 @@ namespace Server.Engines.Quests
|
|||
AddButton(265, 220, 247, 248, 1);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID == 1)
|
||||
{
|
||||
|
|
@ -654,7 +654,7 @@ namespace Server.Engines.Quests
|
|||
AddImage(379, 60, system.Picture);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID == 1)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -300,7 +300,7 @@ public class ChylothPartyGump : Gump
|
|||
AddImageTiled(0, 0, 1, 217, 9155);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID == 2 && info.IsSwitched(1))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ public class SpawnPropsGump : PropertiesGump
|
|||
public static object GetPropValue(object src, string propName) =>
|
||||
src.GetType().GetProperty(propName)?.GetValue(src, null);
|
||||
|
||||
public override void OnResponse(NetState state, RelayInfo info)
|
||||
public override void OnResponse(NetState state, in RelayInfo info)
|
||||
{
|
||||
var from = state.Mobile;
|
||||
|
||||
|
|
|
|||
|
|
@ -399,7 +399,7 @@ public class SpawnerControllerGump : GumpGrid
|
|||
}
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
var buttonID = info.ButtonID - 1;
|
||||
var type = buttonID % TypeCount;
|
||||
|
|
@ -427,9 +427,9 @@ public class SpawnerControllerGump : GumpGrid
|
|||
{
|
||||
var entry = info.GetTextEntry(0xFFFF);
|
||||
|
||||
if (entry?.Text?.Length > 0)
|
||||
if (entry?.Length > 0)
|
||||
{
|
||||
_search.SearchPattern = entry.Text;
|
||||
_search.SearchPattern = entry;
|
||||
}
|
||||
}
|
||||
else if (index == 5 && _copy != null && _spawners?.Length > 0)
|
||||
|
|
@ -500,27 +500,27 @@ public class SpawnerControllerGump : GumpGrid
|
|||
var indexEntry = index >= _lineCount ? (index - _lineCount * _page) * EntryCount : index * EntryCount;
|
||||
|
||||
var name = info.GetTextEntry(indexEntry);
|
||||
if (name?.Text.Length > 0)
|
||||
if (name?.Length > 0)
|
||||
{
|
||||
spawner.Name = name.Text;
|
||||
spawner.Name = name;
|
||||
}
|
||||
|
||||
if (int.TryParse(info.GetTextEntry(indexEntry + 1)?.Text, out var walkRange))
|
||||
if (int.TryParse(info.GetTextEntry(indexEntry + 1), out var walkRange))
|
||||
{
|
||||
spawner.WalkingRange = walkRange;
|
||||
}
|
||||
|
||||
if (int.TryParse(info.GetTextEntry(indexEntry + 2)?.Text, out var homeHange))
|
||||
if (int.TryParse(info.GetTextEntry(indexEntry + 2), out var homeHange))
|
||||
{
|
||||
spawner.HomeRange = homeHange;
|
||||
}
|
||||
|
||||
if (TimeSpan.TryParse(info.GetTextEntry(indexEntry + 3)?.Text, out var minDelay))
|
||||
if (TimeSpan.TryParse(info.GetTextEntry(indexEntry + 3), out var minDelay))
|
||||
{
|
||||
spawner.MinDelay = minDelay;
|
||||
}
|
||||
|
||||
if (TimeSpan.TryParse(info.GetTextEntry(indexEntry + 4)?.Text, out var maxDelay))
|
||||
if (TimeSpan.TryParse(info.GetTextEntry(indexEntry + 4), out var maxDelay))
|
||||
{
|
||||
spawner.MaxDelay = maxDelay;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -246,7 +246,7 @@ public class SpawnerGump : Gump
|
|||
continue;
|
||||
}
|
||||
|
||||
var str = cte.Text.Trim().ToLower();
|
||||
var str = cte.Trim().ToLower();
|
||||
|
||||
if (str.Length > 0)
|
||||
{
|
||||
|
|
@ -267,12 +267,12 @@ public class SpawnerGump : Gump
|
|||
|
||||
if (mte != null)
|
||||
{
|
||||
entry.SpawnedMaxCount = Utility.ToInt32(mte.Text.Trim());
|
||||
entry.SpawnedMaxCount = Utility.ToInt32(mte.Trim());
|
||||
}
|
||||
|
||||
if (poste != null)
|
||||
{
|
||||
entry.SpawnedProbability = Utility.ToInt32(poste.Text.Trim());
|
||||
entry.SpawnedProbability = Utility.ToInt32(poste.Trim());
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
@ -282,12 +282,12 @@ public class SpawnerGump : Gump
|
|||
|
||||
if (mte != null)
|
||||
{
|
||||
maxcount = Utility.ToInt32(mte.Text.Trim());
|
||||
maxcount = Utility.ToInt32(mte.Trim());
|
||||
}
|
||||
|
||||
if (poste != null)
|
||||
{
|
||||
probcount = Utility.ToInt32(poste.Text.Trim());
|
||||
probcount = Utility.ToInt32(poste.Trim());
|
||||
}
|
||||
|
||||
entry = spawner.AddEntry(str, probcount, maxcount);
|
||||
|
|
@ -295,12 +295,12 @@ public class SpawnerGump : Gump
|
|||
|
||||
if (parmte != null)
|
||||
{
|
||||
entry.Parameters = parmte.Text.Trim();
|
||||
entry.Parameters = parmte.Trim();
|
||||
}
|
||||
|
||||
if (propte != null)
|
||||
{
|
||||
entry.Properties = propte.Text.Trim();
|
||||
entry.Properties = propte.Trim();
|
||||
}
|
||||
}
|
||||
else if (entryindex < ocount && spawner.Entries[entryindex] != null)
|
||||
|
|
@ -320,7 +320,7 @@ public class SpawnerGump : Gump
|
|||
}
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState state, RelayInfo info)
|
||||
public override void OnResponse(NetState state, in RelayInfo info)
|
||||
{
|
||||
if (_spawner.Deleted)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ namespace Server.Gumps
|
|||
};
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState state, RelayInfo info)
|
||||
public override void OnResponse(NetState state, in RelayInfo info)
|
||||
{
|
||||
if (m_Statue?.Deleted != false)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ namespace Server.Engines.VeteranRewards
|
|||
page += 1;
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
var buttonID = info.ButtonID - 1;
|
||||
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ namespace Server.Engines.VeteranRewards
|
|||
AddHtmlLocalized(330, 266, 150, 35, 1006045); // Cancel
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID == 1)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ namespace Server.Gumps
|
|||
AddButton(20, 125, 0xFA5, 0xFA7, (int)Buttons.Cancel);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (m_Addon is not Item item || item.Deleted)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ namespace Server.Engines.VeteranRewards
|
|||
AddHtmlLocalized(320, 96, 150, 35, 1006045); // Cancel
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID == 1)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ namespace Server.Gumps
|
|||
}
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (m_Option != null && Contains(info.ButtonID))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -315,7 +315,7 @@ public class AcceptProtectorGump : Gump
|
|||
AddImageTiled(0, 0, 1, 217, 9155);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
public override void OnResponse(NetState sender, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID == 2)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -137,7 +137,7 @@ public class VirtueGump : Gump
|
|||
return _table[index * 3 + vl];
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState state, RelayInfo info)
|
||||
public override void OnResponse(NetState state, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID == 1 && _beholder == _beheld)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ public class VirtueInfoGump : Gump
|
|||
AddHtmlLocalized(83, 275, 400, 40, webPage == null ? 1052055 : 1052052);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState state, RelayInfo info)
|
||||
public override void OnResponse(NetState state, in RelayInfo info)
|
||||
{
|
||||
switch (info.ButtonID)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ public class VirtueStatusGump : Gump
|
|||
_ => 0
|
||||
};
|
||||
|
||||
public override void OnResponse(NetState state, RelayInfo info)
|
||||
public override void OnResponse(NetState state, in RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID == 9)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue