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

Fixes body expression style.

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 08:46:14 -07:00
parent 3f0a72a62f
commit 33f5e77a24
957 changed files with 7424 additions and 15973 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Scripts/Engines/BulkOrders/Books/BOBFilter.cs
View file

@ -7,10 +7,7 @@ namespace Server.Engines.BulkOrders
private int m_Material;
private int m_Quantity;
public bool IsDefault
{
get{ return ( m_Type == 0 && m_Quality == 0 && m_Material == 0 && m_Quantity == 0 ); }
}
public bool IsDefault => ( m_Type == 0 && m_Quality == 0 && m_Material == 0 && m_Quantity == 0 );
public void Clear()
{
@ -22,26 +19,26 @@ namespace Server.Engines.BulkOrders
public int Type
{
get{ return m_Type; }
set{ m_Type = value; }
get => m_Type;
set => m_Type = value;
}
public int Quality
{
get{ return m_Quality; }
set{ m_Quality = value; }
get => m_Quality;
set => m_Quality = value;
}
public int Material
{
get{ return m_Material; }
set{ m_Material = value; }
get => m_Material;
set => m_Material = value;
}
public int Quantity
{
get{ return m_Quantity; }
set{ m_Quantity = value; }
get => m_Quantity;
set => m_Quantity = value;
}
public BOBFilter()

14
Scripts/Engines/BulkOrders/Books/BOBLargeEntry.cs
View file

@ -9,12 +9,14 @@ namespace Server.Engines.BulkOrders
private int m_Price;
private BOBLargeSubEntry[] m_Entries;
public bool RequireExceptional{ get{ return m_RequireExceptional; } }
public BODType DeedType{ get{ return m_DeedType; } }
public BulkMaterialType Material{ get{ return m_Material; } }
public int AmountMax{ get{ return m_AmountMax; } }
public int Price{ get{ return m_Price; } set{ m_Price = value; } }
public BOBLargeSubEntry[] Entries{ get{ return m_Entries; } }
public bool RequireExceptional => m_RequireExceptional;
public BODType DeedType => m_DeedType;
public BulkMaterialType Material => m_Material;
public int AmountMax => m_AmountMax;
public int Price{ get => m_Price;
set => m_Price = value;
}
public BOBLargeSubEntry[] Entries => m_Entries;
public Item Reconstruct()
{

8
Scripts/Engines/BulkOrders/Books/BOBLargeSubEntry.cs
View file

@ -9,10 +9,10 @@ namespace Server.Engines.BulkOrders
private int m_Number;
private int m_Graphic;
public Type ItemType{ get{ return m_ItemType; } }
public int AmountCur{ get{ return m_AmountCur; } }
public int Number{ get{ return m_Number; } }
public int Graphic{ get{ return m_Graphic; } }
public Type ItemType => m_ItemType;
public int AmountCur => m_AmountCur;
public int Number => m_Number;
public int Graphic => m_Graphic;
public BOBLargeSubEntry( LargeBulkEntry lbe )
{

20
Scripts/Engines/BulkOrders/Books/BOBSmallEntry.cs
View file

@ -13,15 +13,17 @@ namespace Server.Engines.BulkOrders
private int m_Graphic;
private int m_Price;
public Type ItemType{ get{ return m_ItemType; } }
public bool RequireExceptional{ get{ return m_RequireExceptional; } }
public BODType DeedType{ get{ return m_DeedType; } }
public BulkMaterialType Material{ get{ return m_Material; } }
public int AmountCur{ get{ return m_AmountCur; } }
public int AmountMax{ get{ return m_AmountMax; } }
public int Number{ get{ return m_Number; } }
public int Graphic{ get{ return m_Graphic; } }
public int Price{ get{ return m_Price; } set{ m_Price = value; } }
public Type ItemType => m_ItemType;
public bool RequireExceptional => m_RequireExceptional;
public BODType DeedType => m_DeedType;
public BulkMaterialType Material => m_Material;
public int AmountCur => m_AmountCur;
public int AmountMax => m_AmountMax;
public int Number => m_Number;
public int Graphic => m_Graphic;
public int Price{ get => m_Price;
set => m_Price = value;
}
public Item Reconstruct()
{

20
Scripts/Engines/BulkOrders/Books/BulkOrderBook.cs
View file

@ -21,31 +21,25 @@ namespace Server.Engines.BulkOrders
[CommandProperty( AccessLevel.GameMaster )]
public string BookName
{
get{ return m_BookName; }
get => m_BookName;
set{ m_BookName = value; InvalidateProperties(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public SecureLevel Level
{
get{ return m_Level; }
set{ m_Level = value; }
get => m_Level;
set => m_Level = value;
}
public ArrayList Entries
{
get{ return m_Entries; }
}
public ArrayList Entries => m_Entries;
public BOBFilter Filter
{
get{ return m_Filter; }
}
public BOBFilter Filter => m_Filter;
public int ItemCount
{
get{ return m_ItemCount; }
set{ m_ItemCount = value; }
get => m_ItemCount;
set => m_ItemCount = value;
}
[Constructible]

12
Scripts/Engines/BulkOrders/LargeBOD.cs
View file

@ -12,15 +12,19 @@ namespace Server.Engines.BulkOrders
private LargeBulkEntry[] m_Entries;
[CommandProperty( AccessLevel.GameMaster )]
public int AmountMax{ get{ return m_AmountMax; } set{ m_AmountMax = value; InvalidateProperties(); } }
public int AmountMax{ get => m_AmountMax;
set{ m_AmountMax = value; InvalidateProperties(); } }
[CommandProperty( AccessLevel.GameMaster )]
public bool RequireExceptional{ get{ return m_RequireExceptional; } set{ m_RequireExceptional = value; InvalidateProperties(); } }
public bool RequireExceptional{ get => m_RequireExceptional;
set{ m_RequireExceptional = value; InvalidateProperties(); } }
[CommandProperty( AccessLevel.GameMaster )]
public BulkMaterialType Material{ get{ return m_Material; } set{ m_Material = value; InvalidateProperties(); } }
public BulkMaterialType Material{ get => m_Material;
set{ m_Material = value; InvalidateProperties(); } }
public LargeBulkEntry[] Entries{ get{ return m_Entries; } set{ m_Entries = value; InvalidateProperties(); } }
public LargeBulkEntry[] Entries{ get => m_Entries;
set{ m_Entries = value; InvalidateProperties(); } }
[CommandProperty( AccessLevel.GameMaster )]
public bool Complete

119
Scripts/Engines/BulkOrders/LargeBulkEntry.cs
View file

@ -9,120 +9,57 @@ namespace Server.Engines.BulkOrders
private int m_Amount;
private SmallBulkEntry m_Details;
public LargeBOD Owner{ get{ return m_Owner; } set{ m_Owner = value; } }
public int Amount{ get{ return m_Amount; } set{ m_Amount = value; if ( m_Owner != null ) m_Owner.InvalidateProperties(); } }
public SmallBulkEntry Details{ get{ return m_Details; } }
public static SmallBulkEntry[] LargeRing
{
get{ return GetEntries( "Blacksmith", "largering" ); }
public LargeBOD Owner{ get => m_Owner;
set => m_Owner = value;
}
public int Amount{ get => m_Amount;
set{ m_Amount = value; if ( m_Owner != null ) m_Owner.InvalidateProperties(); } }
public SmallBulkEntry Details => m_Details;
public static SmallBulkEntry[] LargePlate
{
get{ return GetEntries( "Blacksmith", "largeplate" ); }
}
public static SmallBulkEntry[] LargeRing => GetEntries( "Blacksmith", "largering" );
public static SmallBulkEntry[] LargeChain
{
get{ return GetEntries( "Blacksmith", "largechain" ); }
}
public static SmallBulkEntry[] LargePlate => GetEntries( "Blacksmith", "largeplate" );
public static SmallBulkEntry[] LargeAxes
{
get{ return GetEntries( "Blacksmith", "largeaxes" ); }
}
public static SmallBulkEntry[] LargeChain => GetEntries( "Blacksmith", "largechain" );
public static SmallBulkEntry[] LargeFencing
{
get{ return GetEntries( "Blacksmith", "largefencing" ); }
}
public static SmallBulkEntry[] LargeAxes => GetEntries( "Blacksmith", "largeaxes" );
public static SmallBulkEntry[] LargeMaces
{
get{ return GetEntries( "Blacksmith", "largemaces" ); }
}
public static SmallBulkEntry[] LargeFencing => GetEntries( "Blacksmith", "largefencing" );
public static SmallBulkEntry[] LargePolearms
{
get{ return GetEntries( "Blacksmith", "largepolearms" ); }
}
public static SmallBulkEntry[] LargeMaces => GetEntries( "Blacksmith", "largemaces" );
public static SmallBulkEntry[] LargeSwords
{
get{ return GetEntries( "Blacksmith", "largeswords" ); }
}
public static SmallBulkEntry[] LargePolearms => GetEntries( "Blacksmith", "largepolearms" );
public static SmallBulkEntry[] LargeSwords => GetEntries( "Blacksmith", "largeswords" );
public static SmallBulkEntry[] BoneSet
{
get{ return GetEntries( "Tailoring", "boneset" ); }
}
public static SmallBulkEntry[] BoneSet => GetEntries( "Tailoring", "boneset" );
public static SmallBulkEntry[] Farmer
{
get{ return GetEntries( "Tailoring", "farmer" ); }
}
public static SmallBulkEntry[] Farmer => GetEntries( "Tailoring", "farmer" );
public static SmallBulkEntry[] FemaleLeatherSet
{
get{ return GetEntries( "Tailoring", "femaleleatherset" ); }
}
public static SmallBulkEntry[] FemaleLeatherSet => GetEntries( "Tailoring", "femaleleatherset" );
public static SmallBulkEntry[] FisherGirl
{
get{ return GetEntries( "Tailoring", "fishergirl" ); }
}
public static SmallBulkEntry[] FisherGirl => GetEntries( "Tailoring", "fishergirl" );
public static SmallBulkEntry[] Gypsy
{
get{ return GetEntries( "Tailoring", "gypsy" ); }
}
public static SmallBulkEntry[] Gypsy => GetEntries( "Tailoring", "gypsy" );
public static SmallBulkEntry[] HatSet
{
get{ return GetEntries( "Tailoring", "hatset" ); }
}
public static SmallBulkEntry[] HatSet => GetEntries( "Tailoring", "hatset" );
public static SmallBulkEntry[] Jester
{
get{ return GetEntries( "Tailoring", "jester" ); }
}
public static SmallBulkEntry[] Jester => GetEntries( "Tailoring", "jester" );
public static SmallBulkEntry[] Lady
{
get{ return GetEntries( "Tailoring", "lady" ); }
}
public static SmallBulkEntry[] Lady => GetEntries( "Tailoring", "lady" );
public static SmallBulkEntry[] MaleLeatherSet
{
get{ return GetEntries( "Tailoring", "maleleatherset" ); }
}
public static SmallBulkEntry[] MaleLeatherSet => GetEntries( "Tailoring", "maleleatherset" );
public static SmallBulkEntry[] Pirate
{
get{ return GetEntries( "Tailoring", "pirate" ); }
}
public static SmallBulkEntry[] Pirate => GetEntries( "Tailoring", "pirate" );
public static SmallBulkEntry[] ShoeSet
{
get{ return GetEntries( "Tailoring", "shoeset" ); }
}
public static SmallBulkEntry[] ShoeSet => GetEntries( "Tailoring", "shoeset" );
public static SmallBulkEntry[] StuddedSet
{
get{ return GetEntries( "Tailoring", "studdedset" ); }
}
public static SmallBulkEntry[] StuddedSet => GetEntries( "Tailoring", "studdedset" );
public static SmallBulkEntry[] TownCrier
{
get{ return GetEntries( "Tailoring", "towncrier" ); }
}
public static SmallBulkEntry[] TownCrier => GetEntries( "Tailoring", "towncrier" );
public static SmallBulkEntry[] Wizard
{
get{ return GetEntries( "Tailoring", "wizard" ); }
}
public static SmallBulkEntry[] Wizard => GetEntries( "Tailoring", "wizard" );
private static Dictionary<string,Dictionary<string,SmallBulkEntry[]>> m_Cache;

18
Scripts/Engines/BulkOrders/Rewards.cs
View file

@ -10,8 +10,8 @@ namespace Server.Engines.BulkOrders
private int m_Points;
private Type[] m_Types;
public int Points{ get{ return m_Points; } }
public Type[] Types{ get{ return m_Types; } }
public int Points => m_Points;
public Type[] Types => m_Types;
public RewardType( int points, params Type[] types )
{
@ -37,9 +37,9 @@ namespace Server.Engines.BulkOrders
private ConstructCallback m_Constructor;
private int m_Type;
public int Weight{ get{ return m_Weight; } }
public ConstructCallback Constructor{ get{ return m_Constructor; } }
public int Type{ get{ return m_Type; } }
public int Weight => m_Weight;
public ConstructCallback Constructor => m_Constructor;
public int Type => m_Type;
public RewardItem( int weight, ConstructCallback constructor ) : this( weight, constructor, 0 )
{
@ -64,8 +64,8 @@ namespace Server.Engines.BulkOrders
private int m_Points;
private RewardItem[] m_Items;
public int Points{ get{ return m_Points; } }
public RewardItem[] Items{ get{ return m_Items; } }
public int Points => m_Points;
public RewardItem[] Items => m_Items;
public RewardGroup( int points, params RewardItem[] items )
{
@ -105,7 +105,9 @@ namespace Server.Engines.BulkOrders
{
private RewardGroup[] m_Groups;
public RewardGroup[] Groups{ get{ return m_Groups; } set{ m_Groups = value; } }
public RewardGroup[] Groups{ get => m_Groups;
set => m_Groups = value;
}
public abstract int ComputePoints( int quantity, bool exceptional, BulkMaterialType material, int itemCount, Type type );
public abstract int ComputeGold( int quantity, bool exceptional, BulkMaterialType material, int itemCount, Type type );

25
Scripts/Engines/BulkOrders/SmallBOD.cs
View file

@ -16,28 +16,37 @@ namespace Server.Engines.BulkOrders
private BulkMaterialType m_Material;
[CommandProperty( AccessLevel.GameMaster )]
public int AmountCur{ get{ return m_AmountCur; } set{ m_AmountCur = value; InvalidateProperties(); } }
public int AmountCur{ get => m_AmountCur;
set{ m_AmountCur = value; InvalidateProperties(); } }
[CommandProperty( AccessLevel.GameMaster )]
public int AmountMax{ get{ return m_AmountMax; } set{ m_AmountMax = value; InvalidateProperties(); } }
public int AmountMax{ get => m_AmountMax;
set{ m_AmountMax = value; InvalidateProperties(); } }
[CommandProperty( AccessLevel.GameMaster )]
public Type Type{ get{ return m_Type; } set{ m_Type = value; } }
public Type Type{ get => m_Type;
set => m_Type = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Number{ get{ return m_Number; } set{ m_Number = value; InvalidateProperties(); } }
public int Number{ get => m_Number;
set{ m_Number = value; InvalidateProperties(); } }
[CommandProperty( AccessLevel.GameMaster )]
public int Graphic{ get{ return m_Graphic; } set{ m_Graphic = value; } }
public int Graphic{ get => m_Graphic;
set => m_Graphic = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool RequireExceptional{ get{ return m_RequireExceptional; } set{ m_RequireExceptional = value; InvalidateProperties(); } }
public bool RequireExceptional{ get => m_RequireExceptional;
set{ m_RequireExceptional = value; InvalidateProperties(); } }
[CommandProperty( AccessLevel.GameMaster )]
public BulkMaterialType Material{ get{ return m_Material; } set{ m_Material = value; InvalidateProperties(); } }
public BulkMaterialType Material{ get => m_Material;
set{ m_Material = value; InvalidateProperties(); } }
[CommandProperty( AccessLevel.GameMaster )]
public bool Complete{ get{ return ( m_AmountCur == m_AmountMax ); } }
public bool Complete => ( m_AmountCur == m_AmountMax );
public override int LabelNumber => 1045151; // a bulk order deed

26
Scripts/Engines/BulkOrders/SmallBulkEntry.cs
View file

@ -10,9 +10,9 @@ namespace Server.Engines.BulkOrders
private int m_Number;
private int m_Graphic;
public Type Type{ get{ return m_Type; } }
public int Number{ get{ return m_Number; } }
public int Graphic{ get{ return m_Graphic; } }
public Type Type => m_Type;
public int Number => m_Number;
public int Graphic => m_Graphic;
public SmallBulkEntry( Type type, int number, int graphic )
{
@ -21,25 +21,13 @@ namespace Server.Engines.BulkOrders
m_Graphic = graphic;
}
public static SmallBulkEntry[] BlacksmithWeapons
{
get{ return GetEntries( "Blacksmith", "weapons" ); }
}
public static SmallBulkEntry[] BlacksmithWeapons => GetEntries( "Blacksmith", "weapons" );
public static SmallBulkEntry[] BlacksmithArmor
{
get{ return GetEntries( "Blacksmith", "armor" ); }
}
public static SmallBulkEntry[] BlacksmithArmor => GetEntries( "Blacksmith", "armor" );
public static SmallBulkEntry[] TailorCloth
{
get{ return GetEntries( "Tailoring", "cloth" ); }
}
public static SmallBulkEntry[] TailorCloth => GetEntries( "Tailoring", "cloth" );
public static SmallBulkEntry[] TailorLeather
{
get{ return GetEntries( "Tailoring", "leather" ); }
}
public static SmallBulkEntry[] TailorLeather => GetEntries( "Tailoring", "leather" );
private static Dictionary<string, Dictionary<string, SmallBulkEntry[]>> m_Cache;

3
Scripts/Engines/CannedEvil/ChampionSkull.cs
View file

@ -7,7 +7,8 @@ namespace Server.Items
private ChampionSkullType m_Type;
[CommandProperty( AccessLevel.GameMaster )]
public ChampionSkullType Type{ get{ return m_Type; } set{ m_Type = value; InvalidateProperties(); } }
public ChampionSkullType Type{ get => m_Type;
set{ m_Type = value; InvalidateProperties(); } }
public override int LabelNumber => 1049479 + (int)m_Type;

8
Scripts/Engines/CannedEvil/ChampionSkullBrazier.cs
View file

@ -11,13 +11,15 @@ namespace Server.Engines.CannedEvil
private Item m_Skull;
[CommandProperty( AccessLevel.GameMaster )]
public ChampionSkullPlatform Platform{ get{ return m_Platform; } }
public ChampionSkullPlatform Platform => m_Platform;
[CommandProperty( AccessLevel.GameMaster )]
public ChampionSkullType Type{ get{ return m_Type; } set{ m_Type = value; InvalidateProperties(); } }
public ChampionSkullType Type{ get => m_Type;
set{ m_Type = value; InvalidateProperties(); } }
[CommandProperty( AccessLevel.GameMaster )]
public Item Skull{ get{ return m_Skull; } set{ m_Skull = value; if ( m_Platform != null ) m_Platform.Validate(); } }
public Item Skull{ get => m_Skull;
set{ m_Skull = value; if ( m_Platform != null ) m_Platform.Validate(); } }
public override int LabelNumber => 1049489 + (int)m_Type;

113
Scripts/Engines/CannedEvil/ChampionSpawn.cs
View file

@ -12,14 +12,8 @@ namespace Server.Engines.CannedEvil
[CommandProperty( AccessLevel.GameMaster )]
public int SpawnSzMod
{
get
{
return ( m_SPawnSzMod < 1 || m_SPawnSzMod > 12 ) ? 12 : m_SPawnSzMod;
}
set
{
m_SPawnSzMod = ( value < 1 || value > 12 ) ? 12 : value;
}
get => ( m_SPawnSzMod < 1 || m_SPawnSzMod > 12 ) ? 12 : m_SPawnSzMod;
set => m_SPawnSzMod = ( value < 1 || value > 12 ) ? 12 : value;
}
private int m_SPawnSzMod;
@ -56,15 +50,15 @@ namespace Server.Engines.CannedEvil
[CommandProperty( AccessLevel.GameMaster )]
public bool ConfinedRoaming
{
get { return m_ConfinedRoaming; }
set { m_ConfinedRoaming = value; }
get => m_ConfinedRoaming;
set => m_ConfinedRoaming = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool HasBeenAdvanced
{
get { return m_HasBeenAdvanced; }
set { m_HasBeenAdvanced = value; }
get => m_HasBeenAdvanced;
set => m_HasBeenAdvanced = value;
}
[Constructible]
@ -123,17 +117,14 @@ namespace Server.Engines.CannedEvil
[CommandProperty( AccessLevel.GameMaster )]
public bool RandomizeType
{
get { return m_RandomizeType; }
set { m_RandomizeType = value; }
get => m_RandomizeType;
set => m_RandomizeType = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Kills
{
get
{
return m_Kills;
}
get => m_Kills;
set
{
m_Kills = value;
@ -144,10 +135,7 @@ namespace Server.Engines.CannedEvil
[CommandProperty( AccessLevel.GameMaster )]
public Rectangle2D SpawnArea
{
get
{
return m_SpawnArea;
}
get => m_SpawnArea;
set
{
m_SpawnArea = value;
@ -159,58 +147,31 @@ namespace Server.Engines.CannedEvil
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan RestartDelay
{
get
{
return m_RestartDelay;
}
set
{
m_RestartDelay = value;
}
get => m_RestartDelay;
set => m_RestartDelay = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public DateTime RestartTime
{
get
{
return m_RestartTime;
}
}
public DateTime RestartTime => m_RestartTime;
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan ExpireDelay
{
get
{
return m_ExpireDelay;
}
set
{
m_ExpireDelay = value;
}
get => m_ExpireDelay;
set => m_ExpireDelay = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public DateTime ExpireTime
{
get
{
return m_ExpireTime;
}
set
{
m_ExpireTime = value;
}
get => m_ExpireTime;
set => m_ExpireTime = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public ChampionSpawnType Type
{
get
{
return m_Type;
}
get => m_Type;
set
{
m_Type = value;
@ -221,10 +182,7 @@ namespace Server.Engines.CannedEvil
[CommandProperty( AccessLevel.GameMaster )]
public bool Active
{
get
{
return m_Active;
}
get => m_Active;
set
{
if ( value )
@ -239,23 +197,14 @@ namespace Server.Engines.CannedEvil
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Champion
{
get
{
return m_Champion;
}
set
{
m_Champion = value;
}
get => m_Champion;
set => m_Champion = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Level
{
get
{
return m_RedSkulls.Count;
}
get => m_RedSkulls.Count;
set
{
for( int i = m_RedSkulls.Count - 1; i >= value; --i )
@ -281,13 +230,7 @@ namespace Server.Engines.CannedEvil
}
}
public int MaxKills
{
get
{
return ( m_SPawnSzMod * ( 250 / 12 ) ) - ( Level * m_SPawnSzMod );
}
}
public int MaxKills => ( m_SPawnSzMod * ( 250 / 12 ) ) - ( Level * m_SPawnSzMod );
public bool IsChampionSpawn( Mobile m )
{
@ -1254,10 +1197,7 @@ namespace Server.Engines.CannedEvil
private ChampionSpawn m_Spawn;
public ChampionSpawn ChampionSpawn
{
get { return m_Spawn; }
}
public ChampionSpawn ChampionSpawn => m_Spawn;
public ChampionSpawnRegion( ChampionSpawn spawn ) : base( null, spawn.Map, Region.Find( spawn.Location, spawn.Map ), spawn.SpawnArea )
{
@ -1282,10 +1222,7 @@ namespace Server.Engines.CannedEvil
public ChampionSpawn Spawn => m_Spawn;
public override string DefaultName
{
get { return "Idol of the Champion"; }
}
public override string DefaultName => "Idol of the Champion";
public IdolOfTheChampion( ChampionSpawn spawn ): base( 0x1F18 )

33
Scripts/Engines/Chat/Channel.cs
View file

@ -28,10 +28,7 @@ namespace Server.Engines.Chat
public string Name
{
get
{
return m_Name;
}
get => m_Name;
set
{
SendCommand( ChatCommand.RemoveChannel, m_Name );
@ -43,10 +40,7 @@ namespace Server.Engines.Chat
public string Password
{
get
{
return m_Password;
}
get => m_Password;
set
{
string newValue = null;
@ -238,10 +232,7 @@ namespace Server.Engines.Chat
public bool VoiceRestricted
{
get
{
return m_VoiceRestricted;
}
get => m_VoiceRestricted;
set
{
m_VoiceRestricted = value;
@ -255,14 +246,8 @@ namespace Server.Engines.Chat
public bool AlwaysAvailable
{
get
{
return m_AlwaysAvailable;
}
set
{
m_AlwaysAvailable = value;
}
get => m_AlwaysAvailable;
set => m_AlwaysAvailable = value;
}
public void AddVoiced( ChatUser user )
@ -461,13 +446,7 @@ namespace Server.Engines.Chat
private static List<Channel> m_Channels = new List<Channel>();
public static List<Channel> Channels
{
get
{
return m_Channels;
}
}
public static List<Channel> Channels => m_Channels;
public static void SendChannelsTo( ChatUser user )
{

4
Scripts/Engines/Chat/Chat.cs
View file

@ -11,8 +11,8 @@ namespace Server.Engines.Chat
public static bool Enabled
{
get{ return m_Enabled; }
set{ m_Enabled = value; }
get => m_Enabled;
set => m_Enabled = value;
}
public static void Initialize()

6
Scripts/Engines/Chat/ChatActionHandler.cs
View file

@ -8,9 +8,9 @@ namespace Server.Engines.Chat
private bool m_RequireConference;
private OnChatAction m_Callback;
public bool RequireModerator{ get{ return m_RequireModerator; } }
public bool RequireConference{ get{ return m_RequireConference; } }
public OnChatAction Callback{ get{ return m_Callback; } }
public bool RequireModerator => m_RequireModerator;
public bool RequireConference => m_RequireConference;
public OnChatAction Callback => m_Callback;
public ChatActionHandler( bool requireModerator, bool requireConference, OnChatAction callback )
{

70
Scripts/Engines/Chat/ChatUser.cs
View file

@ -18,29 +18,11 @@ namespace Server.Engines.Chat
m_Ignoring = new List<ChatUser>();
}
public Mobile Mobile
{
get
{
return m_Mobile;
}
}
public Mobile Mobile => m_Mobile;
public List<ChatUser> Ignored
{
get
{
return m_Ignored;
}
}
public List<ChatUser> Ignored => m_Ignored;
public List<ChatUser> Ignoring
{
get
{
return m_Ignoring;
}
}
public List<ChatUser> Ignoring => m_Ignoring;
public string Username
{
@ -60,46 +42,22 @@ namespace Server.Engines.Chat
public Channel CurrentChannel
{
get
{
return m_Channel;
}
set
{
m_Channel = value;
}
get => m_Channel;
set => m_Channel = value;
}
public bool IsOnline
{
get
{
return ( m_Mobile.NetState != null );
}
}
public bool IsOnline => ( m_Mobile.NetState != null );
public bool Anonymous
{
get
{
return m_Anonymous;
}
set
{
m_Anonymous = value;
}
get => m_Anonymous;
set => m_Anonymous = value;
}
public bool IgnorePrivateMessage
{
get
{
return m_IgnorePrivateMessage;
}
set
{
m_IgnorePrivateMessage = value;
}
get => m_IgnorePrivateMessage;
set => m_IgnorePrivateMessage = value;
}
public const char NormalColorCharacter = '0';
@ -153,13 +111,7 @@ namespace Server.Engines.Chat
return m_Ignored.Contains( check );
}
public bool IsModerator
{
get
{
return ( m_Channel != null && m_Channel.IsModerator( this ) );
}
}
public bool IsModerator => ( m_Channel != null && m_Channel.IsModerator( this ) );
public void AddIgnored( ChatUser user )
{

4
Scripts/Engines/ConPVP/AcceptDuelGump.cs
View file

@ -120,8 +120,8 @@ namespace Server.Engines.ConPVP
public Mobile m_Ignored;
public DateTime m_Expire;
public Mobile Ignored{ get{ return m_Ignored; } }
public bool Expired{ get{ return ( DateTime.UtcNow >= m_Expire ); } }
public Mobile Ignored => m_Ignored;
public bool Expired => ( DateTime.UtcNow >= m_Expire );
private static TimeSpan ExpireDelay = TimeSpan.FromMinutes( 15.0 );

120
Scripts/Engines/ConPVP/Arena.cs
View file

@ -10,16 +10,16 @@ namespace Server.Engines.ConPVP
private bool m_IsPrivate;
[CommandProperty( AccessLevel.GameMaster )]
public Arena Arena{ get{ return m_Arena; } set{} }
public Arena Arena{ get => m_Arena;
set{} }
[CommandProperty( AccessLevel.GameMaster )]
public bool IsPrivate{ get{ return m_IsPrivate; } set{ m_IsPrivate = value; } }
public override string DefaultName
{
get { return "arena controller"; }
public bool IsPrivate{ get => m_IsPrivate;
set => m_IsPrivate = value;
}
public override string DefaultName => "arena controller";
[Constructible]
public ArenaController() : base( 0x1B7A )
{
@ -86,7 +86,9 @@ namespace Server.Engines.ConPVP
private static List<ArenaController> m_Instances = new List<ArenaController>();
public static List<ArenaController> Instances{ get{ return m_Instances; } set{ m_Instances = value; } }
public static List<ArenaController> Instances{ get => m_Instances;
set => m_Instances = value;
}
}
[PropertyObject]
@ -94,31 +96,47 @@ namespace Server.Engines.ConPVP
{
private Point3D[] m_Points;
public Point3D[] Points{ get{ return m_Points; } }
public Point3D[] Points => m_Points;
[CommandProperty( AccessLevel.GameMaster )]
public Point3D EdgeWest{ get{ return m_Points[0]; } set{ m_Points[0] = value; } }
public Point3D EdgeWest{ get => m_Points[0];
set => m_Points[0] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D EdgeEast{ get{ return m_Points[1]; } set{ m_Points[1] = value; } }
public Point3D EdgeEast{ get => m_Points[1];
set => m_Points[1] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D EdgeNorth{ get{ return m_Points[2]; } set{ m_Points[2] = value; } }
public Point3D EdgeNorth{ get => m_Points[2];
set => m_Points[2] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D EdgeSouth{ get{ return m_Points[3]; } set{ m_Points[3] = value; } }
public Point3D EdgeSouth{ get => m_Points[3];
set => m_Points[3] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D CornerNW{ get{ return m_Points[4]; } set{ m_Points[4] = value; } }
public Point3D CornerNW{ get => m_Points[4];
set => m_Points[4] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D CornerSE{ get{ return m_Points[5]; } set{ m_Points[5] = value; } }
public Point3D CornerSE{ get => m_Points[5];
set => m_Points[5] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D CornerSW{ get{ return m_Points[6]; } set{ m_Points[6] = value; } }
public Point3D CornerSW{ get => m_Points[6];
set => m_Points[6] = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D CornerNE{ get{ return m_Points[7]; } set{ m_Points[7] = value; } }
public Point3D CornerNE{ get => m_Points[7];
set => m_Points[7] = value;
}
public override string ToString()
{
@ -179,14 +197,14 @@ namespace Server.Engines.ConPVP
[CommandProperty( AccessLevel.GameMaster )]
public LadderController Ladder
{
get{ return m_Ladder; }
set{ m_Ladder = value; }
get => m_Ladder;
set => m_Ladder = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool IsGuarded
{
get{ return m_IsGuarded; }
get => m_IsGuarded;
set
{
m_IsGuarded = value;
@ -207,7 +225,7 @@ namespace Server.Engines.ConPVP
[CommandProperty( AccessLevel.GameMaster )]
public TournamentController Tournament
{
get{ return m_Tournament; }
get => m_Tournament;
set
{
if ( m_Tournament != null )
@ -223,21 +241,21 @@ namespace Server.Engines.ConPVP
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Announcer
{
get{ return m_Announcer; }
set{ m_Announcer = value; }
get => m_Announcer;
set => m_Announcer = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public string Name
{
get{ return m_Name; }
get => m_Name;
set{ m_Name = value; if ( m_Active ) m_Arenas.Sort(); }
}
[CommandProperty( AccessLevel.GameMaster )]
public Map Facet
{
get{ return m_Facet; }
get => m_Facet;
set
{
m_Facet = value;
@ -256,7 +274,9 @@ namespace Server.Engines.ConPVP
}
[CommandProperty( AccessLevel.GameMaster )]
public Rectangle2D Bounds{ get{ return m_Bounds; } set{ m_Bounds = value; } }
public Rectangle2D Bounds{ get => m_Bounds;
set => m_Bounds = value;
}
private SafeZone m_Region;
@ -279,7 +299,7 @@ namespace Server.Engines.ConPVP
[CommandProperty( AccessLevel.GameMaster )]
public Rectangle2D Zone
{
get{ return m_Zone; }
get => m_Zone;
set
{
m_Zone = value;
@ -302,31 +322,41 @@ namespace Server.Engines.ConPVP
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D Outside{ get{ return m_Outside; } set{ m_Outside = value; } }
public Point3D Outside{ get => m_Outside;
set => m_Outside = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D GateIn{ get{ return m_GateIn; } set{ m_GateIn = value; } }
public Point3D GateIn{ get => m_GateIn;
set => m_GateIn = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D GateOut{ get{ return m_GateOut; } set{ m_GateOut = value; if ( m_Teleporter != null ) m_Teleporter.Location = m_GateOut; } }
public Point3D GateOut{ get => m_GateOut;
set{ m_GateOut = value; if ( m_Teleporter != null ) m_Teleporter.Location = m_GateOut; } }
[CommandProperty( AccessLevel.GameMaster )]
public Point3D Wall{ get{ return m_Wall; } set{ m_Wall = value; } }
public Point3D Wall{ get => m_Wall;
set => m_Wall = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool IsOccupied{ get{ return ( m_Players.Count > 0 ); } }
public bool IsOccupied => ( m_Players.Count > 0 );
[CommandProperty( AccessLevel.GameMaster )]
public ArenaStartPoints Points{ get{ return m_Points; } set{} }
public ArenaStartPoints Points{ get => m_Points;
set{} }
public Item Teleporter{ get{ return m_Teleporter; } set{ m_Teleporter = value; } }
public Item Teleporter{ get => m_Teleporter;
set => m_Teleporter = value;
}
public List<Mobile> Players{ get{ return m_Players; } }
public List<Mobile> Players => m_Players;
[CommandProperty( AccessLevel.GameMaster )]
public bool Active
{
get{ return m_Active; }
get => m_Active;
set
{
if ( m_Active == value )
@ -567,7 +597,8 @@ namespace Server.Engines.ConPVP
}
[CommandProperty( AccessLevel.Administrator, AccessLevel.Administrator )]
public bool ForceEvict{ get{ return false; } set{ if ( value ) Evict(); } }
public bool ForceEvict{ get => false;
set{ if ( value ) Evict(); } }
public void Evict()
{
@ -662,7 +693,7 @@ namespace Server.Engines.ConPVP
private static List<Arena> m_Arenas = new List<Arena>();
public static List<Arena> Arenas{ get{ return m_Arenas; } }
public static List<Arena> Arenas => m_Arenas;
public static Arena FindArena( List<Mobile> players )
{
@ -765,20 +796,7 @@ namespace Server.Engines.ConPVP
public int m_VotesFor;
public int m_VotesAgainst;
public int Value
{
get
{
return m_VotesFor;
/*if ( m_VotesFor > m_VotesAgainst )
return m_VotesFor - m_VotesAgainst;
else if ( m_VotesFor > 0 )
return 1;
else
return 0;*/
}
}
public int Value => m_VotesFor;
public ArenaEntry( Arena arena )
{

5
Scripts/Engines/ConPVP/ArenaGump.cs
View file

@ -9,10 +9,7 @@ namespace Server.Engines.ConPVP
{
public class ArenasMoongate : Item
{
public override string DefaultName
{
get { return "arena moongate"; }
}
public override string DefaultName => "arena moongate";
[Constructible]
public ArenasMoongate() : base( 0x1FD4 )

48
Scripts/Engines/ConPVP/DuelContext.cs
View file

@ -34,19 +34,19 @@ namespace Server.Engines.ConPVP
private bool m_Rematch;
public bool Rematch{ get{ return m_Rematch; } }
public bool Rematch => m_Rematch;
public bool ReadyWait{ get{ return m_ReadyWait; } }
public int ReadyCount{ get{ return m_ReadyCount; } }
public bool ReadyWait => m_ReadyWait;
public int ReadyCount => m_ReadyCount;
public bool Registered{ get{ return m_Registered; } }
public bool Finished{ get{ return m_Finished; } }
public bool Started{ get{ return m_Started; } }
public bool Registered => m_Registered;
public bool Finished => m_Finished;
public bool Started => m_Started;
public Mobile Initiator{ get{ return m_Initiator; } }
public ArrayList Participants{ get{ return m_Participants; } }
public Ruleset Ruleset{ get{ return m_Ruleset; } }
public Arena Arena{ get{ return m_Arena; } }
public Mobile Initiator => m_Initiator;
public ArrayList Participants => m_Participants;
public Ruleset Ruleset => m_Ruleset;
public Arena Arena => m_Arena;
private bool CantDoAnything( Mobile mob )
{
@ -896,11 +896,13 @@ namespace Server.Engines.ConPVP
private Timer m_AutoTieTimer;
private bool m_Tied;
public bool Tied{ get{ return m_Tied; } }
public bool Tied => m_Tied;
private bool m_IsSuddenDeath;
public bool IsSuddenDeath{ get{ return m_IsSuddenDeath; } set{ m_IsSuddenDeath = value; } }
public bool IsSuddenDeath{ get => m_IsSuddenDeath;
set => m_IsSuddenDeath = value;
}
private Timer m_SDWarnTimer, m_SDActivateTimer;
@ -1664,8 +1666,8 @@ namespace Server.Engines.ConPVP
private bool m_StartedBeginCountdown;
private bool m_StartedReadyCountdown;
public bool StartedBeginCountdown{ get{ return m_StartedBeginCountdown; } }
public bool StartedReadyCountdown{ get{ return m_StartedReadyCountdown; } }
public bool StartedBeginCountdown => m_StartedBeginCountdown;
public bool StartedReadyCountdown => m_StartedReadyCountdown;
private class InternalWall : Item
{
@ -2000,9 +2002,9 @@ namespace Server.Engines.ConPVP
private Map m_Facet;
private DateTime m_Expire;
public Mobile Mobile{ get{ return m_Mobile; } }
public Point3D Location{ get{ return m_Location; } }
public Map Facet{ get{ return m_Facet; } }
public Mobile Mobile => m_Mobile;
public Point3D Location => m_Location;
public Map Facet => m_Facet;
public void Return()
{
@ -2036,7 +2038,7 @@ namespace Server.Engines.ConPVP
m_Expire = DateTime.UtcNow + TimeSpan.FromMinutes( 30.0 );
}
public bool Expired{ get{ return ( DateTime.UtcNow >= m_Expire ); } }
public bool Expired => ( DateTime.UtcNow >= m_Expire );
public void Update()
{
@ -2059,10 +2061,7 @@ namespace Server.Engines.ConPVP
{
private ArrayList m_Entries;
public override string DefaultName
{
get { return "return teleporter"; }
}
public override string DefaultName => "return teleporter";
public ExitTeleporter() : base( 0x1822 )
{
@ -2183,10 +2182,7 @@ namespace Server.Engines.ConPVP
{
private ExitTeleporter m_Teleporter;
public override string DefaultName
{
get { return "spectator moongate"; }
}
public override string DefaultName => "spectator moongate";
public ArenaMoongate( Point3D target, Map map, ExitTeleporter tp ) : base( target, map )
{

4
Scripts/Engines/ConPVP/DuelContextGump.cs
View file

@ -9,8 +9,8 @@ namespace Server.Engines.ConPVP
private Mobile m_From;
private DuelContext m_Context;
public Mobile From{ get{ return m_From; } }
public DuelContext Context{ get{ return m_Context; } }
public Mobile From => m_From;
public DuelContext Context => m_Context;
public string Center( string text )
{

89
Scripts/Engines/ConPVP/Games/BombingRun.cs
View file

@ -788,7 +788,8 @@ namespace Server.Engines.ConPVP
private bool m_North = false;
[CommandProperty( AccessLevel.GameMaster )]
public bool North { get { return m_North; } set { m_North = value; Remake(); } }
public bool North { get => m_North;
set { m_North = value; Remake(); } }
private static AddonComponent SetHue( AddonComponent ac, int hue )
{
@ -908,7 +909,7 @@ namespace Server.Engines.ConPVP
public BRTeamInfo Team
{
get { return m_Team; }
get => m_Team;
set
{
m_Team = value;
@ -1190,17 +1191,11 @@ namespace Server.Engines.ConPVP
return res;
}
public string Name
{
get { return m_Player.Name; }
}
public string Name => m_Player.Name;
public int Kills
{
get
{
return m_Kills;
}
get => m_Kills;
set
{
m_TeamInfo.Kills += ( value - m_Kills );
@ -1210,10 +1205,7 @@ namespace Server.Engines.ConPVP
public int Captures
{
get
{
return m_Captures;
}
get => m_Captures;
set
{
m_TeamInfo.Captures += ( value - m_Captures );
@ -1223,10 +1215,7 @@ namespace Server.Engines.ConPVP
public int Score
{
get
{
return m_Score;
}
get => m_Score;
set
{
m_TeamInfo.Score += ( value - m_Score );
@ -1277,38 +1266,40 @@ namespace Server.Engines.ConPVP
return res;
}
public string Name
{
get { return String.Format( "{0} Team", m_Name ); }
}
public string Name => String.Format( "{0} Team", m_Name );
public BRGame Game { get { return m_Game; } set { m_Game = value; } }
public BRGame Game { get => m_Game;
set => m_Game = value;
}
public int TeamID => m_TeamID;
public int Kills { get { return m_Kills; } set { m_Kills = value; } }
public int Captures { get { return m_Captures; } set { m_Captures = value; } }
public int Kills { get => m_Kills;
set => m_Kills = value;
}
public int Captures { get => m_Captures;
set => m_Captures = value;
}
public int Score { get { return m_Score; } set { m_Score = value; } }
public int Score { get => m_Score;
set => m_Score = value;
}
private BRPlayerInfo m_Leader;
public BRPlayerInfo Leader
{
get { return m_Leader; }
set { m_Leader = value; }
get => m_Leader;
set => m_Leader = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public BRBoard Board
{
get { return m_Board; }
set { m_Board = value; }
get => m_Board;
set => m_Board = value;
}
public Hashtable Players
{
get { return m_Players; }
}
public Hashtable Players => m_Players;
public BRPlayerInfo this[Mobile mob]
{
@ -1327,21 +1318,21 @@ namespace Server.Engines.ConPVP
[CommandProperty( AccessLevel.GameMaster )]
public int Color
{
get { return m_Color; }
set { m_Color = value; }
get => m_Color;
set => m_Color = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public string TeamName
{
get { return m_Name; }
set { m_Name = value; }
get => m_Name;
set => m_Name = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public BRGoal Goal
{
get { return m_Goal; }
get => m_Goal;
set
{
m_Goal = value;
@ -1423,29 +1414,33 @@ namespace Server.Engines.ConPVP
public BRTeamInfo[] TeamInfo => m_TeamInfo;
[CommandProperty( AccessLevel.GameMaster )]
public BRTeamInfo Team1 { get { return m_TeamInfo[0]; } set { } }
public BRTeamInfo Team1 { get => m_TeamInfo[0];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public BRTeamInfo Team2 { get { return m_TeamInfo[1]; } set { } }
public BRTeamInfo Team2 { get => m_TeamInfo[1];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public BRTeamInfo Team3 { get { return m_TeamInfo[2]; } set { } }
public BRTeamInfo Team3 { get => m_TeamInfo[2];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public BRTeamInfo Team4 { get { return m_TeamInfo[3]; } set { } }
public BRTeamInfo Team4 { get => m_TeamInfo[3];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan Duration
{
get { return m_Duration; }
set { m_Duration = value; }
get => m_Duration;
set => m_Duration = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D BombHome
{
get { return m_BombHome; }
set { m_BombHome = value; }
get => m_BombHome;
set => m_BombHome = value;
}
public override string Title => "Bombing Run";

113
Scripts/Engines/ConPVP/Games/CTF.cs
View file

@ -13,10 +13,7 @@ namespace Server.Engines.ConPVP
{
public CTFTeamInfo m_TeamInfo;
public override string DefaultName
{
get { return "scoreboard"; }
}
public override string DefaultName => "scoreboard";
[Constructible]
public CTFBoard()
@ -233,10 +230,7 @@ namespace Server.Engines.ConPVP
{
public CTFTeamInfo m_TeamInfo;
public override string DefaultName
{
get { return "old people cookies"; }
}
public override string DefaultName => "old people cookies";
public Mobile m_Fragger;
public DateTime m_FragTime;
@ -548,17 +542,11 @@ namespace Server.Engines.ConPVP
public Mobile Player => m_Player;
string IRankedCTF.Name
{
get { return m_Player.Name; }
}
string IRankedCTF.Name => m_Player.Name;
public int Kills
{
get
{
return m_Kills;
}
get => m_Kills;
set
{
m_TeamInfo.Kills += ( value - m_Kills );
@ -568,10 +556,7 @@ namespace Server.Engines.ConPVP
public int Captures
{
get
{
return m_Captures;
}
get => m_Captures;
set
{
m_TeamInfo.Captures += ( value - m_Captures );
@ -581,10 +566,7 @@ namespace Server.Engines.ConPVP
public int Score
{
get
{
return m_Score;
}
get => m_Score;
set
{
m_TeamInfo.Score += ( value - m_Score );
@ -623,38 +605,40 @@ namespace Server.Engines.ConPVP
private Dictionary<Mobile, CTFPlayerInfo> m_Players;
string IRankedCTF.Name
{
get { return String.Format( "{0} Team", m_Name ); }
}
string IRankedCTF.Name => String.Format( "{0} Team", m_Name );
public CTFGame Game { get { return m_Game; } set { m_Game = value; } }
public CTFGame Game { get => m_Game;
set => m_Game = value;
}
public int TeamID => m_TeamID;
public int Kills { get { return m_Kills; } set { m_Kills = value; } }
public int Captures { get { return m_Captures; } set { m_Captures = value; } }
public int Kills { get => m_Kills;
set => m_Kills = value;
}
public int Captures { get => m_Captures;
set => m_Captures = value;
}
public int Score { get { return m_Score; } set { m_Score = value; } }
public int Score { get => m_Score;
set => m_Score = value;
}
private CTFPlayerInfo m_Leader;
public CTFPlayerInfo Leader
{
get { return m_Leader; }
set { m_Leader = value; }
get => m_Leader;
set => m_Leader = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public CTFBoard Board
{
get { return m_Board; }
set { m_Board = value; }
get => m_Board;
set => m_Board = value;
}
public Dictionary<Mobile, CTFPlayerInfo> Players
{
get { return m_Players; }
}
public Dictionary<Mobile, CTFPlayerInfo> Players => m_Players;
public CTFPlayerInfo this[Mobile mob]
{
@ -673,29 +657,29 @@ namespace Server.Engines.ConPVP
[CommandProperty( AccessLevel.GameMaster )]
public int Color
{
get { return m_Color; }
set { m_Color = value; }
get => m_Color;
set => m_Color = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public string Name
{
get { return m_Name; }
set { m_Name = value; }
get => m_Name;
set => m_Name = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public CTFFlag Flag
{
get { return m_Flag; }
set { m_Flag = value; }
get => m_Flag;
set => m_Flag = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D Origin
{
get { return m_Origin; }
set { m_Origin = value; }
get => m_Origin;
set => m_Origin = value;
}
public CTFTeamInfo( int teamID )
@ -787,40 +771,45 @@ namespace Server.Engines.ConPVP
public CTFTeamInfo[] TeamInfo => m_TeamInfo;
[CommandProperty( AccessLevel.GameMaster )]
public CTFTeamInfo Team1 { get { return m_TeamInfo[0]; } set { } }
public CTFTeamInfo Team1 { get => m_TeamInfo[0];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public CTFTeamInfo Team2 { get { return m_TeamInfo[1]; } set { } }
public CTFTeamInfo Team2 { get => m_TeamInfo[1];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public CTFTeamInfo Team3 { get { return m_TeamInfo[2]; } set { } }
public CTFTeamInfo Team3 { get => m_TeamInfo[2];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public CTFTeamInfo Team4 { get { return m_TeamInfo[3]; } set { } }
public CTFTeamInfo Team4 { get => m_TeamInfo[3];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public CTFTeamInfo Team5 { get { return m_TeamInfo[4]; } set { } }
public CTFTeamInfo Team5 { get => m_TeamInfo[4];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public CTFTeamInfo Team6 { get { return m_TeamInfo[5]; } set { } }
public CTFTeamInfo Team6 { get => m_TeamInfo[5];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public CTFTeamInfo Team7 { get { return m_TeamInfo[6]; } set { } }
public CTFTeamInfo Team7 { get => m_TeamInfo[6];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public CTFTeamInfo Team8 { get { return m_TeamInfo[7]; } set { } }
public CTFTeamInfo Team8 { get => m_TeamInfo[7];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan Duration
{
get { return m_Duration; }
set { m_Duration = value; }
get => m_Duration;
set => m_Duration = value;
}
public override string Title
{
get { return "CTF"; }
}
public override string Title => "CTF";
public override string GetTeamName( int teamID )
{

98
Scripts/Engines/ConPVP/Games/DoubleDom.cs
View file

@ -11,10 +11,7 @@ namespace Server.Engines.ConPVP
{
public DDTeamInfo m_TeamInfo;
public override string DefaultName
{
get { return "scoreboard"; }
}
public override string DefaultName => "scoreboard";
[Constructible]
public DDBoard()
@ -238,17 +235,11 @@ namespace Server.Engines.ConPVP
public Mobile Player => m_Player;
public string Name
{
get { return m_Player.Name; }
}
public string Name => m_Player.Name;
public int Kills
{
get
{
return m_Kills;
}
get => m_Kills;
set
{
m_TeamInfo.Kills += ( value - m_Kills );
@ -258,10 +249,7 @@ namespace Server.Engines.ConPVP
public int Captures
{
get
{
return m_Captures;
}
get => m_Captures;
set
{
m_TeamInfo.Captures += ( value - m_Captures );
@ -271,10 +259,7 @@ namespace Server.Engines.ConPVP
public int Score
{
get
{
return m_Score;
}
get => m_Score;
set
{
m_TeamInfo.Score += ( value - m_Score );
@ -312,38 +297,40 @@ namespace Server.Engines.ConPVP
private Dictionary<Mobile, DDPlayerInfo> m_Players;
public string Name
{
get { return String.Format( "{0} Team", m_Name ); }
}
public string Name => String.Format( "{0} Team", m_Name );
public DDGame Game { get { return m_Game; } set { m_Game = value; } }
public DDGame Game { get => m_Game;
set => m_Game = value;
}
public int TeamID => m_TeamID;
public int Kills { get { return m_Kills; } set { m_Kills = value; } }
public int Captures { get { return m_Captures; } set { m_Captures = value; } }
public int Kills { get => m_Kills;
set => m_Kills = value;
}
public int Captures { get => m_Captures;
set => m_Captures = value;
}
public int Score { get { return m_Score; } set { m_Score = value; } }
public int Score { get => m_Score;
set => m_Score = value;
}
private DDPlayerInfo m_Leader;
public DDPlayerInfo Leader
{
get { return m_Leader; }
set { m_Leader = value; }
get => m_Leader;
set => m_Leader = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public DDBoard Board
{
get { return m_Board; }
set { m_Board = value; }
get => m_Board;
set => m_Board = value;
}
public Dictionary<Mobile, DDPlayerInfo> Players
{
get { return m_Players; }
}
public Dictionary<Mobile, DDPlayerInfo> Players => m_Players;
public DDPlayerInfo this[Mobile mob]
{
@ -362,22 +349,22 @@ namespace Server.Engines.ConPVP
[CommandProperty( AccessLevel.GameMaster )]
public int Color
{
get { return m_Color; }
set { m_Color = value; }
get => m_Color;
set => m_Color = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public string TeamName
{
get { return m_Name; }
set { m_Name = value; }
get => m_Name;
set => m_Name = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D Origin
{
get { return m_Origin; }
set { m_Origin = value; }
get => m_Origin;
set => m_Origin = value;
}
public DDTeamInfo( int teamID )
@ -446,30 +433,33 @@ namespace Server.Engines.ConPVP
public DDTeamInfo[] TeamInfo => m_TeamInfo;
[CommandProperty( AccessLevel.GameMaster )]
public DDTeamInfo Team1 { get { return m_TeamInfo[0]; } set { } }
public DDTeamInfo Team1 { get => m_TeamInfo[0];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public DDTeamInfo Team2 { get { return m_TeamInfo[1]; } set { } }
public DDTeamInfo Team2 { get => m_TeamInfo[1];
set { } }
[CommandProperty( AccessLevel.GameMaster )]
public DDWayPoint PointA { get { return m_PointA; } set { m_PointA = value; } }
public DDWayPoint PointA { get => m_PointA;
set => m_PointA = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public DDWayPoint PointB { get { return m_PointB; } set { m_PointB = value; } }
public DDWayPoint PointB { get => m_PointB;
set => m_PointB = value;
}
private DDWayPoint m_PointA, m_PointB;
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan Duration
{
get { return m_Duration; }
set { m_Duration = value; }
get => m_Duration;
set => m_Duration = value;
}
public override string Title
{
get { return "DoubleDom"; }
}
public override string Title => "DoubleDom";
public override string GetTeamName( int teamID )
{
@ -1109,7 +1099,7 @@ namespace Server.Engines.ConPVP
public DDGame Game
{
get{ return m_Game; }
get => m_Game;
set
{
m_Game = value;
@ -1124,7 +1114,7 @@ namespace Server.Engines.ConPVP
public DDTeamInfo TeamOwner
{
get{ return m_TeamOwner; }
get => m_TeamOwner;
set
{
m_TeamOwner = value;

129
Scripts/Engines/ConPVP/Games/KingOfTheHill.cs
View file

@ -58,18 +58,12 @@ namespace Server.Engines.ConPVP
writer.WriteEncodedInt(m_ScoreInterval);
}
public Mobile King
{
get
{
return m_King;
}
}
public Mobile King => m_King;
public KHGame Game
public KHGame Game
{
get { return m_Game; }
set
get => m_Game;
set
{
if (m_Game != value)
{
@ -82,7 +76,9 @@ namespace Server.Engines.ConPVP
}
[CommandProperty(AccessLevel.GameMaster)]
public int ScoreInterval { get { return m_ScoreInterval; } set { m_ScoreInterval = value; } }
public int ScoreInterval { get => m_ScoreInterval;
set => m_ScoreInterval = value;
}
public int CapturesSoFar
{
@ -307,8 +303,8 @@ namespace Server.Engines.ConPVP
[CommandProperty(AccessLevel.GameMaster)]
public KHController Controller
{
get { return m_Controller; }
set
get => m_Controller;
set
{
if (m_Controller != value)
{
@ -563,11 +559,8 @@ namespace Server.Engines.ConPVP
public int Kills
{
get
{
return m_Kills;
}
set
get => m_Kills;
set
{
m_TeamInfo.Kills += (value - m_Kills);
m_Kills = value;
@ -576,11 +569,8 @@ namespace Server.Engines.ConPVP
public int Captures
{
get
{
return m_Captures;
}
set
get => m_Captures;
set
{
m_TeamInfo.Captures += (value - m_Captures);
m_Captures = value;
@ -589,11 +579,8 @@ namespace Server.Engines.ConPVP
public int Score
{
get
{
return m_Score;
}
set
get => m_Score;
set
{
m_TeamInfo.Score += (value - m_Score);
m_Score = value;
@ -644,27 +631,32 @@ namespace Server.Engines.ConPVP
}
}
public KHGame Game { get { return m_Game; } set { m_Game = value; } }
public KHGame Game { get => m_Game;
set => m_Game = value;
}
public int TeamID => m_TeamID;
public int Kills { get { return m_Kills; } set { m_Kills = value; } }
public int Captures { get { return m_Captures; } set { m_Captures = value; } }
public int Score { get { return m_Score; } set { m_Score = value; } }
public int Kills { get => m_Kills;
set => m_Kills = value;
}
public int Captures { get => m_Captures;
set => m_Captures = value;
}
public int Score { get => m_Score;
set => m_Score = value;
}
private KHPlayerInfo m_Leader;
public KHPlayerInfo Leader
{
get { return m_Leader; }
set { m_Leader = value; }
get => m_Leader;
set => m_Leader = value;
}
public Hashtable Players
{
get { return m_Players; }
}
public Hashtable Players => m_Players;
public KHPlayerInfo this[Mobile mob]
public KHPlayerInfo this[Mobile mob]
{
get
{
@ -681,15 +673,15 @@ namespace Server.Engines.ConPVP
[CommandProperty(AccessLevel.GameMaster)]
public int Color
{
get { return m_Color; }
set { m_Color = value; }
get => m_Color;
set => m_Color = value;
}
[CommandProperty(AccessLevel.GameMaster)]
public string TeamName
{
get { return m_Name; }
set { m_Name = value; }
get => m_Name;
set => m_Name = value;
}
public KHTeamInfo(int teamID)
@ -755,58 +747,71 @@ namespace Server.Engines.ConPVP
public KHTeamInfo[] TeamInfo => m_TeamInfo;
[CommandProperty(AccessLevel.GameMaster)]
public KHTeamInfo Team1_W { get { return m_TeamInfo[0]; } set { } }
public KHTeamInfo Team1_W { get => m_TeamInfo[0];
set { } }
[CommandProperty(AccessLevel.GameMaster)]
public KHTeamInfo Team2_E { get { return m_TeamInfo[1]; } set { } }
public KHTeamInfo Team2_E { get => m_TeamInfo[1];
set { } }
[CommandProperty(AccessLevel.GameMaster)]
public KHTeamInfo Team3_N { get { return m_TeamInfo[2]; } set { } }
public KHTeamInfo Team3_N { get => m_TeamInfo[2];
set { } }
[CommandProperty(AccessLevel.GameMaster)]
public KHTeamInfo Team4_S { get { return m_TeamInfo[3]; } set { } }
public KHTeamInfo Team4_S { get => m_TeamInfo[3];
set { } }
[CommandProperty(AccessLevel.GameMaster)]
public KHTeamInfo Team5_NW { get { return m_TeamInfo[4]; } set { } }
public KHTeamInfo Team5_NW { get => m_TeamInfo[4];
set { } }
[CommandProperty(AccessLevel.GameMaster)]
public KHTeamInfo Team6_SE { get { return m_TeamInfo[5]; } set { } }
public KHTeamInfo Team6_SE { get => m_TeamInfo[5];
set { } }
[CommandProperty(AccessLevel.GameMaster)]
public KHTeamInfo Team7_SW { get { return m_TeamInfo[6]; } set { } }
public KHTeamInfo Team7_SW { get => m_TeamInfo[6];
set { } }
[CommandProperty(AccessLevel.GameMaster)]
public KHTeamInfo Team8_NE { get { return m_TeamInfo[7]; } set { } }
public KHTeamInfo Team8_NE { get => m_TeamInfo[7];
set { } }
public HillOfTheKing[] Hills => m_Hills;
[CommandProperty(AccessLevel.GameMaster)]
public HillOfTheKing Hill1 { get { return m_Hills[0]; } set { m_Hills[0] = value; } }
public HillOfTheKing Hill1 { get => m_Hills[0];
set => m_Hills[0] = value;
}
[CommandProperty(AccessLevel.GameMaster)]
public HillOfTheKing Hill2 { get { return m_Hills[1]; } set { m_Hills[1] = value; } }
public HillOfTheKing Hill2 { get => m_Hills[1];
set => m_Hills[1] = value;
}
[CommandProperty(AccessLevel.GameMaster)]
public HillOfTheKing Hill3 { get { return m_Hills[2]; } set { m_Hills[2] = value; } }
public HillOfTheKing Hill3 { get => m_Hills[2];
set => m_Hills[2] = value;
}
[CommandProperty(AccessLevel.GameMaster)]
public HillOfTheKing Hill4 { get { return m_Hills[3]; } set { m_Hills[3] = value; } }
public HillOfTheKing Hill4 { get => m_Hills[3];
set => m_Hills[3] = value;
}
public ArrayList Boards => m_Boards;
[CommandProperty(AccessLevel.GameMaster)]
public TimeSpan Duration
{
get { return m_Duration; }
set { m_Duration = value; }
get => m_Duration;
set => m_Duration = value;
}
public override string Title
{
get { return "King of the Hill"; }
}
public override string Title => "King of the Hill";
public override string GetTeamName(int teamID)
public override string GetTeamName(int teamID)
{
return m_TeamInfo[teamID % m_TeamInfo.Length].Name;
}

31
Scripts/Engines/ConPVP/Ladder.cs
View file

@ -8,12 +8,10 @@ namespace Server.Engines.ConPVP
private Ladder m_Ladder;
//[CommandProperty( AccessLevel.GameMaster )]
public Ladder Ladder{ get{ return m_Ladder; } set{} }
public Ladder Ladder{ get => m_Ladder;
set{} }
public override string DefaultName
{
get { return "ladder controller"; }
}
public override string DefaultName => "ladder controller";
[Constructible]
public LadderController() : base( 0x1B7A )
@ -251,7 +249,9 @@ namespace Server.Engines.ConPVP
private static Ladder m_Instance;
public static Ladder Instance{ get{ return m_Instance; } set{ m_Instance = value; } }
public static Ladder Instance{ get => m_Instance;
set => m_Instance = value;
}
public Ladder()
{
@ -322,21 +322,28 @@ namespace Server.Engines.ConPVP
private int m_Index;
private Ladder m_Ladder;
public Mobile Mobile{ get{ return m_Mobile; } }
public Mobile Mobile => m_Mobile;
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
public int Experience{ get{ return m_Experience; } set{ m_Experience = value; m_Ladder.UpdateEntry(this); } }
public int Experience{ get => m_Experience;
set{ m_Experience = value; m_Ladder.UpdateEntry(this); } }
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
public int Wins{ get{ return m_Wins; } set{ m_Wins = value; } }
public int Wins{ get => m_Wins;
set => m_Wins = value;
}
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
public int Losses{ get{ return m_Losses; } set{ m_Losses = value; } }
public int Losses{ get => m_Losses;
set => m_Losses = value;
}
public int Index{ get{ return m_Index; } set{ m_Index = value; } }
public int Index{ get => m_Index;
set => m_Index = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int Rank{ get{ return m_Index; } }
public int Rank => m_Index;
public LadderEntry( Mobile mob, Ladder ladder )
{

9
Scripts/Engines/ConPVP/LadderGump.cs
View file

@ -12,14 +12,11 @@ namespace Server.Engines.ConPVP
[CommandProperty( AccessLevel.GameMaster )]
public LadderController Ladder
{
get{ return m_Ladder; }
set{ m_Ladder = value; }
get => m_Ladder;
set => m_Ladder = value;
}
public override string DefaultName
{
get { return "1v1 leaderboard"; }
}
public override string DefaultName => "1v1 leaderboard";
[Constructible]
public LadderItem() : base( 0x117F )

23
Scripts/Engines/ConPVP/Participant.cs
View file

@ -10,10 +10,12 @@ namespace Server.Engines.ConPVP
private DuelPlayer[] m_Players;
private TournyParticipant m_TournyPart;
public int Count{ get{ return m_Players.Length; } }
public DuelPlayer[] Players{ get{ return m_Players; } }
public DuelContext Context{ get{ return m_Context; } }
public TournyParticipant TournyPart{ get{ return m_TournyPart; } set{ m_TournyPart = value; } }
public int Count => m_Players.Length;
public DuelPlayer[] Players => m_Players;
public DuelContext Context => m_Context;
public TournyParticipant TournyPart{ get => m_TournyPart;
set => m_TournyPart = value;
}
public DuelPlayer Find( Mobile mob )
{
@ -215,10 +217,15 @@ namespace Server.Engines.ConPVP
private bool m_Ready;
private Participant m_Participant;
public Mobile Mobile{ get{ return m_Mobile; } }
public bool Ready{ get{ return m_Ready; } set{ m_Ready = value; } }
public bool Eliminated{ get{ return m_Eliminated; } set{ m_Eliminated = value; if ( m_Participant.Context.m_Tournament != null && m_Eliminated ){ m_Participant.Context.m_Tournament.OnEliminated( this ); m_Mobile.SendEverything(); } } }
public Participant Participant{ get{ return m_Participant; } set{ m_Participant = value; } }
public Mobile Mobile => m_Mobile;
public bool Ready{ get => m_Ready;
set => m_Ready = value;
}
public bool Eliminated{ get => m_Eliminated;
set{ m_Eliminated = value; if ( m_Participant.Context.m_Tournament != null && m_Eliminated ){ m_Participant.Context.m_Tournament.OnEliminated( this ); m_Mobile.SendEverything(); } } }
public Participant Participant{ get => m_Participant;
set => m_Participant = value;
}
public DuelPlayer( Mobile mob, Participant p )
{

6
Scripts/Engines/ConPVP/ParticipantGump.cs
View file

@ -12,9 +12,9 @@ namespace Server.Engines.ConPVP
private DuelContext m_Context;
private Participant m_Participant;
public Mobile From{ get{ return m_From; } }
public DuelContext Context{ get{ return m_Context; } }
public Participant Participant{ get{ return m_Participant; } }
public Mobile From => m_From;
public DuelContext Context => m_Context;
public Participant Participant => m_Participant;
public string Center( string text )
{

18
Scripts/Engines/ConPVP/Preferences.cs
View file

@ -11,12 +11,10 @@ namespace Server.Engines.ConPVP
private Preferences m_Preferences;
//[CommandProperty( AccessLevel.GameMaster )]
public Preferences Preferences{ get{ return m_Preferences; } set{} }
public Preferences Preferences{ get => m_Preferences;
set{} }
public override string DefaultName
{
get { return "preferences controller"; }
}
public override string DefaultName => "preferences controller";
[Constructible]
public PreferencesController() : base( 0x1B7A )
@ -74,7 +72,7 @@ namespace Server.Engines.ConPVP
private ArrayList m_Entries;
private Hashtable m_Table;
public ArrayList Entries{ get{ return m_Entries; } }
public ArrayList Entries => m_Entries;
public PreferencesEntry Find( Mobile mob )
{
@ -91,7 +89,9 @@ namespace Server.Engines.ConPVP
private static Preferences m_Instance;
public static Preferences Instance{ get{ return m_Instance; } set{ m_Instance = value; } }
public static Preferences Instance{ get => m_Instance;
set => m_Instance = value;
}
public Preferences()
{
@ -145,8 +145,8 @@ namespace Server.Engines.ConPVP
private ArrayList m_Disliked;
private Preferences m_Preferences;
public Mobile Mobile{ get{ return m_Mobile; } }
public ArrayList Disliked{ get{ return m_Disliked; } }
public Mobile Mobile => m_Mobile;
public ArrayList Disliked => m_Disliked;
public PreferencesEntry( Mobile mob, Preferences prefs )
{

16
Scripts/Engines/ConPVP/Ruleset.cs
View file

@ -12,13 +12,17 @@ namespace Server.Engines.ConPVP
private ArrayList m_Flavors = new ArrayList();
private bool m_Changed;
public RulesetLayout Layout{ get{ return m_Layout; } }
public BitArray Options{ get{ return m_Options; } }
public string Title{ get{ return m_Title; } set{ m_Title = value; } }
public RulesetLayout Layout => m_Layout;
public BitArray Options => m_Options;
public string Title{ get => m_Title;
set => m_Title = value;
}
public Ruleset Base{ get{ return m_Base; } }
public ArrayList Flavors{ get{ return m_Flavors; } }
public bool Changed{ get{ return m_Changed; } set{ m_Changed = value; } }
public Ruleset Base => m_Base;
public ArrayList Flavors => m_Flavors;
public bool Changed{ get => m_Changed;
set => m_Changed = value;
}
public void ApplyDefault( Ruleset newDefault )
{

22
Scripts/Engines/ConPVP/RulesetLayout.cs
View file

@ -660,18 +660,22 @@ namespace Server.Engines.ConPVP
private RulesetLayout m_Parent;
private RulesetLayout[] m_Children;
public string Title{ get{ return m_Title; } }
public string Description{ get{ return m_Description; } }
public string[] Options{ get{ return m_Options; } }
public string Title => m_Title;
public string Description => m_Description;
public string[] Options => m_Options;
public int Offset{ get{ return m_Offset; } }
public int TotalLength{ get{ return m_TotalLength; } }
public int Offset => m_Offset;
public int TotalLength => m_TotalLength;
public RulesetLayout Parent{ get{ return m_Parent; } }
public RulesetLayout[] Children{ get{ return m_Children; } }
public RulesetLayout Parent => m_Parent;
public RulesetLayout[] Children => m_Children;
public Ruleset[] Defaults{ get{ return m_Defaults; } set{ m_Defaults = value; } }
public Ruleset[] Flavors{ get{ return m_Flavors; } set{ m_Flavors = value; } }
public Ruleset[] Defaults{ get => m_Defaults;
set => m_Defaults = value;
}
public Ruleset[] Flavors{ get => m_Flavors;
set => m_Flavors = value;
}
public RulesetLayout FindByTitle( string title )
{

156
Scripts/Engines/ConPVP/Tournament.cs
View file

@ -41,7 +41,9 @@ namespace Server.Engines.ConPVP
private TournamentController m_Tournament;
[CommandProperty( AccessLevel.GameMaster )]
public TournamentController Tournament{ get{ return m_Tournament; } set{ m_Tournament = value; } }
public TournamentController Tournament{ get => m_Tournament;
set => m_Tournament = value;
}
[Constructible]
public TournamentRegistrar()
@ -138,16 +140,17 @@ namespace Server.Engines.ConPVP
private Mobile m_Registrar;
[CommandProperty( AccessLevel.GameMaster )]
public TournamentController Tournament{ get{ return m_Tournament; } set{ m_Tournament = value; } }
public TournamentController Tournament{ get => m_Tournament;
set => m_Tournament = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Registrar{ get{ return m_Registrar; } set{ m_Registrar = value; } }
public override string DefaultName
{
get { return "tournament signup book"; }
public Mobile Registrar{ get => m_Registrar;
set => m_Registrar = value;
}
public override string DefaultName => "tournament signup book";
[Constructible]
public TournamentSignupItem() : base( 4029 )
{
@ -1186,7 +1189,8 @@ namespace Server.Engines.ConPVP
private Tournament m_Tournament;
[CommandProperty( AccessLevel.GameMaster )]
public Tournament Tournament{ get{ return m_Tournament; } set{} }
public Tournament Tournament{ get => m_Tournament;
set{} }
private static ArrayList m_Instances = new ArrayList();
@ -1206,10 +1210,7 @@ namespace Server.Engines.ConPVP
}
}
public override string DefaultName
{
get { return "tournament controller"; }
}
public override string DefaultName => "tournament controller";
[Constructible]
public TournamentController() : base( 0x1B7A )
@ -1360,139 +1361,132 @@ namespace Server.Engines.ConPVP
private EventController m_EventController;
public bool IsNotoRestricted { get { return ( m_TournyType != TournyType.Standard ); } }
public bool IsNotoRestricted => ( m_TournyType != TournyType.Standard );
[CommandProperty( AccessLevel.GameMaster )]
public EventController EventController
{
get { return m_EventController; }
set { m_EventController = value; }
get => m_EventController;
set => m_EventController = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int SuddenDeathRounds
{
get{ return m_SuddenDeathRounds; }
set{ m_SuddenDeathRounds = value; }
get => m_SuddenDeathRounds;
set => m_SuddenDeathRounds = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public TournyType TournyType
{
get{ return m_TournyType; }
set{ m_TournyType = value; }
get => m_TournyType;
set => m_TournyType = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public GroupingType GroupType
{
get{ return m_GroupType; }
set{ m_GroupType = value; }
get => m_GroupType;
set => m_GroupType = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public TieType TieType
{
get{ return m_TieType; }
set{ m_TieType = value; }
get => m_TieType;
set => m_TieType = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan SuddenDeath
{
get{ return m_SuddenDeath; }
set{ m_SuddenDeath = value; }
get => m_SuddenDeath;
set => m_SuddenDeath = value;
}
public Ruleset Ruleset
{
get{ return m_Ruleset; }
set{ m_Ruleset = value; }
get => m_Ruleset;
set => m_Ruleset = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int ParticipantsPerMatch
{
get{ return m_ParticipantsPerMatch; }
get => m_ParticipantsPerMatch;
set{ if ( value < 2 ) value = 2; else if ( value > 10 ) value = 10; m_ParticipantsPerMatch = value; }
}
[CommandProperty( AccessLevel.GameMaster )]
public int PlayersPerParticipant
{
get{ return m_PlayersPerParticipant; }
get => m_PlayersPerParticipant;
set{ if ( value < 1 ) value = 1; else if ( value > 10 ) value = 10; m_PlayersPerParticipant = value; }
}
[CommandProperty( AccessLevel.GameMaster )]
public int LevelRequirement
{
get{ return m_LevelRequirement; }
set{ m_LevelRequirement = value; }
get => m_LevelRequirement;
set => m_LevelRequirement = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool FactionRestricted
{
get{ return m_FactionRestricted; }
set{ m_FactionRestricted = value; }
get => m_FactionRestricted;
set => m_FactionRestricted = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan SignupPeriod
{
get{ return m_SignupPeriod; }
set{ m_SignupPeriod = value; }
get => m_SignupPeriod;
set => m_SignupPeriod = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public DateTime SignupStart
{
get{ return m_SignupStart; }
set{ m_SignupStart = value; }
get => m_SignupStart;
set => m_SignupStart = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public TournamentStage CurrentStage
{
get{ return m_Stage; }
}
public TournamentStage CurrentStage => m_Stage;
public TournamentStage Stage
{
get{ return m_Stage; }
set{ m_Stage = value; }
get => m_Stage;
set => m_Stage = value;
}
public TournyPyramid Pyramid
{
get{ return m_Pyramid; }
set{ m_Pyramid = value; }
get => m_Pyramid;
set => m_Pyramid = value;
}
public ArrayList Arenas
{
get{ return m_Arenas; }
set{ m_Arenas = value; }
get => m_Arenas;
set => m_Arenas = value;
}
public ArrayList Participants
{
get{ return m_Participants; }
set{ m_Participants = value; }
get => m_Participants;
set => m_Participants = value;
}
public ArrayList Undefeated
{
get{ return m_Undefeated; }
set{ m_Undefeated = value; }
get => m_Undefeated;
set => m_Undefeated = value;
}
public bool IsFactionRestricted {
get {
return ( m_FactionRestricted || m_TournyType == TournyType.Faction );
}
}
public bool IsFactionRestricted => ( m_FactionRestricted || m_TournyType == TournyType.Faction );
public bool HasParticipant( Mobile mob )
{
@ -2255,8 +2249,8 @@ namespace Server.Engines.ConPVP
public ArrayList Levels
{
get{ return m_Levels; }
set{ m_Levels = value; }
get => m_Levels;
set => m_Levels = value;
}
public TournyPyramid()
@ -2443,14 +2437,14 @@ namespace Server.Engines.ConPVP
public ArrayList Matches
{
get{ return m_Matches; }
set{ m_Matches = value; }
get => m_Matches;
set => m_Matches = value;
}
public TournyParticipant FreeAdvance
{
get{ return m_FreeAdvance; }
set{ m_FreeAdvance = value; }
get => m_FreeAdvance;
set => m_FreeAdvance = value;
}
public PyramidLevel()
@ -2467,26 +2461,23 @@ namespace Server.Engines.ConPVP
public ArrayList Participants
{
get{ return m_Participants; }
set{ m_Participants = value; }
get => m_Participants;
set => m_Participants = value;
}
public TournyParticipant Winner
{
get{ return m_Winner; }
set{ m_Winner = value; }
get => m_Winner;
set => m_Winner = value;
}
public DuelContext Context
{
get{ return m_Context; }
set{ m_Context = value; }
get => m_Context;
set => m_Context = value;
}
public bool InProgress
{
get{ return ( m_Context != null && m_Context.Registered ); }
}
public bool InProgress => ( m_Context != null && m_Context.Registered );
public void Start( Arena arena, Tournament tourny )
{
@ -2601,20 +2592,20 @@ namespace Server.Engines.ConPVP
public ArrayList Players
{
get{ return m_Players; }
set{ m_Players = value; }
get => m_Players;
set => m_Players = value;
}
public ArrayList Log
{
get{ return m_Log; }
set{ m_Log = value; }
get => m_Log;
set => m_Log = value;
}
public int FreeAdvances
{
get{ return m_FreeAdvances; }
set{ m_FreeAdvances = value; }
get => m_FreeAdvances;
set => m_FreeAdvances = value;
}
public int TotalLadderXP
@ -3520,13 +3511,12 @@ namespace Server.Engines.ConPVP
private TournamentController m_Tournament;
[CommandProperty( AccessLevel.GameMaster )]
public TournamentController Tournament{ get{ return m_Tournament; } set{ m_Tournament = value; } }
public override string DefaultName
{
get { return "tournament bracket"; }
public TournamentController Tournament{ get => m_Tournament;
set => m_Tournament = value;
}
public override string DefaultName => "tournament bracket";
[Constructible]
public TournamentBracketItem() : base( 3774 )
{

13
Scripts/Engines/ConPVP/Trophy.cs
View file

@ -18,16 +18,21 @@ namespace Server.Items
private DateTime m_Date;
[CommandProperty( AccessLevel.GameMaster )]
public string Title{ get{ return m_Title; } set{ m_Title = value; } }
public string Title{ get => m_Title;
set => m_Title = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public TrophyRank Rank{ get{ return m_Rank; } set{ m_Rank = value; UpdateStyle(); } }
public TrophyRank Rank{ get => m_Rank;
set{ m_Rank = value; UpdateStyle(); } }
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Owner{ get{ return m_Owner; } set{ m_Owner = value; } }
public Mobile Owner{ get => m_Owner;
set => m_Owner = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public DateTime Date{ get{ return m_Date; } }
public DateTime Date => m_Date;
[Constructible]
public Trophy( string title, TrophyRank rank ) : base( 5020 )

20
Scripts/Engines/Craft/Core/CraftContext.cs
View file

@ -19,11 +19,21 @@ namespace Server.Engines.Craft
private CraftMarkOption m_MarkOption;
public List<CraftItem> Items => m_Items;
public int LastResourceIndex{ get{ return m_LastResourceIndex; } set{ m_LastResourceIndex = value; } }
public int LastResourceIndex2{ get{ return m_LastResourceIndex2; } set{ m_LastResourceIndex2 = value; } }
public int LastGroupIndex{ get{ return m_LastGroupIndex; } set{ m_LastGroupIndex = value; } }
public bool DoNotColor{ get{ return m_DoNotColor; } set{ m_DoNotColor = value; } }
public CraftMarkOption MarkOption{ get{ return m_MarkOption; } set{ m_MarkOption = value; } }
public int LastResourceIndex{ get => m_LastResourceIndex;
set => m_LastResourceIndex = value;
}
public int LastResourceIndex2{ get => m_LastResourceIndex2;
set => m_LastResourceIndex2 = value;
}
public int LastGroupIndex{ get => m_LastGroupIndex;
set => m_LastGroupIndex = value;
}
public bool DoNotColor{ get => m_DoNotColor;
set => m_DoNotColor = value;
}
public CraftMarkOption MarkOption{ get => m_MarkOption;
set => m_MarkOption = value;
}
public CraftContext()
{

15
Scripts/Engines/Craft/Core/CraftGroup.cs
View file

@ -19,19 +19,10 @@ namespace Server.Engines.Craft
m_arCraftItem.Add( craftItem );
}
public CraftItemCol CraftItems
{
get { return m_arCraftItem; }
}
public CraftItemCol CraftItems => m_arCraftItem;
public string NameString
{
get { return m_NameString; }
}
public string NameString => m_NameString;
public int NameNumber
{
get { return m_NameNumber; }
}
public int NameNumber => m_NameNumber;
}
}

88
Scripts/Engines/Craft/Core/CraftItem.cs
View file

@ -49,24 +49,21 @@ namespace Server.Engines.Craft
public bool ForceNonExceptional
{
get { return m_ForceNonExceptional; }
set { m_ForceNonExceptional = value; }
get => m_ForceNonExceptional;
set => m_ForceNonExceptional = value;
}
private Expansion m_RequiredExpansion;
public Expansion RequiredExpansion
{
get { return m_RequiredExpansion; }
set { m_RequiredExpansion = value; }
get => m_RequiredExpansion;
set => m_RequiredExpansion = value;
}
private Recipe m_Recipe;
public Recipe Recipe
{
get { return m_Recipe; }
}
public Recipe Recipe => m_Recipe;
public void AddRecipe( int id, CraftSystem system )
{
@ -148,8 +145,8 @@ namespace Server.Engines.Craft
public BeverageType RequiredBeverage
{
get { return m_RequiredBeverage; }
set { m_RequiredBeverage = value; }
get => m_RequiredBeverage;
set => m_RequiredBeverage = value;
}
public void AddRes( Type type, TextDefinition name, int amount )
@ -172,92 +169,71 @@ namespace Server.Engines.Craft
public int Mana
{
get { return m_Mana; }
set { m_Mana = value; }
get => m_Mana;
set => m_Mana = value;
}
public int Hits
{
get { return m_Hits; }
set { m_Hits = value; }
get => m_Hits;
set => m_Hits = value;
}
public int Stam
{
get { return m_Stam; }
set { m_Stam = value; }
get => m_Stam;
set => m_Stam = value;
}
public bool UseSubRes2
{
get { return m_UseSubRes2; }
set { m_UseSubRes2 = value; }
get => m_UseSubRes2;
set => m_UseSubRes2 = value;
}
public bool UseAllRes
{
get { return m_UseAllRes; }
set { m_UseAllRes = value; }
get => m_UseAllRes;
set => m_UseAllRes = value;
}
public bool NeedHeat
{
get { return m_NeedHeat; }
set { m_NeedHeat = value; }
get => m_NeedHeat;
set => m_NeedHeat = value;
}
public bool NeedOven
{
get { return m_NeedOven; }
set { m_NeedOven = value; }
get => m_NeedOven;
set => m_NeedOven = value;
}
public bool NeedMill
{
get { return m_NeedMill; }
set { m_NeedMill = value; }
get => m_NeedMill;
set => m_NeedMill = value;
}
public Type ItemType
{
get { return m_Type; }
}
public Type ItemType => m_Type;
public int ItemHue
{
get { return m_ItemHue; }
set { m_ItemHue = value; }
get => m_ItemHue;
set => m_ItemHue = value;
}
public string GroupNameString
{
get { return m_GroupNameString; }
}
public string GroupNameString => m_GroupNameString;
public int GroupNameNumber
{
get { return m_GroupNameNumber; }
}
public int GroupNameNumber => m_GroupNameNumber;
public string NameString
{
get { return m_NameString; }
}
public string NameString => m_NameString;
public int NameNumber
{
get { return m_NameNumber; }
}
public int NameNumber => m_NameNumber;
public CraftResCol Resources
{
get { return m_arCraftRes; }
}
public CraftResCol Resources => m_arCraftRes;
public CraftSkillCol Skills
{
get { return m_arCraftSkill; }
}
public CraftSkillCol Skills => m_arCraftSkill;
public bool ConsumeAttributes( Mobile from, ref object message, bool consume )
{

2
Scripts/Engines/Craft/Core/CraftItemIDAttribute.cs
View file

@ -7,7 +7,7 @@ namespace Server.Engines.Craft
{
private int m_ItemID;
public int ItemID{ get{ return m_ItemID; } }
public int ItemID => m_ItemID;
public CraftItemIDAttribute( int itemID )
{

30
Scripts/Engines/Craft/Core/CraftRes.cs
View file

@ -38,34 +38,16 @@ namespace Server.Engines.Craft
from.SendLocalizedMessage( 502925 ); // You don't have the resources required to make that item.
}
public Type ItemType
{
get { return m_Type; }
}
public Type ItemType => m_Type;
public string MessageString
{
get { return m_MessageString; }
}
public string MessageString => m_MessageString;
public int MessageNumber
{
get { return m_MessageNumber; }
}
public int MessageNumber => m_MessageNumber;
public string NameString
{
get { return m_NameString; }
}
public string NameString => m_NameString;
public int NameNumber
{
get { return m_NameNumber; }
}
public int NameNumber => m_NameNumber;
public int Amount
{
get { return m_Amount; }
}
public int Amount => m_Amount;
}
}

15
Scripts/Engines/Craft/Core/CraftSkill.cs
View file

@ -13,19 +13,10 @@ namespace Server.Engines.Craft
m_MaxSkill = maxSkill;
}
public SkillName SkillToMake
{
get { return m_SkillToMake; }
}
public SkillName SkillToMake => m_SkillToMake;
public double MinSkill
{
get { return m_MinSkill; }
}
public double MinSkill => m_MinSkill;
public double MaxSkill
{
get { return m_MaxSkill; }
}
public double MaxSkill => m_MaxSkill;
}
}

30
Scripts/Engines/Craft/Core/CraftSubRes.cs
View file

@ -25,34 +25,16 @@ namespace Server.Engines.Craft
m_Message = message;
}
public Type ItemType
{
get { return m_Type; }
}
public Type ItemType => m_Type;
public string NameString
{
get { return m_NameString; }
}
public string NameString => m_NameString;
public int NameNumber
{
get { return m_NameNumber; }
}
public int NameNumber => m_NameNumber;
public int GenericNameNumber
{
get { return m_GenericNameNumber; }
}
public int GenericNameNumber => m_GenericNameNumber;
public object Message
{
get { return m_Message; }
}
public object Message => m_Message;
public double RequiredSkill
{
get { return m_ReqSkill; }
}
public double RequiredSkill => m_ReqSkill;
}
}

16
Scripts/Engines/Craft/Core/CraftSubResCol.cs
View file

@ -11,26 +11,26 @@ namespace Server.Engines.Craft
public bool Init
{
get { return m_Init; }
set { m_Init = value; }
get => m_Init;
set => m_Init = value;
}
public Type ResType
{
get { return m_Type; }
set { m_Type = value; }
get => m_Type;
set => m_Type = value;
}
public string NameString
{
get { return m_NameString; }
set { m_NameString = value; }
get => m_NameString;
set => m_NameString = value;
}
public int NameNumber
{
get { return m_NameNumber; }
set { m_NameNumber = value; }
get => m_NameNumber;
set => m_NameNumber = value;
}
public CraftSubResCol()

22
Scripts/Engines/Craft/Core/CraftSystem.cs
View file

@ -40,10 +40,10 @@ namespace Server.Engines.Craft
public abstract SkillName MainSkill{ get; }
public virtual int GumpTitleNumber{ get{ return 0; } }
public virtual string GumpTitleString{ get{ return ""; } }
public virtual int GumpTitleNumber => 0;
public virtual string GumpTitleString => "";
public virtual CraftECA ECA{ get{ return CraftECA.ChanceMinusSixty; } }
public virtual CraftECA ECA => CraftECA.ChanceMinusSixty;
private Dictionary<Mobile, CraftContext> m_ContextTable = new Dictionary<Mobile, CraftContext>();
@ -83,26 +83,26 @@ namespace Server.Engines.Craft
public bool Resmelt
{
get { return m_Resmelt; }
set { m_Resmelt = value; }
get => m_Resmelt;
set => m_Resmelt = value;
}
public bool Repair
{
get{ return m_Repair; }
set{ m_Repair = value; }
get => m_Repair;
set => m_Repair = value;
}
public bool MarkOption
{
get{ return m_MarkOption; }
set{ m_MarkOption = value; }
get => m_MarkOption;
set => m_MarkOption = value;
}
public bool CanEnhance
{
get{ return m_CanEnhance; }
set{ m_CanEnhance = value; }
get => m_CanEnhance;
set => m_CanEnhance = value;
}
public CraftSystem( int minCraftEffect, int maxCraftEffect, double delay )

12
Scripts/Engines/Craft/Core/CustomCraft.cs
View file

@ -12,12 +12,12 @@ namespace Server.Engines.Craft
private BaseTool m_Tool;
private int m_Quality;
public Mobile From{ get{ return m_From; } }
public CraftItem CraftItem{ get{ return m_CraftItem; } }
public CraftSystem CraftSystem{ get{ return m_CraftSystem; } }
public Type TypeRes{ get{ return m_TypeRes; } }
public BaseTool Tool{ get{ return m_Tool; } }
public int Quality{ get{ return m_Quality; } }
public Mobile From => m_From;
public CraftItem CraftItem => m_CraftItem;
public CraftSystem CraftSystem => m_CraftSystem;
public Type TypeRes => m_TypeRes;
public BaseTool Tool => m_Tool;
public int Quality => m_Quality;
public CustomCraft( Mobile from, CraftItem craftItem, CraftSystem craftSystem, Type typeRes, BaseTool tool, int quality )
{

15
Scripts/Engines/Craft/Core/Recipes.cs
View file

@ -68,30 +68,27 @@ namespace Server.Engines.Craft
public static Dictionary<int, Recipe> Recipes => m_Recipes;
private static int m_LargestRecipeID;
public static int LargestRecipeID{ get{ return m_LargestRecipeID; } }
public static int LargestRecipeID => m_LargestRecipeID;
private CraftSystem m_System;
public CraftSystem CraftSystem
{
get { return m_System; }
set { m_System = value; }
get => m_System;
set => m_System = value;
}
private CraftItem m_CraftItem;
public CraftItem CraftItem
{
get { return m_CraftItem; }
set { m_CraftItem = value; }
get => m_CraftItem;
set => m_CraftItem = value;
}
private int m_ID;
public int ID
{
get { return m_ID; }
}
public int ID => m_ID;
private TextDefinition m_TD;
public TextDefinition TextDefinition

10
Scripts/Engines/Craft/DefAlchemy.cs
View file

@ -5,15 +5,9 @@ namespace Server.Engines.Craft
{
public class DefAlchemy : CraftSystem
{
public override SkillName MainSkill
{
get { return SkillName.Alchemy; }
}
public override SkillName MainSkill => SkillName.Alchemy;
public override int GumpTitleNumber
{
get { return 1044001; } // <CENTER>ALCHEMY MENU</CENTER>
}
public override int GumpTitleNumber => 1044001;
private static CraftSystem m_CraftSystem;

10
Scripts/Engines/Craft/DefBlacksmithy.cs
View file

@ -5,15 +5,9 @@ namespace Server.Engines.Craft
{
public class DefBlacksmithy : CraftSystem
{
public override SkillName MainSkill
{
get { return SkillName.Blacksmith; }
}
public override SkillName MainSkill => SkillName.Blacksmith;
public override int GumpTitleNumber
{
get { return 1044002; } // <CENTER>BLACKSMITHY MENU</CENTER>
}
public override int GumpTitleNumber => 1044002;
private static CraftSystem m_CraftSystem;

10
Scripts/Engines/Craft/DefBowFletching.cs
View file

@ -5,15 +5,9 @@ namespace Server.Engines.Craft
{
public class DefBowFletching : CraftSystem
{
public override SkillName MainSkill
{
get { return SkillName.Fletching; }
}
public override SkillName MainSkill => SkillName.Fletching;
public override int GumpTitleNumber
{
get { return 1044006; } // <CENTER>BOWCRAFT AND FLETCHING MENU</CENTER>
}
public override int GumpTitleNumber => 1044006;
private static CraftSystem m_CraftSystem;

10
Scripts/Engines/Craft/DefCarpentry.cs
View file

@ -5,15 +5,9 @@ namespace Server.Engines.Craft
{
public class DefCarpentry : CraftSystem
{
public override SkillName MainSkill
{
get { return SkillName.Carpentry; }
}
public override SkillName MainSkill => SkillName.Carpentry;
public override int GumpTitleNumber
{
get { return 1044004; } // <CENTER>CARPENTRY MENU</CENTER>
}
public override int GumpTitleNumber => 1044004;
private static CraftSystem m_CraftSystem;

10
Scripts/Engines/Craft/DefCartography.cs
View file

@ -5,15 +5,9 @@ namespace Server.Engines.Craft
{
public class DefCartography : CraftSystem
{
public override SkillName MainSkill
{
get { return SkillName.Cartography; }
}
public override SkillName MainSkill => SkillName.Cartography;
public override int GumpTitleNumber
{
get { return 1044008; } // <CENTER>CARTOGRAPHY MENU</CENTER>
}
public override int GumpTitleNumber => 1044008;
public override double GetChanceAtMin( CraftItem item )
{

10
Scripts/Engines/Craft/DefCooking.cs
View file

@ -5,15 +5,9 @@ namespace Server.Engines.Craft
{
public class DefCooking : CraftSystem
{
public override SkillName MainSkill
{
get { return SkillName.Cooking; }
}
public override SkillName MainSkill => SkillName.Cooking;
public override int GumpTitleNumber
{
get { return 1044003; } // <CENTER>COOKING MENU</CENTER>
}
public override int GumpTitleNumber => 1044003;
private static CraftSystem m_CraftSystem;

10
Scripts/Engines/Craft/DefGlassblowing.cs
View file

@ -6,15 +6,9 @@ namespace Server.Engines.Craft
{
public class DefGlassblowing : CraftSystem
{
public override SkillName MainSkill
{
get{ return SkillName.Alchemy; }
}
public override SkillName MainSkill => SkillName.Alchemy;
public override int GumpTitleNumber
{
get{ return 1044622; } // <CENTER>Glassblowing MENU</CENTER>
}
public override int GumpTitleNumber => 1044622;
private static CraftSystem m_CraftSystem;

10
Scripts/Engines/Craft/DefInscription.cs
View file

@ -6,15 +6,9 @@ namespace Server.Engines.Craft
{
public class DefInscription : CraftSystem
{
public override SkillName MainSkill
{
get { return SkillName.Inscribe; }
}
public override SkillName MainSkill => SkillName.Inscribe;
public override int GumpTitleNumber
{
get { return 1044009; } // <CENTER>INSCRIPTION MENU</CENTER>
}
public override int GumpTitleNumber => 1044009;
private static CraftSystem m_CraftSystem;

10
Scripts/Engines/Craft/DefMasonry.cs
View file

@ -6,15 +6,9 @@ namespace Server.Engines.Craft
{
public class DefMasonry : CraftSystem
{
public override SkillName MainSkill
{
get{ return SkillName.Carpentry; }
}
public override SkillName MainSkill => SkillName.Carpentry;
public override int GumpTitleNumber
{
get{ return 1044500; } // <CENTER>MASONRY MENU</CENTER>
}
public override int GumpTitleNumber => 1044500;
private static CraftSystem m_CraftSystem;

10
Scripts/Engines/Craft/DefTailoring.cs
View file

@ -5,15 +5,9 @@ namespace Server.Engines.Craft
{
public class DefTailoring : CraftSystem
{
public override SkillName MainSkill
{
get { return SkillName.Tailoring; }
}
public override SkillName MainSkill => SkillName.Tailoring;
public override int GumpTitleNumber
{
get { return 1044005; } // <CENTER>TAILORING MENU</CENTER>
}
public override int GumpTitleNumber => 1044005;
private static CraftSystem m_CraftSystem;

12
Scripts/Engines/Craft/DefTinkering.cs
View file

@ -7,15 +7,9 @@ namespace Server.Engines.Craft
{
public class DefTinkering : CraftSystem
{
public override SkillName MainSkill
{
get { return SkillName.Tinkering; }
}
public override SkillName MainSkill => SkillName.Tinkering;
public override int GumpTitleNumber
{
get { return 1044007; } // <CENTER>TINKERING MENU</CENTER>
}
public override int GumpTitleNumber => 1044007;
private static CraftSystem m_CraftSystem;
@ -388,7 +382,7 @@ namespace Server.Engines.Craft
{
private LockableContainer m_Container;
public LockableContainer Container{ get{ return m_Container; } }
public LockableContainer Container => m_Container;
public abstract TrapType TrapType{ get; }

39
Scripts/Engines/Doom/GauntletSpawner.cs
View file

@ -38,29 +38,29 @@ namespace Server.Engines.Doom
[CommandProperty( AccessLevel.GameMaster )]
public string TypeName
{
get{ return m_TypeName; }
set{ m_TypeName = value; }
get => m_TypeName;
set => m_TypeName = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public BaseDoor Door
{
get{ return m_Door; }
set{ m_Door = value; }
get => m_Door;
set => m_Door = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public BaseAddon Addon
{
get{ return m_Addon; }
set{ m_Addon = value; }
get => m_Addon;
set => m_Addon = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public GauntletSpawner Sequence
{
get{ return m_Sequence; }
set{ m_Sequence = value; }
get => m_Sequence;
set => m_Sequence = value;
}
[CommandProperty( AccessLevel.GameMaster )]
@ -86,14 +86,14 @@ namespace Server.Engines.Doom
[CommandProperty( AccessLevel.GameMaster )]
public Rectangle2D RegionBounds
{
get{ return m_RegionBounds; }
set{ m_RegionBounds = value; }
get => m_RegionBounds;
set => m_RegionBounds = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public GauntletSpawnerState State
{
get{ return m_State; }
get => m_State;
set
{
if ( m_State == value )
@ -163,20 +163,20 @@ namespace Server.Engines.Doom
public List<Mobile> Creatures
{
get{ return m_Creatures; }
set{ m_Creatures = value; }
get => m_Creatures;
set => m_Creatures = value;
}
public List<BaseTrap> Traps
{
get{ return m_Traps; }
set{ m_Traps = value; }
get => m_Traps;
set => m_Traps = value;
}
public Region Region
{
get{ return m_Region; }
set{ m_Region = value; }
get => m_Region;
set => m_Region = value;
}
public virtual void CreateRegion()
@ -380,10 +380,7 @@ namespace Server.Engines.Doom
}
}
public override string DefaultName
{
get { return "doom spawner"; }
}
public override string DefaultName => "doom spawner";
[Constructible]
public GauntletSpawner() : this( null )

14
Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleController.cs
View file

@ -58,15 +58,21 @@ namespace Server.Engines.Doom
}
[CommandProperty( AccessLevel.GameMaster )]
public UInt16 MyKey { get{ return m_MyKey; } set{ m_MyKey = value; } }
public UInt16 MyKey { get => m_MyKey;
set => m_MyKey = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public UInt16 TheirKey { get{ return m_TheirKey; } set{ m_TheirKey = value; } }
public UInt16 TheirKey { get => m_TheirKey;
set => m_TheirKey = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool Enabled { get{ return m_Enabled; } set{ m_Enabled = value; } }
public bool Enabled { get => m_Enabled;
set => m_Enabled = value;
}
public Mobile Successful { get{ return m_Successful; } }
public Mobile Successful => m_Successful;
public bool CircleComplete
{

5
Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleItems.cs
View file

@ -99,10 +99,7 @@ namespace Server.Engines.Doom
private LeverPuzzleController m_Controller;
[CommandProperty( AccessLevel.GameMaster )]
public UInt16 Code
{
get{ return m_Code; }
}
public UInt16 Code => m_Code;
public LeverPuzzleLever( UInt16 code, LeverPuzzleController controller ) : base( 0x108E )
{

10
Scripts/Engines/Ethics/Core/Ethic.cs
View file

@ -159,15 +159,9 @@ namespace Server.Ethics
protected PlayerCollection m_Players;
public EthicDefinition Definition
{
get { return m_Definition; }
}
public EthicDefinition Definition => m_Definition;
public PlayerCollection Players
{
get { return m_Players; }
}
public PlayerCollection Players => m_Players;
public static Ethic Find( Mobile mob )
{

5
Scripts/Engines/Ethics/Core/Persistance.cs
View file

@ -6,10 +6,7 @@ namespace Server.Ethics
public static EthicsPersistance Instance => m_Instance;
public override string DefaultName
{
get { return "Ethics Persistance - Internal"; }
}
public override string DefaultName => "Ethics Persistance - Internal";
[Constructible]
public EthicsPersistance()

16
Scripts/Engines/Ethics/Core/Player.cs
View file

@ -56,16 +56,24 @@ namespace Server.Ethics
public Mobile Mobile => m_Mobile;
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
public int Power { get { return m_Power; } set { m_Power = value; } }
public int Power { get => m_Power;
set => m_Power = value;
}
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
public int History { get { return m_History; } set { m_History = value; } }
public int History { get => m_History;
set => m_History = value;
}
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
public Mobile Steed { get { return m_Steed; } set { m_Steed = value; } }
public Mobile Steed { get => m_Steed;
set => m_Steed = value;
}
[CommandProperty( AccessLevel.GameMaster, AccessLevel.Administrator )]
public Mobile Familiar { get { return m_Familiar; } set { m_Familiar = value; } }
public Mobile Familiar { get => m_Familiar;
set => m_Familiar = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool IsShielded

33
Scripts/Engines/Factions/Core/Election.cs
View file

@ -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()
{

43
Scripts/Engines/Factions/Core/Faction.cs
View file

@ -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 )
{

6
Scripts/Engines/Factions/Core/FactionItem.cs
View file

@ -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
{

32
Scripts/Engines/Factions/Core/FactionState.cs
View file

@ -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 )

4
Scripts/Engines/Factions/Core/GuardList.cs
View file

@ -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()
{

12
Scripts/Engines/Factions/Core/MerchantTitles.cs
View file

@ -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 )
{

7
Scripts/Engines/Factions/Core/Persistance.cs
View file

@ -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 )
{

32
Scripts/Engines/Factions/Core/PlayerState.cs
View file

@ -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 )
{

6
Scripts/Engines/Factions/Core/SilverGivenEntry.cs
View file

@ -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 )
{

4
Scripts/Engines/Factions/Core/StrongholdRegion.cs
View file

@ -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 )

57
Scripts/Engines/Factions/Core/Town.cs
View file

@ -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()

28
Scripts/Engines/Factions/Core/TownState.cs
View file

@ -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 )

2
Scripts/Engines/Factions/Core/VendorList.cs
View file

@ -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 )

48
Scripts/Engines/Factions/Definitions/FactionDefinition.cs
View file

@ -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 )
{

4
Scripts/Engines/Factions/Definitions/FactionItemDefinition.cs
View file

@ -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 )
{

14
Scripts/Engines/Factions/Definitions/GuardDefinition.cs
View file

@ -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 )
{

8
Scripts/Engines/Factions/Definitions/RankDefinition.cs
View file

@ -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 )
{

8
Scripts/Engines/Factions/Definitions/StrongholdDefintion.cs
View file

@ -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 )
{

26
Scripts/Engines/Factions/Definitions/TownDefinition.cs
View file

@ -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 )
{

16
Scripts/Engines/Factions/Definitions/VendorDefinition.cs
View file

@ -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;
}
}

2
Scripts/Engines/Factions/Gumps/FactionGump.cs
View file

@ -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 )
{

2
Scripts/Engines/Factions/Instances/Factions/CouncilOfMages.cs
View file

@ -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()
{

2
Scripts/Engines/Factions/Instances/Factions/Minax.cs
View file

@ -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()
{

2
Scripts/Engines/Factions/Instances/Factions/Shadowlords.cs
View file

@ -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()
{

2
Scripts/Engines/Factions/Instances/Factions/TrueBritannians.cs
View file

@ -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()
{

10
Scripts/Engines/Factions/Items/BaseMonolith.cs
View file

@ -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
Scripts/Engines/Factions/Items/BaseSystemController.cs
View file

@ -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
{

2
Scripts/Engines/Factions/Items/FactionStone.cs
View file

@ -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
Scripts/Engines/Factions/Items/JoinStone.cs
View file

@ -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;

6
Scripts/Engines/Factions/Items/Power Faction Items/BloodRose.cs
View file

@ -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 ) ) {

6
Scripts/Engines/Factions/Items/Power Faction Items/ClarityPotion.cs
View file

@ -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 ) {

6
Scripts/Engines/Factions/Items/Power Faction Items/GemOfEmpowerment.cs
View file

@ -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 ) {

12
Scripts/Engines/Factions/Items/Power Faction Items/PowerFactionItem.cs
View file

@ -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;

6
Scripts/Engines/Factions/Items/Power Faction Items/StormsEye.cs
View file

@ -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 ) {

6
Scripts/Engines/Factions/Items/Power Faction Items/UrnOfAscension.cs
View file

@ -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 ) {

48
Scripts/Engines/Factions/Items/Sigil.cs
View file

@ -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;
}
}

5
Scripts/Engines/Factions/Items/Silver.cs
View file

@ -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 )

Some files were not shown because too many files have changed in this diff Show more