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

113
Scripts/Items/Addons/SHTeleporter.cs
View file

@ -7,7 +7,6 @@ namespace Server.Items
{
private bool m_Active;
private SHTeleComponent m_TeleDest;
private Point3D m_TeleOffset;
[CommandProperty( AccessLevel.GameMaster )]
public bool Active
@ -23,17 +22,13 @@ namespace Server.Items
}
[CommandProperty( AccessLevel.GameMaster )]
public Point3D TeleOffset
{
get => m_TeleOffset;
set => m_TeleOffset = value;
}
public Point3D TeleOffset { get; set; }
[CommandProperty(AccessLevel.GameMaster)]
public Point3D TelePoint
{
get => new Point3D( Location.X + TeleOffset.X, Location.Y + TeleOffset.Y, Location.Z + TeleOffset.Z );
set => m_TeleOffset = new Point3D( value.X - Location.X, value.Y - Location.Y, value.Z - Location.Z );
set => TeleOffset = new Point3D( value.X - Location.X, value.Y - Location.Y, value.Z - Location.Z );
}
[CommandProperty( AccessLevel.GameMaster )]
@ -68,7 +63,7 @@ namespace Server.Items
Hue = 1;
m_Active = true;
m_TeleOffset = offset;
TeleOffset = offset;
}
public SHTeleComponent( Serial serial ) : base( serial )
@ -108,7 +103,7 @@ namespace Server.Items
writer.Write( m_Active );
writer.Write( m_TeleDest );
writer.Write( m_TeleOffset );
writer.Write( TeleOffset );
}
public override void Deserialize( GenericReader reader )
@ -119,7 +114,7 @@ namespace Server.Items
m_Active = reader.ReadBool();
m_TeleDest = reader.ReadItem() as SHTeleComponent;
m_TeleOffset = reader.ReadPoint3D();
TeleOffset = reader.ReadPoint3D();
}
}
@ -276,22 +271,18 @@ namespace Server.Items
}
}
private bool m_External;
private SHTeleComponent m_UpTele;
private SHTeleComponent m_RightTele;
private SHTeleComponent m_DownTele;
private SHTeleComponent m_LeftTele;
private bool m_Changing;
[CommandProperty( AccessLevel.GameMaster )]
public bool External => m_External;
public bool External { get; private set; }
public SHTeleComponent UpTele => m_UpTele;
public SHTeleComponent RightTele => m_RightTele;
public SHTeleComponent DownTele => m_DownTele;
public SHTeleComponent LeftTele => m_LeftTele;
public SHTeleComponent UpTele { get; private set; }
public SHTeleComponent RightTele { get; private set; }
public SHTeleComponent DownTele { get; private set; }
public SHTeleComponent LeftTele { get; private set; }
[Constructible]
public SHTeleporter() : this( true )
@ -302,7 +293,7 @@ namespace Server.Items
public SHTeleporter( bool external )
{
m_Changing = false;
m_External = external;
External = external;
if ( external )
{
@ -325,20 +316,20 @@ namespace Server.Items
}
Point3D upOS = external ? new Point3D( -1, 0, 0 ) : new Point3D( -2, -1, 0 );
m_UpTele = new SHTeleComponent( external ? 0x1775 : 0x495, upOS );
AddComponent( m_UpTele, 0, 0, 0 );
UpTele = new SHTeleComponent( external ? 0x1775 : 0x495, upOS );
AddComponent( UpTele, 0, 0, 0 );
Point3D rightOS = external ? new Point3D( -2, 0, 0 ) : new Point3D( 2, -1, 0 );
m_RightTele = new SHTeleComponent( external ? 0x1775 : 0x495, rightOS );
AddComponent( m_RightTele, 1, 0, 0 );
RightTele = new SHTeleComponent( external ? 0x1775 : 0x495, rightOS );
AddComponent( RightTele, 1, 0, 0 );
Point3D downOS = external ? new Point3D( -2, -1, 0 ) : new Point3D( 2, 2, 0 );
m_DownTele = new SHTeleComponent( external ? 0x1776 : 0x495, downOS );
AddComponent( m_DownTele, 1, 1, 0 );
DownTele = new SHTeleComponent( external ? 0x1776 : 0x495, downOS );
AddComponent( DownTele, 1, 1, 0 );
Point3D leftOS = external ? new Point3D( -1, -1, 0 ) : new Point3D( -1, 2, 0 );
m_LeftTele = new SHTeleComponent( external ? 0x1775 : 0x495, leftOS );
AddComponent( m_LeftTele, 0, 1, 0 );
LeftTele = new SHTeleComponent( external ? 0x1775 : 0x495, leftOS );
AddComponent( LeftTele, 0, 1, 0 );
}
public SHTeleporter( Serial serial ) : base( serial )
@ -355,10 +346,10 @@ namespace Server.Items
m_Changing = true;
m_UpTele.Active = active;
m_RightTele.Active = active;
m_DownTele.Active = active;
m_LeftTele.Active = active;
UpTele.Active = active;
RightTele.Active = active;
DownTele.Active = active;
LeftTele.Active = active;
m_Changing = false;
}
@ -372,19 +363,19 @@ namespace Server.Items
if ( !(dest?.Addon is SHTeleporter) )
{
m_UpTele.TeleDest = dest;
m_RightTele.TeleDest = dest;
m_DownTele.TeleDest = dest;
m_LeftTele.TeleDest = dest;
UpTele.TeleDest = dest;
RightTele.TeleDest = dest;
DownTele.TeleDest = dest;
LeftTele.TeleDest = dest;
}
else
{
SHTeleporter destAddon = (SHTeleporter)dest.Addon;
m_UpTele.TeleDest = destAddon.UpTele;
m_RightTele.TeleDest = destAddon.RightTele;
m_DownTele.TeleDest = destAddon.DownTele;
m_LeftTele.TeleDest = destAddon.LeftTele;
UpTele.TeleDest = destAddon.UpTele;
RightTele.TeleDest = destAddon.RightTele;
DownTele.TeleDest = destAddon.DownTele;
LeftTele.TeleDest = destAddon.LeftTele;
}
m_Changing = false;
@ -399,17 +390,17 @@ namespace Server.Items
if ( destAddon != null )
{
m_UpTele.TeleDest = destAddon.UpTele;
m_RightTele.TeleDest = destAddon.RightTele;
m_DownTele.TeleDest = destAddon.DownTele;
m_LeftTele.TeleDest = destAddon.LeftTele;
UpTele.TeleDest = destAddon.UpTele;
RightTele.TeleDest = destAddon.RightTele;
DownTele.TeleDest = destAddon.DownTele;
LeftTele.TeleDest = destAddon.LeftTele;
}
else
{
m_UpTele.TeleDest = null;
m_RightTele.TeleDest = null;
m_DownTele.TeleDest = null;
m_LeftTele.TeleDest = null;
UpTele.TeleDest = null;
RightTele.TeleDest = null;
DownTele.TeleDest = null;
LeftTele.TeleDest = null;
}
m_Changing = false;
@ -421,12 +412,12 @@ namespace Server.Items
writer.Write( (int)0 ); // version
writer.Write( m_External );
writer.Write( External );
writer.Write( m_UpTele );
writer.Write( m_RightTele );
writer.Write( m_DownTele );
writer.Write( m_LeftTele );
writer.Write( UpTele );
writer.Write( RightTele );
writer.Write( DownTele );
writer.Write( LeftTele );
}
public override void Deserialize( GenericReader reader )
@ -435,12 +426,12 @@ namespace Server.Items
int version = reader.ReadInt();
m_External = reader.ReadBool();
External = reader.ReadBool();
m_UpTele = (SHTeleComponent)reader.ReadItem();
m_RightTele = (SHTeleComponent)reader.ReadItem();
m_DownTele = (SHTeleComponent)reader.ReadItem();
m_LeftTele = (SHTeleComponent)reader.ReadItem();
UpTele = (SHTeleComponent)reader.ReadItem();
RightTele = (SHTeleComponent)reader.ReadItem();
DownTele = (SHTeleComponent)reader.ReadItem();
LeftTele = (SHTeleComponent)reader.ReadItem();
}
}
}