Fixes code according to modern code style. Fixes a few expression bugs.
This commit is contained in:
Kamron Batman
parent
89eea25e5f
commit
970fd563b2
3324 changed files with 441118 additions and 433755 deletions
|
|
@ -1,328 +1,320 @@
|
|||
namespace Server.Items
|
||||
{
|
||||
public abstract class Beard : Item
|
||||
{
|
||||
/*public static Beard CreateByID( int id, int hue )
|
||||
{
|
||||
switch ( id )
|
||||
{
|
||||
case 0x203E: return new LongBeard( hue );
|
||||
case 0x203F: return new ShortBeard( hue );
|
||||
case 0x2040: return new Goatee( hue );
|
||||
case 0x2041: return new Mustache( hue );
|
||||
case 0x204B: return new MediumShortBeard( hue );
|
||||
case 0x204C: return new MediumLongBeard( hue );
|
||||
case 0x204D: return new Vandyke( hue );
|
||||
default: return new GenericBeard( id, hue );
|
||||
}
|
||||
}*/
|
||||
|
||||
protected Beard( int itemID ) : this( itemID, 0 )
|
||||
{
|
||||
}
|
||||
|
||||
protected Beard( int itemID, int hue ) : base( itemID )
|
||||
{
|
||||
LootType = LootType.Blessed;
|
||||
Layer = Layer.FacialHair;
|
||||
Hue = hue;
|
||||
}
|
||||
|
||||
public Beard( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
|
||||
public override bool DisplayLootType => false;
|
||||
|
||||
public override bool VerifyMove( Mobile from )
|
||||
{
|
||||
return ( from.AccessLevel >= AccessLevel.GameMaster );
|
||||
}
|
||||
|
||||
public override DeathMoveResult OnParentDeath( Mobile parent )
|
||||
{
|
||||
//Dupe( Amount );
|
||||
|
||||
parent.FacialHairItemID = ItemID;
|
||||
parent.FacialHairHue = Hue;
|
||||
|
||||
return DeathMoveResult.MoveToCorpse;
|
||||
}
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
|
||||
writer.Write( (int) 0 ); // version
|
||||
}
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
LootType = LootType.Blessed;
|
||||
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
|
||||
public class GenericBeard : Beard
|
||||
{
|
||||
|
||||
private GenericBeard( int itemID ) : this( itemID, 0 )
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
private GenericBeard( int itemID, int hue ) : base( itemID, hue )
|
||||
{
|
||||
}
|
||||
|
||||
public GenericBeard( 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 LongBeard : Beard
|
||||
{
|
||||
public abstract class Beard : Item
|
||||
{
|
||||
/*public static Beard CreateByID( int id, int hue )
|
||||
{
|
||||
switch ( id )
|
||||
{
|
||||
case 0x203E: return new LongBeard( hue );
|
||||
case 0x203F: return new ShortBeard( hue );
|
||||
case 0x2040: return new Goatee( hue );
|
||||
case 0x2041: return new Mustache( hue );
|
||||
case 0x204B: return new MediumShortBeard( hue );
|
||||
case 0x204C: return new MediumLongBeard( hue );
|
||||
case 0x204D: return new Vandyke( hue );
|
||||
default: return new GenericBeard( id, hue );
|
||||
}
|
||||
}*/
|
||||
|
||||
protected Beard(int itemID) : this(itemID, 0)
|
||||
{
|
||||
}
|
||||
|
||||
protected Beard(int itemID, int hue) : base(itemID)
|
||||
{
|
||||
LootType = LootType.Blessed;
|
||||
Layer = Layer.FacialHair;
|
||||
Hue = hue;
|
||||
}
|
||||
|
||||
public Beard(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override bool DisplayLootType => false;
|
||||
|
||||
public override bool VerifyMove(Mobile from)
|
||||
{
|
||||
return from.AccessLevel >= AccessLevel.GameMaster;
|
||||
}
|
||||
|
||||
public override DeathMoveResult OnParentDeath(Mobile parent)
|
||||
{
|
||||
//Dupe( Amount );
|
||||
|
||||
parent.FacialHairItemID = ItemID;
|
||||
parent.FacialHairHue = Hue;
|
||||
|
||||
return DeathMoveResult.MoveToCorpse;
|
||||
}
|
||||
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
LootType = LootType.Blessed;
|
||||
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
|
||||
public class GenericBeard : Beard
|
||||
{
|
||||
private GenericBeard(int itemID) : this(itemID, 0)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
private GenericBeard(int itemID, int hue) : base(itemID, hue)
|
||||
{
|
||||
}
|
||||
|
||||
public GenericBeard(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 LongBeard : Beard
|
||||
{
|
||||
private LongBeard()
|
||||
: this(0)
|
||||
{
|
||||
}
|
||||
|
||||
private LongBeard(int hue)
|
||||
: base(0x203E, hue)
|
||||
{
|
||||
}
|
||||
|
||||
public LongBeard(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
private LongBeard()
|
||||
: this( 0 )
|
||||
{
|
||||
}
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
private LongBeard( int hue )
|
||||
: base( 0x203E, hue )
|
||||
{
|
||||
}
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
public LongBeard( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
public class ShortBeard : Beard
|
||||
{
|
||||
private ShortBeard()
|
||||
: this(0)
|
||||
{
|
||||
}
|
||||
|
||||
writer.Write( (int) 0 ); // version
|
||||
}
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
private ShortBeard(int hue)
|
||||
: base(0x203f, hue)
|
||||
{
|
||||
}
|
||||
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
public ShortBeard(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public class ShortBeard : Beard
|
||||
{
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
private ShortBeard()
|
||||
: this( 0 )
|
||||
{
|
||||
}
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
private ShortBeard( int hue )
|
||||
: base( 0x203f, hue )
|
||||
{
|
||||
}
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
|
||||
public class Goatee : Beard
|
||||
{
|
||||
private Goatee()
|
||||
: this(0)
|
||||
{
|
||||
}
|
||||
|
||||
public ShortBeard( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
private Goatee(int hue)
|
||||
: base(0x2040, hue)
|
||||
{
|
||||
}
|
||||
|
||||
public Goatee(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
public class Goatee : Beard
|
||||
{
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
|
||||
public class Mustache : Beard
|
||||
{
|
||||
private Mustache()
|
||||
: this(0)
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
private Mustache(int hue)
|
||||
: base(0x2041, hue)
|
||||
{
|
||||
}
|
||||
|
||||
private Goatee()
|
||||
: this( 0 )
|
||||
{
|
||||
}
|
||||
public Mustache(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
private Goatee( int hue )
|
||||
: base( 0x2040, hue )
|
||||
{
|
||||
}
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public Goatee( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
|
||||
writer.Write( (int) 0 ); // version
|
||||
}
|
||||
public class MediumShortBeard : Beard
|
||||
{
|
||||
private MediumShortBeard()
|
||||
: this(0)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
private MediumShortBeard(int hue)
|
||||
: base(0x204B, hue)
|
||||
{
|
||||
}
|
||||
|
||||
public MediumShortBeard(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public class Mustache : Beard
|
||||
{
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
private Mustache()
|
||||
: this( 0 )
|
||||
{
|
||||
}
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
private Mustache( int hue )
|
||||
: base( 0x2041, hue )
|
||||
{
|
||||
}
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
|
||||
public Mustache( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
public class MediumLongBeard : Beard
|
||||
{
|
||||
private MediumLongBeard()
|
||||
: this(0)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Serialize( GenericWriter writer )
|
||||
{
|
||||
base.Serialize( writer );
|
||||
|
||||
writer.Write( (int) 0 ); // version
|
||||
}
|
||||
private MediumLongBeard(int hue)
|
||||
: base(0x204C, hue)
|
||||
{
|
||||
}
|
||||
|
||||
public MediumLongBeard(Serial serial) : base(serial)
|
||||
{
|
||||
}
|
||||
|
||||
public override void Deserialize( GenericReader reader )
|
||||
{
|
||||
base.Deserialize( reader );
|
||||
public override void Serialize(GenericWriter writer)
|
||||
{
|
||||
base.Serialize(writer);
|
||||
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
writer.Write(0); // version
|
||||
}
|
||||
|
||||
public class MediumShortBeard : Beard
|
||||
{
|
||||
public override void Deserialize(GenericReader reader)
|
||||
{
|
||||
base.Deserialize(reader);
|
||||
|
||||
private MediumShortBeard()
|
||||
: this( 0 )
|
||||
{
|
||||
}
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
|
||||
public class Vandyke : Beard
|
||||
{
|
||||
private Vandyke()
|
||||
: this(0)
|
||||
{
|
||||
}
|
||||
|
||||
private MediumShortBeard( int hue )
|
||||
: base( 0x204B, hue )
|
||||
{
|
||||
}
|
||||
|
||||
public MediumShortBeard( Serial serial ) : base( serial )
|
||||
{
|
||||
}
|
||||
private Vandyke(int hue)
|
||||
: base(0x204D, hue)
|
||||
{
|
||||
}
|
||||
|
||||
public Vandyke(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();
|
||||
}
|
||||
}
|
||||
|
||||
public class MediumLongBeard : Beard
|
||||
{
|
||||
|
||||
private MediumLongBeard()
|
||||
: this( 0 )
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
private MediumLongBeard( int hue )
|
||||
: base( 0x204C, hue )
|
||||
{
|
||||
}
|
||||
|
||||
public MediumLongBeard( 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 Vandyke : Beard
|
||||
{
|
||||
|
||||
private Vandyke()
|
||||
: this( 0 )
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
private Vandyke( int hue )
|
||||
: base( 0x204D, hue )
|
||||
{
|
||||
}
|
||||
|
||||
public Vandyke( 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();
|
||||
}
|
||||
}
|
||||
}
|
||||
int version = reader.ReadInt();
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue