Adds style cop (#109)
This commit is contained in:
Kamron Batman
GitHub
parent
3e715bcb60
commit
556a17aba8
1725 changed files with 33831 additions and 38046 deletions
|
|
@ -9,16 +9,16 @@ namespace Server.Gumps
|
|||
{
|
||||
public static void Initialize()
|
||||
{
|
||||
CommandSystem.Register( "Who", AccessLevel.Counselor, WhoList_OnCommand );
|
||||
CommandSystem.Register( "WhoList", AccessLevel.Counselor, WhoList_OnCommand );
|
||||
CommandSystem.Register("Who", AccessLevel.Counselor, WhoList_OnCommand);
|
||||
CommandSystem.Register("WhoList", AccessLevel.Counselor, WhoList_OnCommand);
|
||||
}
|
||||
|
||||
[Usage( "WhoList [filter]" )]
|
||||
[Aliases( "Who" )]
|
||||
[Description( "Lists all connected clients. Optionally filters results by name." )]
|
||||
private static void WhoList_OnCommand( CommandEventArgs e )
|
||||
[Usage("WhoList [filter]")]
|
||||
[Aliases("Who")]
|
||||
[Description("Lists all connected clients. Optionally filters results by name.")]
|
||||
private static void WhoList_OnCommand(CommandEventArgs e)
|
||||
{
|
||||
e.Mobile.SendGump( new WhoGump( e.Mobile, e.ArgString ) );
|
||||
e.Mobile.SendGump(new WhoGump(e.Mobile, e.ArgString));
|
||||
}
|
||||
|
||||
public static bool OldStyle = PropsConfig.OldStyle;
|
||||
|
|
@ -31,9 +31,9 @@ namespace Server.Gumps
|
|||
|
||||
public static readonly int OffsetGumpID = PropsConfig.OffsetGumpID;
|
||||
public static readonly int HeaderGumpID = PropsConfig.HeaderGumpID;
|
||||
public static readonly int EntryGumpID = PropsConfig.EntryGumpID;
|
||||
public static readonly int BackGumpID = PropsConfig.BackGumpID;
|
||||
public static readonly int SetGumpID = PropsConfig.SetGumpID;
|
||||
public static readonly int EntryGumpID = PropsConfig.EntryGumpID;
|
||||
public static readonly int BackGumpID = PropsConfig.BackGumpID;
|
||||
public static readonly int SetGumpID = PropsConfig.SetGumpID;
|
||||
|
||||
public static readonly int SetWidth = PropsConfig.SetWidth;
|
||||
public static readonly int SetOffsetX = PropsConfig.SetOffsetX, SetOffsetY = PropsConfig.SetOffsetY;
|
||||
|
|
@ -55,7 +55,8 @@ namespace Server.Gumps
|
|||
public static readonly int EntryHeight = PropsConfig.EntryHeight;
|
||||
public static readonly int BorderSize = PropsConfig.BorderSize;
|
||||
|
||||
private static bool PrevLabel = false, NextLabel = false;
|
||||
private static readonly bool PrevLabel = false;
|
||||
private static readonly bool NextLabel = false;
|
||||
|
||||
private static readonly int PrevLabelOffsetX = PrevWidth + 1;
|
||||
private static readonly int PrevLabelOffsetY = 0;
|
||||
|
|
@ -73,27 +74,27 @@ namespace Server.Gumps
|
|||
private static readonly int BackHeight = BorderSize + TotalHeight + BorderSize;
|
||||
|
||||
private Mobile m_Owner;
|
||||
private List<Mobile> m_Mobiles;
|
||||
private readonly List<Mobile> m_Mobiles;
|
||||
private int m_Page;
|
||||
|
||||
private class InternalComparer : IComparer<Mobile>
|
||||
{
|
||||
public static readonly IComparer<Mobile> Instance = new InternalComparer();
|
||||
|
||||
public int Compare( Mobile x, Mobile y )
|
||||
public int Compare(Mobile x, Mobile y)
|
||||
{
|
||||
if ( x == null || y == null )
|
||||
if (x == null || y == null)
|
||||
throw new ArgumentException();
|
||||
|
||||
if ( x.AccessLevel > y.AccessLevel )
|
||||
if (x.AccessLevel > y.AccessLevel)
|
||||
return -1;
|
||||
if ( x.AccessLevel < y.AccessLevel )
|
||||
if (x.AccessLevel < y.AccessLevel)
|
||||
return 1;
|
||||
return Insensitive.Compare( x.Name, y.Name );
|
||||
return Insensitive.Compare(x.Name, y.Name);
|
||||
}
|
||||
}
|
||||
|
||||
public WhoGump(Mobile owner, string filter) : this(owner, BuildList( owner, filter ))
|
||||
public WhoGump(Mobile owner, string filter) : this(owner, BuildList(owner, filter))
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -104,7 +105,7 @@ namespace Server.Gumps
|
|||
m_Owner = owner;
|
||||
m_Mobiles = list;
|
||||
|
||||
Initialize( page );
|
||||
Initialize(page);
|
||||
}
|
||||
|
||||
public static List<Mobile> BuildList(Mobile owner, string rawFilter)
|
||||
|
|
@ -114,104 +115,104 @@ namespace Server.Gumps
|
|||
List<Mobile> list = new List<Mobile>();
|
||||
List<NetState> states = TcpServer.Instances;
|
||||
|
||||
for ( int i = 0; i < states.Count; ++i )
|
||||
for (int i = 0; i < states.Count; ++i)
|
||||
{
|
||||
Mobile m = states[i].Mobile;
|
||||
|
||||
if ( m != null && (m == owner || !m.Hidden || owner.AccessLevel >= m.AccessLevel || m is PlayerMobile mobile && mobile.VisibilityList.Contains( owner ) ) )
|
||||
if (m != null && (m == owner || !m.Hidden || owner.AccessLevel >= m.AccessLevel || (m is PlayerMobile mobile && mobile.VisibilityList.Contains(owner))))
|
||||
{
|
||||
if ( filter != null && !(m.Name?.ToLower().IndexOf(filter) >= 0) )
|
||||
if (filter != null && !(m.Name?.ToLower().IndexOf(filter) >= 0))
|
||||
continue;
|
||||
|
||||
list.Add( m );
|
||||
list.Add(m);
|
||||
}
|
||||
}
|
||||
|
||||
list.Sort( InternalComparer.Instance );
|
||||
list.Sort(InternalComparer.Instance);
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
public void Initialize( int page )
|
||||
public void Initialize(int page)
|
||||
{
|
||||
m_Page = page;
|
||||
|
||||
int count = m_Mobiles.Count - page * EntryCount;
|
||||
|
||||
if ( count < 0 )
|
||||
if (count < 0)
|
||||
count = 0;
|
||||
else if ( count > EntryCount )
|
||||
else if (count > EntryCount)
|
||||
count = EntryCount;
|
||||
|
||||
int totalHeight = OffsetSize + (EntryHeight + OffsetSize) * (count + 1);
|
||||
|
||||
AddPage( 0 );
|
||||
AddPage(0);
|
||||
|
||||
AddBackground( 0, 0, BackWidth, BorderSize + totalHeight + BorderSize, BackGumpID );
|
||||
AddImageTiled( BorderSize, BorderSize, TotalWidth - (OldStyle ? SetWidth + OffsetSize : 0), totalHeight, OffsetGumpID );
|
||||
AddBackground(0, 0, BackWidth, BorderSize + totalHeight + BorderSize, BackGumpID);
|
||||
AddImageTiled(BorderSize, BorderSize, TotalWidth - (OldStyle ? SetWidth + OffsetSize : 0), totalHeight, OffsetGumpID);
|
||||
|
||||
int x = BorderSize + OffsetSize;
|
||||
int y = BorderSize + OffsetSize;
|
||||
|
||||
int emptyWidth = TotalWidth - PrevWidth - NextWidth - OffsetSize * 4 - (OldStyle ? SetWidth + OffsetSize : 0);
|
||||
|
||||
if ( !OldStyle )
|
||||
AddImageTiled( x - (OldStyle ? OffsetSize : 0), y, emptyWidth + (OldStyle ? OffsetSize * 2 : 0), EntryHeight, EntryGumpID );
|
||||
if (!OldStyle)
|
||||
AddImageTiled(x - (OldStyle ? OffsetSize : 0), y, emptyWidth + (OldStyle ? OffsetSize * 2 : 0), EntryHeight, EntryGumpID);
|
||||
|
||||
AddLabel( x + TextOffsetX, y, TextHue,
|
||||
AddLabel(x + TextOffsetX, y, TextHue,
|
||||
$"Page {page + 1} of {(m_Mobiles.Count + EntryCount - 1) / EntryCount} ({m_Mobiles.Count})");
|
||||
|
||||
x += emptyWidth + OffsetSize;
|
||||
|
||||
if ( OldStyle )
|
||||
AddImageTiled( x, y, TotalWidth - OffsetSize * 3 - SetWidth, EntryHeight, HeaderGumpID );
|
||||
if (OldStyle)
|
||||
AddImageTiled(x, y, TotalWidth - OffsetSize * 3 - SetWidth, EntryHeight, HeaderGumpID);
|
||||
else
|
||||
AddImageTiled( x, y, PrevWidth, EntryHeight, HeaderGumpID );
|
||||
AddImageTiled(x, y, PrevWidth, EntryHeight, HeaderGumpID);
|
||||
|
||||
if ( page > 0 )
|
||||
if (page > 0)
|
||||
{
|
||||
AddButton( x + PrevOffsetX, y + PrevOffsetY, PrevButtonID1, PrevButtonID2, 1 );
|
||||
AddButton(x + PrevOffsetX, y + PrevOffsetY, PrevButtonID1, PrevButtonID2, 1);
|
||||
|
||||
if ( PrevLabel )
|
||||
AddLabel( x + PrevLabelOffsetX, y + PrevLabelOffsetY, TextHue, "Previous" );
|
||||
if (PrevLabel)
|
||||
AddLabel(x + PrevLabelOffsetX, y + PrevLabelOffsetY, TextHue, "Previous");
|
||||
}
|
||||
|
||||
x += PrevWidth + OffsetSize;
|
||||
|
||||
if ( !OldStyle )
|
||||
AddImageTiled( x, y, NextWidth, EntryHeight, HeaderGumpID );
|
||||
if (!OldStyle)
|
||||
AddImageTiled(x, y, NextWidth, EntryHeight, HeaderGumpID);
|
||||
|
||||
if ( (page + 1) * EntryCount < m_Mobiles.Count )
|
||||
if ((page + 1) * EntryCount < m_Mobiles.Count)
|
||||
{
|
||||
AddButton( x + NextOffsetX, y + NextOffsetY, NextButtonID1, NextButtonID2, 2, GumpButtonType.Reply, 1 );
|
||||
AddButton(x + NextOffsetX, y + NextOffsetY, NextButtonID1, NextButtonID2, 2, GumpButtonType.Reply, 1);
|
||||
|
||||
if ( NextLabel )
|
||||
AddLabel( x + NextLabelOffsetX, y + NextLabelOffsetY, TextHue, "Next" );
|
||||
if (NextLabel)
|
||||
AddLabel(x + NextLabelOffsetX, y + NextLabelOffsetY, TextHue, "Next");
|
||||
}
|
||||
|
||||
for ( int i = 0, index = page * EntryCount; i < EntryCount && index < m_Mobiles.Count; ++i, ++index )
|
||||
for (int i = 0, index = page * EntryCount; i < EntryCount && index < m_Mobiles.Count; ++i, ++index)
|
||||
{
|
||||
x = BorderSize + OffsetSize;
|
||||
y += EntryHeight + OffsetSize;
|
||||
|
||||
Mobile m = m_Mobiles[index];
|
||||
|
||||
AddImageTiled( x, y, EntryWidth, EntryHeight, EntryGumpID );
|
||||
AddLabelCropped( x + TextOffsetX, y, EntryWidth - TextOffsetX, EntryHeight, GetHueFor( m ), m.Deleted ? "(deleted)" : m.Name );
|
||||
AddImageTiled(x, y, EntryWidth, EntryHeight, EntryGumpID);
|
||||
AddLabelCropped(x + TextOffsetX, y, EntryWidth - TextOffsetX, EntryHeight, GetHueFor(m), m.Deleted ? "(deleted)" : m.Name);
|
||||
|
||||
x += EntryWidth + OffsetSize;
|
||||
|
||||
if ( SetGumpID != 0 )
|
||||
AddImageTiled( x, y, SetWidth, EntryHeight, SetGumpID );
|
||||
if (SetGumpID != 0)
|
||||
AddImageTiled(x, y, SetWidth, EntryHeight, SetGumpID);
|
||||
|
||||
if ( m.NetState != null && !m.Deleted )
|
||||
AddButton( x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, i + 3 );
|
||||
if (m.NetState != null && !m.Deleted)
|
||||
AddButton(x + SetOffsetX, y + SetOffsetY, SetButtonID1, SetButtonID2, i + 3);
|
||||
}
|
||||
}
|
||||
|
||||
private static int GetHueFor( Mobile m )
|
||||
private static int GetHueFor(Mobile m)
|
||||
{
|
||||
switch ( m.AccessLevel )
|
||||
switch (m.AccessLevel)
|
||||
{
|
||||
case AccessLevel.Owner:
|
||||
case AccessLevel.Developer:
|
||||
|
|
@ -220,67 +221,67 @@ namespace Server.Gumps
|
|||
case AccessLevel.GameMaster: return 0x21;
|
||||
case AccessLevel.Counselor: return 0x2;
|
||||
default:
|
||||
{
|
||||
return m.Kills >= 5 ? 0x21 : m.Criminal ? 0x3B1 : 0x58;
|
||||
}
|
||||
{
|
||||
return m.Kills >= 5 ? 0x21 : m.Criminal ? 0x3B1 : 0x58;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public override void OnResponse( NetState state, RelayInfo info )
|
||||
public override void OnResponse(NetState state, RelayInfo info)
|
||||
{
|
||||
Mobile from = state.Mobile;
|
||||
|
||||
switch ( info.ButtonID )
|
||||
switch (info.ButtonID)
|
||||
{
|
||||
case 0: // Closed
|
||||
{
|
||||
return;
|
||||
}
|
||||
case 1: // Previous
|
||||
{
|
||||
if ( m_Page > 0 )
|
||||
from.SendGump( new WhoGump( from, m_Mobiles, m_Page - 1 ) );
|
||||
|
||||
break;
|
||||
}
|
||||
case 2: // Next
|
||||
{
|
||||
if ( (m_Page + 1) * EntryCount < m_Mobiles.Count )
|
||||
from.SendGump( new WhoGump( from, m_Mobiles, m_Page + 1 ) );
|
||||
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
int index = m_Page * EntryCount + (info.ButtonID - 3);
|
||||
|
||||
if ( index >= 0 && index < m_Mobiles.Count )
|
||||
{
|
||||
Mobile m = m_Mobiles[index];
|
||||
|
||||
if ( m.Deleted )
|
||||
{
|
||||
from.SendMessage( "That player has deleted their character." );
|
||||
from.SendGump( new WhoGump( from, m_Mobiles, m_Page ) );
|
||||
}
|
||||
else if ( m.NetState == null )
|
||||
{
|
||||
from.SendMessage( "That player is no longer online." );
|
||||
from.SendGump( new WhoGump( from, m_Mobiles, m_Page ) );
|
||||
}
|
||||
else if ( m == from || !m.Hidden || from.AccessLevel >= m.AccessLevel || m is PlayerMobile mobile && mobile.VisibilityList.Contains( from ))
|
||||
{
|
||||
from.SendGump( new ClientGump( from, m.NetState ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendMessage( "You cannot see them." );
|
||||
from.SendGump( new WhoGump( from, m_Mobiles, m_Page ) );
|
||||
}
|
||||
return;
|
||||
}
|
||||
case 1: // Previous
|
||||
{
|
||||
if (m_Page > 0)
|
||||
from.SendGump(new WhoGump(from, m_Mobiles, m_Page - 1));
|
||||
|
||||
break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case 2: // Next
|
||||
{
|
||||
if ((m_Page + 1) * EntryCount < m_Mobiles.Count)
|
||||
from.SendGump(new WhoGump(from, m_Mobiles, m_Page + 1));
|
||||
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
int index = m_Page * EntryCount + (info.ButtonID - 3);
|
||||
|
||||
if (index >= 0 && index < m_Mobiles.Count)
|
||||
{
|
||||
Mobile m = m_Mobiles[index];
|
||||
|
||||
if (m.Deleted)
|
||||
{
|
||||
from.SendMessage("That player has deleted their character.");
|
||||
from.SendGump(new WhoGump(from, m_Mobiles, m_Page));
|
||||
}
|
||||
else if (m.NetState == null)
|
||||
{
|
||||
from.SendMessage("That player is no longer online.");
|
||||
from.SendGump(new WhoGump(from, m_Mobiles, m_Page));
|
||||
}
|
||||
else if (m == from || !m.Hidden || from.AccessLevel >= m.AccessLevel || (m is PlayerMobile mobile && mobile.VisibilityList.Contains(from)))
|
||||
{
|
||||
from.SendGump(new ClientGump(from, m.NetState));
|
||||
}
|
||||
else
|
||||
{
|
||||
from.SendMessage("You cannot see them.");
|
||||
from.SendGump(new WhoGump(from, m_Mobiles, m_Page));
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue