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

46
Scripts/Items/Construction/Chairs/Benchs.cs
View file

@ -1,31 +1,31 @@
namespace Server.Items
{
[Furniture]
[Flippable( 0xB2D, 0xB2C )]
public class WoodenBench : Item
{
[Constructible]
public WoodenBench() : base( 0xB2D )
{
Weight = 6;
}
[Furniture]
[Flippable(0xB2D, 0xB2C)]
public class WoodenBench : Item
{
[Constructible]
public WoodenBench() : base(0xB2D)
{
Weight = 6;
}
public WoodenBench(Serial serial) : base(serial)
{
}
public WoodenBench(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);
}
writer.Write(0);
}
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();
}
}
}

380
Scripts/Items/Construction/Chairs/Chairs.cs
View file

@ -1,244 +1,244 @@
namespace Server.Items
{
[Furniture]
[Flippable( 0xB4F, 0xB4E, 0xB50, 0xB51 )]
public class FancyWoodenChairCushion : Item
{
[Constructible]
public FancyWoodenChairCushion() : base(0xB4F)
{
Weight = 20.0;
}
[Furniture]
[Flippable(0xB4F, 0xB4E, 0xB50, 0xB51)]
public class FancyWoodenChairCushion : Item
{
[Constructible]
public FancyWoodenChairCushion() : base(0xB4F)
{
Weight = 20.0;
}
public FancyWoodenChairCushion(Serial serial) : base(serial)
{
}
public FancyWoodenChairCushion(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);
}
writer.Write(0);
}
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();
if ( Weight == 6.0 )
Weight = 20.0;
}
}
if (Weight == 6.0)
Weight = 20.0;
}
}
[Furniture]
[Flippable( 0xB53, 0xB52, 0xB54, 0xB55 )]
public class WoodenChairCushion : Item
{
[Constructible]
public WoodenChairCushion() : base(0xB53)
{
Weight = 20.0;
}
[Furniture]
[Flippable(0xB53, 0xB52, 0xB54, 0xB55)]
public class WoodenChairCushion : Item
{
[Constructible]
public WoodenChairCushion() : base(0xB53)
{
Weight = 20.0;
}
public WoodenChairCushion(Serial serial) : base(serial)
{
}
public WoodenChairCushion(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);
}
writer.Write(0);
}
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();
if ( Weight == 6.0 )
Weight = 20.0;
}
}
if (Weight == 6.0)
Weight = 20.0;
}
}
[Furniture]
[Flippable( 0xB57, 0xB56, 0xB59, 0xB58 )]
public class WoodenChair : Item
{
[Constructible]
public WoodenChair() : base(0xB57)
{
Weight = 20.0;
}
[Furniture]
[Flippable(0xB57, 0xB56, 0xB59, 0xB58)]
public class WoodenChair : Item
{
[Constructible]
public WoodenChair() : base(0xB57)
{
Weight = 20.0;
}
public WoodenChair(Serial serial) : base(serial)
{
}
public WoodenChair(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);
}
writer.Write(0);
}
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();
if ( Weight == 6.0 )
Weight = 20.0;
}
}
if (Weight == 6.0)
Weight = 20.0;
}
}
[Furniture]
[Flippable( 0xB5B, 0xB5A, 0xB5C, 0xB5D )]
public class BambooChair : Item
{
[Constructible]
public BambooChair() : base(0xB5B)
{
Weight = 20.0;
}
[Furniture]
[Flippable(0xB5B, 0xB5A, 0xB5C, 0xB5D)]
public class BambooChair : Item
{
[Constructible]
public BambooChair() : base(0xB5B)
{
Weight = 20.0;
}
public BambooChair(Serial serial) : base(serial)
{
}
public BambooChair(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);
}
writer.Write(0);
}
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();
if ( Weight == 6.0 )
Weight = 20.0;
}
}
if (Weight == 6.0)
Weight = 20.0;
}
}
[DynamicFliping]
[Flippable(0x1218, 0x1219, 0x121A, 0x121B)]
public class StoneChair : Item
{
[Constructible]
public StoneChair() : base(0x1218)
{
Weight = 20;
}
[DynamicFliping]
[Flippable(0x1218, 0x1219, 0x121A, 0x121B)]
public class StoneChair : Item
{
[Constructible]
public StoneChair() : base(0x1218)
{
Weight = 20;
}
public StoneChair(Serial serial) : base(serial)
{
}
public StoneChair(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);
}
writer.Write(0);
}
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();
}
}
[DynamicFliping]
[Flippable( 0x2DE3, 0x2DE4, 0x2DE5, 0x2DE6 )]
public class OrnateElvenChair : Item
{
[Constructible]
public OrnateElvenChair() : base( 0x2DE3 )
{
Weight = 1.0;
}
[DynamicFliping]
[Flippable(0x2DE3, 0x2DE4, 0x2DE5, 0x2DE6)]
public class OrnateElvenChair : Item
{
[Constructible]
public OrnateElvenChair() : base(0x2DE3)
{
Weight = 1.0;
}
public OrnateElvenChair( Serial serial ) : base( serial )
{
}
public OrnateElvenChair(Serial serial) : base(serial)
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt( 0 ); // version
}
writer.WriteEncodedInt(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadEncodedInt();
}
}
int version = reader.ReadEncodedInt();
}
}
[DynamicFliping]
[Flippable( 0x2DEB, 0x2DEC, 0x2DED, 0x2DEE )]
public class BigElvenChair : Item
{
[Constructible]
public BigElvenChair() : base( 0x2DEB )
{
}
[DynamicFliping]
[Flippable(0x2DEB, 0x2DEC, 0x2DED, 0x2DEE)]
public class BigElvenChair : Item
{
[Constructible]
public BigElvenChair() : base(0x2DEB)
{
}
public BigElvenChair( Serial serial ) : base( serial )
{
}
public BigElvenChair(Serial serial) : base(serial)
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt( 0 ); // version
}
writer.WriteEncodedInt(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadEncodedInt();
}
}
int version = reader.ReadEncodedInt();
}
}
[DynamicFliping]
[Flippable( 0x2DF5, 0x2DF6 )]
public class ElvenReadingChair : Item
{
[Constructible]
public ElvenReadingChair() : base( 0x2DF5 )
{
}
[DynamicFliping]
[Flippable(0x2DF5, 0x2DF6)]
public class ElvenReadingChair : Item
{
[Constructible]
public ElvenReadingChair() : base(0x2DF5)
{
}
public ElvenReadingChair( Serial serial ) : base( serial )
{
}
public ElvenReadingChair(Serial serial) : base(serial)
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.WriteEncodedInt( 0 ); // version
}
writer.WriteEncodedInt(0); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadEncodedInt();
}
}
int version = reader.ReadEncodedInt();
}
}
}

96
Scripts/Items/Construction/Chairs/Stools.cs
View file

@ -1,64 +1,64 @@
namespace Server.Items
{
[Furniture]
public class Stool : Item
{
[Constructible]
public Stool() : base( 0xA2A )
{
Weight = 10.0;
}
[Furniture]
public class Stool : Item
{
[Constructible]
public Stool() : base(0xA2A)
{
Weight = 10.0;
}
public Stool(Serial serial) : base(serial)
{
}
public Stool(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);
}
writer.Write(0);
}
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();
if ( Weight == 6.0 )
Weight = 10.0;
}
}
if (Weight == 6.0)
Weight = 10.0;
}
}
[Furniture]
public class FootStool : Item
{
[Constructible]
public FootStool() : base( 0xB5E )
{
Weight = 6.0;
}
[Furniture]
public class FootStool : Item
{
[Constructible]
public FootStool() : base(0xB5E)
{
Weight = 6.0;
}
public FootStool(Serial serial) : base(serial)
{
}
public FootStool(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);
}
writer.Write(0);
}
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();
if ( Weight == 6.0 )
Weight = 10.0;
}
}
if (Weight == 6.0)
Weight = 10.0;
}
}
}

100
Scripts/Items/Construction/Chairs/Thrones.cs
View file

@ -1,66 +1,66 @@
namespace Server.Items
{
[Furniture]
[Flippable(0xB32, 0xB33)]
public class Throne : Item
{
[Constructible]
public Throne() : base(0xB33)
{
Weight = 1.0;
}
[Furniture]
[Flippable(0xB32, 0xB33)]
public class Throne : Item
{
[Constructible]
public Throne() : base(0xB33)
{
Weight = 1.0;
}
public Throne(Serial serial) : base(serial)
{
}
public Throne(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);
}
writer.Write(0);
}
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();
if ( Weight == 6.0 )
Weight = 1.0;
}
}
if (Weight == 6.0)
Weight = 1.0;
}
}
[Furniture]
[Flippable( 0xB2E, 0xB2F, 0xB31, 0xB30 )]
public class WoodenThrone : Item
{
[Constructible]
public WoodenThrone() : base(0xB2E)
{
Weight = 15.0;
}
[Furniture]
[Flippable(0xB2E, 0xB2F, 0xB31, 0xB30)]
public class WoodenThrone : Item
{
[Constructible]
public WoodenThrone() : base(0xB2E)
{
Weight = 15.0;
}
public WoodenThrone(Serial serial) : base(serial)
{
}
public WoodenThrone(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);
}
writer.Write(0);
}
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();
if ( Weight == 6.0 )
Weight = 15.0;
}
}
if (Weight == 6.0)
Weight = 15.0;
}
}
}