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

179
Scripts/Multis/BaseHouse.cs
View file

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

85
Scripts/Multis/Boats/BaseBoat.cs
View file

@ -61,49 +61,75 @@ namespace Server.Multis
private Timer m_MoveTimer;
[CommandProperty( AccessLevel.GameMaster )]
public Hold Hold{ get{ return m_Hold; } set{ m_Hold = value; } }
public Hold Hold{ get => m_Hold;
set => m_Hold = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public TillerMan TillerMan{ get{ return m_TillerMan; } set{ m_TillerMan = value; } }
public TillerMan TillerMan{ get => m_TillerMan;
set => m_TillerMan = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Plank PPlank{ get{ return m_PPlank; } set{ m_PPlank = value; } }
public Plank PPlank{ get => m_PPlank;
set => m_PPlank = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Plank SPlank{ get{ return m_SPlank; } set{ m_SPlank = value; } }
public Plank SPlank{ get => m_SPlank;
set => m_SPlank = value;
}
[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 Direction Facing{ get{ return m_Facing; } set{ SetFacing( value ); } }
public Direction Facing{ get => m_Facing;
set => SetFacing( value );
}
[CommandProperty( AccessLevel.GameMaster )]
public Direction Moving{ get{ return m_Moving; } set{ m_Moving = value; } }
public Direction Moving{ get => m_Moving;
set => m_Moving = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool IsMoving{ get{ return ( m_MoveTimer != null ); } }
public bool IsMoving => ( m_MoveTimer != null );
[CommandProperty( AccessLevel.GameMaster )]
public int Speed{ get{ return m_Speed; } set{ m_Speed = value; } }
public int Speed{ get => m_Speed;
set => m_Speed = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool Anchored{ get{ return m_Anchored; } set{ m_Anchored = value; } }
public bool Anchored{ get => m_Anchored;
set => m_Anchored = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public string ShipName{ get{ return m_ShipName; } set{ m_ShipName = value; if ( m_TillerMan != null ) m_TillerMan.InvalidateProperties(); } }
public string ShipName{ get => m_ShipName;
set{ m_ShipName = value; if ( m_TillerMan != null ) m_TillerMan.InvalidateProperties(); } }
[CommandProperty( AccessLevel.GameMaster )]
public BoatOrder Order{ get{ return m_Order; } set{ m_Order = value; } }
public BoatOrder Order{ get => m_Order;
set => m_Order = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public MapItem MapItem{ get{ return m_MapItem; } set{ m_MapItem = value; } }
public MapItem MapItem{ get => m_MapItem;
set => m_MapItem = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int NextNavPoint{ get{ return m_NextNavPoint; } set{ m_NextNavPoint = value; } }
public int NextNavPoint{ get => m_NextNavPoint;
set => m_NextNavPoint = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public DateTime TimeOfDecay{ get{ return m_DecayTime; } set{ m_DecayTime = value; if ( m_TillerMan != null ) m_TillerMan.InvalidateProperties(); } }
public DateTime TimeOfDecay{ get => m_DecayTime;
set{ m_DecayTime = value; if ( m_TillerMan != null ) m_TillerMan.InvalidateProperties(); } }
public int Status
{
@ -130,22 +156,22 @@ namespace Server.Multis
}
}
public virtual int NorthID{ get{ return 0; } }
public virtual int EastID{ get{ return 0; } }
public virtual int SouthID{ get{ return 0; } }
public virtual int WestID{ get{ return 0; } }
public virtual int NorthID => 0;
public virtual int EastID => 0;
public virtual int SouthID => 0;
public virtual int WestID => 0;
public virtual int HoldDistance{ get{ return 0; } }
public virtual int TillerManDistance{ get{ return 0; } }
public virtual Point2D StarboardOffset{ get{ return Point2D.Zero; } }
public virtual Point2D PortOffset{ get{ return Point2D.Zero; } }
public virtual Point3D MarkOffset{ get{ return Point3D.Zero; } }
public virtual int HoldDistance => 0;
public virtual int TillerManDistance => 0;
public virtual Point2D StarboardOffset => Point2D.Zero;
public virtual Point2D PortOffset => Point2D.Zero;
public virtual Point3D MarkOffset => Point3D.Zero;
public virtual BaseDockedBoat DockedBoat{ get{ return null; } }
public virtual BaseDockedBoat DockedBoat => null;
private static List<BaseBoat> m_Instances = new List<BaseBoat>();
public static List<BaseBoat> Boats{ get{ return m_Instances; } }
public static List<BaseBoat> Boats => m_Instances;
public BaseBoat() : base( 0x0 )
{
@ -433,7 +459,7 @@ namespace Server.Multis
* 'walking' in piloting mode has a 1s interval, speed 0x2
*/
private static bool NewBoatMovement { get { return Core.HS; } }
private static bool NewBoatMovement => Core.HS;
private static TimeSpan SlowInterval = TimeSpan.FromSeconds( NewBoatMovement ? 0.50 : 0.75 );
private static TimeSpan FastInterval = TimeSpan.FromSeconds( NewBoatMovement ? 0.25 : 0.75 );
@ -1739,10 +1765,7 @@ namespace Server.Multis
#region High Seas
public override bool AllowsRelativeDrop
{
get { return true; }
}
public override bool AllowsRelativeDrop => true;
/*
* OSI sends the 0xF7 packet instead, holding 0xF3 packets

8
Scripts/Multis/Boats/BaseBoatDeed.cs
View file

@ -11,10 +11,14 @@ namespace Server.Multis
private Point3D m_Offset;
[CommandProperty( AccessLevel.GameMaster )]
public int MultiID{ get{ return m_MultiID; } set{ m_MultiID = value; } }
public int MultiID{ get => m_MultiID;
set => m_MultiID = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D Offset{ get{ return m_Offset; } set{ m_Offset = value; } }
public Point3D Offset{ get => m_Offset;
set => m_Offset = value;
}
public BaseBoatDeed( int id, Point3D offset ) : base( 0x14F2 )
{

11
Scripts/Multis/Boats/BaseDockedBoat.cs
View file

@ -11,13 +11,18 @@ namespace Server.Multis
private string m_ShipName;
[CommandProperty( AccessLevel.GameMaster )]
public int MultiID{ get{ return m_MultiID; } set{ m_MultiID = value; } }
public int MultiID{ get => m_MultiID;
set => m_MultiID = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D Offset{ get{ return m_Offset; } set{ m_Offset = value; } }
public Point3D Offset{ get => m_Offset;
set => m_Offset = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public string ShipName{ get{ return m_ShipName; } set{ m_ShipName = value; InvalidateProperties(); } }
public string ShipName{ get => m_ShipName;
set{ m_ShipName = value; InvalidateProperties(); } }
public BaseDockedBoat( int id, Point3D offset, BaseBoat boat ) : base( 0x14F4 )
{

5
Scripts/Multis/Boats/Hold.cs
View file

@ -84,10 +84,7 @@ namespace Server.Items
}
}
public override bool IsDecoContainer
{
get{ return false; }
}
public override bool IsDecoContainer => false;
public override void Serialize( GenericWriter writer )
{

20
Scripts/Multis/Boats/Plank.cs
View file

@ -71,22 +71,30 @@ namespace Server.Items
}
[CommandProperty( AccessLevel.GameMaster )]
public BaseBoat Boat{ get{ return m_Boat; } set{ m_Boat = value; } }
public BaseBoat Boat{ get => m_Boat;
set => m_Boat = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public PlankSide Side{ get{ return m_Side; } set{ m_Side = value; } }
public PlankSide Side{ get => m_Side;
set => m_Side = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool Locked{ get{ return m_Locked; } set{ m_Locked = value; } }
public bool Locked{ get => m_Locked;
set => m_Locked = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public uint KeyValue{ get{ return m_KeyValue; } set{ m_KeyValue = value; } }
public uint KeyValue{ get => m_KeyValue;
set => m_KeyValue = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool IsOpen{ get{ return ( ItemID == 0x3ED5 || ItemID == 0x3ED4 || ItemID == 0x3E84 || ItemID == 0x3E89 ); } }
public bool IsOpen => ( ItemID == 0x3ED5 || ItemID == 0x3ED4 || ItemID == 0x3E84 || ItemID == 0x3E89 );
[CommandProperty( AccessLevel.GameMaster )]
public bool Starboard{ get{ return ( m_Side == PlankSide.Starboard ); } }
public bool Starboard => ( m_Side == PlankSide.Starboard );
public void SetFacing( Direction dir )
{

7
Scripts/Multis/Camps/BaseCamp.cs
View file

@ -13,14 +13,11 @@ namespace Server.Multis
private Timer m_DecayTimer;
private TimeSpan m_DecayDelay;
public virtual int EventRange{ get{ return 10; } }
public virtual int EventRange => 10;
public virtual TimeSpan DecayDelay
{
get
{
return m_DecayDelay;
}
get => m_DecayDelay;
set
{
m_DecayDelay = value;

6
Scripts/Multis/Camps/BrigandCamp.cs
View file

@ -6,9 +6,9 @@ namespace Server.Multis
{
public class BrigandCamp : BaseCamp
{
public virtual Mobile Brigands{ get{ return new Brigand(); } }
public virtual Mobile Executioners{ get{ return new Executioner(); } }
public virtual Mobile Brigands => new Brigand();
public virtual Mobile Executioners => new Executioner();
private Mobile m_Prisoner;
[Constructible]

4
Scripts/Multis/Camps/LizardmenCamp.cs
View file

@ -6,8 +6,8 @@ namespace Server.Multis
{
public class LizardmenCamp : BaseCamp
{
public virtual Mobile Lizardmen{ get{ return new Lizardman(); } }
public virtual Mobile Lizardmen => new Lizardman();
private Mobile m_Prisoner;
[Constructible]

2
Scripts/Multis/Camps/OrcCamp.cs
View file

@ -6,7 +6,7 @@ namespace Server.Multis
{
public class OrcCamp : BaseCamp
{
public virtual Mobile Orcs{ get{ return new Orc(); } }
public virtual Mobile Orcs => new Orc();
private Mobile m_Prisoner;

2
Scripts/Multis/Camps/RatCamp.cs
View file

@ -6,7 +6,7 @@ namespace Server.Multis
{
public class RatCamp : BaseCamp
{
public virtual Mobile Ratmen{ get{ return new Ratman(); } }
public virtual Mobile Ratmen => new Ratman();
private Mobile m_Prisoner;

8
Scripts/Multis/ComponentVerification.cs
View file

@ -231,13 +231,7 @@ namespace Server.Multis
return this[name] as string;
}
public object this[string name]
{
get
{
return this[m_Spreadsheet.GetColumnID( name )];
}
}
public object this[string name] => this[m_Spreadsheet.GetColumnID( name )];
public object this[int id]
{

20
Scripts/Multis/Deeds.cs
View file

@ -48,27 +48,15 @@ namespace Server.Multis.Deeds
[CommandProperty( AccessLevel.GameMaster )]
public int MultiID
{
get
{
return m_MultiID;
}
set
{
m_MultiID = value;
}
get => m_MultiID;
set => m_MultiID = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D Offset
{
get
{
return m_Offset;
}
set
{
m_Offset = value;
}
get => m_Offset;
set => m_Offset = value;
}
public HouseDeed( int id, Point3D offset ) : base( 0x14F0 )

10
Scripts/Multis/DynamicDecay.cs
View file

@ -54,15 +54,9 @@ namespace Server.Multis
private TimeSpan m_MinDuration;
private TimeSpan m_MaxDuration;
public TimeSpan MinDuration
{
get { return m_MinDuration; }
}
public TimeSpan MinDuration => m_MinDuration;
public TimeSpan MaxDuration
{
get { return m_MaxDuration; }
}
public TimeSpan MaxDuration => m_MaxDuration;
public DecayStageInfo( TimeSpan min, TimeSpan max )
{

34
Scripts/Multis/HouseFoundation.cs
View file

@ -37,19 +37,27 @@ namespace Server.Multis
private FoundationType m_Type; // Graphic type of this foundation.
private Mobile m_Customizer; // Who is currently customizing this -or- null if not customizing.
public FoundationType Type { get { return m_Type; } set { m_Type = value; } }
public int LastRevision { get { return m_LastRevision; } set { m_LastRevision = value; } }
public FoundationType Type { get => m_Type;
set => m_Type = value;
}
public int LastRevision { get => m_LastRevision;
set => m_LastRevision = value;
}
public List<Item> Fixtures => m_Fixtures;
public Item SignHanger => m_SignHanger;
public Item Signpost => m_Signpost;
public int SignpostGraphic { get { return m_SignpostGraphic; } set { m_SignpostGraphic = value; } }
public Mobile Customizer { get { return m_Customizer; } set { m_Customizer = value; } }
public int SignpostGraphic { get => m_SignpostGraphic;
set => m_SignpostGraphic = value;
}
public Mobile Customizer { get => m_Customizer;
set => m_Customizer = value;
}
public override bool IsAosRules => true;
public override bool IsActive => Customizer == null;
public virtual int CustomizationCost { get { return (Core.AOS ? 0 : 10000); } }
public virtual int CustomizationCost => (Core.AOS ? 0 : 10000);
public bool IsFixture( Item item )
{
@ -89,19 +97,19 @@ namespace Server.Multis
public DesignState CurrentState
{
get { if ( m_Current == null ) SetInitialState(); return m_Current; }
set { m_Current = value; }
set => m_Current = value;
}
public DesignState DesignState
{
get { if ( m_Design == null ) SetInitialState(); return m_Design; }
set { m_Design = value; }
set => m_Design = value;
}
public DesignState BackupState
{
get { if ( m_Backup == null ) SetInitialState(); return m_Backup; }
set { m_Backup = value; }
set => m_Backup = value;
}
public void SetInitialState()
@ -1685,7 +1693,7 @@ namespace Server.Multis
public Packet PacketCache
{
get { return m_PacketCache; }
get => m_PacketCache;
set
{
if ( m_PacketCache == value )
@ -1701,7 +1709,9 @@ namespace Server.Multis
public HouseFoundation Foundation => m_Foundation;
public MultiComponentList Components => m_Components;
public MultiTileEntry[] Fixtures => m_Fixtures;
public int Revision { get { return m_Revision; } set { m_Revision = value; } }
public int Revision { get => m_Revision;
set => m_Revision = value;
}
public DesignState( HouseFoundation foundation, MultiComponentList components )
{
@ -1980,7 +1990,9 @@ namespace Server.Multis
private int m_Level;
public HouseFoundation Foundation => m_Foundation;
public int Level { get { return m_Level; } set { m_Level = value; } }
public int Level { get => m_Level;
set => m_Level = value;
}
public int MaxLevels => m_Foundation.MaxLevels;
public DesignContext( HouseFoundation foundation )

28
Scripts/Multis/HousePlacementTool.cs
View file

@ -281,16 +281,16 @@ namespace Server.Items
private int m_MultiID;
private Point3D m_Offset;
public Type Type{ get{ return m_Type; } }
public Type Type => m_Type;
public int Description{ get{ return m_Description; } }
public int Storage{ get{ return BaseHouse.NewVendorSystem ? m_NewStorage : m_Storage; } }
public int Lockdowns{ get{ return BaseHouse.NewVendorSystem ? m_NewLockdowns : m_Lockdowns; } }
public int Vendors{ get{ return m_Vendors; } }
public int Cost{ get{ return m_Cost; } }
public int Description => m_Description;
public int Storage => BaseHouse.NewVendorSystem ? m_NewStorage : m_Storage;
public int Lockdowns => BaseHouse.NewVendorSystem ? m_NewLockdowns : m_Lockdowns;
public int Vendors => m_Vendors;
public int Cost => m_Cost;
public int MultiID{ get{ return m_MultiID; } }
public Point3D Offset{ get{ return m_Offset; } }
public int MultiID => m_MultiID;
public Point3D Offset => m_Offset;
public HousePlacementEntry( Type type, int description, int storage, int lockdowns, int newStorage, int newLockdowns, int vendors, int cost, int xOffset, int yOffset, int zOffset, int multiID )
{
@ -666,10 +666,7 @@ namespace Server.Items
new HousePlacementEntry( typeof( Castle ), 1011314, 4076, 2038, 4688, 2344, 78, 865250, 0, 16, 0, 0x007E )
};
public static HousePlacementEntry[] ClassicHouses{ get{ return m_ClassicHouses; } }
public static HousePlacementEntry[] ClassicHouses => m_ClassicHouses;
private static HousePlacementEntry[] m_TwoStoryFoundations = new HousePlacementEntry[]
@ -723,10 +720,7 @@ namespace Server.Items
new HousePlacementEntry( typeof( HouseFoundation ), 1060319, 1300, 650, 1495, 747, 28, 96500, 0, 7, 0, 0x143A ) // 13x13 2-Story Customizable House
};
public static HousePlacementEntry[] TwoStoryFoundations{ get{ return m_TwoStoryFoundations; } }
public static HousePlacementEntry[] TwoStoryFoundations => m_TwoStoryFoundations;
private static HousePlacementEntry[] m_ThreeStoryFoundations = new HousePlacementEntry[]
@ -788,6 +782,6 @@ namespace Server.Items
new HousePlacementEntry( typeof( HouseFoundation ), 1060384, 2119, 1059, 2437, 1218, 42, 179000, 0, 10, 0, 0x147B ) // 18x18 3-Story Customizable House
};
public static HousePlacementEntry[] ThreeStoryFoundations{ get{ return m_ThreeStoryFoundations; } }
public static HousePlacementEntry[] ThreeStoryFoundations => m_ThreeStoryFoundations;
}
}

23
Scripts/Multis/HouseSign.cs
View file

@ -29,29 +29,17 @@ namespace Server.Multis
return Name;
}
public BaseHouse Owner
{
get
{
return m_Owner;
}
}
public BaseHouse Owner => m_Owner;
[CommandProperty( AccessLevel.GameMaster )]
public bool RestrictDecay
{
get{ return ( m_Owner != null && m_Owner.RestrictDecay ); }
get => ( m_Owner != null && m_Owner.RestrictDecay );
set{ if ( m_Owner != null ) m_Owner.RestrictDecay = value; }
}
[CommandProperty( AccessLevel.GameMaster )]
public Mobile OriginalOwner
{
get
{
return m_OrgOwner;
}
}
public Mobile OriginalOwner => m_OrgOwner;
public override void OnAfterDelete()
{
@ -70,10 +58,7 @@ namespace Server.Multis
private bool m_GettingProperties;
public bool GettingProperties
{
get { return m_GettingProperties; }
}
public bool GettingProperties => m_GettingProperties;
public override void GetProperties( ObjectPropertyList list )
{

8
Scripts/Multis/HouseTeleporter.cs
View file

@ -14,15 +14,15 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public Item Target
{
get{ return m_Target; }
set{ m_Target = value; }
get => m_Target;
set => m_Target = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public SecureLevel Level
{
get{ return m_Level; }
set{ m_Level = value; }
get => m_Level;
set => m_Level = value;
}
[Constructible]

14
Scripts/Multis/MovingCrate.cs
View file

@ -21,8 +21,8 @@ namespace Server.Multis
public BaseHouse House
{
get{ return m_House; }
set{ m_House = value; }
get => m_House;
set => m_House = value;
}
public override int DefaultMaxItems => 0;
@ -142,10 +142,7 @@ namespace Server.Multis
return Point3D.Zero;
}
public override bool IsDecoContainer
{
get{ return false; }
}
public override bool IsDecoContainer => false;
public override bool CheckHold( Mobile m, Item item, bool message, bool checkItems, int plusItems, int plusWeight )
{
@ -279,10 +276,7 @@ namespace Server.Multis
public override int DefaultGumpID => 0x4B;
public override int DefaultDropSound => 0x42;
public override Rectangle2D Bounds
{
get{ return new Rectangle2D( 16, 51, 168, 73 ); }
}
public override Rectangle2D Bounds => new Rectangle2D( 16, 51, 168, 73 );
public override int DefaultMaxItems => 0;
public override int DefaultMaxWeight => 0;