Clean up: Bugs, LINQ, constructors, default values, and null checks (#18)
This commit is contained in:
Kamron Batman
GitHub
parent
e748af4430
commit
513e54f70e
1094 changed files with 15913 additions and 21892 deletions
|
|
@ -312,7 +312,7 @@ namespace Server.Items
|
|||
|
||||
public override void OnDoubleClick(Mobile from)
|
||||
{
|
||||
if (m_IsRewardItem && !RewardSystem.CheckIsUsableBy(from, this, null))
|
||||
if (m_IsRewardItem && !RewardSystem.CheckIsUsableBy(from, this))
|
||||
return;
|
||||
|
||||
if (IsChildOf(from.Backpack))
|
||||
|
|
@ -372,27 +372,27 @@ namespace Server.Items
|
|||
AddItem(55, 110, 0x161D);
|
||||
AddItem(75, 90, 0x161E);
|
||||
AddItem(95, 70, 0x161F);
|
||||
AddButton(70, 50, 0x845, 0x846, 1, GumpButtonType.Reply, 0);
|
||||
AddButton(70, 50, 0x845, 0x846, 1);
|
||||
AddItem(105, 70, 0x1586);
|
||||
AddItem(125, 90, 0x1587);
|
||||
AddItem(145, 110, 0x1588);
|
||||
AddButton(145, 50, 0x845, 0x846, 2, GumpButtonType.Reply, 0);
|
||||
AddButton(145, 50, 0x845, 0x846, 2);
|
||||
AddItem(200, 110, 0x1620);
|
||||
AddItem(220, 90, 0x1621);
|
||||
AddItem(240, 70, 0x1622);
|
||||
AddButton(220, 50, 0x845, 0x846, 3, GumpButtonType.Reply, 0);
|
||||
AddButton(220, 50, 0x845, 0x846, 3);
|
||||
AddItem(250, 70, 0x1589);
|
||||
AddItem(270, 90, 0x158A);
|
||||
AddItem(290, 110, 0x158B);
|
||||
AddButton(300, 50, 0x845, 0x846, 4, GumpButtonType.Reply, 0);
|
||||
AddButton(300, 50, 0x845, 0x846, 4);
|
||||
AddItem(350, 110, 0x1623);
|
||||
AddItem(370, 90, 0x1624);
|
||||
AddItem(390, 70, 0x1625);
|
||||
AddButton(365, 50, 0x845, 0x846, 5, GumpButtonType.Reply, 0);
|
||||
AddButton(365, 50, 0x845, 0x846, 5);
|
||||
AddItem(400, 70, 0x158C);
|
||||
AddItem(420, 90, 0x158D);
|
||||
AddItem(440, 110, 0x158E);
|
||||
AddButton(445, 50, 0x845, 0x846, 6, GumpButtonType.Reply, 0);
|
||||
AddButton(445, 50, 0x845, 0x846, 6);
|
||||
AddButton(455, 205, 0x8B0, 0x8B0, 0, GumpButtonType.Page, 2);
|
||||
|
||||
AddPage(2);
|
||||
|
|
@ -400,27 +400,27 @@ namespace Server.Items
|
|||
AddItem(52, 110, 0x1626);
|
||||
AddItem(72, 90, 0x1627);
|
||||
AddItem(95, 70, 0x1628);
|
||||
AddButton(70, 50, 0x845, 0x846, 7, GumpButtonType.Reply, 0);
|
||||
AddButton(70, 50, 0x845, 0x846, 7);
|
||||
AddItem(105, 70, 0x1590);
|
||||
AddItem(125, 90, 0x1591);
|
||||
AddItem(145, 110, 0x158F);
|
||||
AddButton(145, 50, 0x845, 0x846, 8, GumpButtonType.Reply, 0);
|
||||
AddButton(145, 50, 0x845, 0x846, 8);
|
||||
AddItem(197, 110, 0x1626);
|
||||
AddItem(217, 90, 0x1629);
|
||||
AddItem(240, 70, 0x162A);
|
||||
AddButton(220, 50, 0x845, 0x846, 9, GumpButtonType.Reply, 0);
|
||||
AddButton(220, 50, 0x845, 0x846, 9);
|
||||
AddItem(250, 70, 0x1592);
|
||||
AddItem(270, 90, 0x1593);
|
||||
AddItem(290, 110, 0x158F);
|
||||
AddButton(300, 50, 0x845, 0x846, 10, GumpButtonType.Reply, 0);
|
||||
AddButton(300, 50, 0x845, 0x846, 10);
|
||||
AddItem(340, 110, 0x162B);
|
||||
AddItem(363, 90, 0x162C);
|
||||
AddItem(385, 70, 0x162D);
|
||||
AddButton(365, 50, 0x845, 0x846, 11, GumpButtonType.Reply, 0);
|
||||
AddButton(365, 50, 0x845, 0x846, 11);
|
||||
AddItem(395, 70, 0x1594);
|
||||
AddItem(417, 90, 0x1595);
|
||||
AddItem(439, 111, 0x1596);
|
||||
AddButton(445, 50, 0x845, 0x846, 12, GumpButtonType.Reply, 0);
|
||||
AddButton(445, 50, 0x845, 0x846, 12);
|
||||
AddButton(70, 205, 0x8AF, 0x8AF, 0, GumpButtonType.Page, 1);
|
||||
AddButton(455, 205, 0x8B0, 0x8B0, 0, GumpButtonType.Page, 3);
|
||||
|
||||
|
|
@ -429,25 +429,25 @@ namespace Server.Items
|
|||
AddItem(55, 110, 0x162E);
|
||||
AddItem(75, 93, 0x1631);
|
||||
AddItem(95, 70, 0x1632);
|
||||
AddButton(70, 50, 0x845, 0x846, 13, GumpButtonType.Reply, 0);
|
||||
AddButton(70, 50, 0x845, 0x846, 13);
|
||||
AddItem(118, 70, 0x1598);
|
||||
AddItem(138, 94, 0x159B);
|
||||
AddItem(159, 113, 0x159C);
|
||||
AddButton(160, 50, 0x845, 0x846, 14, GumpButtonType.Reply, 0);
|
||||
AddButton(160, 50, 0x845, 0x846, 14);
|
||||
AddItem(219, 111, 0x162F);
|
||||
AddItem(238, 94, 0x1630);
|
||||
AddItem(258, 70, 0x1633);
|
||||
AddButton(240, 50, 0x845, 0x846, 15, GumpButtonType.Reply, 0);
|
||||
AddButton(240, 50, 0x845, 0x846, 15);
|
||||
AddItem(279, 70, 0x1599);
|
||||
AddItem(298, 93, 0x159A);
|
||||
AddItem(319, 113, 0x159D);
|
||||
AddButton(320, 50, 0x845, 0x846, 16, GumpButtonType.Reply, 0);
|
||||
AddButton(320, 50, 0x845, 0x846, 16);
|
||||
AddItem(380, 90, 0x160F);
|
||||
AddItem(400, 70, 0x1610);
|
||||
AddButton(390, 50, 0x845, 0x846, 17, GumpButtonType.Reply, 0);
|
||||
AddButton(390, 50, 0x845, 0x846, 17);
|
||||
AddItem(420, 70, 0x15A0);
|
||||
AddItem(440, 90, 0x15A1);
|
||||
AddButton(455, 50, 0x845, 0x846, 18, GumpButtonType.Reply, 0);
|
||||
AddButton(455, 50, 0x845, 0x846, 18);
|
||||
AddButton(70, 205, 0x8AF, 0x8AF, 0, GumpButtonType.Page, 2);
|
||||
AddButton(455, 205, 0x8B0, 0x8B0, 0, GumpButtonType.Page, 4);
|
||||
|
||||
|
|
@ -455,22 +455,22 @@ namespace Server.Items
|
|||
|
||||
AddItem(55, 90, 0x1611);
|
||||
AddItem(75, 70, 0x1612);
|
||||
AddButton(70, 50, 0x845, 0x846, 19, GumpButtonType.Reply, 0);
|
||||
AddButton(70, 50, 0x845, 0x846, 19);
|
||||
AddItem(105, 70, 0x15A2);
|
||||
AddItem(125, 90, 0x15A3);
|
||||
AddButton(145, 50, 0x845, 0x846, 20, GumpButtonType.Reply, 0);
|
||||
AddButton(145, 50, 0x845, 0x846, 20);
|
||||
AddItem(200, 84, 0x1613);
|
||||
AddItem(220, 70, 0x1614);
|
||||
AddButton(215, 50, 0x845, 0x846, 21, GumpButtonType.Reply, 0);
|
||||
AddButton(215, 50, 0x845, 0x846, 21);
|
||||
AddItem(250, 70, 0x15A4);
|
||||
AddItem(270, 84, 0x15A5);
|
||||
AddButton(290, 50, 0x845, 0x846, 22, GumpButtonType.Reply, 0);
|
||||
AddButton(290, 50, 0x845, 0x846, 22);
|
||||
AddItem(350, 90, 0x1615);
|
||||
AddItem(370, 70, 0x1616);
|
||||
AddButton(365, 50, 0x845, 0x846, 23, GumpButtonType.Reply, 0);
|
||||
AddButton(365, 50, 0x845, 0x846, 23);
|
||||
AddItem(400, 70, 0x15A6);
|
||||
AddItem(420, 90, 0x15A7);
|
||||
AddButton(445, 50, 0x845, 0x846, 24, GumpButtonType.Reply, 0);
|
||||
AddButton(445, 50, 0x845, 0x846, 24);
|
||||
AddButton(70, 205, 0x8AF, 0x8AF, 0, GumpButtonType.Page, 3);
|
||||
AddButton(455, 205, 0x8B0, 0x8B0, 0, GumpButtonType.Page, 5);
|
||||
|
||||
|
|
@ -478,33 +478,32 @@ namespace Server.Items
|
|||
|
||||
AddItem(55, 90, 0x1617);
|
||||
AddItem(77, 70, 0x1618);
|
||||
AddButton(70, 50, 0x845, 0x846, 25, GumpButtonType.Reply, 0);
|
||||
AddButton(70, 50, 0x845, 0x846, 25);
|
||||
AddItem(105, 70, 0x15A8);
|
||||
AddItem(127, 90, 0x15A9);
|
||||
AddButton(145, 50, 0x845, 0x846, 26, GumpButtonType.Reply, 0);
|
||||
AddButton(145, 50, 0x845, 0x846, 26);
|
||||
AddItem(200, 90, 0x1619);
|
||||
AddItem(222, 70, 0x161A);
|
||||
AddButton(220, 50, 0x845, 0x846, 27, GumpButtonType.Reply, 0);
|
||||
AddButton(220, 50, 0x845, 0x846, 27);
|
||||
AddItem(250, 70, 0x15AA);
|
||||
AddItem(272, 90, 0x15AB);
|
||||
AddButton(300, 50, 0x845, 0x846, 28, GumpButtonType.Reply, 0);
|
||||
AddButton(300, 50, 0x845, 0x846, 28);
|
||||
AddItem(350, 90, 0x161B);
|
||||
AddItem(372, 70, 0x161C);
|
||||
AddButton(365, 50, 0x845, 0x846, 29, GumpButtonType.Reply, 0);
|
||||
AddButton(365, 50, 0x845, 0x846, 29);
|
||||
AddItem(400, 70, 0x15AC);
|
||||
AddItem(422, 90, 0x15AD);
|
||||
AddButton(445, 50, 0x845, 0x846, 30, GumpButtonType.Reply, 0);
|
||||
AddButton(445, 50, 0x845, 0x846, 30);
|
||||
AddButton(70, 205, 0x8AF, 0x8AF, 0, GumpButtonType.Page, 4);
|
||||
}
|
||||
|
||||
public override void OnResponse(NetState sender, RelayInfo info)
|
||||
{
|
||||
if (m_WallBanner == null || m_WallBanner.Deleted)
|
||||
if (m_WallBanner?.Deleted != false || info.ButtonID <= 0 || info.ButtonID >= 31)
|
||||
return;
|
||||
|
||||
if (info.ButtonID > 0 && info.ButtonID < 31)
|
||||
m_WallBanner.Use(sender.Mobile, info.ButtonID);
|
||||
m_WallBanner.Use(sender.Mobile, info.ButtonID);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue