From e9f8d5fa6d859083624ec25790c461aba4958566 Mon Sep 17 00:00:00 2001
From: Akkadius <akkadius1@gmail.com>
Date: Sun, 18 Jan 2015 01:27:52 -0600
Subject: [PATCH] Port Status messages from Type to Category

---
 client_files/export/main.cpp | 10 +++---
 client_files/import/main.cpp | 14 ++++----
 common/database.cpp          |  2 +-
 queryserv/database.cpp       |  2 +-
 shared_memory/main.cpp       | 16 ++++-----
 ucs/database.cpp             |  2 +-
 world/worlddb.cpp            | 10 +++---
 zone/aa.cpp                  |  6 ++--
 zone/client_packet.cpp       |  2 +-
 zone/command.cpp             |  2 +-
 zone/doors.cpp               |  2 +-
 zone/embparser.cpp           |  2 +-
 zone/pathing.cpp             |  4 +--
 zone/zone.cpp                | 66 ++++++++++++++++++------------------
 zone/zonedb.cpp              |  2 +-
 zone/zoning.cpp              |  2 +-
 16 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/client_files/export/main.cpp b/client_files/export/main.cpp
index 1b129e552..5d421b50c 100644
--- a/client_files/export/main.cpp
+++ b/client_files/export/main.cpp
@@ -38,7 +38,7 @@ int main(int argc, char **argv) {
 	Log.LoadLogSettingsDefaults();
 	set_exception_handler();
 
-	Log.Log(EQEmuLogSys::Status, "Client Files Export Utility");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Client Files Export Utility");
 	if(!EQEmuConfig::LoadConfig()) {
 		Log.Log(EQEmuLogSys::Error, "Unable to load configuration file.");
 		return 1;
@@ -50,7 +50,7 @@ int main(int argc, char **argv) {
 	}
 
 	SharedDatabase database;
-	Log.Log(EQEmuLogSys::Status, "Connecting to database...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Connecting to database...");
 	if(!database.Connect(config->DatabaseHost.c_str(), config->DatabaseUsername.c_str(),
 		config->DatabasePassword.c_str(), config->DatabaseDB.c_str(), config->DatabasePort)) {
 		Log.Log(EQEmuLogSys::Error, "Unable to connect to the database, cannot continue without a "
@@ -66,7 +66,7 @@ int main(int argc, char **argv) {
 }
 
 void ExportSpells(SharedDatabase *db) {
-	Log.Log(EQEmuLogSys::Status, "Exporting Spells...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Exporting Spells...");
 
 	FILE *f = fopen("export/spells_us.txt", "w");
 	if(!f) {
@@ -140,7 +140,7 @@ int GetSkill(SharedDatabase *db, int skill_id, int class_id, int level) {
 }
 
 void ExportSkillCaps(SharedDatabase *db) {
-	Log.Log(EQEmuLogSys::Status, "Exporting Skill Caps...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Exporting Skill Caps...");
 
 	FILE *f = fopen("export/SkillCaps.txt", "w");
 	if(!f) {
@@ -169,7 +169,7 @@ void ExportSkillCaps(SharedDatabase *db) {
 }
 
 void ExportBaseData(SharedDatabase *db) {
-	Log.Log(EQEmuLogSys::Status, "Exporting Base Data...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Exporting Base Data...");
 
 	FILE *f = fopen("export/BaseData.txt", "w");
 	if(!f) {
diff --git a/client_files/import/main.cpp b/client_files/import/main.cpp
index 6e65df96b..810309f36 100644
--- a/client_files/import/main.cpp
+++ b/client_files/import/main.cpp
@@ -36,7 +36,7 @@ int main(int argc, char **argv) {
 	Log.LoadLogSettingsDefaults();
 	set_exception_handler();
 
-	Log.Log(EQEmuLogSys::Status, "Client Files Import Utility");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Client Files Import Utility");
 	if(!EQEmuConfig::LoadConfig()) {
 		Log.Log(EQEmuLogSys::Error, "Unable to load configuration file.");
 		return 1;
@@ -48,7 +48,7 @@ int main(int argc, char **argv) {
 	}
 
 	SharedDatabase database;
-	Log.Log(EQEmuLogSys::Status, "Connecting to database...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Connecting to database...");
 	if(!database.Connect(config->DatabaseHost.c_str(), config->DatabaseUsername.c_str(),
 		config->DatabasePassword.c_str(), config->DatabaseDB.c_str(), config->DatabasePort)) {
 		Log.Log(EQEmuLogSys::Error, "Unable to connect to the database, cannot continue without a "
@@ -76,7 +76,7 @@ int GetSpellColumns(SharedDatabase *db) {
 }
 
 void ImportSpells(SharedDatabase *db) {
-	Log.Log(EQEmuLogSys::Status, "Importing Spells...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Importing Spells...");
 	FILE *f = fopen("import/spells_us.txt", "r");
 	if(!f) {
 		Log.Log(EQEmuLogSys::Error, "Unable to open import/spells_us.txt to read, skipping.");
@@ -142,19 +142,19 @@ void ImportSpells(SharedDatabase *db) {
 
 		spells_imported++;
 		if(spells_imported % 1000 == 0) {
-			Log.Log(EQEmuLogSys::Status, "%d spells imported.", spells_imported);
+			Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "%d spells imported.", spells_imported);
 		}
 	}
 
 	if(spells_imported % 1000 != 0) {
-		Log.Log(EQEmuLogSys::Status, "%d spells imported.", spells_imported);
+		Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "%d spells imported.", spells_imported);
 	}
 
 	fclose(f);
 }
 
 void ImportSkillCaps(SharedDatabase *db) {
-	Log.Log(EQEmuLogSys::Status, "Importing Skill Caps...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Importing Skill Caps...");
 
 	FILE *f = fopen("import/SkillCaps.txt", "r");
 	if(!f) {
@@ -190,7 +190,7 @@ void ImportSkillCaps(SharedDatabase *db) {
 }
 
 void ImportBaseData(SharedDatabase *db) {
-	Log.Log(EQEmuLogSys::Status, "Importing Base Data...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Importing Base Data...");
 
 	FILE *f = fopen("import/BaseData.txt", "r");
 	if(!f) {
diff --git a/common/database.cpp b/common/database.cpp
index 5c506fd53..14b461a01 100644
--- a/common/database.cpp
+++ b/common/database.cpp
@@ -89,7 +89,7 @@ bool Database::Connect(const char* host, const char* user, const char* passwd, c
 		return false; 
 	}
 	else {
-		Log.Log(EQEmuLogSys::Status, "Using database '%s' at %s:%d",database,host,port);
+		Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Using database '%s' at %s:%d",database,host,port);
 		return true;
 	}
 }
diff --git a/queryserv/database.cpp b/queryserv/database.cpp
index c7c4ec8c9..55c26e47e 100644
--- a/queryserv/database.cpp
+++ b/queryserv/database.cpp
@@ -76,7 +76,7 @@ bool Database::Connect(const char* host, const char* user, const char* passwd, c
 	}
 	else
 	{
-		Log.Log(EQEmuLogSys::Status, "Using database '%s' at %s:%d",database,host,port);
+		Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Using database '%s' at %s:%d",database,host,port);
 		return true;
 	}
 }
diff --git a/shared_memory/main.cpp b/shared_memory/main.cpp
index 765d08c22..0797662eb 100644
--- a/shared_memory/main.cpp
+++ b/shared_memory/main.cpp
@@ -40,7 +40,7 @@ int main(int argc, char **argv) {
 	Log.LoadLogSettingsDefaults();
 	set_exception_handler();
 
-	Log.Log(EQEmuLogSys::Status, "Shared Memory Loader Program");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Shared Memory Loader Program");
 	if(!EQEmuConfig::LoadConfig()) {
 		Log.Log(EQEmuLogSys::Error, "Unable to load configuration file.");
 		return 1;
@@ -52,7 +52,7 @@ int main(int argc, char **argv) {
 	}
 
 	SharedDatabase database;
-	Log.Log(EQEmuLogSys::Status, "Connecting to database...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Connecting to database...");
 	if(!database.Connect(config->DatabaseHost.c_str(), config->DatabaseUsername.c_str(),
 		config->DatabasePassword.c_str(), config->DatabaseDB.c_str(), config->DatabasePort)) {
 		Log.Log(EQEmuLogSys::Error, "Unable to connect to the database, cannot continue without a "
@@ -114,7 +114,7 @@ int main(int argc, char **argv) {
 	}
 
 	if(load_all || load_items) {
-		Log.Log(EQEmuLogSys::Status, "Loading items...");
+		Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Loading items...");
 		try {
 			LoadItems(&database);
 		} catch(std::exception &ex) {
@@ -124,7 +124,7 @@ int main(int argc, char **argv) {
 	}
 
 	if(load_all || load_factions) {
-		Log.Log(EQEmuLogSys::Status, "Loading factions...");
+		Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Loading factions...");
 		try {
 			LoadFactions(&database);
 		} catch(std::exception &ex) {
@@ -134,7 +134,7 @@ int main(int argc, char **argv) {
 	}
 
 	if(load_all || load_loot) {
-		Log.Log(EQEmuLogSys::Status, "Loading loot...");
+		Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Loading loot...");
 		try {
 			LoadLoot(&database);
 		} catch(std::exception &ex) {
@@ -144,7 +144,7 @@ int main(int argc, char **argv) {
 	}
 
 	if(load_all || load_skill_caps) {
-		Log.Log(EQEmuLogSys::Status, "Loading skill caps...");
+		Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Loading skill caps...");
 		try {
 			LoadSkillCaps(&database);
 		} catch(std::exception &ex) {
@@ -154,7 +154,7 @@ int main(int argc, char **argv) {
 	}
 
 	if(load_all || load_spells) {
-		Log.Log(EQEmuLogSys::Status, "Loading spells...");
+		Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Loading spells...");
 		try {
 			LoadSpells(&database);
 		} catch(std::exception &ex) {
@@ -164,7 +164,7 @@ int main(int argc, char **argv) {
 	}
 
 	if(load_all || load_bd) {
-		Log.Log(EQEmuLogSys::Status, "Loading base data...");
+		Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Loading base data...");
 		try {
 			LoadBaseData(&database);
 		} catch(std::exception &ex) {
diff --git a/ucs/database.cpp b/ucs/database.cpp
index d437e3d64..f189e0639 100644
--- a/ucs/database.cpp
+++ b/ucs/database.cpp
@@ -81,7 +81,7 @@ bool Database::Connect(const char* host, const char* user, const char* passwd, c
 	}
 	else
 	{
-		Log.Log(EQEmuLogSys::Status, "Using database '%s' at %s:%d",database,host,port);
+		Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Using database '%s' at %s:%d",database,host,port);
 		return true;
 	}
 }
diff --git a/world/worlddb.cpp b/world/worlddb.cpp
index 72c90f494..19f3b831d 100644
--- a/world/worlddb.cpp
+++ b/world/worlddb.cpp
@@ -302,7 +302,7 @@ bool WorldDatabase::GetStartZone(PlayerProfile_Struct* in_pp, CharCreate_Struct*
 		return false;
 	}
 
-	Log.Log(EQEmuLogSys::Status, "Start zone query: %s\n", query.c_str());
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Start zone query: %s\n", query.c_str());
 
     if (results.RowCount() == 0) {
         printf("No start_zones entry in database, using defaults\n");
@@ -395,7 +395,7 @@ bool WorldDatabase::GetStartZone(PlayerProfile_Struct* in_pp, CharCreate_Struct*
 		}
     }
     else {
-		Log.Log(EQEmuLogSys::Status, "Found starting location in start_zones");
+		Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Found starting location in start_zones");
 		auto row = results.begin();
 		in_pp->x = atof(row[0]);
 		in_pp->y = atof(row[1]);
@@ -434,11 +434,11 @@ bool WorldDatabase::GetStartZoneSoF(PlayerProfile_Struct* in_pp, CharCreate_Stru
                                     in_cc->start_zone, in_cc->class_, in_cc->deity, in_cc->race);
     auto results = QueryDatabase(query);
 	if(!results.Success()) {
-		Log.Log(EQEmuLogSys::Status, "SoF Start zone query failed: %s : %s\n", query.c_str(), results.ErrorMessage().c_str());
+		Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "SoF Start zone query failed: %s : %s\n", query.c_str(), results.ErrorMessage().c_str());
 		return false;
 	}
 
-	Log.Log(EQEmuLogSys::Status, "SoF Start zone query: %s\n", query.c_str());
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "SoF Start zone query: %s\n", query.c_str());
 
     if (results.RowCount() == 0) {
         printf("No start_zones entry in database, using defaults\n");
@@ -453,7 +453,7 @@ bool WorldDatabase::GetStartZoneSoF(PlayerProfile_Struct* in_pp, CharCreate_Stru
 		}
     }
     else {
-		Log.Log(EQEmuLogSys::Status, "Found starting location in start_zones");
+		Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Found starting location in start_zones");
 		auto row = results.begin();
 		in_pp->x = atof(row[0]);
 		in_pp->y = atof(row[1]);
diff --git a/zone/aa.cpp b/zone/aa.cpp
index 13ab491d6..b7cb4e7d4 100644
--- a/zone/aa.cpp
+++ b/zone/aa.cpp
@@ -1429,7 +1429,7 @@ SendAA_Struct* Zone::FindAA(uint32 id) {
 }
 
 void Zone::LoadAAs() {
-	Log.Log(EQEmuLogSys::Status, "Loading AA information...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Loading AA information...");
 	totalAAs = database.CountAAs();
 	if(totalAAs == 0) {
 		Log.Log(EQEmuLogSys::Error, "Failed to load AAs!");
@@ -1447,9 +1447,9 @@ void Zone::LoadAAs() {
 	}
 
 	//load AA Effects into aa_effects
-	Log.Log(EQEmuLogSys::Status, "Loading AA Effects...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Loading AA Effects...");
 	if (database.LoadAAEffects2())
-		Log.Log(EQEmuLogSys::Status, "Loaded %d AA Effects.", aa_effects.size());
+		Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Loaded %d AA Effects.", aa_effects.size());
 	else
 		Log.Log(EQEmuLogSys::Error, "Failed to load AA Effects!");
 }
diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp
index a39ad8fa2..b85dbf1a7 100644
--- a/zone/client_packet.cpp
+++ b/zone/client_packet.cpp
@@ -6135,7 +6135,7 @@ void Client::Handle_OP_GMNameChange(const EQApplicationPacket *app)
 		return;
 	}
 	Client* client = entity_list.GetClientByName(gmn->oldname);
-	Log.Log(EQEmuLogSys::Status, "GM(%s) changeing players name. Old:%s New:%s", GetName(), gmn->oldname, gmn->newname);
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "GM(%s) changeing players name. Old:%s New:%s", GetName(), gmn->oldname, gmn->newname);
 	bool usedname = database.CheckUsedName((const char*)gmn->newname);
 	if (client == 0) {
 		Message(13, "%s not found for name change. Operation failed!", gmn->oldname);
diff --git a/zone/command.cpp b/zone/command.cpp
index 2e8ecc8f8..f4aaca5e1 100644
--- a/zone/command.cpp
+++ b/zone/command.cpp
@@ -449,7 +449,7 @@ int command_init(void) {
 		{
 #ifdef COMMANDS_WARNINGS
 			if(cur->second->access == 0)
-				Log.Log(EQEmuLogSys::Status, "command_init(): Warning: Command '%s' defaulting to access level 0!" , cur->first.c_str());
+				Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "command_init(): Warning: Command '%s' defaulting to access level 0!" , cur->first.c_str());
 #endif
 		}
 	}
diff --git a/zone/doors.cpp b/zone/doors.cpp
index 6e4640d23..8ac166ddc 100644
--- a/zone/doors.cpp
+++ b/zone/doors.cpp
@@ -645,7 +645,7 @@ int32 ZoneDatabase::GetDoorsDBCountPlusOne(const char *zone_name, int16 version)
 }
 
 bool ZoneDatabase::LoadDoors(int32 iDoorCount, Door *into, const char *zone_name, int16 version) {
-	Log.Log(EQEmuLogSys::Status, "Loading Doors from database...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Loading Doors from database...");
 
 
 //	Door tmpDoor;
diff --git a/zone/embparser.cpp b/zone/embparser.cpp
index 2a9575f8c..e015b14c8 100644
--- a/zone/embparser.cpp
+++ b/zone/embparser.cpp
@@ -140,7 +140,7 @@ void PerlembParser::ReloadQuests() {
 			perl = nullptr;
 		}
 
-		Log.Log(EQEmuLogSys::Status, "Error re-initializing perlembed: %s", e.what());
+		Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Error re-initializing perlembed: %s", e.what());
 		throw e.what();
 	}
 
diff --git a/zone/pathing.cpp b/zone/pathing.cpp
index 343711a65..06a99ade3 100644
--- a/zone/pathing.cpp
+++ b/zone/pathing.cpp
@@ -61,7 +61,7 @@ PathManager* PathManager::LoadPathFile(const char* ZoneName)
 
 		if(Ret->loadPaths(PathFile))
 		{
-			Log.Log(EQEmuLogSys::Status, "Path File %s loaded.", ZonePathFileName);
+			Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Path File %s loaded.", ZonePathFileName);
 
 		}
 		else
@@ -109,7 +109,7 @@ bool PathManager::loadPaths(FILE *PathFile)
 
 	fread(&Head, sizeof(Head), 1, PathFile);
 
-	Log.Log(EQEmuLogSys::Status, "Path File Header: Version %ld, PathNodes %ld",
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Path File Header: Version %ld, PathNodes %ld",
 				(long)Head.version, (long)Head.PathNodeCount);
 
 	if(Head.version != 2)
diff --git a/zone/zone.cpp b/zone/zone.cpp
index 677284a59..6a5f9a9bb 100644
--- a/zone/zone.cpp
+++ b/zone/zone.cpp
@@ -90,7 +90,7 @@ bool Zone::Bootup(uint32 iZoneID, uint32 iInstanceID, bool iStaticZone) {
 		return false;
 	}
 
-	Log.Log(EQEmuLogSys::Status, "Booting %s (%d:%d)", zonename, iZoneID, iInstanceID);
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Booting %s (%d:%d)", zonename, iZoneID, iInstanceID);
 
 	numclients = 0;
 	zone = new Zone(iZoneID, iInstanceID, zonename);
@@ -117,13 +117,13 @@ bool Zone::Bootup(uint32 iZoneID, uint32 iInstanceID, bool iStaticZone) {
 					log_levels[i]=0; //set to zero on a bogue char
 			}
 			zone->loglevelvar = log_levels[0];
-			Log.Log(EQEmuLogSys::Status, "General logging level: %i", zone->loglevelvar);
+			Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "General logging level: %i", zone->loglevelvar);
 			zone->merchantvar = log_levels[1];
-			Log.Log(EQEmuLogSys::Status, "Merchant logging level: %i", zone->merchantvar);
+			Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Merchant logging level: %i", zone->merchantvar);
 			zone->tradevar = log_levels[2];
-			Log.Log(EQEmuLogSys::Status, "Trade logging level: %i", zone->tradevar);
+			Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Trade logging level: %i", zone->tradevar);
 			zone->lootvar = log_levels[3];
-			Log.Log(EQEmuLogSys::Status, "Loot logging level: %i", zone->lootvar);
+			Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Loot logging level: %i", zone->lootvar);
 		}
 		else {
 			zone->loglevelvar = uint8(atoi(tmp)); //continue supporting only command logging (for now)
@@ -145,7 +145,7 @@ bool Zone::Bootup(uint32 iZoneID, uint32 iInstanceID, bool iStaticZone) {
 	}
 
 	Log.Log(EQEmuLogSys::Normal, "---- Zone server %s, listening on port:%i ----", zonename, ZoneConfig::get()->ZonePort);
-	Log.Log(EQEmuLogSys::Status, "Zone Bootup: %s (%i: %i)", zonename, iZoneID, iInstanceID);
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Zone Bootup: %s (%i: %i)", zonename, iZoneID, iInstanceID);
 	parse->Init();
 	UpdateWindowTitle();
 	zone->GetTimeSync();
@@ -171,7 +171,7 @@ bool Zone::LoadZoneObjects() {
 		return false;
     }
 
-    Log.Log(EQEmuLogSys::Status, "Loading Objects from DB...");
+    Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Loading Objects from DB...");
     for (auto row = results.begin(); row != results.end(); ++row) {
         if (atoi(row[9]) == 0)
         {
@@ -288,7 +288,7 @@ bool Zone::LoadGroundSpawns() {
 
 	memset(&groundspawn, 0, sizeof(groundspawn));
 	int gsindex=0;
-	Log.Log(EQEmuLogSys::Status, "Loading Ground Spawns from DB...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Loading Ground Spawns from DB...");
 	database.LoadGroundSpawns(zoneid, GetInstanceVersion(), &groundspawn);
 	uint32 ix=0;
 	char* name=0;
@@ -402,7 +402,7 @@ uint32 Zone::GetTempMerchantQuantity(uint32 NPCID, uint32 Slot) {
 }
 
 void Zone::LoadTempMerchantData() {
-	Log.Log(EQEmuLogSys::Status, "Loading Temporary Merchant Lists...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Loading Temporary Merchant Lists...");
 	std::string query = StringFormat(
 		"SELECT								   "
 		"DISTINCT ml.npcid,					   "
@@ -474,7 +474,7 @@ void Zone::LoadNewMerchantData(uint32 merchantid) {
 }
 
 void Zone::GetMerchantDataForZoneLoad() {
-	Log.Log(EQEmuLogSys::Status, "Loading Merchant Lists...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Loading Merchant Lists...");
 	std::string query = StringFormat(												   
 		"SELECT																		   "
 		"DISTINCT ml.merchantid,													   "
@@ -707,7 +707,7 @@ void Zone::Shutdown(bool quite)
 	}
 	zone->ldon_trap_entry_list.clear();
 
-	Log.Log(EQEmuLogSys::Status, "Zone Shutdown: %s (%i)", zone->GetShortName(), zone->GetZoneID());
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Zone Shutdown: %s (%i)", zone->GetShortName(), zone->GetZoneID());
 	petition_list.ClearPetitions();
 	zone->GotCurTime(false);
 	if (!quite)
@@ -725,12 +725,12 @@ void Zone::Shutdown(bool quite)
 
 void Zone::LoadZoneDoors(const char* zone, int16 version)
 {
-	Log.Log(EQEmuLogSys::Status, "Loading doors for %s ...", zone);
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Loading doors for %s ...", zone);
 
 	uint32 maxid;
 	int32 count = database.GetDoorsCount(&maxid, zone, version);
 	if(count < 1) {
-		Log.Log(EQEmuLogSys::Status, "... No doors loaded.");
+		Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "... No doors loaded.");
 		return;
 	}
 
@@ -899,53 +899,53 @@ Zone::~Zone() {
 bool Zone::Init(bool iStaticZone) {
 	SetStaticZone(iStaticZone);
 
-	Log.Log(EQEmuLogSys::Status, "Loading spawn conditions...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Loading spawn conditions...");
 	if(!spawn_conditions.LoadSpawnConditions(short_name, instanceid)) {
 		Log.Log(EQEmuLogSys::Error, "Loading spawn conditions failed, continuing without them.");
 	}
 
-	Log.Log(EQEmuLogSys::Status, "Loading static zone points...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Loading static zone points...");
 	if (!database.LoadStaticZonePoints(&zone_point_list, short_name, GetInstanceVersion())) {
 		Log.Log(EQEmuLogSys::Error, "Loading static zone points failed.");
 		return false;
 	}
 
-	Log.Log(EQEmuLogSys::Status, "Loading spawn groups...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Loading spawn groups...");
 	if (!database.LoadSpawnGroups(short_name, GetInstanceVersion(), &spawn_group_list)) {
 		Log.Log(EQEmuLogSys::Error, "Loading spawn groups failed.");
 		return false;
 	}
 
-	Log.Log(EQEmuLogSys::Status, "Loading spawn2 points...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Loading spawn2 points...");
 	if (!database.PopulateZoneSpawnList(zoneid, spawn2_list, GetInstanceVersion()))
 	{
 		Log.Log(EQEmuLogSys::Error, "Loading spawn2 points failed.");
 		return false;
 	}
 
-	Log.Log(EQEmuLogSys::Status, "Loading player corpses...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Loading player corpses...");
 	if (!database.LoadCharacterCorpses(zoneid, instanceid)) {
 		Log.Log(EQEmuLogSys::Error, "Loading player corpses failed.");
 		return false;
 	}
 
-	Log.Log(EQEmuLogSys::Status, "Loading traps...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Loading traps...");
 	if (!database.LoadTraps(short_name, GetInstanceVersion()))
 	{
 		Log.Log(EQEmuLogSys::Error, "Loading traps failed.");
 		return false;
 	}
 
-	Log.Log(EQEmuLogSys::Status, "Loading adventure flavor text...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Loading adventure flavor text...");
 	LoadAdventureFlavor();
 
-	Log.Log(EQEmuLogSys::Status, "Loading ground spawns...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Loading ground spawns...");
 	if (!LoadGroundSpawns())
 	{
 		Log.Log(EQEmuLogSys::Error, "Loading ground spawns failed. continuing.");
 	}
 
-	Log.Log(EQEmuLogSys::Status, "Loading World Objects from DB...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Loading World Objects from DB...");
 	if (!LoadZoneObjects())
 	{
 		Log.Log(EQEmuLogSys::Error, "Loading World Objects failed. continuing.");
@@ -1005,10 +1005,10 @@ bool Zone::Init(bool iStaticZone) {
 		}
 	}
 
-	Log.Log(EQEmuLogSys::Status, "Loading timezone data...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Loading timezone data...");
 	zone->zone_time.setEQTimeZone(database.GetZoneTZ(zoneid, GetInstanceVersion()));
 
-	Log.Log(EQEmuLogSys::Status, "Init Finished: ZoneID = %d, Time Offset = %d", zoneid, zone->zone_time.getEQTimeZone());
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Init Finished: ZoneID = %d, Time Offset = %d", zoneid, zone->zone_time.getEQTimeZone());
 
 	LoadTickItems();
 
@@ -1019,29 +1019,29 @@ bool Zone::Init(bool iStaticZone) {
 }
 
 void Zone::ReloadStaticData() {
-	Log.Log(EQEmuLogSys::Status, "Reloading Zone Static Data...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Reloading Zone Static Data...");
 
-	Log.Log(EQEmuLogSys::Status, "Reloading static zone points...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Reloading static zone points...");
 	zone_point_list.Clear();
 	if (!database.LoadStaticZonePoints(&zone_point_list, GetShortName(), GetInstanceVersion())) {
 		Log.Log(EQEmuLogSys::Error, "Loading static zone points failed.");
 	}
 
-	Log.Log(EQEmuLogSys::Status, "Reloading traps...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Reloading traps...");
 	entity_list.RemoveAllTraps();
 	if (!database.LoadTraps(GetShortName(), GetInstanceVersion()))
 	{
 		Log.Log(EQEmuLogSys::Error, "Reloading traps failed.");
 	}
 
-	Log.Log(EQEmuLogSys::Status, "Reloading ground spawns...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Reloading ground spawns...");
 	if (!LoadGroundSpawns())
 	{
 		Log.Log(EQEmuLogSys::Error, "Reloading ground spawns failed. continuing.");
 	}
 
 	entity_list.RemoveAllObjects();
-	Log.Log(EQEmuLogSys::Status, "Reloading World Objects from DB...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Reloading World Objects from DB...");
 	if (!LoadZoneObjects())
 	{
 		Log.Log(EQEmuLogSys::Error, "Reloading World Objects failed. continuing.");
@@ -1060,7 +1060,7 @@ void Zone::ReloadStaticData() {
 	if (!LoadZoneCFG(zone->GetShortName(), zone->GetInstanceVersion(), true)) // try loading the zone name...
 		LoadZoneCFG(zone->GetFileName(), zone->GetInstanceVersion()); // if that fails, try the file name, then load defaults
 
-	Log.Log(EQEmuLogSys::Status, "Zone Static Data Reloaded.");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Zone Static Data Reloaded.");
 }
 
 bool Zone::LoadZoneCFG(const char* filename, uint16 instance_id, bool DontLoadDefault)
@@ -1098,7 +1098,7 @@ bool Zone::LoadZoneCFG(const char* filename, uint16 instance_id, bool DontLoadDe
 	strcpy(newzone_data.zone_long_name, GetLongName());
 	strcpy(newzone_data.zone_short_name2, GetShortName());
 
-	Log.Log(EQEmuLogSys::Status, "Successfully loaded Zone Config.");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Successfully loaded Zone Config.");
 	return true;
 }
 
@@ -1580,8 +1580,8 @@ ZonePoint* Zone::GetClosestZonePoint(float x, float y, float z, uint32 to, Clien
 	{
 		if(client)
 			client->CheatDetected(MQZoneUnknownDest, x, y, z); // Someone is trying to use /zone
-		Log.Log(EQEmuLogSys::Status, "WARNING: Closest zone point for zone id %d is %f, you might need to update your zone_points table if you dont arrive at the right spot.", to, closest_dist);
-		Log.Log(EQEmuLogSys::Status, "<Real Zone Points>. %f x %f y %f z ", x, y, z);
+		Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "WARNING: Closest zone point for zone id %d is %f, you might need to update your zone_points table if you dont arrive at the right spot.", to, closest_dist);
+		Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "<Real Zone Points>. %f x %f y %f z ", x, y, z);
 	}
 
 	if(closest_dist > max_distance2)
diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp
index 8a8c82e59..69bae78dc 100644
--- a/zone/zonedb.cpp
+++ b/zone/zonedb.cpp
@@ -2696,7 +2696,7 @@ int32 ZoneDatabase::GetBlockedSpellsCount(uint32 zoneid)
 
 bool ZoneDatabase::LoadBlockedSpells(int32 blockedSpellsCount, ZoneSpellsBlocked* into, uint32 zoneid)
 {
-	Log.Log(EQEmuLogSys::Status, "Loading Blocked Spells from database...");
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Loading Blocked Spells from database...");
 
 	std::string query = StringFormat("SELECT id, spellid, type, x, y, z, x_diff, y_diff, z_diff, message "
                                     "FROM blocked_spells WHERE zoneid = %d ORDER BY id ASC", zoneid);
diff --git a/zone/zoning.cpp b/zone/zoning.cpp
index c883dc78d..ec99be644 100644
--- a/zone/zoning.cpp
+++ b/zone/zoning.cpp
@@ -347,7 +347,7 @@ void Client::DoZoneSuccess(ZoneChange_Struct *zc, uint16 zone_id, uint32 instanc
 	if(this->GetPet())
 		entity_list.RemoveFromHateLists(this->GetPet());
 
-	Log.Log(EQEmuLogSys::Status, "Zoning '%s' to: %s (%i) - (%i) x=%f, y=%f, z=%f", m_pp.name, database.GetZoneName(zone_id), zone_id, instance_id, dest_x, dest_y, dest_z);
+	Log.DebugCategory(EQEmuLogSys::General, EQEmuLogSys::Status, "Zoning '%s' to: %s (%i) - (%i) x=%f, y=%f, z=%f", m_pp.name, database.GetZoneName(zone_id), zone_id, instance_id, dest_x, dest_y, dest_z);
 
 	//set the player's coordinates in the new zone so they have them
 	//when they zone into it