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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

32
Scripts/Items/Addons/BallotBox.cs
View file

@ -64,7 +64,7 @@ namespace Server.Items
return true;
BaseHouse house = BaseHouse.FindHouseAt(this);
return house != null && house.IsOwner(from);
return house?.IsOwner(from) == true;
}
public bool HasVoted(Mobile from)
@ -132,11 +132,11 @@ namespace Server.Items
AddBackground(0, 0, 400, 350, 0xA28);
if (isOwner)
AddHtmlLocalized(0, 15, 400, 35, 1011000, false, false); // <center>Ballot Box Owner's Menu</center>
AddHtmlLocalized(0, 15, 400, 35, 1011000); // <center>Ballot Box Owner's Menu</center>
else
AddHtmlLocalized(0, 15, 400, 35, 1011001, false, false); // <center>Ballot Box -- Vote Here!</center>
AddHtmlLocalized(0, 15, 400, 35, 1011001); // <center>Ballot Box -- Vote Here!</center>
AddHtmlLocalized(0, 50, 400, 35, 1011002, false, false); // <center>Topic</center>
AddHtmlLocalized(0, 50, 400, 35, 1011002); // <center>Topic</center>
int lineCount = box.Topic.Length;
AddBackground(25, 90, 350, Math.Max(20 * lineCount, 20), 0x1400);
@ -153,16 +153,16 @@ namespace Server.Items
int noCount = box.No.Count;
int totalVotes = yesCount + noCount;
AddHtmlLocalized(0, 215, 400, 35, 1011003, false, false); // <center>votes</center>
AddHtmlLocalized(0, 215, 400, 35, 1011003); // <center>votes</center>
if (!isOwner)
AddButton(20, 240, 0xFA5, 0xFA7, 3, GumpButtonType.Reply, 0);
AddHtmlLocalized(55, 242, 25, 35, 1011004, false, false); // aye:
AddButton(20, 240, 0xFA5, 0xFA7, 3);
AddHtmlLocalized(55, 242, 25, 35, 1011004); // aye:
AddLabel(78, 242, 0x0, $"[{yesCount}]");
if (!isOwner)
AddButton(20, 275, 0xFA5, 0xFA7, 4, GumpButtonType.Reply, 0);
AddHtmlLocalized(55, 277, 25, 35, 1011005, false, false); // nay:
AddButton(20, 275, 0xFA5, 0xFA7, 4);
AddHtmlLocalized(55, 277, 25, 35, 1011005); // nay:
AddLabel(78, 277, 0x0, $"[{noCount}]");
if (totalVotes > 0)
@ -171,16 +171,16 @@ namespace Server.Items
AddImageTiled(130, 277, noCount * 225 / totalVotes, 10, 0xD6);
}
AddButton(45, 305, 0xFA5, 0xFA7, 0, GumpButtonType.Reply, 0);
AddHtmlLocalized(80, 308, 40, 35, 1011008, false, false); // done
AddButton(45, 305, 0xFA5, 0xFA7, 0);
AddHtmlLocalized(80, 308, 40, 35, 1011008); // done
if (isOwner)
{
AddButton(120, 305, 0xFA5, 0xFA7, 1, GumpButtonType.Reply, 0);
AddHtmlLocalized(155, 308, 100, 35, 1011006, false, false); // change topic
AddButton(120, 305, 0xFA5, 0xFA7, 1);
AddHtmlLocalized(155, 308, 100, 35, 1011006); // change topic
AddButton(240, 305, 0xFA5, 0xFA7, 2, GumpButtonType.Reply, 0);
AddHtmlLocalized(275, 308, 300, 100, 1011007, false, false); // reset votes
AddButton(240, 305, 0xFA5, 0xFA7, 2);
AddHtmlLocalized(275, 308, 300, 100, 1011007); // reset votes
}
}
@ -375,4 +375,4 @@ namespace Server.Items
int version = reader.ReadEncodedInt();
}
}
}
}