Fixes brace style (#248)
This commit is contained in:
parent
a236617ad9
commit
8149620b0c
1503 changed files with 28575 additions and 1717 deletions
|
|
@ -294,15 +294,24 @@ namespace Server.Engines.Help
|
|||
|
||||
private static void EventSink_HelpRequest(Mobile m)
|
||||
{
|
||||
if (m.NetState.Gumps.OfType<HelpGump>().Any()) return;
|
||||
if (m.NetState.Gumps.OfType<HelpGump>().Any())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (!PageQueue.CheckAllowedToPage(m))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (PageQueue.Contains(m))
|
||||
{
|
||||
m.SendMenu(new ContainedMenu(m));
|
||||
}
|
||||
else
|
||||
{
|
||||
m.SendGump(new HelpGump(m));
|
||||
}
|
||||
}
|
||||
|
||||
private static bool IsYoung(Mobile m) => m is PlayerMobile mobile && mobile.Young;
|
||||
|
|
@ -314,7 +323,9 @@ namespace Server.Engines.Help
|
|||
var info = m.Aggressed[i];
|
||||
|
||||
if (DateTime.UtcNow - info.LastCombatTime < TimeSpan.FromSeconds(30.0))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
|
|
@ -407,15 +418,21 @@ namespace Server.Engines.Help
|
|||
if (IsYoung(from))
|
||||
{
|
||||
if (from.Region.IsPartOf<JailRegion>())
|
||||
from.SendLocalizedMessage(
|
||||
{
|
||||
@from.SendLocalizedMessage(
|
||||
1114345,
|
||||
"",
|
||||
0x35
|
||||
); // You'll need a better jailbreak plan than that!
|
||||
}
|
||||
else if (from.Region.IsPartOf("Haven Island"))
|
||||
from.SendLocalizedMessage(1041529); // You're already in Haven
|
||||
{
|
||||
@from.SendLocalizedMessage(1041529); // You're already in Haven
|
||||
}
|
||||
else
|
||||
from.MoveToWorld(new Point3D(3503, 2574, 14), Map.Trammel);
|
||||
{
|
||||
@from.MoveToWorld(new Point3D(3503, 2574, 14), Map.Trammel);
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
|
|
@ -423,7 +440,9 @@ namespace Server.Engines.Help
|
|||
}
|
||||
|
||||
if (type != (PageType)(-1) && PageQueue.CheckAllowedToPage(from))
|
||||
from.SendGump(new PagePromptGump(from, type));
|
||||
{
|
||||
@from.SendGump(new PagePromptGump(@from, type));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,7 +40,9 @@ namespace Server.Engines.Help
|
|||
PageMap = sender.Map;
|
||||
|
||||
if (sender is PlayerMobile pm && pm.SpeechLog != null && Array.IndexOf(SpeechLogAttachment, type) >= 0)
|
||||
{
|
||||
SpeechLog = new List<SpeechLogEntry>(pm.SpeechLog);
|
||||
}
|
||||
|
||||
m_Timer = new InternalTimer(this);
|
||||
m_Timer.Start();
|
||||
|
|
@ -101,14 +103,19 @@ namespace Server.Engines.Help
|
|||
1008084
|
||||
); // You can reference our website at www.uo.com or contact us at support@uo.com. To cancel your page, please select the help button again and select cancel.
|
||||
|
||||
if (m_Entry.Handler != null && m_Entry.Handler.NetState == null) m_Entry.Handler = null;
|
||||
if (m_Entry.Handler != null && m_Entry.Handler.NetState == null)
|
||||
{
|
||||
m_Entry.Handler = null;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (index != -1)
|
||||
// m_Entry.AddResponse(m_Entry.Sender, "[Logout]");
|
||||
|
||||
{
|
||||
PageQueue.Remove(m_Entry);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -129,7 +136,9 @@ namespace Server.Engines.Help
|
|||
public static bool CheckAllowedToPage(Mobile from)
|
||||
{
|
||||
if (!(from is PlayerMobile pm))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
if (pm.DesignContext != null)
|
||||
{
|
||||
|
|
@ -151,19 +160,29 @@ namespace Server.Engines.Help
|
|||
public static string GetPageTypeName(PageType type)
|
||||
{
|
||||
if (type == PageType.VerbalHarassment)
|
||||
{
|
||||
return "Verbal Harassment";
|
||||
}
|
||||
|
||||
if (type == PageType.PhysicalHarassment)
|
||||
{
|
||||
return "Physical Harassment";
|
||||
}
|
||||
|
||||
return type.ToString();
|
||||
}
|
||||
|
||||
public static void OnHandlerChanged(Mobile old, Mobile value, PageEntry entry)
|
||||
{
|
||||
if (old != null)
|
||||
{
|
||||
m_KeyedByHandler.Remove(old);
|
||||
}
|
||||
|
||||
if (value != null)
|
||||
{
|
||||
m_KeyedByHandler[value] = entry;
|
||||
}
|
||||
}
|
||||
|
||||
[Usage("Pages")]
|
||||
|
|
@ -171,11 +190,17 @@ namespace Server.Engines.Help
|
|||
private static void Pages_OnCommand(CommandEventArgs e)
|
||||
{
|
||||
if (m_KeyedByHandler.TryGetValue(e.Mobile, out var entry))
|
||||
{
|
||||
e.Mobile.SendGump(new PageEntryGump(e.Mobile, entry));
|
||||
}
|
||||
else if (List.Count > 0)
|
||||
{
|
||||
e.Mobile.SendGump(new PageQueueGump());
|
||||
}
|
||||
else
|
||||
{
|
||||
e.Mobile.SendMessage("The page queue is empty.");
|
||||
}
|
||||
}
|
||||
|
||||
public static bool IsHandling(Mobile check) => m_KeyedByHandler.ContainsKey(check);
|
||||
|
|
@ -187,7 +212,9 @@ namespace Server.Engines.Help
|
|||
public static void Remove(PageEntry e)
|
||||
{
|
||||
if (e == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
e.Stop();
|
||||
|
||||
|
|
@ -195,7 +222,9 @@ namespace Server.Engines.Help
|
|||
m_KeyedBySender.Remove(e.Sender);
|
||||
|
||||
if (e.Handler != null)
|
||||
{
|
||||
m_KeyedByHandler.Remove(e.Handler);
|
||||
}
|
||||
}
|
||||
|
||||
public static PageEntry GetEntry(Mobile sender)
|
||||
|
|
@ -221,20 +250,28 @@ namespace Server.Engines.Help
|
|||
var m = ns.Mobile;
|
||||
|
||||
if (m?.AccessLevel >= AccessLevel.Counselor && m.AutoPageNotify && !IsHandling(m))
|
||||
{
|
||||
m.SendMessage("A new page has been placed in the queue.");
|
||||
}
|
||||
|
||||
if (m?.AccessLevel >= AccessLevel.Counselor && m.AutoPageNotify &&
|
||||
Core.TickCount - m.LastMoveTime < 600000)
|
||||
{
|
||||
isStaffOnline = true;
|
||||
}
|
||||
}
|
||||
|
||||
if (!isStaffOnline)
|
||||
{
|
||||
entry.Sender.SendMessage(
|
||||
"We are sorry, but no staff members are currently available to assist you. Your page will remain in the queue until one becomes available, or until you cancel it manually."
|
||||
);
|
||||
}
|
||||
|
||||
if (entry.SpeechLog != null)
|
||||
{
|
||||
Email.SendQueueEmail(entry, GetPageTypeName(entry.Type));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,9 +63,13 @@ namespace Server.Engines.Help
|
|||
|
||||
if (e.Sender.Deleted || e.Sender.NetState == null)
|
||||
// e.AddResponse(e.Sender, "[Logout]");
|
||||
{
|
||||
PageQueue.Remove(e);
|
||||
}
|
||||
else
|
||||
{
|
||||
++i;
|
||||
}
|
||||
}
|
||||
|
||||
m_List = list.ToArray();
|
||||
|
|
@ -171,7 +175,9 @@ namespace Server.Engines.Help
|
|||
var path = Path.Combine(Core.BaseDirectory, "Data/pageresponse.cfg");
|
||||
|
||||
if (!File.Exists(path))
|
||||
{
|
||||
return new List<PredefinedResponse>();
|
||||
}
|
||||
|
||||
var list = new List<PredefinedResponse>();
|
||||
|
||||
|
|
@ -183,12 +189,16 @@ namespace Server.Engines.Help
|
|||
while ((line = ip.ReadLine()?.Trim()) != null)
|
||||
{
|
||||
if (line.Length == 0 || line.StartsWith("#"))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
var split = line.Split('\t');
|
||||
|
||||
if (split.Length == 2)
|
||||
{
|
||||
list.Add(new PredefinedResponse(split[0], split[1]));
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
|
|
@ -253,14 +263,22 @@ namespace Server.Engines.Help
|
|||
AddButton(370, 44 + i % 5 * 80 + 24, 0xFA5, 0xFA7, 2 + i * 3);
|
||||
|
||||
if (i > 0)
|
||||
{
|
||||
AddButton(377, 44 + i % 5 * 80 + 2, 0x15E0, 0x15E4, 3 + i * 3);
|
||||
}
|
||||
else
|
||||
{
|
||||
AddImage(377, 44 + i % 5 * 80 + 2, 0x25E4);
|
||||
}
|
||||
|
||||
if (i < list.Count - 1)
|
||||
{
|
||||
AddButton(377, 44 + i % 5 * 80 + 70 - 2 - 16, 0x15E2, 0x15E6, 4 + i * 3);
|
||||
}
|
||||
else
|
||||
{
|
||||
AddImage(377, 44 + i % 5 * 80 + 70 - 2 - 16, 0x25E8);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -313,7 +331,9 @@ namespace Server.Engines.Help
|
|||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
{
|
||||
if (m_From.AccessLevel < AccessLevel.Administrator)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (m_Response == null)
|
||||
{
|
||||
|
|
@ -397,7 +417,9 @@ namespace Server.Engines.Help
|
|||
var te = info.GetTextEntry(0);
|
||||
|
||||
if (te != null)
|
||||
{
|
||||
m_Response.Title = te.Text;
|
||||
}
|
||||
|
||||
PredefinedResponse.Save();
|
||||
m_From.SendGump(new PredefGump(m_From, m_Response));
|
||||
|
|
@ -409,7 +431,9 @@ namespace Server.Engines.Help
|
|||
var te = info.GetTextEntry(1);
|
||||
|
||||
if (te != null)
|
||||
{
|
||||
m_Response.Message = te.Text;
|
||||
}
|
||||
|
||||
PredefinedResponse.Save();
|
||||
m_From.SendGump(new PredefGump(m_From, m_Response));
|
||||
|
|
@ -745,7 +769,9 @@ 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.SendMessage( 0x482, "{0} tells you:", state.Mobile.Name );
|
||||
// m_Entry.Sender.SendMessage( 0x482, text.Text );
|
||||
|
||||
|
|
@ -765,7 +791,9 @@ namespace Server.Engines.Help
|
|||
Resend(state);
|
||||
|
||||
if (m_Entry.SpeechLog != null)
|
||||
{
|
||||
state.Mobile.SendGump(new SpeechLogGump(m_Entry.Sender, m_Entry.SpeechLog));
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
|
@ -776,6 +804,7 @@ namespace Server.Engines.Help
|
|||
|
||||
if (index >= 0 && index < preresp.Count)
|
||||
// m_Entry.AddResponse(state.Mobile, "[PreDef] " + preresp[index].Title);
|
||||
{
|
||||
m_Entry.Sender.SendGump(
|
||||
new MessageSentGump(
|
||||
m_Entry.Sender,
|
||||
|
|
@ -783,6 +812,7 @@ namespace Server.Engines.Help
|
|||
preresp[index].Message
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
Resend(state);
|
||||
|
||||
|
|
|
|||
|
|
@ -38,7 +38,9 @@ namespace Server.Engines.Help
|
|||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
{
|
||||
if (info.ButtonID != 1)
|
||||
{
|
||||
m_From.SendGump(new MessageSentGump(m_From, m_Name, m_Text));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,7 +52,9 @@ namespace Server.Engines.Help
|
|||
public void Add(SpeechLogEntry entry)
|
||||
{
|
||||
if (MaxLength > 0 && m_Queue.Count >= MaxLength)
|
||||
{
|
||||
m_Queue.Dequeue();
|
||||
}
|
||||
|
||||
Clean();
|
||||
|
||||
|
|
@ -66,9 +68,13 @@ namespace Server.Engines.Help
|
|||
var entry = m_Queue.Peek();
|
||||
|
||||
if (DateTime.UtcNow - entry.Created > EntryDuration)
|
||||
{
|
||||
m_Queue.Dequeue();
|
||||
}
|
||||
else
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -75,7 +75,9 @@ namespace Server.Engines.Help
|
|||
var speech = entry.Speech;
|
||||
|
||||
if (i != min)
|
||||
{
|
||||
builder.Append("<br>");
|
||||
}
|
||||
|
||||
builder.AppendFormat(
|
||||
"<u>{0}</u> (<i>{1}</i>): {2}",
|
||||
|
|
@ -91,12 +93,16 @@ namespace Server.Engines.Help
|
|||
AddHtml(10, 40, 280, 350, sLog, false, true);
|
||||
|
||||
if (page > 0)
|
||||
{
|
||||
AddButton(10, 395, 0xFAE, 0xFB0, 1); // Previous page
|
||||
}
|
||||
|
||||
AddLabel(45, 395, 0x481, $"Current page: {page + 1}/{lastPage + 1}");
|
||||
|
||||
if (page < lastPage)
|
||||
{
|
||||
AddButton(261, 395, 0xFA5, 0xFA7, 2); // Next page
|
||||
}
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
|
|
@ -108,14 +114,18 @@ namespace Server.Engines.Help
|
|||
case 1: // Previous page
|
||||
{
|
||||
if (m_Page - 1 >= 0)
|
||||
from.SendGump(new SpeechLogGump(m_Player, m_Log, m_Page - 1));
|
||||
{
|
||||
@from.SendGump(new SpeechLogGump(m_Player, m_Log, m_Page - 1));
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
case 2: // Next page
|
||||
{
|
||||
if ((m_Page + 1) * MaxEntriesPerPage < m_Log.Count)
|
||||
from.SendGump(new SpeechLogGump(m_Player, m_Log, m_Page + 1));
|
||||
{
|
||||
@from.SendGump(new SpeechLogGump(m_Player, m_Log, m_Page + 1));
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -198,7 +198,9 @@ namespace Server.Menus.Questions
|
|||
else if (info.ButtonID == 0)
|
||||
{
|
||||
if (m_Mobile == m_Sender)
|
||||
{
|
||||
m_Mobile.SendLocalizedMessage(1010588); // You choose not to go to any city.
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -206,7 +208,9 @@ namespace Server.Menus.Questions
|
|||
var entries = IsInSecondAgeArea(m_Mobile) ? m_T2AEntries : m_Entries;
|
||||
|
||||
if (index >= 0 && index < entries.Length)
|
||||
{
|
||||
Teleport(entries[index]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -219,7 +223,9 @@ namespace Server.Menus.Questions
|
|||
new TeleportTimer(m_Mobile, entry, TimeSpan.FromSeconds(10.0 + Utility.RandomDouble() * 110.0)).Start();
|
||||
|
||||
if (m_Mobile is PlayerMobile mobile)
|
||||
{
|
||||
mobile.UsedStuckMenu();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -293,11 +299,17 @@ namespace Server.Menus.Questions
|
|||
|
||||
Map destMap;
|
||||
if (m_Mobile.Map == Map.Trammel)
|
||||
{
|
||||
destMap = Map.Trammel;
|
||||
}
|
||||
else if (m_Mobile.Map == Map.Felucca)
|
||||
{
|
||||
destMap = Map.Felucca;
|
||||
}
|
||||
else
|
||||
{
|
||||
destMap = m_Mobile.Kills >= 5 ? Map.Felucca : Map.Trammel;
|
||||
}
|
||||
|
||||
BaseCreature.TeleportPets(m_Mobile, dest, destMap);
|
||||
m_Mobile.MoveToWorld(dest, destMap);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue