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

@ -3,100 +3,104 @@ using Server.Multis;
namespace Server.Items
{
public class ContractOfEmployment : Item
{
public override int LabelNumber => 1041243; // a contract of employment
public class ContractOfEmployment : Item
{
[Constructible]
public ContractOfEmployment() : base(0x14F0)
{
Weight = 1.0;
//LootType = LootType.Blessed;
}
[Constructible]
public ContractOfEmployment() : base( 0x14F0 )
{
Weight = 1.0;
//LootType = LootType.Blessed;
}
public ContractOfEmployment(Serial serial) : base(serial)
{
}
public ContractOfEmployment( Serial serial ) : base( serial )
{
}
public override int LabelNumber => 1041243; // a contract of employment
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();
}
public override void OnDoubleClick( Mobile from )
{
if ( !IsChildOf( from.Backpack ) )
{
from.SendLocalizedMessage( 1042001 ); // That must be in your pack for you to use it.
}
else if ( from.AccessLevel >= AccessLevel.GameMaster )
{
from.SendLocalizedMessage( 503248 ); // Your godly powers allow you to place this vendor whereever you wish.
public override void OnDoubleClick(Mobile from)
{
if (!IsChildOf(from.Backpack))
{
from.SendLocalizedMessage(1042001); // That must be in your pack for you to use it.
}
else if (from.AccessLevel >= AccessLevel.GameMaster)
{
from.SendLocalizedMessage(503248); // Your godly powers allow you to place this vendor whereever you wish.
Mobile v = new PlayerVendor( from, BaseHouse.FindHouseAt( from ) );
Mobile v = new PlayerVendor(from, BaseHouse.FindHouseAt(from));
v.Direction = from.Direction & Direction.Mask;
v.MoveToWorld( from.Location, from.Map );
v.Direction = from.Direction & Direction.Mask;
v.MoveToWorld(from.Location, from.Map);
v.SayTo( from, 503246 ); // Ah! it feels good to be working again.
v.SayTo(from, 503246); // Ah! it feels good to be working again.
Delete();
}
else
{
BaseHouse house = BaseHouse.FindHouseAt( from );
Delete();
}
else
{
BaseHouse house = BaseHouse.FindHouseAt(from);
if ( house == null )
{
from.SendLocalizedMessage( 503240 ); // Vendors can only be placed in houses.
}
else if ( !BaseHouse.NewVendorSystem && !house.IsFriend( from ) )
{
from.SendLocalizedMessage( 503242 ); // You must ask the owner of this building to name you a friend of the household in order to place a vendor here.
}
else if ( BaseHouse.NewVendorSystem && !house.IsOwner( from ) )
{
from.SendLocalizedMessage( 1062423 ); // Only the house owner can directly place vendors. Please ask the house owner to offer you a vendor contract so that you may place a vendor in this house.
}
else if ( !house.Public || !house.CanPlaceNewVendor() )
{
from.SendLocalizedMessage( 503241 ); // You cannot place this vendor or barkeep. Make sure the house is public and has sufficient storage available.
}
else
{
bool vendor, contract;
BaseHouse.IsThereVendor( from.Location, from.Map, out vendor, out contract );
if (house == null)
{
from.SendLocalizedMessage(503240); // Vendors can only be placed in houses.
}
else if (!BaseHouse.NewVendorSystem && !house.IsFriend(from))
{
from.SendLocalizedMessage(
503242); // You must ask the owner of this building to name you a friend of the household in order to place a vendor here.
}
else if (BaseHouse.NewVendorSystem && !house.IsOwner(from))
{
from.SendLocalizedMessage(
1062423); // Only the house owner can directly place vendors. Please ask the house owner to offer you a vendor contract so that you may place a vendor in this house.
}
else if (!house.Public || !house.CanPlaceNewVendor())
{
from.SendLocalizedMessage(
503241); // You cannot place this vendor or barkeep. Make sure the house is public and has sufficient storage available.
}
else
{
bool vendor, contract;
BaseHouse.IsThereVendor(from.Location, from.Map, out vendor, out contract);
if ( vendor )
{
from.SendLocalizedMessage( 1062677 ); // You cannot place a vendor or barkeep at this location.
}
else if ( contract )
{
from.SendLocalizedMessage( 1062678 ); // You cannot place a vendor or barkeep on top of a rental contract!
}
else
{
Mobile v = new PlayerVendor( from, house );
if (vendor)
{
from.SendLocalizedMessage(1062677); // You cannot place a vendor or barkeep at this location.
}
else if (contract)
{
from.SendLocalizedMessage(
1062678); // You cannot place a vendor or barkeep on top of a rental contract!
}
else
{
Mobile v = new PlayerVendor(from, house);
v.Direction = from.Direction & Direction.Mask;
v.MoveToWorld( from.Location, from.Map );
v.Direction = from.Direction & Direction.Mask;
v.MoveToWorld(from.Location, from.Map);
v.SayTo( from, 503246 ); // Ah! it feels good to be working again.
v.SayTo(from, 503246); // Ah! it feels good to be working again.
Delete();
}
}
}
}
}
}
Delete();
}
}
}
}
}
}