#W# File structure changes.

Scripts/Commands/Docs.cs

@@ -1233,7 +1233,7 @@ namespace Server.Commands
 		{
 			List<BodyEntry> list = new List<BodyEntry>();
 
-			string path = Core.FindDataFile( "models/models.txt" );
+			string path = Core.FindDataFile( "Data/Config/models.txt" );
 
 			if( File.Exists( path ) )
 			{

Scripts/Commands/GenCategorization.cs

@@ -45,7 +45,7 @@ namespace Server.Commands
 		{
 			CategoryEntry root = new CategoryEntry( null, "Add Menu", new CategoryEntry[]{ Items, Mobiles } );
 
-			Export( root, "Data/objects.xml", "Objects" );
+			Export( root, "Data/Config/objects.xml", "Objects" );
 
 			e.Mobile.SendMessage( "Categorization menu rebuilt." );
 		}
@@ -157,8 +157,8 @@ namespace Server.Commands
 			for ( int i = 0; i < ScriptCompiler.Assemblies.Length; ++i )
 				AddTypes( ScriptCompiler.Assemblies[i], types );
 
-			m_RootItems = Load( types, "Data/items.cfg" );
-			m_RootMobiles = Load( types, "Data/mobiles.cfg" );
+			m_RootItems = Load( types, "Data/Config/items.cfg" );
+			m_RootMobiles = Load( types, "Data/Config/mobiles.cfg" );
 		}
 
 		private static CategoryEntry Load( ArrayList types, string config )
@@ -423,4 +423,4 @@ namespace Server.Commands
 			return (CategoryLine[])list.ToArray( typeof( CategoryLine ) );
 		}
 	}
-}
+}

Scripts/Engines/Help/PageQueueGump.cs

@@ -171,7 +171,7 @@ namespace Server.Engines.Help
 
 			try
 			{
-				string path = Path.Combine( Core.BaseDirectory, "Data/pageresponse.cfg" );
+				string path = Path.Combine( Core.BaseDirectory, "Data/Config/pageresponse.cfg" );
 
 				using ( StreamWriter op = new StreamWriter( path ) )
 				{
@@ -193,7 +193,7 @@ namespace Server.Engines.Help
 		{
 			ArrayList list = new ArrayList();
 
-			string path = Path.Combine( Core.BaseDirectory, "Data/pageresponse.cfg" );
+			string path = Path.Combine( Core.BaseDirectory, "Data/Config/pageresponse.cfg" );
 
 			if ( File.Exists( path ) )
 			{
@@ -831,4 +831,4 @@ namespace Server.Engines.Help
 			}
 		}
 	}
-}
+}

Scripts/Engines/MLQuests/MLQuestSystem.cs

@@ -53,7 +53,7 @@ namespace Server.Engines.MLQuests
 			m_QuestGivers = new Dictionary<Type, List<MLQuest>>();
 			m_Contexts = new Dictionary<PlayerMobile, MLQuestContext>();
 
-			string cfgPath = Path.Combine( Core.BaseDirectory, Path.Combine( "Data", "MLQuests.cfg" ) );
+			string cfgPath = Path.Combine( Core.BaseDirectory, Path.Combine( "Data", "Config", "MLQuests.cfg" ) );
 
 			Type baseQuestType = typeof( MLQuest );
 			Type baseQuesterType = typeof( IQuestGiver );

Scripts/Engines/Spawner/PremiumSpawner/PremiumSpawnerGumps.cs

@@ -87,7 +87,11 @@ namespace Server.Gumps
 			AddButton( 140, 32, 0x15E1, 0x15E5, 101, GumpButtonType.Reply, 0 );
 
 			AddLabel( 15, 60, 52, "Tip:" );
-			AddHtml( 15, 80, 200, 110, "This will SAVE the spawners, in a specified region, to Data/Nerun's Distro/Spawns/'region name'.map. Type [where if you don't know the region you are. Copy to the text box the name of the region. You also can open Data/Regions.xml to a full list of regions.<BR>Example: you type [where and appear 'your region is town of Britain'. Type 'Britain' in text box.", true, true );
+
+			AddHtml( 15, 80, 200, 110, "This will SAVE the spawners, in a specified region, to Data/Nerun's Distro/Spawns/'region name'.map. Type [where if you don't know the region you are. Copy to the text box the name of the region. You also can open Data/Config/Regions.xml to a full list of regions.<BR>Example: you type [where and appear 'your region is town of Britain'. Type 'Britain' in text box.", true, true );
+
+			AddHtml( 15, 80, 200, 110, "This will SAVE the spawners, in a specified region, to Data/Nerun's Distro/Spawns/'region name'.map. Type [where if you don't know the region you are. Copy to the text box the name of the region. You also can open Data/Config/Regions.xml to a full list of regions.<BR>Example: you type [where and appear 'your region is town of Britain'. Type 'Britain' in text box.", true, true );
+
 		}
 
 		public override void OnResponse(NetState state, RelayInfo info)
@@ -143,7 +147,11 @@ namespace Server.Gumps
 			AddButton( 140, 32, 0x15E1, 0x15E5, 101, GumpButtonType.Reply, 0 );
 
 			AddLabel( 15, 60, 52, "Tip:" );
+<<<<<<< HEAD
 			AddHtml( 15, 80, 200, 110, "This will REMOVE the spawners, in a specified region. Type [where if you don't know the region you are. Copy to the text box the name of the region. You also can open Data/Regions.xml to a full list of regions.<BR>Example: you type [where and appear 'your region is town of Britain'. Type 'Britain' in text box.", true, true );
+=======
+			AddHtml( 15, 80, 200, 110, "This will REMOVE the spawners, in a specified region. Type [where if you don't know the region you are. Copy to the text box the name of the region. You also can open Data/Config/Regions.xml to a full list of regions.<BR>Example: you type [where and appear 'your region is town of Britain'. Type 'Britain' in text box.", true, true );
+>>>>>>> main
 		}
 
 		public override void OnResponse(NetState state, RelayInfo info)
@@ -416,4 +424,8 @@ namespace Server.Gumps
 			}
 		}
 	}
-}
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> main

Scripts/Gumps/CategorizedAddGump.cs

@@ -123,7 +123,7 @@ namespace Server.Gumps
 			get
 			{
 				if ( m_Root == null )
-					m_Root = Load( "Data/objects.xml" );
+					m_Root = Load( "Data/Config/objects.xml" );
 
 				return m_Root;
 			}

Scripts/Items/Maps/TreasureMap.cs

@@ -77,7 +77,7 @@ namespace Server.Items
 
 		private static void LoadLocations()
 		{
-			string filePath = Path.Combine( Core.BaseDirectory, "Data/treasure.cfg" );
+			string filePath = Path.Combine( Core.BaseDirectory, "Data/Config/treasure.cfg" );
 
 			List<Point2D> list = new List<Point2D>();
 			List<Point2D> havenList = new List<Point2D>();
@@ -935,4 +935,4 @@ namespace Server.Items
 			Delete();
 		}
 	}
-}
+}

Scripts/Misc/NameList.cs

@@ -64,7 +64,7 @@ namespace Server
 		{
 			m_Table = new Dictionary<string, NameList>( StringComparer.OrdinalIgnoreCase );
 
-			string filePath = Path.Combine( Core.BaseDirectory, "Data/names.xml" );
+			string filePath = Path.Combine( Core.BaseDirectory, "Data/Config/names.xml" );
 
 			if ( !File.Exists( filePath ) )
 				return;

Scripts/Misc/ShrinkTable.cs

@@ -42,7 +42,7 @@ namespace Server
 
 		private static void Load()
 		{
-			string path = Path.Combine( Core.BaseDirectory, "Data/shrink.cfg" );
+			string path = Path.Combine( Core.BaseDirectory, "Data/Config/shrink.cfg" );
 
 			if ( !File.Exists( path ) )
 			{
@@ -83,4 +83,4 @@ namespace Server
 			}
 		}
 	}
-}
+}

Scripts/Misc/TreasureMapProtection.cs

@@ -19,7 +19,7 @@ namespace Server
 
 		public static void Initialize()
 		{
-			string filePath = Path.Combine( Core.BaseDirectory, "Data/treasure.cfg" );
+			string filePath = Path.Combine( Core.BaseDirectory, "Data/Config/treasure.cfg" );
 			int i = 0, x = 0, y = 0;
 
 			if ( File.Exists( filePath ) )
@@ -51,7 +51,7 @@ namespace Server
 						}
 						catch
 						{
-                            Console.WriteLine( "Warning: Error in Line '{0}' of Data/treasure.cfg", line );
+                            Console.WriteLine( "Warning: Error in Line '{0}' of Data/Config/treasure.cfg", line );
 						}
 					}
 				}
@@ -75,4 +75,4 @@ namespace Server
 				m.SendMessage( "You have left a protected treasure map area." );
 		}
 	}
-}
+}

Scripts/Multis/ComponentVerification.cs

@@ -38,15 +38,15 @@ namespace Server.Multis
 			m_ItemTable = CreateTable( TileData.MaxItemValue );
 			m_MultiTable = CreateTable( 0x4000 );
 
-			LoadItems( "Data/Components/walls.txt", "South1", "South2", "South3", "Corner", "East1", "East2", "East3", "Post", "WindowS", "AltWindowS", "WindowE", "AltWindowE", "SecondAltWindowS", "SecondAltWindowE" );
+			LoadItems( "Data/Config/Components/walls.txt", "South1", "South2", "South3", "Corner", "East1", "East2", "East3", "Post", "WindowS", "AltWindowS", "WindowE", "AltWindowE", "SecondAltWindowS", "SecondAltWindowE" );
 			LoadItems( "Data/Components/teleprts.txt", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12", "F13", "F14", "F15", "F16" );
-			LoadItems( "Data/Components/stairs.txt", "Block", "North", "East", "South", "West", "Squared1", "Squared2", "Rounded1", "Rounded2" );
-			LoadItems( "Data/Components/roof.txt", "North", "East", "South", "West", "NSCrosspiece", "EWCrosspiece", "NDent", "EDent", "SDent", "WDent", "NTPiece", "ETPiece", "STPiece", "WTPiece", "XPiece", "Extra Piece" );
-			LoadItems( "Data/Components/floors.txt", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12", "F13", "F14", "F15", "F16" );
-			LoadItems( "Data/Components/misc.txt", "Piece1", "Piece2", "Piece3", "Piece4", "Piece5", "Piece6", "Piece7", "Piece8" );
-			LoadItems( "Data/Components/doors.txt", "Piece1", "Piece2", "Piece3", "Piece4", "Piece5", "Piece6", "Piece7", "Piece8" );
+			LoadItems( "Data/Config/Components/stairs.txt", "Block", "North", "East", "South", "West", "Squared1", "Squared2", "Rounded1", "Rounded2" );
+			LoadItems( "Data/Config/Components/roof.txt", "North", "East", "South", "West", "NSCrosspiece", "EWCrosspiece", "NDent", "EDent", "SDent", "WDent", "NTPiece", "ETPiece", "STPiece", "WTPiece", "XPiece", "Extra Piece" );
+			LoadItems( "Data/Config/Components/floors.txt", "F1", "F2", "F3", "F4", "F5", "F6", "F7", "F8", "F9", "F10", "F11", "F12", "F13", "F14", "F15", "F16" );
+			LoadItems( "Data/Config/Components/misc.txt", "Piece1", "Piece2", "Piece3", "Piece4", "Piece5", "Piece6", "Piece7", "Piece8" );
+			LoadItems( "Data/Config/Components/doors.txt", "Piece1", "Piece2", "Piece3", "Piece4", "Piece5", "Piece6", "Piece7", "Piece8" );
 
-			LoadMultis( "Data/Components/stairs.txt", "MultiNorth", "MultiEast", "MultiSouth", "MultiWest" );
+			LoadMultis( "Data/Config/Components/stairs.txt", "MultiNorth", "MultiEast", "MultiSouth", "MultiWest" );
 		}
 
 		private int[] CreateTable( int length )
@@ -251,4 +251,4 @@ namespace Server.Multis
 			}
 		}
 	}
-}
+}

Scripts/Regions/Spawning/SpawnDefinition.cs

@@ -312,7 +312,7 @@ namespace Server.Regions
 
 		static SpawnGroup()
 		{
-			string path = Path.Combine( Core.BaseDirectory, "Data/SpawnDefinitions.xml" );
+			string path = Path.Combine( Core.BaseDirectory, "Data/Config/SpawnDefinitions.xml" );
 			if ( !File.Exists( path ) )
 				return;
 
@@ -406,4 +406,4 @@ namespace Server.Regions
 			return false;
 		}
 	}
-}
+}

Source/Body.cs

@@ -41,9 +41,9 @@ namespace Server
 
 		static Body()
 		{
-			if ( File.Exists( "Data/bodyTable.cfg" ) )
+			if ( File.Exists( "Data/Config/bodyTable.cfg" ) )
 			{
-				using ( StreamReader ip = new StreamReader( "Data/bodyTable.cfg" ) )
+				using ( StreamReader ip = new StreamReader( "Data/Config/bodyTable.cfg" ) )
 				{
 					m_Types = new BodyType[0x1000];
 
@@ -73,7 +73,7 @@ namespace Server
 			}
 			else
 			{
-				Console.WriteLine( "Warning: Data/bodyTable.cfg does not exist" );
+				Console.WriteLine( "Warning: Data/Config/bodyTable.cfg does not exist" );
 
 				m_Types = new BodyType[0];
 			}
@@ -284,4 +284,4 @@ namespace Server
 			return l.m_BodyID <= r.m_BodyID;
 		}
 	}
-}
+}

Source/Items/Container.cs

@@ -1729,7 +1729,7 @@ namespace Server.Items
 		{
 			m_Table = new Dictionary<int, ContainerData>();
 
-			string path = Path.Combine( Core.BaseDirectory, "Data/containers.cfg" );
+			string path = Path.Combine( Core.BaseDirectory, "Data/Config/containers.cfg" );
 
 			if ( !File.Exists( path ) )
 			{
@@ -1784,7 +1784,7 @@ namespace Server.Items
 
 									if ( m_Table.ContainsKey( id ) )
 									{
-										Console.WriteLine( @"Warning: double ItemID entry in Data\containers.cfg" );
+										Console.WriteLine( @"Warning: double ItemID entry in Data\Config\containers.cfg" );
 									}
 									else
 									{
@@ -1839,4 +1839,4 @@ namespace Server.Items
 			m_DropSound = dropSound;
 		}
 	}
-}
+}

Source/Region.cs

@@ -858,16 +858,16 @@ namespace Server
 
 		internal static void Load()
 		{
-			if ( !System.IO.File.Exists( "Data/Regions.xml" ) )
+			if ( !System.IO.File.Exists( "Data/Config/Regions.xml" ) )
 			{
-				Console.WriteLine( "Error: Data/Regions.xml does not exist" );
+				Console.WriteLine( "Error: Data/Config/Regions.xml does not exist" );
 				return;
 			}
 
 			Console.Write( "Regions: Loading..." );
 
 			XmlDocument doc = new XmlDocument();
-			doc.Load( System.IO.Path.Combine( Core.BaseDirectory, "Data/Regions.xml" ) );
+			doc.Load( System.IO.Path.Combine( Core.BaseDirectory, "Data/Config/Regions.xml" ) );
 
 			XmlElement root = doc["ServerRegions"];
 
@@ -1282,4 +1282,4 @@ namespace Server
 			return true;
 		}
 	}
-}
+}

Source/ScriptCompiler.cs

@@ -55,7 +55,7 @@ namespace Server
 		{
 			List<string> list = new List<string>();
 
-			string path = Path.Combine( Core.BaseDirectory, "Data/Assemblies.cfg" );
+			string path = Path.Combine( Core.BaseDirectory, "Data/Config/Assemblies.cfg" );
 
 			if( File.Exists( path ) )
 			{