Upgrades code style - First batch (#22)

This commit is contained in:
Kamron Batman 2018-08-14 06:16:50 +08:00 committed by GitHub
parent 8ee42c8ea2
commit 632e8b4757
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1834 changed files with 10245 additions and 10437 deletions

View file

@ -989,8 +989,7 @@ namespace Server.Multis
if ( m != null )
{
List<BaseHouse> exists = null;
m_Table.TryGetValue( m, out exists );
m_Table.TryGetValue( m, out List<BaseHouse> exists );
if ( exists != null )
{
@ -1246,8 +1245,7 @@ namespace Server.Multis
if ( owner != null )
{
List<BaseHouse> list = null;
m_Table.TryGetValue( owner, out list );
m_Table.TryGetValue( owner, out List<BaseHouse> list );
if ( list == null )
m_Table[owner] = list = new List<BaseHouse>();
@ -2702,8 +2700,7 @@ namespace Server.Multis
if ( m_Owner != null )
{
List<BaseHouse> list = null;
m_Table.TryGetValue( m_Owner, out list );
m_Table.TryGetValue( m_Owner, out List<BaseHouse> list );
if ( list == null )
m_Table[m_Owner] = list = new List<BaseHouse>();
@ -2821,8 +2818,7 @@ namespace Server.Multis
{
if ( m_Owner != null )
{
List<BaseHouse> list = null;
m_Table.TryGetValue( m_Owner, out list );
m_Table.TryGetValue( m_Owner, out List<BaseHouse> list );
if ( list == null )
m_Table[m_Owner] = list = new List<BaseHouse>();
@ -2835,8 +2831,7 @@ namespace Server.Multis
if ( m_Owner != null )
{
List<BaseHouse> list = null;
m_Table.TryGetValue( m_Owner, out list );
m_Table.TryGetValue( m_Owner, out List<BaseHouse> list );
if ( list == null )
m_Table[m_Owner] = list = new List<BaseHouse>();
@ -3085,8 +3080,7 @@ namespace Server.Multis
if ( m_Owner != null )
{
List<BaseHouse> list = null;
m_Table.TryGetValue( m_Owner, out list );
m_Table.TryGetValue( m_Owner, out List<BaseHouse> list );
if ( list == null )
m_Table[m_Owner] = list = new List<BaseHouse>();
@ -3239,8 +3233,7 @@ namespace Server.Multis
if ( m == null )
return false;
List<BaseHouse> list = null;
m_Table.TryGetValue( m, out list );
m_Table.TryGetValue( m, out List<BaseHouse> list );
if ( list == null )
return false;

View file

@ -6,20 +6,20 @@ namespace Server.Multis
{
public class LargeBoat : BaseBoat
{
public override int NorthID{ get{ return 0x10; } }
public override int EastID{ get{ return 0x11; } }
public override int SouthID{ get{ return 0x12; } }
public override int WestID{ get{ return 0x13; } }
public override int NorthID => 0x10;
public override int EastID => 0x11;
public override int SouthID => 0x12;
public override int WestID => 0x13;
public override int HoldDistance{ get{ return 5; } }
public override int TillerManDistance{ get{ return -5; } }
public override int HoldDistance => 5;
public override int TillerManDistance => -5;
public override Point2D StarboardOffset{ get{ return new Point2D( 2, -1 ); } }
public override Point2D PortOffset{ get{ return new Point2D( -2, -1 ); } }
public override Point2D StarboardOffset => new Point2D( 2, -1 );
public override Point2D PortOffset => new Point2D( -2, -1 );
public override Point3D MarkOffset{ get{ return new Point3D( 0, 0, 3 ); } }
public override Point3D MarkOffset => new Point3D( 0, 0, 3 );
public override BaseDockedBoat DockedBoat{ get{ return new LargeDockedBoat( this ); } }
public override BaseDockedBoat DockedBoat => new LargeDockedBoat( this );
[Constructible]
public LargeBoat()
@ -47,8 +47,8 @@ namespace Server.Multis
public class LargeBoatDeed : BaseBoatDeed
{
public override int LabelNumber{ get{ return 1041209; } } // large ship deed
public override BaseBoat Boat{ get{ return new LargeBoat(); } }
public override int LabelNumber => 1041209; // large ship deed
public override BaseBoat Boat => new LargeBoat();
[Constructible]
public LargeBoatDeed() : base( 0x10, new Point3D( 0, -1, 0 ) )
@ -76,7 +76,7 @@ namespace Server.Multis
public class LargeDockedBoat : BaseDockedBoat
{
public override BaseBoat Boat{ get{ return new LargeBoat(); } }
public override BaseBoat Boat => new LargeBoat();
public LargeDockedBoat( BaseBoat boat ) : base( 0x10, new Point3D( 0, -1, 0 ), boat )
{
@ -100,4 +100,4 @@ namespace Server.Multis
writer.Write( (int)0 );
}
}
}
}

View file

@ -6,20 +6,20 @@ namespace Server.Multis
{
public class LargeDragonBoat : BaseBoat
{
public override int NorthID{ get{ return 0x14; } }
public override int EastID{ get{ return 0x15; } }
public override int SouthID{ get{ return 0x16; } }
public override int WestID{ get{ return 0x17; } }
public override int NorthID => 0x14;
public override int EastID => 0x15;
public override int SouthID => 0x16;
public override int WestID => 0x17;
public override int HoldDistance{ get{ return 5; } }
public override int TillerManDistance{ get{ return -5; } }
public override int HoldDistance => 5;
public override int TillerManDistance => -5;
public override Point2D StarboardOffset{ get{ return new Point2D( 2, -1 ); } }
public override Point2D PortOffset{ get{ return new Point2D( -2, -1 ); } }
public override Point2D StarboardOffset => new Point2D( 2, -1 );
public override Point2D PortOffset => new Point2D( -2, -1 );
public override Point3D MarkOffset{ get{ return new Point3D( 0, 0, 3 ); } }
public override Point3D MarkOffset => new Point3D( 0, 0, 3 );
public override BaseDockedBoat DockedBoat{ get{ return new LargeDockedDragonBoat( this ); } }
public override BaseDockedBoat DockedBoat => new LargeDockedDragonBoat( this );
[Constructible]
public LargeDragonBoat()
@ -47,8 +47,8 @@ namespace Server.Multis
public class LargeDragonBoatDeed : BaseBoatDeed
{
public override int LabelNumber{ get{ return 1041210; } }// large dragon ship deed
public override BaseBoat Boat{ get{ return new LargeDragonBoat(); } }
public override int LabelNumber => 1041210;// large dragon ship deed
public override BaseBoat Boat => new LargeDragonBoat();
[Constructible]
public LargeDragonBoatDeed() : base( 0x14, new Point3D( 0, -1, 0 ) )
@ -76,7 +76,7 @@ namespace Server.Multis
public class LargeDockedDragonBoat : BaseDockedBoat
{
public override BaseBoat Boat{ get{ return new LargeDragonBoat(); } }
public override BaseBoat Boat => new LargeDragonBoat();
public LargeDockedDragonBoat( BaseBoat boat ) : base( 0x14, new Point3D( 0, -1, 0 ), boat )
{
@ -100,4 +100,4 @@ namespace Server.Multis
writer.Write( (int)0 );
}
}
}
}

View file

@ -6,20 +6,20 @@ namespace Server.Multis
{
public class MediumBoat : BaseBoat
{
public override int NorthID{ get{ return 0x8; } }
public override int EastID{ get{ return 0x9; } }
public override int SouthID{ get{ return 0xA; } }
public override int WestID{ get{ return 0xB; } }
public override int NorthID => 0x8;
public override int EastID => 0x9;
public override int SouthID => 0xA;
public override int WestID => 0xB;
public override int HoldDistance{ get{ return 4; } }
public override int TillerManDistance{ get{ return -5; } }
public override int HoldDistance => 4;
public override int TillerManDistance => -5;
public override Point2D StarboardOffset{ get{ return new Point2D( 2, 0 ); } }
public override Point2D PortOffset{ get{ return new Point2D( -2, 0 ); } }
public override Point2D StarboardOffset => new Point2D( 2, 0 );
public override Point2D PortOffset => new Point2D( -2, 0 );
public override Point3D MarkOffset{ get{ return new Point3D( 0, 1, 3 ); } }
public override Point3D MarkOffset => new Point3D( 0, 1, 3 );
public override BaseDockedBoat DockedBoat{ get{ return new MediumDockedBoat( this ); } }
public override BaseDockedBoat DockedBoat => new MediumDockedBoat( this );
[Constructible]
public MediumBoat()
@ -47,8 +47,8 @@ namespace Server.Multis
public class MediumBoatDeed : BaseBoatDeed
{
public override int LabelNumber{ get{ return 1041207; } } // medium ship deed
public override BaseBoat Boat{ get{ return new MediumBoat(); } }
public override int LabelNumber => 1041207; // medium ship deed
public override BaseBoat Boat => new MediumBoat();
[Constructible]
public MediumBoatDeed() : base( 0x8, Point3D.Zero )
@ -76,7 +76,7 @@ namespace Server.Multis
public class MediumDockedBoat : BaseDockedBoat
{
public override BaseBoat Boat{ get{ return new MediumBoat(); } }
public override BaseBoat Boat => new MediumBoat();
public MediumDockedBoat( BaseBoat boat ) : base( 0x8, Point3D.Zero, boat )
{
@ -100,4 +100,4 @@ namespace Server.Multis
writer.Write( (int)0 );
}
}
}
}

View file

@ -6,20 +6,20 @@ namespace Server.Multis
{
public class MediumDragonBoat : BaseBoat
{
public override int NorthID{ get{ return 0xC; } }
public override int EastID{ get{ return 0xD; } }
public override int SouthID{ get{ return 0xE; } }
public override int WestID{ get{ return 0xF; } }
public override int NorthID => 0xC;
public override int EastID => 0xD;
public override int SouthID => 0xE;
public override int WestID => 0xF;
public override int HoldDistance{ get{ return 4; } }
public override int TillerManDistance{ get{ return -5; } }
public override int HoldDistance => 4;
public override int TillerManDistance => -5;
public override Point2D StarboardOffset{ get{ return new Point2D( 2, 0 ); } }
public override Point2D PortOffset{ get{ return new Point2D( -2, 0 ); } }
public override Point2D StarboardOffset => new Point2D( 2, 0 );
public override Point2D PortOffset => new Point2D( -2, 0 );
public override Point3D MarkOffset{ get{ return new Point3D( 0, 1, 3 ); } }
public override Point3D MarkOffset => new Point3D( 0, 1, 3 );
public override BaseDockedBoat DockedBoat{ get{ return new MediumDockedDragonBoat( this ); } }
public override BaseDockedBoat DockedBoat => new MediumDockedDragonBoat( this );
[Constructible]
public MediumDragonBoat()
@ -47,8 +47,8 @@ namespace Server.Multis
public class MediumDragonBoatDeed : BaseBoatDeed
{
public override int LabelNumber{ get{ return 1041208; } } // medium dragon ship deed
public override BaseBoat Boat{ get{ return new MediumDragonBoat(); } }
public override int LabelNumber => 1041208; // medium dragon ship deed
public override BaseBoat Boat => new MediumDragonBoat();
[Constructible]
public MediumDragonBoatDeed() : base( 0xC, Point3D.Zero )
@ -76,7 +76,7 @@ namespace Server.Multis
public class MediumDockedDragonBoat : BaseDockedBoat
{
public override BaseBoat Boat{ get{ return new MediumDragonBoat(); } }
public override BaseBoat Boat => new MediumDragonBoat();
public MediumDockedDragonBoat( BaseBoat boat ) : base( 0xC, Point3D.Zero, boat )
{
@ -100,4 +100,4 @@ namespace Server.Multis
writer.Write( (int)0 );
}
}
}
}

View file

@ -6,20 +6,20 @@ namespace Server.Multis
{
public class SmallBoat : BaseBoat
{
public override int NorthID{ get{ return 0x0; } }
public override int EastID{ get{ return 0x1; } }
public override int SouthID{ get{ return 0x2; } }
public override int WestID{ get{ return 0x3; } }
public override int NorthID => 0x0;
public override int EastID => 0x1;
public override int SouthID => 0x2;
public override int WestID => 0x3;
public override int HoldDistance{ get{ return 4; } }
public override int TillerManDistance{ get{ return -4; } }
public override int HoldDistance => 4;
public override int TillerManDistance => -4;
public override Point2D StarboardOffset{ get{ return new Point2D( 2, 0 ); } }
public override Point2D PortOffset{ get{ return new Point2D( -2, 0 ); } }
public override Point2D StarboardOffset => new Point2D( 2, 0 );
public override Point2D PortOffset => new Point2D( -2, 0 );
public override Point3D MarkOffset{ get{ return new Point3D( 0, 1, 3 ); } }
public override Point3D MarkOffset => new Point3D( 0, 1, 3 );
public override BaseDockedBoat DockedBoat{ get{ return new SmallDockedBoat( this ); } }
public override BaseDockedBoat DockedBoat => new SmallDockedBoat( this );
[Constructible]
public SmallBoat()
@ -47,8 +47,8 @@ namespace Server.Multis
public class SmallBoatDeed : BaseBoatDeed
{
public override int LabelNumber{ get{ return 1041205; } } // small ship deed
public override BaseBoat Boat{ get{ return new SmallBoat(); } }
public override int LabelNumber => 1041205; // small ship deed
public override BaseBoat Boat => new SmallBoat();
[Constructible]
public SmallBoatDeed() : base( 0x0, Point3D.Zero )
@ -76,7 +76,7 @@ namespace Server.Multis
public class SmallDockedBoat : BaseDockedBoat
{
public override BaseBoat Boat{ get{ return new SmallBoat(); } }
public override BaseBoat Boat => new SmallBoat();
public SmallDockedBoat( BaseBoat boat ) : base( 0x0, Point3D.Zero, boat )
{
@ -100,4 +100,4 @@ namespace Server.Multis
writer.Write( (int)0 );
}
}
}
}

View file

@ -6,20 +6,20 @@ namespace Server.Multis
{
public class SmallDragonBoat : BaseBoat
{
public override int NorthID{ get{ return 0x4; } }
public override int EastID{ get{ return 0x5; } }
public override int SouthID{ get{ return 0x6; } }
public override int WestID{ get{ return 0x7; } }
public override int NorthID => 0x4;
public override int EastID => 0x5;
public override int SouthID => 0x6;
public override int WestID => 0x7;
public override int HoldDistance{ get{ return 4; } }
public override int TillerManDistance{ get{ return -4; } }
public override int HoldDistance => 4;
public override int TillerManDistance => -4;
public override Point2D StarboardOffset{ get{ return new Point2D( 2, 0 ); } }
public override Point2D PortOffset{ get{ return new Point2D( -2, 0 ); } }
public override Point2D StarboardOffset => new Point2D( 2, 0 );
public override Point2D PortOffset => new Point2D( -2, 0 );
public override Point3D MarkOffset{ get{ return new Point3D( 0, 1, 3 ); } }
public override Point3D MarkOffset => new Point3D( 0, 1, 3 );
public override BaseDockedBoat DockedBoat{ get{ return new SmallDockedDragonBoat( this ); } }
public override BaseDockedBoat DockedBoat => new SmallDockedDragonBoat( this );
[Constructible]
public SmallDragonBoat()
@ -47,8 +47,8 @@ namespace Server.Multis
public class SmallDragonBoatDeed : BaseBoatDeed
{
public override int LabelNumber{ get{ return 1041206; } } // small dragon ship deed
public override BaseBoat Boat{ get{ return new SmallDragonBoat(); } }
public override int LabelNumber => 1041206; // small dragon ship deed
public override BaseBoat Boat => new SmallDragonBoat();
[Constructible]
public SmallDragonBoatDeed() : base( 0x4, Point3D.Zero )
@ -76,7 +76,7 @@ namespace Server.Multis
public class SmallDockedDragonBoat : BaseDockedBoat
{
public override BaseBoat Boat{ get{ return new SmallDragonBoat(); } }
public override BaseBoat Boat => new SmallDragonBoat();
public SmallDockedDragonBoat( BaseBoat boat ) : base( 0x4, Point3D.Zero, boat )
{
@ -100,4 +100,4 @@ namespace Server.Multis
writer.Write( (int)0 );
}
}
}
}

View file

@ -120,7 +120,7 @@ namespace Server.Multis
private ColumnInfo[] m_Columns;
private DataRecord[] m_Records;
public DataRecord[] Records { get { return m_Records; } }
public DataRecord[] Records => m_Records;
public int GetColumnID( string name )
{
@ -200,8 +200,8 @@ namespace Server.Multis
private Spreadsheet m_Spreadsheet;
private object[] m_Data;
public Spreadsheet Spreadsheet { get { return m_Spreadsheet; } }
public object[] Data { get { return m_Data; } }
public Spreadsheet Spreadsheet => m_Spreadsheet;
public object[] Data => m_Data;
public DataRecord( Spreadsheet ss, object[] data )
{
@ -251,4 +251,4 @@ namespace Server.Multis
}
}
}
}
}

View file

@ -236,8 +236,8 @@ namespace Server.Multis.Deeds
return new SmallOldHouse( owner, 0x64 );
}
public override int LabelNumber{ get{ return 1041211; } }
public override Rectangle2D[] Area{ get{ return SmallOldHouse.AreaArray; } }
public override int LabelNumber => 1041211;
public override Rectangle2D[] Area => SmallOldHouse.AreaArray;
public override void Serialize( GenericWriter writer )
{
@ -270,8 +270,8 @@ namespace Server.Multis.Deeds
return new SmallOldHouse( owner, 0x66 );
}
public override int LabelNumber{ get{ return 1041212; } }
public override Rectangle2D[] Area{ get{ return SmallOldHouse.AreaArray; } }
public override int LabelNumber => 1041212;
public override Rectangle2D[] Area => SmallOldHouse.AreaArray;
public override void Serialize( GenericWriter writer )
{
@ -304,8 +304,8 @@ namespace Server.Multis.Deeds
return new SmallOldHouse( owner, 0x68 );
}
public override int LabelNumber{ get{ return 1041213; } }
public override Rectangle2D[] Area{ get{ return SmallOldHouse.AreaArray; } }
public override int LabelNumber => 1041213;
public override Rectangle2D[] Area => SmallOldHouse.AreaArray;
public override void Serialize( GenericWriter writer )
{
@ -338,8 +338,8 @@ namespace Server.Multis.Deeds
return new SmallOldHouse( owner, 0x6A );
}
public override int LabelNumber{ get{ return 1041214; } }
public override Rectangle2D[] Area{ get{ return SmallOldHouse.AreaArray; } }
public override int LabelNumber => 1041214;
public override Rectangle2D[] Area => SmallOldHouse.AreaArray;
public override void Serialize( GenericWriter writer )
{
@ -372,8 +372,8 @@ namespace Server.Multis.Deeds
return new SmallOldHouse( owner, 0x6C );
}
public override int LabelNumber{ get{ return 1041215; } }
public override Rectangle2D[] Area{ get{ return SmallOldHouse.AreaArray; } }
public override int LabelNumber => 1041215;
public override Rectangle2D[] Area => SmallOldHouse.AreaArray;
public override void Serialize( GenericWriter writer )
{
@ -406,8 +406,8 @@ namespace Server.Multis.Deeds
return new SmallOldHouse( owner, 0x6E );
}
public override int LabelNumber{ get{ return 1041216; } }
public override Rectangle2D[] Area{ get{ return SmallOldHouse.AreaArray; } }
public override int LabelNumber => 1041216;
public override Rectangle2D[] Area => SmallOldHouse.AreaArray;
public override void Serialize( GenericWriter writer )
{
@ -440,8 +440,8 @@ namespace Server.Multis.Deeds
return new GuildHouse( owner );
}
public override int LabelNumber{ get{ return 1041219; } }
public override Rectangle2D[] Area{ get{ return GuildHouse.AreaArray; } }
public override int LabelNumber => 1041219;
public override Rectangle2D[] Area => GuildHouse.AreaArray;
public override void Serialize( GenericWriter writer )
{
@ -474,8 +474,8 @@ namespace Server.Multis.Deeds
return new TwoStoryHouse( owner, 0x76 );
}
public override int LabelNumber{ get{ return 1041220; } }
public override Rectangle2D[] Area{ get{ return TwoStoryHouse.AreaArray; } }
public override int LabelNumber => 1041220;
public override Rectangle2D[] Area => TwoStoryHouse.AreaArray;
public override void Serialize( GenericWriter writer )
{
@ -508,8 +508,8 @@ namespace Server.Multis.Deeds
return new TwoStoryHouse( owner, 0x78 );
}
public override int LabelNumber{ get{ return 1041221; } }
public override Rectangle2D[] Area{ get{ return TwoStoryHouse.AreaArray; } }
public override int LabelNumber => 1041221;
public override Rectangle2D[] Area => TwoStoryHouse.AreaArray;
public override void Serialize( GenericWriter writer )
{
@ -542,8 +542,8 @@ namespace Server.Multis.Deeds
return new Tower( owner );
}
public override int LabelNumber{ get{ return 1041222; } }
public override Rectangle2D[] Area{ get{ return Tower.AreaArray; } }
public override int LabelNumber => 1041222;
public override Rectangle2D[] Area => Tower.AreaArray;
public override void Serialize( GenericWriter writer )
{
@ -576,8 +576,8 @@ namespace Server.Multis.Deeds
return new Keep( owner );
}
public override int LabelNumber{ get{ return 1041223; } }
public override Rectangle2D[] Area{ get{ return Keep.AreaArray; } }
public override int LabelNumber => 1041223;
public override Rectangle2D[] Area => Keep.AreaArray;
public override void Serialize( GenericWriter writer )
{
@ -610,8 +610,8 @@ namespace Server.Multis.Deeds
return new Castle( owner );
}
public override int LabelNumber{ get{ return 1041224; } }
public override Rectangle2D[] Area{ get{ return Castle.AreaArray; } }
public override int LabelNumber => 1041224;
public override Rectangle2D[] Area => Castle.AreaArray;
public override void Serialize( GenericWriter writer )
{
@ -644,8 +644,8 @@ namespace Server.Multis.Deeds
return new LargePatioHouse( owner );
}
public override int LabelNumber{ get{ return 1041231; } }
public override Rectangle2D[] Area{ get{ return LargePatioHouse.AreaArray; } }
public override int LabelNumber => 1041231;
public override Rectangle2D[] Area => LargePatioHouse.AreaArray;
public override void Serialize( GenericWriter writer )
{
@ -678,8 +678,8 @@ namespace Server.Multis.Deeds
return new LargeMarbleHouse( owner );
}
public override int LabelNumber{ get{ return 1041236; } }
public override Rectangle2D[] Area{ get{ return LargeMarbleHouse.AreaArray; } }
public override int LabelNumber => 1041236;
public override Rectangle2D[] Area => LargeMarbleHouse.AreaArray;
public override void Serialize( GenericWriter writer )
{
@ -712,8 +712,8 @@ namespace Server.Multis.Deeds
return new SmallTower( owner );
}
public override int LabelNumber{ get{ return 1041237; } }
public override Rectangle2D[] Area{ get{ return SmallTower.AreaArray; } }
public override int LabelNumber => 1041237;
public override Rectangle2D[] Area => SmallTower.AreaArray;
public override void Serialize( GenericWriter writer )
{
@ -746,8 +746,8 @@ namespace Server.Multis.Deeds
return new LogCabin( owner );
}
public override int LabelNumber{ get{ return 1041238; } }
public override Rectangle2D[] Area{ get{ return LogCabin.AreaArray; } }
public override int LabelNumber => 1041238;
public override Rectangle2D[] Area => LogCabin.AreaArray;
public override void Serialize( GenericWriter writer )
{
@ -780,8 +780,8 @@ namespace Server.Multis.Deeds
return new SandStonePatio( owner );
}
public override int LabelNumber{ get{ return 1041239; } }
public override Rectangle2D[] Area{ get{ return SandStonePatio.AreaArray; } }
public override int LabelNumber => 1041239;
public override Rectangle2D[] Area => SandStonePatio.AreaArray;
public override void Serialize( GenericWriter writer )
{
@ -814,8 +814,8 @@ namespace Server.Multis.Deeds
return new TwoStoryVilla( owner );
}
public override int LabelNumber{ get{ return 1041240; } }
public override Rectangle2D[] Area{ get{ return TwoStoryVilla.AreaArray; } }
public override int LabelNumber => 1041240;
public override Rectangle2D[] Area => TwoStoryVilla.AreaArray;
public override void Serialize( GenericWriter writer )
{
@ -848,8 +848,8 @@ namespace Server.Multis.Deeds
return new SmallShop( owner, 0xA0 );
}
public override int LabelNumber{ get{ return 1041241; } }
public override Rectangle2D[] Area{ get{ return SmallShop.AreaArray2; } }
public override int LabelNumber => 1041241;
public override Rectangle2D[] Area => SmallShop.AreaArray2;
public override void Serialize( GenericWriter writer )
{
@ -882,8 +882,8 @@ namespace Server.Multis.Deeds
return new SmallShop( owner, 0xA2 );
}
public override int LabelNumber{ get{ return 1041242; } }
public override Rectangle2D[] Area{ get{ return SmallShop.AreaArray1; } }
public override int LabelNumber => 1041242;
public override Rectangle2D[] Area => SmallShop.AreaArray1;
public override void Serialize( GenericWriter writer )
{
@ -899,4 +899,4 @@ namespace Server.Multis.Deeds
int version = reader.ReadInt();
}
}
}
}

View file

@ -6,7 +6,7 @@ namespace Server.Multis
{
public class DynamicDecay
{
public static bool Enabled { get { return Core.ML; } }
public static bool Enabled => Core.ML;
private static Dictionary<DecayLevel, DecayStageInfo> m_Stages;

View file

@ -42,15 +42,15 @@ namespace Server.Multis
public FoundationType Type { get { return m_Type; } set { m_Type = value; } }
public int LastRevision { get { return m_LastRevision; } set { m_LastRevision = value; } }
public List<Item> Fixtures { get { return m_Fixtures; } }
public Item SignHanger { get { return m_SignHanger; } }
public Item Signpost { get { return m_Signpost; } }
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 override bool IsAosRules => true;
public override bool IsActive { get { return Customizer == null; } }
public override bool IsActive => Customizer == null;
public virtual int CustomizationCost { get { return (Core.AOS ? 0 : 10000); } }
@ -573,7 +573,7 @@ namespace Server.Multis
}
}
public override Point3D BaseBanLocation { get { return new Point3D( Components.Min.X, Components.Height - 1 - Components.Center.Y, 0 ); } }
public override Point3D BaseBanLocation => new Point3D( Components.Min.X, Components.Height - 1 - Components.Center.Y, 0 );
public void CheckSignpost()
{
@ -715,7 +715,7 @@ namespace Server.Multis
private int m_DefaultPrice;
public override int DefaultPrice { get { return m_DefaultPrice; } }
public override int DefaultPrice => m_DefaultPrice;
public override void Deserialize( GenericReader reader )
{
@ -1701,9 +1701,9 @@ namespace Server.Multis
}
}
public HouseFoundation Foundation { get { return m_Foundation; } }
public MultiComponentList Components { get { return m_Components; } }
public MultiTileEntry[] Fixtures { get { return m_Fixtures; } }
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 DesignState( HouseFoundation foundation, MultiComponentList components )
@ -1982,9 +1982,9 @@ namespace Server.Multis
private HouseFoundation m_Foundation;
private int m_Level;
public HouseFoundation Foundation { get { return m_Foundation; } }
public HouseFoundation Foundation => m_Foundation;
public int Level { get { return m_Level; } set { m_Level = value; } }
public int MaxLevels { get { return m_Foundation.MaxLevels; } }
public int MaxLevels => m_Foundation.MaxLevels;
public DesignContext( HouseFoundation foundation )
{
@ -1994,15 +1994,14 @@ namespace Server.Multis
private static Dictionary<Mobile, DesignContext> m_Table = new Dictionary<Mobile, DesignContext>();
public static Dictionary<Mobile, DesignContext> Table { get { return m_Table; } }
public static Dictionary<Mobile, DesignContext> Table => m_Table;
public static DesignContext Find( Mobile from )
{
if( from == null )
return null;
DesignContext d;
m_Table.TryGetValue( from, out d );
m_Table.TryGetValue( from, out DesignContext d );
return d;
}

View file

@ -11,7 +11,7 @@ namespace Server.Items
{
public class HousePlacementTool : Item
{
public override int LabelNumber{ get{ return 1060651; } } // a house placement tool
public override int LabelNumber => 1060651; // a house placement tool
[Constructible]
public HousePlacementTool() : base( 0x14F6 )
@ -501,12 +501,12 @@ namespace Server.Items
/* You are about to place a new house.
* Placing this house will condemn any and all of your other houses that you may have.
* All of your houses on all shards will be affected.
*
*
* In addition, you will not be able to place another house or have one transferred to you for one (1) real-life week.
*
*
* Once you accept these terms, these effects cannot be reversed.
* Re-deeding or transferring your new house will not uncondemn your other house(s) nor will the one week timer be removed.
*
*
* If you are absolutely certain you wish to proceed, click the button next to OKAY below.
* If you do not wish to trade for this house, click CANCEL.
*/
@ -791,4 +791,4 @@ namespace Server.Items
public static HousePlacementEntry[] ThreeStoryFoundations{ get{ return m_ThreeStoryFoundations; } }
}
}
}

View file

@ -10,12 +10,12 @@ namespace Server.Multis
{
public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D(-3,-3,7,7 ), new Rectangle2D( -1, 4, 3, 1 ) };
public override Rectangle2D[] Area{ get{ return AreaArray; } }
public override Point3D BaseBanLocation{ get{ return new Point3D( 2, 4, 0 ); } }
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new Point3D( 2, 4, 0 );
public override int DefaultPrice{ get{ return 43800; } }
public override int DefaultPrice => 43800;
public override HousePlacementEntry ConvertEntry{ get{ return HousePlacementEntry.TwoStoryFoundations[0]; } }
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[0];
public SmallOldHouse( Mobile owner, int id ) : base( id, owner, 425, 3 )
{
@ -30,7 +30,7 @@ namespace Server.Multis
{
}
public override HouseDeed GetDeed()
public override HouseDeed GetDeed()
{
switch ( ItemID )
{
@ -38,8 +38,8 @@ namespace Server.Multis
case 0x66: return new FieldStoneHouseDeed();
case 0x68: return new SmallBrickHouseDeed();
case 0x6A: return new WoodHouseDeed();
case 0x6C: return new WoodPlasterHouseDeed();
case 0x6E:
case 0x6C: return new WoodPlasterHouseDeed();
case 0x6E:
default: return new ThatchedRoofCottageDeed();
}
}
@ -61,14 +61,14 @@ namespace Server.Multis
{
public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -7, -7, 14, 14 ), new Rectangle2D( -2, 7, 4, 1 ) };
public override int DefaultPrice{ get{ return 144500; } }
public override int DefaultPrice => 144500;
public override HousePlacementEntry ConvertEntry{ get{ return HousePlacementEntry.ThreeStoryFoundations[20]; } }
public override int ConvertOffsetX{ get{ return -1; } }
public override int ConvertOffsetY{ get{ return -1; } }
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.ThreeStoryFoundations[20];
public override int ConvertOffsetX => -1;
public override int ConvertOffsetY => -1;
public override Rectangle2D[] Area{ get{ return AreaArray; } }
public override Point3D BaseBanLocation{ get{ return new Point3D( 4, 8, 0 ); } }
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new Point3D( 4, 8, 0 );
public GuildHouse( Mobile owner ) : base( 0x74, owner, 1100, 8 )
{
@ -105,10 +105,10 @@ namespace Server.Multis
{
public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -7, 0, 14, 7 ), new Rectangle2D( -7, -7, 9, 7 ), new Rectangle2D( -4, 7, 4, 1 ) };
public override Rectangle2D[] Area{ get{ return AreaArray; } }
public override Point3D BaseBanLocation{ get{ return new Point3D( 2, 8, 0 ); } }
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new Point3D( 2, 8, 0 );
public override int DefaultPrice{ get{ return 192400; } }
public override int DefaultPrice => 192400;
public TwoStoryHouse( Mobile owner, int id ) : base( id, owner, 1370, 10 )
{
@ -126,8 +126,8 @@ namespace Server.Multis
{
}
public override HouseDeed GetDeed()
{
public override HouseDeed GetDeed()
{
switch( ItemID )
{
case 0x76: return new TwoStoryWoodPlasterHouseDeed();
@ -153,13 +153,13 @@ namespace Server.Multis
{
public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -7, -7, 16, 14 ), new Rectangle2D( -1, 7, 4, 2 ), new Rectangle2D( -11, 0, 4, 7 ), new Rectangle2D( 9, 0, 4, 7 ) };
public override int DefaultPrice{ get{ return 433200; } }
public override int DefaultPrice => 433200;
public override HousePlacementEntry ConvertEntry{ get{ return HousePlacementEntry.ThreeStoryFoundations[37]; } }
public override int ConvertOffsetY{ get{ return -1; } }
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.ThreeStoryFoundations[37];
public override int ConvertOffsetY => -1;
public override Rectangle2D[] Area{ get{ return AreaArray; } }
public override Point3D BaseBanLocation{ get{ return new Point3D( 5, 8, 0 ); } }
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new Point3D( 5, 8, 0 );
public Tower( Mobile owner ) : base( 0x7A, owner, 2119, 15 )
{
@ -197,17 +197,17 @@ namespace Server.Multis
{
public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -11, -11, 7, 8 ), new Rectangle2D( -11, 5, 7, 8 ), new Rectangle2D( 6, -11, 7, 8 ), new Rectangle2D( 6, 5, 7, 8 ), new Rectangle2D( -9, -3, 5, 8 ), new Rectangle2D( 6, -3, 5, 8 ), new Rectangle2D( -4, -9, 10, 20 ), new Rectangle2D( -1, 11, 4, 1 ) };
public override int DefaultPrice{ get{ return 665200; } }
public override int DefaultPrice => 665200;
public override Rectangle2D[] Area{ get{ return AreaArray; } }
public override Point3D BaseBanLocation{ get{ return new Point3D( 5, 13, 0 ); } }
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new Point3D( 5, 13, 0 );
public Keep( Mobile owner ) : base( 0x7C, owner, 2625, 18 )
{
uint keyValue = CreateKeys( owner );
AddSouthDoors( false, 0, 10, 6, keyValue );
SetSign( 5, 12, 16 );
}
@ -234,10 +234,10 @@ namespace Server.Multis
{
public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -15, -15, 31, 31 ), new Rectangle2D( -1, 16, 4, 1 ) };
public override int DefaultPrice{ get{ return 1022800; } }
public override int DefaultPrice => 1022800;
public override Rectangle2D[] Area{ get{ return AreaArray; } }
public override Point3D BaseBanLocation{ get{ return new Point3D( 5, 17, 0 ); } }
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new Point3D( 5, 17, 0 );
public Castle( Mobile owner ) : base( 0x7E, owner, 4076, 28 )
{
@ -275,20 +275,20 @@ namespace Server.Multis
{
public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -7, -7, 15, 14 ), new Rectangle2D( -5, 7, 4, 1 ) };
public override int DefaultPrice{ get{ return 152800; } }
public override int DefaultPrice => 152800;
public override HousePlacementEntry ConvertEntry{ get{ return HousePlacementEntry.ThreeStoryFoundations[29]; } }
public override int ConvertOffsetY{ get{ return -1; } }
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.ThreeStoryFoundations[29];
public override int ConvertOffsetY => -1;
public override Rectangle2D[] Area { get { return AreaArray; } }
public override Point3D BaseBanLocation { get { return new Point3D( 1, 8, 0 ); } }
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new Point3D( 1, 8, 0 );
public LargePatioHouse( Mobile owner ) : base( 0x8C, owner, 1100, 8 )
{
uint keyValue = CreateKeys( owner );
AddSouthDoors( -4, 6, 7, keyValue );
SetSign( 1, 8, 16 );
AddEastDoor( 1, 4, 7 );
@ -319,13 +319,13 @@ namespace Server.Multis
{
public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -7, -7, 15, 14 ), new Rectangle2D( -6, 7, 6, 1 ) };
public override int DefaultPrice{ get{ return 192000; } }
public override int DefaultPrice => 192000;
public override HousePlacementEntry ConvertEntry{ get{ return HousePlacementEntry.ThreeStoryFoundations[29]; } }
public override int ConvertOffsetY{ get{ return -1; } }
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.ThreeStoryFoundations[29];
public override int ConvertOffsetY => -1;
public override Rectangle2D[] Area { get { return AreaArray; } }
public override Point3D BaseBanLocation { get { return new Point3D( 1, 8, 0 ); } }
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new Point3D( 1, 8, 0 );
public LargeMarbleHouse( Mobile owner ) : base( 0x96, owner, 1370, 10 )
{
@ -359,12 +359,12 @@ namespace Server.Multis
{
public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -3, -3, 8, 7 ), new Rectangle2D( 2, 4, 3, 1 ) };
public override int DefaultPrice{ get{ return 88500; } }
public override int DefaultPrice => 88500;
public override HousePlacementEntry ConvertEntry{ get{ return HousePlacementEntry.TwoStoryFoundations[6]; } }
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[6];
public override Rectangle2D[] Area{ get{ return AreaArray; } }
public override Point3D BaseBanLocation{ get{ return new Point3D( 1, 4, 0 ); } }
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new Point3D( 1, 4, 0 );
public SmallTower( Mobile owner ) : base( 0x98, owner, 580, 4 )
{
@ -398,19 +398,19 @@ namespace Server.Multis
{
public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -3, -6, 8, 13 ) };
public override int DefaultPrice{ get{ return 97800; } }
public override int DefaultPrice => 97800;
public override HousePlacementEntry ConvertEntry{ get{ return HousePlacementEntry.TwoStoryFoundations[12]; } }
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[12];
public override Rectangle2D[] Area { get { return AreaArray; } }
public override Point3D BaseBanLocation { get { return new Point3D( 5, 8, 0 ); } }
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new Point3D( 5, 8, 0 );
public LogCabin( Mobile owner ) : base( 0x9A, owner, 1100, 8 )
{
uint keyValue = CreateKeys( owner );
AddSouthDoor( 1, 4, 8, keyValue );
SetSign( 5, 8, 20 );
AddSouthDoor( 1, 0, 29 );
@ -439,20 +439,20 @@ namespace Server.Multis
{
public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -5, -4, 12, 8 ), new Rectangle2D( -2, 4, 3, 1 ) };
public override int DefaultPrice{ get{ return 90900; } }
public override int DefaultPrice => 90900;
public override HousePlacementEntry ConvertEntry{ get{ return HousePlacementEntry.TwoStoryFoundations[35]; } }
public override int ConvertOffsetY{ get{ return -1; } }
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[35];
public override int ConvertOffsetY => -1;
public override Rectangle2D[] Area { get { return AreaArray; } }
public override Point3D BaseBanLocation { get { return new Point3D( 4, 6, 0 ); } }
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new Point3D( 4, 6, 0 );
public SandStonePatio( Mobile owner ) : base( 0x9C, owner, 850, 6 )
{
uint keyValue = CreateKeys( owner );
AddSouthDoor( -1, 3, 6, keyValue );
SetSign( 4, 6, 24 );
}
@ -479,19 +479,19 @@ namespace Server.Multis
{
public static Rectangle2D[] AreaArray = new Rectangle2D[]{ new Rectangle2D( -5, -5, 11, 11 ), new Rectangle2D( 2, 6, 4, 1 ) };
public override int DefaultPrice{ get{ return 136500; } }
public override int DefaultPrice => 136500;
public override HousePlacementEntry ConvertEntry{ get{ return HousePlacementEntry.TwoStoryFoundations[31]; } }
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[31];
public override Rectangle2D[] Area{ get{ return AreaArray; } }
public override Point3D BaseBanLocation{ get{ return new Point3D( 3, 8, 0 ); } }
public override Rectangle2D[] Area => AreaArray;
public override Point3D BaseBanLocation => new Point3D( 3, 8, 0 );
public TwoStoryVilla( Mobile owner ) : base( 0x9E, owner, 1100, 8 )
{
uint keyValue = CreateKeys( owner );
AddSouthDoors( 3, 1, 5, keyValue );
SetSign( 3, 8, 24 );
AddEastDoor( 1, 0, 25 );
@ -519,12 +519,12 @@ namespace Server.Multis
public class SmallShop : BaseHouse
{
public override Rectangle2D[] Area { get { return ( ItemID == 0x40A2 ? AreaArray1 : AreaArray2 ); } }
public override Point3D BaseBanLocation { get { return new Point3D( 3, 4, 0 ); } }
public override Rectangle2D[] Area => ( ItemID == 0x40A2 ? AreaArray1 : AreaArray2 );
public override Point3D BaseBanLocation => new Point3D( 3, 4, 0 );
public override int DefaultPrice{ get{ return 63000; } }
public override int DefaultPrice => 63000;
public override HousePlacementEntry ConvertEntry{ get{ return HousePlacementEntry.TwoStoryFoundations[0]; } }
public override HousePlacementEntry ConvertEntry => HousePlacementEntry.TwoStoryFoundations[0];
public static Rectangle2D[] AreaArray1 = new Rectangle2D[]{ new Rectangle2D(-3,-3,7,7), new Rectangle2D( -1, 4, 4, 1 ) };
public static Rectangle2D[] AreaArray2 = new Rectangle2D[]{ new Rectangle2D(-3,-3,7,7), new Rectangle2D( -2, 4, 3, 1 ) };
@ -544,7 +544,7 @@ namespace Server.Multis
AddDoor( door, -2, 0, id == 0xA2 ? 24 : 27 );
//AddSouthDoor( false, -2, 0, 27 - (id == 0xA2 ? 3 : 0), keyValue );
SetSign( 3, 4, 7 - (id == 0xA2 ? 2 : 0) );
}
@ -552,11 +552,11 @@ namespace Server.Multis
{
}
public override HouseDeed GetDeed()
{
public override HouseDeed GetDeed()
{
switch ( ItemID )
{
case 0xA0: return new StoneWorkshopDeed();
case 0xA0: return new StoneWorkshopDeed();
case 0xA2:
default: return new MarbleWorkshopDeed();
}

View file

@ -15,7 +15,7 @@ namespace Server.Multis
public static readonly int HorizontalSpacing = 25;
public static readonly int VerticalSpacing = 25;
public override int LabelNumber{ get{ return 1061690; } } // Packing Crate
public override int LabelNumber => 1061690; // Packing Crate
private BaseHouse m_House;
@ -27,8 +27,8 @@ namespace Server.Multis
set{ m_House = value; }
}
public override int DefaultMaxItems{ get{ return 0; } }
public override int DefaultMaxWeight{ get{ return 0; } }
public override int DefaultMaxItems => 0;
public override int DefaultMaxWeight => 0;
public MovingCrate( BaseHouse house ) : base( 0xE3D )
{
@ -241,7 +241,7 @@ namespace Server.Multis
int version = reader.ReadEncodedInt();
m_House = reader.ReadItem() as BaseHouse;
if( m_House != null )
{
m_House.MovingCrate = this;
@ -276,18 +276,18 @@ namespace Server.Multis
public class PackingBox : BaseContainer
{
public override int LabelNumber{ get{ return 1061690; } } // Packing Crate
public override int LabelNumber => 1061690; // Packing Crate
public override int DefaultGumpID{ get{ return 0x4B; } }
public override int DefaultDropSound{ get{ return 0x42; } }
public override int DefaultGumpID => 0x4B;
public override int DefaultDropSound => 0x42;
public override Rectangle2D Bounds
{
get{ return new Rectangle2D( 16, 51, 168, 73 ); }
}
public override int DefaultMaxItems{ get{ return 0; } }
public override int DefaultMaxWeight{ get{ return 0; } }
public override int DefaultMaxItems => 0;
public override int DefaultMaxWeight => 0;
public PackingBox() : base( 0x9A8 )
{
@ -336,4 +336,4 @@ namespace Server.Multis
MaxItems = -1; // reset to default
}
}
}
}