Fixes body expression style.
This commit is contained in:
Kamron Batman
parent
3f0a72a62f
commit
33f5e77a24
957 changed files with 7424 additions and 15973 deletions
|
|
@ -17,11 +17,12 @@ namespace Server.Multis
|
|||
{
|
||||
public abstract class BaseHouse : BaseMulti
|
||||
{
|
||||
public static bool NewVendorSystem{ get{ return Core.AOS; } } // Is new player vendor system enabled?
|
||||
public static bool NewVendorSystem // Is new player vendor system enabled?
|
||||
=> Core.AOS;
|
||||
|
||||
public const int MaxCoOwners = 15;
|
||||
public static int MaxFriends { get { return !Core.AOS ? 50 : 140; } }
|
||||
public static int MaxBans { get { return !Core.AOS ? 50 : 140; } }
|
||||
public static int MaxFriends => !Core.AOS ? 50 : 140;
|
||||
public static int MaxBans => !Core.AOS ? 50 : 140;
|
||||
|
||||
#region Dynamic decay system
|
||||
private DecayLevel m_CurrentStage;
|
||||
|
|
@ -30,8 +31,8 @@ namespace Server.Multis
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public DateTime NextDecayStage
|
||||
{
|
||||
get { return m_NextDecayStage; }
|
||||
set { m_NextDecayStage = value; }
|
||||
get => m_NextDecayStage;
|
||||
set => m_NextDecayStage = value;
|
||||
}
|
||||
|
||||
public void ResetDynamicDecay()
|
||||
|
|
@ -65,18 +66,18 @@ namespace Server.Multis
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public DateTime LastRefreshed
|
||||
{
|
||||
get{ return m_LastRefreshed; }
|
||||
set{ m_LastRefreshed = value; }
|
||||
get => m_LastRefreshed;
|
||||
set => m_LastRefreshed = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool RestrictDecay
|
||||
{
|
||||
get{ return m_RestrictDecay; }
|
||||
set{ m_RestrictDecay = value; }
|
||||
get => m_RestrictDecay;
|
||||
set => m_RestrictDecay = value;
|
||||
}
|
||||
|
||||
public virtual TimeSpan DecayPeriod{ get{ return TimeSpan.FromDays( 5.0 ); } }
|
||||
public virtual TimeSpan DecayPeriod => TimeSpan.FromDays( 5.0 );
|
||||
|
||||
public virtual DecayType DecayType
|
||||
{
|
||||
|
|
@ -276,10 +277,10 @@ namespace Server.Multis
|
|||
Delete();
|
||||
}
|
||||
|
||||
public virtual TimeSpan RestrictedPlacingTime { get { return TimeSpan.FromHours( 1.0 ); } }
|
||||
public virtual TimeSpan RestrictedPlacingTime => TimeSpan.FromHours( 1.0 );
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public virtual double BonusStorageScalar { get { return (Core.ML ? 1.2 : 1.0); } }
|
||||
public virtual double BonusStorageScalar => (Core.ML ? 1.2 : 1.0);
|
||||
|
||||
private bool m_Public;
|
||||
|
||||
|
|
@ -322,9 +323,9 @@ namespace Server.Multis
|
|||
|
||||
private static Dictionary<Mobile, List<BaseHouse>> m_Table = new Dictionary<Mobile, List<BaseHouse>>();
|
||||
|
||||
public virtual bool IsAosRules{ get{ return Core.AOS; } }
|
||||
public virtual bool IsAosRules => Core.AOS;
|
||||
|
||||
public virtual bool IsActive{ get{ return true; } }
|
||||
public virtual bool IsActive => true;
|
||||
|
||||
public virtual HousePlacementEntry GetAosEntry()
|
||||
{
|
||||
|
|
@ -1205,10 +1206,7 @@ namespace Server.Multis
|
|||
|
||||
private static List<BaseHouse> m_AllHouses = new List<BaseHouse>();
|
||||
|
||||
public static List<BaseHouse> AllHouses
|
||||
{
|
||||
get { return m_AllHouses; }
|
||||
}
|
||||
public static List<BaseHouse> AllHouses => m_AllHouses;
|
||||
|
||||
public BaseHouse( int multiID, Mobile owner, int MaxLockDown, int MaxSecure ) : base( multiID )
|
||||
{
|
||||
|
|
@ -1651,10 +1649,7 @@ namespace Server.Multis
|
|||
{
|
||||
private BaseHouse m_House;
|
||||
|
||||
public override string DefaultName
|
||||
{
|
||||
get { return "a house transfer contract"; }
|
||||
}
|
||||
public override string DefaultName => "a house transfer contract";
|
||||
|
||||
public TransferItem( BaseHouse house ) : base( 0x14F0 )
|
||||
{
|
||||
|
|
@ -2074,13 +2069,7 @@ namespace Server.Multis
|
|||
m.SendLocalizedMessage( 501717 );//This isn't secure...
|
||||
}
|
||||
|
||||
public override bool Decays
|
||||
{
|
||||
get
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
public override bool Decays => false;
|
||||
|
||||
public void AddStrongBox( Mobile from )
|
||||
{
|
||||
|
|
@ -2808,10 +2797,7 @@ namespace Server.Multis
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Mobile Owner
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Owner;
|
||||
}
|
||||
get => m_Owner;
|
||||
set
|
||||
{
|
||||
if ( m_Owner != null )
|
||||
|
|
@ -2846,17 +2832,14 @@ namespace Server.Multis
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int Visits
|
||||
{
|
||||
get{ return m_Visits; }
|
||||
set{ m_Visits = value; }
|
||||
get => m_Visits;
|
||||
set => m_Visits = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public bool Public
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_Public;
|
||||
}
|
||||
get => m_Public;
|
||||
set
|
||||
{
|
||||
if ( m_Public != value )
|
||||
|
|
@ -2875,14 +2858,8 @@ namespace Server.Multis
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int MaxSecures
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_MaxSecures;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_MaxSecures = value;
|
||||
}
|
||||
get => m_MaxSecures;
|
||||
set => m_MaxSecures = value;
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
|
|
@ -2896,19 +2873,13 @@ namespace Server.Multis
|
|||
Point3D rel = m_RelativeBanLocation;
|
||||
return new Point3D( this.X + rel.X, this.Y + rel.Y, this.Z + rel.Z );
|
||||
}
|
||||
set
|
||||
{
|
||||
this.RelativeBanLocation = new Point3D( value.X - this.X, value.Y - this.Y, value.Z - this.Z );
|
||||
}
|
||||
set => this.RelativeBanLocation = new Point3D( value.X - this.X, value.Y - this.Y, value.Z - this.Z );
|
||||
}
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public Point3D RelativeBanLocation
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_RelativeBanLocation;
|
||||
}
|
||||
get => m_RelativeBanLocation;
|
||||
set
|
||||
{
|
||||
m_RelativeBanLocation = value;
|
||||
|
|
@ -2921,22 +2892,26 @@ namespace Server.Multis
|
|||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int MaxLockDowns
|
||||
{
|
||||
get
|
||||
{
|
||||
return m_MaxLockDowns;
|
||||
}
|
||||
set
|
||||
{
|
||||
m_MaxLockDowns = value;
|
||||
}
|
||||
get => m_MaxLockDowns;
|
||||
set => m_MaxLockDowns = value;
|
||||
}
|
||||
|
||||
public Region Region{ get{ return m_Region; } }
|
||||
public ArrayList CoOwners{ get{ return m_CoOwners; } set{ m_CoOwners = value; } }
|
||||
public ArrayList Friends{ get{ return m_Friends; } set{ m_Friends = value; } }
|
||||
public ArrayList Access{ get{ return m_Access; } set{ m_Access = value; } }
|
||||
public ArrayList Bans{ get{ return m_Bans; } set{ m_Bans = value; } }
|
||||
public ArrayList Doors{ get{ return m_Doors; } set{ m_Doors = value; } }
|
||||
public Region Region => m_Region;
|
||||
public ArrayList CoOwners{ get => m_CoOwners;
|
||||
set => m_CoOwners = value;
|
||||
}
|
||||
public ArrayList Friends{ get => m_Friends;
|
||||
set => m_Friends = value;
|
||||
}
|
||||
public ArrayList Access{ get => m_Access;
|
||||
set => m_Access = value;
|
||||
}
|
||||
public ArrayList Bans{ get => m_Bans;
|
||||
set => m_Bans = value;
|
||||
}
|
||||
public ArrayList Doors{ get => m_Doors;
|
||||
set => m_Doors = value;
|
||||
}
|
||||
|
||||
public int GetLockdowns()
|
||||
{
|
||||
|
|
@ -3011,28 +2986,34 @@ namespace Server.Multis
|
|||
}
|
||||
}
|
||||
|
||||
public ArrayList Addons{ get{ return m_Addons; } set{ m_Addons = value; } }
|
||||
public ArrayList LockDowns{ get{ return m_LockDowns; } }
|
||||
public ArrayList Secures{ get{ return m_Secures; } }
|
||||
public HouseSign Sign{ get{ return m_Sign; } set{ m_Sign = value; } }
|
||||
public ArrayList PlayerVendors{ get{ return m_PlayerVendors; } }
|
||||
public ArrayList PlayerBarkeepers{ get{ return m_PlayerBarkeepers; } }
|
||||
public ArrayList VendorRentalContracts{ get{ return m_VendorRentalContracts; } }
|
||||
public ArrayList VendorInventories{ get{ return m_VendorInventories; } }
|
||||
public ArrayList RelocatedEntities{ get{ return m_RelocatedEntities; } }
|
||||
public MovingCrate MovingCrate{ get{ return m_MovingCrate; } set{ m_MovingCrate = value; } }
|
||||
public ArrayList InternalizedVendors{ get{ return m_InternalizedVendors; } }
|
||||
public ArrayList Addons{ get => m_Addons;
|
||||
set => m_Addons = value;
|
||||
}
|
||||
public ArrayList LockDowns => m_LockDowns;
|
||||
public ArrayList Secures => m_Secures;
|
||||
public HouseSign Sign{ get => m_Sign;
|
||||
set => m_Sign = value;
|
||||
}
|
||||
public ArrayList PlayerVendors => m_PlayerVendors;
|
||||
public ArrayList PlayerBarkeepers => m_PlayerBarkeepers;
|
||||
public ArrayList VendorRentalContracts => m_VendorRentalContracts;
|
||||
public ArrayList VendorInventories => m_VendorInventories;
|
||||
public ArrayList RelocatedEntities => m_RelocatedEntities;
|
||||
public MovingCrate MovingCrate{ get => m_MovingCrate;
|
||||
set => m_MovingCrate = value;
|
||||
}
|
||||
public ArrayList InternalizedVendors => m_InternalizedVendors;
|
||||
|
||||
public DateTime BuiltOn
|
||||
{
|
||||
get{ return m_BuiltOn; }
|
||||
set{ m_BuiltOn = value; }
|
||||
get => m_BuiltOn;
|
||||
set => m_BuiltOn = value;
|
||||
}
|
||||
|
||||
public DateTime LastTraded
|
||||
{
|
||||
get{ return m_LastTraded; }
|
||||
set{ m_LastTraded = value; }
|
||||
get => m_LastTraded;
|
||||
set => m_LastTraded = value;
|
||||
}
|
||||
|
||||
public override void OnDelete()
|
||||
|
|
@ -3342,15 +3323,17 @@ namespace Server.Multis
|
|||
}
|
||||
}
|
||||
|
||||
public virtual HousePlacementEntry ConvertEntry{ get{ return null; } }
|
||||
public virtual int ConvertOffsetX{ get{ return 0; } }
|
||||
public virtual int ConvertOffsetY{ get{ return 0; } }
|
||||
public virtual int ConvertOffsetZ{ get{ return 0; } }
|
||||
public virtual HousePlacementEntry ConvertEntry => null;
|
||||
public virtual int ConvertOffsetX => 0;
|
||||
public virtual int ConvertOffsetY => 0;
|
||||
public virtual int ConvertOffsetZ => 0;
|
||||
|
||||
public virtual int DefaultPrice{ get{ return 0; } }
|
||||
public virtual int DefaultPrice => 0;
|
||||
|
||||
[CommandProperty( AccessLevel.GameMaster )]
|
||||
public int Price{ get{ return m_Price; } set{ m_Price = value; } }
|
||||
public int Price{ get => m_Price;
|
||||
set => m_Price = value;
|
||||
}
|
||||
|
||||
public virtual HouseDeed GetDeed()
|
||||
{
|
||||
|
|
@ -3514,8 +3497,10 @@ namespace Server.Multis
|
|||
private Container m_Item;
|
||||
private SecureLevel m_Level;
|
||||
|
||||
public Container Item{ get{ return m_Item; } }
|
||||
public SecureLevel Level{ get{ return m_Level; } set{ m_Level = value; } }
|
||||
public Container Item => m_Item;
|
||||
public SecureLevel Level{ get => m_Level;
|
||||
set => m_Level = value;
|
||||
}
|
||||
|
||||
public SecureInfo( Container item, SecureLevel level )
|
||||
{
|
||||
|
|
@ -3541,15 +3526,9 @@ namespace Server.Multis
|
|||
private IEntity m_Entity;
|
||||
private Point3D m_RelativeLocation;
|
||||
|
||||
public IEntity Entity
|
||||
{
|
||||
get{ return m_Entity; }
|
||||
}
|
||||
public IEntity Entity => m_Entity;
|
||||
|
||||
public Point3D RelativeLocation
|
||||
{
|
||||
get{ return m_RelativeLocation; }
|
||||
}
|
||||
public Point3D RelativeLocation => m_RelativeLocation;
|
||||
|
||||
public RelocatedEntity( IEntity entity, Point3D relativeLocation )
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue