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,83 +1,81 @@
using Server.Items;
using EDI=Server.Mobiles.EscortDestinationInfo;
using EDI = Server.Mobiles.EscortDestinationInfo;
namespace Server.Mobiles
{
public class Merchant : BaseEscortable
{
[Constructible]
public Merchant()
{
Title = "the merchant";
SetSkill( SkillName.ItemID, 55.0, 78.0 );
SetSkill( SkillName.ArmsLore, 55, 78 );
}
public class Merchant : BaseEscortable
{
[Constructible]
public Merchant()
{
Title = "the merchant";
SetSkill(SkillName.ItemID, 55.0, 78.0);
SetSkill(SkillName.ArmsLore, 55, 78);
}
public override bool CanTeach => true;
public override bool ClickTitle => false; // Do not display 'the merchant' when single-clicking
public Merchant(Serial serial)
: base(serial)
{
}
private static int GetRandomHue()
{
switch( Utility.Random( 6 ) )
{
default:
case 0: return 0;
case 1: return Utility.RandomBlueHue();
case 2: return Utility.RandomGreenHue();
case 3: return Utility.RandomRedHue();
case 4: return Utility.RandomYellowHue();
case 5: return Utility.RandomNeutralHue();
}
public override bool CanTeach => true;
public override bool ClickTitle => false; // Do not display 'the merchant' when single-clicking
}
private static int GetRandomHue()
{
switch (Utility.Random(6))
{
default:
case 0: return 0;
case 1: return Utility.RandomBlueHue();
case 2: return Utility.RandomGreenHue();
case 3: return Utility.RandomRedHue();
case 4: return Utility.RandomYellowHue();
case 5: return Utility.RandomNeutralHue();
}
}
public override void InitOutfit()
{
if ( Female )
AddItem( new PlainDress() );
else
AddItem( new Shirt( GetRandomHue() ) );
public override void InitOutfit()
{
if (Female)
AddItem(new PlainDress());
else
AddItem(new Shirt(GetRandomHue()));
int lowHue = GetRandomHue();
int lowHue = GetRandomHue();
AddItem( new ThighBoots() );
AddItem(new ThighBoots());
if ( Female )
AddItem( new FancyDress( lowHue ) );
else
AddItem( new FancyShirt( lowHue ) );
AddItem( new LongPants( lowHue ) );
if (Female)
AddItem(new FancyDress(lowHue));
else
AddItem(new FancyShirt(lowHue));
AddItem(new LongPants(lowHue));
if ( !Female )
AddItem( new BodySash( lowHue ) );
if (!Female)
AddItem(new BodySash(lowHue));
//if ( !Female )
//AddItem( new Longsword() );
//if ( !Female )
//AddItem( new Longsword() );
Utility.AssignRandomHair(this);
Utility.AssignRandomHair( this );
PackGold(200, 250);
}
PackGold( 200, 250 );
}
public override void Serialize(GenericWriter writer)
{
base.Serialize(writer);
public Merchant( Serial serial )
: base( serial )
{
}
writer.Write(0); // version
}
public override void Serialize( GenericWriter writer )
{
base.Serialize( writer );
public override void Deserialize(GenericReader reader)
{
base.Deserialize(reader);
writer.Write( (int)0 ); // version
}
public override void Deserialize( GenericReader reader )
{
base.Deserialize( reader );
int version = reader.ReadInt();
}
}
}
int version = reader.ReadInt();
}
}
}