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,40 +1,40 @@
namespace Server.Items
{
public class AlchemyBag : Bag
{
public override string DefaultName => "an Alchemy Kit";
public class AlchemyBag : Bag
{
[Constructible]
public AlchemyBag() : this(1)
{
Movable = true;
Hue = 0x250;
}
[Constructible]
public AlchemyBag() : this( 1 )
{
Movable = true;
Hue = 0x250;
}
[Constructible]
public AlchemyBag(int amount)
{
DropItem(new MortarPestle(5));
DropItem(new BagOfReagents(5000));
DropItem(new Bottle(5000));
}
[Constructible]
public AlchemyBag( int amount )
{
DropItem( new MortarPestle( 5 ) );
DropItem( new BagOfReagents( 5000 ) );
DropItem( new Bottle( 5000 ) );
}
public AlchemyBag(Serial serial) : base(serial)
{
}
public AlchemyBag( Serial serial ) : base( serial )
{
}
public override string DefaultName => "an Alchemy Kit";
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();
}
}
}

View file

@ -1,45 +1,44 @@
namespace Server.Items
{
public class BagOfingots : Bag
{
[Constructible]
public BagOfingots() : this( 5000 )
{
}
namespace Server.Items
{
public class BagOfingots : Bag
{
[Constructible]
public BagOfingots() : this(5000)
{
}
[Constructible]
public BagOfingots( int amount )
{
DropItem( new DullCopperIngot ( amount ) );
DropItem( new ShadowIronIngot ( amount ) );
DropItem( new CopperIngot ( amount ) );
DropItem( new BronzeIngot ( amount ) );
DropItem( new GoldIngot ( amount ) );
DropItem( new AgapiteIngot ( amount ) );
DropItem( new VeriteIngot ( amount ) );
DropItem( new ValoriteIngot ( amount ) );
DropItem( new IronIngot ( amount ) );
DropItem( new Tongs() );
DropItem( new TinkerTools() );
[Constructible]
public BagOfingots(int amount)
{
DropItem(new DullCopperIngot(amount));
DropItem(new ShadowIronIngot(amount));
DropItem(new CopperIngot(amount));
DropItem(new BronzeIngot(amount));
DropItem(new GoldIngot(amount));
DropItem(new AgapiteIngot(amount));
DropItem(new VeriteIngot(amount));
DropItem(new ValoriteIngot(amount));
DropItem(new IronIngot(amount));
DropItem(new Tongs());
DropItem(new TinkerTools());
}
}
public BagOfingots(Serial serial) : base(serial)
{
}
public BagOfingots( Serial serial ) : base( serial )
{
}
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write(0); // version
}
writer.Write( (int) 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();
}
}
}

View file

@ -1,39 +1,39 @@
namespace Server.Items
{
public class ScribeBag : Bag
{
public override string DefaultName => "a Scribe Kit";
public class ScribeBag : Bag
{
[Constructible]
public ScribeBag() : this(1)
{
Movable = true;
Hue = 0x105;
}
[Constructible]
public ScribeBag() : this( 1 )
{
Movable = true;
Hue = 0x105;
}
[Constructible]
public ScribeBag(int amount)
{
DropItem(new BagOfReagents(5000));
DropItem(new BlankScroll(500));
}
[Constructible]
public ScribeBag( int amount )
{
DropItem( new BagOfReagents( 5000 ) );
DropItem( new BlankScroll( 500 ) );
}
public ScribeBag(Serial serial) : base(serial)
{
}
public ScribeBag( Serial serial ) : base( serial )
{
}
public override string DefaultName => "a Scribe Kit";
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();
}
}
}

View file

@ -1,45 +1,44 @@
namespace Server.Items
{
public class SmithBag : Bag
{
[Constructible]
public SmithBag() : this( 5000 )
{
}
{
public class SmithBag : Bag
{
[Constructible]
public SmithBag() : this(5000)
{
}
[Constructible]
public SmithBag( int amount )
{
DropItem( new DullCopperIngot ( amount ) );
DropItem( new ShadowIronIngot ( amount ) );
DropItem( new CopperIngot ( amount ) );
DropItem( new BronzeIngot ( amount ) );
DropItem( new GoldIngot ( amount ) );
DropItem( new AgapiteIngot ( amount ) );
DropItem( new VeriteIngot ( amount ) );
DropItem( new ValoriteIngot ( amount ) );
DropItem( new IronIngot ( amount ) );
DropItem( new Tongs ( amount ) );
DropItem( new TinkerTools ( amount ) );
[Constructible]
public SmithBag(int amount)
{
DropItem(new DullCopperIngot(amount));
DropItem(new ShadowIronIngot(amount));
DropItem(new CopperIngot(amount));
DropItem(new BronzeIngot(amount));
DropItem(new GoldIngot(amount));
DropItem(new AgapiteIngot(amount));
DropItem(new VeriteIngot(amount));
DropItem(new ValoriteIngot(amount));
DropItem(new IronIngot(amount));
DropItem(new Tongs(amount));
DropItem(new TinkerTools(amount));
}
}
public SmithBag(Serial serial) : base(serial)
{
}
public SmithBag( Serial serial ) : base( serial )
{
}
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
writer.Write(0); // version
}
writer.Write( (int) 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();
}
}
}

View file

@ -1,45 +1,45 @@
namespace Server.Items
{
public class TailorBag : Bag
{
public override string DefaultName => "a Tailoring Kit";
public class TailorBag : Bag
{
[Constructible]
public TailorBag() : this(1)
{
Movable = true;
Hue = 0x315;
}
[Constructible]
public TailorBag() : this( 1 )
{
Movable = true;
Hue = 0x315;
}
[Constructible]
public TailorBag(int amount)
{
DropItem(new SewingKit(5));
DropItem(new Scissors());
DropItem(new Hides(500));
DropItem(new BoltOfCloth(20));
DropItem(new DyeTub());
DropItem(new DyeTub());
DropItem(new BlackDyeTub());
DropItem(new Dyes());
}
[Constructible]
public TailorBag( int amount )
{
DropItem( new SewingKit( 5 ) );
DropItem( new Scissors() );
DropItem( new Hides( 500 ) );
DropItem( new BoltOfCloth( 20 ) );
DropItem( new DyeTub() );
DropItem( new DyeTub() );
DropItem( new BlackDyeTub() );
DropItem( new Dyes() );
}
public TailorBag( Serial serial ) : base( serial )
{
}
public TailorBag(Serial serial) : base(serial)
{
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override string DefaultName => "a Tailoring Kit";
writer.Write( (int) 0 ); // version
}
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
writer.Write(0); // version
}
int version = reader.ReadInt();
}
}
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
int version = reader.ReadInt();
}
}
}