From af37bba9b8e32ac826e0fce5ef872ffa6981f081 Mon Sep 17 00:00:00 2001
From: mark <mark@a9ff2418-eebe-19e0-0898-3207744d8c45>
Date: Wed, 8 Dec 2010 05:29:16 +0000
Subject: [PATCH]

---
 Scripts/Multis/ComponentVerification.cs |   2 +-
 Server/ExpansionInfo.cs                 | 104 ++++++++++++------------
 2 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/Scripts/Multis/ComponentVerification.cs b/Scripts/Multis/ComponentVerification.cs
index 2b9ffd058..04bc06a6f 100644
--- a/Scripts/Multis/ComponentVerification.cs
+++ b/Scripts/Multis/ComponentVerification.cs
@@ -35,7 +35,7 @@ namespace Server.Multis
 
 		public ComponentVerification()
 		{
-			m_ItemTable = CreateTable( 0x4000 );
+			m_ItemTable = CreateTable( 0x10000 );
 			m_MultiTable = CreateTable( 0x4000 );
 
 			LoadItems( "Data/Components/walls.txt", "South1", "South2", "South3", "Corner", "East1", "East2", "East3", "Post", "WindowS", "AltWindowS", "WindowE", "AltWindowE", "SecondAltWindowS", "SecondAltWindowE" );
diff --git a/Server/ExpansionInfo.cs b/Server/ExpansionInfo.cs
index 60855498d..4cc922352 100644
--- a/Server/ExpansionInfo.cs
+++ b/Server/ExpansionInfo.cs
@@ -53,32 +53,32 @@ namespace Server
 	[Flags]
 	public enum FeatureFlags
 	{
-		None					= 0x00000000,
-		T2A						= 0x00000001,
-		UOR						= 0x00000002,
-		UOTD					= 0x00000004,
-		LBR						= 0x00000008,
-		AOS						= 0x00000010,
-		SixthCharacterSlot		= 0x00000020,
-		SE						= 0x00000040,
-		ML						= 0x00000080,
-		Unk1					= 0x00000100,
-		Unk2					= 0x00000200,
-		Unk3					= 0x00000400,
-		Unk4					= 0x00000800,
+		None			= 0x00000000,
+		T2A			= 0x00000001,
+		UOR			= 0x00000002,
+		UOTD			= 0x00000004,
+		LBR			= 0x00000008,
+		AOS			= 0x00000010,
+		SixthCharacterSlot	= 0x00000020,
+		SE			= 0x00000040,
+		ML			= 0x00000080,
+		Unk1			= 0x00000100,
+		Unk2			= 0x00000200,
+		Unk3			= 0x00000400,
+		Unk4			= 0x00000800,
 		SeventhCharacterSlot	= 0x00001000,
-		Unk5					= 0x00002000,
-		Unk6					= 0x00004000,
-		Unk7					= 0x00008000,
-		SA						= 0x00010000,
+		Unk5			= 0x00002000,
+		Unk6			= 0x00004000,
+		Unk7			= 0x00008000,
+		SA			= 0x00010000,
 
 
-		ExpansionNone	= None,
-		ExpansionT2A	= T2A,
-		ExpansionUOR	= ExpansionT2A	| UOR,
-		ExpansionUOTD	= ExpansionUOR	| UOTD,
-		ExpansionLBR	= ExpansionUOTD	| LBR,
-		ExpansionAOS	= ExpansionLBR	| AOS	| Unk7,
+		ExpansionNone		= None,
+		ExpansionT2A		= T2A,
+		ExpansionUOR		= ExpansionT2A	| UOR,
+		ExpansionUOTD		= ExpansionUOR	| UOTD,
+		ExpansionLBR		= ExpansionUOTD	| LBR,
+		ExpansionAOS		= ExpansionLBR	| AOS	| Unk7,
 		ExpansionSE		= ExpansionAOS	| SE,
 		ExpansionML		= ExpansionSE	| ML	| Unk2,
 		ExpansionSA		= ExpansionML	| SA
@@ -87,28 +87,28 @@ namespace Server
 	[Flags]
 	public enum	CharacterListFlags
 	{
-		None					= 0x00000000,
-		Unk1					= 0x00000001,
-		Unk2					= 0x00000002,
-		OneCharacterSlot		= 0x00000004,
-		ContextMenus			= 0x00000008,
-		SlotLimit				= 0x00000010,
-		AOS						= 0x00000020,
-		SixthCharacterSlot		= 0x00000040,
-		SE						= 0x00000080,
-		ML						= 0x00000100,
-		Unk4					= 0x00000200,
-		Unk5					= 0x00000400,
-		Unk6					= 0x00000800,
+		None			= 0x00000000,
+		Unk1			= 0x00000001,
+		Unk2			= 0x00000002,
+		OneCharacterSlot	= 0x00000004,
+		ContextMenus		= 0x00000008,
+		SlotLimit		= 0x00000010,
+		AOS			= 0x00000020,
+		SixthCharacterSlot	= 0x00000040,
+		SE			= 0x00000080,
+		ML			= 0x00000100,
+		Unk4			= 0x00000200,
+		Unk5			= 0x00000400,
+		Unk6			= 0x00000800,
 		SeventhCharacterSlot	= 0x00001000,
-		Unk7					= 0x00002000,
+		Unk7			= 0x00002000,
 
-		ExpansionNone	= ContextMenus, //
-		ExpansionT2A	= ContextMenus, //
-		ExpansionUOR	= ContextMenus, // None
-		ExpansionUOTD	= ContextMenus, //
-		ExpansionLBR	= ContextMenus, //
-		ExpansionAOS	= ContextMenus	| AOS,
+		ExpansionNone		= ContextMenus, //
+		ExpansionT2A		= ContextMenus, //
+		ExpansionUOR		= ContextMenus, // None
+		ExpansionUOTD		= ContextMenus, //
+		ExpansionLBR		= ContextMenus, //
+		ExpansionAOS		= ContextMenus	| AOS,
 		ExpansionSE		= ExpansionAOS	| SE,
 		ExpansionML		= ExpansionSE	| ML,
 		ExpansionSA		= ExpansionML
@@ -119,15 +119,15 @@ namespace Server
 		public static ExpansionInfo[] Table { get { return m_Table; } }
 		private static ExpansionInfo[] m_Table = new ExpansionInfo[]
 			{
-				new ExpansionInfo( 0, "None"				, ClientFlags.None,					FeatureFlags.ExpansionNone,	CharacterListFlags.ExpansionNone,	0x0000 ),
-				new ExpansionInfo( 1, "The Second Age"		, ClientFlags.Felucca,				FeatureFlags.ExpansionT2A,	CharacterListFlags.ExpansionT2A,	0x0000 ),
-				new ExpansionInfo( 2, "Renaissance"			, ClientFlags.Trammel,				FeatureFlags.ExpansionUOR,	CharacterListFlags.ExpansionUOR,	0x0000 ),
-				new ExpansionInfo( 3, "Third Dawn"			, ClientFlags.Ilshenar,				FeatureFlags.ExpansionUOTD,	CharacterListFlags.ExpansionUOTD,	0x0000 ),
-				new ExpansionInfo( 4, "Blackthorn's Revenge", ClientFlags.Ilshenar,				FeatureFlags.ExpansionLBR,	CharacterListFlags.ExpansionLBR,	0x0000 ),
-				new ExpansionInfo( 5, "Age of Shadows"		, ClientFlags.Malas,				FeatureFlags.ExpansionAOS,	CharacterListFlags.ExpansionAOS,	0x0020 ),
-				new ExpansionInfo( 6, "Samurai Empire"		, ClientFlags.Tokuno,				FeatureFlags.ExpansionSE,	CharacterListFlags.ExpansionSE,		0x0060 ),	// 0x40 | 0x20 = 0x60
-				new ExpansionInfo( 7, "Mondain's Legacy"	, new ClientVersion( "5.0.0a" ),	FeatureFlags.ExpansionML,	CharacterListFlags.ExpansionML,		0x02E0 ),	// 0x280 | 0x60 = 0x2E0
-				new ExpansionInfo( 8, "Stygian Abyss"		, ClientFlags.TerMur,				FeatureFlags.ExpansionSA,	CharacterListFlags.ExpansionSA,		0x02E0 )	// ??
+				new ExpansionInfo( 0, "None",			ClientFlags.None,		FeatureFlags.ExpansionNone,	CharacterListFlags.ExpansionNone,	0x0000 ),
+				new ExpansionInfo( 1, "The Second Age",		ClientFlags.Felucca,		FeatureFlags.ExpansionT2A,	CharacterListFlags.ExpansionT2A,	0x0000 ),
+				new ExpansionInfo( 2, "Renaissance",		ClientFlags.Trammel,		FeatureFlags.ExpansionUOR,	CharacterListFlags.ExpansionUOR,	0x0000 ),
+				new ExpansionInfo( 3, "Third Dawn",		ClientFlags.Ilshenar,		FeatureFlags.ExpansionUOTD,	CharacterListFlags.ExpansionUOTD,	0x0000 ),
+				new ExpansionInfo( 4, "Blackthorn's Revenge",	ClientFlags.Ilshenar,		FeatureFlags.ExpansionLBR,	CharacterListFlags.ExpansionLBR,	0x0000 ),
+				new ExpansionInfo( 5, "Age of Shadows",		ClientFlags.Malas,		FeatureFlags.ExpansionAOS,	CharacterListFlags.ExpansionAOS,	0x0000 ),
+				new ExpansionInfo( 6, "Samurai Empire",		ClientFlags.Tokuno,		FeatureFlags.ExpansionSE,	CharacterListFlags.ExpansionSE,		0x00C0 ), // 0x20 | 0x80
+				new ExpansionInfo( 7, "Mondain's Legacy",	new ClientVersion( "5.0.0a" ),	FeatureFlags.ExpansionML,	CharacterListFlags.ExpansionML,		0x02C0 ), // 0x20 | 0x80 | 0x200
+				new ExpansionInfo( 8, "Stygian Abyss",		ClientFlags.TerMur,		FeatureFlags.ExpansionSA,	CharacterListFlags.ExpansionSA,		0x102C0 ) // 0x20 | 0x80 | 0x200 | 0x10000
 			};
 
 		private string m_Name;