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

12
Scripts/Engines/Khaldun/KhaldunPitTeleporter.cs
View file

@ -9,22 +9,22 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool Active
{
get { return m_Active; }
set { m_Active = value; }
get => m_Active;
set => m_Active = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D PointDest
{
get { return m_PointDest; }
set { m_PointDest = value; }
get => m_PointDest;
set => m_PointDest = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public Map MapDest
{
get { return m_MapDest; }
set { m_MapDest = value; }
get => m_MapDest;
set => m_MapDest = value;
}
public override int LabelNumber => 1016511; // the floor of the cavern seems to have collapsed here - a faint light is visible at the bottom of the pit

45
Scripts/Engines/Khaldun/PuzzleChest.cs
View file

@ -24,13 +24,23 @@ namespace Server.Items
private PuzzleChestCylinder[] m_Cylinders = new PuzzleChestCylinder[Length];
public PuzzleChestCylinder[] Cylinders{ get{ return m_Cylinders; } }
public PuzzleChestCylinder[] Cylinders => m_Cylinders;
public PuzzleChestCylinder First{ get{ return m_Cylinders[0]; } set{ m_Cylinders[0] = value; } }
public PuzzleChestCylinder Second{ get{ return m_Cylinders[1]; } set{ m_Cylinders[1] = value; } }
public PuzzleChestCylinder Third{ get{ return m_Cylinders[2]; } set{ m_Cylinders[2] = value; } }
public PuzzleChestCylinder Fourth{ get{ return m_Cylinders[3]; } set{ m_Cylinders[3] = value; } }
public PuzzleChestCylinder Fifth{ get{ return m_Cylinders[4]; } set{ m_Cylinders[4] = value; } }
public PuzzleChestCylinder First{ get => m_Cylinders[0];
set => m_Cylinders[0] = value;
}
public PuzzleChestCylinder Second{ get => m_Cylinders[1];
set => m_Cylinders[1] = value;
}
public PuzzleChestCylinder Third{ get => m_Cylinders[2];
set => m_Cylinders[2] = value;
}
public PuzzleChestCylinder Fourth{ get => m_Cylinders[3];
set => m_Cylinders[3] = value;
}
public PuzzleChestCylinder Fifth{ get => m_Cylinders[4];
set => m_Cylinders[4] = value;
}
public static PuzzleChestCylinder RandomCylinder()
{
@ -149,7 +159,7 @@ namespace Server.Items
{
private DateTime m_When;
public DateTime When{ get{ return m_When; } }
public DateTime When => m_When;
public PuzzleChestSolutionAndTime( DateTime when, PuzzleChestSolution solution ) : base( solution )
{
@ -184,7 +194,7 @@ namespace Server.Items
public PuzzleChestSolution Solution
{
get{ return m_Solution; }
get => m_Solution;
set
{
m_Solution = value;
@ -192,16 +202,19 @@ namespace Server.Items
}
}
public PuzzleChestCylinder[] Hints{ get{ return m_Hints; } }
public PuzzleChestCylinder[] Hints => m_Hints;
public PuzzleChestCylinder FirstHint{ get{ return m_Hints[0]; } set{ m_Hints[0] = value; } }
public PuzzleChestCylinder SecondHint{ get{ return m_Hints[1]; } set{ m_Hints[1] = value; } }
public PuzzleChestCylinder ThirdHint{ get{ return m_Hints[2]; } set{ m_Hints[2] = value; } }
public override string DefaultName
{
get { return null; }
public PuzzleChestCylinder FirstHint{ get => m_Hints[0];
set => m_Hints[0] = value;
}
public PuzzleChestCylinder SecondHint{ get => m_Hints[1];
set => m_Hints[1] = value;
}
public PuzzleChestCylinder ThirdHint{ get => m_Hints[2];
set => m_Hints[2] = value;
}
public override string DefaultName => null;
public PuzzleChest( int itemID ) : base( itemID )
{

19
Scripts/Engines/Khaldun/RaisableItem.cs
View file

@ -12,7 +12,7 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public int MaxElevation
{
get{ return m_MaxElevation; }
get => m_MaxElevation;
set
{
if ( value <= 0 )
@ -25,13 +25,19 @@ namespace Server.Items
}
[CommandProperty( AccessLevel.GameMaster )]
public int MoveSound{ get{ return m_MoveSound; } set{ m_MoveSound = value; } }
public int MoveSound{ get => m_MoveSound;
set => m_MoveSound = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public int StopSound{ get{ return m_StopSound; } set{ m_StopSound = value; } }
public int StopSound{ get => m_StopSound;
set => m_StopSound = value;
}
[CommandProperty( AccessLevel.GameMaster )]
public TimeSpan CloseDelay{ get{ return m_CloseDelay; } set{ m_CloseDelay = value; } }
public TimeSpan CloseDelay{ get => m_CloseDelay;
set => m_CloseDelay = value;
}
[Constructible]
public RaisableItem( int itemID ) : this( itemID, 20, -1, -1, TimeSpan.FromMinutes( 1.0 ) )
@ -57,10 +63,7 @@ namespace Server.Items
private int m_Elevation;
private RaiseTimer m_RaiseTimer;
public bool IsRaisable
{
get{ return m_RaiseTimer == null; }
}
public bool IsRaisable => m_RaiseTimer == null;
public void Raise()
{

6
Scripts/Engines/Khaldun/RaiseSwitch.cs
View file

@ -10,8 +10,8 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public RaisableItem RaisableItem
{
get{ return m_RaisableItem; }
set{ m_RaisableItem = value; }
get => m_RaisableItem;
set => m_RaisableItem = value;
}
[Constructible]
@ -146,7 +146,7 @@ namespace Server.Items
public class DisappearingRaiseSwitch : RaiseSwitch
{
public int CurrentRange{ get{ return Visible ? 3 : 2; } }
public int CurrentRange => Visible ? 3 : 2;
[Constructible]
public DisappearingRaiseSwitch() : base( 0x108F )