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,422 +1,428 @@
namespace Server.Items
{
public abstract class BaseIngot : Item, ICommodity
{
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) 1 ); // version
writer.Write( (int) m_Resource );
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
switch ( version )
{
case 1:
{
m_Resource = (CraftResource)reader.ReadInt();
break;
}
case 0:
{
OreInfo info;
switch ( reader.ReadInt() )
{
case 0: info = OreInfo.Iron; break;
case 1: info = OreInfo.DullCopper; break;
case 2: info = OreInfo.ShadowIron; break;
case 3: info = OreInfo.Copper; break;
case 4: info = OreInfo.Bronze; break;
case 5: info = OreInfo.Gold; break;
case 6: info = OreInfo.Agapite; break;
case 7: info = OreInfo.Verite; break;
case 8: info = OreInfo.Valorite; break;
default: info = null; break;
}
m_Resource = CraftResources.GetFromOreInfo( info );
break;
}
}
}
public BaseIngot( CraftResource resource ) : this( resource, 1 )
{
}
public BaseIngot( CraftResource resource, int amount ) : base( 0x1BF2 )
{
Stackable = true;
Amount = amount;
Hue = CraftResources.GetHue( resource );
m_Resource = resource;
}
public BaseIngot( Serial serial ) : base( serial )
{
}
public override void AddNameProperty( ObjectPropertyList list )
{
if ( Amount > 1 )
list.Add( 1050039, "{0}\t#{1}", Amount, 1027154 ); // ~1_NUMBER~ ~2_ITEMNAME~
else
list.Add( 1027154 ); // ingots
}
public override void GetProperties( ObjectPropertyList list )
{
base.GetProperties( list );
if ( !CraftResources.IsStandard( m_Resource ) )
{
int num = CraftResources.GetLocalizationNumber( m_Resource );
if ( num > 0 )
list.Add( num );
else
list.Add( CraftResources.GetName( m_Resource ) );
}
}
public override int LabelNumber
{
get
{
if ( m_Resource >= CraftResource.DullCopper && m_Resource <= CraftResource.Valorite )
return 1042684 + (int)(m_Resource - CraftResource.DullCopper);
return 1042692;
}
}
}
[FlippableAttribute( 0x1BF2, 0x1BEF )]
public class IronIngot : BaseIngot
{
[Constructible]
public IronIngot() : this( 1 )
{
}
[Constructible]
public IronIngot( int amount ) : base( CraftResource.Iron, amount )
{
}
public IronIngot( 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();
}
}
[FlippableAttribute( 0x1BF2, 0x1BEF )]
public class DullCopperIngot : BaseIngot
{
[Constructible]
public DullCopperIngot() : this( 1 )
{
}
[Constructible]
public DullCopperIngot( int amount ) : base( CraftResource.DullCopper, amount )
{
}
public DullCopperIngot( 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();
}
}
[FlippableAttribute( 0x1BF2, 0x1BEF )]
public class ShadowIronIngot : BaseIngot
{
[Constructible]
public ShadowIronIngot() : this( 1 )
{
}
[Constructible]
public ShadowIronIngot( int amount ) : base( CraftResource.ShadowIron, amount )
{
}
public ShadowIronIngot( 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();
}
}
[FlippableAttribute( 0x1BF2, 0x1BEF )]
public class CopperIngot : BaseIngot
{
[Constructible]
public CopperIngot() : this( 1 )
{
}
[Constructible]
public CopperIngot( int amount ) : base( CraftResource.Copper, amount )
{
}
public CopperIngot( 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();
}
}
[FlippableAttribute( 0x1BF2, 0x1BEF )]
public class BronzeIngot : BaseIngot
{
[Constructible]
public BronzeIngot() : this( 1 )
{
}
[Constructible]
public BronzeIngot( int amount ) : base( CraftResource.Bronze, amount )
{
}
public BronzeIngot( 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();
}
}
[FlippableAttribute( 0x1BF2, 0x1BEF )]
public class GoldIngot : BaseIngot
{
[Constructible]
public GoldIngot() : this( 1 )
{
}
[Constructible]
public GoldIngot( int amount ) : base( CraftResource.Gold, amount )
{
}
public GoldIngot( 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();
}
}
[FlippableAttribute( 0x1BF2, 0x1BEF )]
public class AgapiteIngot : BaseIngot
{
[Constructible]
public AgapiteIngot() : this( 1 )
{
}
[Constructible]
public AgapiteIngot( int amount ) : base( CraftResource.Agapite, amount )
{
}
public AgapiteIngot( 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();
}
}
[FlippableAttribute( 0x1BF2, 0x1BEF )]
public class VeriteIngot : BaseIngot
{
[Constructible]
public VeriteIngot() : this( 1 )
{
}
[Constructible]
public VeriteIngot( int amount ) : base( CraftResource.Verite, amount )
{
}
public VeriteIngot( 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();
}
}
[FlippableAttribute( 0x1BF2, 0x1BEF )]
public class ValoriteIngot : BaseIngot
{
[Constructible]
public ValoriteIngot() : this( 1 )
{
}
[Constructible]
public ValoriteIngot( int amount ) : base( CraftResource.Valorite, amount )
{
}
public ValoriteIngot( 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 BaseIngot : Item, ICommodity
{
private CraftResource m_Resource;
public BaseIngot(CraftResource resource) : this(resource, 1)
{
}
public BaseIngot(CraftResource resource, int amount) : base(0x1BF2)
{
Stackable = true;
Amount = amount;
Hue = CraftResources.GetHue(resource);
m_Resource = resource;
}
public BaseIngot(Serial serial) : base(serial)
{
}
[CommandProperty(AccessLevel.GameMaster)]
public CraftResource Resource
{
get => m_Resource;
set
{
m_Resource = value;
InvalidateProperties();
}
}
public override double DefaultWeight => 0.1;
public override int LabelNumber
{
get
{
if (m_Resource >= CraftResource.DullCopper && m_Resource <= CraftResource.Valorite)
return 1042684 + (m_Resource - CraftResource.DullCopper);
return 1042692;
}
}
int ICommodity.DescriptionNumber => LabelNumber;
bool ICommodity.IsDeedable => true;
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
writer.Write(1); // version
writer.Write((int)m_Resource);
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
switch (version)
{
case 1:
{
m_Resource = (CraftResource)reader.ReadInt();
break;
}
case 0:
{
OreInfo info;
switch (reader.ReadInt())
{
case 0:
info = OreInfo.Iron;
break;
case 1:
info = OreInfo.DullCopper;
break;
case 2:
info = OreInfo.ShadowIron;
break;
case 3:
info = OreInfo.Copper;
break;
case 4:
info = OreInfo.Bronze;
break;
case 5:
info = OreInfo.Gold;
break;
case 6:
info = OreInfo.Agapite;
break;
case 7:
info = OreInfo.Verite;
break;
case 8:
info = OreInfo.Valorite;
break;
default:
info = null;
break;
}
m_Resource = CraftResources.GetFromOreInfo(info);
break;
}
}
}
public override void AddNameProperty(ObjectPropertyList list)
{
if (Amount > 1)
list.Add(1050039, "{0}\t#{1}", Amount, 1027154); // ~1_NUMBER~ ~2_ITEMNAME~
else
list.Add(1027154); // ingots
}
public override void GetProperties(ObjectPropertyList list)
{
base.GetProperties(list);
if (!CraftResources.IsStandard(m_Resource))
{
int num = CraftResources.GetLocalizationNumber(m_Resource);
if (num > 0)
list.Add(num);
else
list.Add(CraftResources.GetName(m_Resource));
}
}
}
[Flippable(0x1BF2, 0x1BEF)]
public class IronIngot : BaseIngot
{
[Constructible]
public IronIngot() : this(1)
{
}
[Constructible]
public IronIngot(int amount) : base(CraftResource.Iron, amount)
{
}
public IronIngot(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();
}
}
[Flippable(0x1BF2, 0x1BEF)]
public class DullCopperIngot : BaseIngot
{
[Constructible]
public DullCopperIngot() : this(1)
{
}
[Constructible]
public DullCopperIngot(int amount) : base(CraftResource.DullCopper, amount)
{
}
public DullCopperIngot(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();
}
}
[Flippable(0x1BF2, 0x1BEF)]
public class ShadowIronIngot : BaseIngot
{
[Constructible]
public ShadowIronIngot() : this(1)
{
}
[Constructible]
public ShadowIronIngot(int amount) : base(CraftResource.ShadowIron, amount)
{
}
public ShadowIronIngot(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();
}
}
[Flippable(0x1BF2, 0x1BEF)]
public class CopperIngot : BaseIngot
{
[Constructible]
public CopperIngot() : this(1)
{
}
[Constructible]
public CopperIngot(int amount) : base(CraftResource.Copper, amount)
{
}
public CopperIngot(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();
}
}
[Flippable(0x1BF2, 0x1BEF)]
public class BronzeIngot : BaseIngot
{
[Constructible]
public BronzeIngot() : this(1)
{
}
[Constructible]
public BronzeIngot(int amount) : base(CraftResource.Bronze, amount)
{
}
public BronzeIngot(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();
}
}
[Flippable(0x1BF2, 0x1BEF)]
public class GoldIngot : BaseIngot
{
[Constructible]
public GoldIngot() : this(1)
{
}
[Constructible]
public GoldIngot(int amount) : base(CraftResource.Gold, amount)
{
}
public GoldIngot(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();
}
}
[Flippable(0x1BF2, 0x1BEF)]
public class AgapiteIngot : BaseIngot
{
[Constructible]
public AgapiteIngot() : this(1)
{
}
[Constructible]
public AgapiteIngot(int amount) : base(CraftResource.Agapite, amount)
{
}
public AgapiteIngot(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();
}
}
[Flippable(0x1BF2, 0x1BEF)]
public class VeriteIngot : BaseIngot
{
[Constructible]
public VeriteIngot() : this(1)
{
}
[Constructible]
public VeriteIngot(int amount) : base(CraftResource.Verite, amount)
{
}
public VeriteIngot(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();
}
}
[Flippable(0x1BF2, 0x1BEF)]
public class ValoriteIngot : BaseIngot
{
[Constructible]
public ValoriteIngot() : this(1)
{
}
[Constructible]
public ValoriteIngot(int amount) : base(CraftResource.Valorite, amount)
{
}
public ValoriteIngot(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();
}
}
}

File diff suppressed because it is too large Load diff

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();
}
}
}