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

Formatting FIxes (#58)

Browse source
This commit is contained in:
Kamron Batman 2019-10-04 23:08:13 -07:00 • committed by GitHub
parent 57fb9fb525
commit 096d39609e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1318 changed files with 11633 additions and 22129 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Projects/Scripts/Gumps/Guilds/New Guild System/BaseGuildGump.cs
View file

@ -65,17 +65,13 @@ namespace Server.Guilds
}
}
public static bool IsLeader(Mobile m, Guild g)
{
return !(m.Deleted || g.Disbanded || !(m is PlayerMobile) ||
m.AccessLevel < AccessLevel.GameMaster && g.Leader != m);
}
public static bool IsLeader(Mobile m, Guild g) =>
!(m.Deleted || g.Disbanded || !(m is PlayerMobile) ||
m.AccessLevel < AccessLevel.GameMaster && g.Leader != m);
public static bool IsMember(Mobile m, Guild g)
{
return !(m.Deleted || g.Disbanded || !(m is PlayerMobile) ||
m.AccessLevel < AccessLevel.GameMaster && !g.IsMember(m));
}
public static bool IsMember(Mobile m, Guild g) =>
!(m.Deleted || g.Disbanded || !(m is PlayerMobile) ||
m.AccessLevel < AccessLevel.GameMaster && !g.IsMember(m));
public static bool CheckProfanity(string s, int maxLength = 50)
{
@ -123,9 +119,6 @@ namespace Server.Guilds
AddHtml(x, y, width, height, text.String, back, scroll);
}
public static string Color(string text, int color)
{
return $"<BASEFONT COLOR=#{color:X6}>{text}</BASEFONT>";
}
public static string Color(string text, int color) => $"<BASEFONT COLOR=#{color:X6}>{text}</BASEFONT>";
}
}

5
Projects/Scripts/Gumps/Guilds/New Guild System/BaseGuildListGump.cs
View file

@ -103,10 +103,7 @@ namespace Server.Guilds
{
}
public virtual bool HasRelationship(T o)
{
return false;
}
public virtual bool HasRelationship(T o) => false;
public virtual void DrawEntry(T o, int index, int itemNumber)
{

11
Projects/Scripts/Gumps/Guilds/New Guild System/DiplomacyGump.cs
View file

@ -179,10 +179,8 @@ namespace Server.Guilds
public override Gump GetResentGump(PlayerMobile pm, Guild g, IComparer<Guild> comparer, bool ascending,
string filter, int startNumber)
{
return new GuildDiplomacyGump(pm, g, comparer, ascending, filter, startNumber, m_Display);
}
string filter, int startNumber) =>
new GuildDiplomacyGump(pm, g, comparer, ascending, filter, startNumber, m_Display);
public override Gump GetObjectInfoGump(PlayerMobile pm, Guild g, Guild o)
{
@ -232,10 +230,7 @@ namespace Server.Guilds
{
private Guild m_Guild;
public StatusComparer(Guild g)
{
m_Guild = g;
}
public StatusComparer(Guild g) => m_Guild = g;
public int Compare(Guild x, Guild y)
{

11
Projects/Scripts/Gumps/Guilds/New Guild System/GuildRosterGump.cs
View file

@ -73,15 +73,10 @@ namespace Server.Guilds
}
public override Gump GetResentGump(PlayerMobile pm, Guild g, IComparer<PlayerMobile> comparer, bool ascending,
string filter, int startNumber)
{
return new GuildRosterGump(pm, g, comparer, ascending, filter, startNumber);
}
string filter, int startNumber) =>
new GuildRosterGump(pm, g, comparer, ascending, filter, startNumber);
public override Gump GetObjectInfoGump(PlayerMobile pm, Guild g, PlayerMobile o)
{
return new GuildMemberInfoGump(pm, g, o, false, false);
}
public override Gump GetObjectInfoGump(PlayerMobile pm, Guild g, PlayerMobile o) => new GuildMemberInfoGump(pm, g, o, false, false);
public override void OnResponse(NetState sender, RelayInfo info)
{