warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changes properties to use automatic property initializers

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 15:23:29 -07:00
parent f0a48ad431
commit 06fa31a7bf
623 changed files with 13072 additions and 19304 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleController.cs
View file

@ -14,17 +14,12 @@ namespace Server.Engines.Doom
{
public class LeverPuzzleController : Item
{
private bool m_Enabled;
private static bool installed;
private ushort m_MyKey;
private ushort m_TheirKey;
private List<Item> m_Levers;
private List<Item> m_Teles;
private List<Item> m_Statues;
private List<LeverPuzzleRegion> m_Tiles;
private Mobile m_Successful;
private LampRoomBox m_Box;
private Region m_LampRoom;
@ -58,21 +53,15 @@ namespace Server.Engines.Doom
}
[CommandProperty( AccessLevel.GameMaster )]
public ushort MyKey { get => m_MyKey;
set => m_MyKey = value;
}
public ushort MyKey { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public ushort TheirKey { get => m_TheirKey;
set => m_TheirKey = value;
}
public ushort TheirKey { get; set; }
[CommandProperty( AccessLevel.GameMaster )]
public bool Enabled { get => m_Enabled;
set => m_Enabled = value;
}
public bool Enabled { get; set; }
public Mobile Successful => m_Successful;
public Mobile Successful { get; private set; }
public bool CircleComplete
{
@ -253,7 +242,7 @@ namespace Server.Engines.Doom
public virtual void RemoveSuccessful()
{
m_Successful=null;
Successful=null;
}
public virtual void LeverPulled( ushort code )
@ -280,7 +269,7 @@ namespace Server.Engines.Doom
if ( TheirKey == MyKey )
{
GenKey();
if (( m_Successful = ( m_Player=GetOccupant( 0 ))) != null )
if (( Successful = ( m_Player=GetOccupant( 0 ))) != null )
{
SendLocationEffect( lp_Center, 0x1153, 0, 60, 1 );
PlaySounds( lp_Center, cs1 );
@ -290,7 +279,7 @@ namespace Server.Engines.Doom
m_Timer = new LampRoomTimer( this );
m_Timer.Start();
m_Enabled = false;
Enabled = false;
}
}
else
@ -715,9 +704,9 @@ namespace Server.Engines.Doom
m_Tiles.Add( new LeverPuzzleRegion( this, TA[i] ));
m_LampRoom = new LampRoomRegion( this );
m_Enabled = true;
m_TheirKey = 0;
m_MyKey = 0;
Enabled = true;
TheirKey = 0;
MyKey = 0;
GenKey();
}
}

11
Scripts/Engines/Doom/LeverPuzzle/LeverPuzzleItems.cs
View file

@ -95,16 +95,15 @@ namespace Server.Engines.Doom
public class LeverPuzzleLever : Item
{
private ushort m_Code;
private LeverPuzzleController m_Controller;
[CommandProperty( AccessLevel.GameMaster )]
public ushort Code => m_Code;
public ushort Code { get; private set; }
public LeverPuzzleLever( ushort code, LeverPuzzleController controller ) : base( 0x108E )
{
m_Controller=controller;
m_Code = code;
Code = code;
Hue = 0x66D;
Movable = false;
}
@ -115,7 +114,7 @@ namespace Server.Engines.Doom
{
ItemID^=2;
Effects.PlaySound( Location, Map, 0x3E8 );
m_Controller.LeverPulled( m_Code );
m_Controller.LeverPulled( Code );
}
else
{
@ -136,14 +135,14 @@ namespace Server.Engines.Doom
{
base.Serialize( writer );
writer.Write( (int) 0 ); // version
writer.Write( (ushort) m_Code );
writer.Write( (ushort) Code );
writer.Write( m_Controller );
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
m_Code = reader.ReadUShort();
Code = reader.ReadUShort();
m_Controller = reader.ReadItem() as LeverPuzzleController;
}
}