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

37
Scripts/Items/Containers/BaseTreasureChest.cs
View file

@ -12,45 +12,27 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public TreasureLevel Level
{
get
{
return m_TreasureLevel;
}
set
{
m_TreasureLevel = value;
}
get => m_TreasureLevel;
set => m_TreasureLevel = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public short MaxSpawnTime
{
get
{
return m_MaxSpawnTime;
}
set
{
m_MaxSpawnTime = value;
}
get => m_MaxSpawnTime;
set => m_MaxSpawnTime = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public short MinSpawnTime
{
get
{
return m_MinSpawnTime;
}
set
{
m_MinSpawnTime = value;
}
get => m_MinSpawnTime;
set => m_MinSpawnTime = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public override bool Locked {
get { return base.Locked; }
get => base.Locked;
set {
if ( base.Locked != value ) {
base.Locked = value;
@ -61,10 +43,7 @@ namespace Server.Items
}
}
public override bool IsDecoContainer
{
get{ return false; }
}
public override bool IsDecoContainer => false;
public BaseTreasureChest( int itemID ) : this( itemID, TreasureLevel.Level2 )
{

8
Scripts/Items/Containers/FillableContainers.cs
View file

@ -26,13 +26,13 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public FillableContentType ContentType
{
get { return FillableContent.Lookup( m_Content ); }
set { Content = FillableContent.Lookup( value ); }
get => FillableContent.Lookup( m_Content );
set => Content = FillableContent.Lookup( value );
}
public FillableContent Content
{
get { return m_Content; }
get => m_Content;
set
{
if ( m_Content == value )
@ -701,7 +701,7 @@ namespace Server.Items
public int Level => m_Level;
public Type[] Vendors => m_Vendors;
public FillableContentType TypeID { get { return Lookup( this ); } }
public FillableContentType TypeID => Lookup( this );
public FillableContent( int level, Type[] vendors, FillableEntry[] entries )
{

77
Scripts/Items/Containers/LockableContainer.cs
View file

@ -15,62 +15,35 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Picker
{
get
{
return m_Picker;
}
set
{
m_Picker = value;
}
get => m_Picker;
set => m_Picker = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int MaxLockLevel
{
get
{
return m_MaxLockLevel;
}
set
{
m_MaxLockLevel = value;
}
get => m_MaxLockLevel;
set => m_MaxLockLevel = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int LockLevel
{
get
{
return m_LockLevel;
}
set
{
m_LockLevel = value;
}
get => m_LockLevel;
set => m_LockLevel = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int RequiredSkill
{
get
{
return m_RequiredSkill;
}
set
{
m_RequiredSkill = value;
}
get => m_RequiredSkill;
set => m_RequiredSkill = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public virtual bool Locked
{
get
{
return m_Locked;
}
get => m_Locked;
set
{
m_Locked = value;
@ -85,35 +58,17 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public uint KeyValue
{
get
{
return m_KeyValue;
}
set
{
m_KeyValue = value;
}
get => m_KeyValue;
set => m_KeyValue = value;
}
public override bool TrapOnOpen
{
get
{
return !m_TrapOnLockpick;
}
}
public override bool TrapOnOpen => !m_TrapOnLockpick;
[CommandProperty( AccessLevel.GameMaster )]
public bool TrapOnLockpick
{
get
{
return m_TrapOnLockpick;
}
set
{
m_TrapOnLockpick = value;
}
get => m_TrapOnLockpick;
set => m_TrapOnLockpick = value;
}
public override void Serialize( GenericWriter writer )
@ -403,8 +358,8 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool IsShipwreckedItem
{
get { return m_IsShipwreckedItem; }
set { m_IsShipwreckedItem = value; }
get => m_IsShipwreckedItem;
set => m_IsShipwreckedItem = value;
}
#endregion

23
Scripts/Items/Containers/MarkContainer.cs
View file

@ -68,7 +68,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool AutoLock
{
get { return m_AutoLock; }
get => m_AutoLock;
set
{
m_AutoLock = value;
@ -81,15 +81,19 @@ namespace Server.Items
}
[CommandProperty( AccessLevel.GameMaster )]
public Map TargetMap { get { return m_TargetMap; } set { m_TargetMap = value; } }
public Map TargetMap { get => m_TargetMap;
set => m_TargetMap = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D Target { get { return m_Target; } set { m_Target = value; } }
public Point3D Target { get => m_Target;
set => m_Target = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public bool Bone
{
get { return ItemID == 0xECA; }
get => ItemID == 0xECA;
set
{
ItemID = value ? 0xECA : 0xE79;
@ -98,13 +102,12 @@ namespace Server.Items
}
[CommandProperty( AccessLevel.GameMaster )]
public string Description { get { return m_Description; } set { m_Description = value; } }
public override bool IsDecoContainer
{
get{ return false; }
public string Description { get => m_Description;
set => m_Description = value;
}
public override bool IsDecoContainer => false;
[Constructible]
public MarkContainer() : this( false )
{
@ -137,7 +140,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public override bool Locked
{
get { return base.Locked; }
get => base.Locked;
set
{
base.Locked = value;

13
Scripts/Items/Containers/Strongbox.cs
View file

@ -24,10 +24,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public Mobile Owner
{
get
{
return m_Owner;
}
get => m_Owner;
set
{
m_Owner = value;
@ -91,13 +88,7 @@ namespace Server.Items
}
}
public override TimeSpan DecayTime
{
get
{
return TimeSpan.FromMinutes( 30.0 );
}
}
public override TimeSpan DecayTime => TimeSpan.FromMinutes( 30.0 );
public override void AddNameProperty( ObjectPropertyList list )
{

32
Scripts/Items/Containers/TrappableContainer.cs
View file

@ -20,43 +20,25 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public TrapType TrapType
{
get
{
return m_TrapType;
}
set
{
m_TrapType = value;
}
get => m_TrapType;
set => m_TrapType = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int TrapPower
{
get
{
return m_TrapPower;
}
set
{
m_TrapPower = value;
}
get => m_TrapPower;
set => m_TrapPower = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int TrapLevel
{
get
{
return m_TrapLevel;
}
set
{
m_TrapLevel = value;
}
get => m_TrapLevel;
set => m_TrapLevel = value;
}
public virtual bool TrapOnOpen{ get{ return true; } }
public virtual bool TrapOnOpen => true;
public TrappableContainer( int itemID ) : base( itemID )
{

19
Scripts/Items/Containers/TreasureMapChest.cs
View file

@ -33,16 +33,22 @@ namespace Server.Items
private List<Mobile> m_Guardians;
[CommandProperty( AccessLevel.GameMaster )]
public int Level{ get{ return m_Level; } set{ m_Level = value; } }
public int Level{ get => m_Level;
set => m_Level = 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 DateTime DeleteTime{ get{ return m_DeleteTime; } }
public DateTime DeleteTime => m_DeleteTime;
[CommandProperty( AccessLevel.GameMaster )]
public bool Temporary{ get{ return m_Temporary; } set{ m_Temporary = value; } }
public bool Temporary{ get => m_Temporary;
set => m_Temporary = value;
}
public List<Mobile> Guardians => m_Guardians;
@ -332,10 +338,7 @@ namespace Server.Items
return false;
}
public override bool IsDecoContainer
{
get{ return false; }
}
public override bool IsDecoContainer => false;
public override bool CheckItemUse( Mobile from, Item item )
{