Clean up: Bugs, LINQ, constructors, default values, and null checks (#18)

This commit is contained in:
Kamron Batman 2019-03-11 14:29:59 -07:00 • committed by GitHub
parent e748af4430
commit 513e54f70e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1094 changed files with 15913 additions and 21892 deletions

View file

@ -17,16 +17,7 @@ namespace Server.Engines.Craft
private CraftPage m_Page;
private BaseTool m_Tool;
/*public CraftGump( Mobile from, CraftSystem craftSystem, BaseTool tool ): this( from, craftSystem, -1, -1, tool, null )
{
}*/
public CraftGump(Mobile from, CraftSystem craftSystem, BaseTool tool, object notice) : this(from, craftSystem, tool,
notice, CraftPage.None)
{
}
private CraftGump(Mobile from, CraftSystem craftSystem, BaseTool tool, object notice, CraftPage page) : base(40, 40)
public CraftGump(Mobile from, CraftSystem craftSystem, BaseTool tool, object notice, CraftPage page = CraftPage.None) : base(40, 40)
{
m_From = from;
m_CraftSystem = craftSystem;
@ -50,57 +41,56 @@ namespace Server.Engines.Craft
AddAlphaRegion(10, 10, 510, 417);
if (craftSystem.GumpTitleNumber > 0)
AddHtmlLocalized(10, 12, 510, 20, craftSystem.GumpTitleNumber, LabelColor, false, false);
AddHtmlLocalized(10, 12, 510, 20, craftSystem.GumpTitleNumber, LabelColor);
else
AddHtml(10, 12, 510, 20, craftSystem.GumpTitleString, false, false);
AddHtml(10, 12, 510, 20, craftSystem.GumpTitleString);
AddHtmlLocalized(10, 37, 200, 22, 1044010, LabelColor, false, false); // <CENTER>CATEGORIES</CENTER>
AddHtmlLocalized(215, 37, 305, 22, 1044011, LabelColor, false, false); // <CENTER>SELECTIONS</CENTER>
AddHtmlLocalized(10, 302, 150, 25, 1044012, LabelColor, false, false); // <CENTER>NOTICES</CENTER>
AddHtmlLocalized(10, 37, 200, 22, 1044010, LabelColor); // <CENTER>CATEGORIES</CENTER>
AddHtmlLocalized(215, 37, 305, 22, 1044011, LabelColor); // <CENTER>SELECTIONS</CENTER>
AddHtmlLocalized(10, 302, 150, 25, 1044012, LabelColor); // <CENTER>NOTICES</CENTER>
AddButton(15, 402, 4017, 4019, 0, GumpButtonType.Reply, 0);
AddHtmlLocalized(50, 405, 150, 18, 1011441, LabelColor, false, false); // EXIT
AddButton(15, 402, 4017, 4019, 0);
AddHtmlLocalized(50, 405, 150, 18, 1011441, LabelColor); // EXIT
AddButton(270, 402, 4005, 4007, GetButtonID(6, 2), GumpButtonType.Reply, 0);
AddHtmlLocalized(305, 405, 150, 18, 1044013, LabelColor, false, false); // MAKE LAST
AddButton(270, 402, 4005, 4007, GetButtonID(6, 2));
AddHtmlLocalized(305, 405, 150, 18, 1044013, LabelColor); // MAKE LAST
// Mark option
if (craftSystem.MarkOption)
{
AddButton(270, 362, 4005, 4007, GetButtonID(6, 6), GumpButtonType.Reply, 0);
AddHtmlLocalized(305, 365, 150, 18, 1044017 + (context == null ? 0 : (int)context.MarkOption), LabelColor,
false, false); // MARK ITEM
AddButton(270, 362, 4005, 4007, GetButtonID(6, 6));
AddHtmlLocalized(305, 365, 150, 18, 1044017 + (context == null ? 0 : (int)context.MarkOption), LabelColor); // MARK ITEM
}
// ****************************************
// Resmelt option
if (craftSystem.Resmelt)
{
AddButton(15, 342, 4005, 4007, GetButtonID(6, 1), GumpButtonType.Reply, 0);
AddHtmlLocalized(50, 345, 150, 18, 1044259, LabelColor, false, false); // SMELT ITEM
AddButton(15, 342, 4005, 4007, GetButtonID(6, 1));
AddHtmlLocalized(50, 345, 150, 18, 1044259, LabelColor); // SMELT ITEM
}
// ****************************************
// Repair option
if (craftSystem.Repair)
{
AddButton(270, 342, 4005, 4007, GetButtonID(6, 5), GumpButtonType.Reply, 0);
AddHtmlLocalized(305, 345, 150, 18, 1044260, LabelColor, false, false); // REPAIR ITEM
AddButton(270, 342, 4005, 4007, GetButtonID(6, 5));
AddHtmlLocalized(305, 345, 150, 18, 1044260, LabelColor); // REPAIR ITEM
}
// ****************************************
// Enhance option
if (craftSystem.CanEnhance)
{
AddButton(270, 382, 4005, 4007, GetButtonID(6, 8), GumpButtonType.Reply, 0);
AddHtmlLocalized(305, 385, 150, 18, 1061001, LabelColor, false, false); // ENHANCE ITEM
AddButton(270, 382, 4005, 4007, GetButtonID(6, 8));
AddHtmlLocalized(305, 385, 150, 18, 1061001, LabelColor); // ENHANCE ITEM
}
// ****************************************
if (notice is int noticeInt && noticeInt > 0)
AddHtmlLocalized(170, 295, 350, 40, noticeInt, LabelColor, false, false);
AddHtmlLocalized(170, 295, 350, 40, noticeInt, LabelColor);
else if (notice is string)
AddHtml(170, 295, 350, 40, $"<BASEFONT COLOR=#{FontColor:X6}>{notice}</BASEFONT>", false, false);
AddHtml(170, 295, 350, 40, $"<BASEFONT COLOR=#{FontColor:X6}>{notice}</BASEFONT>");
// If the system has more than one resource
if (craftSystem.CraftSubRes.Init)
@ -131,10 +121,10 @@ namespace Server.Engines.Craft
resourceCount += items[i].Amount;
}
AddButton(15, 362, 4005, 4007, GetButtonID(6, 0), GumpButtonType.Reply, 0);
AddButton(15, 362, 4005, 4007, GetButtonID(6, 0));
if (nameNumber > 0)
AddHtmlLocalized(50, 365, 250, 18, nameNumber, resourceCount.ToString(), LabelColor, false, false);
AddHtmlLocalized(50, 365, 250, 18, nameNumber, resourceCount.ToString(), LabelColor);
else
AddLabel(50, 362, LabelHue, $"{nameString} ({resourceCount} Available)");
}
@ -169,10 +159,10 @@ namespace Server.Engines.Craft
resourceCount += items[i].Amount;
}
AddButton(15, 382, 4005, 4007, GetButtonID(6, 7), GumpButtonType.Reply, 0);
AddButton(15, 382, 4005, 4007, GetButtonID(6, 7));
if (nameNumber > 0)
AddHtmlLocalized(50, 385, 250, 18, nameNumber, resourceCount.ToString(), LabelColor, false, false);
AddHtmlLocalized(50, 385, 250, 18, nameNumber, resourceCount.ToString(), LabelColor);
else
AddLabel(50, 385, LabelHue, $"{nameString} ({resourceCount} Available)");
}
@ -184,7 +174,7 @@ namespace Server.Engines.Craft
CreateResList(false, from);
else if (page == CraftPage.PickResource2)
CreateResList(true, from);
else if (context != null && context.LastGroupIndex > -1)
else if (context?.LastGroupIndex > -1)
CreateItemList(context.LastGroupIndex);
}
@ -210,9 +200,9 @@ namespace Server.Engines.Craft
CraftContext context = m_CraftSystem.GetContext(m_From);
AddButton(220, 260, 4005, 4007, GetButtonID(6, 4), GumpButtonType.Reply, 0);
AddButton(220, 260, 4005, 4007, GetButtonID(6, 4));
AddHtmlLocalized(255, 263, 200, 18, context == null || !context.DoNotColor ? 1061591 : 1061590,
LabelColor, false, false);
LabelColor);
}
int resourceCount = 0;
@ -225,11 +215,11 @@ namespace Server.Engines.Craft
resourceCount += items[j].Amount;
}
AddButton(220, 60 + index * 20, 4005, 4007, GetButtonID(5, i), GumpButtonType.Reply, 0);
AddButton(220, 60 + index * 20, 4005, 4007, GetButtonID(5, i));
if (subResource.NameNumber > 0)
AddHtmlLocalized(255, 63 + index * 20, 250, 18, subResource.NameNumber, resourceCount.ToString(),
LabelColor, false, false);
LabelColor);
else
AddLabel(255, 60 + index * 20, LabelHue, $"{subResource.NameString} ({resourceCount})");
}
@ -256,7 +246,7 @@ namespace Server.Engines.Craft
if (i > 0)
{
AddButton(370, 260, 4005, 4007, 0, GumpButtonType.Page, i / 10 + 1);
AddHtmlLocalized(405, 263, 100, 18, 1044045, LabelColor, false, false); // NEXT PAGE
AddHtmlLocalized(405, 263, 100, 18, 1044045, LabelColor); // NEXT PAGE
}
AddPage(i / 10 + 1);
@ -264,21 +254,21 @@ namespace Server.Engines.Craft
if (i > 0)
{
AddButton(220, 260, 4014, 4015, 0, GumpButtonType.Page, i / 10);
AddHtmlLocalized(255, 263, 100, 18, 1044044, LabelColor, false, false); // PREV PAGE
AddHtmlLocalized(255, 263, 100, 18, 1044044, LabelColor); // PREV PAGE
}
}
AddButton(220, 60 + index * 20, 4005, 4007, GetButtonID(3, i), GumpButtonType.Reply, 0);
AddButton(220, 60 + index * 20, 4005, 4007, GetButtonID(3, i));
if (craftItem.NameNumber > 0)
AddHtmlLocalized(255, 63 + index * 20, 220, 18, craftItem.NameNumber, LabelColor, false, false);
AddHtmlLocalized(255, 63 + index * 20, 220, 18, craftItem.NameNumber, LabelColor);
else
AddLabel(255, 60 + index * 20, LabelHue, craftItem.NameString);
AddButton(480, 60 + index * 20, 4011, 4012, GetButtonID(4, i), GumpButtonType.Reply, 0);
AddButton(480, 60 + index * 20, 4011, 4012, GetButtonID(4, i));
}
else
AddHtmlLocalized(230, 62, 200, 22, 1044165, LabelColor, false, false); // You haven't made anything yet.
AddHtmlLocalized(230, 62, 200, 22, 1044165, LabelColor); // You haven't made anything yet.
}
public void CreateItemList(int selectedGroup)
@ -304,7 +294,7 @@ namespace Server.Engines.Craft
if (i > 0)
{
AddButton(370, 260, 4005, 4007, 0, GumpButtonType.Page, i / 10 + 1);
AddHtmlLocalized(405, 263, 100, 18, 1044045, LabelColor, false, false); // NEXT PAGE
AddHtmlLocalized(405, 263, 100, 18, 1044045, LabelColor); // NEXT PAGE
}
AddPage(i / 10 + 1);
@ -312,18 +302,18 @@ namespace Server.Engines.Craft
if (i > 0)
{
AddButton(220, 260, 4014, 4015, 0, GumpButtonType.Page, i / 10);
AddHtmlLocalized(255, 263, 100, 18, 1044044, LabelColor, false, false); // PREV PAGE
AddHtmlLocalized(255, 263, 100, 18, 1044044, LabelColor); // PREV PAGE
}
}
AddButton(220, 60 + index * 20, 4005, 4007, GetButtonID(1, i), GumpButtonType.Reply, 0);
AddButton(220, 60 + index * 20, 4005, 4007, GetButtonID(1, i));
if (craftItem.NameNumber > 0)
AddHtmlLocalized(255, 63 + index * 20, 220, 18, craftItem.NameNumber, LabelColor, false, false);
AddHtmlLocalized(255, 63 + index * 20, 220, 18, craftItem.NameNumber, LabelColor);
else
AddLabel(255, 60 + index * 20, LabelHue, craftItem.NameString);
AddButton(480, 60 + index * 20, 4011, 4012, GetButtonID(2, i), GumpButtonType.Reply, 0);
AddButton(480, 60 + index * 20, 4011, 4012, GetButtonID(2, i));
}
}
@ -331,17 +321,17 @@ namespace Server.Engines.Craft
{
CraftGroupCol craftGroupCol = m_CraftSystem.CraftGroups;
AddButton(15, 60, 4005, 4007, GetButtonID(6, 3), GumpButtonType.Reply, 0);
AddHtmlLocalized(50, 63, 150, 18, 1044014, LabelColor, false, false); // LAST TEN
AddButton(15, 60, 4005, 4007, GetButtonID(6, 3));
AddHtmlLocalized(50, 63, 150, 18, 1044014, LabelColor); // LAST TEN
for (int i = 0; i < craftGroupCol.Count; i++)
{
CraftGroup craftGroup = craftGroupCol.GetAt(i);
AddButton(15, 80 + i * 20, 4005, 4007, GetButtonID(0, i), GumpButtonType.Reply, 0);
AddButton(15, 80 + i * 20, 4005, 4007, GetButtonID(0, i));
if (craftGroup.NameNumber > 0)
AddHtmlLocalized(50, 83 + i * 20, 150, 18, craftGroup.NameNumber, LabelColor, false, false);
AddHtmlLocalized(50, 83 + i * 20, 150, 18, craftGroup.NameNumber, LabelColor);
else
AddLabel(50, 80 + i * 20, LabelHue, craftGroup.NameString);
}
@ -608,11 +598,11 @@ namespace Server.Engines.Craft
}
}
private enum CraftPage
public enum CraftPage
{
None,
PickResource,
PickResource2
}
}
}
}