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

Fixes code according to modern code style. Fixes a few expression bugs.

Browse source
This commit is contained in:
Kamron Batman 2018-09-15 09:58:51 -07:00
parent 89eea25e5f
commit 970fd563b2
3324 changed files with 441118 additions and 433755 deletions
Download patch file Download diff file Expand all files Collapse all files

40
Scripts/Items/Construction/Walls/BaseWall.cs
View file

@ -1,28 +1,28 @@
namespace Server.Items
{
public abstract class BaseWall : Item
{
public BaseWall( int itemID ) : base( itemID )
{
Movable = false;
}
public abstract class BaseWall : Item
{
public BaseWall(int itemID) : base(itemID)
{
Movable = false;
}
public BaseWall( Serial serial ) : base( serial )
{
}
public BaseWall(Serial serial) : base(serial)
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 0 ); // version
}
writer.Write(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
int version = reader.ReadInt();
}
}
}

86
Scripts/Items/Construction/Walls/DarkWoodWall.cs
View file

@ -1,52 +1,52 @@
namespace Server.Items
{
public enum DarkWoodWallTypes
{
Corner,
SouthWall,
EastWall,
CornerPost,
EastDoorFrame,
SouthDoorFrame,
WestDoorFrame,
NorthDoorFrame,
SouthWindow,
EastWindow,
CornerMedium,
EastWallMedium,
SouthWallMedium,
CornerPostMedium,
CornerShort,
EastWallShort,
SouthWallShort,
CornerPostShort,
SouthWallVShort,
EastWallVShort
}
public enum DarkWoodWallTypes
{
Corner,
SouthWall,
EastWall,
CornerPost,
EastDoorFrame,
SouthDoorFrame,
WestDoorFrame,
NorthDoorFrame,
SouthWindow,
EastWindow,
CornerMedium,
EastWallMedium,
SouthWallMedium,
CornerPostMedium,
CornerShort,
EastWallShort,
SouthWallShort,
CornerPostShort,
SouthWallVShort,
EastWallVShort
}
public class DarkWoodWall : BaseWall
{
[Constructible]
public DarkWoodWall( DarkWoodWallTypes type ) : base( 0x0006 + (int)type )
{
}
public class DarkWoodWall : BaseWall
{
[Constructible]
public DarkWoodWall(DarkWoodWallTypes type) : base(0x0006 + (int)type)
{
}
public DarkWoodWall( Serial serial ) : base( serial )
{
}
public DarkWoodWall(Serial serial) : base(serial)
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 0 ); // version
}
writer.Write(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
int version = reader.ReadInt();
}
}
}

90
Scripts/Items/Construction/Walls/ThickGrayStoneWall.cs
View file

@ -8,55 +8,55 @@
namespace Server.Items
{
public enum ThickGrayStoneWallTypes
{
WestArch,
NorthArch,
SouthArchTop,
EastArchTop,
EastArch,
SouthArch,
Wall1,
Wall2,
Wall3,
SouthWindow,
Wall4,
EastWindow,
WestArch2,
NorthArch2,
SouthArchTop2,
EastArchTop2,
EastArch2,
SouthArch2,
SWArchEdge2,
SouthWindow2,
NEArchEdge2,
EastWindow2
}
public enum ThickGrayStoneWallTypes
{
WestArch,
NorthArch,
SouthArchTop,
EastArchTop,
EastArch,
SouthArch,
Wall1,
Wall2,
Wall3,
SouthWindow,
Wall4,
EastWindow,
WestArch2,
NorthArch2,
SouthArchTop2,
EastArchTop2,
EastArch2,
SouthArch2,
SWArchEdge2,
SouthWindow2,
NEArchEdge2,
EastWindow2
}
public class ThickGrayStoneWall : BaseWall
{
[Constructible]
public ThickGrayStoneWall( ThickGrayStoneWallTypes type) : base( 0x007A + (int)type )
{
}
public class ThickGrayStoneWall : BaseWall
{
[Constructible]
public ThickGrayStoneWall(ThickGrayStoneWallTypes type) : base(0x007A + (int)type)
{
}
public ThickGrayStoneWall( Serial serial ) : base( serial )
{
}
public ThickGrayStoneWall(Serial serial) : base(serial)
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 0 ); // version
}
writer.Write(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
int version = reader.ReadInt();
}
}
}

118
Scripts/Items/Construction/Walls/ThinBrickWall.cs
View file

@ -1,68 +1,68 @@
namespace Server.Items
{
public enum ThinBrickWallTypes
{
Corner,
SouthWall,
EastWall,
CornerPost,
EastDoorFrame,
SouthDoorFrame,
WestDoorFrame,
NorthDoorFrame,
SouthWindow,
EastWindow,
CornerMedium,
SouthWallMedium,
EastWallMedium,
CornerPostMedium,
CornerShort,
SouthWallShort,
EastWallShort,
CornerPostShort,
CornerArch,
SouthArch,
WestArch,
EastArch,
NorthArch,
SouthCenterArchTall,
EastCenterArchTall,
EastCornerArchTall,
SouthCornerArchTall,
SouthCornerArch,
EastCornerArch,
SouthCenterArch,
EastCenterArch,
CornerVVShort,
SouthWallVVShort,
EastWallVVShort,
SouthWallVShort,
EastWallVShort
};
public enum ThinBrickWallTypes
{
Corner,
SouthWall,
EastWall,
CornerPost,
EastDoorFrame,
SouthDoorFrame,
WestDoorFrame,
NorthDoorFrame,
SouthWindow,
EastWindow,
CornerMedium,
SouthWallMedium,
EastWallMedium,
CornerPostMedium,
CornerShort,
SouthWallShort,
EastWallShort,
CornerPostShort,
CornerArch,
SouthArch,
WestArch,
EastArch,
NorthArch,
SouthCenterArchTall,
EastCenterArchTall,
EastCornerArchTall,
SouthCornerArchTall,
SouthCornerArch,
EastCornerArch,
SouthCenterArch,
EastCenterArch,
CornerVVShort,
SouthWallVVShort,
EastWallVVShort,
SouthWallVShort,
EastWallVShort
}
public class ThinBrickWall : BaseWall
{
[Constructible]
public ThinBrickWall( ThinBrickWallTypes type ) : base( 0x0033 + (int)type )
{
}
public class ThinBrickWall : BaseWall
{
[Constructible]
public ThinBrickWall(ThinBrickWallTypes type) : base(0x0033 + (int)type)
{
}
public ThinBrickWall( Serial serial ) : base( serial )
{
}
public ThinBrickWall(Serial serial) : base(serial)
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 0 ); // version
}
writer.Write(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
int version = reader.ReadInt();
}
}
}

96
Scripts/Items/Construction/Walls/ThinStoneWall.cs
View file

@ -1,57 +1,57 @@
namespace Server.Items
{
public enum ThinStoneWallTypes
{
Corner,
EastWall,
SouthWall,
CornerPost,
EastDoorFrame,
SouthDoorFrame,
NorthDoorFrame,
WestDoorFrame,
SouthWindow,
EastWindow,
CornerMedium,
SouthWallMedium,
EastWallMedium,
CornerPostMedium,
CornerArch,
EastArch,
SouthArch,
NorthArch,
WestArch,
CornerShort,
EastWallShort,
SouthWallShort,
CornerPostShort,
SouthWallShort2,
EastWallShort2
}
public enum ThinStoneWallTypes
{
Corner,
EastWall,
SouthWall,
CornerPost,
EastDoorFrame,
SouthDoorFrame,
NorthDoorFrame,
WestDoorFrame,
SouthWindow,
EastWindow,
CornerMedium,
SouthWallMedium,
EastWallMedium,
CornerPostMedium,
CornerArch,
EastArch,
SouthArch,
NorthArch,
WestArch,
CornerShort,
EastWallShort,
SouthWallShort,
CornerPostShort,
SouthWallShort2,
EastWallShort2
}
public class ThinStoneWall : BaseWall
{
[Constructible]
public ThinStoneWall( ThinStoneWallTypes type ) : base( 0x001A + (int)type )
{
}
public class ThinStoneWall : BaseWall
{
[Constructible]
public ThinStoneWall(ThinStoneWallTypes type) : base(0x001A + (int)type)
{
}
public ThinStoneWall( Serial serial ) : base( serial )
{
}
public ThinStoneWall(Serial serial) : base(serial)
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 0 ); // version
}
writer.Write(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
int version = reader.ReadInt();
}
}
}

116
Scripts/Items/Construction/Walls/WhiteStoneWall.cs
View file

@ -8,68 +8,68 @@
namespace Server.Items
{
public enum WhiteStoneWallTypes
{
EastWall,
SouthWall,
SECorner,
NWCornerPost,
EastArrowLoop,
SouthArrowLoop,
EastWindow,
SouthWindow,
SouthWallMedium,
EastWallMedium,
SECornerMedium,
NWCornerPostMedium,
SouthWallShort,
EastWallShort,
SECornerShort,
NWCornerPostShort,
NECornerPostShort,
SWCornerPostShort,
SouthWallVShort,
EastWallVShort,
SECornerVShort,
NWCornerPostVShort,
SECornerArch,
SouthArch,
WestArch,
EastArch,
NorthArch,
EastBattlement,
SECornerBattlement,
SouthBattlement,
NECornerBattlement,
SWCornerBattlement,
Column,
SouthWallVVShort,
EastWallVVShort
}
public enum WhiteStoneWallTypes
{
EastWall,
SouthWall,
SECorner,
NWCornerPost,
EastArrowLoop,
SouthArrowLoop,
EastWindow,
SouthWindow,
SouthWallMedium,
EastWallMedium,
SECornerMedium,
NWCornerPostMedium,
SouthWallShort,
EastWallShort,
SECornerShort,
NWCornerPostShort,
NECornerPostShort,
SWCornerPostShort,
SouthWallVShort,
EastWallVShort,
SECornerVShort,
NWCornerPostVShort,
SECornerArch,
SouthArch,
WestArch,
EastArch,
NorthArch,
EastBattlement,
SECornerBattlement,
SouthBattlement,
NECornerBattlement,
SWCornerBattlement,
Column,
SouthWallVVShort,
EastWallVVShort
}
public class WhiteStoneWall : BaseWall
{
[Constructible]
public WhiteStoneWall( WhiteStoneWallTypes type) : base( 0x0057 + (int)type )
{
}
public class WhiteStoneWall : BaseWall
{
[Constructible]
public WhiteStoneWall(WhiteStoneWallTypes type) : base(0x0057 + (int)type)
{
}
public WhiteStoneWall( Serial serial ) : base( serial )
{
}
public WhiteStoneWall(Serial serial) : base(serial)
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write( (int) 0 ); // version
}
writer.Write(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
int version = reader.ReadInt();
}
}
}