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

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

62
Scripts/Gumps/Guilds/GuildGump.cs
View file

@ -19,7 +19,7 @@ namespace Server.Gumps
AddBackground(0, 0, 550, 400, 5054);
AddBackground(10, 10, 530, 380, 3000);
AddHtml(20, 15, 200, 35, guild.Name, false, false);
AddHtml(20, 15, 200, 35, guild.Name);
Mobile leader = guild.Leader;
@ -37,11 +37,11 @@ namespace Server.Gumps
if ((leadName = leader.Name) == null || (leadName = leadName.Trim()).Length <= 0)
leadName = "(empty)";
AddHtml(220, 15, 250, 35, leadTitle + leadName, false, false);
AddHtml(220, 15, 250, 35, leadTitle + leadName);
}
AddButton(20, 50, 4005, 4007, 1, GumpButtonType.Reply, 0);
AddHtmlLocalized(55, 50, 100, 20, 1013022, false, false); // Loyal to
AddButton(20, 50, 4005, 4007, 1);
AddHtmlLocalized(55, 50, 100, 20, 1013022); // Loyal to
Mobile fealty = beholder.GuildFealty;
@ -57,55 +57,53 @@ namespace Server.Gumps
fealtyName = "(empty)";
if (beholder == fealty)
AddHtmlLocalized(55, 70, 470, 20, 1018002, false, false); // yourself
AddHtmlLocalized(55, 70, 470, 20, 1018002); // yourself
else
AddHtml(55, 70, 470, 20, fealtyName, false, false);
AddHtml(55, 70, 470, 20, fealtyName);
AddButton(215, 50, 4005, 4007, 2, GumpButtonType.Reply, 0);
AddHtmlLocalized(250, 50, 170, 20, 1013023, false, false); // Display guild abbreviation
AddHtmlLocalized(250, 70, 50, 20, beholder.DisplayGuildTitle ? 1011262 : 1011263, false, false); // on/off
AddButton(215, 50, 4005, 4007, 2);
AddHtmlLocalized(250, 50, 170, 20, 1013023); // Display guild abbreviation
AddHtmlLocalized(250, 70, 50, 20, beholder.DisplayGuildTitle ? 1011262 : 1011263); // on/off
AddButton(20, 100, 4005, 4007, 3, GumpButtonType.Reply, 0);
AddHtmlLocalized(55, 100, 470, 30, 1011086, false, false); // View the current roster.
AddButton(20, 100, 4005, 4007, 3);
AddHtmlLocalized(55, 100, 470, 30, 1011086); // View the current roster.
AddButton(20, 130, 4005, 4007, 4, GumpButtonType.Reply, 0);
AddHtmlLocalized(55, 130, 470, 30, 1011085, false, false); // Recruit someone into the guild.
AddButton(20, 130, 4005, 4007, 4);
AddHtmlLocalized(55, 130, 470, 30, 1011085); // Recruit someone into the guild.
if (guild.Candidates.Count > 0)
{
AddButton(20, 160, 4005, 4007, 5, GumpButtonType.Reply, 0);
AddHtmlLocalized(55, 160, 470, 30, 1011093, false,
false); // View list of candidates who have been sponsored to the guild.
AddButton(20, 160, 4005, 4007, 5);
AddHtmlLocalized(55, 160, 470, 30, 1011093); // View list of candidates who have been sponsored to the guild.
}
else
{
AddImage(20, 160, 4020);
AddHtmlLocalized(55, 160, 470, 30, 1013031, false,
false); // There are currently no candidates for membership.
AddHtmlLocalized(55, 160, 470, 30, 1013031); // There are currently no candidates for membership.
}
AddButton(20, 220, 4005, 4007, 6, GumpButtonType.Reply, 0);
AddHtmlLocalized(55, 220, 470, 30, 1011087, false, false); // View the guild's charter.
AddButton(20, 220, 4005, 4007, 6);
AddHtmlLocalized(55, 220, 470, 30, 1011087); // View the guild's charter.
AddButton(20, 250, 4005, 4007, 7, GumpButtonType.Reply, 0);
AddHtmlLocalized(55, 250, 470, 30, 1011092, false, false); // Resign from the guild.
AddButton(20, 250, 4005, 4007, 7);
AddHtmlLocalized(55, 250, 470, 30, 1011092); // Resign from the guild.
AddButton(20, 280, 4005, 4007, 8, GumpButtonType.Reply, 0);
AddHtmlLocalized(55, 280, 470, 30, 1011095, false, false); // View list of guilds you are at war with.
AddButton(20, 280, 4005, 4007, 8);
AddHtmlLocalized(55, 280, 470, 30, 1011095); // View list of guilds you are at war with.
if (beholder.AccessLevel >= AccessLevel.GameMaster || beholder == leader)
{
AddButton(20, 310, 4005, 4007, 9, GumpButtonType.Reply, 0);
AddHtmlLocalized(55, 310, 470, 30, 1011094, false, false); // Access guildmaster functions.
AddButton(20, 310, 4005, 4007, 9);
AddHtmlLocalized(55, 310, 470, 30, 1011094); // Access guildmaster functions.
}
else
{
AddImage(20, 310, 4020);
AddHtmlLocalized(55, 310, 470, 30, 1018013, false, false); // Reserved for guildmaster
AddHtmlLocalized(55, 310, 470, 30, 1018013); // Reserved for guildmaster
}
AddButton(20, 360, 4005, 4007, 0, GumpButtonType.Reply, 0);
AddHtmlLocalized(55, 360, 470, 30, 1011441, false, false); // EXIT
AddButton(20, 360, 4005, 4007, 0);
AddHtmlLocalized(55, 360, 470, 30, 1011441); // EXIT
}
public static void EnsureClosed(Mobile m)
@ -130,7 +128,7 @@ namespace Server.Gumps
Item stone = g.Guildstone;
return stone == null || stone.Deleted || !m.InRange(stone.GetWorldLocation(), 2);
return stone?.Deleted != false || !m.InRange(stone.GetWorldLocation(), 2);
}
public static bool BadMember(Mobile m, Guild g)
@ -140,7 +138,7 @@ namespace Server.Gumps
Item stone = g.Guildstone;
return stone == null || stone.Deleted || !m.InRange(stone.GetWorldLocation(), 2);
return stone?.Deleted != false || !m.InRange(stone.GetWorldLocation(), 2);
}
public override void OnResponse(NetState sender, RelayInfo info)
@ -219,4 +217,4 @@ namespace Server.Gumps
}
}
}
}
}