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

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

View file

@ -1,263 +1,255 @@
namespace Server.Items
{
public abstract class BaseScales : Item, ICommodity
{
public override int LabelNumber => 1053139; // dragon scales
private CraftResource m_Resource;
[CommandProperty( AccessLevel.GameMaster )]
public CraftResource Resource
{
get => m_Resource;
set{ m_Resource = value; InvalidateProperties(); }
}
public override double DefaultWeight => 0.1;
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true;
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int) 0 ); // version
writer.Write( (int) m_Resource );
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
switch ( version )
{
case 0:
{
m_Resource = (CraftResource)reader.ReadInt();
break;
}
}
}
public BaseScales( CraftResource resource ) : this( resource, 1 )
{
}
public BaseScales( CraftResource resource, int amount ) : base( 0x26B4 )
{
Stackable = true;
Amount = amount;
Hue = CraftResources.GetHue( resource );
m_Resource = resource;
}
public BaseScales( Serial serial ) : base( serial )
{
}
}
public class RedScales : BaseScales
{
[Constructible]
public RedScales() : this( 1 )
{
}
[Constructible]
public RedScales( int amount ) : base( CraftResource.RedScales, amount )
{
}
public RedScales( Serial serial ) : base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int) 0 ); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
public class YellowScales : BaseScales
{
[Constructible]
public YellowScales() : this( 1 )
{
}
[Constructible]
public YellowScales( int amount ) : base( CraftResource.YellowScales, amount )
{
}
public YellowScales( Serial serial ) : base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int) 0 ); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
public class BlackScales : BaseScales
{
[Constructible]
public BlackScales() : this( 1 )
{
}
[Constructible]
public BlackScales( int amount ) : base( CraftResource.BlackScales, amount )
{
}
public BlackScales( Serial serial ) : base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int) 0 ); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
public class GreenScales : BaseScales
{
[Constructible]
public GreenScales() : this( 1 )
{
}
[Constructible]
public GreenScales( int amount ) : base( CraftResource.GreenScales, amount )
{
}
public GreenScales( Serial serial ) : base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int) 0 ); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
public class WhiteScales : BaseScales
{
[Constructible]
public WhiteScales() : this( 1 )
{
}
[Constructible]
public WhiteScales( int amount ) : base( CraftResource.WhiteScales, amount )
{
}
public WhiteScales( Serial serial ) : base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int) 0 ); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
public class BlueScales : BaseScales
{
public override int LabelNumber => 1053140; // sea serpent scales
[Constructible]
public BlueScales() : this( 1 )
{
}
[Constructible]
public BlueScales( int amount ) : base( CraftResource.BlueScales, amount )
{
}
public BlueScales( Serial serial ) : base( serial )
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write( (int) 0 ); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
}
public abstract class BaseScales : Item, ICommodity
{
private CraftResource m_Resource;
public BaseScales(CraftResource resource) : this(resource, 1)
{
}
public BaseScales(CraftResource resource, int amount) : base(0x26B4)
{
Stackable = true;
Amount = amount;
Hue = CraftResources.GetHue(resource);
m_Resource = resource;
}
public BaseScales(Serial serial) : base(serial)
{
}
public override int LabelNumber => 1053139; // dragon scales
[CommandProperty(AccessLevel.GameMaster)]
public CraftResource Resource
{
get => m_Resource;
set
{
m_Resource = value;
InvalidateProperties();
}
}
public override double DefaultWeight => 0.1;
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true;
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
writer.Write((int)m_Resource);
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
switch (version)
{
case 0:
{
m_Resource = (CraftResource)reader.ReadInt();
break;
}
}
}
}
public class RedScales : BaseScales
{
[Constructible]
public RedScales() : this(1)
{
}
[Constructible]
public RedScales(int amount) : base(CraftResource.RedScales, amount)
{
}
public RedScales(Serial serial) : base(serial)
{
}
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
public class YellowScales : BaseScales
{
[Constructible]
public YellowScales() : this(1)
{
}
[Constructible]
public YellowScales(int amount) : base(CraftResource.YellowScales, amount)
{
}
public YellowScales(Serial serial) : base(serial)
{
}
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
public class BlackScales : BaseScales
{
[Constructible]
public BlackScales() : this(1)
{
}
[Constructible]
public BlackScales(int amount) : base(CraftResource.BlackScales, amount)
{
}
public BlackScales(Serial serial) : base(serial)
{
}
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
public class GreenScales : BaseScales
{
[Constructible]
public GreenScales() : this(1)
{
}
[Constructible]
public GreenScales(int amount) : base(CraftResource.GreenScales, amount)
{
}
public GreenScales(Serial serial) : base(serial)
{
}
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
public class WhiteScales : BaseScales
{
[Constructible]
public WhiteScales() : this(1)
{
}
[Constructible]
public WhiteScales(int amount) : base(CraftResource.WhiteScales, amount)
{
}
public WhiteScales(Serial serial) : base(serial)
{
}
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
public class BlueScales : BaseScales
{
[Constructible]
public BlueScales() : this(1)
{
}
[Constructible]
public BlueScales(int amount) : base(CraftResource.BlueScales, amount)
{
}
public BlueScales(Serial serial) : base(serial)
{
}
public override int LabelNumber => 1053140; // sea serpent scales
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write(0); // version
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}