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

18
Scripts/Regions/BaseRegion.cs
View file

@ -35,13 +35,17 @@ namespace Server.Regions
private SpawnZLevel m_SpawnZLevel;
private bool m_ExcludeFromParentSpawns;
public string RuneName{ get{ return m_RuneName; } set{ m_RuneName = value; } }
public string RuneName{ get => m_RuneName;
set => m_RuneName = value;
}
public bool NoLogoutDelay{ get{ return m_NoLogoutDelay; } set{ m_NoLogoutDelay = value; } }
public bool NoLogoutDelay{ get => m_NoLogoutDelay;
set => m_NoLogoutDelay = value;
}
public SpawnEntry[] Spawns
{
get{ return m_Spawns; }
get => m_Spawns;
set
{
if ( m_Spawns != null )
@ -54,9 +58,13 @@ namespace Server.Regions
}
}
public SpawnZLevel SpawnZLevel{ get{ return m_SpawnZLevel; } set{ m_SpawnZLevel = value; } }
public SpawnZLevel SpawnZLevel{ get => m_SpawnZLevel;
set => m_SpawnZLevel = value;
}
public bool ExcludeFromParentSpawns{ get{ return m_ExcludeFromParentSpawns; } set{ m_ExcludeFromParentSpawns = value; } }
public bool ExcludeFromParentSpawns{ get => m_ExcludeFromParentSpawns;
set => m_ExcludeFromParentSpawns = value;
}
public override void OnUnregister()
{

8
Scripts/Regions/DungeonRegion.cs
View file

@ -9,8 +9,12 @@ namespace Server.Regions
private Point3D m_EntranceLocation;
private Map m_EntranceMap;
public Point3D EntranceLocation{ get{ return m_EntranceLocation; } set{ m_EntranceLocation = value; } }
public Map EntranceMap{ get{ return m_EntranceMap; } set{ m_EntranceMap = value; } }
public Point3D EntranceLocation{ get => m_EntranceLocation;
set => m_EntranceLocation = value;
}
public Map EntranceMap{ get => m_EntranceMap;
set => m_EntranceMap = value;
}
public DungeonRegion( XmlElement xml, Map map, Region parent ) : base( xml, map, parent )
{

6
Scripts/Regions/GuardedRegion.cs
View file

@ -12,7 +12,9 @@ namespace Server.Regions
private Type m_GuardType;
private bool m_Disabled;
public bool Disabled{ get{ return m_Disabled; } set{ m_Disabled = value; } }
public bool Disabled{ get => m_Disabled;
set => m_Disabled = value;
}
public virtual bool IsDisabled()
{
@ -99,7 +101,7 @@ namespace Server.Regions
return reg;
}
public virtual bool AllowReds{ get{ return Core.AOS; } }
public virtual bool AllowReds => Core.AOS;
public virtual bool CheckVendorAccess( BaseVendor vendor, Mobile from )
{

8
Scripts/Regions/HouseRegion.cs
View file

@ -417,12 +417,6 @@ namespace Server.Regions
return base.OnSingleClick( from, o );
}
public BaseHouse House
{
get
{
return m_House;
}
}
public BaseHouse House => m_House;
}
}

2
Scripts/Regions/NoHousingRegion.cs
View file

@ -9,7 +9,7 @@ namespace Server.Regions
*/
private bool m_SmartChecking;
public bool SmartChecking{ get{ return m_SmartChecking; } }
public bool SmartChecking => m_SmartChecking;
public NoHousingRegion( XmlElement xml, Map map, Region parent ) : base( xml, map, parent )
{

16
Scripts/Regions/Spawning/SpawnDefinition.cs
View file

@ -84,7 +84,7 @@ namespace Server.Regions
private Type m_Type;
private bool m_Init;
public Type Type{ get{ return m_Type; } }
public Type Type => m_Type;
public abstract int Height{ get; }
public abstract bool Land{ get; }
@ -261,8 +261,8 @@ namespace Server.Regions
private int m_ItemID;
private BaseTreasureChest.TreasureLevel m_Level;
public int ItemID{ get{ return m_ItemID; } }
public BaseTreasureChest.TreasureLevel Level{ get{ return m_Level; } }
public int ItemID => m_ItemID;
public BaseTreasureChest.TreasureLevel Level => m_Level;
public SpawnTreasureChest( int itemID, BaseTreasureChest.TreasureLevel level ) : base( typeof( BaseTreasureChest ) )
{
@ -286,8 +286,8 @@ namespace Server.Regions
private SpawnDefinition m_SpawnDefinition;
private int m_Weight;
public SpawnDefinition SpawnDefinition{ get{ return m_SpawnDefinition; } }
public int Weight{ get{ return m_Weight; } }
public SpawnDefinition SpawnDefinition => m_SpawnDefinition;
public int Weight => m_Weight;
public SpawnGroupElement( SpawnDefinition spawnDefinition, int weight )
{
@ -300,7 +300,7 @@ namespace Server.Regions
{
private static Hashtable m_Table = new Hashtable();
public static Hashtable Table{ get{ return m_Table; } }
public static Hashtable Table => m_Table;
public static void Register( SpawnGroup group )
{
@ -365,8 +365,8 @@ namespace Server.Regions
private SpawnGroupElement[] m_Elements;
private int m_TotalWeight;
public string Name{ get{ return m_Name; } }
public SpawnGroupElement[] Elements{ get{ return m_Elements; } }
public string Name => m_Name;
public SpawnGroupElement[] Elements => m_Elements;
public SpawnGroup( string name, SpawnGroupElement[] elements )
{

36
Scripts/Regions/Spawning/SpawnEntry.cs
View file

@ -13,17 +13,17 @@ namespace Server.Regions
private static Hashtable m_Table = new Hashtable();
public static Hashtable Table{ get{ return m_Table; } }
public static Hashtable Table => m_Table;
// When a creature's AI is deactivated (PlayerRangeSensitive optimization) does it return home?
public bool ReturnOnDeactivate{ get{ return true; } }
public bool ReturnOnDeactivate => true;
// Are creatures unlinked on taming (true) or should they also go out of the region (false)?
public bool UnlinkOnTaming{ get{ return false; } }
public bool UnlinkOnTaming => false;
// Are unlinked and untamed creatures removed after 20 hours?
public bool RemoveIfUntamed{ get{ return true; } }
public bool RemoveIfUntamed => true;
public static readonly Direction InvalidDirection = Direction.Running;
@ -43,21 +43,21 @@ namespace Server.Regions
private DateTime m_NextSpawn;
private Timer m_SpawnTimer;
public int ID{ get{ return m_ID; } }
public BaseRegion Region{ get{ return m_Region; } }
Region ISpawner.Region{ get{ return m_Region; } }
public Point3D HomeLocation{ get{ return m_Home; } }
public int HomeRange{ get{ return m_Range; } }
public Direction Direction{ get{ return m_Direction; } }
public SpawnDefinition Definition{ get{ return m_Definition; } }
public List<ISpawnable> SpawnedObjects{ get{ return m_SpawnedObjects; } }
public int Max{ get{ return m_Max; } }
public TimeSpan MinSpawnTime{ get{ return m_MinSpawnTime; } }
public TimeSpan MaxSpawnTime{ get{ return m_MaxSpawnTime; } }
public bool Running{ get{ return m_Running; } }
public int ID => m_ID;
public BaseRegion Region => m_Region;
Region ISpawner.Region => m_Region;
public Point3D HomeLocation => m_Home;
public int HomeRange => m_Range;
public Direction Direction => m_Direction;
public SpawnDefinition Definition => m_Definition;
public List<ISpawnable> SpawnedObjects => m_SpawnedObjects;
public int Max => m_Max;
public TimeSpan MinSpawnTime => m_MinSpawnTime;
public TimeSpan MaxSpawnTime => m_MaxSpawnTime;
public bool Running => m_Running;
public bool Complete{ get{ return m_SpawnedObjects.Count >= m_Max; } }
public bool Spawning{ get{ return m_Running && !this.Complete; } }
public bool Complete => m_SpawnedObjects.Count >= m_Max;
public bool Spawning => m_Running && !this.Complete;
public SpawnEntry( int id, BaseRegion region, Point3D home, int range, Direction direction, SpawnDefinition definition, int max, TimeSpan minSpawnTime, TimeSpan maxSpawnTime )
{

7
Scripts/Regions/Spawning/SpawnPersistence.cs
View file

@ -5,7 +5,7 @@ namespace Server.Regions
{
private static SpawnPersistence m_Instance;
public SpawnPersistence Instance{ get{ return m_Instance; } }
public SpawnPersistence Instance => m_Instance;
public static void EnsureExistence()
{
@ -13,10 +13,7 @@ namespace Server.Regions
m_Instance = new SpawnPersistence();
}
public override string DefaultName
{
get { return "Region spawn persistence - Internal"; }
}
public override string DefaultName => "Region spawn persistence - Internal";
private SpawnPersistence() : base( 1 )
{