Fixes body expression style.
This commit is contained in:
Kamron Batman
parent
3f0a72a62f
commit
33f5e77a24
957 changed files with 7424 additions and 15973 deletions
|
|
@ -39,17 +39,17 @@ namespace Server.Guilds
|
|||
new RankDefinition( 1062960, 3, RankFlags.Member | RankFlags.ControlWarStatus ), //Warlord
|
||||
new RankDefinition( 1062959, 4, RankFlags.All ) //Leader
|
||||
};
|
||||
public static RankDefinition Leader{ get{ return Ranks[4]; } }
|
||||
public static RankDefinition Member{ get{ return Ranks[1]; } }
|
||||
public static RankDefinition Lowest{ get{ return Ranks[0]; } }
|
||||
public static RankDefinition Leader => Ranks[4];
|
||||
public static RankDefinition Member => Ranks[1];
|
||||
public static RankDefinition Lowest => Ranks[0];
|
||||
|
||||
private TextDefinition m_Name;
|
||||
private int m_Rank;
|
||||
private RankFlags m_Flags;
|
||||
|
||||
public TextDefinition Name{ get{ return m_Name; } }
|
||||
public int Rank{ get{ return m_Rank; } }
|
||||
public RankFlags Flags{ get{ return m_Flags; } }
|
||||
public TextDefinition Name => m_Name;
|
||||
public int Rank => m_Rank;
|
||||
public RankFlags Flags => m_Flags;
|
||||
|
||||
public RankDefinition( TextDefinition name, int rank, RankFlags flags )
|
||||
{
|
||||
|
|
@ -79,20 +79,14 @@ namespace Server.Guilds
|
|||
{
|
||||
private static Dictionary<string, AllianceInfo> m_Alliances = new Dictionary<string, AllianceInfo>();
|
||||
|
||||
public static Dictionary<string, AllianceInfo> Alliances
|
||||
{
|
||||
get{ return m_Alliances; }
|
||||
}
|
||||
public static Dictionary<string, AllianceInfo> Alliances => m_Alliances;
|
||||
|
||||
private string m_Name;
|
||||
private Guild m_Leader;
|
||||
private List<Guild> m_Members;
|
||||
private List<Guild> m_PendingMembers;
|
||||
|
||||
public string Name
|
||||
{
|
||||
get{ return m_Name; }
|
||||
}
|
||||
public string Name => m_Name;
|
||||
|
||||
public void CalculateAllianceLeader()
|
||||
{
|
||||
|
|
@ -374,7 +368,7 @@ namespace Server.Guilds
|
|||
|
||||
public class AllianceRosterGump : GuildDiplomacyGump
|
||||
{
|
||||
protected override bool AllowAdvancedSearch{ get{ return false; } }
|
||||
protected override bool AllowAdvancedSearch => false;
|
||||
|
||||
private AllianceInfo m_Alliance;
|
||||
|
||||
|
|
@ -427,36 +421,32 @@ namespace Server.Guilds
|
|||
|
||||
public int Kills
|
||||
{
|
||||
get{ return m_Kills; }
|
||||
set{ m_Kills = value; }
|
||||
get => m_Kills;
|
||||
set => m_Kills = value;
|
||||
}
|
||||
public int MaxKills
|
||||
{
|
||||
get{ return m_MaxKills; }
|
||||
set{ m_MaxKills = value; }
|
||||
get => m_MaxKills;
|
||||
set => m_MaxKills = value;
|
||||
}
|
||||
public TimeSpan WarLength
|
||||
{
|
||||
get{ return m_WarLength; }
|
||||
set{ m_WarLength = value; }
|
||||
}
|
||||
public Guild Opponent
|
||||
{
|
||||
get{ return m_Opponent; }
|
||||
}
|
||||
public Guild Guild
|
||||
{
|
||||
get{ return m_Guild; }
|
||||
get => m_WarLength;
|
||||
set => m_WarLength = value;
|
||||
}
|
||||
public Guild Opponent => m_Opponent;
|
||||
|
||||
public Guild Guild => m_Guild;
|
||||
|
||||
public DateTime WarBeginning
|
||||
{
|
||||
get{ return m_WarBeginning; }
|
||||
set{ m_WarBeginning = value; }
|
||||
get => m_WarBeginning;
|
||||
set => m_WarBeginning = value;
|
||||
}
|
||||
public bool WarRequester
|
||||
{
|
||||
get{ return m_WarRequester; }
|
||||
set{ m_WarRequester = value; }
|
||||
get => m_WarRequester;
|
||||
set => m_WarRequester = value;
|
||||
}
|
||||
|
||||
public WarDeclaration( Guild g, Guild opponent, int maxKills, TimeSpan warLength, bool warRequester )
|
||||
|
|
@ -673,8 +663,8 @@ namespace Server.Guilds
|
|||
}
|
||||
#endregion
|
||||
|
||||
public static bool NewGuildSystem{ get{ return Core.SE; } }
|
||||
public static bool OrderChaos{ get{ return !Core.SE; } }
|
||||
public static bool NewGuildSystem => Core.SE;
|
||||
public static bool OrderChaos => !Core.SE;
|
||||
|
||||
public static readonly int RegistrationFee = 25000;
|
||||
public static readonly int AbbrevLimit = 4;
|
||||
|
|
@ -721,40 +711,16 @@ namespace Server.Guilds
|
|||
}
|
||||
|
||||
[CommandProperty( AccessLevel.Counselor )]
|
||||
public string AllianceName
|
||||
{
|
||||
get
|
||||
{
|
||||
return Alliance?.Name;
|
||||
}
|
||||
}
|
||||
public string AllianceName => Alliance?.Name;
|
||||
|
||||
[CommandProperty( AccessLevel.Counselor )]
|
||||
public Guild AllianceLeader
|
||||
{
|
||||
get
|
||||
{
|
||||
return Alliance?.Leader;
|
||||
}
|
||||
}
|
||||
public Guild AllianceLeader => Alliance?.Leader;
|
||||
|
||||
[CommandProperty( AccessLevel.Counselor )]
|
||||
public bool IsAllianceMember
|
||||
{
|
||||
get
|
||||
{
|
||||
return Alliance?.IsMember( this ) == true;
|
||||
}
|
||||
}
|
||||
public bool IsAllianceMember => Alliance?.IsMember( this ) == true;
|
||||
|
||||
[CommandProperty( AccessLevel.Counselor )]
|
||||
public bool IsAlliancePendingMember
|
||||
{
|
||||
get
|
||||
{
|
||||
return Alliance?.IsPendingMember( this ) == true;
|
||||
}
|
||||
}
|
||||
public bool IsAlliancePendingMember => Alliance?.IsPendingMember( this ) == true;
|
||||
|
||||
public static Guild GetAllianceLeader( Guild g )
|
||||
{
|
||||
|
|
@ -770,14 +736,9 @@ namespace Server.Guilds
|
|||
|
||||
#region New Wars
|
||||
|
||||
public List<WarDeclaration> PendingWars
|
||||
{
|
||||
get{ return m_PendingWars; }
|
||||
}
|
||||
public List<WarDeclaration> AcceptedWars
|
||||
{
|
||||
get{ return m_AcceptedWars; }
|
||||
}
|
||||
public List<WarDeclaration> PendingWars => m_PendingWars;
|
||||
|
||||
public List<WarDeclaration> AcceptedWars => m_AcceptedWars;
|
||||
|
||||
|
||||
public WarDeclaration FindPendingWar( Guild g )
|
||||
|
|
@ -1047,13 +1008,7 @@ namespace Server.Guilds
|
|||
}
|
||||
|
||||
|
||||
public override bool Disbanded
|
||||
{
|
||||
get
|
||||
{
|
||||
return ( m_Leader == null || m_Leader.Deleted );
|
||||
}
|
||||
}
|
||||
public override bool Disbanded => ( m_Leader == null || m_Leader.Deleted );
|
||||
|
||||
public override void OnDelete( Mobile mob )
|
||||
{
|
||||
|
|
@ -1600,36 +1555,21 @@ namespace Server.Guilds
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Item Guildstone
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Guildstone;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_Guildstone = value;
|
||||
}
|
||||
get => m_Guildstone;
|
||||
set => m_Guildstone = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Item Teleporter
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Teleporter;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_Teleporter = value;
|
||||
}
|
||||
get => m_Teleporter;
|
||||
set => m_Teleporter = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public override string Name
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Name;
|
||||
}
|
||||
get => m_Name;
|
||||
set
|
||||
{
|
||||
m_Name = value;
|
||||
|
|
@ -1643,23 +1583,14 @@ namespace Server.Guilds
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public string Website
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Website;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_Website = value;
|
||||
}
|
||||
get => m_Website;
|
||||
set => m_Website = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public override string Abbreviation
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Abbreviation;
|
||||
}
|
||||
get => m_Abbreviation;
|
||||
set
|
||||
{
|
||||
m_Abbreviation = value;
|
||||
|
|
@ -1673,23 +1604,14 @@ namespace Server.Guilds
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public string Charter
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Charter;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_Charter = value;
|
||||
}
|
||||
get => m_Charter;
|
||||
set => m_Charter = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public override GuildType Type
|
||||
{
|
||||
get
|
||||
{
|
||||
return OrderChaos ? m_Type : GuildType.Regular;
|
||||
}
|
||||
get => OrderChaos ? m_Type : GuildType.Regular;
|
||||
set
|
||||
{
|
||||
if ( m_Type != value )
|
||||
|
|
@ -1705,96 +1627,31 @@ namespace Server.Guilds
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public DateTime LastFealty
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_LastFealty;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_LastFealty = value;
|
||||
}
|
||||
get => m_LastFealty;
|
||||
set => m_LastFealty = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public DateTime TypeLastChange
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_TypeLastChange;
|
||||
}
|
||||
}
|
||||
public DateTime TypeLastChange => m_TypeLastChange;
|
||||
|
||||
public List<Guild> Allies
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Allies;
|
||||
}
|
||||
}
|
||||
public List<Guild> Allies => m_Allies;
|
||||
|
||||
public List<Guild> Enemies
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Enemies;
|
||||
}
|
||||
}
|
||||
public List<Guild> Enemies => m_Enemies;
|
||||
|
||||
public List<Guild> AllyDeclarations
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_AllyDeclarations;
|
||||
}
|
||||
}
|
||||
public List<Guild> AllyDeclarations => m_AllyDeclarations;
|
||||
|
||||
public List<Guild> AllyInvitations
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_AllyInvitations;
|
||||
}
|
||||
}
|
||||
public List<Guild> AllyInvitations => m_AllyInvitations;
|
||||
|
||||
public List<Guild> WarDeclarations
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_WarDeclarations;
|
||||
}
|
||||
}
|
||||
public List<Guild> WarDeclarations => m_WarDeclarations;
|
||||
|
||||
public List<Guild> WarInvitations
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_WarInvitations;
|
||||
}
|
||||
}
|
||||
public List<Guild> WarInvitations => m_WarInvitations;
|
||||
|
||||
public List<Mobile> Candidates
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Candidates;
|
||||
}
|
||||
}
|
||||
public List<Mobile> Candidates => m_Candidates;
|
||||
|
||||
public List<Mobile> Accepted
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Accepted;
|
||||
}
|
||||
}
|
||||
public List<Mobile> Accepted => m_Accepted;
|
||||
|
||||
public List<Mobile> Members => m_Members;
|
||||
|
||||
public List<Mobile> Members
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Members;
|
||||
}
|
||||
}
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue