Fixes body expression style.
This commit is contained in:
parent
3f0a72a62f
commit
33f5e77a24
957 changed files with 7424 additions and 15973 deletions
|
|
@ -20,15 +20,16 @@ namespace Server.Factions
|
|||
private ElectionState m_State;
|
||||
private DateTime m_LastStateTime;
|
||||
|
||||
public Faction Faction{ get{ return m_Faction; } }
|
||||
public Faction Faction => m_Faction;
|
||||
|
||||
public List<Candidate> Candidates => m_Candidates;
|
||||
|
||||
public ElectionState State{ get{ return m_State; } set{ m_State = value; m_LastStateTime = DateTime.UtcNow; } }
|
||||
public DateTime LastStateTime{ get{ return m_LastStateTime; } }
|
||||
public ElectionState State{ get => m_State;
|
||||
set{ m_State = value; m_LastStateTime = DateTime.UtcNow; } }
|
||||
public DateTime LastStateTime => m_LastStateTime;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public ElectionState CurrentState{ get{ return m_State; } }
|
||||
public ElectionState CurrentState => m_State;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
|
||||
public TimeSpan NextStateTime
|
||||
|
|
@ -383,25 +384,13 @@ namespace Server.Factions
|
|||
private IPAddress m_Address;
|
||||
private DateTime m_Time;
|
||||
|
||||
public Mobile From
|
||||
{
|
||||
get{ return m_From; }
|
||||
}
|
||||
public Mobile From => m_From;
|
||||
|
||||
public Mobile Candidate
|
||||
{
|
||||
get{ return m_Candidate; }
|
||||
}
|
||||
public Mobile Candidate => m_Candidate;
|
||||
|
||||
public IPAddress Address
|
||||
{
|
||||
get{ return m_Address; }
|
||||
}
|
||||
public IPAddress Address => m_Address;
|
||||
|
||||
public DateTime Time
|
||||
{
|
||||
get{ return m_Time; }
|
||||
}
|
||||
public DateTime Time => m_Time;
|
||||
|
||||
public object[] AcquireFields()
|
||||
{
|
||||
|
|
@ -480,10 +469,10 @@ namespace Server.Factions
|
|||
private Mobile m_Mobile;
|
||||
private List<Voter> m_Voters;
|
||||
|
||||
public Mobile Mobile{ get{ return m_Mobile; } }
|
||||
public Mobile Mobile => m_Mobile;
|
||||
public List<Voter> Voters => m_Voters;
|
||||
|
||||
public int Votes{ get{ return m_Voters.Count; } }
|
||||
public int Votes => m_Voters.Count;
|
||||
|
||||
public void CleanMuleVotes()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -23,13 +23,13 @@ namespace Server.Factions
|
|||
|
||||
public StrongholdRegion StrongholdRegion
|
||||
{
|
||||
get{ return m_StrongholdRegion; }
|
||||
set{ m_StrongholdRegion = value; }
|
||||
get => m_StrongholdRegion;
|
||||
set => m_StrongholdRegion = value;
|
||||
}
|
||||
|
||||
public FactionDefinition Definition
|
||||
{
|
||||
get{ return m_Definition; }
|
||||
get => m_Definition;
|
||||
set
|
||||
{
|
||||
m_Definition = value;
|
||||
|
|
@ -39,46 +39,43 @@ namespace Server.Factions
|
|||
|
||||
public FactionState State
|
||||
{
|
||||
get{ return m_State; }
|
||||
set{ m_State = value; }
|
||||
get => m_State;
|
||||
set => m_State = value;
|
||||
}
|
||||
|
||||
public Election Election
|
||||
{
|
||||
get{ return m_State.Election; }
|
||||
set{ m_State.Election = value; }
|
||||
get => m_State.Election;
|
||||
set => m_State.Election = value;
|
||||
}
|
||||
|
||||
public Mobile Commander
|
||||
{
|
||||
get{ return m_State.Commander; }
|
||||
set{ m_State.Commander = value; }
|
||||
get => m_State.Commander;
|
||||
set => m_State.Commander = value;
|
||||
}
|
||||
|
||||
public int Tithe
|
||||
{
|
||||
get{ return m_State.Tithe; }
|
||||
set{ m_State.Tithe = value; }
|
||||
get => m_State.Tithe;
|
||||
set => m_State.Tithe = value;
|
||||
}
|
||||
|
||||
public int Silver
|
||||
{
|
||||
get{ return m_State.Silver; }
|
||||
set{ m_State.Silver = value; }
|
||||
get => m_State.Silver;
|
||||
set => m_State.Silver = value;
|
||||
}
|
||||
|
||||
public List<PlayerState> Members
|
||||
{
|
||||
get{ return m_State.Members; }
|
||||
set{ m_State.Members = value; }
|
||||
get => m_State.Members;
|
||||
set => m_State.Members = value;
|
||||
}
|
||||
|
||||
public static readonly TimeSpan LeavePeriod = TimeSpan.FromDays( 3.0 );
|
||||
|
||||
public bool FactionMessageReady
|
||||
{
|
||||
get{ return m_State.FactionMessageReady; }
|
||||
}
|
||||
public bool FactionMessageReady => m_State.FactionMessageReady;
|
||||
|
||||
public void Broadcast( string text )
|
||||
{
|
||||
|
|
@ -948,12 +945,12 @@ namespace Server.Factions
|
|||
return silver;
|
||||
}
|
||||
|
||||
public virtual int MaximumTraps{ get{ return 15; } }
|
||||
public virtual int MaximumTraps => 15;
|
||||
|
||||
public List<BaseFactionTrap> Traps
|
||||
{
|
||||
get{ return m_State.Traps; }
|
||||
set{ m_State.Traps = value; }
|
||||
get => m_State.Traps;
|
||||
set => m_State.Traps = value;
|
||||
}
|
||||
|
||||
public const int StabilityFactor = 300; // 300% greater (3 times) than smallest faction
|
||||
|
|
@ -1219,7 +1216,7 @@ namespace Server.Factions
|
|||
writer.WriteEncodedInt( (int) (idx + 1) );
|
||||
}
|
||||
|
||||
public static List<Faction> Factions{ get{ return Reflector.Factions; } }
|
||||
public static List<Faction> Factions => Reflector.Factions;
|
||||
|
||||
public static Faction ReadReference( GenericReader reader )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -15,9 +15,9 @@ namespace Server.Factions
|
|||
private Faction m_Faction;
|
||||
private DateTime m_Expiration;
|
||||
|
||||
public Item Item{ get{ return m_Item; } }
|
||||
public Faction Faction{ get{ return m_Faction; } }
|
||||
public DateTime Expiration{ get{ return m_Expiration; } }
|
||||
public Item Item => m_Item;
|
||||
public Faction Faction => m_Faction;
|
||||
public DateTime Expiration => m_Expiration;
|
||||
|
||||
public bool HasExpired
|
||||
{
|
||||
|
|
|
|||
|
|
@ -20,7 +20,9 @@ namespace Server.Factions
|
|||
|
||||
private DateTime[] m_LastBroadcasts = new DateTime[BroadcastsPerPeriod];
|
||||
|
||||
public DateTime LastAtrophy{ get{ return m_LastAtrophy; } set{ m_LastAtrophy = value; } }
|
||||
public DateTime LastAtrophy{ get => m_LastAtrophy;
|
||||
set => m_LastAtrophy = value;
|
||||
}
|
||||
|
||||
public bool FactionMessageReady
|
||||
{
|
||||
|
|
@ -36,7 +38,7 @@ namespace Server.Factions
|
|||
}
|
||||
}
|
||||
|
||||
public bool IsAtrophyReady{ get{ return DateTime.UtcNow >= (m_LastAtrophy + TimeSpan.FromHours( 47.0 )); } }
|
||||
public bool IsAtrophyReady => DateTime.UtcNow >= (m_LastAtrophy + TimeSpan.FromHours( 47.0 ));
|
||||
|
||||
public int CheckAtrophy()
|
||||
{
|
||||
|
|
@ -82,25 +84,25 @@ namespace Server.Factions
|
|||
|
||||
public List<FactionItem> FactionItems
|
||||
{
|
||||
get{ return m_FactionItems; }
|
||||
set{ m_FactionItems = value; }
|
||||
get => m_FactionItems;
|
||||
set => m_FactionItems = value;
|
||||
}
|
||||
|
||||
public List<BaseFactionTrap> Traps
|
||||
{
|
||||
get{ return m_FactionTraps; }
|
||||
set{ m_FactionTraps = value; }
|
||||
get => m_FactionTraps;
|
||||
set => m_FactionTraps = value;
|
||||
}
|
||||
|
||||
public Election Election
|
||||
{
|
||||
get{ return m_Election; }
|
||||
set{ m_Election = value; }
|
||||
get => m_Election;
|
||||
set => m_Election = value;
|
||||
}
|
||||
|
||||
public Mobile Commander
|
||||
{
|
||||
get{ return m_Commander; }
|
||||
get => m_Commander;
|
||||
set
|
||||
{
|
||||
if ( m_Commander != null )
|
||||
|
|
@ -127,20 +129,20 @@ namespace Server.Factions
|
|||
|
||||
public int Tithe
|
||||
{
|
||||
get{ return m_Tithe; }
|
||||
set{ m_Tithe = value; }
|
||||
get => m_Tithe;
|
||||
set => m_Tithe = value;
|
||||
}
|
||||
|
||||
public int Silver
|
||||
{
|
||||
get{ return m_Silver; }
|
||||
set{ m_Silver = value; }
|
||||
get => m_Silver;
|
||||
set => m_Silver = value;
|
||||
}
|
||||
|
||||
public List<PlayerState> Members
|
||||
{
|
||||
get{ return m_Members; }
|
||||
set{ m_Members = value; }
|
||||
get => m_Members;
|
||||
set => m_Members = value;
|
||||
}
|
||||
|
||||
public FactionState( Faction faction )
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ namespace Server.Factions
|
|||
private GuardDefinition m_Definition;
|
||||
private List<BaseFactionGuard> m_Guards;
|
||||
|
||||
public GuardDefinition Definition{ get{ return m_Definition; } }
|
||||
public List<BaseFactionGuard> Guards{ get{ return m_Guards; } }
|
||||
public GuardDefinition Definition => m_Definition;
|
||||
public List<BaseFactionGuard> Guards => m_Guards;
|
||||
|
||||
public BaseFactionGuard Construct()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -18,11 +18,11 @@ namespace Server.Factions
|
|||
private TextDefinition m_Label;
|
||||
private TextDefinition m_Assigned;
|
||||
|
||||
public SkillName Skill{ get{ return m_Skill; } }
|
||||
public double Requirement{ get{ return m_Requirement; } }
|
||||
public TextDefinition Title{ get{ return m_Title; } }
|
||||
public TextDefinition Label{ get{ return m_Label; } }
|
||||
public TextDefinition Assigned{ get{ return m_Assigned; } }
|
||||
public SkillName Skill => m_Skill;
|
||||
public double Requirement => m_Requirement;
|
||||
public TextDefinition Title => m_Title;
|
||||
public TextDefinition Label => m_Label;
|
||||
public TextDefinition Assigned => m_Assigned;
|
||||
|
||||
public MerchantTitleInfo( SkillName skill, double requirement, TextDefinition title, TextDefinition label, TextDefinition assigned )
|
||||
{
|
||||
|
|
@ -46,7 +46,7 @@ namespace Server.Factions
|
|||
new MerchantTitleInfo( SkillName.Tailoring, 90.0, new TextDefinition( 1022982, "Tailor" ), new TextDefinition( 1018300, "TAILOR" ), new TextDefinition( 1042162, "You now have the faction title of Tailor" ) ),
|
||||
};
|
||||
|
||||
public static MerchantTitleInfo[] Info{ get{ return m_Info; } }
|
||||
public static MerchantTitleInfo[] Info => m_Info;
|
||||
|
||||
public static MerchantTitleInfo GetInfo( MerchantTitle title )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -6,12 +6,9 @@ namespace Server.Factions
|
|||
{
|
||||
private static FactionPersistance m_Instance;
|
||||
|
||||
public static FactionPersistance Instance{ get{ return m_Instance; } }
|
||||
public static FactionPersistance Instance => m_Instance;
|
||||
|
||||
public override string DefaultName
|
||||
{
|
||||
get { return "Faction Persistance - Internal"; }
|
||||
}
|
||||
public override string DefaultName => "Faction Persistance - Internal";
|
||||
|
||||
public FactionPersistance() : base( 1 )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -21,16 +21,19 @@ namespace Server.Factions
|
|||
|
||||
private DateTime m_LastHonorTime;
|
||||
|
||||
public Mobile Mobile{ get{ return m_Mobile; } }
|
||||
public Faction Faction{ get{ return m_Faction; } }
|
||||
public Mobile Mobile => m_Mobile;
|
||||
public Faction Faction => m_Faction;
|
||||
public List<PlayerState> Owner => m_Owner;
|
||||
public MerchantTitle MerchantTitle{ get{ return m_MerchantTitle; } set{ m_MerchantTitle = value; Invalidate(); } }
|
||||
public Town Sheriff{ get{ return m_Sheriff; } set{ m_Sheriff = value; Invalidate(); } }
|
||||
public Town Finance{ get{ return m_Finance; } set{ m_Finance = value; Invalidate(); } }
|
||||
public MerchantTitle MerchantTitle{ get => m_MerchantTitle;
|
||||
set{ m_MerchantTitle = value; Invalidate(); } }
|
||||
public Town Sheriff{ get => m_Sheriff;
|
||||
set{ m_Sheriff = value; Invalidate(); } }
|
||||
public Town Finance{ get => m_Finance;
|
||||
set{ m_Finance = value; Invalidate(); } }
|
||||
public List<SilverGivenEntry> SilverGiven => m_SilverGiven;
|
||||
|
||||
public int KillPoints {
|
||||
get { return m_KillPoints; }
|
||||
get => m_KillPoints;
|
||||
set {
|
||||
if ( m_KillPoints != value ) {
|
||||
if ( value > m_KillPoints ) {
|
||||
|
|
@ -102,7 +105,8 @@ namespace Server.Factions
|
|||
private bool m_InvalidateRank = true;
|
||||
private int m_RankIndex = -1;
|
||||
|
||||
public int RankIndex { get { return m_RankIndex; } set { if ( m_RankIndex != value ) { m_RankIndex = value; m_InvalidateRank = true; } } }
|
||||
public int RankIndex { get => m_RankIndex;
|
||||
set { if ( m_RankIndex != value ) { m_RankIndex = value; m_InvalidateRank = true; } } }
|
||||
|
||||
public RankDefinition Rank {
|
||||
get {
|
||||
|
|
@ -134,11 +138,17 @@ namespace Server.Factions
|
|||
}
|
||||
}
|
||||
|
||||
public DateTime LastHonorTime{ get{ return m_LastHonorTime; } set{ m_LastHonorTime = value; } }
|
||||
public DateTime Leaving{ get{ return m_Leaving; } set{ m_Leaving = value; } }
|
||||
public bool IsLeaving{ get{ return ( m_Leaving > DateTime.MinValue ); } }
|
||||
public DateTime LastHonorTime{ get => m_LastHonorTime;
|
||||
set => m_LastHonorTime = value;
|
||||
}
|
||||
public DateTime Leaving{ get => m_Leaving;
|
||||
set => m_Leaving = value;
|
||||
}
|
||||
public bool IsLeaving => ( m_Leaving > DateTime.MinValue );
|
||||
|
||||
public bool IsActive{ get{ return m_IsActive; } set{ m_IsActive = value; } }
|
||||
public bool IsActive{ get => m_IsActive;
|
||||
set => m_IsActive = value;
|
||||
}
|
||||
|
||||
public bool CanGiveSilverTo( Mobile mob )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@ namespace Server.Factions
|
|||
private Mobile m_GivenTo;
|
||||
private DateTime m_TimeOfGift;
|
||||
|
||||
public Mobile GivenTo{ get{ return m_GivenTo; } }
|
||||
public DateTime TimeOfGift{ get{ return m_TimeOfGift; } }
|
||||
public Mobile GivenTo => m_GivenTo;
|
||||
public DateTime TimeOfGift => m_TimeOfGift;
|
||||
|
||||
public bool IsExpired{ get{ return ( m_TimeOfGift + ExpirePeriod ) < DateTime.UtcNow; } }
|
||||
public bool IsExpired => ( m_TimeOfGift + ExpirePeriod ) < DateTime.UtcNow;
|
||||
|
||||
public SilverGivenEntry( Mobile givenTo )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ namespace Server.Factions
|
|||
|
||||
public Faction Faction
|
||||
{
|
||||
get{ return m_Faction; }
|
||||
set{ m_Faction = value; }
|
||||
get => m_Faction;
|
||||
set => m_Faction = value;
|
||||
}
|
||||
|
||||
public StrongholdRegion( Faction faction ) : base( faction.Definition.FriendlyName, Faction.Facet, Region.DefaultPriority, faction.Definition.Stronghold.Area )
|
||||
|
|
|
|||
|
|
@ -14,59 +14,56 @@ namespace Server.Factions
|
|||
|
||||
public TownDefinition Definition
|
||||
{
|
||||
get{ return m_Definition; }
|
||||
set{ m_Definition = value; }
|
||||
get => m_Definition;
|
||||
set => m_Definition = value;
|
||||
}
|
||||
|
||||
public TownState State
|
||||
{
|
||||
get{ return m_State; }
|
||||
get => m_State;
|
||||
set{ m_State = value; ConstructGuardLists(); }
|
||||
}
|
||||
|
||||
public int Silver
|
||||
{
|
||||
get{ return m_State.Silver; }
|
||||
set{ m_State.Silver = value; }
|
||||
get => m_State.Silver;
|
||||
set => m_State.Silver = value;
|
||||
}
|
||||
|
||||
public Faction Owner
|
||||
{
|
||||
get{ return m_State.Owner; }
|
||||
set{ Capture( value ); }
|
||||
get => m_State.Owner;
|
||||
set => Capture( value );
|
||||
}
|
||||
|
||||
public Mobile Sheriff
|
||||
{
|
||||
get{ return m_State.Sheriff; }
|
||||
set{ m_State.Sheriff = value; }
|
||||
get => m_State.Sheriff;
|
||||
set => m_State.Sheriff = value;
|
||||
}
|
||||
|
||||
public Mobile Finance
|
||||
{
|
||||
get{ return m_State.Finance; }
|
||||
set{ m_State.Finance = value; }
|
||||
get => m_State.Finance;
|
||||
set => m_State.Finance = value;
|
||||
}
|
||||
|
||||
public int Tax
|
||||
{
|
||||
get{ return m_State.Tax; }
|
||||
set{ m_State.Tax = value; }
|
||||
get => m_State.Tax;
|
||||
set => m_State.Tax = value;
|
||||
}
|
||||
|
||||
public DateTime LastTaxChange
|
||||
{
|
||||
get{ return m_State.LastTaxChange; }
|
||||
set{ m_State.LastTaxChange = value; }
|
||||
get => m_State.LastTaxChange;
|
||||
set => m_State.LastTaxChange = value;
|
||||
}
|
||||
|
||||
public static readonly TimeSpan TaxChangePeriod = TimeSpan.FromHours( 12.0 );
|
||||
public static readonly TimeSpan IncomePeriod = TimeSpan.FromDays( 1.0 );
|
||||
|
||||
public bool TaxChangeReady
|
||||
{
|
||||
get{ return ( m_State.LastTaxChange + TaxChangePeriod ) < DateTime.UtcNow; }
|
||||
}
|
||||
public bool TaxChangeReady => ( m_State.LastTaxChange + TaxChangePeriod ) < DateTime.UtcNow;
|
||||
|
||||
public static Town FromRegion( Region reg )
|
||||
{
|
||||
|
|
@ -114,15 +111,9 @@ namespace Server.Factions
|
|||
}
|
||||
}
|
||||
|
||||
public int DailyIncome
|
||||
{
|
||||
get{ return (10000 * (100 + m_State.Tax)) / 100; }
|
||||
}
|
||||
public int DailyIncome => (10000 * (100 + m_State.Tax)) / 100;
|
||||
|
||||
public int NetCashFlow
|
||||
{
|
||||
get{ return DailyIncome - FinanceUpkeep - SheriffUpkeep; }
|
||||
}
|
||||
public int NetCashFlow => DailyIncome - FinanceUpkeep - SheriffUpkeep;
|
||||
|
||||
public TownMonolith Monolith
|
||||
{
|
||||
|
|
@ -142,8 +133,8 @@ namespace Server.Factions
|
|||
|
||||
public DateTime LastIncome
|
||||
{
|
||||
get{ return m_State.LastIncome; }
|
||||
set{ m_State.LastIncome = value; }
|
||||
get => m_State.LastIncome;
|
||||
set => m_State.LastIncome = value;
|
||||
}
|
||||
|
||||
public void BeginOrderFiring( Mobile from )
|
||||
|
|
@ -258,14 +249,14 @@ namespace Server.Factions
|
|||
|
||||
public List<VendorList> VendorLists
|
||||
{
|
||||
get{ return m_VendorLists; }
|
||||
set{ m_VendorLists = value; }
|
||||
get => m_VendorLists;
|
||||
set => m_VendorLists = value;
|
||||
}
|
||||
|
||||
public List<GuardList> GuardLists
|
||||
{
|
||||
get{ return m_GuardLists; }
|
||||
set{ m_GuardLists = value; }
|
||||
get => m_GuardLists;
|
||||
set => m_GuardLists = value;
|
||||
}
|
||||
|
||||
public void ConstructGuardLists()
|
||||
|
|
|
|||
|
|
@ -18,19 +18,19 @@ namespace Server.Factions
|
|||
|
||||
public Town Town
|
||||
{
|
||||
get{ return m_Town; }
|
||||
set{ m_Town = value; }
|
||||
get => m_Town;
|
||||
set => m_Town = value;
|
||||
}
|
||||
|
||||
public Faction Owner
|
||||
{
|
||||
get{ return m_Owner; }
|
||||
set{ m_Owner = value; }
|
||||
get => m_Owner;
|
||||
set => m_Owner = value;
|
||||
}
|
||||
|
||||
public Mobile Sheriff
|
||||
{
|
||||
get{ return m_Sheriff; }
|
||||
get => m_Sheriff;
|
||||
set
|
||||
{
|
||||
if ( m_Sheriff != null )
|
||||
|
|
@ -55,7 +55,7 @@ namespace Server.Factions
|
|||
|
||||
public Mobile Finance
|
||||
{
|
||||
get{ return m_Finance; }
|
||||
get => m_Finance;
|
||||
set
|
||||
{
|
||||
if ( m_Finance != null )
|
||||
|
|
@ -80,26 +80,26 @@ namespace Server.Factions
|
|||
|
||||
public int Silver
|
||||
{
|
||||
get{ return m_Silver; }
|
||||
set{ m_Silver = value; }
|
||||
get => m_Silver;
|
||||
set => m_Silver = value;
|
||||
}
|
||||
|
||||
public int Tax
|
||||
{
|
||||
get{ return m_Tax; }
|
||||
set{ m_Tax = value; }
|
||||
get => m_Tax;
|
||||
set => m_Tax = value;
|
||||
}
|
||||
|
||||
public DateTime LastTaxChange
|
||||
{
|
||||
get{ return m_LastTaxChange; }
|
||||
set{ m_LastTaxChange = value; }
|
||||
get => m_LastTaxChange;
|
||||
set => m_LastTaxChange = value;
|
||||
}
|
||||
|
||||
public DateTime LastIncome
|
||||
{
|
||||
get{ return m_LastIncome; }
|
||||
set{ m_LastIncome = value; }
|
||||
get => m_LastIncome;
|
||||
set => m_LastIncome = value;
|
||||
}
|
||||
|
||||
public TownState( Town town )
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ namespace Server.Factions
|
|||
private VendorDefinition m_Definition;
|
||||
private List<BaseFactionVendor> m_Vendors;
|
||||
|
||||
public VendorDefinition Definition{ get{ return m_Definition; } }
|
||||
public VendorDefinition Definition => m_Definition;
|
||||
public List<BaseFactionVendor> Vendors => m_Vendors;
|
||||
|
||||
public BaseFactionVendor Construct( Town town, Faction faction )
|
||||
|
|
|
|||
|
|
@ -33,38 +33,38 @@ namespace Server.Factions
|
|||
private RankDefinition[] m_Ranks;
|
||||
private GuardDefinition[] m_Guards;
|
||||
|
||||
public int Sort{ get{ return m_Sort; } }
|
||||
public int Sort => m_Sort;
|
||||
|
||||
public int HuePrimary{ get{ return m_HuePrimary; } }
|
||||
public int HueSecondary{ get{ return m_HueSecondary; } }
|
||||
public int HueJoin{ get{ return m_HueJoin; } }
|
||||
public int HueBroadcast{ get{ return m_HueBroadcast; } }
|
||||
public int HuePrimary => m_HuePrimary;
|
||||
public int HueSecondary => m_HueSecondary;
|
||||
public int HueJoin => m_HueJoin;
|
||||
public int HueBroadcast => m_HueBroadcast;
|
||||
|
||||
public int WarHorseBody{ get{ return m_WarHorseBody; } }
|
||||
public int WarHorseItem{ get{ return m_WarHorseItem; } }
|
||||
public int WarHorseBody => m_WarHorseBody;
|
||||
public int WarHorseItem => m_WarHorseItem;
|
||||
|
||||
public string FriendlyName{ get{ return m_FriendlyName; } }
|
||||
public string Keyword{ get{ return m_Keyword; } }
|
||||
public string FriendlyName => m_FriendlyName;
|
||||
public string Keyword => m_Keyword;
|
||||
public string Abbreviation => m_Abbreviation;
|
||||
|
||||
public TextDefinition Name{ get{ return m_Name; } }
|
||||
public TextDefinition PropName{ get{ return m_PropName; } }
|
||||
public TextDefinition Header{ get{ return m_Header; } }
|
||||
public TextDefinition About{ get{ return m_About; } }
|
||||
public TextDefinition CityControl{ get{ return m_CityControl; } }
|
||||
public TextDefinition SigilControl{ get{ return m_SigilControl; } }
|
||||
public TextDefinition SignupName{ get{ return m_SignupName; } }
|
||||
public TextDefinition FactionStoneName{ get{ return m_FactionStoneName; } }
|
||||
public TextDefinition OwnerLabel{ get{ return m_OwnerLabel; } }
|
||||
public TextDefinition Name => m_Name;
|
||||
public TextDefinition PropName => m_PropName;
|
||||
public TextDefinition Header => m_Header;
|
||||
public TextDefinition About => m_About;
|
||||
public TextDefinition CityControl => m_CityControl;
|
||||
public TextDefinition SigilControl => m_SigilControl;
|
||||
public TextDefinition SignupName => m_SignupName;
|
||||
public TextDefinition FactionStoneName => m_FactionStoneName;
|
||||
public TextDefinition OwnerLabel => m_OwnerLabel;
|
||||
|
||||
public TextDefinition GuardIgnore{ get{ return m_GuardIgnore; } }
|
||||
public TextDefinition GuardWarn{ get{ return m_GuardWarn; } }
|
||||
public TextDefinition GuardAttack{ get{ return m_GuardAttack; } }
|
||||
public TextDefinition GuardIgnore => m_GuardIgnore;
|
||||
public TextDefinition GuardWarn => m_GuardWarn;
|
||||
public TextDefinition GuardAttack => m_GuardAttack;
|
||||
|
||||
public StrongholdDefinition Stronghold{ get{ return m_Stronghold; } }
|
||||
public StrongholdDefinition Stronghold => m_Stronghold;
|
||||
|
||||
public RankDefinition[] Ranks{ get{ return m_Ranks; } }
|
||||
public GuardDefinition[] Guards{ get{ return m_Guards; } }
|
||||
public RankDefinition[] Ranks => m_Ranks;
|
||||
public GuardDefinition[] Guards => m_Guards;
|
||||
|
||||
public FactionDefinition( int sort, int huePrimary, int hueSecondary, int hueJoin, int hueBroadcast, int warHorseBody, int warHorseItem, string friendlyName, string keyword, string abbreviation, TextDefinition name, TextDefinition propName, TextDefinition header, TextDefinition about, TextDefinition cityControl, TextDefinition sigilControl, TextDefinition signupName, TextDefinition factionStoneName, TextDefinition ownerLabel, TextDefinition guardIgnore, TextDefinition guardWarn, TextDefinition guardAttack, StrongholdDefinition stronghold, RankDefinition[] ranks, GuardDefinition[] guards )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ namespace Server.Factions
|
|||
private int m_SilverCost;
|
||||
private Type m_VendorType;
|
||||
|
||||
public int SilverCost{ get{ return m_SilverCost; } }
|
||||
public Type VendorType{ get{ return m_VendorType; } }
|
||||
public int SilverCost => m_SilverCost;
|
||||
public Type VendorType => m_VendorType;
|
||||
|
||||
public FactionItemDefinition( int silverCost, Type vendorType )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -15,15 +15,15 @@ namespace Server.Factions
|
|||
private TextDefinition m_Header;
|
||||
private TextDefinition m_Label;
|
||||
|
||||
public Type Type{ get{ return m_Type; } }
|
||||
public Type Type => m_Type;
|
||||
|
||||
public int Price{ get{ return m_Price; } }
|
||||
public int Upkeep{ get{ return m_Upkeep; } }
|
||||
public int Maximum{ get{ return m_Maximum; } }
|
||||
public int ItemID{ get{ return m_ItemID; } }
|
||||
public int Price => m_Price;
|
||||
public int Upkeep => m_Upkeep;
|
||||
public int Maximum => m_Maximum;
|
||||
public int ItemID => m_ItemID;
|
||||
|
||||
public TextDefinition Header{ get{ return m_Header; } }
|
||||
public TextDefinition Label{ get{ return m_Label; } }
|
||||
public TextDefinition Header => m_Header;
|
||||
public TextDefinition Label => m_Label;
|
||||
|
||||
public GuardDefinition( Type type, int itemID, int price, int upkeep, int maximum, TextDefinition header, TextDefinition label )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -7,10 +7,10 @@ namespace Server.Factions
|
|||
private int m_MaxWearables;
|
||||
private TextDefinition m_Title;
|
||||
|
||||
public int Rank{ get{ return m_Rank; } }
|
||||
public int Required{ get{ return m_Required; } }
|
||||
public int MaxWearables{ get{ return m_MaxWearables; } }
|
||||
public TextDefinition Title{ get{ return m_Title; } }
|
||||
public int Rank => m_Rank;
|
||||
public int Required => m_Required;
|
||||
public int MaxWearables => m_MaxWearables;
|
||||
public TextDefinition Title => m_Title;
|
||||
|
||||
public RankDefinition( int rank, int required, int maxWearables, TextDefinition title )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -7,12 +7,12 @@ namespace Server.Factions
|
|||
private Point3D m_FactionStone;
|
||||
private Point3D[] m_Monoliths;
|
||||
|
||||
public Rectangle2D[] Area{ get{ return m_Area; } }
|
||||
public Rectangle2D[] Area => m_Area;
|
||||
|
||||
public Point3D JoinStone{ get{ return m_JoinStone; } }
|
||||
public Point3D FactionStone{ get{ return m_FactionStone; } }
|
||||
public Point3D JoinStone => m_JoinStone;
|
||||
public Point3D FactionStone => m_FactionStone;
|
||||
|
||||
public Point3D[] Monoliths{ get{ return m_Monoliths; } }
|
||||
public Point3D[] Monoliths => m_Monoliths;
|
||||
|
||||
public StrongholdDefinition( Rectangle2D[] area, Point3D joinStone, Point3D factionStone, Point3D[] monoliths )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -20,22 +20,22 @@ namespace Server.Factions
|
|||
private Point3D m_Monolith;
|
||||
private Point3D m_TownStone;
|
||||
|
||||
public int Sort{ get{ return m_Sort; } }
|
||||
public int SigilID{ get{ return m_SigilID; } }
|
||||
public int Sort => m_Sort;
|
||||
public int SigilID => m_SigilID;
|
||||
|
||||
public string Region{ get{ return m_Region; } }
|
||||
public string FriendlyName{ get{ return m_FriendlyName; } }
|
||||
public string Region => m_Region;
|
||||
public string FriendlyName => m_FriendlyName;
|
||||
|
||||
public TextDefinition TownName{ get{ return m_TownName; } }
|
||||
public TextDefinition TownStoneHeader{ get{ return m_TownStoneHeader; } }
|
||||
public TextDefinition StrongholdMonolithName{ get{ return m_StrongholdMonolithName; } }
|
||||
public TextDefinition TownMonolithName{ get{ return m_TownMonolithName; } }
|
||||
public TextDefinition TownStoneName{ get{ return m_TownStoneName; } }
|
||||
public TextDefinition SigilName{ get{ return m_SigilName; } }
|
||||
public TextDefinition CorruptedSigilName{ get{ return m_CorruptedSigilName; } }
|
||||
public TextDefinition TownName => m_TownName;
|
||||
public TextDefinition TownStoneHeader => m_TownStoneHeader;
|
||||
public TextDefinition StrongholdMonolithName => m_StrongholdMonolithName;
|
||||
public TextDefinition TownMonolithName => m_TownMonolithName;
|
||||
public TextDefinition TownStoneName => m_TownStoneName;
|
||||
public TextDefinition SigilName => m_SigilName;
|
||||
public TextDefinition CorruptedSigilName => m_CorruptedSigilName;
|
||||
|
||||
public Point3D Monolith{ get{ return m_Monolith; } }
|
||||
public Point3D TownStone{ get{ return m_TownStone; } }
|
||||
public Point3D Monolith => m_Monolith;
|
||||
public Point3D TownStone => m_TownStone;
|
||||
|
||||
public TownDefinition( int sort, int sigilID, string region, string friendlyName, TextDefinition townName, TextDefinition townStoneHeader, TextDefinition strongholdMonolithName, TextDefinition townMonolithName, TextDefinition townStoneName, TextDefinition sigilName, TextDefinition corruptedSigilName, Point3D monolith, Point3D townStone )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -15,15 +15,15 @@ namespace Server.Factions
|
|||
private TextDefinition m_Header;
|
||||
private TextDefinition m_Label;
|
||||
|
||||
public Type Type{ get{ return m_Type; } }
|
||||
public Type Type => m_Type;
|
||||
|
||||
public int Price{ get{ return m_Price; } }
|
||||
public int Upkeep{ get{ return m_Upkeep; } }
|
||||
public int Maximum{ get{ return m_Maximum; } }
|
||||
public int ItemID{ get{ return m_ItemID; } }
|
||||
public int Price => m_Price;
|
||||
public int Upkeep => m_Upkeep;
|
||||
public int Maximum => m_Maximum;
|
||||
public int ItemID => m_ItemID;
|
||||
|
||||
public TextDefinition Header{ get{ return m_Header; } }
|
||||
public TextDefinition Label{ get{ return m_Label; } }
|
||||
public TextDefinition Header => m_Header;
|
||||
public TextDefinition Label => m_Label;
|
||||
|
||||
public VendorDefinition( Type type, int itemID, int price, int upkeep, int maximum, TextDefinition header, TextDefinition label )
|
||||
{
|
||||
|
|
@ -77,6 +77,6 @@ namespace Server.Factions
|
|||
)
|
||||
};
|
||||
|
||||
public static VendorDefinition[] Definitions{ get{ return m_Definitions; } }
|
||||
public static VendorDefinition[] Definitions => m_Definitions;
|
||||
}
|
||||
}
|
||||
|
|
@ -4,7 +4,7 @@ namespace Server.Factions
|
|||
{
|
||||
public abstract class FactionGump : Gump
|
||||
{
|
||||
public virtual int ButtonTypes{ get{ return 10; } }
|
||||
public virtual int ButtonTypes => 10;
|
||||
|
||||
public int ToButtonID( int type, int index )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ namespace Server.Factions
|
|||
{
|
||||
private static Faction m_Instance;
|
||||
|
||||
public static Faction Instance{ get{ return m_Instance; } }
|
||||
public static Faction Instance => m_Instance;
|
||||
|
||||
public CouncilOfMages()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ namespace Server.Factions
|
|||
{
|
||||
private static Faction m_Instance;
|
||||
|
||||
public static Faction Instance{ get{ return m_Instance; } }
|
||||
public static Faction Instance => m_Instance;
|
||||
|
||||
public Minax()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ namespace Server.Factions
|
|||
{
|
||||
private static Faction m_Instance;
|
||||
|
||||
public static Faction Instance{ get{ return m_Instance; } }
|
||||
public static Faction Instance => m_Instance;
|
||||
|
||||
public Shadowlords()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ namespace Server.Factions
|
|||
{
|
||||
private static Faction m_Instance;
|
||||
|
||||
public static Faction Instance{ get{ return m_Instance; } }
|
||||
public static Faction Instance => m_Instance;
|
||||
|
||||
public TrueBritannians()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ namespace Server.Factions
|
|||
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
|
||||
public Sigil Sigil
|
||||
{
|
||||
get{ return m_Sigil; }
|
||||
get => m_Sigil;
|
||||
set
|
||||
{
|
||||
if ( m_Sigil == value )
|
||||
|
|
@ -32,7 +32,7 @@ namespace Server.Factions
|
|||
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
|
||||
public Town Town
|
||||
{
|
||||
get{ return m_Town; }
|
||||
get => m_Town;
|
||||
set
|
||||
{
|
||||
m_Town = value;
|
||||
|
|
@ -43,7 +43,7 @@ namespace Server.Factions
|
|||
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
|
||||
public Faction Faction
|
||||
{
|
||||
get{ return m_Faction; }
|
||||
get => m_Faction;
|
||||
set
|
||||
{
|
||||
m_Faction = value;
|
||||
|
|
@ -128,8 +128,8 @@ namespace Server.Factions
|
|||
|
||||
public static List<BaseMonolith> Monoliths
|
||||
{
|
||||
get{ return m_Monoliths; }
|
||||
set{ m_Monoliths = value; }
|
||||
get => m_Monoliths;
|
||||
set => m_Monoliths = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -4,8 +4,8 @@ namespace Server.Factions
|
|||
{
|
||||
private int m_LabelNumber;
|
||||
|
||||
public virtual int DefaultLabelNumber{ get{ return base.LabelNumber; } }
|
||||
public new virtual string DefaultName{ get{ return null; } }
|
||||
public virtual int DefaultLabelNumber => base.LabelNumber;
|
||||
public new virtual string DefaultName => null;
|
||||
|
||||
public override int LabelNumber
|
||||
{
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ namespace Server.Factions
|
|||
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
|
||||
public Faction Faction
|
||||
{
|
||||
get{ return m_Faction; }
|
||||
get => m_Faction;
|
||||
set
|
||||
{
|
||||
m_Faction = value;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ namespace Server.Factions
|
|||
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
|
||||
public Faction Faction
|
||||
{
|
||||
get{ return m_Faction; }
|
||||
get => m_Faction;
|
||||
set
|
||||
{
|
||||
m_Faction = value;
|
||||
|
|
|
|||
|
|
@ -2,11 +2,7 @@ using System;
|
|||
|
||||
namespace Server {
|
||||
public sealed class BloodRose : PowerFactionItem {
|
||||
public override string DefaultName {
|
||||
get {
|
||||
return "blood rose";
|
||||
}
|
||||
}
|
||||
public override string DefaultName => "blood rose";
|
||||
|
||||
public BloodRose()
|
||||
: base( Utility.RandomList( 6378, 9035 ) ) {
|
||||
|
|
|
|||
|
|
@ -2,11 +2,7 @@ using System;
|
|||
|
||||
namespace Server {
|
||||
public sealed class ClarityPotion : PowerFactionItem {
|
||||
public override string DefaultName {
|
||||
get {
|
||||
return "clarity potion";
|
||||
}
|
||||
}
|
||||
public override string DefaultName => "clarity potion";
|
||||
|
||||
public ClarityPotion()
|
||||
: base( 3628 ) {
|
||||
|
|
|
|||
|
|
@ -2,11 +2,7 @@ using Server.Factions;
|
|||
|
||||
namespace Server {
|
||||
public sealed class GemOfEmpowerment : PowerFactionItem {
|
||||
public override string DefaultName {
|
||||
get {
|
||||
return "gem of empowerment";
|
||||
}
|
||||
}
|
||||
public override string DefaultName => "gem of empowerment";
|
||||
|
||||
public GemOfEmpowerment()
|
||||
: base( 7955 ) {
|
||||
|
|
|
|||
|
|
@ -35,17 +35,9 @@ namespace Server {
|
|||
private int _weight;
|
||||
private Type _type;
|
||||
|
||||
public int Weight {
|
||||
get {
|
||||
return _weight;
|
||||
}
|
||||
}
|
||||
public int Weight => _weight;
|
||||
|
||||
public Type Type {
|
||||
get {
|
||||
return _type;
|
||||
}
|
||||
}
|
||||
public Type Type => _type;
|
||||
|
||||
public WeightedItem( int weight, Type type ) {
|
||||
_weight = weight;
|
||||
|
|
|
|||
|
|
@ -5,11 +5,7 @@ using Server.Factions;
|
|||
|
||||
namespace Server {
|
||||
public sealed class StormsEye : PowerFactionItem {
|
||||
public override string DefaultName {
|
||||
get {
|
||||
return "storms eye";
|
||||
}
|
||||
}
|
||||
public override string DefaultName => "storms eye";
|
||||
|
||||
public StormsEye()
|
||||
: base( 3967 ) {
|
||||
|
|
|
|||
|
|
@ -4,11 +4,7 @@ using Server.Factions;
|
|||
|
||||
namespace Server {
|
||||
public sealed class UrnOfAscension : PowerFactionItem {
|
||||
public override string DefaultName {
|
||||
get {
|
||||
return "urn of ascension";
|
||||
}
|
||||
}
|
||||
public override string DefaultName => "urn of ascension";
|
||||
|
||||
public UrnOfAscension()
|
||||
: base( 9246 ) {
|
||||
|
|
|
|||
|
|
@ -36,82 +36,70 @@ namespace Server.Factions
|
|||
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
|
||||
public DateTime LastStolen
|
||||
{
|
||||
get{ return m_LastStolen; }
|
||||
set{ m_LastStolen = value; }
|
||||
get => m_LastStolen;
|
||||
set => m_LastStolen = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
|
||||
public DateTime GraceStart
|
||||
{
|
||||
get{ return m_GraceStart; }
|
||||
set{ m_GraceStart = value; }
|
||||
get => m_GraceStart;
|
||||
set => m_GraceStart = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
|
||||
public DateTime CorruptionStart
|
||||
{
|
||||
get{ return m_CorruptionStart; }
|
||||
set{ m_CorruptionStart = value; }
|
||||
get => m_CorruptionStart;
|
||||
set => m_CorruptionStart = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
|
||||
public DateTime PurificationStart
|
||||
{
|
||||
get{ return m_PurificationStart; }
|
||||
set{ m_PurificationStart = value; }
|
||||
get => m_PurificationStart;
|
||||
set => m_PurificationStart = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
|
||||
public Town Town
|
||||
{
|
||||
get{ return m_Town; }
|
||||
get => m_Town;
|
||||
set{ m_Town = value; Update(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
|
||||
public Faction Corrupted
|
||||
{
|
||||
get{ return m_Corrupted; }
|
||||
get => m_Corrupted;
|
||||
set{ m_Corrupted = value; Update(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
|
||||
public Faction Corrupting
|
||||
{
|
||||
get{ return m_Corrupting; }
|
||||
get => m_Corrupting;
|
||||
set{ m_Corrupting = value; Update(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
|
||||
public BaseMonolith LastMonolith
|
||||
{
|
||||
get{ return m_LastMonolith; }
|
||||
set{ m_LastMonolith = value; }
|
||||
get => m_LastMonolith;
|
||||
set => m_LastMonolith = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.Counselor )]
|
||||
public bool IsBeingCorrupted
|
||||
{
|
||||
get{ return ( m_LastMonolith is StrongholdMonolith && m_LastMonolith.Faction == m_Corrupting && m_Corrupting != null ); }
|
||||
}
|
||||
public bool IsBeingCorrupted => ( m_LastMonolith is StrongholdMonolith && m_LastMonolith.Faction == m_Corrupting && m_Corrupting != null );
|
||||
|
||||
[CommandProperty( AccessLevel.Counselor )]
|
||||
public bool IsCorrupted
|
||||
{
|
||||
get{ return ( m_Corrupted != null ); }
|
||||
}
|
||||
public bool IsCorrupted => ( m_Corrupted != null );
|
||||
|
||||
[CommandProperty( AccessLevel.Counselor )]
|
||||
public bool IsPurifying
|
||||
{
|
||||
get{ return ( m_PurificationStart != DateTime.MinValue ); }
|
||||
}
|
||||
public bool IsPurifying => ( m_PurificationStart != DateTime.MinValue );
|
||||
|
||||
[CommandProperty( AccessLevel.Counselor )]
|
||||
public bool IsCorrupting
|
||||
{
|
||||
get{ return ( m_Corrupting != null && m_Corrupting != m_Corrupted ); }
|
||||
}
|
||||
public bool IsCorrupting => ( m_Corrupting != null && m_Corrupting != m_Corrupted );
|
||||
|
||||
public void Update()
|
||||
{
|
||||
|
|
@ -456,6 +444,6 @@ namespace Server.Factions
|
|||
|
||||
private static List<Sigil> m_Sigils = new List<Sigil>();
|
||||
|
||||
public static List<Sigil> Sigils{ get{ return m_Sigils; } }
|
||||
public static List<Sigil> Sigils => m_Sigils;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,10 +2,7 @@ namespace Server.Factions
|
|||
{
|
||||
public class Silver : Item
|
||||
{
|
||||
public override double DefaultWeight
|
||||
{
|
||||
get { return 0.02; }
|
||||
}
|
||||
public override double DefaultWeight => 0.02;
|
||||
|
||||
[Constructible]
|
||||
public Silver() : this( 1 )
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ namespace Server.Factions
|
|||
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
|
||||
public Town Town
|
||||
{
|
||||
get{ return m_Town; }
|
||||
get => m_Town;
|
||||
set
|
||||
{
|
||||
m_Town = value;
|
||||
|
|
|
|||
|
|
@ -24,39 +24,36 @@ namespace Server.Factions
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Faction Faction
|
||||
{
|
||||
get{ return m_Faction; }
|
||||
set{ m_Faction = value; }
|
||||
get => m_Faction;
|
||||
set => m_Faction = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Mobile Placer
|
||||
{
|
||||
get{ return m_Placer; }
|
||||
set{ m_Placer = value; }
|
||||
get => m_Placer;
|
||||
set => m_Placer = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public DateTime TimeOfPlacement
|
||||
{
|
||||
get{ return m_TimeOfPlacement; }
|
||||
set{ m_TimeOfPlacement = value; }
|
||||
get => m_TimeOfPlacement;
|
||||
set => m_TimeOfPlacement = value;
|
||||
}
|
||||
|
||||
public virtual int EffectSound{ get{ return 0; } }
|
||||
public virtual int EffectSound => 0;
|
||||
|
||||
public virtual int SilverFromDisarm{ get{ return 100; } }
|
||||
public virtual int SilverFromDisarm => 100;
|
||||
|
||||
public virtual int MessageHue{ get{ return 0; } }
|
||||
public virtual int MessageHue => 0;
|
||||
|
||||
public virtual int AttackMessage{ get{ return 0; } }
|
||||
public virtual int DisarmMessage{ get{ return 0; } }
|
||||
public virtual int AttackMessage => 0;
|
||||
public virtual int DisarmMessage => 0;
|
||||
|
||||
public virtual AllowedPlacing AllowedPlacing{ get{ return AllowedPlacing.Everywhere; } }
|
||||
public virtual AllowedPlacing AllowedPlacing => AllowedPlacing.Everywhere;
|
||||
|
||||
public virtual TimeSpan ConcealPeriod
|
||||
{
|
||||
get{ return TimeSpan.FromMinutes( 1.0 ); }
|
||||
}
|
||||
public virtual TimeSpan ConcealPeriod => TimeSpan.FromMinutes( 1.0 );
|
||||
|
||||
public virtual TimeSpan DecayPeriod
|
||||
{
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ namespace Server.Factions
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Faction Faction
|
||||
{
|
||||
get{ return m_Faction; }
|
||||
get => m_Faction;
|
||||
set
|
||||
{
|
||||
m_Faction = value;
|
||||
|
|
|
|||
|
|
@ -7,8 +7,8 @@ namespace Server.Factions
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int Charges
|
||||
{
|
||||
get{ return m_Charges; }
|
||||
set{ m_Charges = value; }
|
||||
get => m_Charges;
|
||||
set => m_Charges = value;
|
||||
}
|
||||
|
||||
public override int LabelNumber => 1041508; // a faction trap removal kit
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ namespace Server.Factions
|
|||
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
|
||||
public Faction Faction
|
||||
{
|
||||
get{ return m_Faction; }
|
||||
get => m_Faction;
|
||||
set
|
||||
{
|
||||
m_Faction = value;
|
||||
|
|
|
|||
|
|
@ -18,19 +18,16 @@ namespace Server.Factions
|
|||
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
|
||||
public Faction Faction
|
||||
{
|
||||
get{ return m_Faction; }
|
||||
get => m_Faction;
|
||||
set{ Unregister(); m_Faction = value; Register(); }
|
||||
}
|
||||
|
||||
public Orders Orders
|
||||
{
|
||||
get{ return m_Orders; }
|
||||
}
|
||||
public Orders Orders => m_Orders;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
|
||||
public Town Town
|
||||
{
|
||||
get{ return m_Town; }
|
||||
get => m_Town;
|
||||
set{ Unregister(); m_Town = value; Register(); }
|
||||
}
|
||||
|
||||
|
|
@ -48,10 +45,7 @@ namespace Server.Factions
|
|||
|
||||
public abstract GuardAI GuardAI{ get; }
|
||||
|
||||
protected override BaseAI ForcedAI
|
||||
{
|
||||
get { return new FactionGuardAI( this ); }
|
||||
}
|
||||
protected override BaseAI ForcedAI => new FactionGuardAI( this );
|
||||
|
||||
public override TimeSpan ReacquireDelay => TimeSpan.FromSeconds( 2.0 );
|
||||
|
||||
|
|
@ -442,7 +436,7 @@ namespace Server.Factions
|
|||
|
||||
public Mobile Rider
|
||||
{
|
||||
get{ return m_Item.Rider; }
|
||||
get => m_Item.Rider;
|
||||
set{}
|
||||
}
|
||||
|
||||
|
|
@ -461,7 +455,7 @@ namespace Server.Factions
|
|||
private Mobile m_Rider;
|
||||
private VirtualMount m_Mount;
|
||||
|
||||
public Mobile Rider{ get{ return m_Rider; } }
|
||||
public Mobile Rider => m_Rider;
|
||||
|
||||
public VirtualMountItem( Mobile mob ) : base( 0x3EA0 )
|
||||
{
|
||||
|
|
@ -471,10 +465,7 @@ namespace Server.Factions
|
|||
m_Mount = new VirtualMount( this );
|
||||
}
|
||||
|
||||
public IMount Mount
|
||||
{
|
||||
get{ return m_Mount; }
|
||||
}
|
||||
public IMount Mount => m_Mount;
|
||||
|
||||
public VirtualMountItem( Serial serial ) : base( serial )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -30,9 +30,9 @@ namespace Server.Factions
|
|||
private TimeSpan m_Hold;
|
||||
private int m_Chance;
|
||||
|
||||
public Type Spell{ get{ return m_Spell; } }
|
||||
public TimeSpan Hold{ get{ return m_Hold; } }
|
||||
public int Chance{ get{ return m_Chance; } }
|
||||
public Type Spell => m_Spell;
|
||||
public TimeSpan Hold => m_Hold;
|
||||
public int Chance => m_Chance;
|
||||
|
||||
public ComboEntry( Type spell ) : this( spell, 100, TimeSpan.Zero )
|
||||
{
|
||||
|
|
@ -55,8 +55,8 @@ namespace Server.Factions
|
|||
private int m_Mana;
|
||||
private ComboEntry[] m_Entries;
|
||||
|
||||
public int Mana{ get{ return m_Mana; } }
|
||||
public ComboEntry[] Entries{ get{ return m_Entries; } }
|
||||
public int Mana => m_Mana;
|
||||
public ComboEntry[] Entries => m_Entries;
|
||||
|
||||
public SpellCombo( int mana, params ComboEntry[] entries )
|
||||
{
|
||||
|
|
@ -121,15 +121,9 @@ namespace Server.Factions
|
|||
return ( ( m_Guard.GuardAI & flag ) == flag );
|
||||
}
|
||||
|
||||
public bool IsDamaged
|
||||
{
|
||||
get{ return ( m_Guard.Hits < m_Guard.HitsMax ); }
|
||||
}
|
||||
public bool IsDamaged => ( m_Guard.Hits < m_Guard.HitsMax );
|
||||
|
||||
public bool IsPoisoned
|
||||
{
|
||||
get{ return m_Guard.Poisoned; }
|
||||
}
|
||||
public bool IsPoisoned => m_Guard.Poisoned;
|
||||
|
||||
public TimeSpan TimeUntilBandage
|
||||
{
|
||||
|
|
|
|||
|
|
@ -21,8 +21,10 @@ namespace Server.Factions.AI
|
|||
private Faction m_Faction;
|
||||
private ReactionType m_Type;
|
||||
|
||||
public Faction Faction{ get{ return m_Faction; } }
|
||||
public ReactionType Type{ get{ return m_Type; } set{ m_Type = value; } }
|
||||
public Faction Faction => m_Faction;
|
||||
public ReactionType Type{ get => m_Type;
|
||||
set => m_Type = value;
|
||||
}
|
||||
|
||||
public Reaction( Faction faction, ReactionType type )
|
||||
{
|
||||
|
|
@ -63,10 +65,14 @@ namespace Server.Factions.AI
|
|||
private MovementType m_Movement;
|
||||
private Mobile m_Follow;
|
||||
|
||||
public BaseFactionGuard Guard{ get{ return m_Guard; } }
|
||||
public BaseFactionGuard Guard => m_Guard;
|
||||
|
||||
public MovementType Movement{ get{ return m_Movement; } set{ m_Movement = value; } }
|
||||
public Mobile Follow{ get{ return m_Follow; } set{ m_Follow = value; } }
|
||||
public MovementType Movement{ get => m_Movement;
|
||||
set => m_Movement = value;
|
||||
}
|
||||
public Mobile Follow{ get => m_Follow;
|
||||
set => m_Follow = value;
|
||||
}
|
||||
|
||||
public Reaction GetReaction( Faction faction )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@ namespace Server.Factions
|
|||
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
|
||||
public Town Town
|
||||
{
|
||||
get{ return m_Town; }
|
||||
get => m_Town;
|
||||
set{ Unregister(); m_Town = value; Register(); }
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.Counselor, AccessLevel.Administrator )]
|
||||
public Faction Faction
|
||||
{
|
||||
get{ return m_Faction; }
|
||||
get => m_Faction;
|
||||
set{ Unregister(); m_Faction = value; Register(); }
|
||||
}
|
||||
|
||||
|
|
@ -43,7 +43,7 @@ namespace Server.Factions
|
|||
}
|
||||
|
||||
private List<SBInfo> m_SBInfos = new List<SBInfo>();
|
||||
protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
|
||||
protected override List<SBInfo> SBInfos => m_SBInfos;
|
||||
|
||||
public override void InitSBInfo()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -17,10 +17,7 @@ namespace Server.Factions
|
|||
SBInfos.Add( new SBFactionBottle() );
|
||||
}
|
||||
|
||||
public override VendorShoeType ShoeType
|
||||
{
|
||||
get{ return Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals; }
|
||||
}
|
||||
public override VendorShoeType ShoeType => Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals;
|
||||
|
||||
public override void InitOutfit()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -18,10 +18,7 @@ namespace Server.Factions
|
|||
{
|
||||
}
|
||||
|
||||
public override VendorShoeType ShoeType
|
||||
{
|
||||
get{ return Female ? VendorShoeType.ThighBoots : VendorShoeType.Boots; }
|
||||
}
|
||||
public override VendorShoeType ShoeType => Female ? VendorShoeType.ThighBoots : VendorShoeType.Boots;
|
||||
|
||||
public override int GetShoeHue()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -21,10 +21,7 @@ namespace Server.Factions
|
|||
SBInfos.Add( new SBFactionReagent() );
|
||||
}
|
||||
|
||||
public override VendorShoeType ShoeType
|
||||
{
|
||||
get{ return Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals; }
|
||||
}
|
||||
public override VendorShoeType ShoeType => Utility.RandomBool() ? VendorShoeType.Shoes : VendorShoeType.Sandals;
|
||||
|
||||
public override void InitOutfit()
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue