From 799269c79e9f9ddded8bdece301e5b86590df50f Mon Sep 17 00:00:00 2001
From: jadebenn <jadebenn@users.noreply.github.com>
Date: Wed, 20 Dec 2023 15:12:01 -0600
Subject: [PATCH 01/13] fix: Using 'leave-zone' in Return to the Venture
 Explorer allows players to return to the original Venture Explorer map
 (#1341)

* fixed VE zone bug and added config option to renable it

* add zero back to LWOMAPID initialization

* typo

* removed config option to enable bug
---
 dGame/dUtilities/SlashCommandHandler.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dGame/dUtilities/SlashCommandHandler.cpp b/dGame/dUtilities/SlashCommandHandler.cpp
index 7c18e9a4..39f4a115 100644
--- a/dGame/dUtilities/SlashCommandHandler.cpp
+++ b/dGame/dUtilities/SlashCommandHandler.cpp
@@ -288,11 +288,13 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 		return;
 	}
 
-	if (chatCommand == "leave-zone") {
+	if (chatCommand == "leave-zone" || chatCommand == "leavezone") {
 		const auto currentZone = Game::zoneManager->GetZone()->GetZoneID().GetMapID();
-
 		LWOMAPID newZone = 0;
-		if (currentZone % 100 == 0) {
+
+		if (currentZone == 1001) {
+			newZone = 1100; // Send to AG if we're in a Return to Venture Explorer instance
+		} else if (currentZone % 100 == 0) {
 			ChatPackets::SendSystemMessage(sysAddr, u"You are not in an instanced zone.");
 			return;
 		} else {

From 42ffd00478b86ea94159c4a914d1810ba0a6f2b1 Mon Sep 17 00:00:00 2001
From: Aaron Kimbrell <aronwk.aaron@gmail.com>
Date: Wed, 20 Dec 2023 22:25:21 -0600
Subject: [PATCH 02/13] feat: implement handling vendorStatusRequest (#1346)

this fixes the crafting menu on johny umami not being there on the initial internaction
---
 dGame/dGameMessages/GameMessageHandler.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/dGame/dGameMessages/GameMessageHandler.cpp b/dGame/dGameMessages/GameMessageHandler.cpp
index 55151242..83b8a666 100644
--- a/dGame/dGameMessages/GameMessageHandler.cpp
+++ b/dGame/dGameMessages/GameMessageHandler.cpp
@@ -690,6 +690,9 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream* inStream, const System
 	case eGameMessageType::CANCEL_DONATION_ON_PLAYER:
 		GameMessages::HandleCancelDonationOnPlayer(inStream, entity);
 		break;
+	case eGameMessageType::REQUEST_VENDOR_STATUS_UPDATE:
+		GameMessages::SendVendorStatusUpdate(entity, sysAddr, true);
+		break;
 	default:
 		LOG_DEBUG("Unknown game message ID: %i", messageID);
 		break;

From c07c909a5724b9e6a3869159e303c3961e68c5c1 Mon Sep 17 00:00:00 2001
From: jadebenn <jadebenn@users.noreply.github.com>
Date: Thu, 21 Dec 2023 22:12:52 -0600
Subject: [PATCH 03/13] fix: Character access after deletion (#1348)

* assorted skill debug plus crash fix

* removed uncleaned debug
---
 dGame/Player.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dGame/Player.cpp b/dGame/Player.cpp
index f2917729..abbbf059 100644
--- a/dGame/Player.cpp
+++ b/dGame/Player.cpp
@@ -60,6 +60,8 @@ void Player::SetSystemAddress(const SystemAddress& value) {
 }
 
 void Player::SetRespawnPos(const NiPoint3 position) {
+	if (!m_Character) return;
+
 	m_respawnPos = position;
 
 	m_Character->SetRespawnPoint(Game::zoneManager->GetZone()->GetWorldID(), position);

From c1e8546d48542896d4cbf6534f730dd9634828b5 Mon Sep 17 00:00:00 2001
From: David Markowitz <39972741+EmosewaMC@users.noreply.github.com>
Date: Fri, 22 Dec 2023 23:53:21 -0800
Subject: [PATCH 04/13] fix: add Nexus Tower missing scripts (#1349)

add final missing scripts for nt

also fix the turnin for the breadcrumb missions not showing the completion window.

Fix another missing script

Add another script

fix include guards

Fix dirt clouds not appearing on mission accept
---
 CMakeLists.txt                                |  1 +
 dGame/EntityManager.cpp                       |  4 --
 dGame/dComponents/MissionComponent.cpp        |  9 ++++
 dGame/dComponents/MissionComponent.h          |  1 +
 dGame/dComponents/MissionOfferComponent.cpp   |  9 ++--
 dGame/dComponents/MissionOfferComponent.h     |  4 +-
 dGame/dGameMessages/GameMessages.cpp          | 13 ++++++
 dGame/dGameMessages/GameMessages.h            |  1 +
 dGame/dUtilities/SlashCommandHandler.cpp      | 11 +++++
 dNet/AuthPackets.cpp                          |  2 +-
 dScripts/02_server/Map/General/CMakeLists.txt |  3 ++
 .../Map/General/FrictionVolumeServer.cpp      | 19 ++++++++
 .../Map/General/FrictionVolumeServer.h        | 13 ++++++
 .../Map/General/NTNaomiDirtServer.cpp         | 14 ++++++
 .../02_server/Map/General/NTNaomiDirtServer.h | 11 +++++
 .../Map/General/VisToggleNotifierServer.cpp   | 23 ++++++++++
 .../Map/General/VisToggleNotifierServer.h     | 15 +++++++
 dScripts/02_server/Map/NT/CMakeLists.txt      |  3 ++
 .../Map/NT/NTPipeVisibilityServer.cpp         | 15 +++++++
 .../02_server/Map/NT/NTPipeVisibilityServer.h | 11 +++++
 .../02_server/Map/NT/NtBcSubmitServer.cpp     | 34 +++++++++++++++
 dScripts/02_server/Map/NT/NtBcSubmitServer.h  | 11 +++++
 dScripts/02_server/Map/NT/NtDukeServer.cpp    |  1 +
 dScripts/02_server/Map/NT/NtDukeServer.h      |  3 +-
 dScripts/02_server/Map/NT/NtHaelServer.h      |  3 +-
 .../Map/NT/NtNaomiBreadcrumbServer.cpp        | 43 +++++++++++++++++++
 .../Map/NT/NtNaomiBreadcrumbServer.h          | 11 +++++
 dScripts/02_server/Map/NT/NtOverbuildServer.h |  3 +-
 dScripts/02_server/Map/NT/NtVandaServer.cpp   |  1 +
 dScripts/02_server/Map/NT/NtVandaServer.h     |  3 +-
 dScripts/CppScripts.cpp                       | 21 ++++++++-
 dScripts/NtFactionSpyServer.h                 |  2 +-
 dScripts/ai/MINIGAME/CMakeLists.txt           |  6 +++
 dScripts/ai/MINIGAME/Objects/CMakeLists.txt   |  4 ++
 .../ai/MINIGAME/Objects/MinigameBlueMark.cpp  |  7 +++
 .../ai/MINIGAME/Objects/MinigameBlueMark.h    |  6 +++
 dZoneManager/Spawner.cpp                      |  9 ++++
 dZoneManager/Spawner.h                        |  1 +
 38 files changed, 334 insertions(+), 17 deletions(-)
 create mode 100644 dScripts/02_server/Map/General/FrictionVolumeServer.cpp
 create mode 100644 dScripts/02_server/Map/General/FrictionVolumeServer.h
 create mode 100644 dScripts/02_server/Map/General/NTNaomiDirtServer.cpp
 create mode 100644 dScripts/02_server/Map/General/NTNaomiDirtServer.h
 create mode 100644 dScripts/02_server/Map/General/VisToggleNotifierServer.cpp
 create mode 100644 dScripts/02_server/Map/General/VisToggleNotifierServer.h
 create mode 100644 dScripts/02_server/Map/NT/NTPipeVisibilityServer.cpp
 create mode 100644 dScripts/02_server/Map/NT/NTPipeVisibilityServer.h
 create mode 100644 dScripts/02_server/Map/NT/NtBcSubmitServer.cpp
 create mode 100644 dScripts/02_server/Map/NT/NtBcSubmitServer.h
 create mode 100644 dScripts/02_server/Map/NT/NtNaomiBreadcrumbServer.cpp
 create mode 100644 dScripts/02_server/Map/NT/NtNaomiBreadcrumbServer.h
 create mode 100644 dScripts/ai/MINIGAME/Objects/CMakeLists.txt
 create mode 100644 dScripts/ai/MINIGAME/Objects/MinigameBlueMark.cpp
 create mode 100644 dScripts/ai/MINIGAME/Objects/MinigameBlueMark.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 635f5f44..84b5468e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -269,6 +269,7 @@ set(INCLUDED_DIRECTORIES
 	"dScripts/ai/GENERAL"
 	"dScripts/ai/GF"
 	"dScripts/ai/MINIGAME"
+	"dScripts/ai/MINIGAME/Objects"
 	"dScripts/ai/NP"
 	"dScripts/ai/NS"
 	"dScripts/ai/PETS"
diff --git a/dGame/EntityManager.cpp b/dGame/EntityManager.cpp
index 86737dd4..cfbd71d9 100644
--- a/dGame/EntityManager.cpp
+++ b/dGame/EntityManager.cpp
@@ -47,10 +47,6 @@ std::vector<LWOMAPID> EntityManager::m_GhostingExcludedZones = {
 
 // Configure some exceptions for ghosting, nessesary for some special objects.
 std::vector<LOT> EntityManager::m_GhostingExcludedLOTs = {
-	// NT - Pipes
-	9524,
-	12408,
-
 	// AG - Footrace
 	4967
 };
diff --git a/dGame/dComponents/MissionComponent.cpp b/dGame/dComponents/MissionComponent.cpp
index 277882bf..33869030 100644
--- a/dGame/dComponents/MissionComponent.cpp
+++ b/dGame/dComponents/MissionComponent.cpp
@@ -621,3 +621,12 @@ bool MissionComponent::HasCollectible(int32_t collectibleID) {
 bool MissionComponent::HasMission(uint32_t missionId) {
 	return GetMission(missionId) != nullptr;
 }
+
+void MissionComponent::ResetMission(const int32_t missionId) {
+	auto* mission = GetMission(missionId);
+
+	if (!mission) return;
+
+	m_Missions.erase(missionId);
+	GameMessages::SendResetMissions(m_Parent, m_Parent->GetSystemAddress(), missionId);
+}
diff --git a/dGame/dComponents/MissionComponent.h b/dGame/dComponents/MissionComponent.h
index 37d5cd84..d53db64e 100644
--- a/dGame/dComponents/MissionComponent.h
+++ b/dGame/dComponents/MissionComponent.h
@@ -170,6 +170,7 @@ public:
 	 */
 	bool HasMission(uint32_t missionId);
 
+	void ResetMission(const int32_t missionId);
 private:
 	/**
 	 * All the missions owned by this entity, mapped by mission ID
diff --git a/dGame/dComponents/MissionOfferComponent.cpp b/dGame/dComponents/MissionOfferComponent.cpp
index 9299ebd7..60095c4a 100644
--- a/dGame/dComponents/MissionOfferComponent.cpp
+++ b/dGame/dComponents/MissionOfferComponent.cpp
@@ -29,11 +29,11 @@ uint32_t OfferedMission::GetMissionId() const {
 	return this->missionId;
 }
 
-bool OfferedMission::GetOfferMission() const {
+bool OfferedMission::GetOffersMission() const {
 	return this->offersMission;
 }
 
-bool OfferedMission::GetAcceptMission() const {
+bool OfferedMission::GetAcceptsMission() const {
 	return this->acceptsMission;
 }
 
@@ -203,7 +203,10 @@ void MissionOfferComponent::OfferMissions(Entity* entity, const uint32_t specifi
 			const auto selected = canAcceptPool[GeneralUtils::GenerateRandomNumber<int>(0, canAcceptPool.size() - 1)];
 
 			GameMessages::SendOfferMission(entity->GetObjectID(), entity->GetSystemAddress(), selected, m_Parent->GetObjectID());
-		} else if (std::find(offered.begin(), offered.end(), missionId) == offered.end() && offeredMission->GetOfferMission()) {
+		} else if (
+			std::find(offered.begin(), offered.end(), missionId) == offered.end()
+			&&
+			(offeredMission->GetOffersMission() || offeredMission->GetAcceptsMission())) {
 			GameMessages::SendOfferMission(entity->GetObjectID(), entity->GetSystemAddress(), missionId, m_Parent->GetObjectID());
 		}
 	}
diff --git a/dGame/dComponents/MissionOfferComponent.h b/dGame/dComponents/MissionOfferComponent.h
index ad5f83bc..52dcdadb 100644
--- a/dGame/dComponents/MissionOfferComponent.h
+++ b/dGame/dComponents/MissionOfferComponent.h
@@ -30,13 +30,13 @@ struct OfferedMission {
 	 * Returns if this mission is offered by the entity
 	 * @return true if this mission is offered by the entity, false otherwise
 	 */
-	bool GetOfferMission() const;
+	bool GetOffersMission() const;
 
 	/**
 	 * Returns if this mission may be accepted by the entity (currently unused)
 	 * @return true if this mission may be accepted by the entity, false otherwise
 	 */
-	bool GetAcceptMission() const;
+	bool GetAcceptsMission() const;
 
 private:
 
diff --git a/dGame/dGameMessages/GameMessages.cpp b/dGame/dGameMessages/GameMessages.cpp
index 51860d44..9d903b3b 100644
--- a/dGame/dGameMessages/GameMessages.cpp
+++ b/dGame/dGameMessages/GameMessages.cpp
@@ -345,6 +345,19 @@ void GameMessages::SendStartPathing(Entity* entity) {
 	SEND_PACKET_BROADCAST;
 }
 
+void GameMessages::SendResetMissions(Entity* entity, const SystemAddress& sysAddr, const int32_t missionid) {
+	CBITSTREAM;
+	CMSGHEADER;
+
+	bitStream.Write(entity->GetObjectID());
+	bitStream.Write(eGameMessageType::RESET_MISSIONS);
+
+	bitStream.Write(missionid != -1);
+	if (missionid != -1) bitStream.Write(missionid);
+
+	SEND_PACKET;
+}
+
 void GameMessages::SendPlatformResync(Entity* entity, const SystemAddress& sysAddr, bool bStopAtDesiredWaypoint,
 	int iIndex, int iDesiredWaypointIndex, int nextIndex,
 	eMovementPlatformState movementState) {
diff --git a/dGame/dGameMessages/GameMessages.h b/dGame/dGameMessages/GameMessages.h
index 5199a72a..8d0a961c 100644
--- a/dGame/dGameMessages/GameMessages.h
+++ b/dGame/dGameMessages/GameMessages.h
@@ -74,6 +74,7 @@ namespace GameMessages {
 		int iIndex = 0, int iDesiredWaypointIndex = 1, int nextIndex = 1,
 		eMovementPlatformState movementState = eMovementPlatformState::Moving);
 
+	void SendResetMissions(Entity* entity, const SystemAddress& sysAddr, const int32_t missionid = -1);
 	void SendRestoreToPostLoadStats(Entity* entity, const SystemAddress& sysAddr);
 	void SendServerDoneLoadingAllObjects(Entity* entity, const SystemAddress& sysAddr);
 	void SendGMLevelBroadcast(const LWOOBJID& objectID, eGameMasterLevel level);
diff --git a/dGame/dUtilities/SlashCommandHandler.cpp b/dGame/dUtilities/SlashCommandHandler.cpp
index 39f4a115..a37b6124 100644
--- a/dGame/dUtilities/SlashCommandHandler.cpp
+++ b/dGame/dUtilities/SlashCommandHandler.cpp
@@ -349,6 +349,17 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 			});
 	}
 
+	if (chatCommand == "resetmission") {
+		uint32_t missionId;
+		if (!GeneralUtils::TryParse(args[0], missionId)) {
+			ChatPackets::SendSystemMessage(sysAddr, u"Invalid mission ID.");
+			return;
+		}
+		auto* missionComponent = entity->GetComponent<MissionComponent>();
+		if (!missionComponent) return;
+		missionComponent->ResetMission(missionId);
+	}
+
 	if (user->GetMaxGMLevel() == eGameMasterLevel::CIVILIAN || entity->GetGMLevel() >= eGameMasterLevel::CIVILIAN) {
 		if (chatCommand == "die") {
 			entity->Smash(entity->GetObjectID());
diff --git a/dNet/AuthPackets.cpp b/dNet/AuthPackets.cpp
index 6ee38028..4e84eeca 100644
--- a/dNet/AuthPackets.cpp
+++ b/dNet/AuthPackets.cpp
@@ -223,7 +223,7 @@ void AuthPackets::SendLoginResponse(dServer* server, const SystemAddress& sysAdd
 	server->Send(&packet, sysAddr, false);
 
 	//Inform the master server that we've created a session for this user:
-	{
+	if (responseCode == eLoginResponse::SUCCESS) {
 		CBITSTREAM;
 		BitStreamUtils::WriteHeader(bitStream, eConnectionType::MASTER, eMasterMessageType::SET_SESSION_KEY);
 		bitStream.Write(sessionKey);
diff --git a/dScripts/02_server/Map/General/CMakeLists.txt b/dScripts/02_server/Map/General/CMakeLists.txt
index 1fe3d785..797b53ed 100644
--- a/dScripts/02_server/Map/General/CMakeLists.txt
+++ b/dScripts/02_server/Map/General/CMakeLists.txt
@@ -3,6 +3,7 @@ set(DSCRIPTS_SOURCES_02_SERVER_MAP_GENERAL
 	"BaseInteractDropLootServer.cpp"
 	"Binoculars.cpp"
 	"ExplodingAsset.cpp"
+	"FrictionVolumeServer.cpp"
 	"ForceVolumeServer.cpp"
 	"GrowingFlower.cpp"
 	"ImaginationBackpackHealServer.cpp"
@@ -17,6 +18,8 @@ set(DSCRIPTS_SOURCES_02_SERVER_MAP_GENERAL
 	"StoryBoxInteractServer.cpp"
 	"TokenConsoleServer.cpp"
 	"TouchMissionUpdateServer.cpp"
+	"VisToggleNotifierServer.cpp"
+	"NTNaomiDirtServer.cpp"
 	"WishingWellServer.cpp")
 
 add_subdirectory(Ninjago)
diff --git a/dScripts/02_server/Map/General/FrictionVolumeServer.cpp b/dScripts/02_server/Map/General/FrictionVolumeServer.cpp
new file mode 100644
index 00000000..541ccdf7
--- /dev/null
+++ b/dScripts/02_server/Map/General/FrictionVolumeServer.cpp
@@ -0,0 +1,19 @@
+#include "FrictionVolumeServer.h"
+#include "PhantomPhysicsComponent.h"
+#include "ePhysicsEffectType.h"
+#include "Game.h"
+#include "EntityManager.h"
+
+void FrictionVolumeServer::OnStartup(Entity* self) {
+	auto frictionAmount = self->GetVar<float>(u"FrictionAmt");
+	if (frictionAmount == 0.0f) frictionAmount = DefaultFrictionAmount;
+
+	auto* phantomPhysicsComponent = self->GetComponent<PhantomPhysicsComponent>();
+	if (!phantomPhysicsComponent) return;
+
+	phantomPhysicsComponent->SetEffectType(ePhysicsEffectType::FRICTION);
+	phantomPhysicsComponent->SetDirectionalMultiplier(frictionAmount);
+	phantomPhysicsComponent->SetPhysicsEffectActive(true);
+
+	Game::entityManager->SerializeEntity(self);
+}
diff --git a/dScripts/02_server/Map/General/FrictionVolumeServer.h b/dScripts/02_server/Map/General/FrictionVolumeServer.h
new file mode 100644
index 00000000..9824daef
--- /dev/null
+++ b/dScripts/02_server/Map/General/FrictionVolumeServer.h
@@ -0,0 +1,13 @@
+#ifndef __FRICTIONVOLUMESERVER__H__
+#define __FRICTIONVOLUMESERVER__H__
+
+#include "CppScripts.h"
+
+class FrictionVolumeServer : public CppScripts::Script {
+public:
+	void OnStartup(Entity* self) override;
+private:
+	const float DefaultFrictionAmount = 1.5f;
+};
+
+#endif  //!__FRICTIONVOLUMESERVER__H__
diff --git a/dScripts/02_server/Map/General/NTNaomiDirtServer.cpp b/dScripts/02_server/Map/General/NTNaomiDirtServer.cpp
new file mode 100644
index 00000000..cf00326a
--- /dev/null
+++ b/dScripts/02_server/Map/General/NTNaomiDirtServer.cpp
@@ -0,0 +1,14 @@
+#include "NTNaomiDirtServer.h"
+
+namespace {
+	std::map<int32_t, std::string> VisibilityMissionTable = {
+		{1253, std::string("Dirt_Clouds_Sent")},
+		{1276, std::string("Dirt_Clouds_Assem")},
+		{1277, std::string("Dirt_Clouds_Para")},
+		{1283, std::string("Dirt_Clouds_Halls")}
+	};
+};
+
+void NTNaomiDirtServer::OnStartup(Entity* self) {
+	SetGameVariables(VisibilityMissionTable);
+}
diff --git a/dScripts/02_server/Map/General/NTNaomiDirtServer.h b/dScripts/02_server/Map/General/NTNaomiDirtServer.h
new file mode 100644
index 00000000..ed03df47
--- /dev/null
+++ b/dScripts/02_server/Map/General/NTNaomiDirtServer.h
@@ -0,0 +1,11 @@
+#ifndef __NTNAOMIDIRTSERVER__H__
+#define __NTNAOMIDIRTSERVER__H__
+
+#include "VisToggleNotifierServer.h"
+
+class NTNaomiDirtServer : public VisToggleNotifierServer {
+public:
+	void OnStartup(Entity* self) override;
+};
+
+#endif  //!__NTNAOMIDIRTSERVER__H__
diff --git a/dScripts/02_server/Map/General/VisToggleNotifierServer.cpp b/dScripts/02_server/Map/General/VisToggleNotifierServer.cpp
new file mode 100644
index 00000000..a02856ef
--- /dev/null
+++ b/dScripts/02_server/Map/General/VisToggleNotifierServer.cpp
@@ -0,0 +1,23 @@
+#include "VisToggleNotifierServer.h"
+#include "eMissionState.h"
+#include "Game.h"
+#include "dZoneManager.h"
+
+void VisToggleNotifierServer::OnMissionDialogueOK(Entity* self, Entity* target, int missionId, eMissionState missionState) {
+	auto itr = m_GameVariables.find(missionId);
+	if (itr != m_GameVariables.end()) {
+		bool visible = true;
+		if (missionState == eMissionState::READY_TO_COMPLETE || missionState == eMissionState::COMPLETE_READY_TO_COMPLETE) {
+			visible = false;
+		}
+
+		auto spawners = Game::zoneManager->GetSpawnersByName(itr->second);
+		if (spawners.empty()) return;
+		for (const auto spawner : spawners) {
+			auto spawnedObjIds = spawner->GetSpawnedObjectIDs();
+			for (const auto& objId : spawnedObjIds) {
+				GameMessages::SendNotifyClientObject(objId, u"SetVisibility", visible);
+			}
+		}
+	}
+}
diff --git a/dScripts/02_server/Map/General/VisToggleNotifierServer.h b/dScripts/02_server/Map/General/VisToggleNotifierServer.h
new file mode 100644
index 00000000..c19b65df
--- /dev/null
+++ b/dScripts/02_server/Map/General/VisToggleNotifierServer.h
@@ -0,0 +1,15 @@
+#ifndef __VISTOGGLENOTIFIERSERVER__H__
+#define __VISTOGGLENOTIFIERSERVER__H__
+
+#include "CppScripts.h"
+
+class VisToggleNotifierServer : public CppScripts::Script {
+public:
+	void OnMissionDialogueOK(Entity* self, Entity* target, int missionID, eMissionState missionState) override;
+protected:
+	void SetGameVariables(std::map<int32_t, std::string>& gameVariables) { m_GameVariables = gameVariables; }
+private:
+	std::map<int32_t, std::string> m_GameVariables;
+};
+
+#endif  //!__VISTOGGLENOTIFIERSERVER__H__
diff --git a/dScripts/02_server/Map/NT/CMakeLists.txt b/dScripts/02_server/Map/NT/CMakeLists.txt
index ede9b003..533a70c9 100644
--- a/dScripts/02_server/Map/NT/CMakeLists.txt
+++ b/dScripts/02_server/Map/NT/CMakeLists.txt
@@ -18,9 +18,12 @@ set(DSCRIPTS_SOURCES_02_SERVER_MAP_NT
 	"NtXRayServer.cpp"
 	"NtSleepingGuard.cpp"
 	"NtImagimeterVisibility.cpp"
+	"NTPipeVisibilityServer.cpp"
 	"NtSentinelWalkwayServer.cpp"
 	"NtDarkitectRevealServer.cpp"
 	"NtParadoxTeleServer.cpp"
 	"NtVentureSpeedPadServer.cpp"
 	"NtVentureCannonServer.cpp"
+	"NtBcSubmitServer.cpp"
+	"NtNaomiBreadcrumbServer.cpp"
 	PARENT_SCOPE)
diff --git a/dScripts/02_server/Map/NT/NTPipeVisibilityServer.cpp b/dScripts/02_server/Map/NT/NTPipeVisibilityServer.cpp
new file mode 100644
index 00000000..d8d7d1d9
--- /dev/null
+++ b/dScripts/02_server/Map/NT/NTPipeVisibilityServer.cpp
@@ -0,0 +1,15 @@
+#include "NTPipeVisibilityServer.h"
+#include "Entity.h"
+#include "Character.h"
+
+void NTPipeVisibilityServer::OnRebuildComplete(Entity* self, Entity* target) {
+	const auto flag = self->GetVar<int32_t>(u"flag");
+	if (flag == 0) return;
+
+	auto* character = target->GetCharacter();
+	if (!character) return;
+
+	character->SetPlayerFlag(flag, true);
+
+	GameMessages::SendNotifyClientObject(self->GetObjectID(), u"PipeBuilt");
+}
diff --git a/dScripts/02_server/Map/NT/NTPipeVisibilityServer.h b/dScripts/02_server/Map/NT/NTPipeVisibilityServer.h
new file mode 100644
index 00000000..2694af8b
--- /dev/null
+++ b/dScripts/02_server/Map/NT/NTPipeVisibilityServer.h
@@ -0,0 +1,11 @@
+#ifndef __NTPIPEVISIBILITYSERVER__H__
+#define __NTPIPEVISIBILITYSERVER__H__
+
+#include "CppScripts.h"
+
+class NTPipeVisibilityServer : public CppScripts::Script {
+public:
+	void OnRebuildComplete(Entity* self, Entity* target) override;
+};
+
+#endif  //!__NTPIPEVISIBILITYSERVER__H__
diff --git a/dScripts/02_server/Map/NT/NtBcSubmitServer.cpp b/dScripts/02_server/Map/NT/NtBcSubmitServer.cpp
new file mode 100644
index 00000000..9dc3e022
--- /dev/null
+++ b/dScripts/02_server/Map/NT/NtBcSubmitServer.cpp
@@ -0,0 +1,34 @@
+#include "NtBcSubmitServer.h"
+
+#include <cstdint>
+#include <map>
+
+#include "Entity.h"
+#include "MissionComponent.h"
+
+// https://explorer.lu/missions/
+// Key is the main mission, value is the breadcrumb mission to reset upon Mission Dialogue Ok.
+// To see the actual missions, just append the number to the end of the URL.
+namespace {
+	std::map<uint32_t, uint32_t> ResetMissionsTable = {
+		{999,  1335},
+		{1002, 1355},
+		{1006, 1349},
+		{1009, 1348},
+		{1379, 1335},
+		{1380, 1355},
+		{1378, 1349},
+		{1377, 1348},
+	};
+}
+
+void NtBcSubmitServer::OnMissionDialogueOK(Entity* self, Entity* target, int missionID, eMissionState missionState) {
+	auto* missionComponent = target->GetComponent<MissionComponent>();
+	if (!missionComponent) return;
+
+	auto it = ResetMissionsTable.find(missionID);
+	if (it == ResetMissionsTable.end()) return;
+
+	const auto missionToReset = it->second;
+	missionComponent->ResetMission(missionToReset);
+}
diff --git a/dScripts/02_server/Map/NT/NtBcSubmitServer.h b/dScripts/02_server/Map/NT/NtBcSubmitServer.h
new file mode 100644
index 00000000..46efa935
--- /dev/null
+++ b/dScripts/02_server/Map/NT/NtBcSubmitServer.h
@@ -0,0 +1,11 @@
+#ifndef __NTBCSUBMITSERVER__H__
+#define __NTBCSUBMITSERVER__H__
+
+#include "CppScripts.h"
+
+class NtBcSubmitServer : public virtual CppScripts::Script {
+public:
+	void OnMissionDialogueOK(Entity* self, Entity* target, int missionID, eMissionState missionState) override;
+};
+
+#endif  //!__NTBCSUBMITSERVER__H__
diff --git a/dScripts/02_server/Map/NT/NtDukeServer.cpp b/dScripts/02_server/Map/NT/NtDukeServer.cpp
index 07d17e96..4ab19445 100644
--- a/dScripts/02_server/Map/NT/NtDukeServer.cpp
+++ b/dScripts/02_server/Map/NT/NtDukeServer.cpp
@@ -37,4 +37,5 @@ void NtDukeServer::OnMissionDialogueOK(Entity* self, Entity* target, int mission
 			inventoryComponent->RemoveItem(m_SwordLot, lotCount);
 		}
 	}
+	NtBcSubmitServer::OnMissionDialogueOK(self, target, missionID, missionState);
 }
diff --git a/dScripts/02_server/Map/NT/NtDukeServer.h b/dScripts/02_server/Map/NT/NtDukeServer.h
index 2103ba8d..c116dfef 100644
--- a/dScripts/02_server/Map/NT/NtDukeServer.h
+++ b/dScripts/02_server/Map/NT/NtDukeServer.h
@@ -1,7 +1,8 @@
 #pragma once
 #include "NtFactionSpyServer.h"
+#include "NtBcSubmitServer.h"
 
-class NtDukeServer : public NtFactionSpyServer {
+class NtDukeServer : public NtFactionSpyServer, public NtBcSubmitServer {
 	void SetVariables(Entity* self) override;
 	void OnMissionDialogueOK(Entity* self, Entity* target, int missionID, eMissionState missionState) override;
 	const uint32_t m_SwordMissionID = 1448;
diff --git a/dScripts/02_server/Map/NT/NtHaelServer.h b/dScripts/02_server/Map/NT/NtHaelServer.h
index 4597198f..13660ab4 100644
--- a/dScripts/02_server/Map/NT/NtHaelServer.h
+++ b/dScripts/02_server/Map/NT/NtHaelServer.h
@@ -1,6 +1,7 @@
 #pragma once
 #include "NtFactionSpyServer.h"
+#include "NtBcSubmitServer.h"
 
-class NtHaelServer : public NtFactionSpyServer {
+class NtHaelServer : public NtFactionSpyServer, public NtBcSubmitServer {
 	void SetVariables(Entity* self) override;
 };
diff --git a/dScripts/02_server/Map/NT/NtNaomiBreadcrumbServer.cpp b/dScripts/02_server/Map/NT/NtNaomiBreadcrumbServer.cpp
new file mode 100644
index 00000000..20edc4da
--- /dev/null
+++ b/dScripts/02_server/Map/NT/NtNaomiBreadcrumbServer.cpp
@@ -0,0 +1,43 @@
+#include "NtNaomiBreadcrumbServer.h"
+#include <map>
+
+#include "eMissionState.h"
+#include "MissionComponent.h"
+
+// https://explorer.lu/missions/
+// Key is the main mission, value is the breadcrumb mission to reset upon Mission Dialogue Ok.
+// To see the actual missions, just append the number to the end of the URL.
+namespace {
+	std::map<int32_t, std::vector<int32_t>> CompleteBcMissionTable = {
+		{1377, {1378, 1379, 1380, 1349, 1335, 1355}},
+		{1378, {1377, 1379, 1380, 1348, 1335, 1355}},
+		{1379, {1377, 1378, 1380, 1348, 1349, 1355}},
+		{1380, {1377, 1378, 1379, 1348, 1349, 1335}},
+	};
+
+	std::map<int32_t, int32_t> MatchingBCTable = {
+		{1377, 1348},
+		{1378, 1349},
+		{1379, 1335},
+		{1380, 1355}
+	};
+}
+
+void NtNaomiBreadcrumbServer::OnMissionDialogueOK(Entity* self, Entity* target, int missionID, eMissionState missionState) {
+	auto* missionComponent = target->GetComponent<MissionComponent>();
+	if (!missionComponent) return;
+
+	auto itr = MatchingBCTable.find(missionID);
+	if (itr == MatchingBCTable.end()) return;
+
+	missionComponent->AcceptMission(itr->second);
+
+	auto it = CompleteBcMissionTable.find(missionID);
+	if (it == CompleteBcMissionTable.end()) return;
+
+	if (missionState == eMissionState::AVAILABLE || missionState == eMissionState::COMPLETE_AVAILABLE) {
+		for (const auto& bcMission : it->second) {
+			missionComponent->ResetMission(bcMission);
+		}
+	}
+}
diff --git a/dScripts/02_server/Map/NT/NtNaomiBreadcrumbServer.h b/dScripts/02_server/Map/NT/NtNaomiBreadcrumbServer.h
new file mode 100644
index 00000000..6a82cac7
--- /dev/null
+++ b/dScripts/02_server/Map/NT/NtNaomiBreadcrumbServer.h
@@ -0,0 +1,11 @@
+#ifndef __NTNAOMIBREADCRUMBSERVER__H__
+#define __NTNAOMIBREADCRUMBSERVER__H__
+
+#include "CppScripts.h"
+
+class NtNaomiBreadcrumbServer : public CppScripts::Script {
+public:
+	void OnMissionDialogueOK(Entity* self, Entity* target, int missionID, eMissionState missionState) override;
+};
+
+#endif  //!__NTNAOMIBREADCRUMBSERVER__H__
diff --git a/dScripts/02_server/Map/NT/NtOverbuildServer.h b/dScripts/02_server/Map/NT/NtOverbuildServer.h
index a34d117e..6d5ce8b0 100644
--- a/dScripts/02_server/Map/NT/NtOverbuildServer.h
+++ b/dScripts/02_server/Map/NT/NtOverbuildServer.h
@@ -1,7 +1,8 @@
 #pragma once
 #include "NtFactionSpyServer.h"
+#include "NtBcSubmitServer.h"
 
-class NtOverbuildServer : public NtFactionSpyServer {
+class NtOverbuildServer : public NtFactionSpyServer, public NtBcSubmitServer {
 	void SetVariables(Entity* self) override;
 	const std::u16string m_OtherEntitiesGroupVariable = u"SpyConvo2Group";
 };
diff --git a/dScripts/02_server/Map/NT/NtVandaServer.cpp b/dScripts/02_server/Map/NT/NtVandaServer.cpp
index 7750d566..45096387 100644
--- a/dScripts/02_server/Map/NT/NtVandaServer.cpp
+++ b/dScripts/02_server/Map/NT/NtVandaServer.cpp
@@ -11,4 +11,5 @@ void NtVandaServer::OnMissionDialogueOK(Entity* self, Entity* target, int missio
 			inventoryComponent->RemoveItem(alienPartLot, 1);
 		}
 	}
+	NtBcSubmitServer::OnMissionDialogueOK(self, target, missionID, missionState);
 }
diff --git a/dScripts/02_server/Map/NT/NtVandaServer.h b/dScripts/02_server/Map/NT/NtVandaServer.h
index 58162cd9..98842e3b 100644
--- a/dScripts/02_server/Map/NT/NtVandaServer.h
+++ b/dScripts/02_server/Map/NT/NtVandaServer.h
@@ -1,7 +1,8 @@
 #pragma once
 #include "CppScripts.h"
+#include "NtBcSubmitServer.h"
 
-class NtVandaServer : public CppScripts::Script {
+class NtVandaServer : public NtBcSubmitServer {
 	void OnMissionDialogueOK(Entity* self, Entity* target, int missionID, eMissionState missionState) override;
 	const uint32_t m_AlienPartMissionID = 1183;
 	const std::vector<LOT> m_AlienPartLots = { 12479, 12480, 12481 };
diff --git a/dScripts/CppScripts.cpp b/dScripts/CppScripts.cpp
index 24fe7b5b..071bd7a3 100644
--- a/dScripts/CppScripts.cpp
+++ b/dScripts/CppScripts.cpp
@@ -209,6 +209,11 @@
 #include "NtXRayServer.h"
 #include "NtSleepingGuard.h"
 #include "NtImagimeterVisibility.h"
+#include "FrictionVolumeServer.h"
+#include "NTPipeVisibilityServer.h"
+#include "NTNaomiDirtServer.h"
+#include "MinigameBlueMark.h"
+#include "NtNaomiBreadcrumbServer.h"
 
 // DLU Scripts
 #include "DLUVanityNPC.h"
@@ -311,6 +316,7 @@
 #include "WildNinjaStudent.h"
 #include "WildNinjaSensei.h"
 #include "WildNinjaBricks.h"
+#include "VisToggleNotifierServer.h"
 
 namespace {
 	InvalidScript* invalidToReturn = new InvalidScript();
@@ -694,19 +700,30 @@ CppScripts::Script* CppScripts::GetScript(Entity* parent, const std::string& scr
 		script = new NtDukeServer();
 	else if (scriptName == "scripts\\02_server\\Map\\NT\\L_NT_HAEL_SERVER.lua")
 		script = new NtHaelServer();
+	else if (scriptName == "scripts\\02_server\\Map\\NT\\L_NT_FACTION_SPY_SERVER.lua")
+		script = new NtFactionSpyServer();
 	else if (scriptName == "scripts\\02_server\\Map\\NT\\L_NT_OVERBUILD_SERVER.lua")
 		script = new NtOverbuildServer();
 	else if (scriptName == "scripts\\02_server\\Map\\NT\\L_NT_VANDA_SERVER.lua")
 		script = new NtVandaServer();
 	else if (scriptName == "scripts\\02_server\\Map\\General\\L_FORCE_VOLUME_SERVER.lua")
 		script = new ForceVolumeServer();
+	else if (scriptName == "scripts\\02_server\\Map\\General\\L_FRICTION_VOLUME_SERVER.lua")
+		script = new FrictionVolumeServer();
 	else if (scriptName == "scripts\\02_server\\Map\\NT\\L_NT_XRAY_SERVER.lua")
 		script = new NtXRayServer();
 	else if (scriptName == "scripts\\02_server\\Map\\NT\\L_NT_SLEEPING_GUARD.lua")
 		script = new NtSleepingGuard();
-	else if (scriptName == "scripts\\02_server\\Map\\NT\\L_NT_IMAGIMETER_VISIBILITY_SERVER.lua") {
+	else if (scriptName == "scripts\\02_server\\Map\\NT\\L_NT_IMAGIMETER_VISIBILITY_SERVER.lua")
 		script = new NTImagimeterVisibility();
-	}
+	else if (scriptName == "scripts\\02_server\\Map\\NT\\L_NT_PIPE_VISIBILITY_SERVER.lua")
+		script = new NTPipeVisibilityServer();
+	else if (scriptName == "scripts\\ai\\MINIGAME\\Objects\\MINIGAME_BLUE_MARK.lua")
+		script = new MinigameBlueMark();
+	else if (scriptName == "scripts\\02_server\\Map\\NT\\L_NT_NAOMI_BREADCRUMB_SERVER.lua")
+		script = new NtNaomiBreadcrumbServer();
+	else if (scriptName == "scripts\\02_server\\Map\\NT\\L_NT_NAOMI_DIRT_SERVER.lua")
+		script = new NTNaomiDirtServer();
 
 	//AM:
 	else if (scriptName == "scripts\\02_server\\Map\\AM\\L_AM_CONSOLE_TELEPORT_SERVER.lua")
diff --git a/dScripts/NtFactionSpyServer.h b/dScripts/NtFactionSpyServer.h
index 4406859c..3a1918d0 100644
--- a/dScripts/NtFactionSpyServer.h
+++ b/dScripts/NtFactionSpyServer.h
@@ -12,7 +12,7 @@ struct SpyData {
 	uint32_t missionID;
 };
 
-class NtFactionSpyServer : public CppScripts::Script {
+class NtFactionSpyServer : public virtual CppScripts::Script {
 	void OnStartup(Entity* self) override;
 	void OnProximityUpdate(Entity* self, Entity* entering, std::string name, std::string status) override;
 	void OnCinematicUpdate(Entity* self, Entity* sender, eCinematicEvent event, const std::u16string& pathName, float_t pathTime, float_t totalTime, int32_t waypoint) override;
diff --git a/dScripts/ai/MINIGAME/CMakeLists.txt b/dScripts/ai/MINIGAME/CMakeLists.txt
index d4517519..f0187057 100644
--- a/dScripts/ai/MINIGAME/CMakeLists.txt
+++ b/dScripts/ai/MINIGAME/CMakeLists.txt
@@ -6,4 +6,10 @@ foreach(file ${DSCRIPTS_SOURCES_AI_MINIGAME_SG_GF})
 	set(DSCRIPTS_SOURCES_AI_MINIGAME ${DSCRIPTS_SOURCES_AI_MINIGAME} "SG_GF/${file}")
 endforeach()
 
+add_subdirectory(Objects)
+
+foreach(file ${DSCRIPTS_SOURCES_AI_MINIGAME_OBJECTS})
+	set(DSCRIPTS_SOURCES_AI_MINIGAME ${DSCRIPTS_SOURCES_AI_MINIGAME} "Objects/${file}")
+endforeach()
+
 set(DSCRIPTS_SOURCES_AI_MINIGAME ${DSCRIPTS_SOURCES_AI_MINIGAME} PARENT_SCOPE)
diff --git a/dScripts/ai/MINIGAME/Objects/CMakeLists.txt b/dScripts/ai/MINIGAME/Objects/CMakeLists.txt
new file mode 100644
index 00000000..54fada5d
--- /dev/null
+++ b/dScripts/ai/MINIGAME/Objects/CMakeLists.txt
@@ -0,0 +1,4 @@
+SET(DSCRIPTS_SOURCES_AI_MINIGAME_OBJECTS
+	"MinigameBlueMark.cpp"
+	PARENT_SCOPE
+)
diff --git a/dScripts/ai/MINIGAME/Objects/MinigameBlueMark.cpp b/dScripts/ai/MINIGAME/Objects/MinigameBlueMark.cpp
new file mode 100644
index 00000000..a5e09e4e
--- /dev/null
+++ b/dScripts/ai/MINIGAME/Objects/MinigameBlueMark.cpp
@@ -0,0 +1,7 @@
+#include "MinigameBlueMark.h"
+#include "Game.h"
+#include "dZoneManager.h"
+
+void MinigameBlueMark::OnStartup(Entity* self) {
+	Game::zoneManager->GetZoneControlObject()->NotifyObject(self, "Blue_Mark");
+}
diff --git a/dScripts/ai/MINIGAME/Objects/MinigameBlueMark.h b/dScripts/ai/MINIGAME/Objects/MinigameBlueMark.h
new file mode 100644
index 00000000..0d644916
--- /dev/null
+++ b/dScripts/ai/MINIGAME/Objects/MinigameBlueMark.h
@@ -0,0 +1,6 @@
+#include "CppScripts.h"
+
+class MinigameBlueMark : public CppScripts::Script {
+public:
+	void OnStartup(Entity* self) override;
+};
diff --git a/dZoneManager/Spawner.cpp b/dZoneManager/Spawner.cpp
index 8cf7b809..b602c17c 100644
--- a/dZoneManager/Spawner.cpp
+++ b/dZoneManager/Spawner.cpp
@@ -205,6 +205,15 @@ void Spawner::Update(const float deltaTime) {
 	}
 }
 
+std::vector<LWOOBJID> Spawner::GetSpawnedObjectIDs() const {
+	std::vector<LWOOBJID> ids;
+	ids.reserve(m_Entities.size());
+	for (const auto& [objId, spawnerNode] : m_Entities) {
+		ids.push_back(objId);
+	}
+	return ids;
+}
+
 void Spawner::NotifyOfEntityDeath(const LWOOBJID& objectID) {
 	for (std::function<void()> cb : m_SpawnedEntityDieCallbacks) {
 		cb();
diff --git a/dZoneManager/Spawner.h b/dZoneManager/Spawner.h
index 1f610b71..79ba40d1 100644
--- a/dZoneManager/Spawner.h
+++ b/dZoneManager/Spawner.h
@@ -66,6 +66,7 @@ public:
 	void SetRespawnTime(float time);
 	void SetNumToMaintain(int32_t value);
 	bool GetIsSpawnSmashGroup() const { return m_SpawnSmashFoundGroup; };
+	std::vector<LWOOBJID> GetSpawnedObjectIDs() const;
 
 	SpawnerInfo m_Info;
 	bool m_Active = true;

From fcf4d6c6faed079e700df4045f091799e84ddc1d Mon Sep 17 00:00:00 2001
From: jadebenn <jadebenn@users.noreply.github.com>
Date: Sat, 23 Dec 2023 10:51:59 -0600
Subject: [PATCH 05/13] feat: Improve console output to show packet enum names
 (magic_enum) (#1344)

* add enum stringification functionality from third party source

* squashed commit

* Macros: Add test and improve speed

Space macros out
utilize cache locality
ensure no lost functionality

* moved stringify code to dCommon

* Rename #defines in stringify enum tests

* Revert "moved stringify code to dCommon"

This reverts commit 33fa5f8d2fc273ede9fffbc15a62d9a5335ffe6a.

* improve macro functionality

change function handle

formatting and function definition tweaks

* typo fixes

* moved code to dCommon/dEnums and tests to dCommonTests/dEnumsTests

* initial magic_enums alternate implementation of enum stringification

* deleted unused tests

* reverted compile flag oopsy and fixed output types

* fixed testing suite

* test formatting improvement

* formatting again :(

* added gm string to "aborting gm!" message

* Push my suggestion for CI tests.

* updated magic enum test

* fix test variable type

* added gm test

* making sure magic_enum is on a release branch

* tidying up console outputs

* re-implemented enum array access for performance

* now it is bugged :(

* nvm, working

* helping out the snowflake compilers

* changed return type too

* optimization too

* formatting too I guess because why not

* being even more painfully specific

* Update WorldServer.cpp to match emo's feedback

* Update MagicEnumTests.cpp to use srand(time(NULL))

* Update eGameMessageType.h - formatting

* Trying to fix the crash but can't actually compile the code to check on my own rn

* Update WorldServer.cpp - third try at this

* Update MagicEnumTests.cpp - use better macro definitions

* Update MagicEnumTests.cpp - c string comparison fix

* addressing all but the cmake feedback

* fixed cmake to the best of my very limited ability

* added tests to verify magic enum arrays are pre-sorted

* updated

---------

Co-authored-by: David Markowitz <EmosewaMC@gmail.com>
Co-authored-by: Jettford <mrjettbradford@gmail.com>
---
 .gitmodules                                   |    3 +
 CMakeLists.txt                                |    3 +-
 dCommon/dEnums/StringifiedEnum.h              |   29 +
 dCommon/dEnums/eGameMessageType.h             | 3182 +++++++++--------
 dCommon/dEnums/eWorldMessageType.h            |    8 +
 dGame/dGameMessages/GameMessageHandler.cpp    |   14 +-
 dGame/dGameMessages/GameMessageHandler.h      |    3 +-
 dWorldServer/WorldServer.cpp                  |    5 +-
 tests/dCommonTests/CMakeLists.txt             |    3 +
 tests/dCommonTests/dEnumsTests/CMakeLists.txt |   10 +
 .../dEnumsTests/MagicEnumTests.cpp            |  142 +
 thirdparty/CMakeLists.txt                     |    3 +
 thirdparty/magic_enum                         |    1 +
 13 files changed, 1808 insertions(+), 1598 deletions(-)
 create mode 100644 dCommon/dEnums/StringifiedEnum.h
 create mode 100644 tests/dCommonTests/dEnumsTests/CMakeLists.txt
 create mode 100644 tests/dCommonTests/dEnumsTests/MagicEnumTests.cpp
 create mode 160000 thirdparty/magic_enum

diff --git a/.gitmodules b/.gitmodules
index 33193447..700e7536 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -17,3 +17,6 @@
 [submodule "thirdparty/AccountManager"]
 	path = thirdparty/AccountManager
 	url = https://github.com/DarkflameUniverse/AccountManager
+[submodule "thirdparty/magic_enum"]
+	path = thirdparty/magic_enum
+	url = https://github.com/Neargye/magic_enum.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84b5468e..7e982346 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -293,6 +293,7 @@ set(INCLUDED_DIRECTORIES
 	"dScripts/zone/PROPERTY/GF"
 	"dScripts/zone/PROPERTY/NS"
 
+	"thirdparty/magic_enum/include/magic_enum"
 	"thirdparty/raknet/Source"
 	"thirdparty/tinyxml2"
 	"thirdparty/recastnavigation"
@@ -374,7 +375,7 @@ add_subdirectory(dNavigation)
 add_subdirectory(dPhysics)
 
 # Create a list of common libraries shared between all binaries
-set(COMMON_LIBRARIES "dCommon" "dDatabase" "dNet" "raknet" "mariadbConnCpp")
+set(COMMON_LIBRARIES "dCommon" "dDatabase" "dNet" "raknet" "mariadbConnCpp" "magic_enum")
 
 # Add platform specific common libraries
 if (UNIX)
diff --git a/dCommon/dEnums/StringifiedEnum.h b/dCommon/dEnums/StringifiedEnum.h
new file mode 100644
index 00000000..30cffd22
--- /dev/null
+++ b/dCommon/dEnums/StringifiedEnum.h
@@ -0,0 +1,29 @@
+#ifndef __STRINGIFIEDENUM_H__
+#define __STRINGIFIEDENUM_H__
+
+#include <string>
+#include "magic_enum.hpp"
+
+namespace StringifiedEnum {
+	template<typename T>
+	const std::string_view ToString(const T e) {
+		constexpr auto sv = &magic_enum::enum_entries<T>();
+		std::string_view output;
+
+		const auto it = std::lower_bound(
+			sv->begin(), sv->end(), e,
+			[&](const std::pair<T, std::string_view>& lhs, const T rhs)
+			{ return lhs.first < rhs; }
+		);
+
+		if (it != sv->end() && it->first == e) {
+			output = it->second;
+		}
+		else {
+			output = "UNKNOWN";
+		}
+		return output;
+	}
+}
+
+#endif // !__STRINGIFIEDENUM_H__
diff --git a/dCommon/dEnums/eGameMessageType.h b/dCommon/dEnums/eGameMessageType.h
index df822c52..14673fac 100644
--- a/dCommon/dEnums/eGameMessageType.h
+++ b/dCommon/dEnums/eGameMessageType.h
@@ -3,1603 +3,1611 @@
 
 #include <cstdint>
 
+#include "magic_enum.hpp"
+
 enum class eGameMessageType : uint16_t {
-    GET_POSITION = 0,
-    GET_ROTATION = 1,
-    GET_LINEAR_VELOCITY = 2,
-    GET_ANGULAR_VELOCITY = 3,
-    GET_FORWARD_VELOCITY = 4,
-    GET_PLAYER_FORWARD = 5,
-    GET_FORWARD_VECTOR = 6,
-    SET_POSITION = 7,
-    SET_LOCAL_POSITION = 8,
-    SET_ROTATION = 9,
-    SET_LINEAR_VELOCITY = 10,
-    MODIFY_LINEAR_VELOCITY = 11,
-    SET_ANGULAR_VELOCITY = 12,
-    MODIFY_ANGULAR_VELOCITY = 13,
-    DEFLECT = 14,
-    SEND_POSITION_UPDATE = 15,
-    SET_OBJECT_SCALE = 16,
-    GET_OBJECT_SCALE = 17,
-    TIMED_SCALE_FINISHED = 18,
-    TELEPORT = 19,
-    TOGGLE_PLAYER_FWD_TO_CAMERA = 20,
-    LOCK_PLAYER_ROT_TO_CAMERA = 21,
-    UNLOCK_PLAYER_ROT_FROM_CAMERA = 22,
-    TOGGLE_PLAYER_ROT_LOCK_TO_MOUSE = 23,
-    LOCK_PLAYER_ROT_TO_MOUSE = 24,
-    UNLOCK_PLAYER_ROT_FROM_MOUSE = 25,
-    SET_PLAYER_CONTROL_SCHEME = 26,
-    GET_PLAYER_CONTROL_SCHEME = 27,
-    RESET_PLAYER_CONTROL_SCHEME = 28,
-    PLAYER_TO_PREVIOUS_CONTROL_SCHEME = 29,
-    DROP_CLIENT_LOOT = 30,
-    GET_SPEED = 34,
-    GET_ROT_SPEED = 35,
-    IS_DEAD = 36,
-    DIE = 37,
-    REQUEST_DIE = 38,
-    ADD_OBJECT = 39,
-    PLAY_EMOTE = 41,
-    PRELOAD_ANIMATION = 42,
-    PLAY_ANIMATION = 43,
-    ANIMATION_COMPLETE = 44,
-    ENABLE_HIGHLIGHT = 45,
-    DISABLE_HIGHLIGHT = 46,
-    GET_ANIMATION_NAMES = 47,
-    CONTROL_BEHAVIORS = 48,
-    BLEND_PRIMARY_ANIMATION = 52,
-    SET_OFFSCREEN_ANIMATION = 53,
-    GET_MOVEMENT_INPUT_VALUES = 54,
-    SWAP_TEXTURE = 55,
-    SWAP_COLOR = 56,
-    ATTACH_HAIR = 57,
-    GET_ENTITY_STRUCT = 58,
-    SET_ENTITY_STRUCT = 59,
-    SET_ATTR = 60,
-    GET_ATTR = 61,
-    ON_HIT = 62,
-    HIT_OR_HEAL_RESULT = 63,
-    SHOW_ATTACK = 64,
-    GO_TO = 65,
-    GET_CONFIG_DATA = 66,
-    SET_CONFIG_DATA = 68,
-    GET_INVENTORY_EXTRA_INFO = 69,
-    GET_DISPLAY_NAME = 70,
-    GET_NAME = 71,
-    SET_NAME = 72,
-    IS_NAME_LOCALIZED = 73,
-    GET_HAIR_COLOR = 74,
-    SET_HAIR_COLOR = 75,
-    GET_HAIR_STYLE = 76,
-    SET_HAIR_STYLE = 77,
-    GET_HEAD = 78,
-    SET_HEAD = 79,
-    GET_TORSO = 80,
-    SET_TORSO = 81,
-    GET_LEGS = 82,
-    SET_LEGS = 83,
-    SET_PROXIMITY_RADIUS = 84,
-    PROXIMITY_UPDATE = 85,
-    GET_PROXIMITY_OBJECTS = 86,
-    UNSET_PROXIMITY_RADIUS = 87,
-    CLEAR_PROXIMITY_RADIUS = 88,
-    GET_PROXIMITY_DATA = 89,
-    SET_PROXIMITY_RADIUS_ICON = 90,
-    TOGGLE_TAC_ARC = 93,
-    CAST_SKILL = 95,
-    CAST_LOCAL_SKILL = 96,
-    ECHO_LOCAL_SKILL = 97,
-    QUEUE_AI_SKILL = 98,
-    ADD_THREAT_RATING = 99,
-    GET_THREAT_RATING = 100,
-    CLEAR_THREAT_LIST = 103,
-    GET_TIME_FOR_NPC_SKILL = 111,
-    ENEMY_HEAL_NOTIFICATION = 112,
-    RESET_SCRIPTED_AI_STATE = 113,
-    ENABLE_COMBAT_AI_COMPONENT = 114,
-    COMBAT_AI_FORCE_TETHER = 115,
-    SUSPEND_MOVEMENT_AI = 116,
-    NOTIFY_SCRIPT_VARS_INITIALIZED = 117,
-    ECHO_START_SKILL = 118,
-    START_SKILL = 119,
-    CASTER_DEAD = 120,
-    VERIFY_ACK = 121,
-    ADD_PENDING_VERIFY = 122,
-    MAP_SKILL = 123,
-    SELECT_SKILL = 124,
-    CAST_ACTIVE_SKILL = 125,
-    MODIFY_SKILL_COOLDOWN = 126,
-    ADD_SKILL = 127,
-    REMOVE_SKILL = 128,
-    LOG = 129,
-    LOG_CHAT = 130,
-    SET_MAX_CURRENCY = 131,
-    GET_MAX_CURRENCY = 132,
-    SET_CURRENCY = 133,
-    GET_CURRENCY = 134,
-    ADD_PENDING_CURRENCY = 136,
-    PICKUP_CURRENCY = 137,
-    SERVER_DELETE_LOOT_ITEM = 138,
-    PICKUP_ITEM = 139,
-    TEAM_PICKUP_ITEM = 140,
-    CLIENT_DELETE_LOOT_ITEM = 141,
-    CLIENT_SET_LOOT_ITEM_FFA = 143,
-    COLLISION_PHANTOM = 144,
-    OFF_COLLISION_PHANTOM = 145,
-    COLLISION_PROXIMITY = 146,
-    OFF_COLLISION_PROXIMITY = 147,
-    COLLISION = 148,
-    OFF_COLLISION = 149,
-    GET_SKILLS = 150,
-    CLEAR_FX_SINGLE_EFFECT = 152,
-    GET_FX_EXIST_EFFECT = 153,
-    PLAY_FX_EFFECT = 154,
-    STOP_FX_EFFECT = 155,
-    CLEAR_FX_ALL_CREATE_EFFECTS = 156,
-    UPDATE_FX_ALL_CREATE_EFFECTS = 157,
-    REQUEST_RESURRECT = 159,
-    RESURRECT = 160,
-    UPDATE_FROM_GHOST = 162,
-    FETCH_GHOST = 163,
-    KFM_LOADED = 164,
-    NIF_LOADED = 165,
-    HKX_LOADED = 166,
-    MOVE_TO_DELETE_QUEUE = 167,
-    RESTORE_FROM_DELETE_QUEUE = 168,
-    IS_ENEMY = 169,
-    GET_FACTION = 170,
-    SET_IMAGINATION = 171,
-    GET_IMAGINATION = 172,
-    SET_MAX_IMAGINATION = 173,
-    GET_MAX_IMAGINATION = 174,
-    MODIFY_IMAGINATION = 175,
-    MODIFY_MAX_IMAGINATION = 176,
-    SET_HEALTH = 177,
-    GET_HEALTH = 178,
-    SET_MAX_HEALTH = 179,
-    GET_MAX_HEALTH = 180,
-    MODIFY_HEALTH = 181,
-    MODIFY_MAX_HEALTH = 182,
-    SET_ARMOR = 183,
-    GET_ARMOR = 184,
-    SET_MAX_ARMOR = 185,
-    GET_MAX_ARMOR = 186,
-    MODIFY_ARMOR = 187,
-    MODIFY_MAX_ARMOR = 188,
-    POP_HEALTH_STATE = 190,
-    PUSH_EQUIPPED_ITEMS_STATE = 191,
-    POP_EQUIPPED_ITEMS_STATE = 192,
-    SET_GM_LEVEL = 193,
-    GET_GM_LEVEL = 194,
-    ADD_STATUS_EFFECT = 196,
-    REMOVE_STATUS_EFFECT = 197,
-    SET_STUNNED = 198,
-    GET_STUNNED = 199,
-    SET_STUN_IMMUNITY = 200,
-    GET_STUN_IMMUNITY = 201,
-    KNOCKBACK = 202,
-    SET_VISIBLE = 203,
-    GET_VISIBLE = 204,
-    REPORT_ITEM_INFO = 205,
-    GET_REBUILD_STATE = 207,
-    REBUILD_CANCEL = 209,
-    REBUILD_START = 211,
-    ENABLE_REBUILD = 213,
-    SKILL_FAILURE = 214,
-    IS_ATTACK_STANCE = 216,
-    SET_OBJECT_RENDER = 217,
-    REQUEST_MAPPED_SKILLS = 218,
-    UI_SELECT_MAPPED_SKILL = 219,
-    GET_INVENTORY_ITEM_IN_SLOT = 220,
-    GET_FIRST_INVENTORY_ITEM_BY_LOT = 221,
-    GET_SMALLEST_INVENTORY_STACK_BY_LOT = 222,
-    MOVE_ITEM_IN_INVENTORY = 224,
-    ADD_ITEM_TO_INVENTORY_CLIENT_SYNC = 227,
-    GET_EQUIPPED_ITEMS = 229,
-    REMOVE_ITEM_FROM_INVENTORY = 230,
-    EQUIP_INVENTORY = 231,
-    UN_EQUIP_INVENTORY = 233,
-    EQUIP_ITEM = 234,
-    UN_EQUIP_ITEM = 235,
-    IS_ITEM_RESPOND = 236,
-    IS_ITEM_EQUIPPED = 237,
-    ATTACH_ITEM = 238,
-    DETACH_ITEM = 239,
-    GET_NODE = 240,
-    GET_LOT = 241,
-    IS_ITEM_EQUIPPABLE = 242,
-    GET_CURRENT_ANIMATION = 243,
-    GET_INV_ITEM_COUNT = 244,
-    POST_LOAD_EQUIP = 245,
-    SET_PHYSICS_ACTIVE_STATE = 246,
-    GET_CURRENT_SKILL_TAC_ARC = 247,
-    OFFER_MISSION = 248,
-    RESPOND_TO_MISSION = 249,
-    GET_MISSION_STATE = 250,
-    GET_MISSION_COMPLETE_TIMESTAMP = 251,
-    NOTIFY_MISSION = 254,
-    NOTIFY_MISSION_TASK = 255,
-    ARE_GFX_LOADED = 257,
-    ADDED_TO_WORLD = 258,
-    REMOVE_EXTRA_GFX_FROM_PIPE = 259,
-    HIDE_EQUIPED_WEAPON = 260,
-    UN_HIDE_EQUIPED_WEAPON = 261,
-    GET_ITEM_SLOT = 262,
-    IS_CHARACTER = 263,
-    SET_IMMUNITY = 264,
-    TOGGLE_TOOLTIPS = 266,
-    GET_TOOLTIPS_DISABLED = 267,
-    GET_BOUNDING_INFO = 268,
-    OVERRIDE_BOUNDING_RADIUS = 269,
-    GET_OFFSCREEN = 270,
-    USE_STATE_MACHINE = 271,
-    ADD_STATE = 272,
-    ADD_SUB_STATE = 273,
-    SET_STATE = 274,
-    SET_SUB_STATE = 275,
-    ADD_MESSAGE = 276,
-    RELOAD_SCRIPT = 277,
-    RELOAD_ALL_SCRIPTS = 278,
-    FRIEND_INVITE_MSG = 279,
-    ADD_FRIEND_REPOSNSE_MSG = 280,
-    REMOVE_FRIEND_RESPONSE_MSG = 281,
-    ADD_FRIEND_FROM_UI_MSG = 282,
-    GET_CACHED_FRIENDS_LIST_MSG = 283,
-    REQUEST_NEW_FRIENDS_LIST_MSG = 284,
-    REPOPULATE_FRIENDS_LIST_MSG = 285,
-    ADD_IGNORE_REPONSE_MSG = 286,
-    REMOVE_IGNORE_RESPONSE_MSG = 287,
-    ADD_IGNORE_FROM_UI_MSG = 288,
-    GET_CACHED_IGNORE_LIST_MSG = 289,
-    REQUEST_NEW_IGNORE_LIST_MSG = 290,
-    REMOVE_FRIEND_BY_NAME = 291,
-    REMOVE_IGNORE_BY_NAME = 292,
-    IS_PLAYER_IN_IGNORE_LIST_MSG = 293,
-    REPOPULATE_IGNORE_LIST_MSG = 294,
-    GET_INVENTORY_LIST = 295,
-    UPDATE_FRIEND_MSG = 296,
-    UPDATE_FRIEND_NAME_MSG = 297,
-    UPDATE_IGNORE_NAME_MSG = 298,
-    DEPARTED = 299,
-    ARRIVED = 300,
-    TEMPLATE_CHANGE_WAYPOINTS = 301,
-    CANCELLED = 302,
-    FLUSH_CACHED_GRAPHICS = 303,
-    FOLLOW_TARGET = 304,
-    TIMER_DONE = 305,
-    TIMER_CANCELLED = 306,
-    SET_TETHER_POINT = 307,
-    GET_TETHER_POINT = 308,
-    LEFT_TETHER_RADIUS = 309,
-    GET_SCRIPT_VARS_PTR = 310,
-    FACE_TARGET = 311,
-    ROTATE_BY_DEGREES = 312,
-    STRING_RENDERED = 313,
-    RESET_PRIMARY_ANIMATION = 314,
-    FACE_PLAY_STREAM = 315,
-    TORSO_PLAY_STREAM = 316,
-    CAN_PICKUP = 317,
-    GET_INVENTORY_SIZE = 318,
-    GET_INVENTORY_COUNT = 319,
-    GET_OBJECTS_IN_GROUP = 320,
-    HIDE_ITEM = 321,
-    IS_OBJECT_IN_FOV = 322,
-    GET_TYPE = 323,
-    TEAM_INVITE_MSG = 324,
-    TEAM_GET_SIZE = 325,
-    TEAM_REQUEST_SET_LOOT = 326,
-    TEAM_REMOVE_PLAYER_MSG = 327,
-    TEAM_UPDATE_PLAYER_NAME_MSG = 328,
-    SET_UPDATABLE = 329,
-    REQUEST_TEAM_UI_UPDATE = 330,
-    SET_COLLISION_GROUP = 331,
-    GET_COLLISION_GROUP = 332,
-    GET_ORIGINAL_COLLISION_GROUP = 333,
-    SET_COLLISION_GROUP_TO_ORIGINAL = 334,
-    GET_OBJECT_RADIUS = 335,
-    REBUILD_NOTIFY_STATE = 336,
-    GET_PLAYER_INTERACTION = 337,
-    SET_PLAYER_INTERACTION = 338,
-    FORCE_PLAYER_TO_INTERACT = 339,
-    GET_SELECTED_POTENTIAL_INTERACTION = 340,
-    SET_SELECTED_POTENTIAL_INTERACTION = 341,
-    GET_INTERACTION_DISTANCE = 342,
-    SET_INTERACTION_DISTANCE = 343,
-    CALCULATE_INTERACTION_DISTANCE = 344,
-    INTERACTION_ATTEMPT_FROM_OUT_OF_RANGE = 345,
-    SET_PICKING_TARGET = 346,
-    CLIENT_UNUSE = 347,
-    BEGIN_PET_INTERACTION = 348,
-    WANTS_INTERACTION_ICON = 349,
-    PROPERTY_EDIT_ICON_INTERACTION = 350,
-    PROPERTY_MODEL_INTERACTION = 351,
-    GET_INTERACTION_DETAILS = 352,
-    GET_DISABLED_INTERACTION_TYPES = 353,
-    GET_INTERACTION_INFO = 354,
-    INTERACTION_GAME_STATE_CHANGE = 355,
-    TOGGLE_INTERACTION_UPDATES = 356,
-    TERMINATE_INTERACTION = 357,
-    SERVER_TERMINATE_INTERACTION = 358,
-    GET_PLAYERS_TARGET_FOR_SELECTION = 359,
-    PROCESS_INTERACTION_UNDER_CURSOR = 360,
-    HANDLE_INTERACT_ACTION = 361,
-    ATTEMPT_INTERACTION = 362,
-    HANDLE_INTERACTION_CAMERA = 363,
-    REQUEST_USE = 364,
-    CLIENT_USE = 366,
-    GET_PLAYER_MULTI_INTERACTION = 367,
-    GET_MULTI_INTERACTION_STATE = 368,
-    VENDOR_OPEN_WINDOW = 369,
-    VENDOR_CLOSE_WINDOW = 370,
-    EMOTE_PLAYED = 371,
-    EMOTE_RECEIVED = 372,
-    BUY_FROM_VENDOR = 373,
-    SELL_TO_VENDOR = 374,
-    ADD_DONATION_ITEM = 375,
-    REMOVE_DONATION_ITEM = 376,
-    CONFIRM_DONATION_ON_PLAYER = 378,
-    CANCEL_DONATION_ON_PLAYER = 379,
-    TEAM_GET_LEADER = 380,
-    TEAM_GET_ON_WORLD_MEMBERS = 381,
-    TEAM_GET_ALL_MEMBERS = 382,
-    TEAM_SET_OFF_WORLD_FLAG = 383,
-    SET_TRANSPARENCY = 385,
-    GET_PREFERS_FADE = 386,
-    PROJECTILE_IMPACT = 387,
-    SET_PROJECTILE_PARAMS = 388,
-    SET_INVENTORY_SIZE = 389,
-    ACKNOWLEDGE_POSSESSION = 391,
-    SET_POSSESSED_OBJECT = 392,
-    CHANGE_POSSESSOR = 393,
-    GET_POSSESSION_TYPE = 395,
-    GET_POSSESSED_OBJECT = 396,
-    GET_POSSESSOR = 397,
-    IS_POSSESSED = 398,
-    ENABLE_ACTIVITY = 399,
-    SET_SHOOTING_GALLERY_PARAMS = 400,
-    OPEN_ACTIVITY_START_DIALOG = 401,
-    REQUEST_ACTIVITY_START_STOP = 402,
-    REQUEST_ACTIVITY_ENTER = 403,
-    REQUEST_ACTIVITY_EXIT = 404,
-    ACTIVITY_ENTER = 405,
-    ACTIVITY_EXIT = 406,
-    ACTIVITY_START = 407,
-    ACTIVITY_STOP = 408,
-    SHOOTING_GALLERY_CLIENT_AIM_UPDATE = 409,
-    ROTATE_TO_POINT = 410,
-    SHOOTING_GALLERY_FIRE = 411,
-    CALCULATE_FIRING_PARAMETERS = 412,
-    GET_MUZZLE_OFFSET = 413,
-    GET_ACTIVITY_POINTS = 414,
-    TEAM_IS_ON_WORLD_MEMBER = 415,
-    REQUEST_VENDOR_STATUS_UPDATE = 416,
-    VENDOR_STATUS_UPDATE = 417,
-    CANCEL_MISSION = 418,
-    RESET_MISSIONS = 419,
-    RENDER_COMPONENT_READY = 420,
-    SEND_MINIFIG_DECALS = 421,
-    PHYSICS_COMPONENT_READY = 422,
-    ENTER_STANDBY_MODE = 423,
-    LEAVE_STANDBY_MODE = 424,
-    NOTIFY_CLIENT_SHOOTING_GALLERY_SCORE = 425,
-    REQUEST_CONSUME_ITEM = 426,
-    CONSUME_CLIENT_ITEM = 427,
-    CLIENT_ITEM_CONSUMED = 428,
-    QUERY_STANDBY_MODE = 429,
-    GET_NI_BOUND = 430,
-    MISSION_FAILURE = 431,
-    GET_ANIMATION_TIME = 432,
-    GET_CURRENT_ACTIVITY = 434,
-    SET_EYEBROWS = 435,
-    GET_EYEBROWS = 436,
-    SET_EYES = 437,
-    GET_EYES = 438,
-    SET_MOUTH = 439,
-    GET_MOUTH = 440,
-    IS_OBJECT_SMASHABLE = 441,
-    SMASHABLE_STATE_CHANGED = 443,
-    USE_STATE_LOGGER = 444,
-    ROTATE_SUB_NODE = 445,
-    GET_SUB_NODE_POSITION = 446,
-    GET_SUB_NODE = 447,
-    UPDATE_SHOOTING_GALLERY_ROTATION = 448,
-    RENDER_FLOATING_TEXT = 449,
-    REQUEST2_D_TEXT_ELEMENT = 450,
-    UPDATE2_D_TEXT_ELEMENT = 451,
-    REMOVE2_D_TEXT_ELEMENT = 452,
-    SET_COLOR = 453,
-    GET_COLOR = 454,
-    HKX_CHARACTER_LOADED = 455,
-    ACTIVATE_PHYSICS = 457,
-    SET_ICON_ABOVE_HEAD = 458,
-    ADD_ICON_COMPOSITE = 459,
-    CLEAR_ICON_COMPOSITES = 460,
-    ICON_NIF_LOADED = 461,
-    ICON_KFM_LOADED = 462,
-    GET_OVERHEAD_ICON_PROPERTIES_FROM_PARENT = 463,
-    BOUNCE_PLAYER = 464,
-    SET_USER_CTRL_COMP_PAUSE = 466,
-    HAS_COLLIDED = 467,
-    GET_TOOLTIP_FLAG = 468,
-    SET_TOOLTIP_FLAG = 469,
-    GET_FLAG = 470,
-    SET_FLAG = 471,
-    NOTIFY_CLIENT_FLAG_CHANGE = 472,
-    CURSOR_ON = 473,
-    CURSOR_OFF = 474,
-    HELP = 475,
-    VENDOR_TRANSACTION_RESULT = 476,
-    PERFORM_SPECIAL_DEATH = 477,
-    GET_SHADER_ID = 478,
-    GET_RENDER_ENVIRONMENT = 479,
-    FINISHED_LOADING_SCENE = 480,
-    GET_SKILL_INFO = 481,
-    ACTIVITY_CANCEL = 482,
-    MISSION_USES_OBJECT = 483,
-    GET_POSITIONAL_ID = 484,
-    SET_COLLECTIBLE_STATUS = 485,
-    HAS_BEEN_COLLECTED = 486,
-    HAS_BEEN_COLLECTED_BY_CLIENT = 487,
-    GET_POS_UPDATE_STATS = 488,
-    GET_NUM_VIEWERS_SCOPING_THIS = 489,
-    GET_ACTIVITY_USER = 490,
-    GET_ALL_ACTIVITY_USERS = 491,
-    GET_MISSION_FOR_PLAYER = 492,
-    SET_FACTION = 493,
-    SET_PLATFORM_IDLE_STATE = 494,
-    DISPLAY_CHAT_BUBBLE = 495,
-    REQUEST_CHAT_BUBBLE_ELEMENT = 496,
-    GET_MISSION_DATA = 497,
-    SPAWN_PET = 498,
-    DESPAWN_PET = 499,
-    SET_LOCAL_SPACE_STATE = 500,
-    GET_LOCAL_SPACE_STATE = 501,
-    SET_POSITION_TO_LOCAL_POSITION = 502,
-    ALLOW_LOCAL_SPACE_UPDATE = 503,
-    TOGGLE_FREE_CAM_MODE = 504,
-    PLAYER_LOADED = 505,
-    PLAYER_ADDED_TO_WORLD_LOCAL = 506,
-    OBJECT_LOADED = 507,
-    GET_PLAYER_READY = 508,
-    PLAYER_READY = 509,
-    SET_SMASHABLE_PARAMS = 510,
-    IS_LOOTABLE_CHEST = 511,
-    LOOT_OPEN_WINDOW = 512,
-    LOOT_SELECTION_UPDATE = 513,
-    TAKE_LOOT_CHEST_ITEM = 514,
-    REQUEST_LINKED_MISSION = 515,
-    TRANSFER_TO_ZONE = 516,
-    TRANSFER_TO_ZONE_CHECKED_IM = 517,
-    SECURED_TRANSFER_TO_ZONE = 518,
-    INVALID_ZONE_TRANSFER_LIST = 519,
-    MISSION_DIALOGUE_OK = 520,
-    GET_OBJECT_IN_SCOPE = 521,
-    SET_LAUNCHED_STATE = 522,
-    P_CREATE_EFFECT_FINISHED = 523,
-    SMASHED_OBJECT = 524,
-    CHECK_SMASHCHAIN_OVERRIDE = 525,
-    DISPLAY_REBUILD_ACTIVATOR = 526,
-    TRANSFER_TO_LAST_NON_INSTANCE = 527,
-    SET_ACTIVE_LOCAL_CHARACTER_ID = 528,
-    DISPLAY_MESSAGE_BOX = 529,
-    MESSAGE_BOX_RESPOND = 530,
-    CHOICE_BOX_RESPOND = 531,
-    SERVER_SET_USER_CTRL_COMP_PAUSE = 532,
-    SET_CHARACTER_AUTO_RUN = 533,
-    FOLLOW_WAYPOINTS = 534,
-    SWAP_DECAL_AND_COLOR = 535,
-    CONTINUE_WAYPOINTS = 536,
-    SMASH = 537,
-    UN_SMASH = 538,
-    GET_IS_SMASHED = 539,
-    GET_UP_VECTOR = 540,
-    SET_GRAVITY_SCALE = 541,
-    SET_GRAVITY_SCALE_FOR_RIGID_BODY = 542,
-    STOP_MOVING = 543,
-    SET_PATHING_SPEED = 544,
-    SET_SHIELDED = 545,
-    SET_SHOOTING_GALLERY_RETICULE_EFFECT = 546,
-    PLACE_MODEL_RESPONSE = 547,
-    SET_DODGE_INFO = 548,
-    GET_DODGE_INFO = 549,
-    SET_SKILL_ATTACK_SPEED = 550,
-    GET_SKILL_COOLDOWN_GROUP = 551,
-    GET_INITIAL_SKILL_COOLDOWN = 552,
-    GET_SKILL_COOLDOWN_REMAINING = 553,
-    GET_GLOBAL_COOLDOWN = 554,
-    SET_GLOBAL_COOLDOWN = 555,
-    RESET_GLOBAL_COOLDOWN = 556,
-    FINDINVENTORY_ITEM = 558,
-    PATH_STUCK = 559,
-    SET_CURRENT_PATH = 560,
-    SET_JET_PACK_MODE = 561,
-    SET_JET_PACK_TIME = 562,
-    PET_FOLLOW_OWNER = 563,
-    PLAYER_DIED = 564,
-    REGISTER_PET_ID = 565,
-    REGISTER_PET_DBID = 566,
-    GET_PET_ID = 567,
-    SHOW_ACTIVITY_COUNTDOWN = 568,
-    DISPLAY_TOOLTIP = 569,
-    SET_PHANTOM_BASE = 570,
-    GET_MOTION_STATE = 571,
-    GET_MOTION_CONFIG = 572,
-    SET_ACTIVE_PROJECTILE_SKILL = 573,
-    INITIALIZE_MISSION_VISUALS = 574,
-    GET_MISSIONS = 575,
-    START_ACTIVITY_TIME = 576,
-    ADD_ACTIVITY_TIME = 577,
-    GUILD_GET_SIZE = 578,
-    GUILD_CAN_WE_INVITE = 579,
-    GUILD_CAN_WE_KICK = 580,
-    SET_CHAR_GUILD_INFO = 581,
-    GET_CHAR_GUILD_INFO = 582,
-    GET_CHAR_IS_IN_GUILD = 583,
-    RE_RENDER_NAME_BILLBOARD = 584,
-    IS_IN_LOCAL_CHAR_PROXIMITY = 585,
-    GUILD_SET_STATUS = 586,
-    GUILD_ADD_PLAYER = 587,
-    GUILD_REMOVE_PLAYER = 588,
-    GUILD_UPDATE_PLAYER_NAME = 589,
-    GUILD_SET_PLAYER_RANK = 590,
-    GUILD_SET_ONLINE_STATUS = 591,
-    GUILD_INVITE = 592,
-    REQUEST_GUILD_DATA = 593,
-    POPULATE_GUILD_DATA = 594,
-    GET_CACHED_GUILD_DATA = 595,
-    GUILD_RENDER_NAME = 596,
-    GET_IS_SUPPORTED = 600,
-    CHARACTER_SUPPORT_CHANGED = 601,
-    ACTIVITY_PAUSE = 602,
-    USE_NON_EQUIPMENT_ITEM = 603,
-    REQUEST_USE_ITEM_ON = 604,
-    REQUEST_USE_ITEM_ON_TARGET = 605,
-    USE_ITEM_ON = 606,
-    USE_ITEM_RESULT = 607,
-    GET_PARENT_OBJ = 608,
-    SET_PARENT_OBJ = 609,
-    GET_UPDATES_WITH_PARENT_POSITION = 610,
-    PARENT_REMOVED = 611,
-    PARENT_LEFT_SCOPE = 612,
-    PARENT_ENTERED_SCOPE = 613,
-    CHILD_LOADED = 614,
-    CHILD_REMOVED = 615,
-    CHILD_DETACHED = 616,
-    CHILD_ENTERED_SCOPE = 617,
-    CHILD_LEFT_SCOPE = 618,
-    GET_CHILD_OBJECTS = 619,
-    ZONE_TRANSFER_FINISHED = 621,
-    CHAT_CONNECTION_UPDATE = 622,
-    PLATFORM_AT_LAST_WAYPOINT = 623,
-    LOOT_TAKE_ALL = 624,
-    GET_EQUIPPED_ITEM_INFO = 625,
-    DISPLAY_GUILD_CREATE_BOX = 626,
-    GET_EDITOR_LEVEL = 627,
-    GET_ACCOUNT_ID = 628,
-    GET_LAST_LOGOUT = 629,
-    GET_LAST_PROP_MOD_DISPLAY_TIME = 630,
-    SET_LAST_PROP_MOD_DISPLAY_TIME = 631,
-    SHOW_ACTIVITY_SUMMARY = 632,
-    CAN_RECEIVE_ALL_REWARDS = 633,
-    GET_ACTIVITY_REWARD = 634,
-    LOOT_CLOSE_WINDOW = 635,
-    GET_BLUEPRINT_ID = 636,
-    NOTIFY_BLUEPRINT_UPDATE = 637,
-    FETCH_MODEL_METADATA_REQUEST = 638,
-    FETCH_MODEL_METADATA_RESPONSE = 639,
-    COMMAND_PET = 640,
-    PET_RESPONSE = 641,
-    GET_ICON_ABOVE_HEAD_STATE = 642,
-    GET_ICON_ABOVE_HEAD = 643,
-    ICON_FINISHED_LOADING = 644,
-    ADD_PET_STATE = 645,
-    REMOVE_PET_STATE = 646,
-    SET_PET_STATE = 647,
-    REQUEST_ACTIVITY_SUMMARY_LEADERBOARD_DATA = 648,
-    SEND_ACTIVITY_SUMMARY_LEADERBOARD_DATA = 649,
-    SET_ON_TEAM = 650,
-    GET_PET_HAS_STATE = 651,
-    FIND_PROPERTY = 652,
-    SET_PET_MOVEMENT_STATE = 653,
-    GET_ITEM_TYPE = 654,
-    GET_ITEM_INFO_KEY = 655,
-    NOTIFY_OBJECT = 656,
-    IS_PET_WILD = 657,
-    CLIENT_NOTIFY_PET = 659,
-    NOTIFY_PET = 660,
-    NOTIFY_PET_TAMING_MINIGAME = 661,
-    START_SERVER_PET_MINIGAME_TIMER = 662,
-    CLIENT_EXIT_TAMING_MINIGAME = 663,
-    GET_BUILDMODE_ACTIVE = 664,
-    GET_PET_TAMING_MINIGAME_ACTIVE = 665,
-    PET_TAMING_OBJECT_PICKED = 666,
-    PET_TAMING_MINIGAME_RESULT = 667,
-    PET_TAMING_TRY_BUILD_RESULT = 668,
-    SET_PET_TAMING_MODEL = 669,
-    GET_PET_TAMING_MODEL = 670,
-    PET_ON_SWITCH = 671,
-    PET_OFF_SWITCH = 672,
-    NOTIFY_TAMING_BUILD_SUCCESS = 673,
-    NOTIFY_TAMING_MODEL_LOADED_ON_SERVER = 674,
-    NOTIFY_TAMING_PUZZLE_SELECTED = 675,
-    GET_INSTRUCTION_COUNT = 676,
-    GET_IS_NPC = 677,
-    ACTIVATE_BUBBLE_BUFF = 678,
-    DECTIVATE_BUBBLE_BUFF = 679, // thanks netdevil
-    EXHIBIT_VOTE = 680,
-    ADD_PET_TO_PLAYER = 681,
-    REMOVE_PET_FROM_PLAYER = 682,
-    REQUEST_SET_PET_NAME = 683,
-    SET_PET_NAME = 684,
-    PET_NAME_CHANGED = 686,
-    GET_PET_AT_INDEX = 687,
-    GET_LOT_FOR_PET_BY_DBID = 688,
-    GET_NAME_FOR_PET_BY_DBID = 689,
-    GET_ACTIVE_PET_OBJ_ID = 690,
-    GET_ACTIVE_PET_INVENTORY_OBJ_ID = 691,
-    SHOW_PET_ACTION_BUTTON = 692,
-    SET_EMOTE_LOCK_STATE = 693,
-    GET_EMOTE_LOCK_STATE = 694,
-    LEAVE_TEAM_MSG = 695,
-    TEAM_KICK_PLAYER_MSG = 697,
-    TEAM_SET_LEADER_SEND_MSG = 698,
-    USE_ITEM_ON_CLIENT = 699,
-    DOES_FORWARD_TARGET_CLICKING = 700,
-    CHECK_USE_REQUIREMENTS = 701,
-    USE_REQUIREMENTS_RESPONSE = 702,
-    USE_ITEM_REQUIREMENTS_RESPONSE = 703,
-    PET_ADDED_TO_WORLD = 704,
-    BOUNCER_TRIGGERED = 705,
-    EXHIBIT_QUERY_CURRENT_MODEL = 706,
-    EXHIBIT_QUERY_CURRENT_MODEL_RESPONSE = 707,
-    EXHIBIT_ATTEMPT_VOTE = 708,
-    EXHIBIT_VOTE_RESPONSE = 709,
-    EHIBIT_REQUERYMODELS = 710,
-    IS_SKILL_ACTIVE = 711,
-    TOGGLE_ACTIVE_SKILL = 712,
-    PLAY_EMBEDDED_EFFECT_ON_ALL_CLIENTS_NEAR_OBJECT = 713,
-    EXHIBIT_GET_INFO = 714,
-    GET_PROPERTY_DATA = 715,
-    DOWNLOAD_PROPERTY_DATA = 716,
-    QUERY_PROPERTY_DATA = 717,
-    MODEL_MODERATION_ACTION = 719,
-    NOTIFY_SERVER_UGC_REVIEW_READY = 720,
-    NOTIFY_CLIENT_UGC_REVIEW_READY = 721,
-    OLD_USE_ITEM_ON = 722,
-    FIND_PROPERTY_FOR_SALE_RESPONSE = 723,
-    PROPERTY_EDITOR_BEGIN = 724,
-    PROPERTY_EDITOR_END = 725,
-    PROPERTY_EDITOR_SET_MODE = 726,
-    TOGGLE_TRIGGER = 727,
-    FIRE_EVENT = 728,
-    IS_MINIFIG_IN_A_BUBBLE = 729,
-    GET_ITEM_INFO = 730,
-    MISSION_NEEDS_LOT = 731,
-    STOP_PATHING = 732,
-    START_PATHING = 733,
-    ACTIVATE_BUBBLE_BUFF_FROM_SERVER = 734,
-    DEACTIVATE_BUBBLE_BUFF_FROM_SERVER = 735,
-    HAS_SKILL = 736,
-    NOTIFY_CLIENT_ZONE_OBJECT = 737,
-    MOVE_OBJECT = 738,
-    ROTATE_OBJECT = 739,
-    GET_SPAWNER_CONFIG_DATA = 740,
-    UPDATE_SPAWNER_CONFIG_DATA = 741,
-    TURN_AROUND = 743,
-    GO_FORWARD = 744,
-    GO_BACKWARD = 745,
-    UPDATE_REPUTATION = 746,
-    GET_REPUTATION = 747,
-    ADD_REPUTATION = 748,
-    UPDATE_PROPERTY_DATA = 749,
-    PROPERTY_RENTAL_RESPONSE = 750,
-    EXHIBIT_PLACEMENT_RESPONSE = 751,
-    SQUIRT_WITH_WATERGUN = 752,
-    GET_VOTES_LEFT = 753,
-    ADJUST_VOTES_LEFT = 754,
-    EVADE_TARGET = 755,
-    STOPPED_EVADING = 756,
-    GET_PET_HAS_ABILITY = 757,
-    REQUEST_PLATFORM_RESYNC = 760,
-    PLATFORM_RESYNC = 761,
-    PLAY_CINEMATIC = 762,
-    END_CINEMATIC = 763,
-    CINEMATIC_UPDATE = 764,
-    ATTACH_CAMERA_TO_RAIL = 765,
-    DETACH_CAMERA_FROM_RAIL = 766,
-    TOGGLE_GHOST_REFERENCE_OVERRIDE = 767,
-    SET_GHOST_REFERENCE_POSITION = 768,
-    GET_GHOST_REFERENCE_POSITION = 769,
-    FIRE_EVENT_SERVER_SIDE = 770,
-    GET_PET_ABILITY_OBJECT = 771,
-    TEAM_INVITE_MSG_FROM_UI = 772,
-    ADD_CAMERA_EFFECT = 773,
-    REMOVE_CAMERA_EFFECT = 774,
-    REMOVE_ALL_CAMERA_EFFECTS = 775,
-    GET_MY_PROPERTIES_IN_THIS_ZONE = 776,
-    IS_MODEL_WITHIN_PROPERTY_BOUNDS = 777,
-    PROPERTY_DATA_RESULTS = 778,
-    ON_UN_SERIALIZE = 779,
-    SCRIPT_NETWORK_VAR_UPDATE = 781,
-    ADD_OBJECT_TO_GROUP = 783,
-    REMOVE_OBJECT_FROM_GROUP = 784,
-    IS_OBJECT_STATIC = 785,
-    GET_HAS_MISSION = 786,
-    GET_MISSION_TARGET_LOT = 787,
-    GET_MISSION_OFFERER_LOT = 788,
-    USE_UNIQUE_ITEM = 789,
-    GET_IS_PET = 790,
-    DELETE_PROPERTY = 791,
-    CREATEMODEL_FROM_CLIENT = 792,
-    UPDATE_MODEL_FROM_CLIENT = 793,
-    DELETE_MODEL_FROM_CLIENT = 794,
-    SHOW_PROPERTY_BOUNDS = 795,
-    SET_PROPERTY_I_DS = 796,
-    PLAY_FACE_DECAL_ANIMATION = 797,
-    ADD_ACTIVITY_USER = 798,
-    REMOVE_ACTIVITY_USER = 799,
-    GET_NUM_ACTIVITY_USERS = 800,
-    ACTIVITY_USER_EXISTS = 801,
-    DO_COMPLETE_ACTIVITY_EVENTS = 805,
-    SET_ACTIVITY_PARAMS = 806,
-    SET_ACTIVITY_USER_DATA = 807,
-    GET_ACTIVITY_USER_DATA = 808,
-    DO_CALCULATE_ACTIVITY_RATING = 809,
-    ND_AUDIO_POST_SETUP = 812,
-    ND_AUDIO_PRE_SHUTDOWN = 813,
-    SET_ND_AUDION_LISTENER_STANCE = 814,
-    SET_UP_ND_AUDIO_EMIITTER = 815,
-    SHUT_DOWN_ND_AUDIO_EMITTER = 816,
-    METAIFY_ND_AUDIO_EMITTER = 817,
-    UN_METAIFY_ND_AUDIO_EMITTER = 818,
-    METAIFY_ND_AUDIO_EMITTERS = 819,
-    UN_METAIFY_ND_AUDIO_EMITTERS = 820,
-    PLAY_ND_AUDIO_EMITTER = 821,
-    STOP_ND_AUDIO_EMITTER = 822,
-    STOP_ND_AUDIO_EMITTER_ALL = 823,
-    SET_ND_AUDIO_EMITTER_PARAMETER = 824,
-    SET_ND_AUDIO_EMITTERS_PARAMETER = 825,
-    ND_AUDIO_CALLBACK = 826,
-    ACTIVATE_ND_AUDIO_MUSIC_CUE = 827,
-    DEACTIVATE_ND_AUDIO_MUSIC_CUE = 828,
-    FLASH_ND_AUDIO_MUSIC_CUE = 829,
-    SET_ND_AUDIO_MUSIC_PARAMETER = 830,
-    PLAY2_D_AMBIENT_SOUND = 831,
-    STOP2_D_AMBIENT_SOUND = 832,
-    PLAY3_D_AMBIENT_SOUND = 834,
-    STOP3_D_AMBIENT_SOUND = 835,
-    ACTIVATE_ND_AUDIO_MIXER_PROGRAM = 836,
-    DEACTIVATE_ND_AUDIO_MIXER_PROGRAM = 837,
-    UPDATE_ACTIVITY_LEADERBOARD = 838,
-    ACTIVITY_LEADERBOARD_UPDATED = 839,
-    ENTER_PROPERTY1 = 840,
-    ENTER_PROPERTY2 = 841,
-    PROPERTY_ENTRANCE_SYNC = 842,
-    SEND_PROPERTY_POPULATION_TO_CLIENT = 843,
-    SEN_PROPERTY_PLAQUE_VIS_UPDATE = 844,
-    PROPERTY_SELECT_QUERY = 845,
-    CREATE_POSITION_STRING = 848,
-    GET_PARALLEL_POSITION = 849,
-    PARSE_CHAT_MESSAGE = 850,
-    SET_MISSION_TYPE_STATE = 851,
-    GET_LOCATIONS_VISITED = 852,
-    GET_MISSION_TYPE_STATES = 853,
-    GET_TIME_PLAYED = 854,
-    SET_MISSION_VIEWED = 855,
-    SLASH_COMMAND_TEXT_FEEDBACK = 856,
-    HANDLE_SLASH_COMMAND_KORE_DEBUGGER = 857,
-    BROADCAST_TEXT_TO_CHATBOX = 858,
-    OPEN_PROPERTY_MANAGEMENT = 860,
-    OPEN_PROPERTY_VENDOR = 861,
-    VOTE_ON_PROPERTY = 862,
-    UPDATE_PROPERTY_OR_MODEL_FOR_FILTER_CHECK = 863,
-    NOTIFY_PLAYER_OF_PROPERTY_SUBMISSION = 865,
-    NOTIFY_PLAYER_OF_MODEL_SUBMISSION = 866,
-    PHYSICS_SYSTEM_LOADED = 867,
-    CLIENT_TRADE_REQUEST = 868,
+	GET_POSITION = 0,
+	GET_ROTATION = 1,
+	GET_LINEAR_VELOCITY = 2,
+	GET_ANGULAR_VELOCITY = 3,
+	GET_FORWARD_VELOCITY = 4,
+	GET_PLAYER_FORWARD = 5,
+	GET_FORWARD_VECTOR = 6,
+	SET_POSITION = 7,
+	SET_LOCAL_POSITION = 8,
+	SET_ROTATION = 9,
+	SET_LINEAR_VELOCITY = 10,
+	MODIFY_LINEAR_VELOCITY = 11,
+	SET_ANGULAR_VELOCITY = 12,
+	MODIFY_ANGULAR_VELOCITY = 13,
+	DEFLECT = 14,
+	SEND_POSITION_UPDATE = 15,
+	SET_OBJECT_SCALE = 16,
+	GET_OBJECT_SCALE = 17,
+	TIMED_SCALE_FINISHED = 18,
+	TELEPORT = 19,
+	TOGGLE_PLAYER_FWD_TO_CAMERA = 20,
+	LOCK_PLAYER_ROT_TO_CAMERA = 21,
+	UNLOCK_PLAYER_ROT_FROM_CAMERA = 22,
+	TOGGLE_PLAYER_ROT_LOCK_TO_MOUSE = 23,
+	LOCK_PLAYER_ROT_TO_MOUSE = 24,
+	UNLOCK_PLAYER_ROT_FROM_MOUSE = 25,
+	SET_PLAYER_CONTROL_SCHEME = 26,
+	GET_PLAYER_CONTROL_SCHEME = 27,
+	RESET_PLAYER_CONTROL_SCHEME = 28,
+	PLAYER_TO_PREVIOUS_CONTROL_SCHEME = 29,
+	DROP_CLIENT_LOOT = 30,
+	GET_SPEED = 34,
+	GET_ROT_SPEED = 35,
+	IS_DEAD = 36,
+	DIE = 37,
+	REQUEST_DIE = 38,
+	ADD_OBJECT = 39,
+	PLAY_EMOTE = 41,
+	PRELOAD_ANIMATION = 42,
+	PLAY_ANIMATION = 43,
+	ANIMATION_COMPLETE = 44,
+	ENABLE_HIGHLIGHT = 45,
+	DISABLE_HIGHLIGHT = 46,
+	GET_ANIMATION_NAMES = 47,
+	CONTROL_BEHAVIORS = 48,
+	BLEND_PRIMARY_ANIMATION = 52,
+	SET_OFFSCREEN_ANIMATION = 53,
+	GET_MOVEMENT_INPUT_VALUES = 54,
+	SWAP_TEXTURE = 55,
+	SWAP_COLOR = 56,
+	ATTACH_HAIR = 57,
+	GET_ENTITY_STRUCT = 58,
+	SET_ENTITY_STRUCT = 59,
+	SET_ATTR = 60,
+	GET_ATTR = 61,
+	ON_HIT = 62,
+	HIT_OR_HEAL_RESULT = 63,
+	SHOW_ATTACK = 64,
+	GO_TO = 65,
+	GET_CONFIG_DATA = 66,
+	SET_CONFIG_DATA = 68,
+	GET_INVENTORY_EXTRA_INFO = 69,
+	GET_DISPLAY_NAME = 70,
+	GET_NAME = 71,
+	SET_NAME = 72,
+	IS_NAME_LOCALIZED = 73,
+	GET_HAIR_COLOR = 74,
+	SET_HAIR_COLOR = 75,
+	GET_HAIR_STYLE = 76,
+	SET_HAIR_STYLE = 77,
+	GET_HEAD = 78,
+	SET_HEAD = 79,
+	GET_TORSO = 80,
+	SET_TORSO = 81,
+	GET_LEGS = 82,
+	SET_LEGS = 83,
+	SET_PROXIMITY_RADIUS = 84,
+	PROXIMITY_UPDATE = 85,
+	GET_PROXIMITY_OBJECTS = 86,
+	UNSET_PROXIMITY_RADIUS = 87,
+	CLEAR_PROXIMITY_RADIUS = 88,
+	GET_PROXIMITY_DATA = 89,
+	SET_PROXIMITY_RADIUS_ICON = 90,
+	TOGGLE_TAC_ARC = 93,
+	CAST_SKILL = 95,
+	CAST_LOCAL_SKILL = 96,
+	ECHO_LOCAL_SKILL = 97,
+	QUEUE_AI_SKILL = 98,
+	ADD_THREAT_RATING = 99,
+	GET_THREAT_RATING = 100,
+	CLEAR_THREAT_LIST = 103,
+	GET_TIME_FOR_NPC_SKILL = 111,
+	ENEMY_HEAL_NOTIFICATION = 112,
+	RESET_SCRIPTED_AI_STATE = 113,
+	ENABLE_COMBAT_AI_COMPONENT = 114,
+	COMBAT_AI_FORCE_TETHER = 115,
+	SUSPEND_MOVEMENT_AI = 116,
+	NOTIFY_SCRIPT_VARS_INITIALIZED = 117,
+	ECHO_START_SKILL = 118,
+	START_SKILL = 119,
+	CASTER_DEAD = 120,
+	VERIFY_ACK = 121,
+	ADD_PENDING_VERIFY = 122,
+	MAP_SKILL = 123,
+	SELECT_SKILL = 124,
+	CAST_ACTIVE_SKILL = 125,
+	MODIFY_SKILL_COOLDOWN = 126,
+	ADD_SKILL = 127,
+	REMOVE_SKILL = 128,
+	LOG = 129,
+	LOG_CHAT = 130,
+	SET_MAX_CURRENCY = 131,
+	GET_MAX_CURRENCY = 132,
+	SET_CURRENCY = 133,
+	GET_CURRENCY = 134,
+	ADD_PENDING_CURRENCY = 136,
+	PICKUP_CURRENCY = 137,
+	SERVER_DELETE_LOOT_ITEM = 138,
+	PICKUP_ITEM = 139,
+	TEAM_PICKUP_ITEM = 140,
+	CLIENT_DELETE_LOOT_ITEM = 141,
+	CLIENT_SET_LOOT_ITEM_FFA = 143,
+	COLLISION_PHANTOM = 144,
+	OFF_COLLISION_PHANTOM = 145,
+	COLLISION_PROXIMITY = 146,
+	OFF_COLLISION_PROXIMITY = 147,
+	COLLISION = 148,
+	OFF_COLLISION = 149,
+	GET_SKILLS = 150,
+	CLEAR_FX_SINGLE_EFFECT = 152,
+	GET_FX_EXIST_EFFECT = 153,
+	PLAY_FX_EFFECT = 154,
+	STOP_FX_EFFECT = 155,
+	CLEAR_FX_ALL_CREATE_EFFECTS = 156,
+	UPDATE_FX_ALL_CREATE_EFFECTS = 157,
+	REQUEST_RESURRECT = 159,
+	RESURRECT = 160,
+	UPDATE_FROM_GHOST = 162,
+	FETCH_GHOST = 163,
+	KFM_LOADED = 164,
+	NIF_LOADED = 165,
+	HKX_LOADED = 166,
+	MOVE_TO_DELETE_QUEUE = 167,
+	RESTORE_FROM_DELETE_QUEUE = 168,
+	IS_ENEMY = 169,
+	GET_FACTION = 170,
+	SET_IMAGINATION = 171,
+	GET_IMAGINATION = 172,
+	SET_MAX_IMAGINATION = 173,
+	GET_MAX_IMAGINATION = 174,
+	MODIFY_IMAGINATION = 175,
+	MODIFY_MAX_IMAGINATION = 176,
+	SET_HEALTH = 177,
+	GET_HEALTH = 178,
+	SET_MAX_HEALTH = 179,
+	GET_MAX_HEALTH = 180,
+	MODIFY_HEALTH = 181,
+	MODIFY_MAX_HEALTH = 182,
+	SET_ARMOR = 183,
+	GET_ARMOR = 184,
+	SET_MAX_ARMOR = 185,
+	GET_MAX_ARMOR = 186,
+	MODIFY_ARMOR = 187,
+	MODIFY_MAX_ARMOR = 188,
+	POP_HEALTH_STATE = 190,
+	PUSH_EQUIPPED_ITEMS_STATE = 191,
+	POP_EQUIPPED_ITEMS_STATE = 192,
+	SET_GM_LEVEL = 193,
+	GET_GM_LEVEL = 194,
+	ADD_STATUS_EFFECT = 196,
+	REMOVE_STATUS_EFFECT = 197,
+	SET_STUNNED = 198,
+	GET_STUNNED = 199,
+	SET_STUN_IMMUNITY = 200,
+	GET_STUN_IMMUNITY = 201,
+	KNOCKBACK = 202,
+	SET_VISIBLE = 203,
+	GET_VISIBLE = 204,
+	REPORT_ITEM_INFO = 205,
+	GET_REBUILD_STATE = 207,
+	REBUILD_CANCEL = 209,
+	REBUILD_START = 211,
+	ENABLE_REBUILD = 213,
+	SKILL_FAILURE = 214,
+	IS_ATTACK_STANCE = 216,
+	SET_OBJECT_RENDER = 217,
+	REQUEST_MAPPED_SKILLS = 218,
+	UI_SELECT_MAPPED_SKILL = 219,
+	GET_INVENTORY_ITEM_IN_SLOT = 220,
+	GET_FIRST_INVENTORY_ITEM_BY_LOT = 221,
+	GET_SMALLEST_INVENTORY_STACK_BY_LOT = 222,
+	MOVE_ITEM_IN_INVENTORY = 224,
+	ADD_ITEM_TO_INVENTORY_CLIENT_SYNC = 227,
+	GET_EQUIPPED_ITEMS = 229,
+	REMOVE_ITEM_FROM_INVENTORY = 230,
+	EQUIP_INVENTORY = 231,
+	UN_EQUIP_INVENTORY = 233,
+	EQUIP_ITEM = 234,
+	UN_EQUIP_ITEM = 235,
+	IS_ITEM_RESPOND = 236,
+	IS_ITEM_EQUIPPED = 237,
+	ATTACH_ITEM = 238,
+	DETACH_ITEM = 239,
+	GET_NODE = 240,
+	GET_LOT = 241,
+	IS_ITEM_EQUIPPABLE = 242,
+	GET_CURRENT_ANIMATION = 243,
+	GET_INV_ITEM_COUNT = 244,
+	POST_LOAD_EQUIP = 245,
+	SET_PHYSICS_ACTIVE_STATE = 246,
+	GET_CURRENT_SKILL_TAC_ARC = 247,
+	OFFER_MISSION = 248,
+	RESPOND_TO_MISSION = 249,
+	GET_MISSION_STATE = 250,
+	GET_MISSION_COMPLETE_TIMESTAMP = 251,
+	NOTIFY_MISSION = 254,
+	NOTIFY_MISSION_TASK = 255,
+	ARE_GFX_LOADED = 257,
+	ADDED_TO_WORLD = 258,
+	REMOVE_EXTRA_GFX_FROM_PIPE = 259,
+	HIDE_EQUIPED_WEAPON = 260,
+	UN_HIDE_EQUIPED_WEAPON = 261,
+	GET_ITEM_SLOT = 262,
+	IS_CHARACTER = 263,
+	SET_IMMUNITY = 264,
+	TOGGLE_TOOLTIPS = 266,
+	GET_TOOLTIPS_DISABLED = 267,
+	GET_BOUNDING_INFO = 268,
+	OVERRIDE_BOUNDING_RADIUS = 269,
+	GET_OFFSCREEN = 270,
+	USE_STATE_MACHINE = 271,
+	ADD_STATE = 272,
+	ADD_SUB_STATE = 273,
+	SET_STATE = 274,
+	SET_SUB_STATE = 275,
+	ADD_MESSAGE = 276,
+	RELOAD_SCRIPT = 277,
+	RELOAD_ALL_SCRIPTS = 278,
+	FRIEND_INVITE_MSG = 279,
+	ADD_FRIEND_REPOSNSE_MSG = 280,
+	REMOVE_FRIEND_RESPONSE_MSG = 281,
+	ADD_FRIEND_FROM_UI_MSG = 282,
+	GET_CACHED_FRIENDS_LIST_MSG = 283,
+	REQUEST_NEW_FRIENDS_LIST_MSG = 284,
+	REPOPULATE_FRIENDS_LIST_MSG = 285,
+	ADD_IGNORE_REPONSE_MSG = 286,
+	REMOVE_IGNORE_RESPONSE_MSG = 287,
+	ADD_IGNORE_FROM_UI_MSG = 288,
+	GET_CACHED_IGNORE_LIST_MSG = 289,
+	REQUEST_NEW_IGNORE_LIST_MSG = 290,
+	REMOVE_FRIEND_BY_NAME = 291,
+	REMOVE_IGNORE_BY_NAME = 292,
+	IS_PLAYER_IN_IGNORE_LIST_MSG = 293,
+	REPOPULATE_IGNORE_LIST_MSG = 294,
+	GET_INVENTORY_LIST = 295,
+	UPDATE_FRIEND_MSG = 296,
+	UPDATE_FRIEND_NAME_MSG = 297,
+	UPDATE_IGNORE_NAME_MSG = 298,
+	DEPARTED = 299,
+	ARRIVED = 300,
+	TEMPLATE_CHANGE_WAYPOINTS = 301,
+	CANCELLED = 302,
+	FLUSH_CACHED_GRAPHICS = 303,
+	FOLLOW_TARGET = 304,
+	TIMER_DONE = 305,
+	TIMER_CANCELLED = 306,
+	SET_TETHER_POINT = 307,
+	GET_TETHER_POINT = 308,
+	LEFT_TETHER_RADIUS = 309,
+	GET_SCRIPT_VARS_PTR = 310,
+	FACE_TARGET = 311,
+	ROTATE_BY_DEGREES = 312,
+	STRING_RENDERED = 313,
+	RESET_PRIMARY_ANIMATION = 314,
+	FACE_PLAY_STREAM = 315,
+	TORSO_PLAY_STREAM = 316,
+	CAN_PICKUP = 317,
+	GET_INVENTORY_SIZE = 318,
+	GET_INVENTORY_COUNT = 319,
+	GET_OBJECTS_IN_GROUP = 320,
+	HIDE_ITEM = 321,
+	IS_OBJECT_IN_FOV = 322,
+	GET_TYPE = 323,
+	TEAM_INVITE_MSG = 324,
+	TEAM_GET_SIZE = 325,
+	TEAM_REQUEST_SET_LOOT = 326,
+	TEAM_REMOVE_PLAYER_MSG = 327,
+	TEAM_UPDATE_PLAYER_NAME_MSG = 328,
+	SET_UPDATABLE = 329,
+	REQUEST_TEAM_UI_UPDATE = 330,
+	SET_COLLISION_GROUP = 331,
+	GET_COLLISION_GROUP = 332,
+	GET_ORIGINAL_COLLISION_GROUP = 333,
+	SET_COLLISION_GROUP_TO_ORIGINAL = 334,
+	GET_OBJECT_RADIUS = 335,
+	REBUILD_NOTIFY_STATE = 336,
+	GET_PLAYER_INTERACTION = 337,
+	SET_PLAYER_INTERACTION = 338,
+	FORCE_PLAYER_TO_INTERACT = 339,
+	GET_SELECTED_POTENTIAL_INTERACTION = 340,
+	SET_SELECTED_POTENTIAL_INTERACTION = 341,
+	GET_INTERACTION_DISTANCE = 342,
+	SET_INTERACTION_DISTANCE = 343,
+	CALCULATE_INTERACTION_DISTANCE = 344,
+	INTERACTION_ATTEMPT_FROM_OUT_OF_RANGE = 345,
+	SET_PICKING_TARGET = 346,
+	CLIENT_UNUSE = 347,
+	BEGIN_PET_INTERACTION = 348,
+	WANTS_INTERACTION_ICON = 349,
+	PROPERTY_EDIT_ICON_INTERACTION = 350,
+	PROPERTY_MODEL_INTERACTION = 351,
+	GET_INTERACTION_DETAILS = 352,
+	GET_DISABLED_INTERACTION_TYPES = 353,
+	GET_INTERACTION_INFO = 354,
+	INTERACTION_GAME_STATE_CHANGE = 355,
+	TOGGLE_INTERACTION_UPDATES = 356,
+	TERMINATE_INTERACTION = 357,
+	SERVER_TERMINATE_INTERACTION = 358,
+	GET_PLAYERS_TARGET_FOR_SELECTION = 359,
+	PROCESS_INTERACTION_UNDER_CURSOR = 360,
+	HANDLE_INTERACT_ACTION = 361,
+	ATTEMPT_INTERACTION = 362,
+	HANDLE_INTERACTION_CAMERA = 363,
+	REQUEST_USE = 364,
+	CLIENT_USE = 366,
+	GET_PLAYER_MULTI_INTERACTION = 367,
+	GET_MULTI_INTERACTION_STATE = 368,
+	VENDOR_OPEN_WINDOW = 369,
+	VENDOR_CLOSE_WINDOW = 370,
+	EMOTE_PLAYED = 371,
+	EMOTE_RECEIVED = 372,
+	BUY_FROM_VENDOR = 373,
+	SELL_TO_VENDOR = 374,
+	ADD_DONATION_ITEM = 375,
+	REMOVE_DONATION_ITEM = 376,
+	CONFIRM_DONATION_ON_PLAYER = 378,
+	CANCEL_DONATION_ON_PLAYER = 379,
+	TEAM_GET_LEADER = 380,
+	TEAM_GET_ON_WORLD_MEMBERS = 381,
+	TEAM_GET_ALL_MEMBERS = 382,
+	TEAM_SET_OFF_WORLD_FLAG = 383,
+	SET_TRANSPARENCY = 385,
+	GET_PREFERS_FADE = 386,
+	PROJECTILE_IMPACT = 387,
+	SET_PROJECTILE_PARAMS = 388,
+	SET_INVENTORY_SIZE = 389,
+	ACKNOWLEDGE_POSSESSION = 391,
+	SET_POSSESSED_OBJECT = 392,
+	CHANGE_POSSESSOR = 393,
+	GET_POSSESSION_TYPE = 395,
+	GET_POSSESSED_OBJECT = 396,
+	GET_POSSESSOR = 397,
+	IS_POSSESSED = 398,
+	ENABLE_ACTIVITY = 399,
+	SET_SHOOTING_GALLERY_PARAMS = 400,
+	OPEN_ACTIVITY_START_DIALOG = 401,
+	REQUEST_ACTIVITY_START_STOP = 402,
+	REQUEST_ACTIVITY_ENTER = 403,
+	REQUEST_ACTIVITY_EXIT = 404,
+	ACTIVITY_ENTER = 405,
+	ACTIVITY_EXIT = 406,
+	ACTIVITY_START = 407,
+	ACTIVITY_STOP = 408,
+	SHOOTING_GALLERY_CLIENT_AIM_UPDATE = 409,
+	ROTATE_TO_POINT = 410,
+	SHOOTING_GALLERY_FIRE = 411,
+	CALCULATE_FIRING_PARAMETERS = 412,
+	GET_MUZZLE_OFFSET = 413,
+	GET_ACTIVITY_POINTS = 414,
+	TEAM_IS_ON_WORLD_MEMBER = 415,
+	REQUEST_VENDOR_STATUS_UPDATE = 416,
+	VENDOR_STATUS_UPDATE = 417,
+	CANCEL_MISSION = 418,
+	RESET_MISSIONS = 419,
+	RENDER_COMPONENT_READY = 420,
+	SEND_MINIFIG_DECALS = 421,
+	PHYSICS_COMPONENT_READY = 422,
+	ENTER_STANDBY_MODE = 423,
+	LEAVE_STANDBY_MODE = 424,
+	NOTIFY_CLIENT_SHOOTING_GALLERY_SCORE = 425,
+	REQUEST_CONSUME_ITEM = 426,
+	CONSUME_CLIENT_ITEM = 427,
+	CLIENT_ITEM_CONSUMED = 428,
+	QUERY_STANDBY_MODE = 429,
+	GET_NI_BOUND = 430,
+	MISSION_FAILURE = 431,
+	GET_ANIMATION_TIME = 432,
+	GET_CURRENT_ACTIVITY = 434,
+	SET_EYEBROWS = 435,
+	GET_EYEBROWS = 436,
+	SET_EYES = 437,
+	GET_EYES = 438,
+	SET_MOUTH = 439,
+	GET_MOUTH = 440,
+	IS_OBJECT_SMASHABLE = 441,
+	SMASHABLE_STATE_CHANGED = 443,
+	USE_STATE_LOGGER = 444,
+	ROTATE_SUB_NODE = 445,
+	GET_SUB_NODE_POSITION = 446,
+	GET_SUB_NODE = 447,
+	UPDATE_SHOOTING_GALLERY_ROTATION = 448,
+	RENDER_FLOATING_TEXT = 449,
+	REQUEST2_D_TEXT_ELEMENT = 450,
+	UPDATE2_D_TEXT_ELEMENT = 451,
+	REMOVE2_D_TEXT_ELEMENT = 452,
+	SET_COLOR = 453,
+	GET_COLOR = 454,
+	HKX_CHARACTER_LOADED = 455,
+	ACTIVATE_PHYSICS = 457,
+	SET_ICON_ABOVE_HEAD = 458,
+	ADD_ICON_COMPOSITE = 459,
+	CLEAR_ICON_COMPOSITES = 460,
+	ICON_NIF_LOADED = 461,
+	ICON_KFM_LOADED = 462,
+	GET_OVERHEAD_ICON_PROPERTIES_FROM_PARENT = 463,
+	BOUNCE_PLAYER = 464,
+	SET_USER_CTRL_COMP_PAUSE = 466,
+	HAS_COLLIDED = 467,
+	GET_TOOLTIP_FLAG = 468,
+	SET_TOOLTIP_FLAG = 469,
+	GET_FLAG = 470,
+	SET_FLAG = 471,
+	NOTIFY_CLIENT_FLAG_CHANGE = 472,
+	CURSOR_ON = 473,
+	CURSOR_OFF = 474,
+	HELP = 475,
+	VENDOR_TRANSACTION_RESULT = 476,
+	PERFORM_SPECIAL_DEATH = 477,
+	GET_SHADER_ID = 478,
+	GET_RENDER_ENVIRONMENT = 479,
+	FINISHED_LOADING_SCENE = 480,
+	GET_SKILL_INFO = 481,
+	ACTIVITY_CANCEL = 482,
+	MISSION_USES_OBJECT = 483,
+	GET_POSITIONAL_ID = 484,
+	SET_COLLECTIBLE_STATUS = 485,
+	HAS_BEEN_COLLECTED = 486,
+	HAS_BEEN_COLLECTED_BY_CLIENT = 487,
+	GET_POS_UPDATE_STATS = 488,
+	GET_NUM_VIEWERS_SCOPING_THIS = 489,
+	GET_ACTIVITY_USER = 490,
+	GET_ALL_ACTIVITY_USERS = 491,
+	GET_MISSION_FOR_PLAYER = 492,
+	SET_FACTION = 493,
+	SET_PLATFORM_IDLE_STATE = 494,
+	DISPLAY_CHAT_BUBBLE = 495,
+	REQUEST_CHAT_BUBBLE_ELEMENT = 496,
+	GET_MISSION_DATA = 497,
+	SPAWN_PET = 498,
+	DESPAWN_PET = 499,
+	SET_LOCAL_SPACE_STATE = 500,
+	GET_LOCAL_SPACE_STATE = 501,
+	SET_POSITION_TO_LOCAL_POSITION = 502,
+	ALLOW_LOCAL_SPACE_UPDATE = 503,
+	TOGGLE_FREE_CAM_MODE = 504,
+	PLAYER_LOADED = 505,
+	PLAYER_ADDED_TO_WORLD_LOCAL = 506,
+	OBJECT_LOADED = 507,
+	GET_PLAYER_READY = 508,
+	PLAYER_READY = 509,
+	SET_SMASHABLE_PARAMS = 510,
+	IS_LOOTABLE_CHEST = 511,
+	LOOT_OPEN_WINDOW = 512,
+	LOOT_SELECTION_UPDATE = 513,
+	TAKE_LOOT_CHEST_ITEM = 514,
+	REQUEST_LINKED_MISSION = 515,
+	TRANSFER_TO_ZONE = 516,
+	TRANSFER_TO_ZONE_CHECKED_IM = 517,
+	SECURED_TRANSFER_TO_ZONE = 518,
+	INVALID_ZONE_TRANSFER_LIST = 519,
+	MISSION_DIALOGUE_OK = 520,
+	GET_OBJECT_IN_SCOPE = 521,
+	SET_LAUNCHED_STATE = 522,
+	P_CREATE_EFFECT_FINISHED = 523,
+	SMASHED_OBJECT = 524,
+	CHECK_SMASHCHAIN_OVERRIDE = 525,
+	DISPLAY_REBUILD_ACTIVATOR = 526,
+	TRANSFER_TO_LAST_NON_INSTANCE = 527,
+	SET_ACTIVE_LOCAL_CHARACTER_ID = 528,
+	DISPLAY_MESSAGE_BOX = 529,
+	MESSAGE_BOX_RESPOND = 530,
+	CHOICE_BOX_RESPOND = 531,
+	SERVER_SET_USER_CTRL_COMP_PAUSE = 532,
+	SET_CHARACTER_AUTO_RUN = 533,
+	FOLLOW_WAYPOINTS = 534,
+	SWAP_DECAL_AND_COLOR = 535,
+	CONTINUE_WAYPOINTS = 536,
+	SMASH = 537,
+	UN_SMASH = 538,
+	GET_IS_SMASHED = 539,
+	GET_UP_VECTOR = 540,
+	SET_GRAVITY_SCALE = 541,
+	SET_GRAVITY_SCALE_FOR_RIGID_BODY = 542,
+	STOP_MOVING = 543,
+	SET_PATHING_SPEED = 544,
+	SET_SHIELDED = 545,
+	SET_SHOOTING_GALLERY_RETICULE_EFFECT = 546,
+	PLACE_MODEL_RESPONSE = 547,
+	SET_DODGE_INFO = 548,
+	GET_DODGE_INFO = 549,
+	SET_SKILL_ATTACK_SPEED = 550,
+	GET_SKILL_COOLDOWN_GROUP = 551,
+	GET_INITIAL_SKILL_COOLDOWN = 552,
+	GET_SKILL_COOLDOWN_REMAINING = 553,
+	GET_GLOBAL_COOLDOWN = 554,
+	SET_GLOBAL_COOLDOWN = 555,
+	RESET_GLOBAL_COOLDOWN = 556,
+	FINDINVENTORY_ITEM = 558,
+	PATH_STUCK = 559,
+	SET_CURRENT_PATH = 560,
+	SET_JET_PACK_MODE = 561,
+	SET_JET_PACK_TIME = 562,
+	PET_FOLLOW_OWNER = 563,
+	PLAYER_DIED = 564,
+	REGISTER_PET_ID = 565,
+	REGISTER_PET_DBID = 566,
+	GET_PET_ID = 567,
+	SHOW_ACTIVITY_COUNTDOWN = 568,
+	DISPLAY_TOOLTIP = 569,
+	SET_PHANTOM_BASE = 570,
+	GET_MOTION_STATE = 571,
+	GET_MOTION_CONFIG = 572,
+	SET_ACTIVE_PROJECTILE_SKILL = 573,
+	INITIALIZE_MISSION_VISUALS = 574,
+	GET_MISSIONS = 575,
+	START_ACTIVITY_TIME = 576,
+	ADD_ACTIVITY_TIME = 577,
+	GUILD_GET_SIZE = 578,
+	GUILD_CAN_WE_INVITE = 579,
+	GUILD_CAN_WE_KICK = 580,
+	SET_CHAR_GUILD_INFO = 581,
+	GET_CHAR_GUILD_INFO = 582,
+	GET_CHAR_IS_IN_GUILD = 583,
+	RE_RENDER_NAME_BILLBOARD = 584,
+	IS_IN_LOCAL_CHAR_PROXIMITY = 585,
+	GUILD_SET_STATUS = 586,
+	GUILD_ADD_PLAYER = 587,
+	GUILD_REMOVE_PLAYER = 588,
+	GUILD_UPDATE_PLAYER_NAME = 589,
+	GUILD_SET_PLAYER_RANK = 590,
+	GUILD_SET_ONLINE_STATUS = 591,
+	GUILD_INVITE = 592,
+	REQUEST_GUILD_DATA = 593,
+	POPULATE_GUILD_DATA = 594,
+	GET_CACHED_GUILD_DATA = 595,
+	GUILD_RENDER_NAME = 596,
+	GET_IS_SUPPORTED = 600,
+	CHARACTER_SUPPORT_CHANGED = 601,
+	ACTIVITY_PAUSE = 602,
+	USE_NON_EQUIPMENT_ITEM = 603,
+	REQUEST_USE_ITEM_ON = 604,
+	REQUEST_USE_ITEM_ON_TARGET = 605,
+	USE_ITEM_ON = 606,
+	USE_ITEM_RESULT = 607,
+	GET_PARENT_OBJ = 608,
+	SET_PARENT_OBJ = 609,
+	GET_UPDATES_WITH_PARENT_POSITION = 610,
+	PARENT_REMOVED = 611,
+	PARENT_LEFT_SCOPE = 612,
+	PARENT_ENTERED_SCOPE = 613,
+	CHILD_LOADED = 614,
+	CHILD_REMOVED = 615,
+	CHILD_DETACHED = 616,
+	CHILD_ENTERED_SCOPE = 617,
+	CHILD_LEFT_SCOPE = 618,
+	GET_CHILD_OBJECTS = 619,
+	ZONE_TRANSFER_FINISHED = 621,
+	CHAT_CONNECTION_UPDATE = 622,
+	PLATFORM_AT_LAST_WAYPOINT = 623,
+	LOOT_TAKE_ALL = 624,
+	GET_EQUIPPED_ITEM_INFO = 625,
+	DISPLAY_GUILD_CREATE_BOX = 626,
+	GET_EDITOR_LEVEL = 627,
+	GET_ACCOUNT_ID = 628,
+	GET_LAST_LOGOUT = 629,
+	GET_LAST_PROP_MOD_DISPLAY_TIME = 630,
+	SET_LAST_PROP_MOD_DISPLAY_TIME = 631,
+	SHOW_ACTIVITY_SUMMARY = 632,
+	CAN_RECEIVE_ALL_REWARDS = 633,
+	GET_ACTIVITY_REWARD = 634,
+	LOOT_CLOSE_WINDOW = 635,
+	GET_BLUEPRINT_ID = 636,
+	NOTIFY_BLUEPRINT_UPDATE = 637,
+	FETCH_MODEL_METADATA_REQUEST = 638,
+	FETCH_MODEL_METADATA_RESPONSE = 639,
+	COMMAND_PET = 640,
+	PET_RESPONSE = 641,
+	GET_ICON_ABOVE_HEAD_STATE = 642,
+	GET_ICON_ABOVE_HEAD = 643,
+	ICON_FINISHED_LOADING = 644,
+	ADD_PET_STATE = 645,
+	REMOVE_PET_STATE = 646,
+	SET_PET_STATE = 647,
+	REQUEST_ACTIVITY_SUMMARY_LEADERBOARD_DATA = 648,
+	SEND_ACTIVITY_SUMMARY_LEADERBOARD_DATA = 649,
+	SET_ON_TEAM = 650,
+	GET_PET_HAS_STATE = 651,
+	FIND_PROPERTY = 652,
+	SET_PET_MOVEMENT_STATE = 653,
+	GET_ITEM_TYPE = 654,
+	GET_ITEM_INFO_KEY = 655,
+	NOTIFY_OBJECT = 656,
+	IS_PET_WILD = 657,
+	CLIENT_NOTIFY_PET = 659,
+	NOTIFY_PET = 660,
+	NOTIFY_PET_TAMING_MINIGAME = 661,
+	START_SERVER_PET_MINIGAME_TIMER = 662,
+	CLIENT_EXIT_TAMING_MINIGAME = 663,
+	GET_BUILDMODE_ACTIVE = 664,
+	GET_PET_TAMING_MINIGAME_ACTIVE = 665,
+	PET_TAMING_OBJECT_PICKED = 666,
+	PET_TAMING_MINIGAME_RESULT = 667,
+	PET_TAMING_TRY_BUILD_RESULT = 668,
+	SET_PET_TAMING_MODEL = 669,
+	GET_PET_TAMING_MODEL = 670,
+	PET_ON_SWITCH = 671,
+	PET_OFF_SWITCH = 672,
+	NOTIFY_TAMING_BUILD_SUCCESS = 673,
+	NOTIFY_TAMING_MODEL_LOADED_ON_SERVER = 674,
+	NOTIFY_TAMING_PUZZLE_SELECTED = 675,
+	GET_INSTRUCTION_COUNT = 676,
+	GET_IS_NPC = 677,
+	ACTIVATE_BUBBLE_BUFF = 678,
+	DECTIVATE_BUBBLE_BUFF = 679, // thanks netdevil
+	EXHIBIT_VOTE = 680,
+	ADD_PET_TO_PLAYER = 681,
+	REMOVE_PET_FROM_PLAYER = 682,
+	REQUEST_SET_PET_NAME = 683,
+	SET_PET_NAME = 684,
+	PET_NAME_CHANGED = 686,
+	GET_PET_AT_INDEX = 687,
+	GET_LOT_FOR_PET_BY_DBID = 688,
+	GET_NAME_FOR_PET_BY_DBID = 689,
+	GET_ACTIVE_PET_OBJ_ID = 690,
+	GET_ACTIVE_PET_INVENTORY_OBJ_ID = 691,
+	SHOW_PET_ACTION_BUTTON = 692,
+	SET_EMOTE_LOCK_STATE = 693,
+	GET_EMOTE_LOCK_STATE = 694,
+	LEAVE_TEAM_MSG = 695,
+	TEAM_KICK_PLAYER_MSG = 697,
+	TEAM_SET_LEADER_SEND_MSG = 698,
+	USE_ITEM_ON_CLIENT = 699,
+	DOES_FORWARD_TARGET_CLICKING = 700,
+	CHECK_USE_REQUIREMENTS = 701,
+	USE_REQUIREMENTS_RESPONSE = 702,
+	USE_ITEM_REQUIREMENTS_RESPONSE = 703,
+	PET_ADDED_TO_WORLD = 704,
+	BOUNCER_TRIGGERED = 705,
+	EXHIBIT_QUERY_CURRENT_MODEL = 706,
+	EXHIBIT_QUERY_CURRENT_MODEL_RESPONSE = 707,
+	EXHIBIT_ATTEMPT_VOTE = 708,
+	EXHIBIT_VOTE_RESPONSE = 709,
+	EHIBIT_REQUERYMODELS = 710,
+	IS_SKILL_ACTIVE = 711,
+	TOGGLE_ACTIVE_SKILL = 712,
+	PLAY_EMBEDDED_EFFECT_ON_ALL_CLIENTS_NEAR_OBJECT = 713,
+	EXHIBIT_GET_INFO = 714,
+	GET_PROPERTY_DATA = 715,
+	DOWNLOAD_PROPERTY_DATA = 716,
+	QUERY_PROPERTY_DATA = 717,
+	MODEL_MODERATION_ACTION = 719,
+	NOTIFY_SERVER_UGC_REVIEW_READY = 720,
+	NOTIFY_CLIENT_UGC_REVIEW_READY = 721,
+	OLD_USE_ITEM_ON = 722,
+	FIND_PROPERTY_FOR_SALE_RESPONSE = 723,
+	PROPERTY_EDITOR_BEGIN = 724,
+	PROPERTY_EDITOR_END = 725,
+	PROPERTY_EDITOR_SET_MODE = 726,
+	TOGGLE_TRIGGER = 727,
+	FIRE_EVENT = 728,
+	IS_MINIFIG_IN_A_BUBBLE = 729,
+	GET_ITEM_INFO = 730,
+	MISSION_NEEDS_LOT = 731,
+	STOP_PATHING = 732,
+	START_PATHING = 733,
+	ACTIVATE_BUBBLE_BUFF_FROM_SERVER = 734,
+	DEACTIVATE_BUBBLE_BUFF_FROM_SERVER = 735,
+	HAS_SKILL = 736,
+	NOTIFY_CLIENT_ZONE_OBJECT = 737,
+	MOVE_OBJECT = 738,
+	ROTATE_OBJECT = 739,
+	GET_SPAWNER_CONFIG_DATA = 740,
+	UPDATE_SPAWNER_CONFIG_DATA = 741,
+	TURN_AROUND = 743,
+	GO_FORWARD = 744,
+	GO_BACKWARD = 745,
+	UPDATE_REPUTATION = 746,
+	GET_REPUTATION = 747,
+	ADD_REPUTATION = 748,
+	UPDATE_PROPERTY_DATA = 749,
+	PROPERTY_RENTAL_RESPONSE = 750,
+	EXHIBIT_PLACEMENT_RESPONSE = 751,
+	SQUIRT_WITH_WATERGUN = 752,
+	GET_VOTES_LEFT = 753,
+	ADJUST_VOTES_LEFT = 754,
+	EVADE_TARGET = 755,
+	STOPPED_EVADING = 756,
+	GET_PET_HAS_ABILITY = 757,
+	REQUEST_PLATFORM_RESYNC = 760,
+	PLATFORM_RESYNC = 761,
+	PLAY_CINEMATIC = 762,
+	END_CINEMATIC = 763,
+	CINEMATIC_UPDATE = 764,
+	ATTACH_CAMERA_TO_RAIL = 765,
+	DETACH_CAMERA_FROM_RAIL = 766,
+	TOGGLE_GHOST_REFERENCE_OVERRIDE = 767,
+	SET_GHOST_REFERENCE_POSITION = 768,
+	GET_GHOST_REFERENCE_POSITION = 769,
+	FIRE_EVENT_SERVER_SIDE = 770,
+	GET_PET_ABILITY_OBJECT = 771,
+	TEAM_INVITE_MSG_FROM_UI = 772,
+	ADD_CAMERA_EFFECT = 773,
+	REMOVE_CAMERA_EFFECT = 774,
+	REMOVE_ALL_CAMERA_EFFECTS = 775,
+	GET_MY_PROPERTIES_IN_THIS_ZONE = 776,
+	IS_MODEL_WITHIN_PROPERTY_BOUNDS = 777,
+	PROPERTY_DATA_RESULTS = 778,
+	ON_UN_SERIALIZE = 779,
+	SCRIPT_NETWORK_VAR_UPDATE = 781,
+	ADD_OBJECT_TO_GROUP = 783,
+	REMOVE_OBJECT_FROM_GROUP = 784,
+	IS_OBJECT_STATIC = 785,
+	GET_HAS_MISSION = 786,
+	GET_MISSION_TARGET_LOT = 787,
+	GET_MISSION_OFFERER_LOT = 788,
+	USE_UNIQUE_ITEM = 789,
+	GET_IS_PET = 790,
+	DELETE_PROPERTY = 791,
+	CREATEMODEL_FROM_CLIENT = 792,
+	UPDATE_MODEL_FROM_CLIENT = 793,
+	DELETE_MODEL_FROM_CLIENT = 794,
+	SHOW_PROPERTY_BOUNDS = 795,
+	SET_PROPERTY_I_DS = 796,
+	PLAY_FACE_DECAL_ANIMATION = 797,
+	ADD_ACTIVITY_USER = 798,
+	REMOVE_ACTIVITY_USER = 799,
+	GET_NUM_ACTIVITY_USERS = 800,
+	ACTIVITY_USER_EXISTS = 801,
+	DO_COMPLETE_ACTIVITY_EVENTS = 805,
+	SET_ACTIVITY_PARAMS = 806,
+	SET_ACTIVITY_USER_DATA = 807,
+	GET_ACTIVITY_USER_DATA = 808,
+	DO_CALCULATE_ACTIVITY_RATING = 809,
+	ND_AUDIO_POST_SETUP = 812,
+	ND_AUDIO_PRE_SHUTDOWN = 813,
+	SET_ND_AUDION_LISTENER_STANCE = 814,
+	SET_UP_ND_AUDIO_EMIITTER = 815,
+	SHUT_DOWN_ND_AUDIO_EMITTER = 816,
+	METAIFY_ND_AUDIO_EMITTER = 817,
+	UN_METAIFY_ND_AUDIO_EMITTER = 818,
+	METAIFY_ND_AUDIO_EMITTERS = 819,
+	UN_METAIFY_ND_AUDIO_EMITTERS = 820,
+	PLAY_ND_AUDIO_EMITTER = 821,
+	STOP_ND_AUDIO_EMITTER = 822,
+	STOP_ND_AUDIO_EMITTER_ALL = 823,
+	SET_ND_AUDIO_EMITTER_PARAMETER = 824,
+	SET_ND_AUDIO_EMITTERS_PARAMETER = 825,
+	ND_AUDIO_CALLBACK = 826,
+	ACTIVATE_ND_AUDIO_MUSIC_CUE = 827,
+	DEACTIVATE_ND_AUDIO_MUSIC_CUE = 828,
+	FLASH_ND_AUDIO_MUSIC_CUE = 829,
+	SET_ND_AUDIO_MUSIC_PARAMETER = 830,
+	PLAY2_D_AMBIENT_SOUND = 831,
+	STOP2_D_AMBIENT_SOUND = 832,
+	PLAY3_D_AMBIENT_SOUND = 834,
+	STOP3_D_AMBIENT_SOUND = 835,
+	ACTIVATE_ND_AUDIO_MIXER_PROGRAM = 836,
+	DEACTIVATE_ND_AUDIO_MIXER_PROGRAM = 837,
+	UPDATE_ACTIVITY_LEADERBOARD = 838,
+	ACTIVITY_LEADERBOARD_UPDATED = 839,
+	ENTER_PROPERTY1 = 840,
+	ENTER_PROPERTY2 = 841,
+	PROPERTY_ENTRANCE_SYNC = 842,
+	SEND_PROPERTY_POPULATION_TO_CLIENT = 843,
+	SEN_PROPERTY_PLAQUE_VIS_UPDATE = 844,
+	PROPERTY_SELECT_QUERY = 845,
+	CREATE_POSITION_STRING = 848,
+	GET_PARALLEL_POSITION = 849,
+	PARSE_CHAT_MESSAGE = 850,
+	SET_MISSION_TYPE_STATE = 851,
+	GET_LOCATIONS_VISITED = 852,
+	GET_MISSION_TYPE_STATES = 853,
+	GET_TIME_PLAYED = 854,
+	SET_MISSION_VIEWED = 855,
+	SLASH_COMMAND_TEXT_FEEDBACK = 856,
+	HANDLE_SLASH_COMMAND_KORE_DEBUGGER = 857,
+	BROADCAST_TEXT_TO_CHATBOX = 858,
+	OPEN_PROPERTY_MANAGEMENT = 860,
+	OPEN_PROPERTY_VENDOR = 861,
+	VOTE_ON_PROPERTY = 862,
+	UPDATE_PROPERTY_OR_MODEL_FOR_FILTER_CHECK = 863,
+	NOTIFY_PLAYER_OF_PROPERTY_SUBMISSION = 865,
+	NOTIFY_PLAYER_OF_MODEL_SUBMISSION = 866,
+	PHYSICS_SYSTEM_LOADED = 867,
+	CLIENT_TRADE_REQUEST = 868,
 	SERVER_TRADE_REQUEST = 869,
-    SERVER_TRADE_INVITE = 870,
-    CLIENT_TRADE_REPLY = 871,
+	SERVER_TRADE_INVITE = 870,
+	CLIENT_TRADE_REPLY = 871,
 	SERVER_TRADE_REPLY = 872,
-    SERVER_TRADE_INITIAL_REPLY = 873,
-    SERVER_TRADE_FINAL_REPLY = 874,
-    CLIENT_TRADE_UPDATE = 875,
+	SERVER_TRADE_INITIAL_REPLY = 873,
+	SERVER_TRADE_FINAL_REPLY = 874,
+	CLIENT_TRADE_UPDATE = 875,
 	SERVER_SIDE_TRADE_UPDATE = 876,
-    SERVER_TRADE_UPDATE = 877,
-    CLIENT_TRADE_CANCEL = 878,
-    CLIENT_SIDE_TRADE_CANCEL = 879,
-    CLIENT_TRADE_ACCEPT = 880,
+	SERVER_TRADE_UPDATE = 877,
+	CLIENT_TRADE_CANCEL = 878,
+	CLIENT_SIDE_TRADE_CANCEL = 879,
+	CLIENT_TRADE_ACCEPT = 880,
 	SERVER_SIDE_TRADE_ACCEPT = 881,
 	SERVER_SIDE_TRADE_CANCEL = 882,
-    SERVER_TRADE_CANCEL = 883,
-    SERVER_TRADE_ACCEPT = 884,
-    GET_TRADE_INFO = 885,
-    KF_LOADED = 886,
-    BRICKS_LOADED = 887,
-    READY_FOR_UPDATES = 888,
-    SEND_READY_FOR_UPDATES = 889,
-    SET_LAST_CUSTOM_BUILD = 890,
-    GET_LAST_CUSTOM_BUILD = 891,
-    GET_STATUS_EFFECT_BY_ID = 892,
-    GET_ALL_STATUS_EFFECTS = 893,
-    CHILD_RENDER_COMPONENT_READY = 894,
-    NOTIFY_APPEARANCE_CHANGED_MSG = 895,
-    SET_PHYSICS_MOTION_STATE = 896,
-    GET_PHYSICS_MOTION_STATE = 897,
-    ATTACH_GRAYSCALE_EFFECT = 898,
-    ATTACH_FADE_EFFECT = 899,
-    ATTACH_CHANGE_RENDER_ENVIRONMENT_EFFECT = 900,
-    FORCE_MOVEMENT = 901,
-    CANCEL_FORCE_MOVEMENT = 902,
-    SET_IGNORE_PROJECTILE_COLLISION = 903,
-    GET_IGNORE_PROJECTILE_COLLISION = 904,
-    ORIENT_TO_OBJECT = 905,
-    ORIENT_TO_POSITION = 906,
-    ORIENT_TO_ANGLE = 907,
-    NOTIFY_CLIENT_UGC_MODEL_READY = 909,
-    NOTIFY_CLIENT_UGC_ICON_READY = 911,
-    PROPERTY_BUILD_MODE_CHANGED = 912,
-    PROPERTY_BUILD_MODE_UPDATE = 913,
-    PROPERTY_DELETION_ACTION = 914,
-    PROPERTY_MODERATION_STATUS_ACTION = 915,
-    PROPERTY_MODERATION_STATUS_ACTION_RESPONSE = 916,
-    PROPERTY_MODERATION_STATUS_UPDATE = 917,
-    PROPERTY_NEEDS_GM_ATTENTION = 918,
-    PROPERTY_MODERATION_CHANGED = 919,
-    INVENTORY_REFRESH_ITEM_DETAILS = 922,
-    INVENTORY_LOAD_CUSTOM_ICON = 923,
-    GET_STATUS_EFFECT_BY_TYPE = 924,
-    RELEASE_CHARGED_SKILL = 925,
-    PROPERTY_RELOAD_DB = 926,
-    SET_PLAYER_TARGET = 927,
-    GET_PLAYER_TARGET = 928,
-    LOCK_CAMERA_NETWORKED = 929,
-    MOVE_CAMERA_NETWORKED = 930,
-    REBUILD_ACTIVATED = 931,
-    BOUNCE_NOTIFICATION = 932,
-    REQUEST_CLIENT_BOUNCE = 934,
-    GET_RECENT_BOUNCED = 935,
-    SET_RECENT_BOUNCED = 936,
-    SET_ACTIVE_STATE = 937,
-    GET_ACTIVE_STATE = 938,
-    HAS_COMPONENT_TYPE = 939,
-    GET_COMPONENT_LIST = 940,
-    RESPONDS_TO_FACTION = 941,
-    BOUNCER_ACTIVE_STATUS = 942,
-    HF_ATTRIBUTES_PUSH = 943,
-    HF_ATTRIBUTES_PULL = 944,
-    HF_ATTRIBUTES_PATH_DISPLAY = 945,
-    HF_CONTROLS_PULL = 946,
-    HF_OBJECT_SELECTED = 947,
-    HF_PLACEHOLDER_UPDATE = 948,
-    HF_PLACEHOLDER_TOGGLE = 949,
-    HF_GET_ASSOCIATED_PATHS = 950,
-    HF_GETS_WANT_PATH = 951,
-    GET_RECENT_MOVEMENT_KEYS = 952,
-    TRACK_RECENT_MOVEMENT_KEYS = 953,
-    PHYSICS_MOVEMENT_NOTIFICATION_REQUEST = 954,
-    PHYSICS_MOVEMENT_NOTIFICATION = 955,
-    MOVE_INVENTORY_SINGLE = 956,
-    MOVE_INVENTORY_BATCH = 957,
-    MINI_GAME_SET_PARAMETERS = 958,
-    MINI_GAME_GET_TEAM_SKILLS = 961,
-    MINI_GAME_GET_TEAM_SCORE = 963,
-    MINI_GAME_GET_PLAYER_SCORE = 967,
-    MINI_GAME_GET_TEAM_COLOR = 972,
-    MINI_GAME_GET_TEAM_PLAYERS = 975,
-    MINI_GAME_UPDATE_CLIENT = 976,
-    MINI_GAME_GET_TEAM = 977,
-    MINI_GAME_GET_PARAMETERS = 978,
-    OBJECT_ACTIVATED_CLIENT = 980,
-    IS_RESURRECTING = 983,
-    GET_ITEM_OWNER = 984,
-    GET_STORED_CONFIG_DATA = 985,
-    SET_STORED_CONFIG_DATA = 986,
-    ON_PLAYER_RESSURECTED = 988,
-    PLAYER_RESURRECTION_FINISHED = 989,
-    TRANSFORM_CHANGELING_BUILD = 990,
-    RETURN_CHANGELING_BUILD_ID = 991,
-    SPEND_BRICK_INVENTORY_FOR_LXFML = 992,
-    BRICK_INVENTORY_FOR_LXFML_SPENT = 993,
-    REBUILD_BBB_AUTOSAVE_MSG = 995,
-    SET_BBB_AUTOSAVE = 996,
-    USE_BBB_INVENTORY = 998,
-    UN_USE_BBB_MODEL = 999,
-    BBB_LOAD_ITEM_REQUEST = 1000,
-    BBB_SAVE_REQUEST = 1001,
-    BBBLUP_SAVE_REQUEST = 1002,
-    BBB_GET_METADATA_SOURCE_ITEM = 1003,
-    BBB_RESET_METADATA_SOURCE_ITEM = 1004,
-    BBB_SAVE_RESPONSE = 1005,
-    PLAYER_EXIT = 1006,
-    SET_PVP_STATUS = 1008,
-    GET_PVP_STATUS = 1009,
-    IS_VALID_PVP_TARGET = 1010,
-    PVP_RENDER_NAME = 1011,
-    ATTACH_OBJECT = 1012,
-    DETACH_OBJECT = 1013,
-    BOUNCE_SUCCEEDED = 1014,
-    GET_GAME_OBJECT_POINTER = 1015,
-    PHANTOM_HKX_LOADED = 1016,
-    DELAY_CREATE_EFFECT = 1017,
-    CHOICE_BUILD_SELECTION_CONFIRMED = 1018,
-    NOTIFY_FADE_UP_VIS_COMPLETE = 1019,
-    ITEM_HAS_NEW_INFO = 1020,
-    RESET_SECONDARY_ANIMATION = 1021,
-    GET_PICK_TYPE = 1022,
-    SET_PICK_TYPE = 1023,
-    GET_PRIORITY_PICK_LIST_TYPE = 1024,
-    REQUEST_PICK_TYPE_UPDATE = 1025,
-    GET_OVERRIDE_PICK_TYPE = 1026,
-    REQUEST_DISPLAY_OBJECT_INFO = 1027,
-    REQUEST_SERVER_OBJECT_INFO = 1028,
-    REQUEST_OBJECT_INFO_AS_XML = 1029,
-    GET_OBJECT_REPORT_INFO = 1030,
-    GET_OBJECT_REPORT_WINDOW_CLOSE = 1031,
-    GET_OBJECT_REPORT_STATUS = 1032,
-    GET_MISSION_DATA_FOR_OBJECT_REPORT = 1033,
-    GET_OBJECT_ROLLOVER_INFO = 1034,
-    PERFORM_ZONE_ANALYSIS = 1035,
-    UPDATE_HK_VISUAL_IZATION = 1036,
-    CLEAR_ITEMS_OWNER = 1037,
-    APPLY_LINEAR_IMPULSE = 1038,
-    APPLY_ANGULAR_IMPULSE = 1039,
-    GET_CONTACT_NORMALS = 1040,
-    IS_WATCHING_FOR_EMOTE = 1041,
-    NOTIFY_CLIENT_OBJECT = 1042,
-    DISPLAY_ZONE_SUMMARY = 1043,
-    ZONE_SUMMARY_DISMISSED = 1044,
-    GET_PLAYER_ZONE_STATISTIC = 1045,
-    MODIFY_PLAYER_ZONE_STATISTIC = 1046,
-    APPLY_EXTERNAL_FORCE = 1049,
-    GET_APPLIED_EXTERNAL_FORCE = 1050,
-    ITEM_EQUIPPED = 1052,
-    ACTIVITY_STATE_CHANGE_REQUEST = 1053,
-    OVERRIDE_FRICTION = 1054,
-    ARRANGE_WITH_ITEM = 1055,
-    CHECK_CAN_BUILD_WITH_ITEM = 1056,
-    START_BUILDING_WITH_ITEM = 1057,
-    START_BUILD_SESSION = 1058,
-    FINISH_BUILD_SESSION = 1059,
-    DONE_BUILD_SESSION = 1060,
-    START_ARRANGING_WITH_ITEM = 1061,
-    FINISH_ARRANGING_WITH_ITEM = 1062,
-    DONE_ARRANGING_WITH_ITEM = 1063,
-    START_ARRANGE_MODE = 1064,
-    ARRANGE_MODE_WITH_ITEM = 1065,
-    FINISH_ARRANGE_MODE = 1066,
-    DONE_ARRANGE_MODE = 1067,
-    SET_BUILD_MODE = 1068,
-    BUILD_MODE_SET = 1069,
-    CONFIRM_BUILD_MODE = 1070,
-    BUILD_MODE_CONFIRMATION = 1071,
-    BUILD_EXIT_CONFIRMATION = 1072,
-    SET_BUILD_MODE_CONFIRMED = 1073,
-    BUILD_MODE_NOTIFICATION = 1074,
-    BUILD_MODE_NOTIFICATION_REPORT = 1075,
-    CLIENT_USE_MODULE_ON = 1076,
-    SET_MODEL_TO_BUILD = 1077,
-    SPAWN_MODEL_BRICKS = 1078,
-    CHECK_PRECONDITION = 1079,
-    CHECK_ALL_PRECONDITIONS = 1080,
-    NOTIFY_CLIENT_FAILED_PRECONDITION = 1081,
-    GET_IS_ITEM_EQUIPPED_BY_LOT = 1082,
-    GET_IS_ITEM_EQUIPPED_BY_ID = 1083,
-    GET_OBJECT_DIRECTION_VECTORS = 1084,
-    GET_CASTABLE_SKILLS = 1085,
-    CHOICEBUILD_COMPLETE = 1086,
-    GET_MISSION_CHAT = 1087,
-    GET_MISSION_AUDIO = 1088,
-    MODULE_EQUIPPED = 1089,
-    MODULE_DROPPED = 1090,
-    MODULE_PICKED_UP = 1091,
-    MODULE_INFO = 1092,
-    MOVE_ITEM_BETWEEN_INVENTORY_TYPES = 1093,
-    MODULAR_BUILD_BEGIN = 1094,
-    MODULAR_BUILD_END = 1095,
-    MODULAR_BUILD_MOVE_AND_EQUIP = 1096,
-    MODULAR_BUILD_FINISH = 1097,
-    SET_REGISTRATION_FOR_UI_UPDATE = 1114,
-    GO_TO_WAYPOINT = 1115,
-    ARRIVED_AT_DESIRED_WAYPOINT = 1116,
-    CHECK_WITHIN_BOUNDS = 1117,
-    ATTACH_TO_BUILD_ASSEMBLY = 1118,
-    SET_BUILD_ASSEMBLY = 1119,
-    RESET_BUILD_ASSEMBLY = 1120,
-    GET_INVENTORY_ITEM_INFO = 1125,
-    GET_ITEM_DETAILS = 1126,
-    GET_BUILD_ACTIVATOR = 1127,
-    GET_MISSION_ANIMATION = 1128,
-    MISSION_DIALOGUE_CANCELLED = 1129,
-    MODULE_ASSEMBLY_DB_DATA = 1130,
-    MODULE_ASSEMBLY_DB_DATA_FOR_CLIENT = 1131,
-    MODULE_ASSEMBLY_QUERY_DATA = 1132,
-    MODULE_ASSEMBLY_HKX_LOADED = 1133,
-    MODULE_ASSEMBLY_NIF_LOADED = 1134,
-    MODULE_ASSEMBLY_MAIN_NIF_LOADED = 1135,
-    MODULE_ASSEMBLY_KFM_LOADED = 1136,
-    GET_PRECONDITION_INFO = 1137,
-    GET_MODEL_LOT = 1138,
-    ANIMATION_FINISHED_PRELOADING = 1139,
-    CHILD_BUILD_ASSEMBLY_COMPLETE = 1140,
-    CHARACTER_UNSERIALIZED = 1141,
-    CHARACTER_NEEDS_TRANSITION = 1142,
-    SET_NEEDS_TRANSITION = 1143,
-    ECHO_SYNC_SKILL = 1144,
-    SYNC_SKILL = 1145,
-    GET_BEHAVIOR_HANDLE = 1146,
-    ADD_OUTSTANDING_BEHAVIOR = 1147,
-    REQUEST_SERVER_PROJECTILE_IMPACT = 1148,
-    OFF_WORLD_IMPACT_REQUEST = 1149,
-    SERVER_IMPACT_REQUEST = 1150,
-    DO_CLIENT_PROJECTILE_IMPACT = 1151,
-    MODULE_ASSEMBLY_PART_INFO = 1152,
-    GET_BUILD_TYPE = 1153,
-    CHECK_BUILD_TYPE = 1154,
-    MODULAR_BUILD_CONVERT_MODEL = 1155,
-    DO_NPC_SHOWCASE_MODEL_SUBMISSION = 1156,
-    GET_MISSION_I_DS_LIST = 1157,
-    SET_SHOWCASE_MISSION_NPC_VALS = 1158,
-    NOTIFY_SHOWCASE_MISSION_NP_COF_SUCCESS = 1159,
-    SEND_LUA_NOTIFICATION_REQUEST = 1160,
-    SEND_LUA_NOTIFICATION_CANCEL = 1161,
-    ACTIVATOR_TOGGLE = 1162,
-    MAKE_PHYSICS = 1163,
-    SET_RESPAWN_GROUP = 1164,
-    SET_PLAYER_ALLOWED_RESPAWN = 1165,
-    TOGGLE_SENDING_POSITION_UPDATES = 1166,
-    TOGGLE_RECEIVING_POSITION_UPDATES = 1167,
-    GET_ENEMY_PRECONDITIONS = 1168,
-    START_MODEL_VISUALIZATION = 1169,
-    PLACE_PROPERTY_MODEL = 1170,
-    PROPERTY_MODEL_PLACED = 1171,
-    OPEN_EXHIBIT_REPLACE_MODEL_UI = 1172,
-    REPLACE_SHOWCASEMODEL = 1173,
-    CLEAR_UI_HOOK_EXHIBIT_REPLACEMENT = 1174,
-    ATTACH_FLYTO_SCREEN_POS = 1175,
-    VEHICLE_GET_DEBUG_INFO = 1176,
-    VEHICLE_GET_MOVEMENT_INPUT_VALUES = 1177,
-    ACTIVITY_TIMER_SET = 1178,
-    ACTIVITY_TIMER_UPDATE = 1179,
-    ACTIVITY_TIMER_GET = 1180,
-    ACTIVITY_TIMER_STOP = 1181,
-    ACTIVITY_TIMER_DONE = 1182,
-    GET_ATTACK_PRIORITY = 1183,
-    UI_MESSAGE_SERVER_TO_SINGLE_CLIENT = 1184,
-    UI_MESSAGE_SERVER_TO_ALL_CLIENTS = 1185,
-    SET_LOSE_COINS_ON_DEATH = 1186,
-    LOAD_EFFECTS = 1187,
-    SET_CUSTOM_BUILD = 1188,
-    ACTIVITY_TIMER_RESET = 1189,
-    ACTIVITY_TIMER_STOP_ALL_TIMERS = 1190,
-    ACTIVITY_TIMER_MODIFY = 1191,
-    SET_KEYFRAM_TRANSFORM = 1192,
-    ADD_ACTIVITY_OWNER = 1193,
-    REMOVE_ACTIVITY_OWNER = 1194,
-    GET_CURRENT_ACTIVITY_OWNERS = 1195,
-    TOGGLE_SKILL_DEBUGGING = 1196,
-    PET_TAMING_TRY_BUILD = 1197,
-    REPORT_BUG = 1198,
-    REPORT_OFFENSIVE_MODEL = 1199,
-    REPORT_OFFENSIVE_PROPERTY = 1200,
-    GET_ACTIVITY_ID = 1201,
-    REQUEST_SMASH_PLAYER = 1202,
-    GET_TIMES_REQUESTED_SMASH = 1203,
-    RESPONSE_SMASH_PLAYER = 1204,
-    MODIFY_DAMAGE_ABSORPTION = 1205,
-    UNCAST_SKILL = 1206,
-    GET_SHOWCASE_MODEL_READY = 1207,
-    IS_SKILL_NEEDED = 1208,
-    GET_COMPONENT_DATA = 1209,
-    VEHICLE_SET_POWERSLIDE_METHOD = 1210,
-    SHOWS_NAMETAG = 1211,
-    FIRE_EVENT_CLIENT_SIDE = 1213,
-    GET_REQUIRES_NAME_RESUBMISSION = 1216,
-    SET_REQUIRES_NAME_RESUBMISSION = 1217,
-    TOGGLE_GM_INVIS = 1218,
-    GET_GM_INVIS = 1219,
-    KILLED_PLAYER = 1220,
-    GET_PICKUP_SKILLS = 1221,
-    GET_FACTION_SKILL = 1222,
-    CHANGE_OBJECT_WORLD_STATE = 1223,
-    GET_OBJECT_WORLD_STATE = 1224,
-    VISIBILITY_CHANGED = 1225,
-    MOTION_EFFECT_COMPLETE = 1226,
-    TOGGLE_FREEZE_MODE = 1227,
-    SHADER_RENDER_MSG_APPLIED = 1228,
-    PLAYER_RENAME_REQUEST = 1229,
-    VEHICLE_LOCK_INPUT = 1230,
-    VEHICLE_UNLOCK_INPUT = 1231,
-    SET_AIR_MOVEMENT = 1232,
-    MOVEMENT_STATE_CHANGED = 1233,
-    SKILL_MOVEMENT_CANCELLED = 1234,
-    AIR_MOVEMENT_COMPLETE = 1235,
-    CANCEL_AIR_MOVEMENT = 1236,
-    FORCE_MINIFIGURE_TEXTURE_UPDATE = 1237,
-    RESYNC_EQUIPMENT = 1238,
-    ADD_COMPONENT_TO_OBJECT = 1239,
-    VEHICLE_GET_MAX_GAME_SPEED = 1240,
-    VEHICLE_GET_MAX_GAME_SPEED_WITH_BOOST = 1241,
-    GET_SPEED_FACTOR = 1242,
-    FREEZE_INVENTORY = 1243,
-    ADD_STAT_TRIGGER = 1244,
-    ADD_STAT_TRIGGER_CHILD = 1245,
-    CHECK_TRIGGERS_AND_FIRE_IF_NEEDED = 1246,
-    STAT_EVENT_TRIGGERED = 1247,
-    GET_CURRENT_SPEED = 1248,
-    RACING_PLAYER_RANK_CHANGED = 1249,
-    RACING_PLAYER_WRONG_WAY_STATUS_CHANGED = 1250,
-    RACING_PLAYER_CROSSED_FINISH_LINE = 1251,
-    RACING_RESET_PLAYER_TO_LAST_RESET = 1252,
+	SERVER_TRADE_CANCEL = 883,
+	SERVER_TRADE_ACCEPT = 884,
+	GET_TRADE_INFO = 885,
+	KF_LOADED = 886,
+	BRICKS_LOADED = 887,
+	READY_FOR_UPDATES = 888,
+	SEND_READY_FOR_UPDATES = 889,
+	SET_LAST_CUSTOM_BUILD = 890,
+	GET_LAST_CUSTOM_BUILD = 891,
+	GET_STATUS_EFFECT_BY_ID = 892,
+	GET_ALL_STATUS_EFFECTS = 893,
+	CHILD_RENDER_COMPONENT_READY = 894,
+	NOTIFY_APPEARANCE_CHANGED_MSG = 895,
+	SET_PHYSICS_MOTION_STATE = 896,
+	GET_PHYSICS_MOTION_STATE = 897,
+	ATTACH_GRAYSCALE_EFFECT = 898,
+	ATTACH_FADE_EFFECT = 899,
+	ATTACH_CHANGE_RENDER_ENVIRONMENT_EFFECT = 900,
+	FORCE_MOVEMENT = 901,
+	CANCEL_FORCE_MOVEMENT = 902,
+	SET_IGNORE_PROJECTILE_COLLISION = 903,
+	GET_IGNORE_PROJECTILE_COLLISION = 904,
+	ORIENT_TO_OBJECT = 905,
+	ORIENT_TO_POSITION = 906,
+	ORIENT_TO_ANGLE = 907,
+	NOTIFY_CLIENT_UGC_MODEL_READY = 909,
+	NOTIFY_CLIENT_UGC_ICON_READY = 911,
+	PROPERTY_BUILD_MODE_CHANGED = 912,
+	PROPERTY_BUILD_MODE_UPDATE = 913,
+	PROPERTY_DELETION_ACTION = 914,
+	PROPERTY_MODERATION_STATUS_ACTION = 915,
+	PROPERTY_MODERATION_STATUS_ACTION_RESPONSE = 916,
+	PROPERTY_MODERATION_STATUS_UPDATE = 917,
+	PROPERTY_NEEDS_GM_ATTENTION = 918,
+	PROPERTY_MODERATION_CHANGED = 919,
+	INVENTORY_REFRESH_ITEM_DETAILS = 922,
+	INVENTORY_LOAD_CUSTOM_ICON = 923,
+	GET_STATUS_EFFECT_BY_TYPE = 924,
+	RELEASE_CHARGED_SKILL = 925,
+	PROPERTY_RELOAD_DB = 926,
+	SET_PLAYER_TARGET = 927,
+	GET_PLAYER_TARGET = 928,
+	LOCK_CAMERA_NETWORKED = 929,
+	MOVE_CAMERA_NETWORKED = 930,
+	REBUILD_ACTIVATED = 931,
+	BOUNCE_NOTIFICATION = 932,
+	REQUEST_CLIENT_BOUNCE = 934,
+	GET_RECENT_BOUNCED = 935,
+	SET_RECENT_BOUNCED = 936,
+	SET_ACTIVE_STATE = 937,
+	GET_ACTIVE_STATE = 938,
+	HAS_COMPONENT_TYPE = 939,
+	GET_COMPONENT_LIST = 940,
+	RESPONDS_TO_FACTION = 941,
+	BOUNCER_ACTIVE_STATUS = 942,
+	HF_ATTRIBUTES_PUSH = 943,
+	HF_ATTRIBUTES_PULL = 944,
+	HF_ATTRIBUTES_PATH_DISPLAY = 945,
+	HF_CONTROLS_PULL = 946,
+	HF_OBJECT_SELECTED = 947,
+	HF_PLACEHOLDER_UPDATE = 948,
+	HF_PLACEHOLDER_TOGGLE = 949,
+	HF_GET_ASSOCIATED_PATHS = 950,
+	HF_GETS_WANT_PATH = 951,
+	GET_RECENT_MOVEMENT_KEYS = 952,
+	TRACK_RECENT_MOVEMENT_KEYS = 953,
+	PHYSICS_MOVEMENT_NOTIFICATION_REQUEST = 954,
+	PHYSICS_MOVEMENT_NOTIFICATION = 955,
+	MOVE_INVENTORY_SINGLE = 956,
+	MOVE_INVENTORY_BATCH = 957,
+	MINI_GAME_SET_PARAMETERS = 958,
+	MINI_GAME_GET_TEAM_SKILLS = 961,
+	MINI_GAME_GET_TEAM_SCORE = 963,
+	MINI_GAME_GET_PLAYER_SCORE = 967,
+	MINI_GAME_GET_TEAM_COLOR = 972,
+	MINI_GAME_GET_TEAM_PLAYERS = 975,
+	MINI_GAME_UPDATE_CLIENT = 976,
+	MINI_GAME_GET_TEAM = 977,
+	MINI_GAME_GET_PARAMETERS = 978,
+	OBJECT_ACTIVATED_CLIENT = 980,
+	IS_RESURRECTING = 983,
+	GET_ITEM_OWNER = 984,
+	GET_STORED_CONFIG_DATA = 985,
+	SET_STORED_CONFIG_DATA = 986,
+	ON_PLAYER_RESSURECTED = 988,
+	PLAYER_RESURRECTION_FINISHED = 989,
+	TRANSFORM_CHANGELING_BUILD = 990,
+	RETURN_CHANGELING_BUILD_ID = 991,
+	SPEND_BRICK_INVENTORY_FOR_LXFML = 992,
+	BRICK_INVENTORY_FOR_LXFML_SPENT = 993,
+	REBUILD_BBB_AUTOSAVE_MSG = 995,
+	SET_BBB_AUTOSAVE = 996,
+	USE_BBB_INVENTORY = 998,
+	UN_USE_BBB_MODEL = 999,
+	BBB_LOAD_ITEM_REQUEST = 1000,
+	BBB_SAVE_REQUEST = 1001,
+	BBBLUP_SAVE_REQUEST = 1002,
+	BBB_GET_METADATA_SOURCE_ITEM = 1003,
+	BBB_RESET_METADATA_SOURCE_ITEM = 1004,
+	BBB_SAVE_RESPONSE = 1005,
+	PLAYER_EXIT = 1006,
+	SET_PVP_STATUS = 1008,
+	GET_PVP_STATUS = 1009,
+	IS_VALID_PVP_TARGET = 1010,
+	PVP_RENDER_NAME = 1011,
+	ATTACH_OBJECT = 1012,
+	DETACH_OBJECT = 1013,
+	BOUNCE_SUCCEEDED = 1014,
+	GET_GAME_OBJECT_POINTER = 1015,
+	PHANTOM_HKX_LOADED = 1016,
+	DELAY_CREATE_EFFECT = 1017,
+	CHOICE_BUILD_SELECTION_CONFIRMED = 1018,
+	NOTIFY_FADE_UP_VIS_COMPLETE = 1019,
+	ITEM_HAS_NEW_INFO = 1020,
+	RESET_SECONDARY_ANIMATION = 1021,
+	GET_PICK_TYPE = 1022,
+	SET_PICK_TYPE = 1023,
+	GET_PRIORITY_PICK_LIST_TYPE = 1024,
+	REQUEST_PICK_TYPE_UPDATE = 1025,
+	GET_OVERRIDE_PICK_TYPE = 1026,
+	REQUEST_DISPLAY_OBJECT_INFO = 1027,
+	REQUEST_SERVER_OBJECT_INFO = 1028,
+	REQUEST_OBJECT_INFO_AS_XML = 1029,
+	GET_OBJECT_REPORT_INFO = 1030,
+	GET_OBJECT_REPORT_WINDOW_CLOSE = 1031,
+	GET_OBJECT_REPORT_STATUS = 1032,
+	GET_MISSION_DATA_FOR_OBJECT_REPORT = 1033,
+	GET_OBJECT_ROLLOVER_INFO = 1034,
+	PERFORM_ZONE_ANALYSIS = 1035,
+	UPDATE_HK_VISUAL_IZATION = 1036,
+	CLEAR_ITEMS_OWNER = 1037,
+	APPLY_LINEAR_IMPULSE = 1038,
+	APPLY_ANGULAR_IMPULSE = 1039,
+	GET_CONTACT_NORMALS = 1040,
+	IS_WATCHING_FOR_EMOTE = 1041,
+	NOTIFY_CLIENT_OBJECT = 1042,
+	DISPLAY_ZONE_SUMMARY = 1043,
+	ZONE_SUMMARY_DISMISSED = 1044,
+	GET_PLAYER_ZONE_STATISTIC = 1045,
+	MODIFY_PLAYER_ZONE_STATISTIC = 1046,
+	APPLY_EXTERNAL_FORCE = 1049,
+	GET_APPLIED_EXTERNAL_FORCE = 1050,
+	ITEM_EQUIPPED = 1052,
+	ACTIVITY_STATE_CHANGE_REQUEST = 1053,
+	OVERRIDE_FRICTION = 1054,
+	ARRANGE_WITH_ITEM = 1055,
+	CHECK_CAN_BUILD_WITH_ITEM = 1056,
+	START_BUILDING_WITH_ITEM = 1057,
+	START_BUILD_SESSION = 1058,
+	FINISH_BUILD_SESSION = 1059,
+	DONE_BUILD_SESSION = 1060,
+	START_ARRANGING_WITH_ITEM = 1061,
+	FINISH_ARRANGING_WITH_ITEM = 1062,
+	DONE_ARRANGING_WITH_ITEM = 1063,
+	START_ARRANGE_MODE = 1064,
+	ARRANGE_MODE_WITH_ITEM = 1065,
+	FINISH_ARRANGE_MODE = 1066,
+	DONE_ARRANGE_MODE = 1067,
+	SET_BUILD_MODE = 1068,
+	BUILD_MODE_SET = 1069,
+	CONFIRM_BUILD_MODE = 1070,
+	BUILD_MODE_CONFIRMATION = 1071,
+	BUILD_EXIT_CONFIRMATION = 1072,
+	SET_BUILD_MODE_CONFIRMED = 1073,
+	BUILD_MODE_NOTIFICATION = 1074,
+	BUILD_MODE_NOTIFICATION_REPORT = 1075,
+	CLIENT_USE_MODULE_ON = 1076,
+	SET_MODEL_TO_BUILD = 1077,
+	SPAWN_MODEL_BRICKS = 1078,
+	CHECK_PRECONDITION = 1079,
+	CHECK_ALL_PRECONDITIONS = 1080,
+	NOTIFY_CLIENT_FAILED_PRECONDITION = 1081,
+	GET_IS_ITEM_EQUIPPED_BY_LOT = 1082,
+	GET_IS_ITEM_EQUIPPED_BY_ID = 1083,
+	GET_OBJECT_DIRECTION_VECTORS = 1084,
+	GET_CASTABLE_SKILLS = 1085,
+	CHOICEBUILD_COMPLETE = 1086,
+	GET_MISSION_CHAT = 1087,
+	GET_MISSION_AUDIO = 1088,
+	MODULE_EQUIPPED = 1089,
+	MODULE_DROPPED = 1090,
+	MODULE_PICKED_UP = 1091,
+	MODULE_INFO = 1092,
+	MOVE_ITEM_BETWEEN_INVENTORY_TYPES = 1093,
+	MODULAR_BUILD_BEGIN = 1094,
+	MODULAR_BUILD_END = 1095,
+	MODULAR_BUILD_MOVE_AND_EQUIP = 1096,
+	MODULAR_BUILD_FINISH = 1097,
+	SET_REGISTRATION_FOR_UI_UPDATE = 1114,
+	GO_TO_WAYPOINT = 1115,
+	ARRIVED_AT_DESIRED_WAYPOINT = 1116,
+	CHECK_WITHIN_BOUNDS = 1117,
+	ATTACH_TO_BUILD_ASSEMBLY = 1118,
+	SET_BUILD_ASSEMBLY = 1119,
+	RESET_BUILD_ASSEMBLY = 1120,
+	GET_INVENTORY_ITEM_INFO = 1125,
+	GET_ITEM_DETAILS = 1126,
+	GET_BUILD_ACTIVATOR = 1127,
+	GET_MISSION_ANIMATION = 1128,
+	MISSION_DIALOGUE_CANCELLED = 1129,
+	MODULE_ASSEMBLY_DB_DATA = 1130,
+	MODULE_ASSEMBLY_DB_DATA_FOR_CLIENT = 1131,
+	MODULE_ASSEMBLY_QUERY_DATA = 1132,
+	MODULE_ASSEMBLY_HKX_LOADED = 1133,
+	MODULE_ASSEMBLY_NIF_LOADED = 1134,
+	MODULE_ASSEMBLY_MAIN_NIF_LOADED = 1135,
+	MODULE_ASSEMBLY_KFM_LOADED = 1136,
+	GET_PRECONDITION_INFO = 1137,
+	GET_MODEL_LOT = 1138,
+	ANIMATION_FINISHED_PRELOADING = 1139,
+	CHILD_BUILD_ASSEMBLY_COMPLETE = 1140,
+	CHARACTER_UNSERIALIZED = 1141,
+	CHARACTER_NEEDS_TRANSITION = 1142,
+	SET_NEEDS_TRANSITION = 1143,
+	ECHO_SYNC_SKILL = 1144,
+	SYNC_SKILL = 1145,
+	GET_BEHAVIOR_HANDLE = 1146,
+	ADD_OUTSTANDING_BEHAVIOR = 1147,
+	REQUEST_SERVER_PROJECTILE_IMPACT = 1148,
+	OFF_WORLD_IMPACT_REQUEST = 1149,
+	SERVER_IMPACT_REQUEST = 1150,
+	DO_CLIENT_PROJECTILE_IMPACT = 1151,
+	MODULE_ASSEMBLY_PART_INFO = 1152,
+	GET_BUILD_TYPE = 1153,
+	CHECK_BUILD_TYPE = 1154,
+	MODULAR_BUILD_CONVERT_MODEL = 1155,
+	DO_NPC_SHOWCASE_MODEL_SUBMISSION = 1156,
+	GET_MISSION_I_DS_LIST = 1157,
+	SET_SHOWCASE_MISSION_NPC_VALS = 1158,
+	NOTIFY_SHOWCASE_MISSION_NP_COF_SUCCESS = 1159,
+	SEND_LUA_NOTIFICATION_REQUEST = 1160,
+	SEND_LUA_NOTIFICATION_CANCEL = 1161,
+	ACTIVATOR_TOGGLE = 1162,
+	MAKE_PHYSICS = 1163,
+	SET_RESPAWN_GROUP = 1164,
+	SET_PLAYER_ALLOWED_RESPAWN = 1165,
+	TOGGLE_SENDING_POSITION_UPDATES = 1166,
+	TOGGLE_RECEIVING_POSITION_UPDATES = 1167,
+	GET_ENEMY_PRECONDITIONS = 1168,
+	START_MODEL_VISUALIZATION = 1169,
+	PLACE_PROPERTY_MODEL = 1170,
+	PROPERTY_MODEL_PLACED = 1171,
+	OPEN_EXHIBIT_REPLACE_MODEL_UI = 1172,
+	REPLACE_SHOWCASEMODEL = 1173,
+	CLEAR_UI_HOOK_EXHIBIT_REPLACEMENT = 1174,
+	ATTACH_FLYTO_SCREEN_POS = 1175,
+	VEHICLE_GET_DEBUG_INFO = 1176,
+	VEHICLE_GET_MOVEMENT_INPUT_VALUES = 1177,
+	ACTIVITY_TIMER_SET = 1178,
+	ACTIVITY_TIMER_UPDATE = 1179,
+	ACTIVITY_TIMER_GET = 1180,
+	ACTIVITY_TIMER_STOP = 1181,
+	ACTIVITY_TIMER_DONE = 1182,
+	GET_ATTACK_PRIORITY = 1183,
+	UI_MESSAGE_SERVER_TO_SINGLE_CLIENT = 1184,
+	UI_MESSAGE_SERVER_TO_ALL_CLIENTS = 1185,
+	SET_LOSE_COINS_ON_DEATH = 1186,
+	LOAD_EFFECTS = 1187,
+	SET_CUSTOM_BUILD = 1188,
+	ACTIVITY_TIMER_RESET = 1189,
+	ACTIVITY_TIMER_STOP_ALL_TIMERS = 1190,
+	ACTIVITY_TIMER_MODIFY = 1191,
+	SET_KEYFRAM_TRANSFORM = 1192,
+	ADD_ACTIVITY_OWNER = 1193,
+	REMOVE_ACTIVITY_OWNER = 1194,
+	GET_CURRENT_ACTIVITY_OWNERS = 1195,
+	TOGGLE_SKILL_DEBUGGING = 1196,
+	PET_TAMING_TRY_BUILD = 1197,
+	REPORT_BUG = 1198,
+	REPORT_OFFENSIVE_MODEL = 1199,
+	REPORT_OFFENSIVE_PROPERTY = 1200,
+	GET_ACTIVITY_ID = 1201,
+	REQUEST_SMASH_PLAYER = 1202,
+	GET_TIMES_REQUESTED_SMASH = 1203,
+	RESPONSE_SMASH_PLAYER = 1204,
+	MODIFY_DAMAGE_ABSORPTION = 1205,
+	UNCAST_SKILL = 1206,
+	GET_SHOWCASE_MODEL_READY = 1207,
+	IS_SKILL_NEEDED = 1208,
+	GET_COMPONENT_DATA = 1209,
+	VEHICLE_SET_POWERSLIDE_METHOD = 1210,
+	SHOWS_NAMETAG = 1211,
+	FIRE_EVENT_CLIENT_SIDE = 1213,
+	GET_REQUIRES_NAME_RESUBMISSION = 1216,
+	SET_REQUIRES_NAME_RESUBMISSION = 1217,
+	TOGGLE_GM_INVIS = 1218,
+	GET_GM_INVIS = 1219,
+	KILLED_PLAYER = 1220,
+	GET_PICKUP_SKILLS = 1221,
+	GET_FACTION_SKILL = 1222,
+	CHANGE_OBJECT_WORLD_STATE = 1223,
+	GET_OBJECT_WORLD_STATE = 1224,
+	VISIBILITY_CHANGED = 1225,
+	MOTION_EFFECT_COMPLETE = 1226,
+	TOGGLE_FREEZE_MODE = 1227,
+	SHADER_RENDER_MSG_APPLIED = 1228,
+	PLAYER_RENAME_REQUEST = 1229,
+	VEHICLE_LOCK_INPUT = 1230,
+	VEHICLE_UNLOCK_INPUT = 1231,
+	SET_AIR_MOVEMENT = 1232,
+	MOVEMENT_STATE_CHANGED = 1233,
+	SKILL_MOVEMENT_CANCELLED = 1234,
+	AIR_MOVEMENT_COMPLETE = 1235,
+	CANCEL_AIR_MOVEMENT = 1236,
+	FORCE_MINIFIGURE_TEXTURE_UPDATE = 1237,
+	RESYNC_EQUIPMENT = 1238,
+	ADD_COMPONENT_TO_OBJECT = 1239,
+	VEHICLE_GET_MAX_GAME_SPEED = 1240,
+	VEHICLE_GET_MAX_GAME_SPEED_WITH_BOOST = 1241,
+	GET_SPEED_FACTOR = 1242,
+	FREEZE_INVENTORY = 1243,
+	ADD_STAT_TRIGGER = 1244,
+	ADD_STAT_TRIGGER_CHILD = 1245,
+	CHECK_TRIGGERS_AND_FIRE_IF_NEEDED = 1246,
+	STAT_EVENT_TRIGGERED = 1247,
+	GET_CURRENT_SPEED = 1248,
+	RACING_PLAYER_RANK_CHANGED = 1249,
+	RACING_PLAYER_WRONG_WAY_STATUS_CHANGED = 1250,
+	RACING_PLAYER_CROSSED_FINISH_LINE = 1251,
+	RACING_RESET_PLAYER_TO_LAST_RESET = 1252,
 	RACING_SERVER_SET_PLAYER_LAP_AND_PLANE = 1253,
-    RACING_SET_PLAYER_RESET_INFO = 1254,
-    RACING_PLAYER_INFO_RESET_FINISHED = 1255,
-    RACING_PLAYER_OUT_OF_TRACK_BOUNDS = 1256,
-    RACING_SYNC_INFO = 1257,
-    RACING_PLAYER_KEEP_ALIVE = 1258,
-    RACING_SERVER_KEEP_ALIVE = 1259,
-    LOCK_NODE_ROTATION = 1260,
-    GET_PHYSICS_COLLIDABLE = 1261,
-    SET_PHYSICS_COLOR_FOR_DEBUG = 1262,
-    GET_PHYSICS_COLOR_FOR_DEBUG = 1263,
-    SET_PHYSICS_TEXT_AND_STATE_FOR_DEBUG = 1264,
-    REQUEST_INFO_FOR_PHYSICS_DEBUGGER = 1265,
-    GET_COLLIDABLE_AT_ADDRESS = 1266,
-    REQUEST_SERVER_GET_COLLIDABLE_REPORT = 1267,
-    COLLISION_POINT_ADDED = 1268,
-    COLLISION_POINT_REMOVED = 1269,
-    SET_ATTACHED = 1270,
-    SET_DESTROYABLE_MODEL_BRICKS = 1271,
-    VEHICLE_SET_POWERSLIDE_LOCK_WHEELS = 1272,
-    VEHICLE_SET_WHEEL_LOCK_STATE = 1273,
-    SHOW_HEALTH_BAR = 1274,
-    GET_SHOWS_HEALTH_BAR = 1275,
-    NOTIFY_VEHICLE_OF_RACING_OBJECT = 1276,
-    ENABLE_CLIENT_EQUIP_MODE = 1278,
-    CLIENT_EQUIP_MODE_WAS_CHANGED = 1279,
-    VEHICLE_GET_SPAWN_HEIGHT = 1281,
-    SET_NAME_BILLBOARD_STATE = 1284,
-    CHECK_TARGETING_REQUIREMENTS = 1285,
-    VEHICLE_CAN_WRECK = 1286,
-    ATTACH_RENDER_EFFECT = 1287,
-    DETACH_RENDER_EFFECT = 1288,
-    IS_PET_USING_ABILITY = 1289,
-    SET_BLOCKING = 1290,
-    GET_BLOCKING = 1291,
-    UPDATE_BLOCKING = 1292,
-    CHECK_DAMAGE_RESULTS = 1293,
-    GET_OBJECT_IS_IN_RENDER_PIPE = 1294,
-    ATTACH_MOTION_FX_ARC = 1295,
-    PLAYER_REACHED_RESPAWN_CHECKPOINT = 1296,
-    GET_LAST_RESPAWN_CHECKPOINT = 1297,
-    GET_VEHICLE_DEBUG_COLLISIONS = 1298,
-    VISITING_PROPERTY = 1299,
-    HANDLE_UGC_POST_DELETE_BASED_ON_EDIT_MODE = 1300,
-    HANDLE_UGC_POST_CREATE_BASED_ON_EDIT_MODE = 1301,
-    WORLD_CHECK_RESPONSE = 1302,
-    ADD_DAMAGE_REDUCTION = 1303,
-    REMOVE_DAMAGE_REDUCTION = 1304,
-    PROPERTY_CONTENTS_FROM_CLIENT = 1305,
-    GET_MODELS_ON_PROPERTY = 1306,
-    IS_SHOWCASE_DISPLAY_PEDESTAL = 1307,
-    MATCH_REQUEST = 1308,
-    MATCH_RESPONSE = 1309,
-    MATCH_UPDATE = 1310,
-    IS_DEFAULT_SKILL_ACTIVE = 1311,
-    PROPERTY_EDITOR_CARRY = 1312,
-    GET_LOOT_OWNER_ID = 1313,
-    GET_ENEMY_LOOT_TAG = 1314,
-    GET_NUM_SPAWNED_BRICKS = 1315,
-    SET_ITEM_EQUIP_TRANSFORM = 1316,
-    GET_ITEM_EQUIP_TRANSFORM = 1317,
-    GET_PROPERTY_BUDGET_INFO = 1318,
-    CHATBOX_IS_INIT = 1319,
-    GET_SPAWNED_I_DS = 1320,
-    GET_IMMUNITY = 1321,
-    GET_GM_IMMUNITY = 1322,
-    PROCESS_REMOTE_SLASH_COMMAND = 1323,
-    IS_FRIEND_MSG = 1324,
-    RACING_PLAYER_EVENT = 1325,
-    GET_PROPERTY_EDIT_VALID = 1326,
-    REFRESH_RENDER_ASSET = 1327,
-    VEHICLE_APPLY_STAT_CHANGE = 1328,
-    ZONE_LOADED_INFO = 1329,
-    B3_INTERFACE_ACTION = 1330,
-    RACING_STAT_MODIFIERS_FROM_CLIENT = 1332,
-    GET_RACING_STAT_MODIFIERS = 1333,
-    SET_RACING_STAT_MODIFIERS = 1334,
-    GET_RACING_LICENSE_LEVEL = 1335,
-    ADD_EQUIP_CAST = 1336,
-    SHOW_BILLBOARD_INTERACT_ICON = 1337,
-    CHANGE_IDLE_FLAGS = 1338,
-    GET_ANIMATION_FLAG = 1339,
-    VEHICLE_ADD_PASSIVE_BOOST_ACTION = 1340,
-    VEHICLE_REMOVE_PASSIVE_BOOST_ACTION = 1341,
-    NOTIFY_SERVER_VEHICLE_ADD_PASSIVE_BOOST_ACTION = 1342,
-    NOTIFY_SERVER_VEHICLE_REMOVE_PASSIVE_BOOST_ACTION = 1343,
-    VEHICLE_ADD_SLOWDOWN_ACTION = 1344,
-    VEHICLE_REMOVE_SLOWDOWN_ACTION = 1345,
-    NOTIFY_SERVER_VEHICLE_ADD_SLOWDOWN_ACTION = 1346,
-    NOTIFY_SERVER_VEHICLE_REMOVE_SLOWDOWN_ACTION = 1347,
-    FORCE_UPDATE_ANIMATIONS = 1348,
-    MATCH_GET_DATA_FOR_PLAYER = 1349,
-    BUYBACK_FROM_VENDOR = 1350,
-    SET_INVENTORY_FILTER = 1351,
-    GET_INVENTORY_FILTER = 1352,
-    GET_INVENTORY_GROUPS = 1353,
-    GET_INVENTORY_GROUP = 1354,
-    UPDATE_INVENTORY_GROUP = 1355,
-    UPDATE_INVENTORY_UI = 1356,
-    UPDATE_INVENTORY_GROUP_CONTENTS = 1357,
-    CAN_REMOVE_ITEM_FROM_INVENTORY = 1362,
-    DRIVE_THIS_CAR = 1363,
-    VEHICLE_CAN_ADD_ACTIVE_BOOST = 1364,
-    VEHICLE_ADD_ACTIVE_BOOST = 1365,
-    SET_PROPERTY_ACCESS = 1366,
+	RACING_SET_PLAYER_RESET_INFO = 1254,
+	RACING_PLAYER_INFO_RESET_FINISHED = 1255,
+	RACING_PLAYER_OUT_OF_TRACK_BOUNDS = 1256,
+	RACING_SYNC_INFO = 1257,
+	RACING_PLAYER_KEEP_ALIVE = 1258,
+	RACING_SERVER_KEEP_ALIVE = 1259,
+	LOCK_NODE_ROTATION = 1260,
+	GET_PHYSICS_COLLIDABLE = 1261,
+	SET_PHYSICS_COLOR_FOR_DEBUG = 1262,
+	GET_PHYSICS_COLOR_FOR_DEBUG = 1263,
+	SET_PHYSICS_TEXT_AND_STATE_FOR_DEBUG = 1264,
+	REQUEST_INFO_FOR_PHYSICS_DEBUGGER = 1265,
+	GET_COLLIDABLE_AT_ADDRESS = 1266,
+	REQUEST_SERVER_GET_COLLIDABLE_REPORT = 1267,
+	COLLISION_POINT_ADDED = 1268,
+	COLLISION_POINT_REMOVED = 1269,
+	SET_ATTACHED = 1270,
+	SET_DESTROYABLE_MODEL_BRICKS = 1271,
+	VEHICLE_SET_POWERSLIDE_LOCK_WHEELS = 1272,
+	VEHICLE_SET_WHEEL_LOCK_STATE = 1273,
+	SHOW_HEALTH_BAR = 1274,
+	GET_SHOWS_HEALTH_BAR = 1275,
+	NOTIFY_VEHICLE_OF_RACING_OBJECT = 1276,
+	ENABLE_CLIENT_EQUIP_MODE = 1278,
+	CLIENT_EQUIP_MODE_WAS_CHANGED = 1279,
+	VEHICLE_GET_SPAWN_HEIGHT = 1281,
+	SET_NAME_BILLBOARD_STATE = 1284,
+	CHECK_TARGETING_REQUIREMENTS = 1285,
+	VEHICLE_CAN_WRECK = 1286,
+	ATTACH_RENDER_EFFECT = 1287,
+	DETACH_RENDER_EFFECT = 1288,
+	IS_PET_USING_ABILITY = 1289,
+	SET_BLOCKING = 1290,
+	GET_BLOCKING = 1291,
+	UPDATE_BLOCKING = 1292,
+	CHECK_DAMAGE_RESULTS = 1293,
+	GET_OBJECT_IS_IN_RENDER_PIPE = 1294,
+	ATTACH_MOTION_FX_ARC = 1295,
+	PLAYER_REACHED_RESPAWN_CHECKPOINT = 1296,
+	GET_LAST_RESPAWN_CHECKPOINT = 1297,
+	GET_VEHICLE_DEBUG_COLLISIONS = 1298,
+	VISITING_PROPERTY = 1299,
+	HANDLE_UGC_POST_DELETE_BASED_ON_EDIT_MODE = 1300,
+	HANDLE_UGC_POST_CREATE_BASED_ON_EDIT_MODE = 1301,
+	WORLD_CHECK_RESPONSE = 1302,
+	ADD_DAMAGE_REDUCTION = 1303,
+	REMOVE_DAMAGE_REDUCTION = 1304,
+	PROPERTY_CONTENTS_FROM_CLIENT = 1305,
+	GET_MODELS_ON_PROPERTY = 1306,
+	IS_SHOWCASE_DISPLAY_PEDESTAL = 1307,
+	MATCH_REQUEST = 1308,
+	MATCH_RESPONSE = 1309,
+	MATCH_UPDATE = 1310,
+	IS_DEFAULT_SKILL_ACTIVE = 1311,
+	PROPERTY_EDITOR_CARRY = 1312,
+	GET_LOOT_OWNER_ID = 1313,
+	GET_ENEMY_LOOT_TAG = 1314,
+	GET_NUM_SPAWNED_BRICKS = 1315,
+	SET_ITEM_EQUIP_TRANSFORM = 1316,
+	GET_ITEM_EQUIP_TRANSFORM = 1317,
+	GET_PROPERTY_BUDGET_INFO = 1318,
+	CHATBOX_IS_INIT = 1319,
+	GET_SPAWNED_I_DS = 1320,
+	GET_IMMUNITY = 1321,
+	GET_GM_IMMUNITY = 1322,
+	PROCESS_REMOTE_SLASH_COMMAND = 1323,
+	IS_FRIEND_MSG = 1324,
+	RACING_PLAYER_EVENT = 1325,
+	GET_PROPERTY_EDIT_VALID = 1326,
+	REFRESH_RENDER_ASSET = 1327,
+	VEHICLE_APPLY_STAT_CHANGE = 1328,
+	ZONE_LOADED_INFO = 1329,
+	B3_INTERFACE_ACTION = 1330,
+	RACING_STAT_MODIFIERS_FROM_CLIENT = 1332,
+	GET_RACING_STAT_MODIFIERS = 1333,
+	SET_RACING_STAT_MODIFIERS = 1334,
+	GET_RACING_LICENSE_LEVEL = 1335,
+	ADD_EQUIP_CAST = 1336,
+	SHOW_BILLBOARD_INTERACT_ICON = 1337,
+	CHANGE_IDLE_FLAGS = 1338,
+	GET_ANIMATION_FLAG = 1339,
+	VEHICLE_ADD_PASSIVE_BOOST_ACTION = 1340,
+	VEHICLE_REMOVE_PASSIVE_BOOST_ACTION = 1341,
+	NOTIFY_SERVER_VEHICLE_ADD_PASSIVE_BOOST_ACTION = 1342,
+	NOTIFY_SERVER_VEHICLE_REMOVE_PASSIVE_BOOST_ACTION = 1343,
+	VEHICLE_ADD_SLOWDOWN_ACTION = 1344,
+	VEHICLE_REMOVE_SLOWDOWN_ACTION = 1345,
+	NOTIFY_SERVER_VEHICLE_ADD_SLOWDOWN_ACTION = 1346,
+	NOTIFY_SERVER_VEHICLE_REMOVE_SLOWDOWN_ACTION = 1347,
+	FORCE_UPDATE_ANIMATIONS = 1348,
+	MATCH_GET_DATA_FOR_PLAYER = 1349,
+	BUYBACK_FROM_VENDOR = 1350,
+	SET_INVENTORY_FILTER = 1351,
+	GET_INVENTORY_FILTER = 1352,
+	GET_INVENTORY_GROUPS = 1353,
+	GET_INVENTORY_GROUP = 1354,
+	UPDATE_INVENTORY_GROUP = 1355,
+	UPDATE_INVENTORY_UI = 1356,
+	UPDATE_INVENTORY_GROUP_CONTENTS = 1357,
+	CAN_REMOVE_ITEM_FROM_INVENTORY = 1362,
+	DRIVE_THIS_CAR = 1363,
+	VEHICLE_CAN_ADD_ACTIVE_BOOST = 1364,
+	VEHICLE_ADD_ACTIVE_BOOST = 1365,
+	SET_PROPERTY_ACCESS = 1366,
 	ZONE_PROPERTY_MODEL_PLACED = 1369,
-    ZONE_PROPERTY_MODEL_ROTATED = 1370,
-    ZONE_PROPERTY_MODEL_REMOVED_WHILE_EQUIPPED = 1371,
-    ZONE_PROPERTY_MODEL_EQUIPPED = 1372,
+	ZONE_PROPERTY_MODEL_ROTATED = 1370,
+	ZONE_PROPERTY_MODEL_REMOVED_WHILE_EQUIPPED = 1371,
+	ZONE_PROPERTY_MODEL_EQUIPPED = 1372,
 	ZONE_PROPERTY_MODEL_PICKED_UP = 1373,
 	ZONE_PROPERTY_MODEL_REMOVED = 1374,
-    GET_VERSIONING_INFO = 1381,
-    OPEN_UG_BEHAVIOR_UI = 1382,
-    VEHICLE_NOTIFY_HIT_SMASHABLE = 1383,
-    GET_TETHER_RADIUS = 1384,
-    VEHICLE_NOTIFY_HIT_EXPLODER = 1385,
-    CHECK_NEAREST_ROCKET_LAUNCH_PRE_CONDITIONS = 1386,
-    REQUEST_NEAREST_ROCKET_LAUNCH_PRE_CONDITIONS = 1387,
-    CONFIGURE_RACING_CONTROL_CLIENT = 1389,
-    NOTIFY_RACING_CLIENT = 1390,
-    RACING_PLAYER_HACK_CAR = 1391,
-    RACING_PLAYER_LOADED = 1392,
-    RACING_CLIENT_READY = 1393,
-    POSSESSION_FINISHED_ATTACH = 1394,
-    UPDATE_CHAT_MODE = 1395,
-    VEHICLE_NOTIFY_FINISHED_RACE = 1396,
-    EQUIPPED_ITEM_STARTUP = 1397,
-    FACTION_TRIGGER_ITEM_EQUIPPED = 1400,
-    FACTION_TRIGGER_ITEM_UNEQUIPPED = 1401,
-    TOGGLE_PROPERTY_BEHAVIORS = 1402,
-    GET_UG_OBJECT_INFO = 1405,
-    RESET_PROPERTY_BEHAVIORS = 1406,
-    IS_PROPERTY_MODEL_RESET = 1407,
-    SET_UG_OBJECT_NAME_AND_DESCRIPTION = 1408,
-    SET_CONSUMABLE_ITEM = 1409,
-    VEHICLE_GET_CURRENT_LAP = 1410,
-    GET_UGID = 1411,
-    SET_UGID = 1412,
-    UGID_CHANGED = 1413,
-    RACING_GET_CURRENT_LAP_FOR_PLAYER = 1414,
-    SUB_ITEM_UN_EQUIPPED = 1415,
-    SET_CUSTOM_DROP_SHADOW_TEXTURE = 1416,
-    GET_PLAYER_KIT_FACTION = 1418,
-    USED_INFORMATION_PLAQUE = 1419,
-    RACING_ENABLE_WRONG_WAY_RESET = 1420,
-    RACING_TOGGLE_RUBBER_BANDING = 1421,
-    GET_RACING_CONTROL_DEBUG_INFO = 1422,
-    SET_PROPERTY_BOUNDS_VISIBILITY = 1423,
-    SET_PROPERTY_VENDOR_VISIBILITY = 1424,
-    SET_EQUIP_STATE = 1425,
-    NOTIFY_COMBAT_AI_STATE_CHANGE = 1426,
-    SET_PROPERTY_MODEL_INTERACTIVE = 1430,
-    SERVER_STATE_NOTIFY = 1431,
-    GET_SERVER_STATE = 1432,
-    GET_ICON_FOR_PROXIMITY = 1433,
-    GET_LEGO_CLUB_MEMBERSHIP_STATUS = 1434,
-    SET_STATUS_IMMUNITY = 1435,
-    GET_STATUS_IMMUNITY = 1436,
-    TEAM_IS_MEMBER = 1437,
-    ACTIVATE_BRICK_MODE = 1438,
-    GET_BUILD_OBJECT_ID = 1439,
-    SET_ANIMATION_ENABLED = 1444,
-    PAUSE_COOLDOWNS = 1446,
-    FORCE_UPDATE_RENDER_NODE = 1447,
-    SET_PET_NAME_MODERATED = 1448,
-    TOGGLE_STRAFE_MODE = 1449,
-    SET_SCHEME_SPEED_SCALE = 1450,
-    CANCEL_SKILL_CAST = 1451,
-    CHECK_PLAYER_ASSEMBLY_FOR_UNIQUE_MODULE_BY_LOT = 1454,
-    MODULE_ASSEMBLY_DB_DATA_TO_LUA = 1455,
-    IS_ALLY = 1458,
-    MODIFY_LEGO_SCORE = 1459,
-    GET_LEGO_SCORE = 1460,
-    GET_PLAYER_LEVEL = 1461,
-    NOTIFY_LEGO_SCORE_UPDATE = 1462,
-    SET_LEGO_SCORE = 1463,
-    UPDATE_BEHAVIOR_EXECUTION_DETAILS = 1466,
-    RESTORE_TO_POST_LOAD_STATS = 1468,
-    PICKUP_OBJECT_ERROR = 1469,
-    CHECK_AND_SHOW_INVENTORY_FULL_TIP = 1470,
-    SET_RAIL_MOVEMENT = 1471,
-    START_RAIL_MOVEMENT = 1472,
-    SET_UP_VECTOR = 1473,
-    CANCEL_RAIL_MOVEMENT = 1474,
-    GET_RAIL_INFO = 1475,
-    CLIENT_RAIL_MOVEMENT_READY = 1476,
-    PLAYER_RAIL_ARRIVED_NOTIFICATION = 1477,
-    NOTIFY_RAIL_ACTOVATOR_STATE_CHANGE = 1478,
-    REQUEST_RAIL_ACTIVATOR_STATE = 1479,
-    NOTIFY_REWARD_MAILED = 1480,
-    UPDATE_PLAYER_STATISTIC = 1481,
-    IS_IN_COMBAT = 1482,
-    IS_PRIMITIVE_MODEL_MSG = 1483,
-    SCALE_PRIMITICE_MODEL_MSG = 1484,
-    MODIFY_GHOSTING_DISTANCE = 1485,
-    PRIMITIVE_MODEL_CHANGED_MSG = 1487,
-    GET_PROPRTY_CLONE_ID = 1488,
-    REQUEST_LEAVE_PROPERTY = 1489,
-    REQUERY_PROPERTY_MODELS = 1491,
-    GET_BEHAVIOR_COUNT = 1492,
-    UPDATE_BEHAVIOR_CONTROLS = 1493,
-    MODULE_ASSEMBLY_LXFML_LOADED = 1494,
-    REQUEST_ASSEMBLED_LXFML = 1495,
-    ASSEMBLED_LXFML_LOADED = 1496,
-    GET_REORIENT_UP_VECTOR = 1497,
-    MODULAR_ASSEMBLY_NIF_COMPLETED = 1498,
-    CHARACTER_DISCONNECT_BEFORE_CREATE = 1499,
-    SEND_LAUNCH_TO_PREVIOUS_ZONE_TO_CLIENT = 1500,
-    ROCKETLAUNCH_REQUEST_DEFAULT_MAP_ID = 1501,
-    BEGIN_LAUNCH = 1502,
-    PROCESS_CLAIM_CODES = 1503,
-    GET_LAST_ZONE_ID = 1504,
-    ADD_RUN_SPEED_MODIFIER = 1505,
-    REMOVE_RUN_SPEED_MODIFIER = 1506,
-    SKILL_EVENT_FIRED = 1507,
-    SEND_HOT_PROPERTY_DATA = 1510,
-    GET_HOT_PROPERTY_DATA = 1511,
-    GET_EQUIPPED_ITEMS_IN_SET = 1512,
-    IS_ITEM_IN_SET = 1513,
-    GET_INVENTORY_TYPE_FOR_LOT = 1514,
-    GET_BANK_TYPE_FOR_LOT = 1515,
-    NOTIFY_NOT_ENOUGH_INV_SPACE = 1516,
-    IMPORT_MODEL_TO_BBB = 1517,
-    SEARCH_NEARBY_OBJECTS = 1518,
-    SEARCH_NEARBY_OBJECTS_REQUEST_BY_LOT = 1519,
-    REQUEST_OBJECT_POSITION_BY_ID = 1520,
-    SEARCH_NEARBY_OBJECTS_REQUEST_BY_COMPONENT = 1521,
-    SEARCH_NEARBY_OBJECTS_RESPONSE = 1522,
-    BROADCAST_NON_STANDARD_COLLISIONS = 1523,
-    GET_REGISTERED_NON_STANDARD_COLLISION_GROUP = 1524,
-    BROADCAST_CRUSHED_NOTIFICATIONS = 1525,
-    GET_REGISTERED_CRUSHED_COLLISION_GROUPS = 1526,
-    IS_BEING_CRUSHED = 1527,
-    GET_SUPPORTING_OBJECT = 1528,
-    TREAT_RIGID_BODY_COLLSIONS_AS_FIXED = 1529,
-    BROADCAST_TELEPORTED_WITHIN_NOTIFICATION = 1530,
-    GET_REGISTERED_TELEPORTED_WITHIN_OBJECT_GROUP = 1531,
-    GET_INTERPENTRATING_INFORMATION = 1532,
-    OBJECT_TELEPORTED_WITHIN = 1533,
-    SET_PHYSICS_SOLVER_PROPERTIES = 1534,
-    HAS_BEHAVIORS = 1535,
-    PLAY_BEHAVIOR_SOUND = 1536,
-    GET_PLAYER_BEHAVIOR_TIER = 1537,
-    GET_EMOTE_ANIMATION_TIME = 1538,
-    GET_CHARACTER_STAT_TRACKING = 1539,
-    PLAYER_INVENTORY_READY = 1540,
-    SET_PRECONDITIONS = 1541,
-    DETACH_SHADOW = 1542,
-    GET_LOOT_INFO = 1543,
-    GET_PLAYERS_ON_PROPERTY = 1544,
-    PROPERTY_SPAWN_BY_BEHAVIOR = 1545,
-    NOTIFY_PROPERTY_OF_EDIT_MODE = 1546,
-    UPDATE_PROPERTY_PERFORMANCE_COST = 1547,
-    GET_PROPERTY_PERFORMANCE_COST = 1548,
-    GET_INVENTORY_ITEM_WITH_SUBKEY = 1549,
-    DISPLAY_PROPERTY_SUMMARY_SCREEN = 1550,
-    VALIDATE_BBB_MODEL = 1551,
-    BBB_MODEL_VALIDATION = 1552,
-    PROPERTY_ENTRANCE_BEGIN = 1553,
-    CHECK_LIST_OF_PRECONDITIONS_FROM_LUA = 1554,
-    GET_PROPERTYIN_ZONE = 1555,
-    GET_ZONE_ID_FROM_MULTI_ZONE_ENTRANCE = 1556,
-    TEAM_SET_LEADER = 1557,
-    TEAM_INVITE_CONFIRM = 1558,
-    TEAM_GET_STATUS_RESPONSE = 1559,
-    MINI_GAME_ENABLE_LOCAL_TEAMS = 1560,
-    TEAM_INVITE_FINAL_RESPONSE = 1561,
-    TEAM_ADD_PLAYER = 1562,
-    TEAM_REMOVE_PLAYER = 1563,
-    TEAM_CREATE_LOCAL = 1564,
-    TEAM_GET_LOOT = 1565,
-    TEAM_SET_LOOT = 1566,
-    SET_ZERO_IMPULSE_AGAINST_COLLISION_GROUPS = 1567,
-    SET_CENTER_OF_MASS_TO_PHYSICAL_CENTER = 1568,
-    SET_INERTIA_INVERSE = 1569,
-    ADD_REMOVE_CLIMBING_LISTENER = 1570,
-    GET_INVENTORYITEM_DETAILS = 1571,
-    PERFORM_CLIENT_SIDE_DEATH = 1572,
-    LEGO_CLUB_ACCESS_RESULT = 1573,
-    VEHICLE_GET_IS_REVERSING = 1574,
-    CHECK_CLAIM_CODE = 1575,
-    GET_HOLIDAY_EVENT = 1576,
-    SET_EMOTES_ENABLED = 1577,
-    GET_EMOTES_ENABLED = 1578,
-    FREEZE_ANIMATION = 1579,
-    LOCALIZED_ANNOUNCEMENT_SERVER_TO_SINGLE_CLIENT = 1580,
-    ANCHOR_FX_NODE = 1581,
-    WS_GET_FRIEND_LIST_MESSAGE = 1582,
-    WS_ADD_FRIEND_RESPONSE = 1583,
-    WS_REMOVE_FRIEND_REPSONSE = 1584,
-    WS_UPDATE_FRIEND_STATUS = 1585,
-    WS_UPDATE_FRIEND_NAME = 1586,
-    IS_BEST_FRIEND = 1587,
-    TEAM_NOTIFY_UPDATE_MISSION_TASK = 1588,
-    VEHICLE_ADD_SLIPPERY_ACTION = 1589,
-    VEHICLE_REMOVE_SLIPPERY_ACTION = 1590,
-    SET_RESURRECT_RESTORE_VALUES = 1591,
-    GET_MASS = 1592,
-    SET_PROPERTY_MODERATION_STATUS = 1593,
-    UPDATE_PROPERTY_MODEL_DEFAULTS = 1594,
-    UPDATE_PROPERTYMODEL_COUNT = 1595,
-    GET_PROPERTY_MODEL_COUNT = 1596,
-    IS_PLAYER_LOADED = 1597,
-    ATTACH_RENDER_EFFECT_FROM_LUA = 1598,
-    DETACH_RENDER_EFFECT_FROM_LUA = 1599,
-    TEAM_IS_LOCAL = 1600,
-    CREATE_CAMERA_PARTICLES = 1602,
-    SET_SMASHABLE_GRAVITY_FACTOR = 1603,
-    VEHICLE_SET_SURFACE_TYPE_OVERRIDE = 1604,
-    VEHICLE_NOTIFY_HIT_IMAGINATION = 1605,
-    VEHICLE_NOTIFY_HIT_IMAGINATION_SERVER = 1606,
-    GET_SPAWNED_OBJECT_SPAWNER_INFO = 1607,
-    SAVE_PROPERTY = 1608,
-    SET_PROPERTY_DIRTY = 1609,
-    GET_PROPERTY_DIRTY = 1610,
-    GET_MODEL_LIST_FROM_PLAQUE = 1611,
-    GET_ORIGINAL_POSITION_AND_ROTATION = 1612,
-    VEHICLE_SET_MASS_FOR_COLLISION = 1613,
-    GET_INVENTORY_GROUP_COUNT = 1614,
-    GET_LATEST_CHAT_CHANNEL_USED = 1615,
-    SET_SUGGEST_LIST_LANGUAGE = 1616,
-    VEHICLE_STOP_BOOST = 1617,
-    START_CELEBRATION_EFFECT = 1618,
-    LOCK_PLAYER = 1619,
-    VEHICLE_IS_INPUT_LOCKED = 1620,
-    GET_MULTI_NODE = 1621,
-    RENEW_PROPERTY = 1622,
-    RENEW_PROPERTY_RESULT = 1623,
-    CHARGE_ACTIVITY_COST = 1624,
-    CAN_RECEIVE_LOOT = 1625,
-    JOIN_PLAYER_FACTION = 1626,
-    SET_PROXIMITY_UPDATE_RATE = 1627,
-    BBB_MODELS_TO_SAVE = 1628,
-    BELONGS_TO_FACTION = 1629,
-    MODIFY_FACTION = 1630,
-    FACTION_UPDATE = 1631,
-    CELEBRATION_COMPLETED = 1632,
-    PLAY_PRIMARY_MODULE_SOUNDS = 1633,
-    STOP_PRIMARY_MODULE_SOUNDS = 1634,
-    REQUEST_TEAM_PLAYER_UI_UPDATE = 1635,
-    SET_LOCAL_TEAM = 1636,
-    TEAM_GET_WORLD_MEMBERS_IN_RADIUS = 1637,
-    GET_PARENTAL_LEVEL = 1638,
-    GET_OBJECTS_MESSAGE_HANDLERS = 1639,
-    PROPERTY_FEATURED = 1640,
-    PROPERTY_NOTIFY_MODEL_SPAWNED = 1641,
-    SERVER_DONE_LOADING_ALL_OBJECTS = 1642,
-    GET_DONATION_TOTAL = 1643,
-    UPDATE_DONATION_VALUES = 1644,
-    DELAYED_DELETE_DROP_EFFECT_BRICK = 1645,
-    SET_CAMERA_UNLOCK_ROTATION_STATE = 1646,
-    ADD_BUFF = 1647,
-    REMOVE_BUFF = 1648,
-    CHECK_FOR_BUFF = 1649,
-    TEAM_MEMBERS_DISOWNS_LOOT = 1650,
-    GET_WHEEL_TEMPLATE = 1651,
-    ADD_SKILL_IN_PROGRESS = 1652,
-    REMOVE_SKILL_IN_PROGRESS = 1653,
-    SET_OVERHEAD_ICON_OFFSET = 1654,
-    SET_BILLBOARD_OFFSET = 1655,
-    SET_CHAT_BUBBLE_OFFSET = 1656,
-    SET_NO_TEAM_INVITES = 1657,
-    RESET_MODEL_TO_DEFAULTS = 1658,
-    IS_PROPERTY_IN_EDIT_MODE = 1659,
-    GET_OBJECTS_IN_PHYSICS_BOUNDS = 1660,
-    ENABLE_LU_REMOTE = 1661,
-    SET_IS_USING_FREE_TRIAL = 1662,
-    GET_IS_USING_FREE_TRIAL = 1663,
-    GET_ACCOUNT_FREE_TRIAL_MODE = 1664,
-    TOGGLE_INVENTORY_ITEM_LOCK = 1665,
-    REQUEST_MOVE_ITEM_BETWEEN_INVENTORY_TYPES = 1666,
-    RESPONSE_MOVE_ITEM_BETWEEN_INVENTORY_TYPES = 1667,
-    REMOVE_SUB_COMPONENT = 1668,
-    TEAM_GET_LOOT_MEMBERS = 1669,
-    GET_FACTION_TOKEN_TYPE = 1670,
-    GET_SUBSCRIPTION_PRICING = 1671,
-    INFORM_AFK = 1672,
-    OVERHEAD_INDICATOR_CREATED = 1673,
-    SET_OVERHEAD_INDICATOR_GRID_LOCATION = 1674,
-    PLAYSTREAM_LOAD_PENDING = 1675,
-    PLAYER_SET_CAMERA_CYCLING_MODE = 1676,
-    PLAYER_GET_CAMERA_CYCLING_MODE = 1677,
-    FORCE_CAMERA_TARGET_CYCLE = 1678,
-    GET_OBJECT_CONFIG_DATA = 1679,
-    GET_OBJECT_CONFIG_DATA_NON_CONST = 1680,
-    SCOPE_CHANGED = 1681,
-    SET_ALLOW_JUMP_WITHOUT_SUPPORT = 1682,
-    GET_ALLOW_JUMP_WITHOUT_SUPPORT = 1683,
-    SET_JUMP_HEIGHT_SCALE = 1684,
-    GET_JUMP_HEIGHT_SCALE = 1685,
-    SET_VELOCITY_RESISTANCE = 1686,
-    GET_VELOCITY_RESISTANCE = 1687,
-    GATE_RUSH_VEHICLE_HIT_GATE = 1688,
-    GATE_RUSH_PLAYER_COLLECTED_GATE = 1689,
-    GATE_RUSH_ADD_GATE = 1690,
-    GATE_RUSH_REMOVE_GATE = 1691,
-    NOTIFY_VEHICLE_UPDATED = 1692,
-    VEHICLE_NOTIFY_HIT_WEAPON_POWERUP = 1693,
-    VEHICLE_NOTIFY_HIT_WEAPON_POWERUP_SERVER = 1694,
-    LOCAL_PLAYER_TARGETED = 1696,
-    SKILL_COUNT_CHANGED = 1697,
-    DO_YAW_ROTATION = 1698,
-    DO_PITCH_ROTATION = 1699,
-    DO_ROLL_ROTATION = 1700,
-    GET_CURRENT_LOOT_MATRIX = 1701,
-    SEND_MULTI_MISSION_OFFER_UPDATE_I_DS = 1702,
-    SET_AIR_SPEED_VALUES = 1703,
-    USE_LAUNCHER = 1704,
-    START_LAUNCHER = 1705,
-    STOP_LAUNCHER = 1706,
-    CAN_USE_JET_PACK = 1707,
-    JET_PACK_STATE_CHANGED = 1708,
-    TURN_OFF_JET_PACK = 1709,
-    ADD_PLAYER_JET_PACK_PAD = 1710,
-    SET_JET_PACK_WARNING = 1711,
-    JET_PACK_DISABLED = 1712,
-    JET_PACK_PAD_ENTERED = 1713,
-    UPDATE_RENDER_POSSESSION_FLAG = 1714,
-    POSSESSABLE_GET_ATTACH_OFFSET = 1715,
-    ATTEMPT_TO_CRAFT_ITEM = 1718,
-    CRAFT_ATTEMPT_RESPONSE = 1719,
-    SET_C_SCORE = 1720,
-    FILL_IN_RENDERER = 1721,
-    TOGGLE_CRAFTING_WINDOW = 1722,
-    REMOVE_TEAM_BUFFS = 1724,
-    REQUEST_FREE_TRIAL_STATUS_REFRESH = 1725,
-    REMOVE_BUFFS_APPLIED_BY_OBJECT = 1726,
-    SET_MOUNT_INVENTORY_ID = 1727,
-    GET_MOUNT_INVENTORY_ID = 1728,
-    GET_BUILD_CINEMATIC_TIME_REMAINING = 1730,
-    JET_PACK_FLYING = 1731,
-    NOTIFY_SERVER_LEVEL_PROCESSING_COMPLETE = 1734,
-    NOTIFY_LEVEL_REWARDS = 1735,
-    CHARACTER_VERSION_CHANGED = 1736,
-    SET_FREE_TRIAL_RENAME_AVAILABLE = 1737,
-    SET_PROJECTILE_LAUNCHER_PARAMS = 1738,
-    RACE_PRECOUNTDOWN_DONE = 1739,
-    CHECK_INVITE_SPAMMING = 1740,
-    GET_RESPAWN_VOLUME_INFO = 1741,
-    INVITE_ACCEPTED = 1742,
-    TELEPORT_TO_NEAREST_RESPAWN = 1743,
-    SET_SKILL_CANCEL_ON_MOVE = 1744,
-    CANCEL_MOVE_SKILL = 1745,
-    SERVER_CANCEL_MOVE_SKILL = 1746,
-    CLIENT_CANCEL_MOVE_SKILL = 1747,
-    END_LAUNCH_SEQUENCE = 1748,
-    CANCEL_QUEUE = 1749,
-    UPDATE_PROJECTILE_LAUNCHER_ROTATION = 1750,
-    GET_CHARACTER_VERSION_INFO = 1751,
-    GET_CON_INFO = 1753,
-    GET_SKILLS_FOR_LOT = 1755,
-    DISMOUNT_COMPLETE = 1756,
-    MOUNT_FAILURE_RESPONSE = 1757,
-    CLEAR_BILLBOARD_OFFSET = 1758,
-    GET_INVENTORY_ITEM_ANIMATION_FLAG = 1759,
-    SET_JET_PACK_ALLOWED = 1760,
-    GET_BUILD_TIME_DETAILS = 1761,
-    USE_SKILL_SET = 1762,
-    SET_SKILL_SET_POSSESSOR = 1763,
-    POPULATE_ACTION_BAR = 1764,
-    GET_COMPONENT_TEMPLATE_ID = 1765,
-    GET_POSSESSABLE_SKILL_SET = 1766,
-    MARK_INVENTORY_ITEM_AS_ACTIVE = 1767,
-    UPDATE_FORGED_ITEM = 1768,
-    CAN_ITEMS_BE_REFORGED = 1769,
-    NOTIFY_CLIENT_RAIL_START_FAILED = 1771,
-    GET_IS_ON_RAIL = 1772
+	GET_VERSIONING_INFO = 1381,
+	OPEN_UG_BEHAVIOR_UI = 1382,
+	VEHICLE_NOTIFY_HIT_SMASHABLE = 1383,
+	GET_TETHER_RADIUS = 1384,
+	VEHICLE_NOTIFY_HIT_EXPLODER = 1385,
+	CHECK_NEAREST_ROCKET_LAUNCH_PRE_CONDITIONS = 1386,
+	REQUEST_NEAREST_ROCKET_LAUNCH_PRE_CONDITIONS = 1387,
+	CONFIGURE_RACING_CONTROL_CLIENT = 1389,
+	NOTIFY_RACING_CLIENT = 1390,
+	RACING_PLAYER_HACK_CAR = 1391,
+	RACING_PLAYER_LOADED = 1392,
+	RACING_CLIENT_READY = 1393,
+	POSSESSION_FINISHED_ATTACH = 1394,
+	UPDATE_CHAT_MODE = 1395,
+	VEHICLE_NOTIFY_FINISHED_RACE = 1396,
+	EQUIPPED_ITEM_STARTUP = 1397,
+	FACTION_TRIGGER_ITEM_EQUIPPED = 1400,
+	FACTION_TRIGGER_ITEM_UNEQUIPPED = 1401,
+	TOGGLE_PROPERTY_BEHAVIORS = 1402,
+	GET_UG_OBJECT_INFO = 1405,
+	RESET_PROPERTY_BEHAVIORS = 1406,
+	IS_PROPERTY_MODEL_RESET = 1407,
+	SET_UG_OBJECT_NAME_AND_DESCRIPTION = 1408,
+	SET_CONSUMABLE_ITEM = 1409,
+	VEHICLE_GET_CURRENT_LAP = 1410,
+	GET_UGID = 1411,
+	SET_UGID = 1412,
+	UGID_CHANGED = 1413,
+	RACING_GET_CURRENT_LAP_FOR_PLAYER = 1414,
+	SUB_ITEM_UN_EQUIPPED = 1415,
+	SET_CUSTOM_DROP_SHADOW_TEXTURE = 1416,
+	GET_PLAYER_KIT_FACTION = 1418,
+	USED_INFORMATION_PLAQUE = 1419,
+	RACING_ENABLE_WRONG_WAY_RESET = 1420,
+	RACING_TOGGLE_RUBBER_BANDING = 1421,
+	GET_RACING_CONTROL_DEBUG_INFO = 1422,
+	SET_PROPERTY_BOUNDS_VISIBILITY = 1423,
+	SET_PROPERTY_VENDOR_VISIBILITY = 1424,
+	SET_EQUIP_STATE = 1425,
+	NOTIFY_COMBAT_AI_STATE_CHANGE = 1426,
+	SET_PROPERTY_MODEL_INTERACTIVE = 1430,
+	SERVER_STATE_NOTIFY = 1431,
+	GET_SERVER_STATE = 1432,
+	GET_ICON_FOR_PROXIMITY = 1433,
+	GET_LEGO_CLUB_MEMBERSHIP_STATUS = 1434,
+	SET_STATUS_IMMUNITY = 1435,
+	GET_STATUS_IMMUNITY = 1436,
+	TEAM_IS_MEMBER = 1437,
+	ACTIVATE_BRICK_MODE = 1438,
+	GET_BUILD_OBJECT_ID = 1439,
+	SET_ANIMATION_ENABLED = 1444,
+	PAUSE_COOLDOWNS = 1446,
+	FORCE_UPDATE_RENDER_NODE = 1447,
+	SET_PET_NAME_MODERATED = 1448,
+	TOGGLE_STRAFE_MODE = 1449,
+	SET_SCHEME_SPEED_SCALE = 1450,
+	CANCEL_SKILL_CAST = 1451,
+	CHECK_PLAYER_ASSEMBLY_FOR_UNIQUE_MODULE_BY_LOT = 1454,
+	MODULE_ASSEMBLY_DB_DATA_TO_LUA = 1455,
+	IS_ALLY = 1458,
+	MODIFY_LEGO_SCORE = 1459,
+	GET_LEGO_SCORE = 1460,
+	GET_PLAYER_LEVEL = 1461,
+	NOTIFY_LEGO_SCORE_UPDATE = 1462,
+	SET_LEGO_SCORE = 1463,
+	UPDATE_BEHAVIOR_EXECUTION_DETAILS = 1466,
+	RESTORE_TO_POST_LOAD_STATS = 1468,
+	PICKUP_OBJECT_ERROR = 1469,
+	CHECK_AND_SHOW_INVENTORY_FULL_TIP = 1470,
+	SET_RAIL_MOVEMENT = 1471,
+	START_RAIL_MOVEMENT = 1472,
+	SET_UP_VECTOR = 1473,
+	CANCEL_RAIL_MOVEMENT = 1474,
+	GET_RAIL_INFO = 1475,
+	CLIENT_RAIL_MOVEMENT_READY = 1476,
+	PLAYER_RAIL_ARRIVED_NOTIFICATION = 1477,
+	NOTIFY_RAIL_ACTOVATOR_STATE_CHANGE = 1478,
+	REQUEST_RAIL_ACTIVATOR_STATE = 1479,
+	NOTIFY_REWARD_MAILED = 1480,
+	UPDATE_PLAYER_STATISTIC = 1481,
+	IS_IN_COMBAT = 1482,
+	IS_PRIMITIVE_MODEL_MSG = 1483,
+	SCALE_PRIMITICE_MODEL_MSG = 1484,
+	MODIFY_GHOSTING_DISTANCE = 1485,
+	PRIMITIVE_MODEL_CHANGED_MSG = 1487,
+	GET_PROPRTY_CLONE_ID = 1488,
+	REQUEST_LEAVE_PROPERTY = 1489,
+	REQUERY_PROPERTY_MODELS = 1491,
+	GET_BEHAVIOR_COUNT = 1492,
+	UPDATE_BEHAVIOR_CONTROLS = 1493,
+	MODULE_ASSEMBLY_LXFML_LOADED = 1494,
+	REQUEST_ASSEMBLED_LXFML = 1495,
+	ASSEMBLED_LXFML_LOADED = 1496,
+	GET_REORIENT_UP_VECTOR = 1497,
+	MODULAR_ASSEMBLY_NIF_COMPLETED = 1498,
+	CHARACTER_DISCONNECT_BEFORE_CREATE = 1499,
+	SEND_LAUNCH_TO_PREVIOUS_ZONE_TO_CLIENT = 1500,
+	ROCKETLAUNCH_REQUEST_DEFAULT_MAP_ID = 1501,
+	BEGIN_LAUNCH = 1502,
+	PROCESS_CLAIM_CODES = 1503,
+	GET_LAST_ZONE_ID = 1504,
+	ADD_RUN_SPEED_MODIFIER = 1505,
+	REMOVE_RUN_SPEED_MODIFIER = 1506,
+	SKILL_EVENT_FIRED = 1507,
+	SEND_HOT_PROPERTY_DATA = 1510,
+	GET_HOT_PROPERTY_DATA = 1511,
+	GET_EQUIPPED_ITEMS_IN_SET = 1512,
+	IS_ITEM_IN_SET = 1513,
+	GET_INVENTORY_TYPE_FOR_LOT = 1514,
+	GET_BANK_TYPE_FOR_LOT = 1515,
+	NOTIFY_NOT_ENOUGH_INV_SPACE = 1516,
+	IMPORT_MODEL_TO_BBB = 1517,
+	SEARCH_NEARBY_OBJECTS = 1518,
+	SEARCH_NEARBY_OBJECTS_REQUEST_BY_LOT = 1519,
+	REQUEST_OBJECT_POSITION_BY_ID = 1520,
+	SEARCH_NEARBY_OBJECTS_REQUEST_BY_COMPONENT = 1521,
+	SEARCH_NEARBY_OBJECTS_RESPONSE = 1522,
+	BROADCAST_NON_STANDARD_COLLISIONS = 1523,
+	GET_REGISTERED_NON_STANDARD_COLLISION_GROUP = 1524,
+	BROADCAST_CRUSHED_NOTIFICATIONS = 1525,
+	GET_REGISTERED_CRUSHED_COLLISION_GROUPS = 1526,
+	IS_BEING_CRUSHED = 1527,
+	GET_SUPPORTING_OBJECT = 1528,
+	TREAT_RIGID_BODY_COLLSIONS_AS_FIXED = 1529,
+	BROADCAST_TELEPORTED_WITHIN_NOTIFICATION = 1530,
+	GET_REGISTERED_TELEPORTED_WITHIN_OBJECT_GROUP = 1531,
+	GET_INTERPENTRATING_INFORMATION = 1532,
+	OBJECT_TELEPORTED_WITHIN = 1533,
+	SET_PHYSICS_SOLVER_PROPERTIES = 1534,
+	HAS_BEHAVIORS = 1535,
+	PLAY_BEHAVIOR_SOUND = 1536,
+	GET_PLAYER_BEHAVIOR_TIER = 1537,
+	GET_EMOTE_ANIMATION_TIME = 1538,
+	GET_CHARACTER_STAT_TRACKING = 1539,
+	PLAYER_INVENTORY_READY = 1540,
+	SET_PRECONDITIONS = 1541,
+	DETACH_SHADOW = 1542,
+	GET_LOOT_INFO = 1543,
+	GET_PLAYERS_ON_PROPERTY = 1544,
+	PROPERTY_SPAWN_BY_BEHAVIOR = 1545,
+	NOTIFY_PROPERTY_OF_EDIT_MODE = 1546,
+	UPDATE_PROPERTY_PERFORMANCE_COST = 1547,
+	GET_PROPERTY_PERFORMANCE_COST = 1548,
+	GET_INVENTORY_ITEM_WITH_SUBKEY = 1549,
+	DISPLAY_PROPERTY_SUMMARY_SCREEN = 1550,
+	VALIDATE_BBB_MODEL = 1551,
+	BBB_MODEL_VALIDATION = 1552,
+	PROPERTY_ENTRANCE_BEGIN = 1553,
+	CHECK_LIST_OF_PRECONDITIONS_FROM_LUA = 1554,
+	GET_PROPERTYIN_ZONE = 1555,
+	GET_ZONE_ID_FROM_MULTI_ZONE_ENTRANCE = 1556,
+	TEAM_SET_LEADER = 1557,
+	TEAM_INVITE_CONFIRM = 1558,
+	TEAM_GET_STATUS_RESPONSE = 1559,
+	MINI_GAME_ENABLE_LOCAL_TEAMS = 1560,
+	TEAM_INVITE_FINAL_RESPONSE = 1561,
+	TEAM_ADD_PLAYER = 1562,
+	TEAM_REMOVE_PLAYER = 1563,
+	TEAM_CREATE_LOCAL = 1564,
+	TEAM_GET_LOOT = 1565,
+	TEAM_SET_LOOT = 1566,
+	SET_ZERO_IMPULSE_AGAINST_COLLISION_GROUPS = 1567,
+	SET_CENTER_OF_MASS_TO_PHYSICAL_CENTER = 1568,
+	SET_INERTIA_INVERSE = 1569,
+	ADD_REMOVE_CLIMBING_LISTENER = 1570,
+	GET_INVENTORYITEM_DETAILS = 1571,
+	PERFORM_CLIENT_SIDE_DEATH = 1572,
+	LEGO_CLUB_ACCESS_RESULT = 1573,
+	VEHICLE_GET_IS_REVERSING = 1574,
+	CHECK_CLAIM_CODE = 1575,
+	GET_HOLIDAY_EVENT = 1576,
+	SET_EMOTES_ENABLED = 1577,
+	GET_EMOTES_ENABLED = 1578,
+	FREEZE_ANIMATION = 1579,
+	LOCALIZED_ANNOUNCEMENT_SERVER_TO_SINGLE_CLIENT = 1580,
+	ANCHOR_FX_NODE = 1581,
+	WS_GET_FRIEND_LIST_MESSAGE = 1582,
+	WS_ADD_FRIEND_RESPONSE = 1583,
+	WS_REMOVE_FRIEND_REPSONSE = 1584,
+	WS_UPDATE_FRIEND_STATUS = 1585,
+	WS_UPDATE_FRIEND_NAME = 1586,
+	IS_BEST_FRIEND = 1587,
+	TEAM_NOTIFY_UPDATE_MISSION_TASK = 1588,
+	VEHICLE_ADD_SLIPPERY_ACTION = 1589,
+	VEHICLE_REMOVE_SLIPPERY_ACTION = 1590,
+	SET_RESURRECT_RESTORE_VALUES = 1591,
+	GET_MASS = 1592,
+	SET_PROPERTY_MODERATION_STATUS = 1593,
+	UPDATE_PROPERTY_MODEL_DEFAULTS = 1594,
+	UPDATE_PROPERTYMODEL_COUNT = 1595,
+	GET_PROPERTY_MODEL_COUNT = 1596,
+	IS_PLAYER_LOADED = 1597,
+	ATTACH_RENDER_EFFECT_FROM_LUA = 1598,
+	DETACH_RENDER_EFFECT_FROM_LUA = 1599,
+	TEAM_IS_LOCAL = 1600,
+	CREATE_CAMERA_PARTICLES = 1602,
+	SET_SMASHABLE_GRAVITY_FACTOR = 1603,
+	VEHICLE_SET_SURFACE_TYPE_OVERRIDE = 1604,
+	VEHICLE_NOTIFY_HIT_IMAGINATION = 1605,
+	VEHICLE_NOTIFY_HIT_IMAGINATION_SERVER = 1606,
+	GET_SPAWNED_OBJECT_SPAWNER_INFO = 1607,
+	SAVE_PROPERTY = 1608,
+	SET_PROPERTY_DIRTY = 1609,
+	GET_PROPERTY_DIRTY = 1610,
+	GET_MODEL_LIST_FROM_PLAQUE = 1611,
+	GET_ORIGINAL_POSITION_AND_ROTATION = 1612,
+	VEHICLE_SET_MASS_FOR_COLLISION = 1613,
+	GET_INVENTORY_GROUP_COUNT = 1614,
+	GET_LATEST_CHAT_CHANNEL_USED = 1615,
+	SET_SUGGEST_LIST_LANGUAGE = 1616,
+	VEHICLE_STOP_BOOST = 1617,
+	START_CELEBRATION_EFFECT = 1618,
+	LOCK_PLAYER = 1619,
+	VEHICLE_IS_INPUT_LOCKED = 1620,
+	GET_MULTI_NODE = 1621,
+	RENEW_PROPERTY = 1622,
+	RENEW_PROPERTY_RESULT = 1623,
+	CHARGE_ACTIVITY_COST = 1624,
+	CAN_RECEIVE_LOOT = 1625,
+	JOIN_PLAYER_FACTION = 1626,
+	SET_PROXIMITY_UPDATE_RATE = 1627,
+	BBB_MODELS_TO_SAVE = 1628,
+	BELONGS_TO_FACTION = 1629,
+	MODIFY_FACTION = 1630,
+	FACTION_UPDATE = 1631,
+	CELEBRATION_COMPLETED = 1632,
+	PLAY_PRIMARY_MODULE_SOUNDS = 1633,
+	STOP_PRIMARY_MODULE_SOUNDS = 1634,
+	REQUEST_TEAM_PLAYER_UI_UPDATE = 1635,
+	SET_LOCAL_TEAM = 1636,
+	TEAM_GET_WORLD_MEMBERS_IN_RADIUS = 1637,
+	GET_PARENTAL_LEVEL = 1638,
+	GET_OBJECTS_MESSAGE_HANDLERS = 1639,
+	PROPERTY_FEATURED = 1640,
+	PROPERTY_NOTIFY_MODEL_SPAWNED = 1641,
+	SERVER_DONE_LOADING_ALL_OBJECTS = 1642,
+	GET_DONATION_TOTAL = 1643,
+	UPDATE_DONATION_VALUES = 1644,
+	DELAYED_DELETE_DROP_EFFECT_BRICK = 1645,
+	SET_CAMERA_UNLOCK_ROTATION_STATE = 1646,
+	ADD_BUFF = 1647,
+	REMOVE_BUFF = 1648,
+	CHECK_FOR_BUFF = 1649,
+	TEAM_MEMBERS_DISOWNS_LOOT = 1650,
+	GET_WHEEL_TEMPLATE = 1651,
+	ADD_SKILL_IN_PROGRESS = 1652,
+	REMOVE_SKILL_IN_PROGRESS = 1653,
+	SET_OVERHEAD_ICON_OFFSET = 1654,
+	SET_BILLBOARD_OFFSET = 1655,
+	SET_CHAT_BUBBLE_OFFSET = 1656,
+	SET_NO_TEAM_INVITES = 1657,
+	RESET_MODEL_TO_DEFAULTS = 1658,
+	IS_PROPERTY_IN_EDIT_MODE = 1659,
+	GET_OBJECTS_IN_PHYSICS_BOUNDS = 1660,
+	ENABLE_LU_REMOTE = 1661,
+	SET_IS_USING_FREE_TRIAL = 1662,
+	GET_IS_USING_FREE_TRIAL = 1663,
+	GET_ACCOUNT_FREE_TRIAL_MODE = 1664,
+	TOGGLE_INVENTORY_ITEM_LOCK = 1665,
+	REQUEST_MOVE_ITEM_BETWEEN_INVENTORY_TYPES = 1666,
+	RESPONSE_MOVE_ITEM_BETWEEN_INVENTORY_TYPES = 1667,
+	REMOVE_SUB_COMPONENT = 1668,
+	TEAM_GET_LOOT_MEMBERS = 1669,
+	GET_FACTION_TOKEN_TYPE = 1670,
+	GET_SUBSCRIPTION_PRICING = 1671,
+	INFORM_AFK = 1672,
+	OVERHEAD_INDICATOR_CREATED = 1673,
+	SET_OVERHEAD_INDICATOR_GRID_LOCATION = 1674,
+	PLAYSTREAM_LOAD_PENDING = 1675,
+	PLAYER_SET_CAMERA_CYCLING_MODE = 1676,
+	PLAYER_GET_CAMERA_CYCLING_MODE = 1677,
+	FORCE_CAMERA_TARGET_CYCLE = 1678,
+	GET_OBJECT_CONFIG_DATA = 1679,
+	GET_OBJECT_CONFIG_DATA_NON_CONST = 1680,
+	SCOPE_CHANGED = 1681,
+	SET_ALLOW_JUMP_WITHOUT_SUPPORT = 1682,
+	GET_ALLOW_JUMP_WITHOUT_SUPPORT = 1683,
+	SET_JUMP_HEIGHT_SCALE = 1684,
+	GET_JUMP_HEIGHT_SCALE = 1685,
+	SET_VELOCITY_RESISTANCE = 1686,
+	GET_VELOCITY_RESISTANCE = 1687,
+	GATE_RUSH_VEHICLE_HIT_GATE = 1688,
+	GATE_RUSH_PLAYER_COLLECTED_GATE = 1689,
+	GATE_RUSH_ADD_GATE = 1690,
+	GATE_RUSH_REMOVE_GATE = 1691,
+	NOTIFY_VEHICLE_UPDATED = 1692,
+	VEHICLE_NOTIFY_HIT_WEAPON_POWERUP = 1693,
+	VEHICLE_NOTIFY_HIT_WEAPON_POWERUP_SERVER = 1694,
+	LOCAL_PLAYER_TARGETED = 1696,
+	SKILL_COUNT_CHANGED = 1697,
+	DO_YAW_ROTATION = 1698,
+	DO_PITCH_ROTATION = 1699,
+	DO_ROLL_ROTATION = 1700,
+	GET_CURRENT_LOOT_MATRIX = 1701,
+	SEND_MULTI_MISSION_OFFER_UPDATE_I_DS = 1702,
+	SET_AIR_SPEED_VALUES = 1703,
+	USE_LAUNCHER = 1704,
+	START_LAUNCHER = 1705,
+	STOP_LAUNCHER = 1706,
+	CAN_USE_JET_PACK = 1707,
+	JET_PACK_STATE_CHANGED = 1708,
+	TURN_OFF_JET_PACK = 1709,
+	ADD_PLAYER_JET_PACK_PAD = 1710,
+	SET_JET_PACK_WARNING = 1711,
+	JET_PACK_DISABLED = 1712,
+	JET_PACK_PAD_ENTERED = 1713,
+	UPDATE_RENDER_POSSESSION_FLAG = 1714,
+	POSSESSABLE_GET_ATTACH_OFFSET = 1715,
+	ATTEMPT_TO_CRAFT_ITEM = 1718,
+	CRAFT_ATTEMPT_RESPONSE = 1719,
+	SET_C_SCORE = 1720,
+	FILL_IN_RENDERER = 1721,
+	TOGGLE_CRAFTING_WINDOW = 1722,
+	REMOVE_TEAM_BUFFS = 1724,
+	REQUEST_FREE_TRIAL_STATUS_REFRESH = 1725,
+	REMOVE_BUFFS_APPLIED_BY_OBJECT = 1726,
+	SET_MOUNT_INVENTORY_ID = 1727,
+	GET_MOUNT_INVENTORY_ID = 1728,
+	GET_BUILD_CINEMATIC_TIME_REMAINING = 1730,
+	JET_PACK_FLYING = 1731,
+	NOTIFY_SERVER_LEVEL_PROCESSING_COMPLETE = 1734,
+	NOTIFY_LEVEL_REWARDS = 1735,
+	CHARACTER_VERSION_CHANGED = 1736,
+	SET_FREE_TRIAL_RENAME_AVAILABLE = 1737,
+	SET_PROJECTILE_LAUNCHER_PARAMS = 1738,
+	RACE_PRECOUNTDOWN_DONE = 1739,
+	CHECK_INVITE_SPAMMING = 1740,
+	GET_RESPAWN_VOLUME_INFO = 1741,
+	INVITE_ACCEPTED = 1742,
+	TELEPORT_TO_NEAREST_RESPAWN = 1743,
+	SET_SKILL_CANCEL_ON_MOVE = 1744,
+	CANCEL_MOVE_SKILL = 1745,
+	SERVER_CANCEL_MOVE_SKILL = 1746,
+	CLIENT_CANCEL_MOVE_SKILL = 1747,
+	END_LAUNCH_SEQUENCE = 1748,
+	CANCEL_QUEUE = 1749,
+	UPDATE_PROJECTILE_LAUNCHER_ROTATION = 1750,
+	GET_CHARACTER_VERSION_INFO = 1751,
+	GET_CON_INFO = 1753,
+	GET_SKILLS_FOR_LOT = 1755,
+	DISMOUNT_COMPLETE = 1756,
+	MOUNT_FAILURE_RESPONSE = 1757,
+	CLEAR_BILLBOARD_OFFSET = 1758,
+	GET_INVENTORY_ITEM_ANIMATION_FLAG = 1759,
+	SET_JET_PACK_ALLOWED = 1760,
+	GET_BUILD_TIME_DETAILS = 1761,
+	USE_SKILL_SET = 1762,
+	SET_SKILL_SET_POSSESSOR = 1763,
+	POPULATE_ACTION_BAR = 1764,
+	GET_COMPONENT_TEMPLATE_ID = 1765,
+	GET_POSSESSABLE_SKILL_SET = 1766,
+	MARK_INVENTORY_ITEM_AS_ACTIVE = 1767,
+	UPDATE_FORGED_ITEM = 1768,
+	CAN_ITEMS_BE_REFORGED = 1769,
+	NOTIFY_CLIENT_RAIL_START_FAILED = 1771,
+	GET_IS_ON_RAIL = 1772
+};
+
+template <>
+struct magic_enum::customize::enum_range<eGameMessageType> {
+	static constexpr int min = 0;
+	static constexpr int max = 1772;
 };
 
 #endif  //!__EGAMEMESSAGETYPE__H__
diff --git a/dCommon/dEnums/eWorldMessageType.h b/dCommon/dEnums/eWorldMessageType.h
index 4b3e2a03..bfaa110b 100644
--- a/dCommon/dEnums/eWorldMessageType.h
+++ b/dCommon/dEnums/eWorldMessageType.h
@@ -3,6 +3,8 @@
 
 #include <cstdint>
 
+#include "magic_enum.hpp"
+
 enum class eWorldMessageType : uint32_t {
 	VALIDATION = 1,  // 				Session info
 	CHARACTER_LIST_REQUEST,
@@ -40,4 +42,10 @@ enum class eWorldMessageType : uint32_t {
 	UI_HELP_TOP_5 = 91
 };
 
+template <>
+struct magic_enum::customize::enum_range<eWorldMessageType> {
+	static constexpr int min = 0;
+	static constexpr int max = 91;
+};
+
 #endif  //!__EWORLDMESSAGETYPE__H__
diff --git a/dGame/dGameMessages/GameMessageHandler.cpp b/dGame/dGameMessages/GameMessageHandler.cpp
index 83b8a666..fbaa913b 100644
--- a/dGame/dGameMessages/GameMessageHandler.cpp
+++ b/dGame/dGameMessages/GameMessageHandler.cpp
@@ -34,10 +34,10 @@
 #include "eMissionTaskType.h"
 #include "eReplicaComponentType.h"
 #include "eConnectionType.h"
+#include "eGameMessageType.h"
 #include "ePlayerFlag.h"
 #include "dConfig.h"
-
-using namespace std;
+#include "StringifiedEnum.h"
 
 void GameMessageHandler::HandleMessage(RakNet::BitStream* inStream, const SystemAddress& sysAddr, LWOOBJID objectID, eGameMessageType messageID) {
 
@@ -49,11 +49,11 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream* inStream, const System
 	User* usr = UserManager::Instance()->GetUser(sysAddr);
 
 	if (!entity) {
-		LOG("Failed to find associated entity (%llu), aborting GM (%X)!", objectID, messageID);
+		LOG("Failed to find associated entity (%llu), aborting GM: %4i, %s!", objectID, messageID, StringifiedEnum::ToString(messageID).data());
 		return;
 	}
 
-	if (messageID != eGameMessageType::READY_FOR_UPDATES) LOG_DEBUG("received game message ID: %i", messageID);
+	if (messageID != eGameMessageType::READY_FOR_UPDATES) LOG_DEBUG("Received GM with ID and name: %4i, %s", messageID,  StringifiedEnum::ToString(messageID).data());
 
 	switch (messageID) {
 
@@ -344,12 +344,12 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream* inStream, const System
 
 		SyncSkill sync = SyncSkill(inStream); // inStream replaced &bitStream
 
-		ostringstream buffer;
+		std::ostringstream buffer;
 
 		for (unsigned int k = 0; k < sync.sBitStream.size(); k++) {
 			char s;
 			s = sync.sBitStream.at(k);
-			buffer << setw(2) << hex << setfill('0') << (int)s << " ";
+			buffer << std::setw(2) << std::hex << std::setfill('0') << static_cast<int>(s) << " ";
 		}
 
 		if (usr != nullptr) {
@@ -694,7 +694,7 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream* inStream, const System
 		GameMessages::SendVendorStatusUpdate(entity, sysAddr, true);
 		break;
 	default:
-		LOG_DEBUG("Unknown game message ID: %i", messageID);
+		LOG_DEBUG("Received Unknown GM with ID: %4i, %s", messageID,  StringifiedEnum::ToString(messageID).data());
 		break;
 	}
 }
diff --git a/dGame/dGameMessages/GameMessageHandler.h b/dGame/dGameMessages/GameMessageHandler.h
index 61378f80..aed3d496 100644
--- a/dGame/dGameMessages/GameMessageHandler.h
+++ b/dGame/dGameMessages/GameMessageHandler.h
@@ -19,8 +19,7 @@
 #include "Logger.h"
 #include "GameMessages.h"
 #include "CDClientDatabase.h"
-
-enum class eGameMessageType : uint16_t;
+#include "eGameMessageType.h"
 
 namespace GameMessageHandler {
 	void HandleMessage(RakNet::BitStream* inStream, const SystemAddress& sysAddr, LWOOBJID objectID, eGameMessageType messageID);
diff --git a/dWorldServer/WorldServer.cpp b/dWorldServer/WorldServer.cpp
index 5fc0393a..caa0dab3 100644
--- a/dWorldServer/WorldServer.cpp
+++ b/dWorldServer/WorldServer.cpp
@@ -76,6 +76,7 @@
 #include "EntityManager.h"
 #include "CheatDetection.h"
 #include "eGameMasterLevel.h"
+#include "StringifiedEnum.h"
 
 namespace Game {
 	Logger* logger = nullptr;
@@ -1244,7 +1245,9 @@ void HandlePacket(Packet* packet) {
 	}
 
 	default:
-		LOG("Unknown world packet received: %i", int(packet->data[3]));
+		const auto messageId = *reinterpret_cast<eWorldMessageType*>(&packet->data[3]);
+		const std::string_view messageIdString =  StringifiedEnum::ToString(messageId);
+		LOG("Unknown world packet received: %4i, %s", messageId, messageIdString.data());
 	}
 }
 
diff --git a/tests/dCommonTests/CMakeLists.txt b/tests/dCommonTests/CMakeLists.txt
index b39d130c..d1025489 100644
--- a/tests/dCommonTests/CMakeLists.txt
+++ b/tests/dCommonTests/CMakeLists.txt
@@ -11,6 +11,9 @@ set(DCOMMONTEST_SOURCES
 	"dCommonDependencies.cpp"
 )
 
+add_subdirectory(dEnumsTests)
+list(APPEND DCOMMONTEST_SOURCES ${DENUMS_TESTS})
+
 # Set our executable
 add_executable(dCommonTests ${DCOMMONTEST_SOURCES})
 
diff --git a/tests/dCommonTests/dEnumsTests/CMakeLists.txt b/tests/dCommonTests/dEnumsTests/CMakeLists.txt
new file mode 100644
index 00000000..e2208395
--- /dev/null
+++ b/tests/dCommonTests/dEnumsTests/CMakeLists.txt
@@ -0,0 +1,10 @@
+set(DENUMS_TESTS
+	"MagicEnumTests.cpp"
+)
+
+# Get the folder name and prepend it to the files above
+get_filename_component(thisFolderName ${CMAKE_CURRENT_SOURCE_DIR} NAME)
+list(TRANSFORM DENUMS_TESTS PREPEND "${thisFolderName}/")
+
+# Export to parent scope
+set(DENUMS_TESTS ${DENUMS_TESTS} PARENT_SCOPE)
diff --git a/tests/dCommonTests/dEnumsTests/MagicEnumTests.cpp b/tests/dCommonTests/dEnumsTests/MagicEnumTests.cpp
new file mode 100644
index 00000000..48b192f6
--- /dev/null
+++ b/tests/dCommonTests/dEnumsTests/MagicEnumTests.cpp
@@ -0,0 +1,142 @@
+#include <chrono>
+#include <string>
+
+#include <gtest/gtest.h>
+
+#include "StringifiedEnum.h"
+#include "Logger.h"
+#include "Game.h"
+#include "eGameMessageType.h"
+#include "eWorldMessageType.h"
+#include "magic_enum.hpp"
+
+#define ENUM_EQ(e, y, z)\
+	LOG("%s %s", StringifiedEnum::ToString(static_cast<e>(y)).data(), #z);\
+	ASSERT_STREQ(StringifiedEnum::ToString(static_cast<e>(y)).data(), #z);
+
+#define ENUM_NE(e, y)\
+	ENUM_EQ(e, y, UNKNOWN);
+
+// Test World Message Enum Reflection
+TEST(MagicEnumTest, eWorldMessageTypeTest) {
+	Game::logger = new Logger("./MagicEnumTest_eWorldMessageTypeTest.log", true, true);
+	
+	ENUM_EQ(eWorldMessageType, 1, VALIDATION);
+	ENUM_EQ(eWorldMessageType, 2, CHARACTER_LIST_REQUEST);
+	ENUM_EQ(eWorldMessageType, 3, CHARACTER_CREATE_REQUEST);
+	ENUM_EQ(eWorldMessageType, 4, LOGIN_REQUEST);
+	ENUM_EQ(eWorldMessageType, 5, GAME_MSG);
+	ENUM_EQ(eWorldMessageType, 6, CHARACTER_DELETE_REQUEST);
+	ENUM_EQ(eWorldMessageType, 7, CHARACTER_RENAME_REQUEST);
+	ENUM_EQ(eWorldMessageType, 8, HAPPY_FLOWER_MODE_NOTIFY);
+	ENUM_EQ(eWorldMessageType, 9, SLASH_RELOAD_MAP);
+	ENUM_EQ(eWorldMessageType, 10, SLASH_PUSH_MAP_REQUEST);
+	ENUM_EQ(eWorldMessageType, 11, SLASH_PUSH_MAP);
+	ENUM_EQ(eWorldMessageType, 12, SLASH_PULL_MAP);
+	ENUM_EQ(eWorldMessageType, 13, LOCK_MAP_REQUEST);
+	ENUM_EQ(eWorldMessageType, 14, GENERAL_CHAT_MESSAGE);
+	ENUM_EQ(eWorldMessageType, 15, HTTP_MONITOR_INFO_REQUEST);
+	ENUM_EQ(eWorldMessageType, 16, SLASH_DEBUG_SCRIPTS);
+	ENUM_EQ(eWorldMessageType, 17, MODELS_CLEAR);
+	ENUM_EQ(eWorldMessageType, 18, EXHIBIT_INSERT_MODEL);
+	ENUM_EQ(eWorldMessageType, 19, LEVEL_LOAD_COMPLETE);
+	ENUM_EQ(eWorldMessageType, 20, TMP_GUILD_CREATE);
+	ENUM_EQ(eWorldMessageType, 21, ROUTE_PACKET);
+	ENUM_EQ(eWorldMessageType, 22, POSITION_UPDATE);
+	ENUM_EQ(eWorldMessageType, 23, MAIL);
+	ENUM_EQ(eWorldMessageType, 24, WORD_CHECK);
+	ENUM_EQ(eWorldMessageType, 25, STRING_CHECK);
+	ENUM_EQ(eWorldMessageType, 26, GET_PLAYERS_IN_ZONE);
+	ENUM_EQ(eWorldMessageType, 27, REQUEST_UGC_MANIFEST_INFO);
+	ENUM_EQ(eWorldMessageType, 28, BLUEPRINT_GET_ALL_DATA_REQUEST);
+	ENUM_EQ(eWorldMessageType, 29, CANCEL_MAP_QUEUE);
+	ENUM_EQ(eWorldMessageType, 30, HANDLE_FUNNESS);
+	ENUM_EQ(eWorldMessageType, 31, FAKE_PRG_CSR_MESSAGE);
+	ENUM_EQ(eWorldMessageType, 32, REQUEST_FREE_TRIAL_REFRESH);
+	ENUM_EQ(eWorldMessageType, 33, GM_SET_FREE_TRIAL_STATUS);
+	ENUM_EQ(eWorldMessageType, 91, UI_HELP_TOP_5);
+	ENUM_NE(eWorldMessageType, 37);
+	ENUM_NE(eWorldMessageType, 123);
+
+	srand(time(NULL));
+	auto begin = std::chrono::high_resolution_clock::now();
+	for (int i = 0; i < 10000000; ++i) {
+		volatile auto f = StringifiedEnum::ToString(static_cast<eWorldMessageType>(i)).data();
+
+		// To ensure the compiler doesn't optimize out the call, I print it at random intervals
+		if (rand() % 100000 == 0) LOG("%i, %s", i, f);
+	}
+	auto end = std::chrono::high_resolution_clock::now();
+	LOG("Time: %lld", std::chrono::duration_cast<std::chrono::microseconds>(end - begin).count());
+
+	delete Game::logger;
+}
+
+// Test Game Message Enum Reflection
+TEST(MagicEnumTest, eGameMessageTypeTest) {
+	
+	Game::logger = new Logger("./MagicEnumTest_eGameMessageTypeTest.log", true, true);
+	
+	// Only doing the first and last 10 for the sake of my sanity
+	ENUM_EQ(eGameMessageType, 0, GET_POSITION);
+	ENUM_EQ(eGameMessageType, 1, GET_ROTATION);
+	ENUM_EQ(eGameMessageType, 2, GET_LINEAR_VELOCITY);
+	ENUM_EQ(eGameMessageType, 3, GET_ANGULAR_VELOCITY);
+	ENUM_EQ(eGameMessageType, 4, GET_FORWARD_VELOCITY);
+	ENUM_EQ(eGameMessageType, 5, GET_PLAYER_FORWARD);
+	ENUM_EQ(eGameMessageType, 6, GET_FORWARD_VECTOR);
+	ENUM_EQ(eGameMessageType, 7, SET_POSITION);
+	ENUM_EQ(eGameMessageType, 8, SET_LOCAL_POSITION);
+	ENUM_EQ(eGameMessageType, 9, SET_ROTATION);
+	ENUM_EQ(eGameMessageType, 10, SET_LINEAR_VELOCITY);
+	ENUM_EQ(eGameMessageType, 1762, USE_SKILL_SET);
+	ENUM_EQ(eGameMessageType, 1763, SET_SKILL_SET_POSSESSOR);
+	ENUM_EQ(eGameMessageType, 1764, POPULATE_ACTION_BAR);
+	ENUM_EQ(eGameMessageType, 1765, GET_COMPONENT_TEMPLATE_ID);
+	ENUM_EQ(eGameMessageType, 1766, GET_POSSESSABLE_SKILL_SET);
+	ENUM_EQ(eGameMessageType, 1767, MARK_INVENTORY_ITEM_AS_ACTIVE);
+	ENUM_EQ(eGameMessageType, 1768, UPDATE_FORGED_ITEM);
+	ENUM_EQ(eGameMessageType, 1769, CAN_ITEMS_BE_REFORGED);
+	ENUM_EQ(eGameMessageType, 1771, NOTIFY_CLIENT_RAIL_START_FAILED);
+	ENUM_EQ(eGameMessageType, 1772, GET_IS_ON_RAIL);
+	ENUM_NE(eGameMessageType, 32);
+	ENUM_NE(eGameMessageType, 1776);
+
+	srand(time(NULL));
+	auto begin = std::chrono::high_resolution_clock::now();
+	for (int i = 0; i < 10000000; ++i) {
+		volatile auto f = StringifiedEnum::ToString(static_cast<eGameMessageType>(i)).data();
+
+		// To ensure the compiler doesn't optimize out the call, I print it at random intervals
+		if (rand() % 100000 == 0) LOG("%i, %s", i, f);
+	}
+	auto end = std::chrono::high_resolution_clock::now();
+	LOG("Time: %lld", std::chrono::duration_cast<std::chrono::microseconds>(end - begin).count());
+
+	delete Game::logger;
+}
+
+#define ASSERT_EARRAY_SORTED(EARRAY_VAR)\
+	for (int i = 0; i < EARRAY_VAR->size(); i++) {\
+		const auto entryCurr = EARRAY_VAR->at(i).first;\
+		LOG_EARRAY(EARRAY_VAR, i, entryCurr);\
+		const auto entryNext = EARRAY_VAR->at(++i).first;\
+		LOG_EARRAY(EARRAY_VAR, i, entryNext);\
+		ASSERT_TRUE(entryCurr < entryNext);\
+	};\
+
+#define LOG_EARRAY(EARRAY_VAR, INDICE, ENTRY)\
+	LOG(#EARRAY_VAR"[%i] = %i, %s", INDICE, ENTRY, magic_enum::enum_name(ENTRY).data());
+
+// Test that the magic enum arrays are pre-sorted
+TEST(MagicEnumTest, ArraysAreSorted) {
+	Game::logger = new Logger("./MagicEnumTest_ArraysAreSorted.log", true, true);
+
+	constexpr auto wmArray = &magic_enum::enum_entries<eWorldMessageType>();
+	ASSERT_EARRAY_SORTED(wmArray);
+
+	constexpr auto gmArray = &magic_enum::enum_entries<eGameMessageType>();
+	ASSERT_EARRAY_SORTED(gmArray);
+
+	delete Game::logger;
+}
diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
index 978c5532..7b694b14 100644
--- a/thirdparty/CMakeLists.txt
+++ b/thirdparty/CMakeLists.txt
@@ -19,6 +19,9 @@ add_library(bcrypt ${SOURCES_LIBBCRYPT})
 # Source code for sqlite
 add_subdirectory(SQLite)
 
+# Source code for magic_enum
+add_subdirectory(magic_enum)
+
 # MariaDB C++ Connector
 include(CMakeMariaDBLists.txt)
 
diff --git a/thirdparty/magic_enum b/thirdparty/magic_enum
new file mode 160000
index 00000000..e55b9b54
--- /dev/null
+++ b/thirdparty/magic_enum
@@ -0,0 +1 @@
+Subproject commit e55b9b54d5cf61f8e117cafb17846d7d742dd3b4

From e58218cfbcc6b5a616dac59174f653aecf1ff2df Mon Sep 17 00:00:00 2001
From: David Markowitz <39972741+EmosewaMC@users.noreply.github.com>
Date: Sat, 23 Dec 2023 09:24:16 -0800
Subject: [PATCH 06/13] chore: Speed up and cleanup level and zone loading; Add
 safer asset buffer reading (#1314)

* Remove std::couts littered throughout the base

* working

End of optimizations for now

going faster

* Remove extraneous compare function

std::less<LWOSCENEID> already does this in a map.

* gaming

* Update Zone.cpp

* dlu is moving to bitbucket again

* Update Level.cpp

---------

Co-authored-by: Jettford <mrjettbradford@gmail.com>
---
 dCommon/BinaryIO.cpp                          |  41 ---
 dCommon/BinaryIO.h                            |  53 +++-
 dCommon/FdbToSqlite.cpp                       |   8 +-
 dCommon/FdbToSqlite.h                         |   4 +-
 dCommon/dClient/AssetManager.cpp              |   7 +-
 dCommon/dClient/AssetManager.h                |  18 +-
 dCommon/dClient/PackIndex.cpp                 |  19 +-
 dGame/UserManager.cpp                         |  30 +-
 dGame/dInventory/Item.cpp                     |  13 +-
 dGame/dPropertyBehaviors/ControlBehaviors.cpp |  13 +-
 dGame/dUtilities/BrickDatabase.cpp            |  12 +-
 dGame/dUtilities/SlashCommandHandler.cpp      |   8 +-
 dMasterServer/MasterServer.cpp                |   7 +-
 dZoneManager/Level.cpp                        | 151 +++------
 dZoneManager/Level.h                          |  14 +-
 dZoneManager/Zone.cpp                         | 294 ++++++------------
 dZoneManager/Zone.h                           |   9 +-
 dZoneManager/dZMCommon.h                      |   4 -
 dZoneManager/dZoneManager.cpp                 |  27 --
 dZoneManager/dZoneManager.h                   |   2 -
 20 files changed, 247 insertions(+), 487 deletions(-)

diff --git a/dCommon/BinaryIO.cpp b/dCommon/BinaryIO.cpp
index 22e4de60..b64fb3ba 100644
--- a/dCommon/BinaryIO.cpp
+++ b/dCommon/BinaryIO.cpp
@@ -1,14 +1,6 @@
 #include "BinaryIO.h"
 #include <string>
 
-void BinaryIO::WriteString(const std::string& stringToWrite, std::ofstream& outstream) {
-	//BinaryWrite(outstream, uint32_t(stringToWrite.length()));
-
-	for (size_t i = 0; i < size_t(stringToWrite.length()); ++i) {
-		BinaryIO::BinaryWrite(outstream, stringToWrite[i]);
-	}
-}
-
 //For reading null-terminated strings
 std::string BinaryIO::ReadString(std::istream& instream) {
 	std::string toReturn;
@@ -23,36 +15,3 @@ std::string BinaryIO::ReadString(std::istream& instream) {
 
 	return toReturn;
 }
-
-//For reading strings of a specific size
-std::string BinaryIO::ReadString(std::istream& instream, size_t size) {
-	std::string toReturn;
-	char buffer;
-
-	for (size_t i = 0; i < size; ++i) {
-		BinaryIO::BinaryRead(instream, buffer);
-		toReturn += buffer;
-	}
-
-	return toReturn;
-}
-
-std::string BinaryIO::ReadWString(std::istream& instream) {
-	size_t size;
-	BinaryRead(instream, size);
-	//toReturn.resize(size);
-	std::string test;
-	unsigned char buf;
-
-	for (size_t i = 0; i < size; ++i) {
-		//instream.ignore(1);
-		BinaryRead(instream, buf);
-		test += buf;
-	}
-
-	//printf("%s\n", test.c_str());
-
-	//instream.read((char*)&toReturn[0], size * 2);
-	//std::string str(toReturn.begin(), toReturn.end());
-	return test;
-}
diff --git a/dCommon/BinaryIO.h b/dCommon/BinaryIO.h
index a117ad0d..d1e728ca 100644
--- a/dCommon/BinaryIO.h
+++ b/dCommon/BinaryIO.h
@@ -1,8 +1,17 @@
 #pragma once
+
+#ifndef __BINARYIO__H__
+#define __BINARYIO__H__
+
 #include <iostream>
 #include <fstream>
+#include <string>
+
+#include "Game.h"
+#include "Logger.h"
 
 namespace BinaryIO {
+
 	template<typename T>
 	std::ostream& BinaryWrite(std::ostream& stream, const T& value) {
 		return stream.write(reinterpret_cast<const char*>(&value), sizeof(T));
@@ -15,13 +24,51 @@ namespace BinaryIO {
 		return stream.read(reinterpret_cast<char*>(&value), sizeof(T));
 	}
 
-	void WriteString(const std::string& stringToWrite, std::ofstream& outstream);
+	enum class ReadType : int8_t {
+		WideString = 0,
+		String = 1,
+	};
+
+	template<typename SizeType>
+	inline void ReadString(std::istream& stream, std::u16string& value) {
+		static_assert(std::is_integral<SizeType>::value, "SizeType must be an integral type.");
+
+		SizeType size;
+		BinaryRead(stream, size);
+
+		if (!stream.good()) throw std::runtime_error("Failed to read from istream.");
+		value.resize(size);
+		stream.read(reinterpret_cast<char*>(value.data()), size * sizeof(uint16_t));
+	}
+
+	template<typename SizeType>
+	inline void ReadString(std::istream& stream, std::string& value, ReadType readType) {
+		static_assert(std::is_integral<SizeType>::value, "SizeType must be an integral type.");
+
+		SizeType size;
+		BinaryRead(stream, size);
+
+		if (!stream.good()) throw std::runtime_error("Failed to read from istream.");
+		value.resize(size);
+		if (readType == ReadType::WideString) {
+			uint16_t wideChar;
+
+			// Faster to do this than to read a u16string and convert it to a string since we only go through allocator once
+			for (SizeType i = 0; i < size; ++i) {
+				BinaryRead(stream, wideChar);
+				value[i] = static_cast<char>(wideChar);
+			}
+		} else {
+			stream.read(value.data(), size);
+		}
+	}
+
 	std::string ReadString(std::istream& instream);
-	std::string ReadString(std::istream& instream, size_t size);
-	std::string ReadWString(std::istream& instream);
 
 	inline bool DoesFileExist(const std::string& name) {
 		std::ifstream f(name.c_str());
 		return f.good();
 	}
 }
+
+#endif  //!__BINARYIO__H__
diff --git a/dCommon/FdbToSqlite.cpp b/dCommon/FdbToSqlite.cpp
index 0b2c546c..d8409cd5 100644
--- a/dCommon/FdbToSqlite.cpp
+++ b/dCommon/FdbToSqlite.cpp
@@ -28,19 +28,17 @@ FdbToSqlite::Convert::Convert(std::string binaryOutPath) {
 	this->m_BinaryOutPath = binaryOutPath;
 }
 
-bool FdbToSqlite::Convert::ConvertDatabase(AssetMemoryBuffer& buffer) {
+bool FdbToSqlite::Convert::ConvertDatabase(AssetStream& buffer) {
 	if (m_ConversionStarted) return false;
 
-	std::istream cdClientBuffer(&buffer);
-
 	this->m_ConversionStarted = true;
 	try {
 		CDClientDatabase::Connect(m_BinaryOutPath + "/CDServer.sqlite");
 
 		CDClientDatabase::ExecuteQuery("BEGIN TRANSACTION;");
 
-		int32_t numberOfTables = ReadInt32(cdClientBuffer);
-		ReadTables(numberOfTables, cdClientBuffer);
+		int32_t numberOfTables = ReadInt32(buffer);
+		ReadTables(numberOfTables, buffer);
 
 		CDClientDatabase::ExecuteQuery("COMMIT;");
 	} catch (CppSQLite3Exception& e) {
diff --git a/dCommon/FdbToSqlite.h b/dCommon/FdbToSqlite.h
index 7aad2703..b0d20aee 100644
--- a/dCommon/FdbToSqlite.h
+++ b/dCommon/FdbToSqlite.h
@@ -7,7 +7,7 @@
 #include <iosfwd>
 #include <map>
 
-class AssetMemoryBuffer;
+#include "AssetManager.h"
 
 enum class eSqliteDataType : int32_t;
 
@@ -27,7 +27,7 @@ namespace FdbToSqlite {
 		 * 
 		 * @return true if the database was converted properly, false otherwise. 
 		 */
-		bool ConvertDatabase(AssetMemoryBuffer& buffer);
+		bool ConvertDatabase(AssetStream& buffer);
 
 		/**
 		 * @brief Reads a 32 bit int from the fdb file.
diff --git a/dCommon/dClient/AssetManager.cpp b/dCommon/dClient/AssetManager.cpp
index c672b335..00bae6ce 100644
--- a/dCommon/dClient/AssetManager.cpp
+++ b/dCommon/dClient/AssetManager.cpp
@@ -152,13 +152,12 @@ bool AssetManager::GetFile(const char* name, char** data, uint32_t* len) {
 	return success;
 }
 
-AssetMemoryBuffer AssetManager::GetFileAsBuffer(const char* name) {
-	char* buf;
-	uint32_t len;
+AssetStream AssetManager::GetFile(const char* name) {
+	char* buf; uint32_t len;
 
 	bool success = this->GetFile(name, &buf, &len);
 
-	return AssetMemoryBuffer(buf, len, success);
+	return AssetStream(buf, len, success);
 }
 
 uint32_t AssetManager::crc32b(uint32_t base, uint8_t* message, size_t l) {
diff --git a/dCommon/dClient/AssetManager.h b/dCommon/dClient/AssetManager.h
index d2543489..7e36b4b5 100644
--- a/dCommon/dClient/AssetManager.h
+++ b/dCommon/dClient/AssetManager.h
@@ -25,6 +25,10 @@ struct AssetMemoryBuffer : std::streambuf {
 		this->setg(base, base, base + n);
 	}
 
+	~AssetMemoryBuffer() {
+		free(m_Base);
+	}
+
 	pos_type seekpos(pos_type sp, std::ios_base::openmode which) override {
 		return seekoff(sp - pos_type(off_type(0)), std::ios_base::beg, which);
 	}
@@ -40,9 +44,17 @@ struct AssetMemoryBuffer : std::streambuf {
 			setg(eback(), eback() + off, egptr());
 		return gptr() - eback();
 	}
+};
 
-	void close() {
-		free(m_Base);
+struct AssetStream : std::istream {
+	AssetStream(char* base, std::ptrdiff_t n, bool success) : std::istream(new AssetMemoryBuffer(base, n, success)) {}
+
+	~AssetStream() {
+		delete rdbuf();
+	}
+
+	operator bool() {
+		return reinterpret_cast<AssetMemoryBuffer*>(rdbuf())->m_Success;
 	}
 };
 
@@ -56,7 +68,7 @@ public:
 
 	bool HasFile(const char* name);
 	bool GetFile(const char* name, char** data, uint32_t* len);
-	AssetMemoryBuffer GetFileAsBuffer(const char* name);
+	AssetStream GetFile(const char* name);
 
 private:
 	void LoadPackIndex();
diff --git a/dCommon/dClient/PackIndex.cpp b/dCommon/dClient/PackIndex.cpp
index 55c26b48..0d7a7fe9 100644
--- a/dCommon/dClient/PackIndex.cpp
+++ b/dCommon/dClient/PackIndex.cpp
@@ -8,21 +8,10 @@ PackIndex::PackIndex(const std::filesystem::path& filePath) {
 
 	BinaryIO::BinaryRead<uint32_t>(m_FileStream, m_Version);
 	BinaryIO::BinaryRead<uint32_t>(m_FileStream, m_PackPathCount);
-
-	for (int i = 0; i < m_PackPathCount; i++) {
-		uint32_t stringLen = 0;
-		BinaryIO::BinaryRead<uint32_t>(m_FileStream, stringLen);
-
-		std::string path;
-
-		for (int j = 0; j < stringLen; j++) {
-			char inChar;
-			BinaryIO::BinaryRead<char>(m_FileStream, inChar);
-
-			path += inChar;
-		}
-
-		m_PackPaths.push_back(path);
+	
+	m_PackPaths.resize(m_PackPathCount);
+	for (auto& item : m_PackPaths) {
+		BinaryIO::ReadString<uint32_t>(m_FileStream, item, BinaryIO::ReadType::String);
 	}
 
 	BinaryIO::BinaryRead<uint32_t>(m_FileStream, m_PackFileIndexCount);
diff --git a/dGame/UserManager.cpp b/dGame/UserManager.cpp
index 323bf29a..18387366 100644
--- a/dGame/UserManager.cpp
+++ b/dGame/UserManager.cpp
@@ -44,57 +44,53 @@ inline void StripCR(std::string& str) {
 void UserManager::Initialize() {
 	std::string line;
 
-	AssetMemoryBuffer fnBuff = Game::assetManager->GetFileAsBuffer("names/minifigname_first.txt");
-	if (!fnBuff.m_Success) {
+	auto fnStream = Game::assetManager->GetFile("names/minifigname_first.txt");
+	if (!fnStream) {
 		LOG("Failed to load %s", (Game::assetManager->GetResPath() / "names/minifigname_first.txt").string().c_str());
 		throw std::runtime_error("Aborting initialization due to missing minifigure name file.");
 	}
-	std::istream fnStream = std::istream(&fnBuff);
+
 	while (std::getline(fnStream, line, '\n')) {
 		std::string name = line;
 		StripCR(name);
 		m_FirstNames.push_back(name);
 	}
-	fnBuff.close();
 
-	AssetMemoryBuffer mnBuff = Game::assetManager->GetFileAsBuffer("names/minifigname_middle.txt");
-	if (!mnBuff.m_Success) {
+	auto mnStream = Game::assetManager->GetFile("names/minifigname_middle.txt");
+	if (!mnStream) {
 		LOG("Failed to load %s", (Game::assetManager->GetResPath() / "names/minifigname_middle.txt").string().c_str());
 		throw std::runtime_error("Aborting initialization due to missing minifigure name file.");
 	}
-	std::istream mnStream = std::istream(&mnBuff);
+
 	while (std::getline(mnStream, line, '\n')) {
 		std::string name = line;
 		StripCR(name);
 		m_MiddleNames.push_back(name);
 	}
-	mnBuff.close();
 
-	AssetMemoryBuffer lnBuff = Game::assetManager->GetFileAsBuffer("names/minifigname_last.txt");
-	if (!lnBuff.m_Success) {
+	auto lnStream = Game::assetManager->GetFile("names/minifigname_last.txt");
+	if (!lnStream) {
 		LOG("Failed to load %s", (Game::assetManager->GetResPath() / "names/minifigname_last.txt").string().c_str());
 		throw std::runtime_error("Aborting initialization due to missing minifigure name file.");
 	}
-	std::istream lnStream = std::istream(&lnBuff);
+
 	while (std::getline(lnStream, line, '\n')) {
 		std::string name = line;
 		StripCR(name);
 		m_LastNames.push_back(name);
 	}
-	lnBuff.close();
 
-	//Load our pre-approved names:
-	AssetMemoryBuffer chatListBuff = Game::assetManager->GetFileAsBuffer("chatplus_en_us.txt");
-	if (!chatListBuff.m_Success) {
+	// Load our pre-approved names:
+	auto chatListStream = Game::assetManager->GetFile("chatplus_en_us.txt");
+	if (!chatListStream) {
 		LOG("Failed to load %s", (Game::assetManager->GetResPath() / "chatplus_en_us.txt").string().c_str());
 		throw std::runtime_error("Aborting initialization due to missing chat whitelist file.");
 	}
-	std::istream chatListStream = std::istream(&chatListBuff);
+
 	while (std::getline(chatListStream, line, '\n')) {
 		StripCR(line);
 		m_PreapprovedNames.push_back(line);
 	}
-	chatListBuff.close();
 }
 
 UserManager::~UserManager() {
diff --git a/dGame/dInventory/Item.cpp b/dGame/dInventory/Item.cpp
index 438bec2f..9e4b46f6 100644
--- a/dGame/dInventory/Item.cpp
+++ b/dGame/dInventory/Item.cpp
@@ -423,25 +423,16 @@ void Item::DisassembleModel(uint32_t numToDismantle) {
 	if (renderAssetSplit.empty()) return;
 
 	std::string lxfmlPath = "BrickModels" + lxfmlFolderName + "/" + GeneralUtils::SplitString(renderAssetSplit.back(), '.').at(0) + ".lxfml";
-	auto buffer = Game::assetManager->GetFileAsBuffer(lxfmlPath.c_str());
+	auto file = Game::assetManager->GetFile(lxfmlPath.c_str());
 
-	if (!buffer.m_Success) {
+	if (!file) {
 		LOG("Failed to load %s to disassemble model into bricks, check that this file exists", lxfmlPath.c_str());
 		return;
 	}
 
-	std::istream file(&buffer);
-
-	if (!file.good()) {
-		buffer.close();
-		return;
-	}
-
 	std::stringstream data;
 	data << file.rdbuf();
 
-	buffer.close();
-
 	uint32_t fileSize;
 	file.seekg(0, std::ios::end);
 	fileSize = static_cast<uint32_t>(file.tellg());
diff --git a/dGame/dPropertyBehaviors/ControlBehaviors.cpp b/dGame/dPropertyBehaviors/ControlBehaviors.cpp
index 3dbd777a..b143cbc8 100644
--- a/dGame/dPropertyBehaviors/ControlBehaviors.cpp
+++ b/dGame/dPropertyBehaviors/ControlBehaviors.cpp
@@ -324,14 +324,9 @@ void ControlBehaviors::ProcessCommand(Entity* modelEntity, const SystemAddress&
 }
 
 ControlBehaviors::ControlBehaviors() {
-	auto blocksDefStreamBuffer = Game::assetManager->GetFileAsBuffer("ui\\ingame\\blocksdef.xml");
-	if (!blocksDefStreamBuffer.m_Success) {
-		LOG("failed to open blocksdef");
-		return;
-	}
-	std::istream blocksBuffer(&blocksDefStreamBuffer);
-	if (!blocksBuffer.good()) {
-		LOG("Blocks buffer is not good!");
+	auto blocksBuffer = Game::assetManager->GetFile("ui\\ingame\\blocksdef.xml");
+	if (!blocksBuffer) {
+		LOG("Failed to open blocksdef.xml");
 		return;
 	}
 
@@ -342,7 +337,7 @@ ControlBehaviors::ControlBehaviors() {
 	std::string buffer{};
 	bool commentBlockStart = false;
 	while (std::getline(blocksBuffer, read)) {
-		// tinyxml2 should handle comment blocks but the client has one that fails the processing.  
+		// tinyxml2 should handle comment blocks but the client has one that fails the processing.
 		// This preprocessing just removes all comments from the read file out of an abundance of caution.
 		if (read.find("<!--") != std::string::npos) {
 			commentBlockStart = true;
diff --git a/dGame/dUtilities/BrickDatabase.cpp b/dGame/dUtilities/BrickDatabase.cpp
index e4a6a714..7b447b84 100644
--- a/dGame/dUtilities/BrickDatabase.cpp
+++ b/dGame/dUtilities/BrickDatabase.cpp
@@ -17,26 +17,18 @@ const BrickList& BrickDatabase::GetBricks(const LxfmlPath& lxfmlPath) {
 		return cached->second;
 	}
 
-	AssetMemoryBuffer buffer = Game::assetManager->GetFileAsBuffer((lxfmlPath).c_str());
+	auto file = Game::assetManager->GetFile((lxfmlPath).c_str());
 
-	if (!buffer.m_Success) {
-		return emptyCache;
-	}
-
-	std::istream file(&buffer);
-	if (!file.good()) {
+	if (!file) {
 		return emptyCache;
 	}
 
 	std::stringstream data;
 	data << file.rdbuf();
 	if (data.str().empty()) {
-		buffer.close();
 		return emptyCache;
 	}
 
-	buffer.close();
-
 	auto* doc = new tinyxml2::XMLDocument();
 	if (doc->Parse(data.str().c_str(), data.str().size()) != 0) {
 		delete doc;
diff --git a/dGame/dUtilities/SlashCommandHandler.cpp b/dGame/dUtilities/SlashCommandHandler.cpp
index a37b6124..7a41f6d0 100644
--- a/dGame/dUtilities/SlashCommandHandler.cpp
+++ b/dGame/dUtilities/SlashCommandHandler.cpp
@@ -621,15 +621,13 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 		if (args[0].find("/") != std::string::npos) return;
 		if (args[0].find("\\") != std::string::npos) return;
 
-		auto buf = Game::assetManager->GetFileAsBuffer(("macros/" + args[0] + ".scm").c_str());
+		auto infile = Game::assetManager->GetFile(("macros/" + args[0] + ".scm").c_str());
 
-		if (!buf.m_Success) {
+		if (!infile) {
 			ChatPackets::SendSystemMessage(sysAddr, u"Unknown macro! Is the filename right?");
 			return;
 		}
 
-		std::istream infile(&buf);
-
 		if (infile.good()) {
 			std::string line;
 			while (std::getline(infile, line)) {
@@ -639,8 +637,6 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 			ChatPackets::SendSystemMessage(sysAddr, u"Unknown macro! Is the filename right?");
 		}
 
-		buf.close();
-
 		return;
 	}
 
diff --git a/dMasterServer/MasterServer.cpp b/dMasterServer/MasterServer.cpp
index e5947009..1f62a64e 100644
--- a/dMasterServer/MasterServer.cpp
+++ b/dMasterServer/MasterServer.cpp
@@ -169,8 +169,8 @@ int main(int argc, char** argv) {
 				(BinaryPathFinder::GetBinaryDir() / "resServer" / "CDServer.sqlite").c_str(),
 				(Game::assetManager->GetResPath() / "cdclient.fdb").c_str());
 
-			AssetMemoryBuffer cdClientBuffer = Game::assetManager->GetFileAsBuffer("cdclient.fdb");
-			if (!cdClientBuffer.m_Success) {
+			auto cdclientStream = Game::assetManager->GetFile("cdclient.fdb");
+			if (!cdclientStream) {
 				LOG("Failed to load %s", (Game::assetManager->GetResPath() / "cdclient.fdb").c_str());
 				throw std::runtime_error("Aborting initialization due to missing cdclient.fdb.");
 			}
@@ -178,11 +178,10 @@ int main(int argc, char** argv) {
 			LOG("Found %s.  Converting to SQLite", (Game::assetManager->GetResPath() / "cdclient.fdb").c_str());
 			Game::logger->Flush();
 
-			if (FdbToSqlite::Convert((BinaryPathFinder::GetBinaryDir() / "resServer").string()).ConvertDatabase(cdClientBuffer) == false) {
+			if (FdbToSqlite::Convert((BinaryPathFinder::GetBinaryDir() / "resServer").string()).ConvertDatabase(cdclientStream) == false) {
 				LOG("Failed to convert fdb to sqlite.");
 				return EXIT_FAILURE;
 			}
-			cdClientBuffer.close();
 		}
 	}
 
diff --git a/dZoneManager/Level.cpp b/dZoneManager/Level.cpp
index 4c6ff93c..ae44eb8f 100644
--- a/dZoneManager/Level.cpp
+++ b/dZoneManager/Level.cpp
@@ -16,36 +16,20 @@
 #include "AssetManager.h"
 #include "dConfig.h"
 
-void Level::SceneObjectDataChunk::PrintAllObjects() const {
-	for (const auto& [id, sceneObj] : objects) {
-		LOG("ID: %d LOT: %d", id, sceneObj.lot);
-	}
-}
-
 Level::Level(Zone* parentZone, const std::string& filepath) {
 	m_ParentZone = parentZone;
 
-	auto buffer = Game::assetManager->GetFileAsBuffer(filepath.c_str());
+	auto stream = Game::assetManager->GetFile(filepath.c_str());
 
-	if (!buffer.m_Success) {
+	if (!stream) {
 		LOG("Failed to load %s", filepath.c_str());
 		return;
 	}
-
-	std::istream file(&buffer);
-	ReadChunks(file);
-
-	buffer.close();
+	
+	ReadChunks(stream);
 }
 
-Level::~Level() {
-	for (auto& [id, header] : m_ChunkHeaders) {
-		if (header.id == Level::ChunkTypeID::FileInfo) delete header.fileInfo;
-		if (header.id == Level::ChunkTypeID::SceneObjectData) delete header.sceneObjects;
-	}
-}
-
-void Level::MakeSpawner(SceneObject obj){
+void Level::MakeSpawner(SceneObject obj) {
 	SpawnerInfo spawnInfo = SpawnerInfo();
 	SpawnerNode* node = new SpawnerNode();
 	spawnInfo.templateID = obj.lot;
@@ -56,7 +40,7 @@ void Level::MakeSpawner(SceneObject obj){
 	node->config = obj.settings;
 	spawnInfo.nodes.push_back(node);
 	for (LDFBaseData* data : obj.settings) {
-	if (data) {
+		if (!data) continue;
 		if (data->GetKey() == u"spawntemplate") {
 			spawnInfo.templateID = std::stoi(data->GetValueAsString());
 		}
@@ -111,16 +95,8 @@ void Level::MakeSpawner(SceneObject obj){
 			spawnInfo.spawnActivator = static_cast<LDFData<bool>*>(data)->GetValue();
 		}
 	}
-	}
-	Game::zoneManager->MakeSpawner(spawnInfo);
-}
 
-const void Level::PrintAllObjects() {
-	for (std::map<uint32_t, Header>::iterator it = m_ChunkHeaders.begin(); it != m_ChunkHeaders.end(); ++it) {
-		if (it->second.id == Level::ChunkTypeID::SceneObjectData) {
-			it->second.sceneObjects->PrintAllObjects();
-		}
-	}
+	Game::zoneManager->MakeSpawner(spawnInfo);
 }
 
 void Level::ReadChunks(std::istream& file) {
@@ -155,11 +131,10 @@ void Level::ReadChunks(std::istream& file) {
 				file.seekg(0);
 				Header header;
 				header.id = ChunkTypeID::FileInfo; //I guess?
-				FileInfoChunk* fileInfo = new FileInfoChunk();
 				BinaryIO::BinaryRead(file, header.chunkVersion);
 				BinaryIO::BinaryRead(file, header.chunkType);
 				file.ignore(1);
-				BinaryIO::BinaryRead(file, fileInfo->revision);
+				BinaryIO::BinaryRead(file, header.fileInfo.revision);
 
 				if (header.chunkVersion >= 45) file.ignore(4);
 				file.ignore(4 * (4 * 3));
@@ -172,9 +147,7 @@ void Level::ReadChunks(std::istream& file) {
 							uint32_t s = 0;
 							BinaryIO::BinaryRead(file, s);
 							for (uint32_t i = 0; i < s; ++i) {
-								file.ignore(4); //a uint
-								file.ignore(4); //two floats
-								file.ignore(4);
+								file.ignore(4 * 3); //a uint and two floats
 							}
 						}
 					} else {
@@ -208,7 +181,6 @@ void Level::ReadChunks(std::istream& file) {
 				BinaryIO::BinaryRead(file, count);
 				file.ignore(count * 12);
 
-				header.fileInfo = fileInfo;
 				m_ChunkHeaders.insert(std::make_pair(header.id, header));
 
 				//Now pretend to be a normal file and read Objects chunk:
@@ -222,20 +194,17 @@ void Level::ReadChunks(std::istream& file) {
 }
 
 void Level::ReadFileInfoChunk(std::istream& file, Header& header) {
-	FileInfoChunk* fi = new FileInfoChunk;
-	BinaryIO::BinaryRead(file, fi->version);
-	BinaryIO::BinaryRead(file, fi->revision);
-	BinaryIO::BinaryRead(file, fi->enviromentChunkStart);
-	BinaryIO::BinaryRead(file, fi->objectChunkStart);
-	BinaryIO::BinaryRead(file, fi->particleChunkStart);
-	header.fileInfo = fi;
+	BinaryIO::BinaryRead(file, header.fileInfo.version);
+	BinaryIO::BinaryRead(file, header.fileInfo.revision);
+	BinaryIO::BinaryRead(file, header.fileInfo.enviromentChunkStart);
+	BinaryIO::BinaryRead(file, header.fileInfo.objectChunkStart);
+	BinaryIO::BinaryRead(file, header.fileInfo.particleChunkStart);
 
 	//PATCH FOR AG: (messed up file?)
-	if (header.fileInfo->revision == 3452816845 && m_ParentZone->GetZoneID().GetMapID() == 1100) header.fileInfo->revision = 26;
+	if (header.fileInfo.revision == 0xCDCDCDCD && m_ParentZone->GetZoneID().GetMapID() == 1100) header.fileInfo.revision = 26;
 }
 
 void Level::ReadSceneObjectDataChunk(std::istream& file, Header& header) {
-	SceneObjectDataChunk* chunk = new SceneObjectDataChunk;
 	uint32_t objectsCount = 0;
 	BinaryIO::BinaryRead(file, objectsCount);
 
@@ -249,7 +218,10 @@ void Level::ReadSceneObjectDataChunk(std::istream& file, Header& header) {
 	GeneralUtils::TryParse<int32_t>(Game::config->GetValue("version_current"), gating.current);
 	GeneralUtils::TryParse<int32_t>(Game::config->GetValue("version_minor"), gating.minor);
 
+	const auto zoneControlObject = Game::zoneManager->GetZoneControlObject();
+	DluAssert(zoneControlObject != nullptr);
 	for (uint32_t i = 0; i < objectsCount; ++i) {
+		std::u16string ldfString;
 		SceneObject obj;
 		BinaryIO::BinaryRead(file, obj.id);
 		BinaryIO::BinaryRead(file, obj.lot);
@@ -260,6 +232,8 @@ void Level::ReadSceneObjectDataChunk(std::istream& file, Header& header) {
 		BinaryIO::BinaryRead(file, obj.position);
 		BinaryIO::BinaryRead(file, obj.rotation);
 		BinaryIO::BinaryRead(file, obj.scale);
+		BinaryIO::ReadString<uint32_t>(file, ldfString);
+		BinaryIO::BinaryRead(file, obj.value3);
 
 		//This is a little bit of a bodge, but because the alpha client (HF) doesn't store the
 		//spawn position / rotation like the later versions do, we need to check the LOT for the spawn pos & set it.
@@ -268,16 +242,6 @@ void Level::ReadSceneObjectDataChunk(std::istream& file, Header& header) {
 			Game::zoneManager->GetZone()->SetSpawnRot(obj.rotation);
 		}
 
-		std::u16string ldfString = u"";
-		uint32_t length = 0;
-		BinaryIO::BinaryRead(file, length);
-
-		for (uint32_t i = 0; i < length; ++i) {
-			uint16_t data;
-			BinaryIO::BinaryRead(file, data);
-			ldfString.push_back(data);
-		}
-
 		std::string sData = GeneralUtils::UTF16ToWTF8(ldfString);
 		std::stringstream ssData(sData);
 		std::string token;
@@ -288,35 +252,40 @@ void Level::ReadSceneObjectDataChunk(std::istream& file, Header& header) {
 			obj.settings.push_back(ldfData);
 		}
 
-		BinaryIO::BinaryRead(file, obj.value3);
 
-		// Feature gating
-		bool gated = false;
+		// We should never have more than 1 zone control object
+		bool skipLoadingObject = obj.lot == zoneControlObject->GetLOT();
 		for (LDFBaseData* data : obj.settings) {
+			if (!data) continue;
 			if (data->GetKey() == u"gatingOnFeature") {
 				gating.featureName = data->GetValueAsString();
-				if (gating.featureName == Game::config->GetValue("event_1")) break;
-				else if (gating.featureName == Game::config->GetValue("event_2")) break;
-				else if (gating.featureName == Game::config->GetValue("event_3")) break;
-				else if (gating.featureName == Game::config->GetValue("event_4")) break;
-				else if (gating.featureName == Game::config->GetValue("event_5")) break;
-				else if (gating.featureName == Game::config->GetValue("event_6")) break;
-				else if (gating.featureName == Game::config->GetValue("event_7")) break;
-				else if (gating.featureName == Game::config->GetValue("event_8")) break;
+				if (gating.featureName == Game::config->GetValue("event_1")) continue;
+				else if (gating.featureName == Game::config->GetValue("event_2")) continue;
+				else if (gating.featureName == Game::config->GetValue("event_3")) continue;
+				else if (gating.featureName == Game::config->GetValue("event_4")) continue;
+				else if (gating.featureName == Game::config->GetValue("event_5")) continue;
+				else if (gating.featureName == Game::config->GetValue("event_6")) continue;
+				else if (gating.featureName == Game::config->GetValue("event_7")) continue;
+				else if (gating.featureName == Game::config->GetValue("event_8")) continue;
 				else if (!featureGatingTable->FeatureUnlocked(gating)) {
-					gated = true;
+					// The feature is not unlocked, so we can skip loading this object
+					skipLoadingObject = true;
 					break;
 				}
 			}
+			// If this is a client only object, we can skip loading it
+			if (data->GetKey() == u"loadOnClientOnly") {
+				skipLoadingObject = static_cast<bool>(std::stoi(data->GetValueAsString()));
+				break;
+			}
 		}
 
-		if (gated) {
+		if (skipLoadingObject) {
 			for (auto* setting : obj.settings) {
 				delete setting;
+				setting = nullptr;
 			}
 
-			obj.settings.clear();
-
 			continue;
 		}
 
@@ -331,45 +300,7 @@ void Level::ReadSceneObjectDataChunk(std::istream& file, Header& header) {
 			info.rot = obj.rotation;
 			info.settings = obj.settings;
 			info.scale = obj.scale;
-
-			//Check to see if we shouldn't be loading this:
-			bool clientOnly = false;
-			bool serverOnly = false;
-			std::string featureGate = "";
-			for (LDFBaseData* data : obj.settings) {
-				if (data) {
-					if (data->GetKey() == u"loadOnClientOnly") {
-						clientOnly = (bool)std::stoi(data->GetValueAsString());
-						break;
-					}
-					if (data->GetKey() == u"loadSrvrOnly") {
-						serverOnly = (bool)std::stoi(data->GetValueAsString());
-						break;
-					}
-				}
-			}
-
-			if (!clientOnly) {
-
-				// We should never have more than 1 zone control object
-				const auto zoneControlObject = Game::zoneManager->GetZoneControlObject();
-				if (zoneControlObject != nullptr && info.lot == zoneControlObject->GetLOT())
-					goto deleteSettings;
-
-				Game::entityManager->CreateEntity(info, nullptr);
-			} else {
-			deleteSettings:
-
-				for (auto* setting : info.settings) {
-					delete setting;
-					setting = nullptr;
-				}
-
-				info.settings.clear();
-				obj.settings.clear();
-			}
+			Game::entityManager->CreateEntity(info);
 		}
 	}
-
-	header.sceneObjects = chunk;
 }
diff --git a/dZoneManager/Level.h b/dZoneManager/Level.h
index 6f56e073..1f0b4f2e 100644
--- a/dZoneManager/Level.h
+++ b/dZoneManager/Level.h
@@ -27,33 +27,21 @@ public:
 		uint32_t particleChunkStart;
 	};
 
-	struct SceneObjectDataChunk {
-		std::map<LWOOBJID, SceneObject> objects;
-
-		void PrintAllObjects() const;
-
-		uint32_t GetObjectCount() { return objects.size(); }
-	};
-
 	struct Header {
 		uint32_t id;
 		uint16_t chunkVersion;
 		ChunkTypeID chunkType;
 		uint32_t size;
 		uint32_t startPosition;
-		FileInfoChunk* fileInfo;
-		SceneObjectDataChunk* sceneObjects;
+		FileInfoChunk fileInfo;
 		LWOSCENEID lwoSceneID;
 	};
 
 public:
 	Level(Zone* parentZone, const std::string& filepath);
-	~Level();
 	
 	static void MakeSpawner(SceneObject obj);
 
-	const void PrintAllObjects();
-
 	std::map<uint32_t, Header> m_ChunkHeaders;
 private:
 	Zone* m_ParentZone;
diff --git a/dZoneManager/Zone.cpp b/dZoneManager/Zone.cpp
index 18de939c..1e0c6077 100644
--- a/dZoneManager/Zone.cpp
+++ b/dZoneManager/Zone.cpp
@@ -20,7 +20,6 @@
 
 Zone::Zone(const LWOMAPID& mapID, const LWOINSTANCEID& instanceID, const LWOCLONEID& cloneID) :
 	m_ZoneID(mapID, instanceID, cloneID) {
-	m_NumberOfScenesLoaded = 0;
 	m_NumberOfObjectsLoaded = 0;
 	m_NumberOfSceneTransitionsLoaded = 0;
 	m_CheckSum = 0;
@@ -46,14 +45,13 @@ void Zone::LoadZoneIntoMemory() {
 	m_ZonePath = m_ZoneFilePath.substr(0, m_ZoneFilePath.rfind('/') + 1);
 	if (m_ZoneFilePath == "ERR") return;
 
-	AssetMemoryBuffer buffer = Game::assetManager->GetFileAsBuffer(m_ZoneFilePath.c_str());
+	auto file = Game::assetManager->GetFile(m_ZoneFilePath.c_str());
 
-	if (!buffer.m_Success) {
+	if (!file) {
 		LOG("Failed to load %s", m_ZoneFilePath.c_str());
 		throw std::runtime_error("Aborting Zone loading due to no Zone File.");
 	}
 
-	std::istream file(&buffer);
 	if (file) {
 		BinaryIO::BinaryRead(file, m_FileFormatVersion);
 
@@ -81,18 +79,10 @@ void Zone::LoadZoneIntoMemory() {
 		}
 
 		//Read generic zone info:
-		uint8_t stringLength;
-		BinaryIO::BinaryRead(file, stringLength);
-		m_ZonePath = BinaryIO::ReadString(file, stringLength);
-
-		BinaryIO::BinaryRead(file, stringLength);
-		m_ZoneRawPath = BinaryIO::ReadString(file, stringLength);
-
-		BinaryIO::BinaryRead(file, stringLength);
-		m_ZoneName = BinaryIO::ReadString(file, stringLength);
-
-		BinaryIO::BinaryRead(file, stringLength);
-		m_ZoneDesc = BinaryIO::ReadString(file, stringLength);
+		BinaryIO::ReadString<uint8_t>(file, m_ZonePath, BinaryIO::ReadType::String);
+		BinaryIO::ReadString<uint8_t>(file, m_ZoneRawPath, BinaryIO::ReadType::String);
+		BinaryIO::ReadString<uint8_t>(file, m_ZoneName, BinaryIO::ReadType::String);
+		BinaryIO::ReadString<uint8_t>(file, m_ZoneDesc, BinaryIO::ReadType::String);
 
 		if (m_FileFormatVersion >= Zone::FileFormatVersion::PreAlpha) {
 			BinaryIO::BinaryRead(file, m_NumberOfSceneTransitionsLoaded);
@@ -108,59 +98,57 @@ void Zone::LoadZoneIntoMemory() {
 			uint32_t pathCount;
 			BinaryIO::BinaryRead(file, pathCount);
 
+			m_Paths.reserve(pathCount);
 			for (uint32_t i = 0; i < pathCount; ++i) LoadPath(file);
 
 			for (Path path : m_Paths) {
-				if (path.pathType == PathType::Spawner) {
-					SpawnerInfo info = SpawnerInfo();
-					for (PathWaypoint waypoint : path.pathWaypoints) {
-						SpawnerNode* node = new SpawnerNode();
-						node->position = waypoint.position;
-						node->rotation = waypoint.rotation;
-						node->nodeID = 0;
-						node->config = waypoint.config;
+				if (path.pathType != PathType::Spawner) continue;
+				SpawnerInfo info = SpawnerInfo();
+				for (PathWaypoint waypoint : path.pathWaypoints) {
+					SpawnerNode* node = new SpawnerNode();
+					node->position = waypoint.position;
+					node->rotation = waypoint.rotation;
+					node->nodeID = 0;
+					node->config = waypoint.config;
 
-						for (LDFBaseData* data : waypoint.config) {
-							if (data) {
-								if (data->GetKey() == u"spawner_node_id") {
-									node->nodeID = std::stoi(data->GetValueAsString());
-								} else if (data->GetKey() == u"spawner_max_per_node") {
-									node->nodeMax = std::stoi(data->GetValueAsString());
-								} else if (data->GetKey() == u"groupID") { // Load object group
-									std::string groupStr = data->GetValueAsString();
-									info.groups = GeneralUtils::SplitString(groupStr, ';');
-									info.groups.erase(info.groups.end() - 1);
-								} else if (data->GetKey() == u"grpNameQBShowBricks") {
-									if (data->GetValueAsString() == "") continue;
-									/*std::string groupStr = data->GetValueAsString();
-									info.groups.push_back(groupStr);*/
-									info.grpNameQBShowBricks = data->GetValueAsString();
-								} else if (data->GetKey() == u"spawner_name") {
-									info.name = data->GetValueAsString();
-								}
-							}
+					for (LDFBaseData* data : waypoint.config) {
+						if (!data) continue;
+
+						if (data->GetKey() == u"spawner_node_id") {
+							node->nodeID = std::stoi(data->GetValueAsString());
+						} else if (data->GetKey() == u"spawner_max_per_node") {
+							node->nodeMax = std::stoi(data->GetValueAsString());
+						} else if (data->GetKey() == u"groupID") { // Load object group
+							std::string groupStr = data->GetValueAsString();
+							info.groups = GeneralUtils::SplitString(groupStr, ';');
+							info.groups.erase(info.groups.end() - 1);
+						} else if (data->GetKey() == u"grpNameQBShowBricks") {
+							if (data->GetValueAsString() == "") continue;
+							/*std::string groupStr = data->GetValueAsString();
+							info.groups.push_back(groupStr);*/
+							info.grpNameQBShowBricks = data->GetValueAsString();
+						} else if (data->GetKey() == u"spawner_name") {
+							info.name = data->GetValueAsString();
 						}
-						info.nodes.push_back(node);
 					}
-					info.templateID = path.spawner.spawnedLOT;
-					info.spawnerID = path.spawner.spawnerObjID;
-					info.respawnTime = path.spawner.respawnTime;
-					info.amountMaintained = path.spawner.amountMaintained;
-					info.maxToSpawn = path.spawner.maxToSpawn;
-					info.activeOnLoad = path.spawner.spawnerNetActive;
-					info.isNetwork = true;
-					Spawner* spawner = new Spawner(info);
-					Game::zoneManager->AddSpawner(info.spawnerID, spawner);
+					info.nodes.push_back(node);
 				}
-
+				info.templateID = path.spawner.spawnedLOT;
+				info.spawnerID = path.spawner.spawnerObjID;
+				info.respawnTime = path.spawner.respawnTime;
+				info.amountMaintained = path.spawner.amountMaintained;
+				info.maxToSpawn = path.spawner.maxToSpawn;
+				info.activeOnLoad = path.spawner.spawnerNetActive;
+				info.isNetwork = true;
+				Spawner* spawner = new Spawner(info);
+				Game::zoneManager->AddSpawner(info.spawnerID, spawner);
 			}
 		}
 	} else {
 		LOG("Failed to open: %s", m_ZoneFilePath.c_str());
 	}
+	
 	m_ZonePath = m_ZoneFilePath.substr(0, m_ZoneFilePath.rfind('/') + 1);
-
-	buffer.close();
 }
 
 std::string Zone::GetFilePathForZoneID() {
@@ -180,16 +168,16 @@ std::string Zone::GetFilePathForZoneID() {
 uint32_t Zone::CalculateChecksum() {
 	uint32_t sum1 = 0xffff, sum2 = 0xffff;
 
-	for (std::map<LWOSCENEID, uint32_t>::const_iterator it = m_MapRevisions.cbegin(); it != m_MapRevisions.cend(); ++it) {
-		uint32_t sceneID = it->first.GetSceneID();
+	for (const auto& [scene, sceneRevision] : m_MapRevisions) {
+		uint32_t sceneID = scene.GetSceneID();
 		sum2 += sum1 += (sceneID >> 16);
 		sum2 += sum1 += (sceneID & 0xffff);
 
-		uint32_t layerID = it->first.GetLayerID();
+		uint32_t layerID = scene.GetLayerID();
 		sum2 += sum1 += (layerID >> 16);
 		sum2 += sum1 += (layerID & 0xffff);
 
-		uint32_t revision = it->second;
+		uint32_t revision = sceneRevision;
 		sum2 += sum1 += (revision >> 16);
 		sum2 += sum1 += (revision & 0xffff);
 	}
@@ -201,30 +189,20 @@ uint32_t Zone::CalculateChecksum() {
 }
 
 void Zone::LoadLevelsIntoMemory() {
-	for (std::map<LWOSCENEID, SceneRef>::iterator it = m_Scenes.begin(); it != m_Scenes.end(); ++it) {
-		if (it->second.level == nullptr) {
-			it->second.level = new Level(this, m_ZonePath + it->second.filename);
+	for (auto& [sceneID, scene] : m_Scenes) {
+		if (scene.level) continue;
+		scene.level = new Level(this, m_ZonePath + scene.filename);
 
-			if (it->second.level->m_ChunkHeaders.size() > 0) {
-				it->second.level->m_ChunkHeaders.begin()->second.lwoSceneID = it->first;
-				AddRevision(it->second.level->m_ChunkHeaders.begin()->second.lwoSceneID, it->second.level->m_ChunkHeaders.begin()->second.fileInfo->revision);
-			}
-		}
+		if (scene.level->m_ChunkHeaders.empty()) continue;
+
+		scene.level->m_ChunkHeaders.begin()->second.lwoSceneID = sceneID;
+		AddRevision(scene.level->m_ChunkHeaders.begin()->second.lwoSceneID, scene.level->m_ChunkHeaders.begin()->second.fileInfo.revision);
 	}
 }
 
 void Zone::AddRevision(LWOSCENEID sceneID, uint32_t revision) {
-	for (std::pair<LWOSCENEID, uint32_t> item : m_MapRevisions) {
-		if (item.first == sceneID) return;
-	}
-
-	m_MapRevisions[LWOSCENEID(sceneID)] = revision;
-}
-
-const void Zone::PrintAllGameObjects() {
-	for (std::pair<LWOSCENEID, SceneRef> scene : m_Scenes) {
-		LOG("In sceneID: %i", scene.first.GetSceneID());
-		scene.second.level->PrintAllObjects();
+	if (m_MapRevisions.find(sceneID) == m_MapRevisions.end()) {
+		m_MapRevisions.insert(std::make_pair(sceneID, revision));
 	}
 }
 
@@ -233,17 +211,10 @@ void Zone::LoadScene(std::istream& file) {
 	scene.level = nullptr;
 	LWOSCENEID lwoSceneID(LWOZONEID_INVALID, 0);
 
-	uint8_t sceneFilenameLength;
-	BinaryIO::BinaryRead(file, sceneFilenameLength);
-	scene.filename = BinaryIO::ReadString(file, sceneFilenameLength);
+	BinaryIO::ReadString<uint8_t>(file, scene.filename, BinaryIO::ReadType::String);
 
 	std::string luTriggersPath = scene.filename.substr(0, scene.filename.size() - 4) + ".lutriggers";
-	std::vector<LUTriggers::Trigger*> triggers;
-	if(Game::assetManager->HasFile((m_ZonePath + luTriggersPath).c_str())) triggers = LoadLUTriggers(luTriggersPath, scene.id);
-
-	for (LUTriggers::Trigger* trigger : triggers) {
-		scene.triggers.insert({ trigger->id, trigger });
-	}
+	if (Game::assetManager->HasFile((m_ZonePath + luTriggersPath).c_str())) LoadLUTriggers(luTriggersPath, scene);
 
 	if (m_FileFormatVersion >= Zone::FileFormatVersion::LatePreAlpha || m_FileFormatVersion < Zone::FileFormatVersion::PrePreAlpha) {
 		BinaryIO::BinaryRead(file, scene.id);
@@ -253,12 +224,10 @@ void Zone::LoadScene(std::istream& file) {
 		BinaryIO::BinaryRead(file, scene.sceneType);
 		lwoSceneID.SetLayerID(scene.sceneType);
 
-		uint8_t sceneNameLength;
-		BinaryIO::BinaryRead(file, sceneNameLength);
-		scene.name = BinaryIO::ReadString(file, sceneNameLength);
+		BinaryIO::ReadString<uint8_t>(file, scene.name, BinaryIO::ReadType::String);
 	}
 
-	if (m_FileFormatVersion == Zone::FileFormatVersion::LatePreAlpha){
+	if (m_FileFormatVersion == Zone::FileFormatVersion::LatePreAlpha) {
 		BinaryIO::BinaryRead(file, scene.unknown1);
 		BinaryIO::BinaryRead(file, scene.unknown2);
 	}
@@ -270,61 +239,51 @@ void Zone::LoadScene(std::istream& file) {
 	}
 
 	m_Scenes.insert(std::make_pair(lwoSceneID, scene));
-	m_NumberOfScenesLoaded++;
 }
 
-std::vector<LUTriggers::Trigger*> Zone::LoadLUTriggers(std::string triggerFile, LWOSCENEID sceneID) {
-	std::vector<LUTriggers::Trigger*> lvlTriggers;
-
-	auto buffer = Game::assetManager->GetFileAsBuffer((m_ZonePath + triggerFile).c_str());
-
-	if (!buffer.m_Success) {
-		LOG("Failed to load %s from disk. Skipping loading triggers", (m_ZonePath + triggerFile).c_str());
-		return lvlTriggers;
-	}
-
-	std::istream file(&buffer);
+void Zone::LoadLUTriggers(std::string triggerFile, SceneRef& scene) {
+	auto file = Game::assetManager->GetFile((m_ZonePath + triggerFile).c_str());
+	
 	std::stringstream data;
 	data << file.rdbuf();
 
-	buffer.close();
+	data.seekg(0, std::ios::end);
+	int32_t size = data.tellg();
+	data.seekg(0, std::ios::beg);
 
-	if (data.str().size() == 0) return lvlTriggers;
+	if (size == 0) return;
 
-	tinyxml2::XMLDocument* doc = new tinyxml2::XMLDocument();
-	if (!doc) return lvlTriggers;
+	tinyxml2::XMLDocument doc;
 
-	if (doc->Parse(data.str().c_str(), data.str().size()) == 0) {
-		//LOG("Loaded LUTriggers from file %s!", triggerFile.c_str());
-	} else {
+	if (doc.Parse(data.str().c_str(), size) != tinyxml2::XML_SUCCESS) {
 		LOG("Failed to load LUTriggers from file %s", triggerFile.c_str());
-		return lvlTriggers;
+		return;
 	}
 
-	tinyxml2::XMLElement* triggers = doc->FirstChildElement("triggers");
-	if (!triggers) return lvlTriggers;
+	auto* triggers = doc.FirstChildElement("triggers");
+	if (!triggers) return;
 
-	auto currentTrigger = triggers->FirstChildElement("trigger");
+	auto* currentTrigger = triggers->FirstChildElement("trigger");
 	while (currentTrigger) {
 		LUTriggers::Trigger* newTrigger = new LUTriggers::Trigger();
 		currentTrigger->QueryAttribute("enabled", &newTrigger->enabled);
 		currentTrigger->QueryAttribute("id", &newTrigger->id);
 
-		auto currentEvent = currentTrigger->FirstChildElement("event");
+		auto* currentEvent = currentTrigger->FirstChildElement("event");
 		while (currentEvent) {
 			LUTriggers::Event* newEvent = new LUTriggers::Event();
 			newEvent->id = TriggerEventType::StringToTriggerEventType(currentEvent->Attribute("id"));
-			auto currentCommand = currentEvent->FirstChildElement("command");
+			auto* currentCommand = currentEvent->FirstChildElement("command");
 			while (currentCommand) {
 				LUTriggers::Command* newCommand = new LUTriggers::Command();
 				newCommand->id = TriggerCommandType::StringToTriggerCommandType(currentCommand->Attribute("id"));
 				newCommand->target = currentCommand->Attribute("target");
-				if (currentCommand->Attribute("targetName") != NULL) {
+				if (currentCommand->Attribute("targetName")) {
 					newCommand->targetName = currentCommand->Attribute("targetName");
-				}
-				if (currentCommand->Attribute("args") != NULL) {
+				} else if (currentCommand->Attribute("args")) {
 					newCommand->args = currentCommand->Attribute("args");
 				}
+
 				newEvent->commands.push_back(newCommand);
 				currentCommand = currentCommand->NextSiblingElement("command");
 			}
@@ -332,19 +291,18 @@ std::vector<LUTriggers::Trigger*> Zone::LoadLUTriggers(std::string triggerFile,
 			currentEvent = currentEvent->NextSiblingElement("event");
 		}
 		currentTrigger = currentTrigger->NextSiblingElement("trigger");
-		lvlTriggers.push_back(newTrigger);
+		scene.triggers.insert(std::make_pair(newTrigger->id, newTrigger));
 	}
-
-	delete doc;
-
-	return lvlTriggers;
 }
 
 LUTriggers::Trigger* Zone::GetTrigger(uint32_t sceneID, uint32_t triggerID) {
-	if (m_Scenes.find(sceneID) == m_Scenes.end()) return nullptr;
-	if (m_Scenes[sceneID].triggers.find(triggerID) == m_Scenes[sceneID].triggers.end()) return nullptr;
+	auto scene = m_Scenes.find(sceneID);
+	if (scene == m_Scenes.end()) return nullptr;
 
-	return m_Scenes[sceneID].triggers[triggerID];
+	auto trigger = scene->second.triggers.find(triggerID);
+	if (trigger == scene->second.triggers.end()) return nullptr;
+
+	return trigger->second;
 }
 
 const Path* Zone::GetPath(std::string name) const {
@@ -360,15 +318,14 @@ const Path* Zone::GetPath(std::string name) const {
 void Zone::LoadSceneTransition(std::istream& file) {
 	SceneTransition sceneTrans;
 	if (m_FileFormatVersion < Zone::FileFormatVersion::Auramar) {
-		uint8_t length;
-		BinaryIO::BinaryRead(file, length);
-		sceneTrans.name = BinaryIO::ReadString(file, length);
+		BinaryIO::ReadString<uint8_t>(file, sceneTrans.name, BinaryIO::ReadType::String);
 		BinaryIO::BinaryRead(file, sceneTrans.width);
 	}
 
 	//BR�THER MAY I HAVE SOME L��PS?
 	uint8_t loops = (m_FileFormatVersion <= Zone::FileFormatVersion::LatePreAlpha || m_FileFormatVersion >= Zone::FileFormatVersion::Launch) ? 2 : 5;
 
+	sceneTrans.points.reserve(loops);
 	for (uint8_t i = 0; i < loops; ++i) {
 		sceneTrans.points.push_back(LoadSceneTransitionInfo(file));
 	}
@@ -388,13 +345,7 @@ void Zone::LoadPath(std::istream& file) {
 
 	BinaryIO::BinaryRead(file, path.pathVersion);
 
-	uint8_t stringLength;
-	BinaryIO::BinaryRead(file, stringLength);
-	for (uint8_t i = 0; i < stringLength; ++i) {
-		uint16_t character;
-		BinaryIO::BinaryRead(file, character);
-		path.pathName.push_back(character);
-	}
+	BinaryIO::ReadString<uint8_t>(file, path.pathName, BinaryIO::ReadType::WideString);
 
 	BinaryIO::BinaryRead(file, path.pathType);
 	BinaryIO::BinaryRead(file, path.flags);
@@ -404,13 +355,7 @@ void Zone::LoadPath(std::istream& file) {
 		if (path.pathVersion >= 18) {
 			BinaryIO::BinaryRead(file, path.movingPlatform.timeBasedMovement);
 		} else if (path.pathVersion >= 13) {
-			uint8_t count;
-			BinaryIO::BinaryRead(file, count);
-			for (uint8_t i = 0; i < count; ++i) {
-				uint16_t character;
-				BinaryIO::BinaryRead(file, character);
-				path.movingPlatform.platformTravelSound.push_back(character);
-			}
+			BinaryIO::ReadString<uint8_t>(file, path.movingPlatform.platformTravelSound, BinaryIO::ReadType::WideString);
 		}
 	} else if (path.pathType == PathType::Property) {
 		BinaryIO::BinaryRead(file, path.property.pathType);
@@ -419,20 +364,8 @@ void Zone::LoadPath(std::istream& file) {
 		BinaryIO::BinaryRead(file, path.property.associatedZone);
 
 		if (path.pathVersion >= 5) {
-			uint8_t count1;
-			BinaryIO::BinaryRead(file, count1);
-			for (uint8_t i = 0; i < count1; ++i) {
-				uint16_t character;
-				BinaryIO::BinaryRead(file, character);
-				path.property.displayName.push_back(character);
-			}
-			uint32_t count2;
-			BinaryIO::BinaryRead(file, count2);
-			for (uint8_t i = 0; i < count2; ++i) {
-				uint16_t character;
-				BinaryIO::BinaryRead(file, character);
-				path.property.displayDesc.push_back(character);
-			}
+			BinaryIO::ReadString<uint8_t>(file, path.property.displayName, BinaryIO::ReadType::WideString);
+			BinaryIO::ReadString<uint32_t>(file, path.property.displayDesc, BinaryIO::ReadType::WideString);
 		}
 
 		if (path.pathVersion >= 6) BinaryIO::BinaryRead(file, path.property.type);
@@ -449,13 +382,7 @@ void Zone::LoadPath(std::istream& file) {
 			BinaryIO::BinaryRead(file, path.property.maxBuildHeight);
 		}
 	} else if (path.pathType == PathType::Camera) {
-		uint8_t count;
-		BinaryIO::BinaryRead(file, count);
-		for (uint8_t i = 0; i < count; ++i) {
-			uint16_t character;
-			BinaryIO::BinaryRead(file, character);
-			path.camera.nextPath.push_back(character);
-		}
+		BinaryIO::ReadString<uint8_t>(file, path.camera.nextPath, BinaryIO::ReadType::WideString);
 		if (path.pathVersion >= 14) {
 			BinaryIO::BinaryRead(file, path.camera.rotatePlayer);
 
@@ -472,7 +399,7 @@ void Zone::LoadPath(std::istream& file) {
 	// Read waypoints
 
 	BinaryIO::BinaryRead(file, path.waypointCount);
-
+	path.pathWaypoints.reserve(path.waypointCount);
 	for (uint32_t i = 0; i < path.waypointCount; ++i) {
 		PathWaypoint waypoint = PathWaypoint();
 
@@ -493,20 +420,8 @@ void Zone::LoadPath(std::istream& file) {
 			BinaryIO::BinaryRead(file, waypoint.movingPlatform.speed);
 			BinaryIO::BinaryRead(file, waypoint.movingPlatform.wait);
 			if (path.pathVersion >= 13) {
-				uint8_t count1;
-				BinaryIO::BinaryRead(file, count1);
-				for (uint8_t i = 0; i < count1; ++i) {
-					uint16_t character;
-					BinaryIO::BinaryRead(file, character);
-					waypoint.movingPlatform.departSound.push_back(character);
-				}
-				uint8_t count2;
-				BinaryIO::BinaryRead(file, count2);
-				for (uint8_t i = 0; i < count2; ++i) {
-					uint16_t character;
-					BinaryIO::BinaryRead(file, character);
-					waypoint.movingPlatform.arriveSound.push_back(character);
-				}
+				BinaryIO::ReadString<uint8_t>(file, waypoint.movingPlatform.departSound, BinaryIO::ReadType::WideString);
+				BinaryIO::ReadString<uint8_t>(file, waypoint.movingPlatform.arriveSound, BinaryIO::ReadType::WideString);
 			}
 		} else if (path.pathType == PathType::Camera) {
 			BinaryIO::BinaryRead(file, waypoint.camera.time);
@@ -529,22 +444,11 @@ void Zone::LoadPath(std::istream& file) {
 			uint32_t count;
 			BinaryIO::BinaryRead(file, count);
 			for (uint32_t i = 0; i < count; ++i) {
-				uint8_t count1;
 				std::string parameter;
+				BinaryIO::ReadString<uint8_t>(file, parameter, BinaryIO::ReadType::WideString);
+
 				std::string value;
-				BinaryIO::BinaryRead(file, count1);
-				for (uint8_t i = 0; i < count1; ++i) {
-					uint16_t character;
-					BinaryIO::BinaryRead(file, character);
-					parameter.push_back(character);
-				}
-				uint8_t count2;
-				BinaryIO::BinaryRead(file, count2);
-				for (uint8_t i = 0; i < count2; ++i) {
-					uint16_t character;
-					BinaryIO::BinaryRead(file, character);
-					value.push_back(character);
-				}
+				BinaryIO::ReadString<uint8_t>(file, value, BinaryIO::ReadType::WideString);
 
 				LDFBaseData* ldfConfig = nullptr;
 				if (path.pathType == PathType::Movement || path.pathType == PathType::Rail) {
diff --git a/dZoneManager/Zone.h b/dZoneManager/Zone.h
index ff931154..a62a81ed 100644
--- a/dZoneManager/Zone.h
+++ b/dZoneManager/Zone.h
@@ -210,7 +210,6 @@ public:
 	void AddRevision(LWOSCENEID sceneID, uint32_t revision);
 	const LWOZONEID& GetZoneID() const { return m_ZoneID; }
 	const uint32_t GetChecksum() const { return m_CheckSum; }
-	const void PrintAllGameObjects();
 	LUTriggers::Trigger* GetTrigger(uint32_t sceneID, uint32_t triggerID);
 	const Path* GetPath(std::string name) const;
 
@@ -228,7 +227,6 @@ public:
 private:
 	LWOZONEID m_ZoneID;
 	std::string m_ZoneFilePath;
-	uint32_t m_NumberOfScenesLoaded;
 	uint32_t m_NumberOfObjectsLoaded;
 	uint32_t m_NumberOfSceneTransitionsLoaded;
 	FileFormatVersion m_FileFormatVersion;
@@ -243,18 +241,17 @@ private:
 	std::string m_ZoneDesc; //Description of the zone by a level designer
 	std::string m_ZoneRawPath; //Path to the .raw file of this zone.
 
-	std::map<LWOSCENEID, SceneRef, mapCompareLwoSceneIDs> m_Scenes;
+	std::map<LWOSCENEID, SceneRef> m_Scenes;
 	std::vector<SceneTransition> m_SceneTransitions;
 
 	uint32_t m_PathDataLength;
 	uint32_t m_PathChunkVersion;
 	std::vector<Path> m_Paths;
 
-	std::map<LWOSCENEID, uint32_t, mapCompareLwoSceneIDs> m_MapRevisions; //rhs is the revision!
-
+	std::map<LWOSCENEID, uint32_t> m_MapRevisions; //rhs is the revision!
 	//private ("helper") functions:
 	void LoadScene(std::istream& file);
-	std::vector<LUTriggers::Trigger*> LoadLUTriggers(std::string triggerFile, LWOSCENEID sceneID);
+	void LoadLUTriggers(std::string triggerFile, SceneRef& scene);
 	void LoadSceneTransition(std::istream& file);
 	SceneTransitionInfo LoadSceneTransitionInfo(std::istream& file);
 	void LoadPath(std::istream& file);
diff --git a/dZoneManager/dZMCommon.h b/dZoneManager/dZMCommon.h
index 738fc283..bee37e5a 100644
--- a/dZoneManager/dZMCommon.h
+++ b/dZoneManager/dZMCommon.h
@@ -5,10 +5,6 @@
 #include "LDFFormat.h"
 #include <vector>
 
-struct mapCompareLwoSceneIDs {
-	bool operator()(const LWOSCENEID& lhs, const LWOSCENEID& rhs) const { return lhs < rhs; }
-};
-
 struct SceneObject {
 	LWOOBJID id;
 	LOT lot;
diff --git a/dZoneManager/dZoneManager.cpp b/dZoneManager/dZoneManager.cpp
index 4aaa911d..a6ce0944 100644
--- a/dZoneManager/dZoneManager.cpp
+++ b/dZoneManager/dZoneManager.cpp
@@ -94,33 +94,6 @@ void dZoneManager::LoadZone(const LWOZONEID& zoneID) {
 	m_pZone = new Zone(zoneID.GetMapID(), zoneID.GetInstanceID(), zoneID.GetCloneID());
 }
 
-void dZoneManager::NotifyZone(const dZoneNotifier& notifier, const LWOOBJID& objectID) {
-	switch (notifier) {
-	case dZoneNotifier::SpawnedObjectDestroyed:
-		break;
-	case dZoneNotifier::SpawnedChildObjectDestroyed:
-		break;
-	case dZoneNotifier::ReloadZone:
-		LOG("Forcing reload of zone %i", m_ZoneID.GetMapID());
-		LoadZone(m_ZoneID);
-
-		m_pZone->Initalize();
-		break;
-	case dZoneNotifier::UserJoined:
-		break;
-	case dZoneNotifier::UserMoved:
-		break;
-	case dZoneNotifier::PrintAllGameObjects:
-		m_pZone->PrintAllGameObjects();
-		break;
-	case dZoneNotifier::InvalidNotifier:
-		LOG("Got an invalid zone notifier.");
-		break;
-	default:
-		LOG("Unknown zone notifier: %i", int(notifier));
-	}
-}
-
 void dZoneManager::AddSpawner(LWOOBJID id, Spawner* spawner) {
 	m_Spawners.insert_or_assign(id, spawner);
 }
diff --git a/dZoneManager/dZoneManager.h b/dZoneManager/dZoneManager.h
index b5db3f6e..4e512d22 100644
--- a/dZoneManager/dZoneManager.h
+++ b/dZoneManager/dZoneManager.h
@@ -14,7 +14,6 @@ public:
 		ReloadZone, //Forces the server and all connects clients to reload the map
 		UserJoined,
 		UserMoved,
-		PrintAllGameObjects, //Using this is a BAD idea in production
 		InvalidNotifier
 	};
 
@@ -30,7 +29,6 @@ public:
 
 	Zone* GetZone(); //Gets a pointer to the currently loaded zone.
 	void LoadZone(const LWOZONEID& zoneID); //Discard the current zone (if any) and loads a new zone.
-	void NotifyZone(const dZoneNotifier& notifier, const LWOOBJID& objectID); //Notifies the zone of a certain event or command.
 	void AddSpawner(LWOOBJID id, Spawner* spawner);
 	LWOZONEID GetZoneID() const;
 	LWOOBJID MakeSpawner(SpawnerInfo info);

From 6b9798595e9034811bab6c7dcfd06c8b55c1f505 Mon Sep 17 00:00:00 2001
From: David Markowitz <39972741+EmosewaMC@users.noreply.github.com>
Date: Sat, 23 Dec 2023 09:28:32 -0800
Subject: [PATCH 07/13] fix: leavezone command (#1345)

Players do not need access to leave Return to the Venture Explorer (rttve) via a slash command.  They can leave through the usual zone method.

Tested that you cannot leavezone in rttve
---
 dGame/dUtilities/SlashCommandHandler.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dGame/dUtilities/SlashCommandHandler.cpp b/dGame/dUtilities/SlashCommandHandler.cpp
index 7a41f6d0..05817e3b 100644
--- a/dGame/dUtilities/SlashCommandHandler.cpp
+++ b/dGame/dUtilities/SlashCommandHandler.cpp
@@ -292,9 +292,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 		const auto currentZone = Game::zoneManager->GetZone()->GetZoneID().GetMapID();
 		LWOMAPID newZone = 0;
 
-		if (currentZone == 1001) {
-			newZone = 1100; // Send to AG if we're in a Return to Venture Explorer instance
-		} else if (currentZone % 100 == 0) {
+		if (currentZone == 1001 || currentZone % 100 == 0) {
 			ChatPackets::SendSystemMessage(sysAddr, u"You are not in an instanced zone.");
 			return;
 		} else {

From 5e9355b1ffc4cc5639a7082a74069c182a273c98 Mon Sep 17 00:00:00 2001
From: David Markowitz <39972741+EmosewaMC@users.noreply.github.com>
Date: Sat, 23 Dec 2023 09:50:14 -0800
Subject: [PATCH 08/13] fix: shooting gallery bugs (#1347)

fix: reset some more vars

Co-authored-by: Aaron Kimbre <aronwk.aaron@gmail.com>
---
 dGame/Entity.cpp                               | 4 +++-
 dGame/dComponents/ShootingGalleryComponent.cpp | 2 ++
 dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp | 7 +++++++
 dZoneManager/Level.cpp                         | 2 +-
 dZoneManager/Zone.cpp                          | 4 ++--
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/dGame/Entity.cpp b/dGame/Entity.cpp
index a73e356f..38960d70 100644
--- a/dGame/Entity.cpp
+++ b/dGame/Entity.cpp
@@ -166,7 +166,9 @@ void Entity::Initialize() {
 
 	if (!groupIDs.empty()) {
 		m_Groups = GeneralUtils::SplitString(groupIDs, ';');
-		m_Groups.erase(m_Groups.end() - 1);
+		if (!m_Groups.empty()) {
+			if (m_Groups.back().empty()) m_Groups.erase(m_Groups.end() - 1);
+		}
 	}
 
 	/**
diff --git a/dGame/dComponents/ShootingGalleryComponent.cpp b/dGame/dComponents/ShootingGalleryComponent.cpp
index 92208598..45cd9342 100644
--- a/dGame/dComponents/ShootingGalleryComponent.cpp
+++ b/dGame/dComponents/ShootingGalleryComponent.cpp
@@ -24,6 +24,7 @@ void ShootingGalleryComponent::Serialize(RakNet::BitStream* outBitStream, bool i
 		outBitStream->Write<uint32_t>(0);
 	} else {
 		outBitStream->Write<uint32_t>(1);
+		outBitStream->Write<LWOOBJID>(m_CurrentPlayerID);
 		for (size_t i = 0; i < 10; i++) {
 			outBitStream->Write<float_t>(0.0f);
 		}
@@ -60,6 +61,7 @@ void ShootingGalleryComponent::Serialize(RakNet::BitStream* outBitStream, bool i
 		outBitStream->Write<LWOOBJID>(m_CurrentPlayerID);
 		outBitStream->Write<float_t>(m_DynamicParams.cannonTimeout);
 		outBitStream->Write<float_t>(m_DynamicParams.cannonFOV);
+		if (!isInitialUpdate) m_Dirty = false;
 	}
 }
 
diff --git a/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp b/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp
index b1d4abc4..2c520670 100644
--- a/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp
+++ b/dScripts/ai/MINIGAME/SG_GF/SERVER/SGCannon.cpp
@@ -1040,6 +1040,13 @@ void SGCannon::ResetVars(Entity* self) {
 	self->SetVar<std::vector<LOT>>(RewardsVariable, {});
 	self->SetVar<uint32_t>(TotalScoreVariable, 0);
 
+	self->SetVar<uint32_t>(u"m_curStreak", 0);
+	self->SetNetworkVar<float>(u"SuperChargeBar", 0);
+	self->SetVar<uint32_t>(u"LastSuperTotal", 0);
+	self->SetNetworkVar<float>(u"SuperChargeBar", 0.0f);
+	self->SetNetworkVar<bool>(u"ShowStreak", 0);
+	self->SetNetworkVar<bool>(u"UnMarkAll", true);
+
 	const_cast<std::vector<SGEnemy>&>(self->GetVar<std::vector<SGEnemy>>(ActiveSpawnsVariable)).clear();
 	self->SetVar<std::vector<SGEnemy>>(ActiveSpawnsVariable, {});
 
diff --git a/dZoneManager/Level.cpp b/dZoneManager/Level.cpp
index ae44eb8f..60f69359 100644
--- a/dZoneManager/Level.cpp
+++ b/dZoneManager/Level.cpp
@@ -83,7 +83,7 @@ void Level::MakeSpawner(SceneObject obj) {
 		if (data->GetKey() == u"groupID") { // Load object groups
 			std::string groupStr = data->GetValueAsString();
 			spawnInfo.groups = GeneralUtils::SplitString(groupStr, ';');
-			spawnInfo.groups.erase(spawnInfo.groups.end() - 1);
+			if (spawnInfo.groups.back().empty()) spawnInfo.groups.erase(spawnInfo.groups.end() - 1);
 		}
 		if (data->GetKey() == u"no_auto_spawn") {
 			spawnInfo.noAutoSpawn = static_cast<LDFData<bool>*>(data)->GetValue();
diff --git a/dZoneManager/Zone.cpp b/dZoneManager/Zone.cpp
index 1e0c6077..d11d11dd 100644
--- a/dZoneManager/Zone.cpp
+++ b/dZoneManager/Zone.cpp
@@ -121,9 +121,9 @@ void Zone::LoadZoneIntoMemory() {
 						} else if (data->GetKey() == u"groupID") { // Load object group
 							std::string groupStr = data->GetValueAsString();
 							info.groups = GeneralUtils::SplitString(groupStr, ';');
-							info.groups.erase(info.groups.end() - 1);
+							if (info.groups.back().empty()) info.groups.erase(info.groups.end() - 1);
 						} else if (data->GetKey() == u"grpNameQBShowBricks") {
-							if (data->GetValueAsString() == "") continue;
+							if (data->GetValueAsString().empty()) continue;
 							/*std::string groupStr = data->GetValueAsString();
 							info.groups.push_back(groupStr);*/
 							info.grpNameQBShowBricks = data->GetValueAsString();

From 6de224a2facfbf2f140869a6345ff6024acfe7cf Mon Sep 17 00:00:00 2001
From: jadebenn <jadebenn@users.noreply.github.com>
Date: Sat, 23 Dec 2023 18:11:00 -0600
Subject: [PATCH 09/13] chore: miscellaneous code, formatting, and syntax
 cleanup (#1351)

* miscellaneous code, formatting, and syntax cleanup

* update

* update again

* updated to account for feedback
---
 dCommon/GeneralUtils.h                        |  26 ++-
 dCommon/dEnums/StringifiedEnum.h              |   8 +-
 dGame/Entity.cpp                              |   5 +-
 dGame/dBehaviors/BasicAttackBehavior.cpp      |  10 +-
 dGame/dComponents/DestroyableComponent.cpp    |   2 +-
 dGame/dGameMessages/GameMessageHandler.cpp    |   4 +-
 dGame/dGameMessages/GameMessages.cpp          | 172 +++++++++---------
 dNet/MasterPackets.cpp                        |   8 +-
 dNet/WorldPackets.cpp                         |  40 ++--
 dWorldServer/WorldServer.cpp                  |   4 +-
 tests/dCommonTests/CMakeLists.txt             |   1 +
 .../dCommonTests/CastUnderlyingTypeTests.cpp  |  24 +++
 .../dEnumsTests/MagicEnumTests.cpp            |   6 +-
 13 files changed, 169 insertions(+), 141 deletions(-)
 create mode 100644 tests/dCommonTests/CastUnderlyingTypeTests.cpp

diff --git a/dCommon/GeneralUtils.h b/dCommon/GeneralUtils.h
index d93fd0e7..964a864b 100644
--- a/dCommon/GeneralUtils.h
+++ b/dCommon/GeneralUtils.h
@@ -234,18 +234,30 @@ namespace GeneralUtils {
 		return T();
 	}
 
-// on Windows we need to undef these or else they conflict with our numeric limits calls
-// DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS
-#ifdef _WIN32
-#undef min
-#undef max
-#endif
+	/**
+	 * Casts the value of an enum entry to its underlying type
+	 * @param entry Enum entry to cast
+	 * @returns The enum entry's value in its underlying type
+	*/
+	template <typename eType>
+	inline constexpr typename std::underlying_type_t<eType> CastUnderlyingType(const eType entry) {
+		static_assert(std::is_enum_v<eType>, "Not an enum");
+
+		return static_cast<typename std::underlying_type_t<eType>>(entry);
+	}
+
+	// on Windows we need to undef these or else they conflict with our numeric limits calls
+	// DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS DEVELOPERS
+	#ifdef _WIN32
+	#undef min
+	#undef max
+	#endif
 
 	template <typename T>
 	inline T GenerateRandomNumber() {
 		// Make sure it is a numeric type
 		static_assert(std::is_arithmetic<T>::value, "Not an arithmetic type");
-		
+
 		return GenerateRandomNumber<T>(std::numeric_limits<T>::min(), std::numeric_limits<T>::max());
 	}
 }
diff --git a/dCommon/dEnums/StringifiedEnum.h b/dCommon/dEnums/StringifiedEnum.h
index 30cffd22..ee7402ec 100644
--- a/dCommon/dEnums/StringifiedEnum.h
+++ b/dCommon/dEnums/StringifiedEnum.h
@@ -7,19 +7,19 @@
 namespace StringifiedEnum {
 	template<typename T>
 	const std::string_view ToString(const T e) {
+		static_assert(std::is_enum_v<T>, "Not an enum"); // Check type
+
 		constexpr auto sv = &magic_enum::enum_entries<T>();
 		std::string_view output;
 
 		const auto it = std::lower_bound(
 			sv->begin(), sv->end(), e,
-			[&](const std::pair<T, std::string_view>& lhs, const T rhs)
-			{ return lhs.first < rhs; }
+			[&](const std::pair<T, std::string_view>& lhs, const T rhs) { return lhs.first < rhs; }
 		);
 
 		if (it != sv->end() && it->first == e) {
 			output = it->second;
-		}
-		else {
+		} else {
 			output = "UNKNOWN";
 		}
 		return output;
diff --git a/dGame/Entity.cpp b/dGame/Entity.cpp
index 38960d70..cbbbb4d4 100644
--- a/dGame/Entity.cpp
+++ b/dGame/Entity.cpp
@@ -336,7 +336,7 @@ void Entity::Initialize() {
 
 	CDDestructibleComponentTable* destCompTable = CDClientManager::Instance().GetTable<CDDestructibleComponentTable>();
 	std::vector<CDDestructibleComponent> destCompData = destCompTable->Query([=](CDDestructibleComponent entry) { return (entry.id == componentID); });
-  
+
 	bool isSmashable = GetVarAs<int32_t>(u"is_smashable") != 0;
 	if (buffComponentID > 0 || collectibleComponentID > 0 || isSmashable) {
 		DestroyableComponent* comp = AddComponent<DestroyableComponent>();
@@ -543,8 +543,7 @@ void Entity::Initialize() {
 
 				// Known bug with moving platform in FV that casues it to build at the end instead of the start.
 				// This extends the smash time so players can ride up the lift.
-				if (m_TemplateID == 9483)
-				{
+				if (m_TemplateID == 9483) {
 					rebuildComponent->SetResetTime(rebuildComponent->GetResetTime() + 25);
 				}
 			}
diff --git a/dGame/dBehaviors/BasicAttackBehavior.cpp b/dGame/dBehaviors/BasicAttackBehavior.cpp
index 36615a9f..914e67a5 100644
--- a/dGame/dBehaviors/BasicAttackBehavior.cpp
+++ b/dGame/dBehaviors/BasicAttackBehavior.cpp
@@ -22,7 +22,6 @@ void BasicAttackBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bi
 			if (entity->IsPlayer() && !this->m_DontApplyImmune) {
 				const float immunityTime = Game::zoneManager->GetWorldConfig()->globalImmunityTime;
 				destroyableComponent->SetDamageCooldownTimer(immunityTime);
-				LOG_DEBUG("Target targetEntity %llu took damage, setting damage cooldown timer to %f s", branch.target, immunityTime);
 			}
 		}
 
@@ -188,11 +187,7 @@ void BasicAttackBehavior::DoBehaviorCalculation(BehaviorContext* context, RakNet
 		return;
 	}
 
-	const float immunityTime = Game::zoneManager->GetWorldConfig()->globalImmunityTime;
-	LOG_DEBUG("Damage cooldown timer currently %f s", destroyableComponent->GetDamageCooldownTimer());
-
-	const bool isImmune = (destroyableComponent->IsImmune()) || (destroyableComponent->IsCooldownImmune());
-
+	const bool isImmune = destroyableComponent->IsImmune() || destroyableComponent->IsCooldownImmune();
 	bitStream->Write(isImmune);
 
 	if (isImmune) {
@@ -219,8 +214,7 @@ void BasicAttackBehavior::DoBehaviorCalculation(BehaviorContext* context, RakNet
 
 	//Handle player damage cooldown
 	if (isSuccess && targetEntity->IsPlayer() && !this->m_DontApplyImmune) {
-		destroyableComponent->SetDamageCooldownTimer(immunityTime);
-		LOG_DEBUG("Target targetEntity %llu took damage, setting damage cooldown timer to %f s", branch.target, immunityTime);
+		destroyableComponent->SetDamageCooldownTimer(Game::zoneManager->GetWorldConfig()->globalImmunityTime);
 	}
 
 	eBasicAttackSuccessTypes successState = eBasicAttackSuccessTypes::FAILIMMUNE;
diff --git a/dGame/dComponents/DestroyableComponent.cpp b/dGame/dComponents/DestroyableComponent.cpp
index ce3743e8..8c5321f4 100644
--- a/dGame/dComponents/DestroyableComponent.cpp
+++ b/dGame/dComponents/DestroyableComponent.cpp
@@ -557,7 +557,7 @@ void DestroyableComponent::Damage(uint32_t damage, const LWOOBJID source, uint32
 	}
 
 	if (IsImmune() || IsCooldownImmune()) {
-		LOG_DEBUG("Target targetEntity %llu is immune!", m_Parent->GetObjectID()); //Immune is succesfully proc'd
+		LOG_DEBUG("Target targetEntity %llu is immune!", m_Parent->GetObjectID());
 		return;
 	}
 
diff --git a/dGame/dGameMessages/GameMessageHandler.cpp b/dGame/dGameMessages/GameMessageHandler.cpp
index fbaa913b..63b9d7e9 100644
--- a/dGame/dGameMessages/GameMessageHandler.cpp
+++ b/dGame/dGameMessages/GameMessageHandler.cpp
@@ -53,7 +53,7 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream* inStream, const System
 		return;
 	}
 
-	if (messageID != eGameMessageType::READY_FOR_UPDATES) LOG_DEBUG("Received GM with ID and name: %4i, %s", messageID,  StringifiedEnum::ToString(messageID).data());
+	if (messageID != eGameMessageType::READY_FOR_UPDATES) LOG_DEBUG("Received GM with ID and name: %4i, %s", messageID, StringifiedEnum::ToString(messageID).data());
 
 	switch (messageID) {
 
@@ -694,7 +694,7 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream* inStream, const System
 		GameMessages::SendVendorStatusUpdate(entity, sysAddr, true);
 		break;
 	default:
-		LOG_DEBUG("Received Unknown GM with ID: %4i, %s", messageID,  StringifiedEnum::ToString(messageID).data());
+		LOG_DEBUG("Received Unknown GM with ID: %4i, %s", messageID, StringifiedEnum::ToString(messageID).data());
 		break;
 	}
 }
diff --git a/dGame/dGameMessages/GameMessages.cpp b/dGame/dGameMessages/GameMessages.cpp
index 9d903b3b..09f9fdbb 100644
--- a/dGame/dGameMessages/GameMessages.cpp
+++ b/dGame/dGameMessages/GameMessages.cpp
@@ -111,7 +111,7 @@ void GameMessages::SendFireEventClientSide(const LWOOBJID& objectID, const Syste
 	uint32_t argSize = args.size();
 	bitStream.Write(argSize);
 	for (uint32_t k = 0; k < argSize; k++) {
-		bitStream.Write(static_cast<uint16_t>(args[k]));
+		bitStream.Write<uint16_t>(args[k]);
 	}
 	bitStream.Write(object);
 	bitStream.Write0();
@@ -221,13 +221,13 @@ void GameMessages::SendInvalidZoneTransferList(Entity* entity, const SystemAddre
 	uint32_t CustomerFeedbackURLLength = feedbackURL.size();
 	bitStream.Write(CustomerFeedbackURLLength);
 	for (uint32_t k = 0; k < CustomerFeedbackURLLength; k++) {
-		bitStream.Write(static_cast<uint16_t>(feedbackURL[k]));
+		bitStream.Write<uint16_t>(feedbackURL[k]);
 	}
 
 	uint32_t InvalidMapTransferListLength = invalidMapTransferList.size();
 	bitStream.Write(InvalidMapTransferListLength);
 	for (uint32_t k = 0; k < InvalidMapTransferListLength; k++) {
-		bitStream.Write(static_cast<uint16_t>(invalidMapTransferList[k]));
+		bitStream.Write<uint16_t>(invalidMapTransferList[k]);
 	}
 
 	bitStream.Write(feedbackOnExit);
@@ -318,17 +318,17 @@ void GameMessages::SendPlayNDAudioEmitter(Entity* entity, const SystemAddress& s
 	CMSGHEADER;
 
 	bitStream.Write(entity->GetObjectID());
-	bitStream.Write((uint16_t)eGameMessageType::PLAY_ND_AUDIO_EMITTER);
+	bitStream.Write(eGameMessageType::PLAY_ND_AUDIO_EMITTER);
 	bitStream.Write0();
 	bitStream.Write0();
 
 	uint32_t length = audioGUID.size();
 	bitStream.Write(length);
 	for (uint32_t k = 0; k < length; k++) {
-		bitStream.Write(static_cast<char>(audioGUID[k]));
+		bitStream.Write<char>(audioGUID[k]);
 	}
 
-	bitStream.Write(uint32_t(0));
+	bitStream.Write<uint32_t>(0);
 	bitStream.Write0();
 	bitStream.Write0();
 
@@ -375,7 +375,7 @@ void GameMessages::SendPlatformResync(Entity* entity, const SystemAddress& sysAd
 	}
 
 	bitStream.Write(entity->GetObjectID());
-	bitStream.Write((uint16_t)eGameMessageType::PLATFORM_RESYNC);
+	bitStream.Write(eGameMessageType::PLATFORM_RESYNC);
 
 	bool bReverse = false;
 	int eCommand = 0;
@@ -432,7 +432,7 @@ void GameMessages::SendChatModeUpdate(const LWOOBJID& objectID, eGameMasterLevel
 	CBITSTREAM;
 	CMSGHEADER;
 	bitStream.Write(objectID);
-	bitStream.Write((uint16_t)eGameMessageType::UPDATE_CHAT_MODE);
+	bitStream.Write(eGameMessageType::UPDATE_CHAT_MODE);
 	bitStream.Write(level);
 	SEND_PACKET_BROADCAST;
 }
@@ -441,7 +441,7 @@ void GameMessages::SendGMLevelBroadcast(const LWOOBJID& objectID, eGameMasterLev
 	CBITSTREAM;
 	CMSGHEADER;
 	bitStream.Write(objectID);
-	bitStream.Write((uint16_t)eGameMessageType::SET_GM_LEVEL);
+	bitStream.Write(eGameMessageType::SET_GM_LEVEL);
 	bitStream.Write1();
 	bitStream.Write(level);
 	SEND_PACKET_BROADCAST;
@@ -472,9 +472,9 @@ void GameMessages::SendAddItemToInventoryClientSync(Entity* entity, const System
 	bitStream.Write<uint32_t>(extraInfo.name.size());
 	if (extraInfo.name.size() > 0) {
 		for (uint32_t i = 0; i < extraInfo.name.size(); ++i) {
-			bitStream.Write(static_cast<uint16_t>(extraInfo.name[i]));
+			bitStream.Write<uint16_t>(extraInfo.name[i]);
 		}
-		bitStream.Write(static_cast<uint16_t>(0x00));
+		bitStream.Write<uint16_t>(0x00);
 	}
 
 	bitStream.Write(item->GetLot());
@@ -511,7 +511,7 @@ void GameMessages::SendNotifyClientFlagChange(const LWOOBJID& objectID, uint32_t
 	CMSGHEADER;
 
 	bitStream.Write(objectID);
-	bitStream.Write((uint16_t)eGameMessageType::NOTIFY_CLIENT_FLAG_CHANGE);
+	bitStream.Write(eGameMessageType::NOTIFY_CLIENT_FLAG_CHANGE);
 	bitStream.Write(bFlag);
 	bitStream.Write(iFlagID);
 
@@ -523,7 +523,7 @@ void GameMessages::SendChangeObjectWorldState(const LWOOBJID& objectID, eObjectW
 	CMSGHEADER;
 
 	bitStream.Write(objectID);
-	bitStream.Write((uint16_t)eGameMessageType::CHANGE_OBJECT_WORLD_STATE);
+	bitStream.Write(eGameMessageType::CHANGE_OBJECT_WORLD_STATE);
 	bitStream.Write(state);
 
 	if (sysAddr == UNASSIGNED_SYSTEM_ADDRESS) SEND_PACKET_BROADCAST
@@ -578,7 +578,7 @@ void GameMessages::SendNotifyMissionTask(Entity* entity, const SystemAddress& sy
 	CMSGHEADER;
 
 	bitStream.Write(entity->GetObjectID());
-	bitStream.Write((uint16_t)eGameMessageType::NOTIFY_MISSION_TASK);
+	bitStream.Write(eGameMessageType::NOTIFY_MISSION_TASK);
 
 	bitStream.Write(missionID);
 	bitStream.Write(taskMask);
@@ -596,7 +596,7 @@ void GameMessages::SendModifyLEGOScore(Entity* entity, const SystemAddress& sysA
 	CMSGHEADER;
 
 	bitStream.Write(entity->GetObjectID());
-	bitStream.Write((uint16_t)eGameMessageType::MODIFY_LEGO_SCORE);
+	bitStream.Write(eGameMessageType::MODIFY_LEGO_SCORE);
 	bitStream.Write(score);
 
 	bitStream.Write(sourceType != eLootSourceType::NONE);
@@ -610,14 +610,14 @@ void GameMessages::SendUIMessageServerToSingleClient(Entity* entity, const Syste
 	CMSGHEADER;
 
 	bitStream.Write(entity->GetObjectID());
-	bitStream.Write((uint16_t)eGameMessageType::UI_MESSAGE_SERVER_TO_SINGLE_CLIENT);
+	bitStream.Write(eGameMessageType::UI_MESSAGE_SERVER_TO_SINGLE_CLIENT);
 
 	bitStream.Write<AMFBaseValue&>(args);
 	uint32_t strMessageNameLength = message.size();
 	bitStream.Write(strMessageNameLength);
 
 	for (uint32_t k = 0; k < strMessageNameLength; k++) {
-		bitStream.Write(static_cast<char>(message[k]));
+		bitStream.Write<char>(message[k]);
 	}
 
 	SEND_PACKET;
@@ -629,14 +629,14 @@ void GameMessages::SendUIMessageServerToAllClients(const std::string& message, A
 
 	LWOOBJID empty = 0;
 	bitStream.Write(empty);
-	bitStream.Write((uint16_t)eGameMessageType::UI_MESSAGE_SERVER_TO_ALL_CLIENTS);
+	bitStream.Write(eGameMessageType::UI_MESSAGE_SERVER_TO_ALL_CLIENTS);
 
 	bitStream.Write<AMFBaseValue&>(args);
 	uint32_t strMessageNameLength = message.size();
 	bitStream.Write(strMessageNameLength);
 
 	for (uint32_t k = 0; k < strMessageNameLength; k++) {
-		bitStream.Write(static_cast<char>(message[k]));
+		bitStream.Write<char>(message[k]);
 	}
 
 	SEND_PACKET_BROADCAST;
@@ -647,11 +647,11 @@ void GameMessages::SendPlayEmbeddedEffectOnAllClientsNearObject(Entity* entity,
 	CMSGHEADER;
 
 	bitStream.Write(entity->GetObjectID());
-	bitStream.Write((uint16_t)eGameMessageType::PLAY_EMBEDDED_EFFECT_ON_ALL_CLIENTS_NEAR_OBJECT);
+	bitStream.Write(eGameMessageType::PLAY_EMBEDDED_EFFECT_ON_ALL_CLIENTS_NEAR_OBJECT);
 
-	bitStream.Write(static_cast<uint32_t>(effectName.length()));
+	bitStream.Write<uint32_t>(effectName.length());
 	for (uint32_t k = 0; k < effectName.length(); k++) {
-		bitStream.Write(static_cast<uint16_t>(effectName[k]));
+		bitStream.Write<uint16_t>(effectName[k]);
 	}
 	bitStream.Write(fromObjectID);
 	bitStream.Write(radius);
@@ -668,7 +668,7 @@ void GameMessages::SendPlayFXEffect(const LWOOBJID& entity, int32_t effectID, co
 	CMSGHEADER;
 
 	bitStream.Write(entity);
-	bitStream.Write((uint16_t)eGameMessageType::PLAY_FX_EFFECT);
+	bitStream.Write(eGameMessageType::PLAY_FX_EFFECT);
 
 	bitStream.Write(effectID != -1);
 	if (effectID != -1) bitStream.Write(effectID);
@@ -716,22 +716,22 @@ void GameMessages::SendBroadcastTextToChatbox(Entity* entity, const SystemAddres
 	CMSGHEADER;
 
 	bitStream.Write(entity->GetObjectID());
-	bitStream.Write((uint16_t)eGameMessageType::BROADCAST_TEXT_TO_CHATBOX);
+	bitStream.Write(eGameMessageType::BROADCAST_TEXT_TO_CHATBOX);
 
 	LWONameValue attribs;
 	attribs.name = attrs;
 	attribs.length = attrs.size();
 
-	bitStream.Write(static_cast<uint32_t>(attribs.length));
+	bitStream.Write<uint32_t>(attribs.length);
 	for (uint32_t i = 0; i < attribs.length; ++i) {
-		bitStream.Write(static_cast<uint16_t>(attribs.name[i]));
+		bitStream.Write<uint16_t>(attribs.name[i]);
 	}
-	bitStream.Write(static_cast<uint16_t>(0x00)); // Null Terminator
+	bitStream.Write<uint16_t>(0x00); // Null Terminator
 
 	uint32_t wsTextLength = wsText.size();
 	bitStream.Write(wsTextLength);
 	for (uint32_t k = 0; k < wsTextLength; k++) {
-		bitStream.Write(static_cast<uint16_t>(wsText[k]));
+		bitStream.Write<uint16_t>(wsText[k]);
 	}
 
 	SEND_PACKET_BROADCAST;
@@ -772,7 +772,7 @@ void GameMessages::SendRebuildNotifyState(Entity* entity, eRebuildState prevStat
 	CMSGHEADER;
 
 	bitStream.Write(entity->GetObjectID());
-	bitStream.Write((uint16_t)eGameMessageType::REBUILD_NOTIFY_STATE);
+	bitStream.Write(eGameMessageType::REBUILD_NOTIFY_STATE);
 
 	bitStream.Write(prevState);
 	bitStream.Write(state);
@@ -786,7 +786,7 @@ void GameMessages::SendEnableRebuild(Entity* entity, bool enable, bool fail, boo
 	CMSGHEADER;
 
 	bitStream.Write(entity->GetObjectID());
-	bitStream.Write((uint16_t)eGameMessageType::ENABLE_REBUILD);
+	bitStream.Write(eGameMessageType::ENABLE_REBUILD);
 
 	bitStream.Write(enable);
 	bitStream.Write(fail);
@@ -806,7 +806,7 @@ void GameMessages::SendTerminateInteraction(const LWOOBJID& objectID, eTerminate
 	CMSGHEADER;
 
 	bitStream.Write(objectID);
-	bitStream.Write((uint16_t)eGameMessageType::TERMINATE_INTERACTION);
+	bitStream.Write(eGameMessageType::TERMINATE_INTERACTION);
 
 	bitStream.Write(terminator);
 	bitStream.Write(type);
@@ -842,7 +842,7 @@ void GameMessages::SendDie(Entity* entity, const LWOOBJID& killerID, const LWOOB
 
 	bitStream.Write(entity->GetObjectID());
 
-	bitStream.Write((uint16_t)eGameMessageType::DIE);
+	bitStream.Write(eGameMessageType::DIE);
 
 	bitStream.Write(bClientDeath);
 	bitStream.Write(bSpawnLoot);
@@ -853,7 +853,7 @@ void GameMessages::SendDie(Entity* entity, const LWOOBJID& killerID, const LWOOB
 	uint32_t deathTypeLength = deathType.size();
 	bitStream.Write(deathTypeLength);
 	for (uint32_t k = 0; k < deathTypeLength; k++) {
-		bitStream.Write(static_cast<uint16_t>(deathType[k]));
+		bitStream.Write<uint16_t>(deathType[k]);
 	}
 
 	bitStream.Write(directionRelative_AngleXZ);
@@ -976,7 +976,7 @@ void GameMessages::SendStop2DAmbientSound(Entity* entity, bool force, std::strin
 	CMSGHEADER;
 
 	bitStream.Write(entity->GetObjectID());
-	bitStream.Write((uint16_t)eGameMessageType::STOP2_D_AMBIENT_SOUND);
+	bitStream.Write(eGameMessageType::STOP2_D_AMBIENT_SOUND);
 
 	uint32_t audioGUIDSize = audioGUID.size();
 
@@ -984,7 +984,7 @@ void GameMessages::SendStop2DAmbientSound(Entity* entity, bool force, std::strin
 	bitStream.Write(audioGUIDSize);
 
 	for (uint32_t k = 0; k < audioGUIDSize; k++) {
-		bitStream.Write(static_cast<char>(audioGUID[k]));
+		bitStream.Write<char>(audioGUID[k]);
 	}
 
 	bitStream.Write(result);
@@ -999,13 +999,12 @@ void GameMessages::SendPlay2DAmbientSound(Entity* entity, std::string audioGUID,
 	CMSGHEADER;
 
 	bitStream.Write(entity->GetObjectID());
-	bitStream.Write((uint16_t)eGameMessageType::PLAY2_D_AMBIENT_SOUND);
-
+	bitStream.Write(eGameMessageType::PLAY2_D_AMBIENT_SOUND);
 	uint32_t audioGUIDSize = audioGUID.size();
 
 	bitStream.Write(audioGUIDSize);
 	for (uint32_t k = 0; k < audioGUIDSize; k++) {
-		bitStream.Write(static_cast<char>(audioGUID[k]));
+		bitStream.Write<char>(audioGUID[k]);
 	}
 	bitStream.Write(result);
 
@@ -1018,7 +1017,7 @@ void GameMessages::SendSetNetworkScriptVar(Entity* entity, const SystemAddress&
 	CMSGHEADER;
 
 	bitStream.Write(entity->GetObjectID());
-	bitStream.Write((uint16_t)eGameMessageType::SCRIPT_NETWORK_VAR_UPDATE);
+	bitStream.Write(eGameMessageType::SCRIPT_NETWORK_VAR_UPDATE);
 
 	// FIXME: this is a bad place to need to do a conversion because we have no clue whether data is utf8 or plain ascii
 	// an this has performance implications
@@ -1027,9 +1026,9 @@ void GameMessages::SendSetNetworkScriptVar(Entity* entity, const SystemAddress&
 
 	bitStream.Write(dataSize);
 	for (auto value : u16Data) {
-		bitStream.Write(uint16_t(value));
+		bitStream.Write<uint16_t>(value);
 	}
-	if (dataSize > 0) bitStream.Write(uint16_t(0));
+	if (dataSize > 0) bitStream.Write<uint16_t>(0);
 
 	if (sysAddr == UNASSIGNED_SYSTEM_ADDRESS) SEND_PACKET_BROADCAST;
 	SEND_PACKET;
@@ -1144,16 +1143,16 @@ void GameMessages::SendPlayerReachedRespawnCheckpoint(Entity* entity, const NiPo
 	CMSGHEADER;
 
 	bitStream.Write(entity->GetObjectID());
-	bitStream.Write((uint16_t)eGameMessageType::PLAYER_REACHED_RESPAWN_CHECKPOINT);
+	bitStream.Write(eGameMessageType::PLAYER_REACHED_RESPAWN_CHECKPOINT);
 
 	bitStream.Write(position.x);
 	bitStream.Write(position.y);
 	bitStream.Write(position.z);
 
-	const bool isNotIdentity = rotation != NiQuaternion::IDENTITY;
-	bitStream.Write(isNotIdentity);
-	
-	if (isNotIdentity) {
+	const bool bIsNotIdentity = rotation != NiQuaternion::IDENTITY;
+	bitStream.Write(bIsNotIdentity);
+
+	if (bIsNotIdentity) {
 		bitStream.Write(rotation.w);
 		bitStream.Write(rotation.x);
 		bitStream.Write(rotation.y);
@@ -1176,7 +1175,7 @@ void GameMessages::SendAddSkill(Entity* entity, TSkillID skillID, BehaviorSlot s
 	CMSGHEADER;
 
 	bitStream.Write(entity->GetObjectID());
-	bitStream.Write((uint16_t)eGameMessageType::ADD_SKILL);
+	bitStream.Write(eGameMessageType::ADD_SKILL);
 
 	bitStream.Write(AICombatWeight != 0);
 	if (AICombatWeight != 0) bitStream.Write(AICombatWeight);
@@ -1345,8 +1344,8 @@ void GameMessages::SendRemoveItemFromInventory(Entity* entity, const SystemAddre
 	bitStream.Write(eInvType);
 	bitStream.Write1();
 	bitStream.Write(eLootTypeSource);
-	bitStream.Write(static_cast<uint32_t>(0)); //extra info
-	//bitStream.Write(static_cast<uint16_t>(0)); //extra info
+	bitStream.Write<uint32_t>(0); //extra info
+	//bitStream.Write<uint16_t>(0); //extra info
 	bitStream.Write(forceDeletion);
 	bitStream.Write0();
 	bitStream.Write1();
@@ -1469,11 +1468,11 @@ void GameMessages::SendMatchUpdate(Entity* entity, const SystemAddress& sysAddr,
 
 	bitStream.Write(entity->GetObjectID());
 	bitStream.Write(eGameMessageType::MATCH_UPDATE);
-	bitStream.Write(uint32_t(data.size()));
+	bitStream.Write<uint32_t>(data.size());
 	for (char character : data) {
-		bitStream.Write(uint16_t(character));
+		bitStream.Write<uint16_t>(character);
 	}
-	if (data.size() > 0) bitStream.Write(uint16_t(0));
+	if (data.size() > 0) bitStream.Write<uint16_t>(0);
 	bitStream.Write(type);
 
 	SEND_PACKET;
@@ -1557,7 +1556,7 @@ void GameMessages::NotifyLevelRewards(LWOOBJID objectID, const SystemAddress& sy
 	CMSGHEADER;
 
 	bitStream.Write(objectID);
-	bitStream.Write((uint16_t)eGameMessageType::NOTIFY_LEVEL_REWARDS);
+	bitStream.Write(eGameMessageType::NOTIFY_LEVEL_REWARDS);
 
 	bitStream.Write(level);
 	bitStream.Write(sending_rewards);
@@ -1743,7 +1742,7 @@ void GameMessages::SendSetRailMovement(const LWOOBJID& objectID, bool pathGoForw
 
 	bitStream.Write(pathGoForward);
 
-	bitStream.Write(uint32_t(pathName.size()));
+	bitStream.Write<uint32_t>(pathName.size());
 	for (auto character : pathName) {
 		bitStream.Write<uint16_t>(character);
 	}
@@ -1782,14 +1781,14 @@ void GameMessages::SendStartRailMovement(const LWOOBJID& objectID, std::u16strin
 	bitStream.Write(cameraLocked);
 	bitStream.Write(collisionEnabled);
 
-	bitStream.Write(uint32_t(loopSound.size()));
+	bitStream.Write<uint32_t>(loopSound.size());
 	for (auto character : loopSound) {
 		bitStream.Write<uint16_t>(character);
 	}
 
 	bitStream.Write(goForward);
 
-	bitStream.Write(uint32_t(pathName.size()));
+	bitStream.Write<uint32_t>(pathName.size());
 	for (auto character : pathName) {
 		bitStream.Write<uint16_t>(character);
 	}
@@ -1812,12 +1811,12 @@ void GameMessages::SendStartRailMovement(const LWOOBJID& objectID, std::u16strin
 		bitStream.Write<LWOOBJID>(railActivatorObjectID);
 	}
 
-	bitStream.Write(uint32_t(startSound.size()));
+	bitStream.Write<uint32_t>(startSound.size());
 	for (auto character : startSound) {
 		bitStream.Write<uint16_t>(character);
 	}
 
-	bitStream.Write(uint32_t(stopSound.size()));
+	bitStream.Write<uint32_t>(stopSound.size());
 	for (auto character : stopSound) {
 		bitStream.Write<uint16_t>(character);
 	}
@@ -1835,7 +1834,7 @@ void GameMessages::SendNotifyClientObject(const LWOOBJID& objectID, std::u16stri
 	bitStream.Write(objectID);
 	bitStream.Write(eGameMessageType::NOTIFY_CLIENT_OBJECT);
 
-	bitStream.Write(uint32_t(name.size()));
+	bitStream.Write<uint32_t>(name.size());
 	for (auto character : name) {
 		bitStream.Write<uint16_t>(character);
 	}
@@ -1846,7 +1845,7 @@ void GameMessages::SendNotifyClientObject(const LWOOBJID& objectID, std::u16stri
 
 	bitStream.Write(paramObj);
 
-	bitStream.Write(uint32_t(paramStr.size()));
+	bitStream.Write<uint32_t>(paramStr.size());
 	for (auto character : paramStr) {
 		bitStream.Write(character);
 	}
@@ -1864,7 +1863,7 @@ void GameMessages::SendNotifyClientZoneObject(const LWOOBJID& objectID, const st
 	bitStream.Write(objectID);
 	bitStream.Write(eGameMessageType::NOTIFY_CLIENT_ZONE_OBJECT);
 
-	bitStream.Write(uint32_t(name.size()));
+	bitStream.Write<uint32_t>(name.size());
 	for (const auto& character : name) {
 		bitStream.Write<uint16_t>(character);
 	}
@@ -1873,7 +1872,7 @@ void GameMessages::SendNotifyClientZoneObject(const LWOOBJID& objectID, const st
 	bitStream.Write(param2);
 	bitStream.Write(paramObj);
 
-	bitStream.Write(uint32_t(paramStr.size()));
+	bitStream.Write<uint32_t>(paramStr.size());
 	for (const auto& character : paramStr) {
 		bitStream.Write(character);
 	}
@@ -1890,9 +1889,9 @@ void GameMessages::SendNotifyClientFailedPrecondition(LWOOBJID objectId, const S
 	bitStream.Write(objectId);
 	bitStream.Write(eGameMessageType::NOTIFY_CLIENT_FAILED_PRECONDITION);
 
-	bitStream.Write(uint32_t(failedReason.size()));
+	bitStream.Write<uint32_t>(failedReason.size());
 	for (uint16_t character : failedReason) {
-		bitStream.Write(uint16_t(character));
+		bitStream.Write<uint16_t>(character);
 	}
 
 	bitStream.Write(preconditionID);
@@ -2016,7 +2015,7 @@ void GameMessages::SendLockNodeRotation(Entity* entity, std::string nodeName) {
 	bitStream.Write(entity->GetObjectID());
 	bitStream.Write(eGameMessageType::LOCK_NODE_ROTATION);
 
-	bitStream.Write(uint32_t(nodeName.size()));
+	bitStream.Write<uint32_t>(nodeName.size());
 	for (char character : nodeName) {
 		bitStream.Write(character);
 	}
@@ -2051,7 +2050,7 @@ void GameMessages::SendGetModelsOnProperty(LWOOBJID objectId, std::map<LWOOBJID,
 	bitStream.Write(objectId);
 	bitStream.Write(eGameMessageType::GET_MODELS_ON_PROPERTY);
 
-	bitStream.Write(static_cast<uint32_t>(models.size()));
+	bitStream.Write<uint32_t>(models.size());
 
 	for (const auto& pair : models) {
 		bitStream.Write(pair.first);
@@ -2433,7 +2432,7 @@ void GameMessages::HandleBBBLoadItemRequest(RakNet::BitStream* inStream, Entity*
 void GameMessages::SendBlueprintLoadItemResponse(const SystemAddress& sysAddr, bool success, LWOOBJID oldItemId, LWOOBJID newItemId) {
 	CBITSTREAM;
 	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::BLUEPRINT_LOAD_RESPONSE_ITEMID);
-	bitStream.Write(static_cast<uint8_t>(success));
+	bitStream.Write<uint8_t>(success);
 	bitStream.Write<LWOOBJID>(oldItemId);
 	bitStream.Write<LWOOBJID>(newItemId);
 	SEND_PACKET;
@@ -3058,7 +3057,7 @@ void GameMessages::SendNotifyObject(LWOOBJID objectId, LWOOBJID objIDSender, std
 	bitStream.Write(eGameMessageType::NOTIFY_OBJECT);
 
 	bitStream.Write(objIDSender);
-	bitStream.Write(static_cast<uint32_t>(name.size()));
+	bitStream.Write<uint32_t>(name.size());
 	for (const auto character : name) {
 		bitStream.Write(character);
 	}
@@ -3115,7 +3114,7 @@ void GameMessages::SendServerTradeInvite(LWOOBJID objectId, bool bNeedInvitePopU
 
 	bitStream.Write(bNeedInvitePopUp);
 	bitStream.Write(i64Requestor);
-	bitStream.Write(static_cast<uint32_t>(wsName.size()));
+	bitStream.Write<uint32_t>(wsName.size());
 	for (const auto character : wsName) {
 		bitStream.Write(character);
 	}
@@ -3133,7 +3132,7 @@ void GameMessages::SendServerTradeInitialReply(LWOOBJID objectId, LWOOBJID i64In
 
 	bitStream.Write(i64Invitee);
 	bitStream.Write(resultType);
-	bitStream.Write(static_cast<uint32_t>(wsName.size()));
+	bitStream.Write<uint32_t>(wsName.size());
 	for (const auto character : wsName) {
 		bitStream.Write(character);
 	}
@@ -3151,7 +3150,7 @@ void GameMessages::SendServerTradeFinalReply(LWOOBJID objectId, bool bResult, LW
 
 	bitStream.Write(bResult);
 	bitStream.Write(i64Invitee);
-	bitStream.Write(static_cast<uint32_t>(wsName.size()));
+	bitStream.Write<uint32_t>(wsName.size());
 	for (const auto character : wsName) {
 		bitStream.Write(character);
 	}
@@ -3193,7 +3192,7 @@ void GameMessages::SendServerTradeUpdate(LWOOBJID objectId, uint64_t coins, cons
 
 	bitStream.Write(false);
 	bitStream.Write(coins);
-	bitStream.Write(static_cast<uint32_t>(items.size()));
+	bitStream.Write<uint32_t>(items.size());
 
 	for (const auto& item : items) {
 		bitStream.Write(item.itemId);
@@ -3402,7 +3401,7 @@ void GameMessages::SendNotifyPetTamingPuzzleSelected(LWOOBJID objectId, const st
 	bitStream.Write(objectId);
 	bitStream.Write(eGameMessageType::NOTIFY_TAMING_PUZZLE_SELECTED);
 
-	bitStream.Write(static_cast<uint32_t>(bricks.size()));
+	bitStream.Write<uint32_t>(bricks.size());
 	for (const auto& brick : bricks) {
 		bitStream.Write(brick.designerID);
 		bitStream.Write(brick.materialID);
@@ -3451,7 +3450,7 @@ void GameMessages::SendAddPetToPlayer(LWOOBJID objectId, int32_t iElementalType,
 	bitStream.Write(eGameMessageType::ADD_PET_TO_PLAYER);
 
 	bitStream.Write(iElementalType);
-	bitStream.Write(static_cast<uint32_t>(name.size()));
+	bitStream.Write<uint32_t>(name.size());
 	for (const auto character : name) {
 		bitStream.Write(character);
 	}
@@ -3585,7 +3584,7 @@ void GameMessages::SendSetPetName(LWOOBJID objectId, std::u16string name, LWOOBJ
 	bitStream.Write(objectId);
 	bitStream.Write(eGameMessageType::SET_PET_NAME);
 
-	bitStream.Write(static_cast<uint32_t>(name.size()));
+	bitStream.Write<uint32_t>(name.size());
 	for (const auto character : name) {
 		bitStream.Write(character);
 	}
@@ -3624,12 +3623,12 @@ void GameMessages::SendPetNameChanged(LWOOBJID objectId, int32_t moderationStatu
 
 	bitStream.Write(moderationStatus);
 
-	bitStream.Write(static_cast<uint32_t>(name.size()));
+	bitStream.Write<uint32_t>(name.size());
 	for (const auto character : name) {
 		bitStream.Write(character);
 	}
 
-	bitStream.Write(static_cast<uint32_t>(ownerName.size()));
+	bitStream.Write<uint32_t>(ownerName.size());
 	for (const auto character : ownerName) {
 		bitStream.Write(character);
 	}
@@ -3907,19 +3906,19 @@ void GameMessages::SendDisplayMessageBox(LWOOBJID objectId, bool bShow, LWOOBJID
 	bitStream.Write(bShow);
 	bitStream.Write(callbackClient);
 
-	bitStream.Write(static_cast<uint32_t>(identifier.size()));
+	bitStream.Write<uint32_t>(identifier.size());
 	for (const auto character : identifier) {
 		bitStream.Write(character);
 	}
 
 	bitStream.Write(imageID);
 
-	bitStream.Write(static_cast<uint32_t>(text.size()));
+	bitStream.Write<uint32_t>(text.size());
 	for (const auto character : text) {
 		bitStream.Write(character);
 	}
 
-	bitStream.Write(static_cast<uint32_t>(userData.size()));
+	bitStream.Write<uint32_t>(userData.size());
 	for (const auto character : userData) {
 		bitStream.Write(character);
 	}
@@ -3936,7 +3935,7 @@ void GameMessages::SendDisplayChatBubble(LWOOBJID objectId, const std::u16string
 	bitStream.Write(objectId);
 	bitStream.Write(eGameMessageType::DISPLAY_CHAT_BUBBLE);
 
-	bitStream.Write(static_cast<uint32_t>(text.size()));
+	bitStream.Write<uint32_t>(text.size());
 	for (const auto character : text) {
 		bitStream.Write(character);
 	}
@@ -4127,8 +4126,7 @@ void GameMessages::HandleRequestDie(RakNet::BitStream* inStream, Entity* entity,
 		}
 
 		racingControlComponent->OnRequestDie(entity);
-	}
-	else {
+	} else {
 		auto* destroyableComponent = entity->GetComponent<DestroyableComponent>();
 
 		if (!destroyableComponent) return;
@@ -4245,7 +4243,7 @@ void GameMessages::SendModuleAssemblyDBDataForClient(LWOOBJID objectId, LWOOBJID
 
 	bitStream.Write(assemblyID);
 
-	bitStream.Write(static_cast<uint32_t>(data.size()));
+	bitStream.Write<uint32_t>(data.size());
 	for (auto character : data) {
 		bitStream.Write(character);
 	}
@@ -4390,7 +4388,7 @@ void GameMessages::SendNotifyRacingClient(LWOOBJID objectId, int32_t eventType,
 
 	bitStream.Write(paramObj);
 
-	bitStream.Write(static_cast<uint32_t>(paramStr.size()));
+	bitStream.Write<uint32_t>(paramStr.size());
 	for (auto character : paramStr) {
 		bitStream.Write(character);
 	}
@@ -4585,7 +4583,7 @@ void GameMessages::SendShowActivityCountdown(LWOOBJID objectId, bool bPlayAdditi
 
 	bitStream.Write(bPlayCountdownSound);
 
-	bitStream.Write(static_cast<uint32_t>(sndName.size()));
+	bitStream.Write<uint32_t>(sndName.size());
 	for (auto character : sndName) {
 		bitStream.Write(character);
 	}
@@ -5601,7 +5599,7 @@ void GameMessages::HandleModularBuildFinish(RakNet::BitStream* inStream, Entity*
 			if (entity->GetLOT() != 9980 || Game::server->GetZoneID() != 1200) {
 				if (missionComponent != nullptr) {
 					missionComponent->Progress(eMissionTaskType::SCRIPT, entity->GetLOT(), entity->GetObjectID());
-					if (count >= 7 && everyPieceSwapped) missionComponent->Progress(eMissionTaskType::RACING, LWOOBJID_EMPTY, (LWOOBJID)eRacingTaskParam::MODULAR_BUILDING);
+					if (count >= 7 && everyPieceSwapped) missionComponent->Progress(eMissionTaskType::RACING, LWOOBJID_EMPTY, static_cast<LWOOBJID>(eRacingTaskParam::MODULAR_BUILDING));
 				}
 			}
 
diff --git a/dNet/MasterPackets.cpp b/dNet/MasterPackets.cpp
index 03330cc9..624b92ad 100644
--- a/dNet/MasterPackets.cpp
+++ b/dNet/MasterPackets.cpp
@@ -31,7 +31,7 @@ void MasterPackets::SendZoneTransferRequest(dServer* server, uint64_t requestID,
 	BitStreamUtils::WriteHeader(bitStream, eConnectionType::MASTER, eMasterMessageType::REQUEST_ZONE_TRANSFER);
 
 	bitStream.Write(requestID);
-	bitStream.Write(static_cast<uint8_t>(mythranShift));
+	bitStream.Write<uint8_t>(mythranShift);
 	bitStream.Write(zoneID);
 	bitStream.Write(cloneID);
 
@@ -58,7 +58,7 @@ void MasterPackets::SendZoneRequestPrivate(dServer* server, uint64_t requestID,
 	BitStreamUtils::WriteHeader(bitStream, eConnectionType::MASTER, eMasterMessageType::REQUEST_PRIVATE_ZONE);
 
 	bitStream.Write(requestID);
-	bitStream.Write(static_cast<uint8_t>(mythranShift));
+	bitStream.Write<uint8_t>(mythranShift);
 
 	bitStream.Write<uint32_t>(password.size());
 	for (auto character : password) {
@@ -83,11 +83,11 @@ void MasterPackets::SendZoneTransferResponse(dServer* server, const SystemAddres
 	BitStreamUtils::WriteHeader(bitStream, eConnectionType::MASTER, eMasterMessageType::REQUEST_ZONE_TRANSFER_RESPONSE);
 
 	bitStream.Write(requestID);
-	bitStream.Write(static_cast<uint8_t>(mythranShift));
+	bitStream.Write<uint8_t>(mythranShift);
 	bitStream.Write(zoneID);
 	bitStream.Write(zoneInstance);
 	bitStream.Write(zoneClone);
-	bitStream.Write(static_cast<uint16_t>(serverPort));
+	bitStream.Write<uint16_t>(serverPort);
 	bitStream.Write(LUString(serverIP, static_cast<uint32_t>(serverIP.size() + 1)));
 
 	server->Send(&bitStream, sysAddr, false);
diff --git a/dNet/WorldPackets.cpp b/dNet/WorldPackets.cpp
index d6de9186..1ee98c83 100644
--- a/dNet/WorldPackets.cpp
+++ b/dNet/WorldPackets.cpp
@@ -21,19 +21,19 @@ void WorldPackets::SendLoadStaticZone(const SystemAddress& sysAddr, float x, flo
 	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::LOAD_STATIC_ZONE);
 
 	auto zone = Game::zoneManager->GetZone()->GetZoneID();
-	bitStream.Write(static_cast<uint16_t>(zone.GetMapID()));
-	bitStream.Write(static_cast<uint16_t>(zone.GetInstanceID()));
-	//bitStream.Write(static_cast<uint32_t>(zone.GetCloneID()));
+	bitStream.Write<uint16_t>(zone.GetMapID());
+	bitStream.Write<uint16_t>(zone.GetInstanceID());
+	//bitStream.Write<uint32_t>(zone.GetCloneID());
 	bitStream.Write(0);
 
 	bitStream.Write(checksum);
-	bitStream.Write(static_cast<uint16_t>(0));     // ??
+	bitStream.Write<uint16_t>(0);     // ??
 
 	bitStream.Write(x);
 	bitStream.Write(y);
 	bitStream.Write(z);
 
-	bitStream.Write(static_cast<uint32_t>(0));     // Change this to eventually use 4 on activity worlds
+	bitStream.Write<uint32_t>(0);     // Change this to eventually use 4 on activity worlds
 
 	SEND_PACKET;
 }
@@ -45,18 +45,18 @@ void WorldPackets::SendCharacterList(const SystemAddress& sysAddr, User* user) {
 	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::CHARACTER_LIST_RESPONSE);
 
 	std::vector<Character*> characters = user->GetCharacters();
-	bitStream.Write(static_cast<uint8_t>(characters.size()));
-	bitStream.Write(static_cast<uint8_t>(0)); //character index in front, just picking 0
+	bitStream.Write<uint8_t>(characters.size());
+	bitStream.Write<uint8_t>(0); //character index in front, just picking 0
 
 	for (uint32_t i = 0; i < characters.size(); ++i) {
 		bitStream.Write(characters[i]->GetObjectID());
-		bitStream.Write(static_cast<uint32_t>(0));
+		bitStream.Write<uint32_t>(0);
 
 		bitStream.Write(LUWString(characters[i]->GetName()));
 		bitStream.Write(LUWString(characters[i]->GetUnapprovedName()));
 
-		bitStream.Write(static_cast<uint8_t>(characters[i]->GetNameRejected()));
-		bitStream.Write(static_cast<uint8_t>(false));
+		bitStream.Write<uint8_t>(characters[i]->GetNameRejected());
+		bitStream.Write<uint8_t>(false);
 
 		bitStream.Write(LUString("", 10));
 
@@ -70,16 +70,16 @@ void WorldPackets::SendCharacterList(const SystemAddress& sysAddr, User* user) {
 		bitStream.Write(characters[i]->GetEyebrows());
 		bitStream.Write(characters[i]->GetEyes());
 		bitStream.Write(characters[i]->GetMouth());
-		bitStream.Write(static_cast<uint32_t>(0));
+		bitStream.Write<uint32_t>(0);
 
-		bitStream.Write(static_cast<uint16_t>(characters[i]->GetZoneID()));
-		bitStream.Write(static_cast<uint16_t>(characters[i]->GetZoneInstance()));
+		bitStream.Write<uint16_t>(characters[i]->GetZoneID());
+		bitStream.Write<uint16_t>(characters[i]->GetZoneInstance());
 		bitStream.Write(characters[i]->GetZoneClone());
 
 		bitStream.Write(characters[i]->GetLastLogin());
 
 		const auto& equippedItems = characters[i]->GetEquippedItems();
-		bitStream.Write(static_cast<uint16_t>(equippedItems.size()));
+		bitStream.Write<uint16_t>(equippedItems.size());
 
 		for (uint32_t j = 0; j < equippedItems.size(); ++j) {
 			bitStream.Write(equippedItems[j]);
@@ -106,7 +106,7 @@ void WorldPackets::SendCharacterRenameResponse(const SystemAddress& sysAddr, eRe
 void WorldPackets::SendCharacterDeleteResponse(const SystemAddress& sysAddr, bool response) {
 	RakNet::BitStream bitStream;
 	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::DELETE_CHARACTER_RESPONSE);
-	bitStream.Write(static_cast<uint8_t>(response));
+	bitStream.Write<uint8_t>(response);
 	SEND_PACKET;
 }
 
@@ -115,8 +115,8 @@ void WorldPackets::SendTransferToWorld(const SystemAddress& sysAddr, const std::
 	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::TRANSFER_TO_WORLD);
 
 	bitStream.Write(LUString(serverIP));
-	bitStream.Write(static_cast<uint16_t>(serverPort));
-	bitStream.Write(static_cast<uint8_t>(mythranShift));
+	bitStream.Write<uint16_t>(serverPort);
+	bitStream.Write<uint8_t>(mythranShift);
 
 	SEND_PACKET;
 }
@@ -124,7 +124,7 @@ void WorldPackets::SendTransferToWorld(const SystemAddress& sysAddr, const std::
 void WorldPackets::SendServerState(const SystemAddress& sysAddr) {
 	RakNet::BitStream bitStream;
 	BitStreamUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::SERVER_STATES);
-	bitStream.Write(static_cast<uint8_t>(1)); //If the server is receiving this request, it probably is ready anyway.
+	bitStream.Write<uint8_t>(1); //If the server is receiving this request, it probably is ready anyway.
 	SEND_PACKET;
 }
 
@@ -204,8 +204,8 @@ void WorldPackets::SendChatModerationResponse(const SystemAddress& sysAddr, bool
 	bitStream.Write<uint8_t>(unacceptedItems.empty()); // Is sentence ok?
 	bitStream.Write<uint16_t>(0x16); // Source ID, unknown
 
-	bitStream.Write(static_cast<uint8_t>(requestID)); // request ID
-	bitStream.Write(static_cast<char>(0)); // chat mode
+	bitStream.Write<uint8_t>(requestID); // request ID
+	bitStream.Write<char>(0); // chat mode
 
 	bitStream.Write(LUWString(receiver, 42)); // receiver name
 
diff --git a/dWorldServer/WorldServer.cpp b/dWorldServer/WorldServer.cpp
index caa0dab3..078ea50f 100644
--- a/dWorldServer/WorldServer.cpp
+++ b/dWorldServer/WorldServer.cpp
@@ -217,7 +217,7 @@ int main(int argc, char** argv) {
 	uint32_t chatPort = 1501;
 	if (Game::config->GetValue("chat_server_port") != "") chatPort = std::atoi(Game::config->GetValue("chat_server_port").c_str());
 
-	auto chatSock = SocketDescriptor(uint16_t(ourPort + 2), 0);
+	auto chatSock = SocketDescriptor(static_cast<uint16_t>(ourPort + 2), 0);
 	Game::chatServer = RakNetworkFactory::GetRakPeerInterface();
 	Game::chatServer->Startup(1, 30, &chatSock, 1);
 	Game::chatServer->Connect(masterIP.c_str(), chatPort, "3.25 ND1", 8);
@@ -1246,7 +1246,7 @@ void HandlePacket(Packet* packet) {
 
 	default:
 		const auto messageId = *reinterpret_cast<eWorldMessageType*>(&packet->data[3]);
-		const std::string_view messageIdString =  StringifiedEnum::ToString(messageId);
+		const std::string_view messageIdString = StringifiedEnum::ToString(messageId);
 		LOG("Unknown world packet received: %4i, %s", messageId, messageIdString.data());
 	}
 }
diff --git a/tests/dCommonTests/CMakeLists.txt b/tests/dCommonTests/CMakeLists.txt
index d1025489..be23d866 100644
--- a/tests/dCommonTests/CMakeLists.txt
+++ b/tests/dCommonTests/CMakeLists.txt
@@ -1,6 +1,7 @@
 set(DCOMMONTEST_SOURCES
 	"AMFDeserializeTests.cpp"
 	"Amf3Tests.cpp"
+	"CastUnderlyingTypeTests.cpp"
 	"HeaderSkipTest.cpp"
 	"TestCDFeatureGatingTable.cpp"
 	"TestLDFFormat.cpp"
diff --git a/tests/dCommonTests/CastUnderlyingTypeTests.cpp b/tests/dCommonTests/CastUnderlyingTypeTests.cpp
new file mode 100644
index 00000000..9cdfcdd3
--- /dev/null
+++ b/tests/dCommonTests/CastUnderlyingTypeTests.cpp
@@ -0,0 +1,24 @@
+#include <gtest/gtest.h>
+
+#include "GeneralUtils.h"
+
+#include "eGameMasterLevel.h"
+#include "eGameMessageType.h"
+#include "eWorldMessageType.h"
+
+#define ASSERT_TYPE_EQ(TYPE, ENUM)\
+	ASSERT_TRUE(typeid(TYPE) == typeid(GeneralUtils::CastUnderlyingType(static_cast<ENUM>(0))));
+
+#define ASSERT_TYPE_NE(TYPE, ENUM)\
+	ASSERT_FALSE(typeid(TYPE) == typeid(GeneralUtils::CastUnderlyingType(static_cast<ENUM>(0))));
+	
+// Verify that the underlying enum types are being cast correctly
+TEST(CastUnderlyingTypeTests, VerifyCastUnderlyingType) {
+	ASSERT_TYPE_EQ(uint8_t, eGameMasterLevel);
+	ASSERT_TYPE_EQ(uint16_t, eGameMessageType);
+	ASSERT_TYPE_EQ(uint32_t, eWorldMessageType)
+
+	ASSERT_TYPE_NE(void, eGameMasterLevel);
+	ASSERT_TYPE_NE(void, eGameMessageType);
+	ASSERT_TYPE_NE(void, eWorldMessageType)
+}
diff --git a/tests/dCommonTests/dEnumsTests/MagicEnumTests.cpp b/tests/dCommonTests/dEnumsTests/MagicEnumTests.cpp
index 48b192f6..2ad92914 100644
--- a/tests/dCommonTests/dEnumsTests/MagicEnumTests.cpp
+++ b/tests/dCommonTests/dEnumsTests/MagicEnumTests.cpp
@@ -20,7 +20,7 @@
 // Test World Message Enum Reflection
 TEST(MagicEnumTest, eWorldMessageTypeTest) {
 	Game::logger = new Logger("./MagicEnumTest_eWorldMessageTypeTest.log", true, true);
-	
+
 	ENUM_EQ(eWorldMessageType, 1, VALIDATION);
 	ENUM_EQ(eWorldMessageType, 2, CHARACTER_LIST_REQUEST);
 	ENUM_EQ(eWorldMessageType, 3, CHARACTER_CREATE_REQUEST);
@@ -74,9 +74,9 @@ TEST(MagicEnumTest, eWorldMessageTypeTest) {
 
 // Test Game Message Enum Reflection
 TEST(MagicEnumTest, eGameMessageTypeTest) {
-	
+
 	Game::logger = new Logger("./MagicEnumTest_eGameMessageTypeTest.log", true, true);
-	
+
 	// Only doing the first and last 10 for the sake of my sanity
 	ENUM_EQ(eGameMessageType, 0, GET_POSITION);
 	ENUM_EQ(eGameMessageType, 1, GET_ROTATION);

From 81dc4e22162783175057cbd255db849d1afd74df Mon Sep 17 00:00:00 2001
From: David Markowitz <39972741+EmosewaMC@users.noreply.github.com>
Date: Sun, 24 Dec 2023 06:01:47 -0800
Subject: [PATCH 10/13] fix: remove cancelOnLogout handling (#1354)

---
 dGame/dComponents/BuffComponent.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dGame/dComponents/BuffComponent.cpp b/dGame/dComponents/BuffComponent.cpp
index be33527f..c901c19d 100644
--- a/dGame/dComponents/BuffComponent.cpp
+++ b/dGame/dComponents/BuffComponent.cpp
@@ -398,7 +398,8 @@ void BuffComponent::UpdateXml(tinyxml2::XMLDocument* doc) {
 
 	for (const auto& [id, buff] : m_Buffs) {
 		auto* buffEntry = doc->NewElement("b");
-		if (buff.cancelOnZone || buff.cancelOnLogout) continue;
+		// TODO: change this if to if (buff.cancelOnZone || buff.cancelOnLogout) handling at some point.  No current way to differentiate between zone transfer and logout.
+		if (buff.cancelOnZone) continue;
 
 		buffEntry->SetAttribute("id", id);
 		buffEntry->SetAttribute("t", buff.time);

From dbf37c2d2b86bdf1efba3e5984e5a55b564842ef Mon Sep 17 00:00:00 2001
From: David Markowitz <39972741+EmosewaMC@users.noreply.github.com>
Date: Sun, 24 Dec 2023 09:17:04 -0800
Subject: [PATCH 11/13] fix: more than 1 zone control object causing issues
 with scripted minigames (#1355)

* fix: more than 1 zone control object

Fixes an issue when players cannot load into Avant Gardens Survival and other script based minigames with more than 1 zone control object in the level files.  (why are there 26 zone control objects in BoNS and AGS)

* Update Level.cpp
---
 dZoneManager/Level.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dZoneManager/Level.cpp b/dZoneManager/Level.cpp
index 60f69359..0a46dc89 100644
--- a/dZoneManager/Level.cpp
+++ b/dZoneManager/Level.cpp
@@ -275,7 +275,7 @@ void Level::ReadSceneObjectDataChunk(std::istream& file, Header& header) {
 			}
 			// If this is a client only object, we can skip loading it
 			if (data->GetKey() == u"loadOnClientOnly") {
-				skipLoadingObject = static_cast<bool>(std::stoi(data->GetValueAsString()));
+				skipLoadingObject |= static_cast<bool>(std::stoi(data->GetValueAsString()));
 				break;
 			}
 		}

From d2d67384a741cd70624b690dd57ef96fff787b7b Mon Sep 17 00:00:00 2001
From: Jett <55758076+Jettford@users.noreply.github.com>
Date: Sun, 24 Dec 2023 20:45:27 +0000
Subject: [PATCH 12/13] fix: update trigger loading code after typo (#1357)

---
 dZoneManager/Zone.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dZoneManager/Zone.cpp b/dZoneManager/Zone.cpp
index d11d11dd..463f0a8a 100644
--- a/dZoneManager/Zone.cpp
+++ b/dZoneManager/Zone.cpp
@@ -280,7 +280,8 @@ void Zone::LoadLUTriggers(std::string triggerFile, SceneRef& scene) {
 				newCommand->target = currentCommand->Attribute("target");
 				if (currentCommand->Attribute("targetName")) {
 					newCommand->targetName = currentCommand->Attribute("targetName");
-				} else if (currentCommand->Attribute("args")) {
+				}
+				if (currentCommand->Attribute("args")) {
 					newCommand->args = currentCommand->Attribute("args");
 				}
 

From ffa2f9986cc2eb1f9a6c6691e9e72eba19d20711 Mon Sep 17 00:00:00 2001
From: David Markowitz <39972741+EmosewaMC@users.noreply.github.com>
Date: Mon, 25 Dec 2023 06:48:57 -0800
Subject: [PATCH 13/13] AssetManager: fix deleting no file (#1358)

---
 dCommon/dClient/AssetManager.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dCommon/dClient/AssetManager.h b/dCommon/dClient/AssetManager.h
index 7e36b4b5..2116f223 100644
--- a/dCommon/dClient/AssetManager.h
+++ b/dCommon/dClient/AssetManager.h
@@ -26,7 +26,7 @@ struct AssetMemoryBuffer : std::streambuf {
 	}
 
 	~AssetMemoryBuffer() {
-		free(m_Base);
+		if (m_Success) free(m_Base);
 	}
 
 	pos_type seekpos(pos_type sp, std::ios_base::openmode which) override {