massive branch sync

Scripts/Mobiles/Vendors/NPC/Alchemist.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 
 namespace Server.Mobiles
 {
 	public class Alchemist : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		public override NpcGuild NpcGuild{ get{ return NpcGuild.MagesGuild; } }
 

Scripts/Mobiles/Vendors/NPC/AnimalTrainer.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using Server;
 using Server.ContextMenus;
@@ -12,8 +11,8 @@ namespace Server.Mobiles
 {
 	public class AnimalTrainer : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		[Constructable]
 		public AnimalTrainer() : base( "the animal trainer" )
@@ -217,19 +216,10 @@ namespace Server.Mobiles
 			if ( pet == null || pet.Deleted || from.Map != this.Map || !from.InRange( this, 14 ) || !from.Stabled.Contains( pet ) || !from.CheckAlive() )
 				return;
 
-			if ( (from.Followers + pet.ControlSlots) <= from.FollowersMax )
+			if ( CanClaim( from, pet ) )
 			{
-				pet.SetControlMaster( from );
+                DoClaim( from, pet );
 
-				if ( pet.Summoned )
-					pet.SummonMaster = from;
-
-				pet.ControlTarget = from;
-				pet.ControlOrder = OrderType.Follow;
-
-				pet.MoveToWorld( from.Location, from.Map );
-
-				pet.IsStabled = false;
 				from.Stabled.Remove( pet );
 
 				SayTo( from, 1042559 ); // Here you go... and good day to you!
@@ -322,7 +312,12 @@ namespace Server.Mobiles
 			}
 		}
 
-		public void Claim( Mobile from )
+        public void Claim( Mobile from )
+        {
+            Claim( from, null );
+        }
+
+		public void Claim( Mobile from, string petName )
 		{
 			if ( Deleted || !from.CheckAlive() )
 				return;
@@ -344,22 +339,9 @@ namespace Server.Mobiles
 
 				++stabled;
 
-				if ( (from.Followers + pet.ControlSlots) <= from.FollowersMax )
+				if ( CanClaim( from, pet ) )
 				{
-					pet.SetControlMaster( from );
-
-					if ( pet.Summoned )
-						pet.SummonMaster = from;
-
-					pet.ControlTarget = from;
-					pet.ControlOrder = OrderType.Follow;
-
-					pet.MoveToWorld( from.Location, from.Map );
-
-					pet.IsStabled = false;
-
-					if ( Core.SE )
-						pet.Loyalty = BaseCreature.MaxLoyalty; // Wonderfully Happy
+                    DoClaim( from, pet );
 
 					from.Stabled.RemoveAt( i );
 					--i;
@@ -378,6 +360,29 @@ namespace Server.Mobiles
 				SayTo( from, 502671 ); // But I have no animals stabled with me at the moment!
 		}
 
+        public bool CanClaim( Mobile from, BaseCreature pet )
+        {
+            return ((from.Followers + pet.ControlSlots) <= from.FollowersMax);
+        }
+
+        private void DoClaim( Mobile from, BaseCreature pet )
+        {
+            pet.SetControlMaster( from );
+
+            if ( pet.Summoned )
+                pet.SummonMaster = from;
+
+            pet.ControlTarget = from;
+            pet.ControlOrder = OrderType.Follow;
+
+            pet.MoveToWorld( from.Location, from.Map );
+
+            pet.IsStabled = false;
+
+            if ( Core.SE )
+                pet.Loyalty = BaseCreature.MaxLoyalty; // Wonderfully Happy
+        }
+
 		public override bool HandlesOnSpeech( Mobile from )
 		{
 			return true;
@@ -394,10 +399,34 @@ namespace Server.Mobiles
 			{
 				e.Handled = true;
 
-				if ( !Insensitive.Equals( e.Speech, "claim" ) )
-					BeginClaimList( e.Mobile );
-				else
-					Claim( e.Mobile );
+                if (!Insensitive.Equals( e.Speech, "claim" ))
+                {
+                    bool showList = true;
+
+                    if ( e.Speech.Length > 6 ) //sanity    
+                    {
+                        string name = e.Speech.Substring( 6 ).Trim();
+
+                        for ( int i = 0; i < e.Mobile.Stabled.Count; ++i )
+                        {
+                            if ( Insensitive.Equals( e.Mobile.Stabled[i].Name, name ) ) //Similar names?
+                            {
+                                showList = false;
+                                break;
+                            }
+                        }
+
+                        //What about pets with the same name, or 'similar' names, ie Fluffy 1, Fluffy 2?? - Similar names don't work.. what about identicals?
+                        //What if you try and claim a pet that doesn't exist? -- GUMP
+                    }
+
+                    if ( showList )
+                        BeginClaimList( e.Mobile );
+                }
+                else
+                {
+                    Claim( e.Mobile );
+                }
 			}
 			else
 			{

Scripts/Mobiles/Vendors/NPC/Architect.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 
 namespace Server.Mobiles
 {
 	public class Architect : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		public override NpcGuild NpcGuild{ get{ return NpcGuild.TinkersGuild; } }
 

Scripts/Mobiles/Vendors/NPC/Armorer.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 
 namespace Server.Mobiles
 {
 	public class Armorer : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		[Constructable]
 		public Armorer() : base( "the armorer" )

Scripts/Mobiles/Vendors/NPC/Baker.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 
 namespace Server.Mobiles
 {
 	public class Baker : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		[Constructable]
 		public Baker() : base( "the baker" )

Scripts/Mobiles/Vendors/NPC/Bard.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 
 namespace Server.Mobiles
 {
 	public class Bard : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		public override NpcGuild NpcGuild{ get{ return NpcGuild.BardsGuild; } }
 

Scripts/Mobiles/Vendors/NPC/Barkeeper.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 using Server.Items;
 using Server.Gumps;
@@ -11,8 +11,8 @@ namespace Server.Mobiles
 {
 	public class Barkeeper : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList(); 
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } } 
+		private List<SBInfo> m_SBInfos = new List<SBInfo>(); 
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } } 
 
 		public override void InitSBInfo()
 		{

Scripts/Mobiles/Vendors/NPC/Beekeeper.cs

@@ -1,13 +1,13 @@
 using System; 
-using System.Collections; 
+using System.Collections.Generic; 
 using Server; 
 
 namespace Server.Mobiles 
 { 
 	public class Beekeeper : BaseVendor 
 	{ 
-		private ArrayList m_SBInfos = new ArrayList(); 
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } } 
+		private List<SBInfo> m_SBInfos = new List<SBInfo>(); 
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } } 
 
 		[Constructable]
 		public Beekeeper() : base( "the beekeeper" ) 

Scripts/Mobiles/Vendors/NPC/Blacksmith.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 using Server.Engines.BulkOrders;
 
@@ -7,8 +7,8 @@ namespace Server.Mobiles
 {
 	public class Blacksmith : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		public override NpcGuild NpcGuild{ get{ return NpcGuild.BlacksmithsGuild; } }
 

Scripts/Mobiles/Vendors/NPC/Bowyer.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 
 namespace Server.Mobiles
@@ -7,8 +7,8 @@ namespace Server.Mobiles
 	[TypeAlias( "Server.Mobiles.Bower" )]
 	public class Bowyer : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		[Constructable]
 		public Bowyer() : base( "the bowyer" )

Scripts/Mobiles/Vendors/NPC/Butcher.cs

@@ -1,13 +1,13 @@
 using System; 
-using System.Collections; 
+using System.Collections.Generic; 
 using Server; 
 
 namespace Server.Mobiles 
 { 
 	public class Butcher : BaseVendor 
 	{ 
-		private ArrayList m_SBInfos = new ArrayList(); 
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } } 
+		private List<SBInfo> m_SBInfos = new List<SBInfo>(); 
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } } 
 
 		[Constructable]
 		public Butcher() : base( "the butcher" ) 

Scripts/Mobiles/Vendors/NPC/Carpenter.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 
 namespace Server.Mobiles
 {
 	public class Carpenter : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		public override NpcGuild NpcGuild{ get{ return NpcGuild.TinkersGuild; } }
 

Scripts/Mobiles/Vendors/NPC/Cobbler.cs

@@ -1,13 +1,13 @@
 using System; 
-using System.Collections; 
+using System.Collections.Generic; 
 using Server; 
 
 namespace Server.Mobiles 
 { 
 	public class Cobbler : BaseVendor 
 	{ 
-		private ArrayList m_SBInfos = new ArrayList(); 
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } } 
+		private List<SBInfo> m_SBInfos = new List<SBInfo>(); 
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } } 
 
 		[Constructable]
 		public Cobbler() : base( "the cobbler" ) 

Scripts/Mobiles/Vendors/NPC/Cook.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 
 namespace Server.Mobiles
 {
 	public class Cook : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		[Constructable]
 		public Cook() : base( "the cook" )

Scripts/Mobiles/Vendors/NPC/CustomHairstylist.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using Server;
 using Server.Items;
 using Server.Gumps;
@@ -9,15 +10,15 @@ namespace Server.Mobiles
 {
 	public class CustomHairstylist : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		public override bool ClickTitle{ get{ return false; } }
 
 		public override bool IsActiveBuyer{ get{ return false; } }
 		public override bool IsActiveSeller{ get{ return true; } }
 
-		public override bool OnBuyItems( Mobile buyer, ArrayList list )
+        public override bool OnBuyItems( Mobile buyer, List<BuyItemResponse> list )
 		{
 			return false;
 		}

Scripts/Mobiles/Vendors/NPC/Farmer.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 
 namespace Server.Mobiles
 {
 	public class Farmer : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		[Constructable]
 		public Farmer() : base( "the farmer" )

Scripts/Mobiles/Vendors/NPC/Fisherman.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 
 namespace Server.Mobiles
 {
 	public class Fisherman : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		public override NpcGuild NpcGuild{ get{ return NpcGuild.FishermensGuild; } }
 

Scripts/Mobiles/Vendors/NPC/Furtrader.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 
 namespace Server.Mobiles
 {
 	public class Furtrader : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		[Constructable]
 		public Furtrader() : base( "the furtrader" )

Scripts/Mobiles/Vendors/NPC/Glassblower.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 
 namespace Server.Mobiles
@@ -7,8 +7,8 @@ namespace Server.Mobiles
 	[TypeAlias( "Server.Mobiles.GargoyleAlchemist" )]
 	public class Glassblower : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		public override NpcGuild NpcGuild{ get{ return NpcGuild.MagesGuild; } }
 

Scripts/Mobiles/Vendors/NPC/GolemCrafter.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 using Server.Items;
 
@@ -7,8 +7,8 @@ namespace Server.Mobiles
 {
 	public class GolemCrafter : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		[Constructable]
 		public GolemCrafter() : base( "the golem crafter" )

Scripts/Mobiles/Vendors/NPC/Guildmasters/BaseGuildmaster.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 using Server.Items;
 using Server.Network;
@@ -8,8 +8,8 @@ namespace Server.Mobiles
 {
 	public abstract class BaseGuildmaster : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		public override bool IsActiveVendor{ get{ return false; } }
 

Scripts/Mobiles/Vendors/NPC/GypsyMaiden.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 using Server.Gumps;
 using Server.Items;
@@ -11,8 +11,8 @@ namespace Server.Mobiles
 {
 	public class GypsyMaiden : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		[Constructable]
 		public GypsyMaiden() : base( "the gypsy maiden" )

Scripts/Mobiles/Vendors/NPC/HairStylist.cs

@@ -1,13 +1,13 @@
 using System; 
-using System.Collections; 
+using System.Collections.Generic; 
 using Server; 
 
 namespace Server.Mobiles 
 { 
 	public class HairStylist : BaseVendor 
 	{ 
-		private ArrayList m_SBInfos = new ArrayList(); 
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } } 
+		private List<SBInfo> m_SBInfos = new List<SBInfo>(); 
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } } 
 
 		[Constructable]
 		public HairStylist() : base( "the hair stylist" ) 

Scripts/Mobiles/Vendors/NPC/Herbalist.cs

@@ -1,13 +1,13 @@
 using System; 
-using System.Collections; 
+using System.Collections.Generic; 
 using Server; 
 
 namespace Server.Mobiles 
 { 
 	public class Herbalist : BaseVendor 
 	{ 
-		private ArrayList m_SBInfos = new ArrayList(); 
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>(); 
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		public override NpcGuild NpcGuild{ get{ return NpcGuild.MagesGuild; } }
 

Scripts/Mobiles/Vendors/NPC/HolyMage.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 using Server.Items;
 
@@ -7,8 +7,8 @@ namespace Server.Mobiles
 {
 	public class HolyMage : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		[Constructable]
 		public HolyMage() : base( "the Holy Mage" )

Scripts/Mobiles/Vendors/NPC/InnKeeper.cs

@@ -1,13 +1,13 @@
 using System; 
-using System.Collections; 
+using System.Collections.Generic; 
 using Server; 
 
 namespace Server.Mobiles 
 { 
 	public class InnKeeper : BaseVendor 
 	{ 
-		private ArrayList m_SBInfos = new ArrayList(); 
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } } 
+		private List<SBInfo> m_SBInfos = new List<SBInfo>(); 
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } } 
 
 		[Constructable]
 		public InnKeeper() : base( "the innkeeper" ) 

Scripts/Mobiles/Vendors/NPC/IronWorker.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 using Server.Items;
 
@@ -7,8 +7,8 @@ namespace Server.Mobiles
 {
 	public class IronWorker : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		[Constructable]
 		public IronWorker() : base( "the iron worker" )

Scripts/Mobiles/Vendors/NPC/Jeweler.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 
 namespace Server.Mobiles
 {
 	public class Jeweler : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		[Constructable]
 		public Jeweler() : base( "the jeweler" )

Scripts/Mobiles/Vendors/NPC/KeeperOfChivalry.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 using Server.Items;
 
@@ -7,8 +7,8 @@ namespace Server.Mobiles
 {
 	public class KeeperOfChivalry : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		[Constructable]
 		public KeeperOfChivalry() : base( "the Keeper of Chivalry" )

Scripts/Mobiles/Vendors/NPC/LeatherWorker.cs

@@ -1,13 +1,13 @@
 using System; 
-using System.Collections; 
+using System.Collections.Generic; 
 using Server; 
 
 namespace Server.Mobiles 
 { 
 	public class LeatherWorker : BaseVendor 
 	{ 
-		private ArrayList m_SBInfos = new ArrayList(); 
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } } 
+		private List<SBInfo> m_SBInfos = new List<SBInfo>(); 
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } } 
 
 		[Constructable]
 		public LeatherWorker() : base( "the leather worker" ) 

Scripts/Mobiles/Vendors/NPC/Mage.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 
 namespace Server.Mobiles
 {
 	public class Mage : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		public override NpcGuild NpcGuild{ get{ return NpcGuild.MagesGuild; } }
 

Scripts/Mobiles/Vendors/NPC/Mapmaker.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 
 namespace Server.Mobiles
 {
 	public class Mapmaker : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		[Constructable]
 		public Mapmaker() : base( "the mapmaker" )

Scripts/Mobiles/Vendors/NPC/Miller.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 
 namespace Server.Mobiles
 {
 	public class Miller : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		[Constructable]
 		public Miller() : base( "the miller" )

Scripts/Mobiles/Vendors/NPC/Miner.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 
 namespace Server.Mobiles
 {
 	public class Miner : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		[Constructable]
 		public Miner() : base( "the miner" )

Scripts/Mobiles/Vendors/NPC/Monk.cs

@@ -1,6 +1,6 @@
 
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 using Server.Items;
 
@@ -8,8 +8,8 @@ namespace Server.Mobiles
 {
 	public class Monk : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 		
 		[Constructable]
 		public Monk() : base( "the Monk" )

Scripts/Mobiles/Vendors/NPC/Provisioner.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 
 namespace Server.Mobiles
 {
 	public class Provisioner : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		[Constructable]
 		public Provisioner() : base( "the provisioner" )

Scripts/Mobiles/Vendors/NPC/Rancher.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 using Server.Gumps;
 using Server.Items;
@@ -11,8 +11,8 @@ namespace Server.Mobiles
 {
 	public class Rancher : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		[Constructable]
 		public Rancher() : base( "the rancher" )

Scripts/Mobiles/Vendors/NPC/Ranger.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 
 namespace Server.Mobiles
 {
 	public class Ranger : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		[Constructable]
 		public Ranger() : base( "the ranger" )

Scripts/Mobiles/Vendors/NPC/RealEstateBroker.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 using Server.Items;
 using Server.Multis;
@@ -11,8 +11,8 @@ namespace Server.Mobiles
 {
 	public class RealEstateBroker : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		[Constructable]
 		public RealEstateBroker() : base( "the real estate broker" )

Scripts/Mobiles/Vendors/NPC/Scribe.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 
 namespace Server.Mobiles
 {
 	public class Scribe : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		public override NpcGuild NpcGuild{ get{ return NpcGuild.MagesGuild; } }
 

Scripts/Mobiles/Vendors/NPC/Shipwright.cs

@@ -1,13 +1,13 @@
 using System; 
-using System.Collections; 
+using System.Collections.Generic; 
 using Server; 
 
 namespace Server.Mobiles 
 { 
 	public class Shipwright : BaseVendor 
 	{ 
-		private ArrayList m_SBInfos = new ArrayList(); 
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } } 
+		private List<SBInfo> m_SBInfos = new List<SBInfo>(); 
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } } 
 
 		[Constructable]
 		public Shipwright() : base( "the shipwright" ) 

Scripts/Mobiles/Vendors/NPC/StoneCrafter.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 
 namespace Server.Mobiles
@@ -7,8 +7,8 @@ namespace Server.Mobiles
 	[TypeAlias( "Server.Mobiles.GargoyleStonecrafter" )]
 	public class StoneCrafter : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		public override NpcGuild NpcGuild{ get{ return NpcGuild.TinkersGuild; } }
 

Scripts/Mobiles/Vendors/NPC/Tailor.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 using Server.Engines.BulkOrders;
 
@@ -7,8 +7,8 @@ namespace Server.Mobiles
 {
 	public class Tailor : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		public override NpcGuild NpcGuild{ get{ return NpcGuild.TailorsGuild; } }
 

Scripts/Mobiles/Vendors/NPC/Tanner.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 
 namespace Server.Mobiles
 {
 	public class Tanner : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		[Constructable]
 		public Tanner() : base( "the tanner" )

Scripts/Mobiles/Vendors/NPC/TavernKeeper.cs

@@ -1,13 +1,13 @@
 using System; 
-using System.Collections; 
+using System.Collections.Generic; 
 using Server; 
 
 namespace Server.Mobiles 
 { 
 	public class TavernKeeper : BaseVendor 
 	{ 
-		private ArrayList m_SBInfos = new ArrayList(); 
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } } 
+		private List<SBInfo> m_SBInfos = new List<SBInfo>(); 
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } } 
 
 		[Constructable]
 		public TavernKeeper() : base( "the tavern keeper" ) 

Scripts/Mobiles/Vendors/NPC/Thief.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 
 namespace Server.Mobiles
 {
 	public class Thief : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		[Constructable]
 		public Thief() : base( "the thief" )

Scripts/Mobiles/Vendors/NPC/Tinker.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 
 namespace Server.Mobiles
 {
 	public class Tinker : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		public override NpcGuild NpcGuild{ get{ return NpcGuild.TinkersGuild; } }
 

Scripts/Mobiles/Vendors/NPC/Vagabond.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 using Server.Items;
 
@@ -7,8 +7,8 @@ namespace Server.Mobiles
 {
 	public class Vagabond : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		[Constructable]
 		public Vagabond() : base( "the vagabond" )

Scripts/Mobiles/Vendors/NPC/VarietyDealer.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 
 namespace Server.Mobiles
 {
 	public class VarietyDealer : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		[Constructable]
 		public VarietyDealer() : base( "the variety dealer" )

Scripts/Mobiles/Vendors/NPC/Veterinarian.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 using Server.Gumps;
 using Server.Items;
@@ -11,8 +11,8 @@ namespace Server.Mobiles
 {
 	public class Veterinarian : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		[Constructable]
 		public Veterinarian() : base( "the vet" )

Scripts/Mobiles/Vendors/NPC/Waiter.cs

@@ -1,13 +1,13 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 
 namespace Server.Mobiles
 {
 	public class Waiter : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		[Constructable]
 		public Waiter() : base( "the waiter" )

Scripts/Mobiles/Vendors/NPC/Weaponsmith.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 using Server.Engines.BulkOrders;
 
@@ -7,8 +7,8 @@ namespace Server.Mobiles
 {
 	public class Weaponsmith : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		[Constructable]
 		public Weaponsmith() : base( "the weaponsmith" )

Scripts/Mobiles/Vendors/NPC/Weaver.cs

@@ -1,5 +1,5 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using Server;
 using Server.Engines.BulkOrders;
 
@@ -7,8 +7,8 @@ namespace Server.Mobiles
 {
 	public class Weaver : BaseVendor
 	{
-		private ArrayList m_SBInfos = new ArrayList();
-		protected override ArrayList SBInfos{ get { return m_SBInfos; } }
+		private List<SBInfo> m_SBInfos = new List<SBInfo>();
+		protected override List<SBInfo> SBInfos{ get { return m_SBInfos; } }
 
 		public override NpcGuild NpcGuild{ get{ return NpcGuild.TailorsGuild; } }