warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removes implicit this.

Browse source
This commit is contained in:
Kamron Batman 2018-09-14 12:56:58 -07:00
parent 04b4cfe75b
commit 83dcf536d8
533 changed files with 2804 additions and 2806 deletions
Download patch file Download diff file Expand all files Collapse all files

60
Scripts/Mobiles/Vendors/BaseVendor.cs
View file

@ -81,7 +81,7 @@ namespace Server.Mobiles
#region Faction
public virtual int GetPriceScalar()
{
Town town = Town.FromRegion( this.Region );
Town town = Town.FromRegion( Region );
if ( town != null )
return ( 100 + town.Tax );
@ -160,7 +160,7 @@ namespace Server.Mobiles
{
LoadSBInfo();
this.Title = title;
Title = title;
InitBody();
InitOutfit();
@ -297,7 +297,7 @@ namespace Server.Mobiles
public virtual bool CheckTokuno()
{
if ( this.Map != Map.Tokuno )
if ( Map != Map.Tokuno )
return false;
NameList n;
@ -307,7 +307,7 @@ namespace Server.Mobiles
else
n = NameList.GetNameList( "tokuno male" );
if ( !n.ContainsName( this.Name ) )
if ( !n.ContainsName( Name ) )
TurnToTokuno();
return true;
@ -316,14 +316,14 @@ namespace Server.Mobiles
public virtual void TurnToTokuno()
{
if ( Female )
this.Name = NameList.RandomName( "tokuno female" );
Name = NameList.RandomName( "tokuno female" );
else
this.Name = NameList.RandomName( "tokuno male" );
Name = NameList.RandomName( "tokuno male" );
}
public virtual bool CheckGargoyle()
{
Map map = this.Map;
Map map = Map;
if ( map != Map.Ilshenar )
return false;
@ -339,7 +339,7 @@ namespace Server.Mobiles
public virtual bool CheckNecromancer()
{
Map map = this.Map;
Map map = Map;
if ( map != Map.Malas )
return false;
@ -379,9 +379,9 @@ namespace Server.Mobiles
public virtual void TurnToNecromancer()
{
for ( int i = 0; i < this.Items.Count; ++i )
for ( int i = 0; i < Items.Count; ++i )
{
Item item = this.Items[i];
Item item = Items[i];
if ( item is Hair || item is Beard )
item.Hue = 0;
@ -397,9 +397,9 @@ namespace Server.Mobiles
public virtual void TurnToGargoyle()
{
for ( int i = 0; i < this.Items.Count; ++i )
for ( int i = 0; i < Items.Count; ++i )
{
Item item = this.Items[i];
Item item = Items[i];
if ( item is BaseClothing || item is Hair || item is Beard )
item.Delete();
@ -417,7 +417,7 @@ namespace Server.Mobiles
public virtual void CapitalizeTitle()
{
string title = this.Title;
string title = Title;
if ( title == null )
return;
@ -435,7 +435,7 @@ namespace Server.Mobiles
split[i] = Char.ToUpper( split[i][0] ).ToString();
}
this.Title = String.Join( " ", split );
Title = String.Join( " ", split );
}
public virtual int GetHairHue()
@ -493,7 +493,7 @@ namespace Server.Mobiles
{
m_LastRestock = DateTime.UtcNow;
IBuyItemInfo[] buyInfo = this.GetBuyInfo();
IBuyItemInfo[] buyInfo = GetBuyInfo();
foreach ( IBuyItemInfo bii in buyInfo )
bii.OnRestock();
@ -522,11 +522,11 @@ namespace Server.Mobiles
int count = 0;
List<BuyItemState> list;
IBuyItemInfo[] buyInfo = this.GetBuyInfo();
IShopSellInfo[] sellInfo = this.GetSellInfo();
IBuyItemInfo[] buyInfo = GetBuyInfo();
IShopSellInfo[] sellInfo = GetSellInfo();
list = new List<BuyItemState>( buyInfo.Length );
Container cont = this.BuyPack;
Container cont = BuyPack;
List<ObjectPropertyList> opls = null;
@ -781,7 +781,7 @@ namespace Server.Mobiles
private GenericBuyInfo LookupDisplayObject( object obj )
{
IBuyItemInfo[] buyInfo = this.GetBuyInfo();
IBuyItemInfo[] buyInfo = GetBuyInfo();
for ( int i = 0; i < buyInfo.Length; ++i ) {
GenericBuyInfo gbi = (GenericBuyInfo)buyInfo[i];
@ -938,7 +938,7 @@ namespace Server.Mobiles
{
ProcessSinglePurchase( buy, gbi, validBuy, ref controlSlots, ref fullPurchase, ref totalCost );
}
else if ( item != this.BuyPack && item.IsChildOf( this.BuyPack ) )
else if ( item != BuyPack && item.IsChildOf( BuyPack ) )
{
if ( amount > item.Amount )
amount = item.Amount;
@ -1055,7 +1055,7 @@ namespace Server.Mobiles
}
else
{
buyItem = Mobile.LiftItemDupe( item, item.Amount - amount );
buyItem = LiftItemDupe( item, item.Amount - amount );
if ( buyItem == null )
buyItem = item;
@ -1108,12 +1108,12 @@ namespace Server.Mobiles
public virtual bool CheckVendorAccess( Mobile from )
{
GuardedRegion reg = (GuardedRegion)this.Region.GetRegion( typeof( GuardedRegion ) );
GuardedRegion reg = (GuardedRegion)Region.GetRegion( typeof( GuardedRegion ) );
if ( reg != null && !reg.CheckVendorAccess( this, from ) )
return false;
if ( this.Region != from.Region )
if ( Region != from.Region )
{
reg = (GuardedRegion)from.Region.GetRegion( typeof( GuardedRegion ) );
@ -1141,7 +1141,7 @@ namespace Server.Mobiles
seller.PlaySound( 0x32 );
IShopSellInfo[] info = GetSellInfo();
IBuyItemInfo[] buyInfo = this.GetBuyInfo();
IBuyItemInfo[] buyInfo = GetBuyInfo();
int GiveGold = 0;
int Sold = 0;
Container cont;
@ -1202,11 +1202,11 @@ namespace Server.Mobiles
if ( !found )
{
cont = this.BuyPack;
cont = BuyPack;
if ( amount < resp.Item.Amount )
{
Item item = Mobile.LiftItemDupe( resp.Item, resp.Item.Amount - amount );
Item item = LiftItemDupe( resp.Item, resp.Item.Amount - amount );
if ( item != null )
{
@ -1274,7 +1274,7 @@ namespace Server.Mobiles
writer.Write( (int)1 ); // version
List<SBInfo> sbInfos = this.SBInfos;
List<SBInfo> sbInfos = SBInfos;
for ( int i = 0; sbInfos != null && i < sbInfos.Count; ++i )
{
@ -1317,7 +1317,7 @@ namespace Server.Mobiles
LoadSBInfo();
List<SBInfo> sbInfos = this.SBInfos;
List<SBInfo> sbInfos = SBInfos;
switch ( version )
{
@ -1416,7 +1416,7 @@ namespace Server.ContextMenus
public override void OnClick()
{
m_Vendor.VendorBuy( this.Owner.From );
m_Vendor.VendorBuy( Owner.From );
}
}
@ -1433,7 +1433,7 @@ namespace Server.ContextMenus
public override void OnClick()
{
m_Vendor.VendorSell( this.Owner.From );
m_Vendor.VendorSell( Owner.From );
}
}
}

2
Scripts/Mobiles/Vendors/GenericBuy.cs
View file

@ -134,7 +134,7 @@ namespace Server.Mobiles
if ( m_DisplayEntity != null && !IsDeleted( m_DisplayEntity ) )
return m_DisplayEntity;
bool canCache = this.CanCacheDisplay;
bool canCache = CanCacheDisplay;
if ( canCache )
m_DisplayEntity = DisplayCache.Cache.Lookup( m_Type );

2
Scripts/Mobiles/Vendors/NPC/Alchemist.cs
View file

@ -27,7 +27,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.Robe( Utility.RandomPinkHue() ) );
AddItem( new Items.Robe( Utility.RandomPinkHue() ) );
}
public Alchemist( Serial serial ) : base( serial )

6
Scripts/Mobiles/Vendors/NPC/AnimalTrainer.cs
View file

@ -215,7 +215,7 @@ namespace Server.Mobiles
public void EndClaimList( Mobile from, BaseCreature pet )
{
if ( pet == null || pet.Deleted || from.Map != this.Map || !from.Stabled.Contains( pet ) || !from.CheckAlive() )
if ( pet == null || pet.Deleted || from.Map != Map || !from.Stabled.Contains( pet ) || !from.CheckAlive() )
return;
if ( !from.InRange( this, 14 ) )
@ -322,7 +322,7 @@ namespace Server.Mobiles
pet.StabledBy = from;
if ( Core.SE )
pet.Loyalty = BaseCreature.MaxLoyalty; // Wonderfully happy
pet.Loyalty = MaxLoyalty; // Wonderfully happy
from.Stabled.Add( pet );
@ -416,7 +416,7 @@ namespace Server.Mobiles
pet.StabledBy = null;
if ( Core.SE )
pet.Loyalty = BaseCreature.MaxLoyalty; // Wonderfully Happy
pet.Loyalty = MaxLoyalty; // Wonderfully Happy
}
public override bool HandlesOnSpeech( Mobile from )

4
Scripts/Mobiles/Vendors/NPC/Armorer.cs
View file

@ -66,8 +66,8 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.HalfApron( Utility.RandomYellowHue() ) );
AddItem( new Server.Items.Bascinet() );
AddItem( new Items.HalfApron( Utility.RandomYellowHue() ) );
AddItem( new Items.Bascinet() );
}
public Armorer( Serial serial ) : base( serial )

8
Scripts/Mobiles/Vendors/NPC/Blacksmith.cs
View file

@ -58,7 +58,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
Item item = ( Utility.RandomBool() ? null : new Server.Items.RingmailChest() );
Item item = ( Utility.RandomBool() ? null : new Items.RingmailChest() );
if ( item != null && !EquipItem( item ) )
{
@ -67,10 +67,10 @@ namespace Server.Mobiles
}
if ( item == null )
AddItem( new Server.Items.FullApron() );
AddItem( new Items.FullApron() );
AddItem( new Server.Items.Bascinet() );
AddItem( new Server.Items.SmithHammer() );
AddItem( new Items.Bascinet() );
AddItem( new Items.SmithHammer() );
}
#region Bulk Orders

4
Scripts/Mobiles/Vendors/NPC/Bowyer.cs
View file

@ -26,8 +26,8 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.Bow() );
AddItem( new Server.Items.LeatherGorget() );
AddItem( new Items.Bow() );
AddItem( new Items.LeatherGorget() );
}
public override void InitSBInfo()

4
Scripts/Mobiles/Vendors/NPC/Butcher.cs
View file

@ -22,8 +22,8 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.HalfApron() );
AddItem( new Server.Items.Cleaver() );
AddItem( new Items.HalfApron() );
AddItem( new Items.Cleaver() );
}
public Butcher( Serial serial ) : base( serial )

2
Scripts/Mobiles/Vendors/NPC/Carpenter.cs
View file

@ -30,7 +30,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.HalfApron() );
AddItem( new Items.HalfApron() );
}
public Carpenter( Serial serial ) : base( serial )

2
Scripts/Mobiles/Vendors/NPC/Cook.cs
View file

@ -28,7 +28,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.HalfApron() );
AddItem( new Items.HalfApron() );
}
public Cook( Serial serial ) : base( serial )

2
Scripts/Mobiles/Vendors/NPC/CustomHairstylist.cs
View file

@ -65,7 +65,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.Robe( Utility.RandomPinkHue() ) );
AddItem( new Items.Robe( Utility.RandomPinkHue() ) );
}
public override void InitSBInfo()

2
Scripts/Mobiles/Vendors/NPC/Farmer.cs
View file

@ -31,7 +31,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.WideBrimHat( Utility.RandomNeutralHue() ) );
AddItem( new Items.WideBrimHat( Utility.RandomNeutralHue() ) );
}
public Farmer( Serial serial ) : base( serial )

2
Scripts/Mobiles/Vendors/NPC/Fisherman.cs
View file

@ -24,7 +24,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.FishingPole() );
AddItem( new Items.FishingPole() );
}
public Fisherman( Serial serial ) : base( serial )

14
Scripts/Mobiles/Vendors/NPC/Guildmasters/BaseGuildmaster.cs
View file

@ -47,14 +47,14 @@ namespace Server.Mobiles
public virtual bool WasNamed( string speech )
{
string name = this.Name;
string name = Name;
return ( name != null && Insensitive.StartsWith( speech, name ) );
}
public override bool HandlesOnSpeech( Mobile from )
{
if ( from.InRange( this.Location, 2 ) )
if ( from.InRange( Location, 2 ) )
return true;
return base.HandlesOnSpeech( from );
@ -64,13 +64,13 @@ namespace Server.Mobiles
{
Mobile from = e.Mobile;
if ( !e.Handled && from is PlayerMobile && from.InRange( this.Location, 2 ) && WasNamed( e.Speech ) )
if ( !e.Handled && from is PlayerMobile && from.InRange( Location, 2 ) && WasNamed( e.Speech ) )
{
PlayerMobile pm = (PlayerMobile)from;
if ( e.HasKeyword( 0x0004 ) ) // *join* | *member*
{
if ( pm.NpcGuild == this.NpcGuild )
if ( pm.NpcGuild == NpcGuild )
SayTo( from, 501047 ); // Thou art already a member of our guild.
else if ( pm.NpcGuild != NpcGuild.None )
SayTo( from, 501046 ); // Thou must resign from thy other guild first.
@ -83,7 +83,7 @@ namespace Server.Mobiles
}
else if ( e.HasKeyword( 0x0005 ) ) // *resign* | *quit*
{
if ( pm.NpcGuild != this.NpcGuild )
if ( pm.NpcGuild != NpcGuild )
{
SayTo( from, 501052 ); // Thou dost not belong to my guild!
}
@ -110,7 +110,7 @@ namespace Server.Mobiles
{
PlayerMobile pm = (PlayerMobile)from;
if ( pm.NpcGuild == this.NpcGuild )
if ( pm.NpcGuild == NpcGuild )
{
SayTo( from, 501047 ); // Thou art already a member of our guild.
}
@ -126,7 +126,7 @@ namespace Server.Mobiles
{
SayWelcomeTo( from );
pm.NpcGuild = this.NpcGuild;
pm.NpcGuild = NpcGuild;
pm.NpcGuildJoinTime = DateTime.UtcNow;
pm.NpcGuildGameTime = pm.GameTime;

8
Scripts/Mobiles/Vendors/NPC/Guildmasters/BlacksmithGuildmaster.cs
View file

@ -27,7 +27,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
Item item = ( Utility.RandomBool() ? null : new Server.Items.RingmailChest() );
Item item = ( Utility.RandomBool() ? null : new Items.RingmailChest() );
if ( item != null && !EquipItem( item ) )
{
@ -36,10 +36,10 @@ namespace Server.Mobiles
}
if ( item == null )
AddItem( new Server.Items.FullApron() );
AddItem( new Items.FullApron() );
AddItem( new Server.Items.Bascinet() );
AddItem( new Server.Items.SmithHammer() );
AddItem( new Items.Bascinet() );
AddItem( new Items.SmithHammer() );
}
public BlacksmithGuildmaster( Serial serial ) : base( serial )

2
Scripts/Mobiles/Vendors/NPC/Guildmasters/HealerGuildmaster.cs
View file

@ -20,7 +20,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.Robe( Utility.RandomYellowHue() ) );
AddItem( new Items.Robe( Utility.RandomYellowHue() ) );
}
public HealerGuildmaster( Serial serial ) : base( serial )

4
Scripts/Mobiles/Vendors/NPC/Guildmasters/MageGuildmaster.cs
View file

@ -22,8 +22,8 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.Robe( Utility.RandomBlueHue() ) );
AddItem( new Server.Items.GnarledStaff() );
AddItem( new Items.Robe( Utility.RandomBlueHue() ) );
AddItem( new Items.GnarledStaff() );
}
public MageGuildmaster( Serial serial ) : base( serial )

8
Scripts/Mobiles/Vendors/NPC/Guildmasters/ThiefGuildmaster.cs
View file

@ -28,9 +28,9 @@ namespace Server.Mobiles
base.InitOutfit();
if ( Utility.RandomBool() )
AddItem( new Server.Items.Kryss() );
AddItem( new Kryss() );
else
AddItem( new Server.Items.Dagger() );
AddItem( new Dagger() );
}
public override bool CheckCustomReqs( PlayerMobile pm )
@ -61,7 +61,7 @@ namespace Server.Mobiles
public override bool HandlesOnSpeech( Mobile from )
{
if ( from.InRange( this.Location, 2 ) )
if ( from.InRange( Location, 2 ) )
return true;
return base.HandlesOnSpeech( from );
@ -71,7 +71,7 @@ namespace Server.Mobiles
{
Mobile from = e.Mobile;
if ( !e.Handled && from is PlayerMobile && from.InRange( this.Location, 2 ) && e.HasKeyword( 0x1F ) ) // *disguise*
if ( !e.Handled && from is PlayerMobile && from.InRange( Location, 2 ) && e.HasKeyword( 0x1F ) ) // *disguise*
{
PlayerMobile pm = (PlayerMobile)from;

2
Scripts/Mobiles/Vendors/NPC/IronWorker.cs
View file

@ -46,7 +46,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
Item item = ( Utility.RandomBool() ? null : new Server.Items.RingmailChest() );
Item item = ( Utility.RandomBool() ? null : new RingmailChest() );
if ( item != null && !EquipItem( item ) )
{

2
Scripts/Mobiles/Vendors/NPC/Mage.cs
View file

@ -31,7 +31,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.Robe( Utility.RandomBlueHue() ) );
AddItem( new Items.Robe( Utility.RandomBlueHue() ) );
}
public Mage( Serial serial ) : base( serial )

8
Scripts/Mobiles/Vendors/NPC/Miner.cs
View file

@ -22,10 +22,10 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.FancyShirt( 0x3E4 ) );
AddItem( new Server.Items.LongPants( 0x192 ) );
AddItem( new Server.Items.Pickaxe() );
AddItem( new Server.Items.ThighBoots( 0x283 ) );
AddItem( new Items.FancyShirt( 0x3E4 ) );
AddItem( new Items.LongPants( 0x192 ) );
AddItem( new Items.Pickaxe() );
AddItem( new Items.ThighBoots( 0x283 ) );
}
public Miner( Serial serial ) : base( serial )

8
Scripts/Mobiles/Vendors/NPC/Ranger.cs
View file

@ -27,10 +27,10 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.Shirt( Utility.RandomNeutralHue() ) );
AddItem( new Server.Items.LongPants( Utility.RandomNeutralHue() ) );
AddItem( new Server.Items.Bow() );
AddItem( new Server.Items.ThighBoots( Utility.RandomNeutralHue() ) );
AddItem( new Items.Shirt( Utility.RandomNeutralHue() ) );
AddItem( new Items.LongPants( Utility.RandomNeutralHue() ) );
AddItem( new Items.Bow() );
AddItem( new Items.ThighBoots( Utility.RandomNeutralHue() ) );
}
public Ranger( Serial serial ) : base( serial )

2
Scripts/Mobiles/Vendors/NPC/Scribe.cs
View file

@ -31,7 +31,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.Robe( Utility.RandomNeutralHue() ) );
AddItem( new Items.Robe( Utility.RandomNeutralHue() ) );
}
public override bool HandlesOnSpeech( Mobile from )

2
Scripts/Mobiles/Vendors/NPC/Shipwright.cs
View file

@ -23,7 +23,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.SmithHammer() );
AddItem( new Items.SmithHammer() );
}
public Shipwright( Serial serial ) : base( serial )

2
Scripts/Mobiles/Vendors/NPC/TavernKeeper.cs
View file

@ -21,7 +21,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.HalfApron() );
AddItem( new Items.HalfApron() );
}
public TavernKeeper( Serial serial ) : base( serial )

8
Scripts/Mobiles/Vendors/NPC/Thief.cs
View file

@ -27,10 +27,10 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.Shirt( Utility.RandomNeutralHue() ) );
AddItem( new Server.Items.LongPants( Utility.RandomNeutralHue() ) );
AddItem( new Server.Items.Dagger() );
AddItem( new Server.Items.ThighBoots( Utility.RandomNeutralHue() ) );
AddItem( new Items.Shirt( Utility.RandomNeutralHue() ) );
AddItem( new Items.LongPants( Utility.RandomNeutralHue() ) );
AddItem( new Items.Dagger() );
AddItem( new Items.ThighBoots( Utility.RandomNeutralHue() ) );
}
public Thief( Serial serial ) : base( serial )

2
Scripts/Mobiles/Vendors/NPC/Waiter.cs
View file

@ -22,7 +22,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.HalfApron() );
AddItem( new Items.HalfApron() );
}
public Waiter( Serial serial ) : base( serial )

2
Scripts/Mobiles/Vendors/NPC/Weaponsmith.cs
View file

@ -39,7 +39,7 @@ namespace Server.Mobiles
{
base.InitOutfit();
AddItem( new Server.Items.HalfApron() );
AddItem( new Items.HalfApron() );
}
#region Bulk Orders

10
Scripts/Mobiles/Vendors/PlayerBarkeeper.cs
View file

@ -198,7 +198,7 @@ namespace Server.Mobiles
AddItem( new HalfApron( Utility.RandomBrightHue() ) );
Container pack = this.Backpack;
Container pack = Backpack;
if ( pack != null )
pack.Delete();
@ -213,7 +213,7 @@ namespace Server.Mobiles
else
Hue = 0x83F4; // hue is not random
Container pack = this.Backpack;
Container pack = Backpack;
if ( pack != null )
pack.Delete();
@ -270,7 +270,7 @@ namespace Server.Mobiles
if ( !base.OnBeforeDeath() )
return false;
Item shoes = this.FindItemOnLayer( Layer.Shoes );
Item shoes = FindItemOnLayer( Layer.Shoes );
if ( shoes is Sandals )
shoes.Hue = 0;
@ -359,7 +359,7 @@ namespace Server.Mobiles
public bool IsOwner( Mobile from )
{
if ( from == null || from.Deleted || this.Deleted )
if ( from == null || from.Deleted || Deleted )
return false;
if ( from.AccessLevel > AccessLevel.GameMaster )
@ -457,7 +457,7 @@ namespace Server.Mobiles
public void EndChangeTitle( Mobile from, string title, bool vendor )
{
this.Title = title;
Title = title;
LoadSBInfo();
}

60
Scripts/Mobiles/Vendors/PlayerVendor.cs
View file

@ -479,15 +479,15 @@ namespace Server.Mobiles
if ( !Core.AOS )
NameHue = 0x35;
if ( this.Female = Utility.RandomBool() )
if ( Female = Utility.RandomBool() )
{
this.Body = 0x191;
this.Name = NameList.RandomName( "female" );
Body = 0x191;
Name = NameList.RandomName( "female" );
}
else
{
this.Body = 0x190;
this.Name = NameList.RandomName( "male" );
Body = 0x190;
Name = NameList.RandomName( "male" );
}
}
@ -634,12 +634,12 @@ namespace Server.Mobiles
{
List<Item> list = new List<Item>();
foreach ( Item item in this.Items )
if ( item.Movable && item != this.Backpack && item.Layer != Layer.Hair && item.Layer != Layer.FacialHair )
foreach ( Item item in Items )
if ( item.Movable && item != Backpack && item.Layer != Layer.Hair && item.Layer != Layer.FacialHair )
list.Add( item );
if ( this.Backpack != null )
list.AddRange( this.Backpack.Items );
if ( Backpack != null )
list.AddRange( Backpack.Items );
return list;
}
@ -668,7 +668,7 @@ namespace Server.Mobiles
if ( list.Count > 0 || HoldGold > 0 ) // No case 1
{
if ( ( !toBackpack || this.Map == Map.Internal ) && House != null && House.IsAosRules ) // Case 2
if ( ( !toBackpack || Map == Map.Internal ) && House != null && House.IsAosRules ) // Case 2
{
if ( House.IsOwner( Owner ) ) // Move to moving crate
{
@ -696,7 +696,7 @@ namespace Server.Mobiles
House.VendorInventories.Add( inventory );
}
}
else if ( ( toBackpack || House == null || !House.IsAosRules ) && this.Map != Map.Internal ) // Case 3 - Move to backpack
else if ( ( toBackpack || House == null || !House.IsAosRules ) && Map != Map.Internal ) // Case 3 - Move to backpack
{
Container backpack = new Backpack();
@ -708,7 +708,7 @@ namespace Server.Mobiles
backpack.DropItem( item );
}
backpack.MoveToWorld( this.Location, this.Map );
backpack.MoveToWorld( Location, Map );
}
}
@ -817,7 +817,7 @@ namespace Server.Mobiles
{
Item parent = item.Parent as Item;
if ( parent == this.Backpack )
if ( parent == Backpack )
return true;
if ( parent is Container )
@ -862,7 +862,7 @@ namespace Server.Mobiles
{
base.OnItemRemoved( item );
if ( item == this.Backpack )
if ( item == Backpack )
{
foreach ( Item subItem in item.Items )
{
@ -883,11 +883,11 @@ namespace Server.Mobiles
{
if ( BaseHouse.NewVendorSystem )
{
if ( this.HoldGold < 1000000 )
if ( HoldGold < 1000000 )
{
SayTo( from, 503210 ); // I'll take that to fund my services.
this.HoldGold += item.Amount;
HoldGold += item.Amount;
item.Delete();
return true;
@ -901,11 +901,11 @@ namespace Server.Mobiles
}
else
{
if ( this.BankAccount < 1000000 )
if ( BankAccount < 1000000 )
{
SayTo( from, 503210 ); // I'll take that to fund my services.
this.BankAccount += item.Amount;
BankAccount += item.Amount;
item.Delete();
return true;
@ -922,7 +922,7 @@ namespace Server.Mobiles
{
bool newItem = ( GetVendorItem( item ) == null );
if ( this.Backpack != null && this.Backpack.TryDropItem( from, item, false ) )
if ( Backpack != null && Backpack.TryDropItem( from, item, false ) )
{
if ( newItem )
OnItemGiven( from, item );
@ -993,7 +993,7 @@ namespace Server.Mobiles
public override bool CheckNonlocalLift( Mobile from, Item item )
{
if ( item.IsChildOf( this.Backpack ) )
if ( item.IsChildOf( Backpack ) )
{
if ( IsOwner( from ) )
{
@ -1074,11 +1074,11 @@ namespace Server.Mobiles
public void OpenBackpack( Mobile from )
{
if ( this.Backpack != null )
if ( Backpack != null )
{
SayTo( from, IsOwner( from ) ? 1010642 : 503208 ); // Take a look at my/your goods.
this.Backpack.DisplayTo( from );
Backpack.DisplayTo( from );
}
}
@ -1172,7 +1172,7 @@ namespace Server.Mobiles
public void Dismiss( Mobile from )
{
Container pack = this.Backpack;
Container pack = Backpack;
if ( pack != null && pack.Items.Count > 0 )
{
@ -1207,7 +1207,7 @@ namespace Server.Mobiles
public bool CheckTeleport( Mobile to )
{
if ( Deleted || !IsOwner( to ) || House == null || this.Map == Map.Internal )
if ( Deleted || !IsOwner( to ) || House == null || Map == Map.Internal )
return false;
if ( House.IsInside( to ) || to.Map != House.Map || !House.InRange( to, 5 ) )
@ -1216,9 +1216,9 @@ namespace Server.Mobiles
if ( Placeholder == null )
{
Placeholder = new PlayerVendorPlaceholder( this );
Placeholder.MoveToWorld( this.Location, this.Map );
Placeholder.MoveToWorld( Location, Map );
this.MoveToWorld( to.Location, to.Map );
MoveToWorld( to.Location, to.Map );
to.SendLocalizedMessage( 1062431 ); // This vendor has been moved out of the house to your current location temporarily. The vendor will return home automatically after two minutes have passed once you are done managing its inventory or customizing it.
}
@ -1273,7 +1273,7 @@ namespace Server.Mobiles
public bool WasNamed( string speech )
{
return this.Name != null && Insensitive.StartsWith( speech, this.Name );
return Name != null && Insensitive.StartsWith( speech, Name );
}
public override void OnSpeech( SpeechEventArgs e )
@ -1356,7 +1356,7 @@ namespace Server.Mobiles
{
if ( IsOwner( from ) )
{
this.Direction = this.GetDirectionTo( from );
Direction = GetDirectionTo( from );
e.Handled = true;
}
@ -1384,7 +1384,7 @@ namespace Server.Mobiles
protected override void OnTick()
{
m_Vendor.m_NextPayTime = DateTime.UtcNow + this.Interval;
m_Vendor.m_NextPayTime = DateTime.UtcNow + Interval;
int pay;
int totalGold;
@ -1710,7 +1710,7 @@ namespace Server.Mobiles
{
if ( m_Vendor != null && !m_Vendor.Deleted )
{
m_Vendor.MoveToWorld( this.Location, this.Map );
m_Vendor.MoveToWorld( Location, Map );
m_Vendor.Placeholder = null;
}
}