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

Adds style cop (#109)

Browse source
This commit is contained in:
Kamron Batman 2020-04-26 00:16:02 -07:00 • committed by GitHub
parent 3e715bcb60
commit 556a17aba8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1725 changed files with 33831 additions and 38046 deletions
Download patch file Download diff file Expand all files Collapse all files

90
Projects/Scripts/Gumps/CategorizedAddGump.cs
View file

@ -8,7 +8,7 @@ namespace Server.Gumps
{
public abstract class CAGNode
{
public abstract string Caption{ get; }
public abstract string Caption { get; }
public abstract void OnClick(Mobile from, int page);
}
@ -28,13 +28,13 @@ namespace Server.Gumps
Hue = XmlConvert.ToInt32(xml.Value);
}
public Type Type{ get; }
public Type Type { get; }
public int ItemID{ get; }
public int ItemID { get; }
public int Hue{ get; }
public int Hue { get; }
public CAGCategory Parent{ get; }
public CAGCategory Parent { get; }
public override string Caption => Type == null ? "bad type" : Type.Name;
@ -60,7 +60,7 @@ namespace Server.Gumps
private CAGCategory()
{
Title = "no data";
Nodes = new CAGNode[0];
Nodes = Array.Empty<CAGNode>();
}
public CAGCategory(CAGCategory parent, XmlTextReader xml)
@ -77,7 +77,7 @@ namespace Server.Gumps
if (xml.IsEmptyElement)
{
Nodes = new CAGNode[0];
Nodes = Array.Empty<CAGNode>();
}
else
{
@ -102,11 +102,11 @@ namespace Server.Gumps
}
}
public string Title{ get; }
public string Title { get; }
public CAGNode[] Nodes{ get; }
public CAGNode[] Nodes { get; }
public CAGCategory Parent{ get; }
public CAGCategory Parent { get; }
public override string Caption => Title;
@ -123,7 +123,6 @@ namespace Server.Gumps
{
XmlTextReader xml = new XmlTextReader(path) { WhitespaceHandling = WhitespaceHandling.None };
while (xml.Read())
if (xml.Name == "category" && xml.NodeType == XmlNodeType.Element)
{
@ -143,7 +142,7 @@ namespace Server.Gumps
{
public static bool OldStyle = PropsConfig.OldStyle;
public static readonly int EntryHeight = 24; //PropsConfig.EntryHeight;
public static readonly int EntryHeight = 24; // PropsConfig.EntryHeight;
public static readonly int OffsetSize = PropsConfig.OffsetSize;
public static readonly int BorderSize = PropsConfig.BorderSize;
@ -184,7 +183,8 @@ namespace Server.Gumps
public static readonly int NextButtonID1 = PropsConfig.NextButtonID1;
public static readonly int NextButtonID2 = PropsConfig.NextButtonID2;
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;
@ -200,9 +200,9 @@ namespace Server.Gumps
private static readonly int BackWidth = BorderSize + TotalWidth + BorderSize;
private static readonly int BackHeight = BorderSize + TotalHeight + BorderSize;
private CAGCategory m_Category;
private readonly CAGCategory m_Category;
private Mobile m_Owner;
private readonly Mobile m_Owner;
private int m_Page;
public CategorizedAddGump(Mobile owner) : this(owner, CAGCategory.Root)
@ -340,46 +340,46 @@ namespace Server.Gumps
switch (info.ButtonID)
{
case 0: // Closed
{
return;
}
case 1: // Up
{
if (m_Category.Parent != null)
{
int index = Array.IndexOf(m_Category.Parent.Nodes, m_Category) / EntryCount;
if (index < 0)
index = 0;
from.SendGump(new CategorizedAddGump(from, m_Category.Parent, index));
return;
}
case 1: // Up
{
if (m_Category.Parent != null)
{
int index = Array.IndexOf(m_Category.Parent.Nodes, m_Category) / EntryCount;
break;
}
if (index < 0)
index = 0;
from.SendGump(new CategorizedAddGump(from, m_Category.Parent, index));
}
break;
}
case 2: // Previous
{
if (m_Page > 0)
from.SendGump(new CategorizedAddGump(from, m_Category, m_Page - 1));
{
if (m_Page > 0)
from.SendGump(new CategorizedAddGump(from, m_Category, m_Page - 1));
break;
}
break;
}
case 3: // Next
{
if ((m_Page + 1) * EntryCount < m_Category.Nodes.Length)
from.SendGump(new CategorizedAddGump(from, m_Category, m_Page + 1));
{
if ((m_Page + 1) * EntryCount < m_Category.Nodes.Length)
from.SendGump(new CategorizedAddGump(from, m_Category, m_Page + 1));
break;
}
break;
}
default:
{
int index = m_Page * EntryCount + (info.ButtonID - 4);
{
int index = m_Page * EntryCount + (info.ButtonID - 4);
if (index >= 0 && index < m_Category.Nodes.Length)
m_Category.Nodes[index].OnClick(from, m_Page);
if (index >= 0 && index < m_Category.Nodes.Length)
m_Category.Nodes[index].OnClick(from, m_Page);
break;
}
break;
}
}
}
}