Remove unused problematic code

Fixes an issue where most smashables did not explode into bricks upon death.  This included anything that was spawned or didnt have the flag is_smashable set.
Tested that in races, all objects smash into bricks
Tested that the player properly explodes in their car if they crash
Tested that Shooting Gallery plays the special smash animation when a ship is smashed
Tested that all spawned objects play smash animations

* Fix warning, Fix modular assembly not smashing

* Rename variable to correct name

.github/workflows/build-and-test.yml

@@ -36,22 +36,16 @@ jobs:
         testPreset: "ci-${{matrix.os}}"
     - name: artifacts
       uses: actions/upload-artifact@v3
-      if: ${{ github.ref == 'ref/head/main' }}
       with:
         name: build-${{matrix.os}}
         path: |
-          build
-          !build/tests
-          !build/Testing
-          !build/CMakeFiles
-          !build/DartConfiguration.tcl
-          !build/CTestTestfile.cmake
-          !build/CMakeCache.txt
-          !build/build.ninja
-          !build/_deps
-          !build/cmake_install.cmake
-          !build/*.a
-          !build/*.lib
-          !build/*.dir
-          !build/*.vcxproj
-          !build/*.vcxproj.filters
+          build/*Server*
+          build/*.ini
+          build/*.so
+          build/*.dll
+          build/vanity/
+          build/navmeshes/
+          build/migrations/
+          build/*.dcf
+          !build/*.pdb
+          !build/d*/

dChatServer/ChatPacketHandler.cpp

@@ -22,10 +22,9 @@ extern PlayerContainer playerContainer;
 
 void ChatPacketHandler::HandleFriendlistRequest(Packet* packet) {
 	//Get from the packet which player we want to do something with:
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID = 0;
 	inStream.Read(playerID);
-	inStream.Read(playerID);
 
 	auto player = playerContainer.GetPlayerData(playerID);
 	if (!player) return;
@@ -99,10 +98,9 @@ void ChatPacketHandler::HandleFriendRequest(Packet* packet) {
 	auto maxNumberOfBestFriendsAsString = Game::config->GetValue("max_number_of_best_friends");
 	// If this config option doesn't exist, default to 5 which is what live used.
 	auto maxNumberOfBestFriends = maxNumberOfBestFriendsAsString != "" ? std::stoi(maxNumberOfBestFriendsAsString) : 5U;
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID requestorPlayerID;
 	inStream.Read(requestorPlayerID);
-	inStream.Read(requestorPlayerID);
 	uint32_t spacing{};
 	inStream.Read(spacing);
 	std::string playerName = "";
@@ -247,10 +245,9 @@ void ChatPacketHandler::HandleFriendRequest(Packet* packet) {
 }
 
 void ChatPacketHandler::HandleFriendResponse(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID;
 	inStream.Read(playerID);
-	inStream.Read(playerID);
 
 	eAddFriendResponseCode clientResponseCode = static_cast<eAddFriendResponseCode>(packet->data[0x14]);
 	std::string friendName = PacketUtils::ReadString(0x15, packet, true);
@@ -323,10 +320,9 @@ void ChatPacketHandler::HandleFriendResponse(Packet* packet) {
 }
 
 void ChatPacketHandler::HandleRemoveFriend(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID;
 	inStream.Read(playerID);
-	inStream.Read(playerID);
 	std::string friendName = PacketUtils::ReadString(0x14, packet, true);
 
 	//we'll have to query the db here to find the user, since you can delete them while they're offline.
@@ -381,10 +377,9 @@ void ChatPacketHandler::HandleRemoveFriend(Packet* packet) {
 }
 
 void ChatPacketHandler::HandleChatMessage(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID = LWOOBJID_EMPTY;
 	inStream.Read(playerID);
-	inStream.Read(playerID);
 
 	auto* sender = playerContainer.GetPlayerData(playerID);
 
@@ -501,10 +496,9 @@ void ChatPacketHandler::HandlePrivateChatMessage(Packet* packet) {
 }
 
 void ChatPacketHandler::HandleTeamInvite(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID;
 	inStream.Read(playerID);
-	inStream.Read(playerID);
 	std::string invitedPlayer = PacketUtils::ReadString(0x14, packet, true);
 
 	auto* player = playerContainer.GetPlayerData(playerID);
@@ -542,10 +536,9 @@ void ChatPacketHandler::HandleTeamInvite(Packet* packet) {
 }
 
 void ChatPacketHandler::HandleTeamInviteResponse(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID = LWOOBJID_EMPTY;
 	inStream.Read(playerID);
-	inStream.Read(playerID);
 	uint32_t size = 0;
 	inStream.Read(size);
 	char declined = 0;
@@ -576,10 +569,9 @@ void ChatPacketHandler::HandleTeamInviteResponse(Packet* packet) {
 }
 
 void ChatPacketHandler::HandleTeamLeave(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID = LWOOBJID_EMPTY;
 	inStream.Read(playerID);
-	inStream.Read(playerID);
 	uint32_t size = 0;
 	inStream.Read(size);
 
@@ -593,10 +585,9 @@ void ChatPacketHandler::HandleTeamLeave(Packet* packet) {
 }
 
 void ChatPacketHandler::HandleTeamKick(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID = LWOOBJID_EMPTY;
 	inStream.Read(playerID);
-	inStream.Read(playerID);
 
 	std::string kickedPlayer = PacketUtils::ReadString(0x14, packet, true);
 
@@ -624,10 +615,9 @@ void ChatPacketHandler::HandleTeamKick(Packet* packet) {
 }
 
 void ChatPacketHandler::HandleTeamPromote(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID = LWOOBJID_EMPTY;
 	inStream.Read(playerID);
-	inStream.Read(playerID);
 
 	std::string promotedPlayer = PacketUtils::ReadString(0x14, packet, true);
 
@@ -647,10 +637,9 @@ void ChatPacketHandler::HandleTeamPromote(Packet* packet) {
 }
 
 void ChatPacketHandler::HandleTeamLootOption(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID = LWOOBJID_EMPTY;
 	inStream.Read(playerID);
-	inStream.Read(playerID);
 	uint32_t size = 0;
 	inStream.Read(size);
 
@@ -671,10 +660,9 @@ void ChatPacketHandler::HandleTeamLootOption(Packet* packet) {
 }
 
 void ChatPacketHandler::HandleTeamStatusRequest(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID = LWOOBJID_EMPTY;
 	inStream.Read(playerID);
-	inStream.Read(playerID);
 
 	auto* team = playerContainer.GetTeam(playerID);
 	auto* data = playerContainer.GetPlayerData(playerID);

dChatServer/PlayerContainer.cpp

@@ -19,9 +19,8 @@ PlayerContainer::~PlayerContainer() {
 }
 
 void PlayerContainer::InsertPlayer(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	PlayerData* data = new PlayerData();
-	inStream.SetReadOffset(inStream.GetReadOffset() + 64);
 	inStream.Read(data->playerID);
 
 	uint32_t len;
@@ -52,9 +51,8 @@ void PlayerContainer::InsertPlayer(Packet* packet) {
 }
 
 void PlayerContainer::RemovePlayer(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID;
-	inStream.Read(playerID); //skip header
 	inStream.Read(playerID);
 
 	//Before they get kicked, we need to also send a message to their friends saying that they disconnected.
@@ -97,9 +95,8 @@ void PlayerContainer::RemovePlayer(Packet* packet) {
 }
 
 void PlayerContainer::MuteUpdate(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID;
-	inStream.Read(playerID); //skip header
 	inStream.Read(playerID);
 	time_t expire = 0;
 	inStream.Read(expire);
@@ -118,9 +115,8 @@ void PlayerContainer::MuteUpdate(Packet* packet) {
 }
 
 void PlayerContainer::CreateTeamServer(Packet* packet) {
-	CINSTREAM;
+	CINSTREAM_SKIP_HEADER;
 	LWOOBJID playerID;
-	inStream.Read(playerID); //skip header
 	inStream.Read(playerID);
 	size_t membersSize = 0;
 	inStream.Read(membersSize);

dCommon/AMFDeserialize.cpp

@@ -1,77 +1,79 @@
 #include "AMFDeserialize.h"
 
-#include "AMFFormat.h"
+#include <stdexcept>
+
+#include "Amf3.h"
 
 /**
  * AMF3 Reference document https://rtmp.veriskope.com/pdf/amf3-file-format-spec.pdf
  * AMF3 Deserializer written by EmosewaMC
  */
 
-AMFValue* AMFDeserialize::Read(RakNet::BitStream* inStream) {
+AMFBaseValue* AMFDeserialize::Read(RakNet::BitStream* inStream) {
 	if (!inStream) return nullptr;
-	AMFValue* returnValue = nullptr;
+	AMFBaseValue* returnValue = nullptr;
 	// Read in the value type from the bitStream
-	int8_t marker;
+	eAmf marker;
 	inStream->Read(marker);
 	// Based on the typing, create the value associated with that and return the base value class
 	switch (marker) {
-	case AMFValueType::AMFUndefined: {
-		returnValue = new AMFUndefinedValue();
+	case eAmf::Undefined: {
+		returnValue = new AMFBaseValue();
 		break;
 	}
 
-	case AMFValueType::AMFNull: {
+	case eAmf::Null: {
 		returnValue = new AMFNullValue();
 		break;
 	}
 
-	case AMFValueType::AMFFalse: {
-		returnValue = new AMFFalseValue();
+	case eAmf::False: {
+		returnValue = new AMFBoolValue(false);
 		break;
 	}
 
-	case AMFValueType::AMFTrue: {
-		returnValue = new AMFTrueValue();
+	case eAmf::True: {
+		returnValue = new AMFBoolValue(true);
 		break;
 	}
 
-	case AMFValueType::AMFInteger: {
+	case eAmf::Integer: {
 		returnValue = ReadAmfInteger(inStream);
 		break;
 	}
 
-	case AMFValueType::AMFDouble: {
+	case eAmf::Double: {
 		returnValue = ReadAmfDouble(inStream);
 		break;
 	}
 
-	case AMFValueType::AMFString: {
+	case eAmf::String: {
 		returnValue = ReadAmfString(inStream);
 		break;
 	}
 
-	case AMFValueType::AMFArray: {
+	case eAmf::Array: {
 		returnValue = ReadAmfArray(inStream);
 		break;
 	}
 
-							   // TODO We do not need these values, but if someone wants to implement them
-							   // then please do so and add the corresponding unit tests.
-	case AMFValueType::AMFXMLDoc:
-	case AMFValueType::AMFDate:
-	case AMFValueType::AMFObject:
-	case AMFValueType::AMFXML:
-	case AMFValueType::AMFByteArray:
-	case AMFValueType::AMFVectorInt:
-	case AMFValueType::AMFVectorUInt:
-	case AMFValueType::AMFVectorDouble:
-	case AMFValueType::AMFVectorObject:
-	case AMFValueType::AMFDictionary: {
-		throw static_cast<AMFValueType>(marker);
+	// These values are unimplemented in the live client and will remain unimplemented
+	// unless someone modifies the client to allow serializing of these values.
+	case eAmf::XMLDoc:
+	case eAmf::Date:
+	case eAmf::Object:
+	case eAmf::XML:
+	case eAmf::ByteArray:
+	case eAmf::VectorInt:
+	case eAmf::VectorUInt:
+	case eAmf::VectorDouble:
+	case eAmf::VectorObject:
+	case eAmf::Dictionary: {
+		throw marker;
 		break;
 	}
 	default:
-		throw static_cast<AMFValueType>(marker);
+		throw std::invalid_argument("Invalid AMF3 marker" + std::to_string(static_cast<int32_t>(marker)));
 		break;
 	}
 	return returnValue;
@@ -99,7 +101,7 @@ uint32_t AMFDeserialize::ReadU29(RakNet::BitStream* inStream) {
 	return actualNumber;
 }
 
-std::string AMFDeserialize::ReadString(RakNet::BitStream* inStream) {
+const std::string AMFDeserialize::ReadString(RakNet::BitStream* inStream) {
 	auto length = ReadU29(inStream);
 	// Check if this is a reference
 	bool isReference = length % 2 == 1;
@@ -113,48 +115,39 @@ std::string AMFDeserialize::ReadString(RakNet::BitStream* inStream) {
 		return value;
 	} else {
 		// Length is a reference to a previous index - use that as the read in value
-		return accessedElements[length];
+		return accessedElements.at(length);
 	}
 }
 
-AMFValue* AMFDeserialize::ReadAmfDouble(RakNet::BitStream* inStream) {
-	auto doubleValue = new AMFDoubleValue();
+AMFBaseValue* AMFDeserialize::ReadAmfDouble(RakNet::BitStream* inStream) {
 	double value;
 	inStream->Read<double>(value);
-	doubleValue->SetDoubleValue(value);
-	return doubleValue;
+	return new AMFDoubleValue(value);
 }
 
-AMFValue* AMFDeserialize::ReadAmfArray(RakNet::BitStream* inStream) {
+AMFBaseValue* AMFDeserialize::ReadAmfArray(RakNet::BitStream* inStream) {
 	auto arrayValue = new AMFArrayValue();
 
 	// Read size of dense array
 	auto sizeOfDenseArray = (ReadU29(inStream) >> 1);
-
-	// Then read Key'd portion
+	// Then read associative portion
 	while (true) {
 		auto key = ReadString(inStream);
-		// No more values when we encounter an empty string
+		// No more associative values when we encounter an empty string key
 		if (key.size() == 0) break;
-		arrayValue->InsertValue(key, Read(inStream));
+		arrayValue->Insert(key, Read(inStream));
 	}
-
 	// Finally read dense portion
 	for (uint32_t i = 0; i < sizeOfDenseArray; i++) {
-		arrayValue->PushBackValue(Read(inStream));
+		arrayValue->Insert(i, Read(inStream));
 	}
-
 	return arrayValue;
 }
 
-AMFValue* AMFDeserialize::ReadAmfString(RakNet::BitStream* inStream) {
-	auto stringValue = new AMFStringValue();
-	stringValue->SetStringValue(ReadString(inStream));
-	return stringValue;
+AMFBaseValue* AMFDeserialize::ReadAmfString(RakNet::BitStream* inStream) {
+	return new AMFStringValue(ReadString(inStream));
 }
 
-AMFValue* AMFDeserialize::ReadAmfInteger(RakNet::BitStream* inStream) {
-	auto integerValue = new AMFIntegerValue();
-	integerValue->SetIntegerValue(ReadU29(inStream));
-	return integerValue;
+AMFBaseValue* AMFDeserialize::ReadAmfInteger(RakNet::BitStream* inStream) {
+	return new AMFIntValue(ReadU29(inStream));
 }

dCommon/AMFDeserialize.h

@@ -5,7 +5,8 @@
 #include <vector>
 #include <string>
 
-class AMFValue;
+class AMFBaseValue;
+
 class AMFDeserialize {
 public:
 	/**
@@ -14,7 +15,7 @@ public:
 	 * @param inStream inStream to read value from.
 	 * @return Returns an AMFValue with all the information from the bitStream in it.
 	 */
-	AMFValue* Read(RakNet::BitStream* inStream);
+	AMFBaseValue* Read(RakNet::BitStream* inStream);
 private:
 	/**
 	 * @brief Private method to read a U29 integer from a bitstream
@@ -30,7 +31,7 @@ private:
 	 * @param inStream bitStream to read data from
 	 * @return The read string
 	 */
-	std::string ReadString(RakNet::BitStream* inStream);
+	const std::string ReadString(RakNet::BitStream* inStream);
 
 	/**
 	 * @brief Read an AMFDouble value from a bitStream
@@ -38,7 +39,7 @@ private:
 	 * @param inStream bitStream to read data from
 	 * @return Double value represented as an AMFValue
 	 */
-	AMFValue* ReadAmfDouble(RakNet::BitStream* inStream);
+	AMFBaseValue* ReadAmfDouble(RakNet::BitStream* inStream);
 
 	/**
 	 * @brief Read an AMFArray from a bitStream
@@ -46,7 +47,7 @@ private:
 	 * @param inStream bitStream to read data from
 	 * @return Array value represented as an AMFValue
 	 */
-	AMFValue* ReadAmfArray(RakNet::BitStream* inStream);
+	AMFBaseValue* ReadAmfArray(RakNet::BitStream* inStream);
 
 	/**
 	 * @brief Read an AMFString from a bitStream
@@ -54,7 +55,7 @@ private:
 	 * @param inStream bitStream to read data from
 	 * @return String value represented as an AMFValue
 	 */
-	AMFValue* ReadAmfString(RakNet::BitStream* inStream);
+	AMFBaseValue* ReadAmfString(RakNet::BitStream* inStream);
 
 	/**
 	 * @brief Read an AMFInteger from a bitStream
@@ -62,7 +63,7 @@ private:
 	 * @param inStream bitStream to read data from
 	 * @return Integer value represented as an AMFValue
 	 */
-	AMFValue* ReadAmfInteger(RakNet::BitStream* inStream);
+	AMFBaseValue* ReadAmfInteger(RakNet::BitStream* inStream);
 
 	/**
 	 * List of strings read so far saved to be read by reference.

dCommon/AMFFormat.cpp

@@ -1,156 +0,0 @@
-#include "AMFFormat.h"
-
-// AMFInteger
-void AMFIntegerValue::SetIntegerValue(uint32_t value) {
-	this->value = value;
-}
-
-uint32_t AMFIntegerValue::GetIntegerValue() {
-	return this->value;
-}
-
-// AMFDouble
-void AMFDoubleValue::SetDoubleValue(double value) {
-	this->value = value;
-}
-
-double AMFDoubleValue::GetDoubleValue() {
-	return this->value;
-}
-
-// AMFString
-void AMFStringValue::SetStringValue(const std::string& value) {
-	this->value = value;
-}
-
-std::string AMFStringValue::GetStringValue() {
-	return this->value;
-}
-
-// AMFXMLDoc
-void AMFXMLDocValue::SetXMLDocValue(const std::string& value) {
-	this->xmlData = value;
-}
-
-std::string AMFXMLDocValue::GetXMLDocValue() {
-	return this->xmlData;
-}
-
-// AMFDate
-void AMFDateValue::SetDateValue(uint64_t value) {
-	this->millisecondTimestamp = value;
-}
-
-uint64_t AMFDateValue::GetDateValue() {
-	return this->millisecondTimestamp;
-}
-
-// AMFArray Insert Value
-void AMFArrayValue::InsertValue(const std::string& key, AMFValue* value) {
-	this->associative.insert(std::make_pair(key, value));
-}
-
-// AMFArray Remove Value
-void AMFArrayValue::RemoveValue(const std::string& key) {
-	_AMFArrayMap_::iterator it = this->associative.find(key);
-	if (it != this->associative.end()) {
-		this->associative.erase(it);
-	}
-}
-
-// AMFArray Get Associative Iterator Begin
-_AMFArrayMap_::iterator AMFArrayValue::GetAssociativeIteratorValueBegin() {
-	return this->associative.begin();
-}
-
-// AMFArray Get Associative Iterator End
-_AMFArrayMap_::iterator AMFArrayValue::GetAssociativeIteratorValueEnd() {
-	return this->associative.end();
-}
-
-// AMFArray Push Back Value
-void AMFArrayValue::PushBackValue(AMFValue* value) {
-	this->dense.push_back(value);
-}
-
-// AMFArray Pop Back Value
-void AMFArrayValue::PopBackValue() {
-	this->dense.pop_back();
-}
-
-// AMFArray Get Dense List Size
-uint32_t AMFArrayValue::GetDenseValueSize() {
-	return (uint32_t)this->dense.size();
-}
-
-// AMFArray Get Dense Iterator Begin
-_AMFArrayList_::iterator AMFArrayValue::GetDenseIteratorBegin() {
-	return this->dense.begin();
-}
-
-// AMFArray Get Dense Iterator End
-_AMFArrayList_::iterator AMFArrayValue::GetDenseIteratorEnd() {
-	return this->dense.end();
-}
-
-AMFArrayValue::~AMFArrayValue() {
-	for (auto valueToDelete : GetDenseArray()) {
-		if (valueToDelete) delete valueToDelete;
-	}
-	for (auto valueToDelete : GetAssociativeMap()) {
-		if (valueToDelete.second) delete valueToDelete.second;
-	}
-}
-
-// AMFObject Constructor
-AMFObjectValue::AMFObjectValue(std::vector<std::pair<std::string, AMFValueType>> traits) {
-	this->traits.reserve(traits.size());
-	std::vector<std::pair<std::string, AMFValueType>>::iterator it = traits.begin();
-	while (it != traits.end()) {
-		this->traits.insert(std::make_pair(it->first, std::make_pair(it->second, new AMFNullValue())));
-		it++;
-	}
-}
-
-// AMFObject Set Value
-void AMFObjectValue::SetTraitValue(const std::string& trait, AMFValue* value) {
-	if (value) {
-		_AMFObjectTraits_::iterator it = this->traits.find(trait);
-		if (it != this->traits.end()) {
-			if (it->second.first == value->GetValueType()) {
-				it->second.second = value;
-			}
-		}
-	}
-}
-
-// AMFObject Get Value
-AMFValue* AMFObjectValue::GetTraitValue(const std::string& trait) {
-	_AMFObjectTraits_::iterator it = this->traits.find(trait);
-	if (it != this->traits.end()) {
-		return it->second.second;
-	}
-
-	return nullptr;
-}
-
-// AMFObject Get Trait Iterator Begin
-_AMFObjectTraits_::iterator AMFObjectValue::GetTraitsIteratorBegin() {
-	return this->traits.begin();
-}
-
-// AMFObject Get Trait Iterator End
-_AMFObjectTraits_::iterator AMFObjectValue::GetTraitsIteratorEnd() {
-	return this->traits.end();
-}
-
-// AMFObject Get Trait Size
-uint32_t AMFObjectValue::GetTraitArrayCount() {
-	return (uint32_t)this->traits.size();
-}
-
-AMFObjectValue::~AMFObjectValue() {
-	for (auto valueToDelete = GetTraitsIteratorBegin(); valueToDelete != GetTraitsIteratorEnd(); valueToDelete++) {
-		if (valueToDelete->second.second) delete valueToDelete->second.second;
-	}
-}

dCommon/AMFFormat.h

@@ -1,413 +0,0 @@
-#pragma once
-
-// Custom Classes
-#include "dCommonVars.h"
-
-// C++
-#include <unordered_map>
-#include <vector>
-
-/*!
-  \file AMFFormat.hpp
-  \brief A class for managing AMF values
- */
-
-class AMFValue;     // Forward declaration
-
-// Definitions
-#define _AMFArrayMap_               std::unordered_map<std::string, AMFValue*>
-#define _AMFArrayList_              std::vector<AMFValue*>
-
-#define _AMFObjectTraits_           std::unordered_map<std::string, std::pair<AMFValueType, AMFValue*>>
-#define _AMFObjectDynamicTraits_    std::unordered_map<std::string, AMFValue*>
-
-//! An enum for each AMF value type
-enum AMFValueType : unsigned char {
-	AMFUndefined = 0x00,            //!< An undefined AMF Value
-	AMFNull = 0x01,                 //!< A null AMF value
-	AMFFalse = 0x02,                //!< A false AMF value
-	AMFTrue = 0x03,                 //!< A true AMF value
-	AMFInteger = 0x04,              //!< An integer AMF value
-	AMFDouble = 0x05,               //!< A double AMF value
-	AMFString = 0x06,               //!< A string AMF value
-	AMFXMLDoc = 0x07,               //!< An XML Doc AMF value
-	AMFDate = 0x08,                 //!< A date AMF value
-	AMFArray = 0x09,                //!< An array AMF value
-	AMFObject = 0x0A,               //!< An object AMF value
-	AMFXML = 0x0B,                  //!< An XML AMF value
-	AMFByteArray = 0x0C,            //!< A byte array AMF value
-	AMFVectorInt = 0x0D,            //!< An integer vector AMF value
-	AMFVectorUInt = 0x0E,           //!< An unsigned integer AMF value
-	AMFVectorDouble = 0x0F,         //!< A double vector AMF value
-	AMFVectorObject = 0x10,         //!< An object vector AMF value
-	AMFDictionary = 0x11            //!< A dictionary AMF value
-};
-
-//! An enum for the object value types
-enum AMFObjectValueType : unsigned char {
-	AMFObjectAnonymous = 0x01,
-	AMFObjectTyped = 0x02,
-	AMFObjectDynamic = 0x03,
-	AMFObjectExternalizable = 0x04
-};
-
-//! The base AMF value class
-class AMFValue {
-public:
-	//! Returns the AMF value type
-	/*!
-	  \return The AMF value type
-	 */
-	virtual AMFValueType GetValueType() = 0;
-	virtual ~AMFValue() {};
-};
-
-//! A typedef for a pointer to an AMF value
-typedef AMFValue* NDGFxValue;
-
-
-// The various AMF value types
-
-//! The undefined value AMF type
-class AMFUndefinedValue : public AMFValue {
-private:
-	//! Returns the AMF value type
-	/*!
-	  \return The AMF value type
-	 */
-	AMFValueType GetValueType() { return ValueType; }
-public:
-	static const AMFValueType ValueType = AMFUndefined;
-};
-
-//! The null value AMF type
-class AMFNullValue : public AMFValue {
-private:
-	//! Returns the AMF value type
-	/*!
-	 \return The AMF value type
-	 */
-	AMFValueType GetValueType() { return ValueType; }
-public:
-	static const AMFValueType ValueType = AMFNull;
-};
-
-//! The false value AMF type
-class AMFFalseValue : public AMFValue {
-private:
-	//! Returns the AMF value type
-	/*!
-	 \return The AMF value type
-	 */
-	AMFValueType GetValueType() { return ValueType; }
-public:
-	static const AMFValueType ValueType = AMFFalse;
-};
-
-//! The true value AMF type
-class AMFTrueValue : public AMFValue {
-private:
-	//! Returns the AMF value type
-	/*!
-	 \return The AMF value type
-	 */
-	AMFValueType GetValueType() { return ValueType; }
-public:
-	static const AMFValueType ValueType = AMFTrue;
-};
-
-//! The integer value AMF type
-class AMFIntegerValue : public AMFValue {
-private:
-	uint32_t value;         //!< The value of the AMF type
-
-	//! Returns the AMF value type
-	/*!
-	 \return The AMF value type
-	 */
-	AMFValueType GetValueType() { return ValueType; }
-
-public:
-	static const AMFValueType ValueType = AMFInteger;
-	//! Sets the integer value
-	/*!
-	  \param value The value to set
-	 */
-	void SetIntegerValue(uint32_t value);
-
-	//! Gets the integer value
-	/*!
-	  \return The integer value
-	 */
-	uint32_t GetIntegerValue();
-};
-
-//! The double value AMF type
-class AMFDoubleValue : public AMFValue {
-private:
-	double value;           //!< The value of the AMF type
-
-	//! Returns the AMF value type
-	/*!
-	 \return The AMF value type
-	 */
-	AMFValueType GetValueType() { return ValueType; }
-
-public:
-	static const AMFValueType ValueType = AMFDouble;
-	//! Sets the double value
-	/*!
-	  \param value The value to set to
-	 */
-	void SetDoubleValue(double value);
-
-	//! Gets the double value
-	/*!
-	  \return The double value
-	 */
-	double GetDoubleValue();
-};
-
-//! The string value AMF type
-class AMFStringValue : public AMFValue {
-private:
-	std::string value;          //!< The value of the AMF type
-
-	//! Returns the AMF value type
-	/*!
-	 \return The AMF value type
-	 */
-	AMFValueType GetValueType() { return ValueType; }
-
-public:
-	static const AMFValueType ValueType = AMFString;
-	//! Sets the string value
-	/*!
-	  \param value The string value to set to
-	 */
-	void SetStringValue(const std::string& value);
-
-	//! Gets the string value
-	/*!
-	  \return The string value
-	 */
-	std::string GetStringValue();
-};
-
-//! The XML doc value AMF type
-class AMFXMLDocValue : public AMFValue {
-private:
-	std::string xmlData;            //!< The value of the AMF type
-
-	//! Returns the AMF value type
-	/*!
-	 \return The AMF value type
-	 */
-	AMFValueType GetValueType() { return ValueType; }
-
-public:
-	static const AMFValueType ValueType = AMFXMLDoc;
-	//! Sets the XML Doc value
-	/*!
-	  \param value The value to set to
-	 */
-	void SetXMLDocValue(const std::string& value);
-
-	//! Gets the XML Doc value
-	/*!
-	  \return The XML Doc value
-	 */
-	std::string GetXMLDocValue();
-};
-
-//! The date value AMF type
-class AMFDateValue : public AMFValue {
-private:
-	uint64_t millisecondTimestamp;      //!< The time in milliseconds since the ephoch
-
-	//! Returns the AMF value type
-	/*!
-	 \return The AMF value type
-	 */
-	AMFValueType GetValueType() { return ValueType; }
-
-public:
-	static const AMFValueType ValueType = AMFDate;
-	//! Sets the date time
-	/*!
-	  \param value The value to set to
-	 */
-	void SetDateValue(uint64_t value);
-
-	//! Gets the date value
-	/*!
-	  \return The date value in milliseconds since the epoch
-	 */
-	uint64_t GetDateValue();
-};
-
-//! The array value AMF type
-// This object will manage it's own memory map and list.  Do not delete its values.
-class AMFArrayValue : public AMFValue {
-private:
-	_AMFArrayMap_ associative;      //!< The array map (associative part)
-	_AMFArrayList_ dense;           //!< The array list (dense part)
-
-	//! Returns the AMF value type
-	/*!
-	 \return The AMF value type
-	 */
-	AMFValueType GetValueType() override { return ValueType; }
-
-public:
-	static const AMFValueType ValueType = AMFArray;
-
-	~AMFArrayValue() override;
-	//! Inserts an item into the array map for a specific key
-	/*!
-	  \param key The key to set
-	  \param value The value to add
-	 */
-	void InsertValue(const std::string& key, AMFValue* value);
-
-	//! Removes an item for a specific key
-	/*!
-	  \param key The key to remove
-	 */
-	void RemoveValue(const std::string& key);
-
-	//! Finds an AMF value
-	/*!
-	  \return The AMF value if found, nullptr otherwise
-	 */
-	template <typename T>
-	T* FindValue(const std::string& key) const {
-		_AMFArrayMap_::const_iterator it = this->associative.find(key);
-		if (it != this->associative.end() && T::ValueType == it->second->GetValueType()) {
-			return dynamic_cast<T*>(it->second);
-		}
-
-		return nullptr;
-	};
-
-	//! Returns where the associative iterator begins
-	/*!
-	  \return Where the array map iterator begins
-	 */
-	_AMFArrayMap_::iterator GetAssociativeIteratorValueBegin();
-
-	//! Returns where the associative iterator ends
-	/*!
-	  \return Where the array map iterator ends
-	 */
-	_AMFArrayMap_::iterator GetAssociativeIteratorValueEnd();
-
-	//! Pushes back a value into the array list
-	/*!
-	  \param value The value to push back
-	 */
-	void PushBackValue(AMFValue* value);
-
-	//! Pops back the last value in the array list
-	void PopBackValue();
-
-	//! Gets the count of the dense list
-	/*!
-	  \return The dense list size
-	 */
-	uint32_t GetDenseValueSize();
-
-	//! Gets a specific value from the list for the specified index
-	/*!
-	  \param index The index to get
-	 */
-	template <typename T>
-	T* GetValueAt(uint32_t index) {
-		if (index >= this->dense.size()) return nullptr;
-		AMFValue* foundValue = this->dense.at(index);
-		return T::ValueType == foundValue->GetValueType() ? dynamic_cast<T*>(foundValue) : nullptr;
-	};
-
-	//! Returns where the dense iterator begins
-	/*!
-	  \return Where the iterator begins
-	 */
-	_AMFArrayList_::iterator GetDenseIteratorBegin();
-
-	//! Returns where the dense iterator ends
-	/*!
-	  \return Where the iterator ends
-	 */
-	_AMFArrayList_::iterator GetDenseIteratorEnd();
-
-	//! Returns the associative map
-	/*!
-	  \return The associative map
-	 */
-	_AMFArrayMap_ GetAssociativeMap() { return this->associative; };
-
-	//! Returns the dense array
-	/*!
-	  \return The dense array
-	 */
-	_AMFArrayList_ GetDenseArray() { return this->dense; };
-};
-
-//! The anonymous object value AMF type
-class AMFObjectValue : public AMFValue {
-private:
-	_AMFObjectTraits_ traits;           //!< The object traits
-
-	//! Returns the AMF value type
-	/*!
-	 \return The AMF value type
-	 */
-	AMFValueType GetValueType() override { return ValueType; }
-	~AMFObjectValue() override;
-
-public:
-	static const AMFValueType ValueType = AMFObject;
-	//! Constructor
-	/*!
-	  \param traits The traits to set
-	 */
-	AMFObjectValue(std::vector<std::pair<std::string, AMFValueType>> traits);
-
-	//! Gets the object value type
-	/*!
-	  \return The object value type
-	 */
-	virtual AMFObjectValueType GetObjectValueType() { return AMFObjectAnonymous; }
-
-	//! Sets the value of a trait
-	/*!
-	  \param trait The trait to set the value for
-	  \param value The AMF value to set
-	 */
-	void SetTraitValue(const std::string& trait, AMFValue* value);
-
-	//! Gets a trait value
-	/*!
-	  \param trait The trait to get the value for
-	  \return The trait value
-	 */
-	AMFValue* GetTraitValue(const std::string& trait);
-
-	//! Gets the beginning of the object traits iterator
-	/*!
-	  \return The AMF trait array iterator begin
-	 */
-	_AMFObjectTraits_::iterator GetTraitsIteratorBegin();
-
-	//! Gets the end of the object traits iterator
-	/*!
-	  \return The AMF trait array iterator begin
-	 */
-	_AMFObjectTraits_::iterator GetTraitsIteratorEnd();
-
-	//! Gets the amount of traits
-	/*!
-	  \return The amount of traits
-	 */
-	uint32_t GetTraitArrayCount();
-};

dCommon/AMFFormat_BitStream.cpp

@@ -1,259 +0,0 @@
-#include "AMFFormat_BitStream.h"
-
-// Writes an AMFValue pointer to a RakNet::BitStream
-template<>
-void RakNet::BitStream::Write<AMFValue*>(AMFValue* value) {
-	if (value != nullptr) {
-		AMFValueType type = value->GetValueType();
-
-		switch (type) {
-		case AMFUndefined: {
-			AMFUndefinedValue* v = (AMFUndefinedValue*)value;
-			this->Write(*v);
-			break;
-		}
-
-		case AMFNull: {
-			AMFNullValue* v = (AMFNullValue*)value;
-			this->Write(*v);
-			break;
-		}
-
-		case AMFFalse: {
-			AMFFalseValue* v = (AMFFalseValue*)value;
-			this->Write(*v);
-			break;
-		}
-
-		case AMFTrue: {
-			AMFTrueValue* v = (AMFTrueValue*)value;
-			this->Write(*v);
-			break;
-		}
-
-		case AMFInteger: {
-			AMFIntegerValue* v = (AMFIntegerValue*)value;
-			this->Write(*v);
-			break;
-		}
-
-		case AMFDouble: {
-			AMFDoubleValue* v = (AMFDoubleValue*)value;
-			this->Write(*v);
-			break;
-		}
-
-		case AMFString: {
-			AMFStringValue* v = (AMFStringValue*)value;
-			this->Write(*v);
-			break;
-		}
-
-		case AMFXMLDoc: {
-			AMFXMLDocValue* v = (AMFXMLDocValue*)value;
-			this->Write(*v);
-			break;
-		}
-
-		case AMFDate: {
-			AMFDateValue* v = (AMFDateValue*)value;
-			this->Write(*v);
-			break;
-		}
-
-		case AMFArray: {
-			this->Write((AMFArrayValue*)value);
-			break;
-		}
-		case AMFObject:
-		case AMFXML:
-		case AMFByteArray:
-		case AMFVectorInt:
-		case AMFVectorUInt:
-		case AMFVectorDouble:
-		case AMFVectorObject:
-		case AMFDictionary:
-			break;
-		}
-	}
-}
-
-/**
- * A private function to write an value to a RakNet::BitStream
- * RakNet writes in the correct byte order - do not reverse this.
- */
-void WriteUInt29(RakNet::BitStream* bs, uint32_t v) {
-	unsigned char b4 = (unsigned char)v;
-	if (v < 0x00200000) {
-		b4 = b4 & 0x7F;
-		if (v > 0x7F) {
-			unsigned char b3;
-			v = v >> 7;
-			b3 = ((unsigned char)(v)) | 0x80;
-			if (v > 0x7F) {
-				unsigned char b2;
-				v = v >> 7;
-				b2 = ((unsigned char)(v)) | 0x80;
-				bs->Write(b2);
-			}
-
-			bs->Write(b3);
-		}
-	} else {
-		unsigned char b1;
-		unsigned char b2;
-		unsigned char b3;
-
-		v = v >> 8;
-		b3 = ((unsigned char)(v)) | 0x80;
-		v = v >> 7;
-		b2 = ((unsigned char)(v)) | 0x80;
-		v = v >> 7;
-		b1 = ((unsigned char)(v)) | 0x80;
-
-		bs->Write(b1);
-		bs->Write(b2);
-		bs->Write(b3);
-	}
-
-	bs->Write(b4);
-}
-
-/**
- * Writes a flag number to a RakNet::BitStream
- * RakNet writes in the correct byte order - do not reverse this.
- */
-void WriteFlagNumber(RakNet::BitStream* bs, uint32_t v) {
-	v = (v << 1) | 0x01;
-	WriteUInt29(bs, v);
-}
-
-/**
- * Writes an AMFString to a RakNet::BitStream
- *
- * RakNet writes in the correct byte order - do not reverse this.
- */
-void WriteAMFString(RakNet::BitStream* bs, const std::string& str) {
-	WriteFlagNumber(bs, (uint32_t)str.size());
-	bs->Write(str.c_str(), (uint32_t)str.size());
-}
-
-/**
- * Writes an U16 to a bitstream
- *
- * RakNet writes in the correct byte order - do not reverse this.
- */
-void WriteAMFU16(RakNet::BitStream* bs, uint16_t value) {
-	bs->Write(value);
-}
-
-/**
- * Writes an U32 to a bitstream
- *
- * RakNet writes in the correct byte order - do not reverse this.
- */
-void WriteAMFU32(RakNet::BitStream* bs, uint32_t value) {
-	bs->Write(value);
-}
-
-/**
- * Writes an U64 to a bitstream
- *
- * RakNet writes in the correct byte order - do not reverse this.
- */
-void WriteAMFU64(RakNet::BitStream* bs, uint64_t value) {
-	bs->Write(value);
-}
-
-
-// Writes an AMFUndefinedValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFUndefinedValue>(AMFUndefinedValue value) {
-	this->Write(AMFUndefined);
-}
-
-// Writes an AMFNullValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFNullValue>(AMFNullValue value) {
-	this->Write(AMFNull);
-}
-
-// Writes an AMFFalseValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFFalseValue>(AMFFalseValue value) {
-	this->Write(AMFFalse);
-}
-
-// Writes an AMFTrueValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFTrueValue>(AMFTrueValue value) {
-	this->Write(AMFTrue);
-}
-
-// Writes an AMFIntegerValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFIntegerValue>(AMFIntegerValue value) {
-	this->Write(AMFInteger);
-	WriteUInt29(this, value.GetIntegerValue());
-}
-
-// Writes an AMFDoubleValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFDoubleValue>(AMFDoubleValue value) {
-	this->Write(AMFDouble);
-	double d = value.GetDoubleValue();
-	WriteAMFU64(this, *((unsigned long long*) & d));
-}
-
-// Writes an AMFStringValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFStringValue>(AMFStringValue value) {
-	this->Write(AMFString);
-	std::string v = value.GetStringValue();
-	WriteAMFString(this, v);
-}
-
-// Writes an AMFXMLDocValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFXMLDocValue>(AMFXMLDocValue value) {
-	this->Write(AMFXMLDoc);
-	std::string v = value.GetXMLDocValue();
-	WriteAMFString(this, v);
-}
-
-// Writes an AMFDateValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFDateValue>(AMFDateValue value) {
-	this->Write(AMFDate);
-	uint64_t date = value.GetDateValue();
-	WriteAMFU64(this, date);
-}
-
-// Writes an AMFArrayValue to BitStream
-template<>
-void RakNet::BitStream::Write<AMFArrayValue*>(AMFArrayValue* value) {
-	this->Write(AMFArray);
-	uint32_t denseSize = value->GetDenseValueSize();
-	WriteFlagNumber(this, denseSize);
-
-	_AMFArrayMap_::iterator it = value->GetAssociativeIteratorValueBegin();
-	_AMFArrayMap_::iterator end = value->GetAssociativeIteratorValueEnd();
-
-	while (it != end) {
-		WriteAMFString(this, it->first);
-		this->Write(it->second);
-		it++;
-	}
-
-	this->Write(AMFNull);
-
-	if (denseSize > 0) {
-		_AMFArrayList_::iterator it2 = value->GetDenseIteratorBegin();
-		_AMFArrayList_::iterator end2 = value->GetDenseIteratorEnd();
-
-		while (it2 != end2) {
-			this->Write(*it2);
-			it2++;
-		}
-	}
-}

dCommon/AMFFormat_BitStream.h

@@ -1,92 +0,0 @@
-#pragma once
-
-// Custom Classes
-#include "AMFFormat.h"
-
-// RakNet
-#include <BitStream.h>
-
-/*!
- \file AMFFormat_BitStream.h
- \brief A class that implements native writing of AMF values to RakNet::BitStream
- */
-
- // We are using the RakNet namespace
-namespace RakNet {
-	//! Writes an AMFValue pointer to a RakNet::BitStream
-	/*!
-	 \param value The value to write
-	 */
-	template <>
-	void RakNet::BitStream::Write<AMFValue*>(AMFValue* value);
-
-	//! Writes an AMFUndefinedValue to a RakNet::BitStream
-	/*!
-	 \param value The value to write
-	 */
-	template <>
-	void RakNet::BitStream::Write<AMFUndefinedValue>(AMFUndefinedValue value);
-
-	//! Writes an AMFNullValue to a RakNet::BitStream
-	/*!
-	 \param value The value to write
-	 */
-	template <>
-	void RakNet::BitStream::Write<AMFNullValue>(AMFNullValue value);
-
-	//! Writes an AMFFalseValue to a RakNet::BitStream
-	/*!
-	 \param value The value to write
-	 */
-	template <>
-	void RakNet::BitStream::Write<AMFFalseValue>(AMFFalseValue value);
-
-	//! Writes an AMFTrueValue to a RakNet::BitStream
-	/*!
-	 \param value The value to write
-	 */
-	template <>
-	void RakNet::BitStream::Write<AMFTrueValue>(AMFTrueValue value);
-
-	//! Writes an AMFIntegerValue to a RakNet::BitStream
-	/*!
-	 \param value The value to write
-	 */
-	template <>
-	void RakNet::BitStream::Write<AMFIntegerValue>(AMFIntegerValue value);
-
-	//! Writes an AMFDoubleValue to a RakNet::BitStream
-	/*!
-	 \param value The value to write
-	 */
-	template <>
-	void RakNet::BitStream::Write<AMFDoubleValue>(AMFDoubleValue value);
-
-	//! Writes an AMFStringValue to a RakNet::BitStream
-	/*!
-	 \param value The value to write
-	 */
-	template <>
-	void RakNet::BitStream::Write<AMFStringValue>(AMFStringValue value);
-
-	//! Writes an AMFXMLDocValue to a RakNet::BitStream
-	/*!
-	 \param value The value to write
-	 */
-	template <>
-	void RakNet::BitStream::Write<AMFXMLDocValue>(AMFXMLDocValue value);
-
-	//! Writes an AMFDateValue to a RakNet::BitStream
-	/*!
-	 \param value The value to write
-	 */
-	template <>
-	void RakNet::BitStream::Write<AMFDateValue>(AMFDateValue value);
-
-	//! Writes an AMFArrayValue to a RakNet::BitStream
-	/*!
-	 \param value The value to write
-	 */
-	template <>
-	void RakNet::BitStream::Write<AMFArrayValue*>(AMFArrayValue* value);
-} // namespace RakNet

dCommon/Amf3.h

@@ -0,0 +1,367 @@
+#ifndef __AMF3__H__
+#define __AMF3__H__
+
+#include "dCommonVars.h"
+#include "dLogger.h"
+#include "Game.h"
+
+#include <unordered_map>
+#include <vector>
+
+enum class eAmf : uint8_t {
+	Undefined = 0x00,            // An undefined AMF Value
+	Null = 0x01,                 // A null AMF value
+	False = 0x02,                // A false AMF value
+	True = 0x03,                 // A true AMF value
+	Integer = 0x04,              // An integer AMF value
+	Double = 0x05,               // A double AMF value
+	String = 0x06,               // A string AMF value
+	XMLDoc = 0x07,               // Unused in the live client and cannot be serialized without modification.  An XML Doc AMF value
+	Date = 0x08,                 // Unused in the live client and cannot be serialized without modification.  A date AMF value
+	Array = 0x09,                // An array AMF value
+	Object = 0x0A,               // Unused in the live client and cannot be serialized without modification.  An object AMF value
+	XML = 0x0B,                  // Unused in the live client and cannot be serialized without modification.  An XML AMF value
+	ByteArray = 0x0C,            // Unused in the live client and cannot be serialized without modification.  A byte array AMF value
+	VectorInt = 0x0D,            // Unused in the live client and cannot be serialized without modification.  An integer vector AMF value
+	VectorUInt = 0x0E,           // Unused in the live client and cannot be serialized without modification.  An unsigned integer AMF value
+	VectorDouble = 0x0F,         // Unused in the live client and cannot be serialized without modification.  A double vector AMF value
+	VectorObject = 0x10,         // Unused in the live client and cannot be serialized without modification.  An object vector AMF value
+	Dictionary = 0x11            // Unused in the live client and cannot be serialized without modification.  A dictionary AMF value
+};
+
+class AMFBaseValue {
+public:
+	virtual eAmf GetValueType() { return eAmf::Undefined; };
+	AMFBaseValue() {};
+	virtual ~AMFBaseValue() {};
+};
+
+template<typename ValueType>
+class AMFValue : public AMFBaseValue {
+public:
+	AMFValue() {};
+	AMFValue(ValueType value) { SetValue(value); };
+	virtual ~AMFValue() override {};
+
+	eAmf GetValueType() override { return eAmf::Undefined; };
+
+	const ValueType& GetValue() { return data; };
+	void SetValue(ValueType value) { data = value; };
+protected:
+	ValueType data;
+};
+
+// As a string this is much easier to write and read from a BitStream.
+template<>
+class AMFValue<const char*> : public AMFBaseValue {
+public:
+	AMFValue() {};
+	AMFValue(const char* value) { SetValue(std::string(value)); };
+	virtual ~AMFValue() override {};
+
+	eAmf GetValueType() override { return eAmf::String; };
+
+	const std::string& GetValue() { return data; };
+	void SetValue(std::string value) { data = value; };
+protected:
+	std::string data;
+};
+
+typedef AMFValue<std::nullptr_t> AMFNullValue;
+typedef AMFValue<bool> AMFBoolValue;
+typedef AMFValue<int32_t> AMFIntValue;
+typedef AMFValue<std::string> AMFStringValue;
+typedef AMFValue<double> AMFDoubleValue;
+
+template<> inline eAmf AMFValue<std::nullptr_t>::GetValueType() { return eAmf::Null; };
+template<> inline eAmf AMFValue<bool>::GetValueType() { return this->data ? eAmf::True : eAmf::False; };
+template<> inline eAmf AMFValue<int32_t>::GetValueType() { return eAmf::Integer; };
+template<> inline eAmf AMFValue<uint32_t>::GetValueType() { return eAmf::Integer; };
+template<> inline eAmf AMFValue<std::string>::GetValueType() { return eAmf::String; };
+template<> inline eAmf AMFValue<double>::GetValueType() { return eAmf::Double; };
+
+/**
+ * The AMFArrayValue object holds 2 types of lists:
+ * An associative list where a key maps to a value
+ * A Dense list where elements are stored back to back
+ *
+ * Objects that are Registered are owned by this object
+ * and are not to be deleted by a caller.
+ */
+class AMFArrayValue : public AMFBaseValue {
+
+	typedef std::unordered_map<std::string, AMFBaseValue*> AMFAssociative;
+	typedef std::vector<AMFBaseValue*> AMFDense;
+
+public:
+	eAmf GetValueType() override { return eAmf::Array; };
+
+	~AMFArrayValue() override {
+		for (auto valueToDelete : GetDense()) {
+			if (valueToDelete) {
+				delete valueToDelete;
+				valueToDelete = nullptr;
+			}
+		}
+		for (auto valueToDelete : GetAssociative()) {
+			if (valueToDelete.second) {
+				delete valueToDelete.second;
+				valueToDelete.second = nullptr;
+			}
+		}
+	};
+
+	/**
+	 * Returns the Associative portion of the object
+	 */
+	inline AMFAssociative& GetAssociative() { return this->associative; };
+
+	/**
+	 * Returns the dense portion of the object
+	 */
+	inline AMFDense& GetDense() { return this->dense; };
+
+	/**
+	 * Inserts an AMFValue into the associative portion with the given key.
+	 * If a duplicate is attempted to be inserted, it is ignored and the
+	 * first value with that key is kept in the map.
+	 *
+	 * These objects are not to be deleted by the caller as they are owned by
+	 * the AMFArray object which manages its own memory.
+	 *
+	 * @param key The key to associate with the value
+	 * @param value The value to insert
+	 *
+	 * @return The inserted element if the type matched,
+	 * or nullptr if a key existed and was not the same type
+	 */
+	template<typename ValueType>
+	std::pair<AMFValue<ValueType>*, bool> Insert(const std::string& key, ValueType value) {
+		auto element = associative.find(key);
+		AMFValue<ValueType>* val = nullptr;
+		bool found = true;
+		if (element == associative.end()) {
+			val = new AMFValue<ValueType>(value);
+			associative.insert(std::make_pair(key, val));
+		} else {
+			val = dynamic_cast<AMFValue<ValueType>*>(element->second);
+			found = false;
+		}
+		return std::make_pair(val, found);
+	};
+
+	// Associates an array with a string key
+	std::pair<AMFBaseValue*, bool> Insert(const std::string& key) {
+		auto element = associative.find(key);
+		AMFArrayValue* val = nullptr;
+		bool found = true;
+		if (element == associative.end()) {
+			val = new AMFArrayValue();
+			associative.insert(std::make_pair(key, val));
+		} else {
+			val = dynamic_cast<AMFArrayValue*>(element->second);
+			found = false;
+		}
+		return std::make_pair(val, found);
+	};
+
+	// Associates an array with an integer key
+	std::pair<AMFBaseValue*, bool> Insert(const uint32_t& index) {
+		AMFArrayValue* val = nullptr;
+		bool inserted = false;
+		if (index >= dense.size()) {
+			dense.resize(index + 1);
+			val = new AMFArrayValue();
+			dense.at(index) = val;
+			inserted = true;
+		}
+		return std::make_pair(dynamic_cast<AMFArrayValue*>(dense.at(index)), inserted);
+	};
+
+	/**
+	 * @brief Inserts an AMFValue into the AMFArray key'd by index.
+	 * Attempting to insert the same key to the same value twice overwrites
+	 * the previous value with the new one.
+	 *
+	 * @param index The index to associate with the value
+	 * @param value The value to insert
+	 * @return The inserted element, or nullptr if the type did not match
+	 * what was at the index.
+	 */
+	template<typename ValueType>
+	std::pair<AMFValue<ValueType>*, bool> Insert(const uint32_t& index, ValueType value) {
+		AMFValue<ValueType>* val = nullptr;
+		bool inserted = false;
+		if (index >= this->dense.size()) {
+			this->dense.resize(index + 1);
+			val = new AMFValue<ValueType>(value);
+			this->dense.at(index) = val;
+			inserted = true;
+		}
+		return std::make_pair(dynamic_cast<AMFValue<ValueType>*>(this->dense.at(index)), inserted);
+	};
+
+	/**
+	 * Inserts an AMFValue into the associative portion with the given key.
+	 * If a duplicate is attempted to be inserted, it replaces the original
+	 *
+	 * The inserted element is now owned by this object and is not to be deleted
+	 *
+	 * @param key The key to associate with the value
+	 * @param value The value to insert
+	 */
+	void Insert(const std::string& key, AMFBaseValue* value) {
+		auto element = associative.find(key);
+		if (element != associative.end() && element->second) {
+			delete element->second;
+			element->second = value;
+		} else {
+			associative.insert(std::make_pair(key, value));
+		}
+	};
+
+	/**
+	 * Inserts an AMFValue into the associative portion with the given index.
+	 * If a duplicate is attempted to be inserted, it replaces the original
+	 *
+	 * The inserted element is now owned by this object and is not to be deleted
+	 *
+	 * @param key The key to associate with the value
+	 * @param value The value to insert
+	 */
+	void Insert(const uint32_t index, AMFBaseValue* value) {
+		if (index < dense.size()) {
+			AMFDense::iterator itr = dense.begin() + index;
+			if (*itr) delete dense.at(index);
+		} else {
+			dense.resize(index + 1);
+		}
+		dense.at(index) = value;
+	};
+
+	/**
+	 * Pushes an AMFValue into the back of the dense portion.
+	 *
+	 * These objects are not to be deleted by the caller as they are owned by
+	 * the AMFArray object which manages its own memory.
+	 *
+	 * @param value The value to insert
+	 *
+	 * @return The inserted pointer, or nullptr should the key already be in use.
+	 */
+	template<typename ValueType>
+	inline AMFValue<ValueType>* Push(ValueType value) {
+		return Insert(this->dense.size(), value).first;
+	};
+
+	/**
+	 * Removes the key from the associative portion
+	 *
+	 * The pointer removed is now no longer managed by this container
+	 *
+	 * @param key The key to remove from the associative portion
+	 */
+	void Remove(const std::string& key, bool deleteValue = true) {
+		AMFAssociative::iterator it = this->associative.find(key);
+		if (it != this->associative.end()) {
+			if (deleteValue) delete it->second;
+			this->associative.erase(it);
+		}
+	}
+
+	/**
+	 * Pops the last element in the dense portion, deleting it in the process.
+	 */
+	void Remove(const uint32_t index) {
+		if (!this->dense.empty() && index < this->dense.size()) {
+			auto itr = this->dense.begin() + index;
+			if (*itr) delete (*itr);
+			this->dense.erase(itr);
+		}
+	}
+
+	void Pop() {
+		if (!this->dense.empty()) Remove(this->dense.size() - 1);
+	}
+
+	AMFArrayValue* GetArray(const std::string& key) {
+		AMFAssociative::const_iterator it = this->associative.find(key);
+		if (it != this->associative.end()) {
+			return dynamic_cast<AMFArrayValue*>(it->second);
+		}
+		return nullptr;
+	};
+
+	AMFArrayValue* GetArray(const uint32_t index) {
+		return index >= this->dense.size() ? nullptr : dynamic_cast<AMFArrayValue*>(this->dense.at(index));
+	};
+
+	inline AMFArrayValue* InsertArray(const std::string& key) {
+		return static_cast<AMFArrayValue*>(Insert(key).first);
+	};
+
+	inline AMFArrayValue* InsertArray(const uint32_t index) {
+		return static_cast<AMFArrayValue*>(Insert(index).first);
+	};
+
+	inline AMFArrayValue* PushArray() {
+		return static_cast<AMFArrayValue*>(Insert(this->dense.size()).first);
+	};
+
+	/**
+	 * Gets an AMFValue by the key from the associative portion and converts it
+	 * to the AmfValue template type.  If the key did not exist, it is inserted.
+	 *
+	 * @tparam The target object type
+	 * @param key The key to lookup
+	 *
+	 * @return The AMFValue
+	 */
+	template <typename AmfType>
+	AMFValue<AmfType>* Get(const std::string& key) const {
+		AMFAssociative::const_iterator it = this->associative.find(key);
+		return it != this->associative.end() ?
+			dynamic_cast<AMFValue<AmfType>*>(it->second) :
+			nullptr;
+	};
+
+	// Get from the array but dont cast it
+	AMFBaseValue* Get(const std::string& key) const {
+		AMFAssociative::const_iterator it = this->associative.find(key);
+		return it != this->associative.end() ? it->second : nullptr;
+	};
+
+	/**
+	 * @brief Get an AMFValue object at a position in the dense portion.
+	 * Gets an AMFValue by the index from the dense portion and converts it
+	 * to the AmfValue template type.  If the index did not exist, it is inserted.
+	 *
+	 * @tparam The target object type
+	 * @param index The index to get
+	 * @return The casted object, or nullptr.
+	 */
+	template <typename AmfType>
+	AMFValue<AmfType>* Get(uint32_t index) const {
+		return index < this->dense.size() ?
+			dynamic_cast<AMFValue<AmfType>*>(this->dense.at(index)) :
+			nullptr;
+	};
+
+	// Get from the dense but dont cast it
+	AMFBaseValue* Get(const uint32_t index) const {
+		return index < this->dense.size() ? this->dense.at(index) : nullptr;
+	};
+private:
+	/**
+	 * The associative portion.  These values are key'd with strings to an AMFValue.
+	 */
+	AMFAssociative associative;
+
+	/**
+	 * The dense portion.  These AMFValue's are stored one after
+	 * another with the most recent addition being at the back.
+	 */
+	AMFDense dense;
+};
+
+#endif  //!__AMF3__H__

dCommon/AmfSerialize.cpp

@@ -0,0 +1,184 @@
+#include "AmfSerialize.h"
+
+#include "Game.h"
+#include "dLogger.h"
+
+// Writes an AMFValue pointer to a RakNet::BitStream
+template<>
+void RakNet::BitStream::Write<AMFBaseValue&>(AMFBaseValue& value) {
+	eAmf type = value.GetValueType();
+	this->Write(type);
+	switch (type) {
+	case eAmf::Integer: {
+		this->Write<AMFIntValue&>(*static_cast<AMFIntValue*>(&value));
+		break;
+	}
+
+	case eAmf::Double: {
+		this->Write<AMFDoubleValue&>(*static_cast<AMFDoubleValue*>(&value));
+		break;
+	}
+
+	case eAmf::String: {
+		this->Write<AMFStringValue&>(*static_cast<AMFStringValue*>(&value));
+		break;
+	}
+
+	case eAmf::Array: {
+		this->Write<AMFArrayValue&>(*static_cast<AMFArrayValue*>(&value));
+		break;
+	}
+	default: {
+		Game::logger->Log("AmfSerialize", "Encountered unwritable AMFType %i!", type);
+	}
+	case eAmf::Undefined:
+	case eAmf::Null:
+	case eAmf::False:
+	case eAmf::True:
+	case eAmf::Date:
+	case eAmf::Object:
+	case eAmf::XML:
+	case eAmf::XMLDoc:
+	case eAmf::ByteArray:
+	case eAmf::VectorInt:
+	case eAmf::VectorUInt:
+	case eAmf::VectorDouble:
+	case eAmf::VectorObject:
+	case eAmf::Dictionary:
+		break;
+	}
+}
+
+/**
+ * A private function to write an value to a RakNet::BitStream
+ * RakNet writes in the correct byte order - do not reverse this.
+ */
+void WriteUInt29(RakNet::BitStream* bs, uint32_t v) {
+	unsigned char b4 = (unsigned char)v;
+	if (v < 0x00200000) {
+		b4 = b4 & 0x7F;
+		if (v > 0x7F) {
+			unsigned char b3;
+			v = v >> 7;
+			b3 = ((unsigned char)(v)) | 0x80;
+			if (v > 0x7F) {
+				unsigned char b2;
+				v = v >> 7;
+				b2 = ((unsigned char)(v)) | 0x80;
+				bs->Write(b2);
+			}
+
+			bs->Write(b3);
+		}
+	} else {
+		unsigned char b1;
+		unsigned char b2;
+		unsigned char b3;
+
+		v = v >> 8;
+		b3 = ((unsigned char)(v)) | 0x80;
+		v = v >> 7;
+		b2 = ((unsigned char)(v)) | 0x80;
+		v = v >> 7;
+		b1 = ((unsigned char)(v)) | 0x80;
+
+		bs->Write(b1);
+		bs->Write(b2);
+		bs->Write(b3);
+	}
+
+	bs->Write(b4);
+}
+
+/**
+ * Writes a flag number to a RakNet::BitStream
+ * RakNet writes in the correct byte order - do not reverse this.
+ */
+void WriteFlagNumber(RakNet::BitStream* bs, uint32_t v) {
+	v = (v << 1) | 0x01;
+	WriteUInt29(bs, v);
+}
+
+/**
+ * Writes an AMFString to a RakNet::BitStream
+ *
+ * RakNet writes in the correct byte order - do not reverse this.
+ */
+void WriteAMFString(RakNet::BitStream* bs, const std::string& str) {
+	WriteFlagNumber(bs, (uint32_t)str.size());
+	bs->Write(str.c_str(), (uint32_t)str.size());
+}
+
+/**
+ * Writes an U16 to a bitstream
+ *
+ * RakNet writes in the correct byte order - do not reverse this.
+ */
+void WriteAMFU16(RakNet::BitStream* bs, uint16_t value) {
+	bs->Write(value);
+}
+
+/**
+ * Writes an U32 to a bitstream
+ *
+ * RakNet writes in the correct byte order - do not reverse this.
+ */
+void WriteAMFU32(RakNet::BitStream* bs, uint32_t value) {
+	bs->Write(value);
+}
+
+/**
+ * Writes an U64 to a bitstream
+ *
+ * RakNet writes in the correct byte order - do not reverse this.
+ */
+void WriteAMFU64(RakNet::BitStream* bs, uint64_t value) {
+	bs->Write(value);
+}
+
+// Writes an AMFIntegerValue to BitStream
+template<>
+void RakNet::BitStream::Write<AMFIntValue&>(AMFIntValue& value) {
+	WriteUInt29(this, value.GetValue());
+}
+
+// Writes an AMFDoubleValue to BitStream
+template<>
+void RakNet::BitStream::Write<AMFDoubleValue&>(AMFDoubleValue& value) {
+	double d = value.GetValue();
+	WriteAMFU64(this, *reinterpret_cast<uint64_t*>(&d));
+}
+
+// Writes an AMFStringValue to BitStream
+template<>
+void RakNet::BitStream::Write<AMFStringValue&>(AMFStringValue& value) {
+	WriteAMFString(this, value.GetValue());
+}
+
+// Writes an AMFArrayValue to BitStream
+template<>
+void RakNet::BitStream::Write<AMFArrayValue&>(AMFArrayValue& value) {
+	uint32_t denseSize = value.GetDense().size();
+	WriteFlagNumber(this, denseSize);
+
+	auto it = value.GetAssociative().begin();
+	auto end = value.GetAssociative().end();
+
+	while (it != end) {
+		WriteAMFString(this, it->first);
+		this->Write<AMFBaseValue&>(*it->second);
+		it++;
+	}
+
+	this->Write(eAmf::Null);
+
+	if (denseSize > 0) {
+		auto it2 = value.GetDense().begin();
+		auto end2 = value.GetDense().end();
+
+		while (it2 != end2) {
+			this->Write<AMFBaseValue&>(**it2);
+			it2++;
+		}
+	}
+}

dCommon/AmfSerialize.h

@@ -0,0 +1,50 @@
+#pragma once
+
+// Custom Classes
+#include "Amf3.h"
+
+// RakNet
+#include <BitStream.h>
+
+/*!
+ \file AmfSerialize.h
+ \brief A class that implements native writing of AMF values to RakNet::BitStream
+ */
+
+ // We are using the RakNet namespace
+namespace RakNet {
+	//! Writes an AMFValue pointer to a RakNet::BitStream
+	/*!
+	 \param value The value to write
+	 */
+	template <>
+	void RakNet::BitStream::Write<AMFBaseValue&>(AMFBaseValue& value);
+
+	//! Writes an AMFIntegerValue to a RakNet::BitStream
+	/*!
+	 \param value The value to write
+	 */
+	template <>
+	void RakNet::BitStream::Write<AMFIntValue&>(AMFIntValue& value);
+
+	//! Writes an AMFDoubleValue to a RakNet::BitStream
+	/*!
+	 \param value The value to write
+	 */
+	template <>
+	void RakNet::BitStream::Write<AMFDoubleValue&>(AMFDoubleValue& value);
+
+	//! Writes an AMFStringValue to a RakNet::BitStream
+	/*!
+	 \param value The value to write
+	 */
+	template <>
+	void RakNet::BitStream::Write<AMFStringValue&>(AMFStringValue& value);
+
+	//! Writes an AMFArrayValue to a RakNet::BitStream
+	/*!
+	 \param value The value to write
+	 */
+	template <>
+	void RakNet::BitStream::Write<AMFArrayValue&>(AMFArrayValue& value);
+} // namespace RakNet

dCommon/CMakeLists.txt

@@ -1,6 +1,6 @@
-set(DCOMMON_SOURCES "AMFFormat.cpp"
+set(DCOMMON_SOURCES
 		"AMFDeserialize.cpp"
-		"AMFFormat_BitStream.cpp"
+		"AmfSerialize.cpp"
 		"BinaryIO.cpp"
 		"dConfig.cpp"
 		"Diagnostics.cpp"

dCommon/DluAssert.h

@@ -0,0 +1,12 @@
+#ifndef __DLUASSERT__H__
+#define __DLUASSERT__H__
+
+#include <assert.h>
+
+#ifdef _DEBUG
+#	define DluAssert(expression) assert(expression)
+#else
+#	define DluAssert(expression)
+#endif
+
+#endif  //!__DLUASSERT__H__

dCommon/dEnums/dCommonVars.h

@@ -28,8 +28,10 @@ constexpr uint32_t lowFrameDelta = FRAMES_TO_MS(lowFramerate);
 
 //========== MACROS ===========
 
+#define HEADER_SIZE 8
 #define CBITSTREAM RakNet::BitStream bitStream;
 #define CINSTREAM RakNet::BitStream inStream(packet->data, packet->length, false);
+#define CINSTREAM_SKIP_HEADER CINSTREAM if (inStream.GetNumberOfUnreadBits() >= BYTES_TO_BITS(HEADER_SIZE)) inStream.IgnoreBytes(HEADER_SIZE); else inStream.IgnoreBits(inStream.GetNumberOfUnreadBits());
 #define CMSGHEADER PacketUtils::WriteHeader(bitStream, eConnectionType::CLIENT, eClientMessageType::GAME_MSG);
 #define SEND_PACKET Game::server->Send(&bitStream, sysAddr, false);
 #define SEND_PACKET_BROADCAST Game::server->Send(&bitStream, UNASSIGNED_SYSTEM_ADDRESS, true);

dCommon/dEnums/eGameMessageType.h

@@ -273,7 +273,7 @@ enum class eGameMessageType : uint16_t {
 	TEAM_SET_LEADER = 1557,
 	TEAM_INVITE_CONFIRM = 1558,
 	TEAM_GET_STATUS_RESPONSE = 1559,
-	TEAM_ADD_PLAYER = 1526,
+	TEAM_ADD_PLAYER = 1562,
 	TEAM_REMOVE_PLAYER = 1563,
 	START_CELEBRATION_EFFECT = 1618,
 	ADD_BUFF = 1647,

dCommon/dEnums/eReplicaComponentType.h

@@ -107,7 +107,7 @@ enum class eReplicaComponentType : uint32_t {
 	DONATION_VENDOR,
 	COMBAT_MEDIATOR,
 	COMMENDATION_VENDOR,
-	UNKNOWN_103,
+	GATE_RUSH_CONTROL,
 	RAIL_ACTIVATOR,
 	ROLLER,
 	PLAYER_FORCED_MOVEMENT,
@@ -119,7 +119,7 @@ enum class eReplicaComponentType : uint32_t {
 	UNKNOWN_112,
 	PROPERTY_PLAQUE,
 	BUILD_BORDER,
-	UNKOWN_115,
+	UNKNOWN_115,
 	CULLING_PLANE,
 	DESTROYABLE = 1000 // Actually 7
 };

dDatabase/CDClientDatabase.h

@@ -16,9 +16,6 @@
  // Enable this to cache all entries in each table for fast access, comes with more memory cost
  //#define CDCLIENT_CACHE_ALL
 
- // Enable this to skip some unused columns in some tables
-#define UNUSED(v)
-
 /*!
   \file CDClientDatabase.hpp
   \brief An interface between the CDClient.sqlite file and the server

dDatabase/CDClientManager.cpp

@@ -40,7 +40,7 @@
 
 CDClientManager::CDClientManager() {
 	CDActivityRewardsTable::Instance();
-	UNUSED(CDAnimationsTable::Instance());
+	CDAnimationsTable::Instance();
 	CDBehaviorParameterTable::Instance();
 	CDBehaviorTemplateTable::Instance();
 	CDComponentsRegistryTable::Instance();

dDatabase/CDClientManager.h

@@ -4,6 +4,8 @@
 
 #include "Singleton.h"
 
+#define UNUSED_TABLE(v)
+
 /**
  * Initialize the CDClient tables so they are all loaded into memory.
  */

dDatabase/Tables/CDAnimationsTable.cpp

@@ -1,56 +1,83 @@
 #include "CDAnimationsTable.h"
+#include "GeneralUtils.h"
+#include "Game.h"
 
-CDAnimationsTable::CDAnimationsTable(void) {
+bool CDAnimationsTable::CacheData(CppSQLite3Statement& queryToCache) {
+	auto tableData = queryToCache.execQuery();
+	// If we received a bad lookup, cache it anyways so we do not run the query again.
+	if (tableData.eof()) return false;
 
-	// First, get the size of the table
-	unsigned int size = 0;
-	auto tableSize = CDClientDatabase::ExecuteQuery("SELECT COUNT(*) FROM Animations");
-	while (!tableSize.eof()) {
-		size = tableSize.getIntField(0, 0);
+	do {
+		std::string animation_type = tableData.getStringField("animation_type", "");
+		DluAssert(!animation_type.empty());
+		AnimationGroupID animationGroupID = tableData.getIntField("animationGroupID", -1);
+		DluAssert(animationGroupID != -1);
 
-		tableSize.nextRow();
-	}
-
-	tableSize.finalize();
-
-	// Reserve the size
-	this->entries.reserve(size);
-
-	// Now get the data
-	auto tableData = CDClientDatabase::ExecuteQuery("SELECT * FROM Animations");
-	while (!tableData.eof()) {
-		CDAnimations entry;
-		entry.animationGroupID = tableData.getIntField("animationGroupID", -1);
-		entry.animation_type = tableData.getStringField("animation_type", "");
+		CDAnimation entry;
 		entry.animation_name = tableData.getStringField("animation_name", "");
-		entry.chance_to_play = tableData.getFloatField("chance_to_play", -1.0f);
-		entry.min_loops = tableData.getIntField("min_loops", -1);
-		entry.max_loops = tableData.getIntField("max_loops", -1);
-		entry.animation_length = tableData.getFloatField("animation_length", -1.0f);
-		entry.hideEquip = tableData.getIntField("hideEquip", -1) == 1 ? true : false;
-		entry.ignoreUpperBody = tableData.getIntField("ignoreUpperBody", -1) == 1 ? true : false;
-		entry.restartable = tableData.getIntField("restartable", -1) == 1 ? true : false;
-		entry.face_animation_name = tableData.getStringField("face_animation_name", "");
-		entry.priority = tableData.getFloatField("priority", -1.0f);
-		entry.blendTime = tableData.getFloatField("blendTime", -1.0f);
+		entry.chance_to_play = tableData.getFloatField("chance_to_play", 1.0f);
+		UNUSED_COLUMN(entry.min_loops = tableData.getIntField("min_loops", 0);)
+		UNUSED_COLUMN(entry.max_loops = tableData.getIntField("max_loops", 0);)
+		entry.animation_length = tableData.getFloatField("animation_length", 0.0f);
+		UNUSED_COLUMN(entry.hideEquip = tableData.getIntField("hideEquip", 0) == 1;)
+		UNUSED_COLUMN(entry.ignoreUpperBody = tableData.getIntField("ignoreUpperBody", 0) == 1;)
+		UNUSED_COLUMN(entry.restartable = tableData.getIntField("restartable", 0) == 1;)
+		UNUSED_COLUMN(entry.face_animation_name = tableData.getStringField("face_animation_name", "");)
+		UNUSED_COLUMN(entry.priority = tableData.getFloatField("priority", 0.0f);)
+		UNUSED_COLUMN(entry.blendTime = tableData.getFloatField("blendTime", 0.0f);)
 
-		this->entries.push_back(entry);
+		this->animations[CDAnimationKey(animation_type, animationGroupID)].push_back(entry);
 		tableData.nextRow();
-	}
+	} while (!tableData.eof());
 
 	tableData.finalize();
+
+	return true;
 }
 
-std::vector<CDAnimations> CDAnimationsTable::Query(std::function<bool(CDAnimations)> predicate) {
-
-	std::vector<CDAnimations> data = cpplinq::from(this->entries)
-		>> cpplinq::where(predicate)
-		>> cpplinq::to_vector();
-
-	return data;
+void CDAnimationsTable::CacheAnimations(const CDAnimationKey animationKey) {
+	auto query = CDClientDatabase::CreatePreppedStmt("SELECT * FROM Animations WHERE animationGroupID = ? and animation_type = ?");
+	query.bind(1, static_cast<int32_t>(animationKey.second));
+	query.bind(2, animationKey.first.c_str());
+	// If we received a bad lookup, cache it anyways so we do not run the query again.
+	if (!CacheData(query)) {
+		this->animations[animationKey];
+	}
 }
 
-std::vector<CDAnimations> CDAnimationsTable::GetEntries(void) const {
-	return this->entries;
+void CDAnimationsTable::CacheAnimationGroup(AnimationGroupID animationGroupID) {
+	auto animationEntryCached = this->animations.find(CDAnimationKey("", animationGroupID));
+	if (animationEntryCached != this->animations.end()) {
+		return;
 	}
 
+	auto query = CDClientDatabase::CreatePreppedStmt("SELECT * FROM Animations WHERE animationGroupID = ?");
+	query.bind(1, static_cast<int32_t>(animationGroupID));
+
+	// Cache the query so we don't run the query again.
+	CacheData(query);
+	this->animations[CDAnimationKey("", animationGroupID)];
+}
+
+CDAnimationLookupResult CDAnimationsTable::GetAnimation(const AnimationID& animationType, const std::string& previousAnimationName, const AnimationGroupID animationGroupID) {
+	CDAnimationKey animationKey(animationType, animationGroupID);
+	auto animationEntryCached = this->animations.find(animationKey);
+	if (animationEntryCached == this->animations.end()) {
+		this->CacheAnimations(animationKey);
+	}
+
+	auto animationEntry = this->animations.find(animationKey);
+	// If we have only one animation, return it regardless of the chance to play.
+	if (animationEntry->second.size() == 1) {
+		return CDAnimationLookupResult(animationEntry->second.front());
+	}
+	auto randomAnimation = GeneralUtils::GenerateRandomNumber<float>(0, 1);
+
+	for (auto& animationEntry : animationEntry->second) {
+		randomAnimation -= animationEntry.chance_to_play;
+		// This is how the client gets the random animation.
+		if (animationEntry.animation_name != previousAnimationName && randomAnimation <= 0.0f) return CDAnimationLookupResult(animationEntry);
+	}
+
+	return CDAnimationLookupResult();
+}

dDatabase/Tables/CDAnimationsTable.h

@@ -1,33 +1,66 @@
 #pragma once
 
-// Custom Classes
 #include "CDTable.h"
+#include <list>
 
-struct CDAnimations {
-	unsigned int animationGroupID;          //!< The animation group ID
-	std::string animation_type;        //!< The animation type
+struct CDAnimation {
+	// unsigned int animationGroupID;
+	// std::string animation_type;
+	// The above two are a pair to represent a primary key in the map.
 	std::string animation_name;        //!< The animation name
 	float chance_to_play;           //!< The chance to play the animation
-	unsigned int min_loops;                 //!< The minimum number of loops
-	unsigned int max_loops;                 //!< The maximum number of loops
+	UNUSED_COLUMN(unsigned int min_loops;)                 //!< The minimum number of loops
+	UNUSED_COLUMN(unsigned int max_loops;)                 //!< The maximum number of loops
 	float animation_length;         //!< The animation length
-	bool hideEquip;                 //!< Whether or not to hide the equip
-	bool ignoreUpperBody;           //!< Whether or not to ignore the upper body
-	bool restartable;               //!< Whether or not the animation is restartable
-	std::string face_animation_name;   //!< The face animation name
-	float priority;                 //!< The priority
-	float blendTime;                //!< The blend time
+	UNUSED_COLUMN(bool hideEquip;)                 //!< Whether or not to hide the equip
+	UNUSED_COLUMN(bool ignoreUpperBody;)           //!< Whether or not to ignore the upper body
+	UNUSED_COLUMN(bool restartable;)               //!< Whether or not the animation is restartable
+	UNUSED_COLUMN(std::string face_animation_name;)   //!< The face animation name
+	UNUSED_COLUMN(float priority;)                 //!< The priority
+	UNUSED_COLUMN(float blendTime;)                //!< The blend time
 };
 
+typedef LookupResult<CDAnimation> CDAnimationLookupResult;
 
 class CDAnimationsTable : public CDTable<CDAnimationsTable> {
-private:
-	std::vector<CDAnimations> entries;
-
+	typedef int32_t AnimationGroupID;
+	typedef std::string AnimationID;
+	typedef std::pair<std::string, AnimationGroupID> CDAnimationKey;
 public:
-	CDAnimationsTable();
-	// Queries the table with a custom "where" clause
-	std::vector<CDAnimations> Query(std::function<bool(CDAnimations)> predicate);
+	/**
+	 * Given an animationType and the previousAnimationName played, return the next animationType to play.
+	 * If there are more than 1 animationTypes that can be played, one is selected at random but also does not allow
+	 * the previousAnimationName to be played twice.
+	 * 
+	 * @param animationType The animationID to lookup
+	 * @param previousAnimationName The previously played animation
+	 * @param animationGroupID The animationGroupID to lookup
+	 * @return CDAnimationLookupResult 
+	 */
+	[[nodiscard]] CDAnimationLookupResult GetAnimation(const AnimationID& animationType, const std::string& previousAnimationName, const AnimationGroupID animationGroupID);
 
-	std::vector<CDAnimations> GetEntries(void) const;
+	/**
+	 * Cache a full AnimationGroup by its ID.
+	 */
+	void CacheAnimationGroup(AnimationGroupID animationGroupID);
+private:
+
+	/**
+	 * Cache all animations given a premade key
+	 */
+	void CacheAnimations(const CDAnimationKey animationKey);
+
+	/**
+	 * Run the query responsible for caching the data.
+	 * @param queryToCache 
+	 * @return true 
+	 * @return false 
+	 */
+	bool CacheData(CppSQLite3Statement& queryToCache);
+
+	/**
+	 * Each animation is key'd by its animationName and its animationGroupID.  Each
+	 * animation has a possible list of animations.  This is because there can be animations have a percent chance to play so one is selected at random.
+	 */
+	std::map<CDAnimationKey, std::list<CDAnimation>> animations;
 };

dDatabase/Tables/CDTable.h

@@ -2,6 +2,7 @@
 
 #include "CDClientDatabase.h"
 #include "Singleton.h"
+#include "DluAssert.h"
 
 #include <functional>
 #include <string>
@@ -15,6 +16,12 @@
 #endif
 #include "cpplinq.hpp"
 
+// Used for legacy
+#define UNUSED(x)
+
+// Enable this to skip some unused columns in some tables
+#define UNUSED_COLUMN(v)
+
 #pragma warning (disable : 4244) //Disable double to float conversion warnings
 #pragma warning (disable : 4715) //Disable "not all control paths return a value"
 
@@ -23,3 +30,15 @@ class CDTable : public Singleton<Table> {
 protected:
 	virtual ~CDTable() = default;
 };
+
+template<class T>
+class LookupResult {
+	typedef std::pair<T, bool> DataType;
+public:
+	LookupResult() { m_data.first = T(); m_data.second = false; };
+	LookupResult(T& data) { m_data.first = data; m_data.second = true; };
+	inline const T& Data() { return m_data.first; };
+	inline const bool& FoundData() { return m_data.second; };
+private:
+	DataType m_data;
+};

dGame/Entity.cpp

@@ -386,8 +386,8 @@ void Entity::Initialize() {
 						comp->SetMaxCoins(currencyValues[0].maxvalue);
 					}
 
-					// extraInfo overrides
-					comp->SetIsSmashable(GetVarAs<int32_t>(u"is_smashable") != 0);
+					// extraInfo overrides. Client ORs the database smashable and the luz smashable.
+					comp->SetIsSmashable(comp->GetIsSmashable() | (GetVarAs<int32_t>(u"is_smashable") != 0));
 				}
 			} else {
 				comp->SetHealth(1);
@@ -595,8 +595,9 @@ void Entity::Initialize() {
 		m_Components.insert(std::make_pair(eReplicaComponentType::BOUNCER, comp));
 	}
 
-	if ((compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::RENDER) > 0 && m_TemplateID != 2365) || m_Character) {
-		RenderComponent* render = new RenderComponent(this);
+	int32_t renderComponentId = compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::RENDER);
+	if ((renderComponentId > 0 && m_TemplateID != 2365) || m_Character) {
+		RenderComponent* render = new RenderComponent(this, renderComponentId);
 		m_Components.insert(std::make_pair(eReplicaComponentType::RENDER, render));
 	}
 
@@ -707,6 +708,13 @@ void Entity::Initialize() {
 				// TODO: create movementAIcomp and set path
 			}
 		}*/
+	} else {
+		// else we still need to setup moving platform if it has a moving platform comp but no path
+		int32_t movingPlatformComponentId = compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::MOVING_PLATFORM, -1);
+		if (movingPlatformComponentId >= 0) {
+			MovingPlatformComponent* plat = new MovingPlatformComponent(this, pathName);
+			m_Components.insert(std::make_pair(eReplicaComponentType::MOVING_PLATFORM, plat));
+		}
 	}
 
 	int proximityMonitorID = compRegistryTable->GetByIDAndType(m_TemplateID, eReplicaComponentType::PROXIMITY_MONITOR);
@@ -1485,6 +1493,12 @@ void Entity::OnChoiceBoxResponse(Entity* sender, int32_t button, const std::u16s
 	}
 }
 
+void Entity::RequestActivityExit(Entity* sender, LWOOBJID player, bool canceled) {
+	for (CppScripts::Script* script : CppScripts::GetEntityScripts(this)) {
+		script->OnRequestActivityExit(sender, player, canceled);
+	}
+}
+
 void Entity::Smash(const LWOOBJID source, const eKillType killType, const std::u16string& deathType) {
 	if (!m_PlayerIsReadyForUpdates) return;
 
@@ -1813,8 +1827,6 @@ bool Entity::IsSleeping() const {
 
 
 const NiPoint3& Entity::GetPosition() const {
-	if (!this) return NiPoint3::ZERO;
-
 	auto* controllable = GetComponent<ControllablePhysicsComponent>();
 
 	if (controllable != nullptr) {

dGame/Entity.h

@@ -207,6 +207,7 @@ public:
 
 	void OnMessageBoxResponse(Entity* sender, int32_t button, const std::u16string& identifier, const std::u16string& userData);
 	void OnChoiceBoxResponse(Entity* sender, int32_t button, const std::u16string& buttonIdentifier, const std::u16string& identifier);
+	void RequestActivityExit(Entity* sender, LWOOBJID player, bool canceled);
 
 	void Smash(const LWOOBJID source = LWOOBJID_EMPTY, const eKillType killType = eKillType::VIOLENT, const std::u16string& deathType = u"");
 	void Kill(Entity* murderer = nullptr);

dGame/EntityManager.cpp

@@ -161,9 +161,7 @@ void EntityManager::DestroyEntity(const LWOOBJID& objectID) {
 }
 
 void EntityManager::DestroyEntity(Entity* entity) {
-	if (entity == nullptr) {
-		return;
-	}
+	if (!entity) return;
 
 	entity->TriggerEvent(eTriggerEventType::DESTROY, entity);
 
@@ -182,15 +180,11 @@ void EntityManager::DestroyEntity(Entity* entity) {
 	ScheduleForDeletion(id);
 }
 
-void EntityManager::UpdateEntities(const float deltaTime) {
-	for (const auto& e : m_Entities) {
-		e.second->Update(deltaTime);
-	}
-
+void EntityManager::SerializeEntities() {
 	for (auto entry = m_EntitiesToSerialize.begin(); entry != m_EntitiesToSerialize.end(); entry++) {
 		auto* entity = GetEntity(*entry);
 
-		if (entity == nullptr) continue;
+		if (!entity) continue;
 
 		m_SerializationCounter++;
 
@@ -212,11 +206,16 @@ void EntityManager::UpdateEntities(const float deltaTime) {
 		}
 	}
 	m_EntitiesToSerialize.clear();
+}
 
+void EntityManager::KillEntities() {
 	for (auto entry = m_EntitiesToKill.begin(); entry != m_EntitiesToKill.end(); entry++) {
 		auto* entity = GetEntity(*entry);
 
-		if (!entity) continue;
+		if (!entity) {
+			Game::logger->Log("EntityManager", "Attempting to kill null entity %llu", *entry);
+			continue;
+		}
 
 		if (entity->GetScheduledKiller()) {
 			entity->Smash(entity->GetScheduledKiller()->GetObjectID(), eKillType::SILENT);
@@ -225,32 +224,41 @@ void EntityManager::UpdateEntities(const float deltaTime) {
 		}
 	}
 	m_EntitiesToKill.clear();
+}
 
+void EntityManager::DeleteEntities() {
 	for (auto entry = m_EntitiesToDelete.begin(); entry != m_EntitiesToDelete.end(); entry++) {
-
-		// Get all this info first before we delete the player.
 		auto entityToDelete = GetEntity(*entry);
+		if (entityToDelete) {
+			// Get all this info first before we delete the player.
 			auto networkIdToErase = entityToDelete->GetNetworkId();
 			const auto& ghostingToDelete = std::find(m_EntitiesToGhost.begin(), m_EntitiesToGhost.end(), entityToDelete);
 
-		if (entityToDelete) {
-			// If we are a player run through the player destructor.
-			if (entityToDelete->IsPlayer()) {
-				delete dynamic_cast<Player*>(entityToDelete);
-			} else {
 			delete entityToDelete;
-			}
+
 			entityToDelete = nullptr;
+
 			if (networkIdToErase != 0) m_LostNetworkIds.push(networkIdToErase);
-		}
 
 			if (ghostingToDelete != m_EntitiesToGhost.end()) m_EntitiesToGhost.erase(ghostingToDelete);
-
+		} else {
+			Game::logger->Log("EntityManager", "Attempted to delete non-existent entity %llu", *entry);
+		}
 		m_Entities.erase(*entry);
 	}
 	m_EntitiesToDelete.clear();
 }
 
+void EntityManager::UpdateEntities(const float deltaTime) {
+	for (const auto& e : m_Entities) {
+		e.second->Update(deltaTime);
+	}
+
+	SerializeEntities();
+	KillEntities();
+	DeleteEntities();
+}
+
 Entity* EntityManager::GetEntity(const LWOOBJID& objectId) const {
 	const auto& index = m_Entities.find(objectId);
 
@@ -316,6 +324,11 @@ const std::unordered_map<std::string, LWOOBJID>& EntityManager::GetSpawnPointEnt
 }
 
 void EntityManager::ConstructEntity(Entity* entity, const SystemAddress& sysAddr, const bool skipChecks) {
+	if (!entity) {
+		Game::logger->Log("EntityManager", "Attempted to construct null entity");
+		return;
+	}
+
 	if (entity->GetNetworkId() == 0) {
 		uint16_t networkId;
 
@@ -395,9 +408,7 @@ void EntityManager::ConstructAllEntities(const SystemAddress& sysAddr) {
 }
 
 void EntityManager::DestructEntity(Entity* entity, const SystemAddress& sysAddr) {
-	if (entity->GetNetworkId() == 0) {
-		return;
-	}
+	if (!entity || entity->GetNetworkId() == 0) return;
 
 	RakNet::BitStream stream;
 
@@ -414,9 +425,7 @@ void EntityManager::DestructEntity(Entity* entity, const SystemAddress& sysAddr)
 }
 
 void EntityManager::SerializeEntity(Entity* entity) {
-	if (entity->GetNetworkId() == 0) {
-		return;
-	}
+	if (!entity || entity->GetNetworkId() == 0) return;
 
 	if (std::find(m_EntitiesToSerialize.begin(), m_EntitiesToSerialize.end(), entity->GetObjectID()) == m_EntitiesToSerialize.end()) {
 		m_EntitiesToSerialize.push_back(entity->GetObjectID());

dGame/EntityManager.h

@@ -85,6 +85,10 @@ public:
 	const uint32_t GetHardcoreUscoreEnemiesMultiplier() { return m_HardcoreUscoreEnemiesMultiplier; };
 
 private:
+	void SerializeEntities();
+	void KillEntities();
+	void DeleteEntities();
+
 	static EntityManager* m_Address; //For singleton method
 	static std::vector<LWOMAPID> m_GhostingExcludedZones;
 	static std::vector<LOT> m_GhostingExcludedLOTs;

dGame/dBehaviors/Behavior.cpp

@@ -61,6 +61,7 @@
 #include "SpeedBehavior.h"
 #include "DamageReductionBehavior.h"
 #include "JetPackBehavior.h"
+#include "FallSpeedBehavior.h"
 #include "ChangeIdleFlagsBehavior.h"
 #include "DarkInspirationBehavior.h"
 
@@ -164,7 +165,9 @@ Behavior* Behavior::CreateBehavior(const uint32_t behaviorId) {
 	case BehaviorTemplates::BEHAVIOR_CAR_BOOST:
 		behavior = new CarBoostBehavior(behaviorId);
 		break;
-	case BehaviorTemplates::BEHAVIOR_FALL_SPEED: break;
+	case BehaviorTemplates::BEHAVIOR_FALL_SPEED:
+		behavior = new FallSpeedBehavior(behaviorId);
+		break;
 	case BehaviorTemplates::BEHAVIOR_SHIELD: break;
 	case BehaviorTemplates::BEHAVIOR_REPAIR_ARMOR:
 		behavior = new RepairBehavior(behaviorId);

dGame/dBehaviors/CMakeLists.txt

@@ -22,6 +22,7 @@ set(DGAME_DBEHAVIORS_SOURCES "AirMovementBehavior.cpp"
 	"DurationBehavior.cpp"
 	"EmptyBehavior.cpp"
 	"EndBehavior.cpp"
+	"FallSpeedBehavior.cpp"
 	"ForceMovementBehavior.cpp"
 	"HealBehavior.cpp"
 	"ImaginationBehavior.cpp"

dGame/dBehaviors/FallSpeedBehavior.cpp

@@ -0,0 +1,50 @@
+#include "FallSpeedBehavior.h"
+
+#include "ControllablePhysicsComponent.h"
+#include "BehaviorContext.h"
+#include "BehaviorBranchContext.h"
+
+
+void FallSpeedBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
+	// make sure required parameter has non-default value
+	if (m_PercentSlowed == 0.0f) return;
+	auto* target = EntityManager::Instance()->GetEntity(branch.target);
+	if (!target) return;
+
+	auto* controllablePhysicsComponent = target->GetComponent<ControllablePhysicsComponent>();
+	if (!controllablePhysicsComponent) return;
+	controllablePhysicsComponent->SetGravityScale(m_PercentSlowed);
+	EntityManager::Instance()->SerializeEntity(target);
+
+	if (branch.duration > 0.0f) {
+		context->RegisterTimerBehavior(this, branch);
+	} else if (branch.start > 0) {
+		context->RegisterEndBehavior(this, branch);
+	}
+}
+
+void FallSpeedBehavior::Calculate(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) {
+	Handle(context, bitStream, branch);
+}
+
+void FallSpeedBehavior::Timer(BehaviorContext* context, BehaviorBranchContext branch, LWOOBJID second) {
+	End(context, branch, second);
+}
+
+void FallSpeedBehavior::UnCast(BehaviorContext* context, BehaviorBranchContext branch) {
+	End(context, branch, LWOOBJID_EMPTY);
+}
+
+void FallSpeedBehavior::End(BehaviorContext* context, BehaviorBranchContext branch, LWOOBJID second) {
+	auto* target = EntityManager::Instance()->GetEntity(branch.target);
+	if (!target) return;
+
+	auto* controllablePhysicsComponent = target->GetComponent<ControllablePhysicsComponent>();
+	if (!controllablePhysicsComponent) return;
+	controllablePhysicsComponent->SetGravityScale(1);
+	EntityManager::Instance()->SerializeEntity(target);
+}
+
+void FallSpeedBehavior::Load(){
+	m_PercentSlowed = GetFloat("percent_slowed");
+}

dGame/dBehaviors/FallSpeedBehavior.h

@@ -0,0 +1,18 @@
+#pragma once
+#include "Behavior.h"
+
+class FallSpeedBehavior final : public Behavior
+{
+public:
+	explicit FallSpeedBehavior(const uint32_t behaviorId) : Behavior(behaviorId) {}
+
+	void Handle(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) override;
+	void Calculate(BehaviorContext* context, RakNet::BitStream* bitStream, BehaviorBranchContext branch) override;
+	void Timer(BehaviorContext* context, BehaviorBranchContext branch, LWOOBJID second) override;
+	void End(BehaviorContext* context, BehaviorBranchContext branch, LWOOBJID second) override;
+	void UnCast(BehaviorContext* context, BehaviorBranchContext branch) override;
+	void Load() override;
+
+private:
+	float m_PercentSlowed;
+};

dGame/dBehaviors/SwitchBehavior.cpp

@@ -30,7 +30,7 @@ void SwitchBehavior::Handle(BehaviorContext* context, RakNet::BitStream* bitStre
 
 	Game::logger->LogDebug("SwitchBehavior", "[%i] State: (%d), imagination: (%i) / (%f)", entity->GetLOT(), state, destroyableComponent->GetImagination(), destroyableComponent->GetMaxImagination());
 
-	if (state || (entity->GetLOT() == 8092 && destroyableComponent->GetImagination() >= m_imagination)) {
+	if (state) {
 		this->m_actionTrue->Handle(context, bitStream, branch);
 	} else {
 		this->m_actionFalse->Handle(context, bitStream, branch);

dGame/dComponents/CharacterComponent.cpp

@@ -13,7 +13,7 @@
 #include "VehiclePhysicsComponent.h"
 #include "GameMessages.h"
 #include "Item.h"
-#include "AMFFormat.h"
+#include "Amf3.h"
 #include "eGameMasterLevel.h"
 #include "eGameActivity.h"
 
@@ -734,6 +734,6 @@ void CharacterComponent::RemoveVentureVisionEffect(std::string ventureVisionType
 void CharacterComponent::UpdateClientMinimap(bool showFaction, std::string ventureVisionType) const {
 	if (!m_Parent) return;
 	AMFArrayValue arrayToSend;
-	arrayToSend.InsertValue(ventureVisionType, showFaction ? static_cast<AMFValue*>(new AMFTrueValue()) : static_cast<AMFValue*>(new AMFFalseValue()));
-	GameMessages::SendUIMessageServerToSingleClient(m_Parent, m_Parent ? m_Parent->GetSystemAddress() : UNASSIGNED_SYSTEM_ADDRESS, "SetFactionVisibility", &arrayToSend);
+	arrayToSend.Insert(ventureVisionType, showFaction);
+	GameMessages::SendUIMessageServerToSingleClient(m_Parent, m_Parent ? m_Parent->GetSystemAddress() : UNASSIGNED_SYSTEM_ADDRESS, "SetFactionVisibility", arrayToSend);
 }

dGame/dComponents/ControllablePhysicsComponent.cpp

@@ -320,7 +320,7 @@ void ControllablePhysicsComponent::RemoveSpeedboost(float value) {
 
 	// Recalculate speedboost since we removed one
 	m_SpeedBoost = 0.0f;
-	if (m_ActiveSpeedBoosts.size() == 0) { // no active speed boosts left, so return to base speed
+	if (m_ActiveSpeedBoosts.empty()) { // no active speed boosts left, so return to base speed
 		auto* levelProgressionComponent = m_Parent->GetComponent<LevelProgressionComponent>();
 		if (levelProgressionComponent) m_SpeedBoost = levelProgressionComponent->GetSpeedBase();
 	} else { // Used the last applied speedboost

dGame/dComponents/ControllablePhysicsComponent.h

@@ -276,7 +276,7 @@ public:
 	 * The speed boosts of this component.
 	 * @return All active Speed boosts for this component.
 	 */
-	std::vector<float> GetActiveSpeedboosts() { return m_ActivePickupRadiusScales; };
+	std::vector<float> GetActiveSpeedboosts() { return m_ActiveSpeedBoosts; };
 
 	/**
 	* Activates the Bubble Buff

dGame/dComponents/DestroyableComponent.cpp

@@ -4,8 +4,8 @@
 #include "Game.h"
 #include "dConfig.h"
 
-#include "AMFFormat.h"
-#include "AMFFormat_BitStream.h"
+#include "Amf3.h"
+#include "AmfSerialize.h"
 #include "GameMessages.h"
 #include "User.h"
 #include "CDClientManager.h"
@@ -51,7 +51,7 @@ DestroyableComponent::DestroyableComponent(Entity* parent) : Component(parent) {
 	m_IsGMImmune = false;
 	m_IsShielded = false;
 	m_DamageToAbsorb = 0;
-	m_HasBricks = false;
+	m_IsModuleAssembly = m_Parent->HasComponent(eReplicaComponentType::MODULE_ASSEMBLY);
 	m_DirtyThreatList = false;
 	m_HasThreats = false;
 	m_ExplodeFactor = 1.0f;
@@ -163,7 +163,7 @@ void DestroyableComponent::Serialize(RakNet::BitStream* outBitStream, bool bIsIn
 			outBitStream->Write(m_IsSmashed);
 
 			if (m_IsSmashable) {
-				outBitStream->Write(m_HasBricks);
+				outBitStream->Write(m_IsModuleAssembly);
 				outBitStream->Write(m_ExplodeFactor != 1.0f);
 				if (m_ExplodeFactor != 1.0f) outBitStream->Write(m_ExplodeFactor);
 			}
@@ -245,16 +245,12 @@ void DestroyableComponent::SetMaxHealth(float value, bool playAnim) {
 	if (playAnim) {
 		// Now update the player bar
 		if (!m_Parent->GetParentUser()) return;
-		AMFStringValue* amount = new AMFStringValue();
-		amount->SetStringValue(std::to_string(difference));
-		AMFStringValue* type = new AMFStringValue();
-		type->SetStringValue("health");
 
 		AMFArrayValue args;
-		args.InsertValue("amount", amount);
-		args.InsertValue("type", type);
+		args.Insert("amount", std::to_string(difference));
+		args.Insert("type", "health");
 
-		GameMessages::SendUIMessageServerToSingleClient(m_Parent, m_Parent->GetParentUser()->GetSystemAddress(), "MaxPlayerBarUpdate", &args);
+		GameMessages::SendUIMessageServerToSingleClient(m_Parent, m_Parent->GetParentUser()->GetSystemAddress(), "MaxPlayerBarUpdate", args);
 	}
 
 	EntityManager::Instance()->SerializeEntity(m_Parent);
@@ -290,16 +286,12 @@ void DestroyableComponent::SetMaxArmor(float value, bool playAnim) {
 	if (playAnim) {
 		// Now update the player bar
 		if (!m_Parent->GetParentUser()) return;
-		AMFStringValue* amount = new AMFStringValue();
-		amount->SetStringValue(std::to_string(value));
-		AMFStringValue* type = new AMFStringValue();
-		type->SetStringValue("armor");
 
 		AMFArrayValue args;
-		args.InsertValue("amount", amount);
-		args.InsertValue("type", type);
+		args.Insert("amount", std::to_string(value));
+		args.Insert("type", "armor");
 
-		GameMessages::SendUIMessageServerToSingleClient(m_Parent, m_Parent->GetParentUser()->GetSystemAddress(), "MaxPlayerBarUpdate", &args);
+		GameMessages::SendUIMessageServerToSingleClient(m_Parent, m_Parent->GetParentUser()->GetSystemAddress(), "MaxPlayerBarUpdate", args);
 	}
 
 	EntityManager::Instance()->SerializeEntity(m_Parent);
@@ -334,16 +326,12 @@ void DestroyableComponent::SetMaxImagination(float value, bool playAnim) {
 	if (playAnim) {
 		// Now update the player bar
 		if (!m_Parent->GetParentUser()) return;
-		AMFStringValue* amount = new AMFStringValue();
-		amount->SetStringValue(std::to_string(difference));
-		AMFStringValue* type = new AMFStringValue();
-		type->SetStringValue("imagination");
 
 		AMFArrayValue args;
-		args.InsertValue("amount", amount);
-		args.InsertValue("type", type);
+		args.Insert("amount", std::to_string(difference));
+		args.Insert("type", "imagination");
 
-		GameMessages::SendUIMessageServerToSingleClient(m_Parent, m_Parent->GetParentUser()->GetSystemAddress(), "MaxPlayerBarUpdate", &args);
+		GameMessages::SendUIMessageServerToSingleClient(m_Parent, m_Parent->GetParentUser()->GetSystemAddress(), "MaxPlayerBarUpdate", args);
 	}
 	EntityManager::Instance()->SerializeEntity(m_Parent);
 }

dGame/dComponents/DestroyableComponent.h

@@ -239,7 +239,7 @@ public:
 	 * Returns whether or not this entity has bricks flying out when smashed
 	 * @return whether or not this entity has bricks flying out when smashed
 	 */
-	bool GetHasBricks() const { return m_HasBricks; }
+	bool GetHasBricks() const { return m_IsModuleAssembly; }
 
 	/**
 	 * Sets the multiplier for the explosion that's visible when the bricks fly out when this entity is smashed
@@ -546,7 +546,7 @@ private:
 	/**
 	 * Whether this entity has bricks flying out when smashed (causes the client to look up the files)
 	 */
-	bool m_HasBricks;
+	bool m_IsModuleAssembly;
 
 	/**
 	 * The rate at which bricks fly out when smashed

dGame/dComponents/InventoryComponent.cpp

@@ -1002,7 +1002,6 @@ void InventoryComponent::HandlePossession(Item* item) {
 	// Setup the destroyable stats
 	auto* destroyableComponent = mount->GetComponent<DestroyableComponent>();
 	if (destroyableComponent) {
-		destroyableComponent->SetIsSmashable(false);
 		destroyableComponent->SetIsImmune(true);
 	}
 

dGame/dComponents/MissionComponent.cpp

@@ -13,7 +13,7 @@
 #include "InventoryComponent.h"
 #include "GameMessages.h"
 #include "Game.h"
-#include "AMFFormat.h"
+#include "Amf3.h"
 #include "dZoneManager.h"
 #include "Mail.h"
 #include "MissionPrerequisites.h"

dGame/dComponents/MovementAIComponent.cpp

@@ -307,13 +307,14 @@ float MovementAIComponent::GetBaseSpeed(LOT lot) {
 
 foundComponent:
 
-	float speed;
+	// Client defaults speed to 10 and if the speed is also null in the table, it defaults to 10.
+	float speed = 10.0f;
 
-	if (physicsComponent == nullptr) {
-		speed = 8;
-	} else {
-		speed = physicsComponent->speed;
-	}
+	if (physicsComponent) speed = physicsComponent->speed;
+
+	float delta = fabs(speed) - 1.0f;
+
+	if (delta <= std::numeric_limits<float>::epsilon()) speed = 10.0f;
 
 	m_PhysicsSpeedCache[lot] = speed;
 

dGame/dComponents/PetComponent.cpp

@@ -26,6 +26,7 @@
 #include "Database.h"
 #include "EntityInfo.h"
 #include "eMissionTaskType.h"
+#include "RenderComponent.h"
 #include "eObjectBits.h"
 #include "eGameMasterLevel.h"
 
@@ -530,7 +531,7 @@ void PetComponent::NotifyTamingBuildSuccess(NiPoint3 position) {
 	}
 
 	GameMessages::SendPlayFXEffect(tamer, -1, u"petceleb", "", LWOOBJID_EMPTY, 1, 1, true);
-	GameMessages::SendPlayAnimation(tamer, u"rebuild-celebrate");
+	RenderComponent::PlayAnimation(tamer, u"rebuild-celebrate");
 
 	EntityInfo info{};
 	info.lot = cached->second.puzzleModelLot;

dGame/dComponents/PropertyEntranceComponent.cpp

@@ -11,7 +11,7 @@
 #include "CharacterComponent.h"
 #include "UserManager.h"
 #include "dLogger.h"
-#include "AMFFormat.h"
+#include "Amf3.h"
 #include "eObjectBits.h"
 #include "eGameMasterLevel.h"
 
@@ -36,12 +36,9 @@ void PropertyEntranceComponent::OnUse(Entity* entity) {
 
 	AMFArrayValue args;
 
-	auto* state = new AMFStringValue();
-	state->SetStringValue("property_menu");
+	args.Insert("state", "property_menu");
 
-	args.InsertValue("state", state);
-
-	GameMessages::SendUIMessageServerToSingleClient(entity, entity->GetSystemAddress(), "pushGameState", &args);
+	GameMessages::SendUIMessageServerToSingleClient(entity, entity->GetSystemAddress(), "pushGameState", args);
 }
 
 void PropertyEntranceComponent::OnEnterProperty(Entity* entity, uint32_t index, bool returnToZone, const SystemAddress& sysAddr) {

dGame/dComponents/RacingControlComponent.cpp

@@ -23,6 +23,8 @@
 #include "dConfig.h"
 #include "Loot.h"
 #include "eMissionTaskType.h"
+#include "dZoneManager.h"
+#include "CDActivitiesTable.h"
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846264338327950288
@@ -45,36 +47,14 @@ RacingControlComponent::RacingControlComponent(Entity* parent)
 	m_EmptyTimer = 0;
 	m_SoloRacing = Game::config->GetValue("solo_racing") == "1";
 
-	// Select the main world ID as fallback when a player fails to load.
-
+	m_MainWorld = 1200;
 	const auto worldID = Game::server->GetZoneID();
+	if (dZoneManager::Instance()->CheckIfAccessibleZone((worldID/10)*10)) m_MainWorld = (worldID/10)*10;
 
-	switch (worldID) {
-	case 1203:
 	m_ActivityID = 42;
-		m_MainWorld = 1200;
-		break;
-
-	case 1261:
-		m_ActivityID = 60;
-		m_MainWorld = 1260;
-		break;
-
-	case 1303:
-		m_ActivityID = 39;
-		m_MainWorld = 1300;
-		break;
-
-	case 1403:
-		m_ActivityID = 54;
-		m_MainWorld = 1400;
-		break;
-
-	default:
-		m_ActivityID = 42;
-		m_MainWorld = 1200;
-		break;
-	}
+	CDActivitiesTable* activitiesTable = CDClientManager::Instance().GetTable<CDActivitiesTable>();
+	std::vector<CDActivities> activities = activitiesTable->Query([=](CDActivities entry) {return (entry.instanceMapID == worldID); });
+	for (CDActivities activity : activities) m_ActivityID = activity.ActivityID;
 }
 
 RacingControlComponent::~RacingControlComponent() {}
@@ -382,8 +362,7 @@ void RacingControlComponent::OnRacingPlayerInfoResetFinished(Entity* player) {
 	}
 }
 
-void RacingControlComponent::HandleMessageBoxResponse(Entity* player,
-	const std::string& id) {
+void RacingControlComponent::HandleMessageBoxResponse(Entity* player, int32_t button, const std::string& id) {
 	auto* data = GetPlayerData(player->GetObjectID());
 
 	if (data == nullptr) {
@@ -425,7 +404,7 @@ void RacingControlComponent::HandleMessageBoxResponse(Entity* player,
 				missionComponent->Progress(eMissionTaskType::RACING, dZoneManager::Instance()->GetZone()->GetWorldID(), (LWOOBJID)eRacingTaskParam::LAST_PLACE_FINISH); // Finished first place in specific world.
 			}
 		}
-	} else if (id == "ACT_RACE_EXIT_THE_RACE?" || id == "Exit") {
+	} else if ((id == "ACT_RACE_EXIT_THE_RACE?" || id == "Exit") && button == m_ActivityExitConfirm) {
 		auto* vehicle = EntityManager::Instance()->GetEntity(data->vehicleID);
 
 		if (vehicle == nullptr) {

dGame/dComponents/RacingControlComponent.h

@@ -144,7 +144,7 @@ public:
 	/**
 	 * Invoked when the player responds to the GUI.
 	 */
-	void HandleMessageBoxResponse(Entity* player, const std::string& id);
+	void HandleMessageBoxResponse(Entity* player, int32_t button, const std::string& id);
 
 	/**
 	 * Get the racing data from a player's LWOOBJID.
@@ -246,4 +246,9 @@ private:
 	float m_EmptyTimer;
 
 	bool m_SoloRacing;
+
+	/**
+	 * Value for message box response to know if we are exiting the race via the activity dialogue
+	 */
+	const int32_t m_ActivityExitConfirm = 1;
 };

dGame/dComponents/RailActivatorComponent.cpp

@@ -7,6 +7,8 @@
 #include "RebuildComponent.h"
 #include "Game.h"
 #include "dLogger.h"
+#include "RenderComponent.h"
+#include "EntityManager.h"
 #include "eStateChangeType.h"
 
 RailActivatorComponent::RailActivatorComponent(Entity* parent, int32_t componentID) : Component(parent) {
@@ -58,22 +60,9 @@ void RailActivatorComponent::OnUse(Entity* originator) {
 			std::to_string(m_StartEffect.first));
 	}
 	
+	float animationLength = 0.5f;
 	if (!m_StartAnimation.empty()) {
-		GameMessages::SendPlayAnimation(originator, m_StartAnimation);
-	}
-
-	float animationLength;
-
-	if (m_StartAnimation == u"whirlwind-rail-up-earth") {
-		animationLength = 1.5f;
-	} else if (m_StartAnimation == u"whirlwind-rail-up-lightning") {
-		animationLength = 0.5f;
-	} else if (m_StartAnimation == u"whirlwind-rail-up-ice") {
-		animationLength = 0.5f;
-	} else if (m_StartAnimation == u"whirlwind-rail-up-fire") {
-		animationLength = 0.5f;
-	} else {
-		animationLength = 0.5f;
+		animationLength = RenderComponent::PlayAnimation(originator, m_StartAnimation);
 	}
 
 	const auto originatorID = originator->GetObjectID();
@@ -112,7 +101,7 @@ void RailActivatorComponent::OnRailMovementReady(Entity* originator) const {
 		}
 
 		if (!m_LoopAnimation.empty()) {
-			GameMessages::SendPlayAnimation(originator, m_LoopAnimation);
+			RenderComponent::PlayAnimation(originator, m_LoopAnimation);
 		}
 
 		GameMessages::SendSetRailMovement(originator->GetObjectID(), m_PathDirection, m_Path, m_PathStart,
@@ -147,7 +136,7 @@ void RailActivatorComponent::OnCancelRailMovement(Entity* originator) {
 		}
 
 		if (!m_StopAnimation.empty()) {
-			GameMessages::SendPlayAnimation(originator, m_StopAnimation);
+			RenderComponent::PlayAnimation(originator, m_StopAnimation);
 		}
 
 		// Remove the player after they've signalled they're done railing

dGame/dComponents/RebuildComponent.cpp

@@ -20,6 +20,7 @@
 #include "Preconditions.h"
 #include "Loot.h"
 #include "TeamManager.h"
+#include "RenderComponent.h"
 
 #include "CppScripts.h"
 
@@ -196,18 +197,18 @@ void RebuildComponent::Update(float deltaTime) {
 			DestroyableComponent* destComp = builder->GetComponent<DestroyableComponent>();
 			if (!destComp) break;
 
-			int newImagination = destComp->GetImagination() - 1;
+			int newImagination = destComp->GetImagination();
+			if (newImagination <= 0) {
+				CancelRebuild(builder, eQuickBuildFailReason::OUT_OF_IMAGINATION, true);
+				break;
+			}
 
+			++m_DrainedImagination;
+			--newImagination;
 			destComp->SetImagination(newImagination);
 			EntityManager::Instance()->SerializeEntity(builder);
 
-			++m_DrainedImagination;
 
-			if (newImagination == 0 && m_DrainedImagination < m_TakeImagination) {
-				CancelRebuild(builder, eQuickBuildFailReason::OUT_OF_IMAGINATION, true);
-
-				break;
-			}
 		}
 
 		if (m_Timer >= m_CompleteTime && m_DrainedImagination >= m_TakeImagination) {
@@ -517,7 +518,7 @@ void RebuildComponent::CompleteRebuild(Entity* user) {
 			character->SetPlayerFlag(flagNumber, true);
 		}
 	}
-	GameMessages::SendPlayAnimation(user, u"rebuild-celebrate", 1.09f);
+	RenderComponent::PlayAnimation(user, u"rebuild-celebrate", 1.09f);
 }
 
 void RebuildComponent::ResetRebuild(bool failed) {
@@ -527,7 +528,7 @@ void RebuildComponent::ResetRebuild(bool failed) {
 		GameMessages::SendEnableRebuild(m_Parent, false, false, failed, eQuickBuildFailReason::NOT_GIVEN, m_ResetTime, builder->GetObjectID());
 
 		if (failed) {
-			GameMessages::SendPlayAnimation(builder, u"rebuild-fail");
+			RenderComponent::PlayAnimation(builder, u"rebuild-fail");
 		}
 	}
 

dGame/dComponents/RenderComponent.cpp

@@ -11,72 +11,36 @@
 #include "GameMessages.h"
 #include "Game.h"
 #include "dLogger.h"
+#include "CDAnimationsTable.h"
 
 std::unordered_map<int32_t, float> RenderComponent::m_DurationCache{};
 
-RenderComponent::RenderComponent(Entity* parent) : Component(parent) {
+RenderComponent::RenderComponent(Entity* parent, int32_t componentId): Component(parent) {
 	m_Effects = std::vector<Effect*>();
+	m_LastAnimationName = "";
+	if (componentId == -1) return;
 
-	return;
+	auto query = CDClientDatabase::CreatePreppedStmt("SELECT * FROM RenderComponent WHERE id = ?;");
+	query.bind(1, componentId);
+	auto result = query.execQuery();
 
-	/*
-	auto* table = CDClientManager::Instance().GetTable<CDComponentsRegistryTable>();
-
-	const auto entry = table->GetByIDAndType(parent->GetLOT(), eReplicaComponentType::RENDER);
-
-	std::stringstream query;
-
-	query << "SELECT effect1, effect2, effect3, effect4, effect5, effect6 FROM RenderComponent WHERE id = " << std::to_string(entry) << ";";
-
-	auto result = CDClientDatabase::ExecuteQuery(query.str());
-
-	if (result.eof())
-	{
-		return;
-	}
-
-	for (auto i = 0; i < 6; ++i)
-	{
-		if (result.fieldIsNull(i))
-		{
+	if (!result.eof()) {
+		auto animationGroupIDs = std::string(result.getStringField("animationGroupIDs", ""));
+		if (!animationGroupIDs.empty()) {
+			auto* animationsTable = CDClientManager::Instance().GetTable<CDAnimationsTable>();
+			auto groupIdsSplit = GeneralUtils::SplitString(animationGroupIDs, ',');
+			for (auto& groupId : groupIdsSplit) {
+				int32_t groupIdInt;
+				if (!GeneralUtils::TryParse(groupId, groupIdInt)) {
+					Game::logger->Log("RenderComponent", "bad animation group Id %s", groupId.c_str());
 					continue;
 				}
-
-		const auto id = result.getIntField(i);
-
-		if (id <= 0)
-		{
-			continue;
-		}
-
-		query.clear();
-
-		query << "SELECT effectType, effectName FROM BehaviorEffect WHERE effectID = " << std::to_string(id) << ";";
-
-		auto effectResult = CDClientDatabase::ExecuteQuery(query.str());
-
-		while (!effectResult.eof())
-		{
-			const auto type = effectResult.fieldIsNull(0) ? "" : std::string(effectResult.getStringField(0));
-
-			const auto name = effectResult.fieldIsNull(1) ? "" : std::string(effectResult.getStringField(1));
-
-			auto* effect = new Effect();
-
-			effect->name = name;
-			effect->type = GeneralUtils::ASCIIToUTF16(type);
-			effect->scale = 1;
-			effect->effectID = id;
-			effect->secondary = LWOOBJID_EMPTY;
-
-			m_Effects.push_back(effect);
-
-			effectResult.nextRow();
+				m_animationGroupIds.push_back(groupIdInt);
+				animationsTable->CacheAnimationGroup(groupIdInt);
+			}
 		}
 	}
-
 	result.finalize();
-	*/
 }
 
 RenderComponent::~RenderComponent() {
@@ -224,3 +188,45 @@ void RenderComponent::StopEffect(const std::string& name, const bool killImmedia
 std::vector<Effect*>& RenderComponent::GetEffects() {
 	return m_Effects;
 }
+
+
+float RenderComponent::PlayAnimation(Entity* self, const std::u16string& animation, float priority, float scale) {
+	if (!self) return 0.0f;
+	return RenderComponent::PlayAnimation(self, GeneralUtils::UTF16ToWTF8(animation), priority, scale);
+}
+
+float RenderComponent::PlayAnimation(Entity* self, const std::string& animation, float priority, float scale) {
+	if (!self) return 0.0f;
+	return RenderComponent::DoAnimation(self, animation, true, priority, scale);
+}
+
+float RenderComponent::GetAnimationTime(Entity* self, const std::u16string& animation) {
+	if (!self) return 0.0f;
+	return RenderComponent::GetAnimationTime(self, GeneralUtils::UTF16ToWTF8(animation));
+}
+
+float RenderComponent::GetAnimationTime(Entity* self, const std::string& animation) {
+	if (!self) return 0.0f;
+	return RenderComponent::DoAnimation(self, animation, false);
+}
+
+
+float RenderComponent::DoAnimation(Entity* self, const std::string& animation, bool sendAnimation, float priority, float scale) {
+	float returnlength = 0.0f;
+	if (!self) return returnlength;
+	auto* renderComponent = self->GetComponent<RenderComponent>();
+	if (!renderComponent) return returnlength;
+
+	auto* animationsTable = CDClientManager::Instance().GetTable<CDAnimationsTable>();
+	for (auto& groupId : renderComponent->m_animationGroupIds) {
+		auto animationGroup = animationsTable->GetAnimation(animation, renderComponent->GetLastAnimationName(), groupId);
+		if (animationGroup.FoundData()) {
+			auto data = animationGroup.Data();
+			renderComponent->SetLastAnimationName(data.animation_name);
+			returnlength = data.animation_length;
+		}
+	}
+	if (sendAnimation) GameMessages::SendPlayAnimation(self, GeneralUtils::ASCIIToUTF16(animation), priority, scale);
+	if (returnlength == 0.0f) Game::logger->Log("RenderComponent", "WARNING: Unable to find animation %s for lot %i in any group.", animation.c_str(), self->GetLOT());
+	return returnlength;
+}

dGame/dComponents/RenderComponent.h

@@ -6,7 +6,7 @@
 #include <string>
 #include <unordered_map>
 
-#include "AMFFormat.h"
+#include "Amf3.h"
 #include "Component.h"
 #include "eReplicaComponentType.h"
 
@@ -58,7 +58,7 @@ class RenderComponent : public Component {
 public:
 	static const eReplicaComponentType ComponentType = eReplicaComponentType::RENDER;
 
-	RenderComponent(Entity* entity);
+	RenderComponent(Entity* entity, int32_t componentId = -1);
 	~RenderComponent() override;
 
 	void Serialize(RakNet::BitStream* outBitStream, bool bIsInitialUpdate, unsigned int& flags);
@@ -104,6 +104,32 @@ public:
 	 */
 	std::vector<Effect*>& GetEffects();
 
+	/**
+	 * Verifies that an animation can be played on this entity by checking
+	 * if it has the animation assigned to its group.  If it does, the animation is echo'd
+	 * down to all clients to be played and the duration of the played animation is returned.
+	 * If the animation did not exist or the function was called in an invalid state, 0 is returned.
+	 * 
+	 * The logic here matches the exact client logic.
+	 * 
+	 * @param self The entity that wants to play an animation
+	 * @param animation The animation_type (animationID in the client) to be played.
+	 * @param sendAnimation Whether or not to echo the animation down to all clients.
+	 * @param priority The priority of the animation.  Only used if sendAnimation is true.
+	 * @param scale	The scale of the animation.  Only used if sendAnimation is true.
+	 * 
+	 * @return The duration of the animation that was played.
+	 */
+	static float DoAnimation(Entity* self, const std::string& animation, bool sendAnimation, float priority = 0.0f, float scale = 1.0f);
+
+	static float PlayAnimation(Entity* self, const std::u16string& animation, float priority = 0.0f, float scale = 1.0f);
+	static float PlayAnimation(Entity* self, const std::string& animation, float priority = 0.0f, float scale = 1.0f);
+	static float GetAnimationTime(Entity* self, const std::string& animation);
+	static float GetAnimationTime(Entity* self, const std::u16string& animation);
+
+	const std::string& GetLastAnimationName() const { return m_LastAnimationName; };
+	void SetLastAnimationName(const std::string& name) { m_LastAnimationName = name; };
+
 private:
 
 	/**
@@ -111,6 +137,11 @@ private:
 	 */
 	std::vector<Effect*> m_Effects;
 
+	std::vector<int32_t> m_animationGroupIds;
+
+	// The last animationName that was played
+	std::string m_LastAnimationName;
+
 	/**
 	 * Cache of queries that look for the length of each effect, indexed by effect ID
 	 */

dGame/dComponents/ScriptedActivityComponent.cpp

@@ -27,6 +27,7 @@
 #include "CDCurrencyTableTable.h"
 #include "CDActivityRewardsTable.h"
 #include "CDActivitiesTable.h"
+#include "LeaderboardManager.h"
 
 ScriptedActivityComponent::ScriptedActivityComponent(Entity* parent, int activityID) : Component(parent) {
 	m_ActivityID = activityID;
@@ -35,10 +36,7 @@ ScriptedActivityComponent::ScriptedActivityComponent(Entity* parent, int activit
 
 	for (CDActivities activity : activities) {
 		m_ActivityInfo = activity;
-
-		const auto mapID = m_ActivityInfo.instanceMapID;
-
-		if ((mapID == 1203 || mapID == 1261 || mapID == 1303 || mapID == 1403) && Game::config->GetValue("solo_racing") == "1") {
+		if (static_cast<LeaderboardType>(activity.leaderboardType) == LeaderboardType::Racing && Game::config->GetValue("solo_racing") == "1") {
 			m_ActivityInfo.minTeamSize = 1;
 			m_ActivityInfo.minTeams = 1;
 		}

dGame/dComponents/SwitchComponent.cpp

@@ -1,6 +1,7 @@
 #include "SwitchComponent.h"
 #include "EntityManager.h"
 #include "eTriggerEventType.h"
+#include "RenderComponent.h"
 
 std::vector<SwitchComponent*> SwitchComponent::petSwitches;
 
@@ -59,7 +60,7 @@ void SwitchComponent::EntityEnter(Entity* entity) {
 
 		if (m_PetBouncer != nullptr) {
 			GameMessages::SendPlayFXEffect(m_Parent->GetObjectID(), 2602, u"pettriggeractive", "BounceEffect", LWOOBJID_EMPTY, 1, 1, true);
-			GameMessages::SendPlayAnimation(m_Parent, u"engaged", 0, 1);
+			RenderComponent::PlayAnimation(m_Parent, u"engaged");
 			m_PetBouncer->SetPetBouncerEnabled(true);
 		} else {
 			EntityManager::Instance()->SerializeEntity(m_Parent);

dGame/dComponents/TriggerComponent.cpp

@@ -235,6 +235,8 @@ void TriggerComponent::HandleRotateObject(Entity* targetEntity, std::vector<std:
 }
 
 void TriggerComponent::HandlePushObject(Entity* targetEntity, std::vector<std::string> argArray){
+	if (argArray.size() < 3) return;
+
 	auto* phantomPhysicsComponent = m_Parent->GetComponent<PhantomPhysicsComponent>();
 	if (!phantomPhysicsComponent) {
 		Game::logger->LogDebug("TriggerComponent::HandlePushObject", "Phantom Physics component not found!");

dGame/dComponents/VendorComponent.cpp

@@ -134,3 +134,7 @@ void VendorComponent::SetupConstants() {
 	m_RefreshTimeSeconds = vendorComps[0].refreshTimeSeconds;
 	m_LootMatrixID = vendorComps[0].LootMatrixIndex;
 }
+
+bool VendorComponent::SellsItem(const LOT item) const {
+	return m_Inventory.find(item) != m_Inventory.end();
+}

dGame/dComponents/VendorComponent.h

@@ -67,6 +67,8 @@ public:
 	 * Called on startup of vendor to setup the variables for the component.
 	 */
 	void SetupConstants();
+
+	bool SellsItem(const LOT item) const;
 private:
 	/**
 	 * The buy scalar.

dGame/dGameMessages/GameMessageHandler.cpp

@@ -677,6 +677,9 @@ void GameMessageHandler::HandleMessage(RakNet::BitStream* inStream, const System
 	case eGameMessageType::ZONE_SUMMARY_DISMISSED:
 		GameMessages::HandleZoneSummaryDismissed(inStream, entity);
 		break;
+	case eGameMessageType::REQUEST_ACTIVITY_EXIT:
+		GameMessages::HandleRequestActivityExit(inStream, entity);
+		break;
 	default:
 		// Game::logger->Log("GameMessageHandler", "Unknown game message ID: %i", messageID);
 		break;

dGame/dGameMessages/GameMessages.cpp

@@ -28,7 +28,7 @@
 #include "eUnequippableActiveType.h"
 #include "eMovementPlatformState.h"
 #include "LeaderboardManager.h"
-#include "AMFFormat.h"
+#include "Amf3.h"
 #include "Loot.h"
 #include "eRacingTaskParam.h"
 #include "eMissionTaskType.h"
@@ -70,6 +70,7 @@
 #include "PetComponent.h"
 #include "ModuleAssemblyComponent.h"
 #include "VehiclePhysicsComponent.h"
+#include "RenderComponent.h"
 #include "PossessableComponent.h"
 #include "PossessorComponent.h"
 #include "RacingControlComponent.h"
@@ -87,10 +88,11 @@
 #include "AMFDeserialize.h"
 #include "eBlueprintSaveResponseType.h"
 #include "eAninmationFlags.h"
-#include "AMFFormat_BitStream.h"
+#include "AmfSerialize.h"
 #include "eReplicaComponentType.h"
 #include "eClientMessageType.h"
 #include "eGameMessageType.h"
+#include "ActivityManager.h"
 
 #include "CDComponentsRegistryTable.h"
 #include "CDObjectsTable.h"
@@ -595,14 +597,14 @@ void GameMessages::SendModifyLEGOScore(Entity* entity, const SystemAddress& sysA
 	SEND_PACKET;
 }
 
-void GameMessages::SendUIMessageServerToSingleClient(Entity* entity, const SystemAddress& sysAddr, const std::string& message, AMFValue* args) {
+void GameMessages::SendUIMessageServerToSingleClient(Entity* entity, const SystemAddress& sysAddr, const std::string& message, AMFBaseValue& args) {
 	CBITSTREAM;
 	CMSGHEADER;
 
 	bitStream.Write(entity->GetObjectID());
 	bitStream.Write((uint16_t)eGameMessageType::UI_MESSAGE_SERVER_TO_SINGLE_CLIENT);
 
-	bitStream.Write(args);
+	bitStream.Write<AMFBaseValue&>(args);
 	uint32_t strMessageNameLength = message.size();
 	bitStream.Write(strMessageNameLength);
 
@@ -613,7 +615,7 @@ void GameMessages::SendUIMessageServerToSingleClient(Entity* entity, const Syste
 	SEND_PACKET;
 }
 
-void GameMessages::SendUIMessageServerToAllClients(const std::string& message, AMFValue* args) {
+void GameMessages::SendUIMessageServerToAllClients(const std::string& message, AMFBaseValue& args) {
 	CBITSTREAM;
 	CMSGHEADER;
 
@@ -621,7 +623,7 @@ void GameMessages::SendUIMessageServerToAllClients(const std::string& message, A
 	bitStream.Write(empty);
 	bitStream.Write((uint16_t)eGameMessageType::UI_MESSAGE_SERVER_TO_ALL_CLIENTS);
 
-	bitStream.Write(args);
+	bitStream.Write<AMFBaseValue&>(args);
 	uint32_t strMessageNameLength = message.size();
 	bitStream.Write(strMessageNameLength);
 
@@ -2485,8 +2487,8 @@ void GameMessages::SendUnSmash(Entity* entity, LWOOBJID builderID, float duratio
 
 void GameMessages::HandleControlBehaviors(RakNet::BitStream* inStream, Entity* entity, const SystemAddress& sysAddr) {
 	AMFDeserialize reader;
-	std::unique_ptr<AMFValue> amfArguments(reader.Read(inStream));
-	if (amfArguments->GetValueType() != AMFValueType::AMFArray) return;
+	std::unique_ptr<AMFBaseValue> amfArguments(reader.Read(inStream));
+	if (amfArguments->GetValueType() != eAmf::Array) return;
 
 	uint32_t commandLength{};
 	inStream->Read(commandLength);
@@ -3891,7 +3893,7 @@ void GameMessages::HandleMessageBoxResponse(RakNet::BitStream* inStream, Entity*
 	auto* racingControlComponent = entity->GetComponent<RacingControlComponent>();
 
 	if (racingControlComponent != nullptr) {
-		racingControlComponent->HandleMessageBoxResponse(userEntity, GeneralUtils::UTF16ToWTF8(identifier));
+		racingControlComponent->HandleMessageBoxResponse(userEntity, iButton, GeneralUtils::UTF16ToWTF8(identifier));
 	}
 
 	for (auto* shootingGallery : EntityManager::Instance()->GetEntitiesByComponent(eReplicaComponentType::SHOOTING_GALLERY)) {
@@ -4731,12 +4733,17 @@ void GameMessages::HandleBuyFromVendor(RakNet::BitStream* inStream, Entity* enti
 
 	const auto isCommendationVendor = entity->GetLOT() == 13806;
 
-	VendorComponent* vend = static_cast<VendorComponent*>(entity->GetComponent(eReplicaComponentType::VENDOR));
+	auto* vend = entity->GetComponent<VendorComponent>();
 	if (!vend && !isCommendationVendor) return;
 
-	InventoryComponent* inv = static_cast<InventoryComponent*>(player->GetComponent(eReplicaComponentType::INVENTORY));
+	auto* inv = player->GetComponent<InventoryComponent>();
 	if (!inv) return;
 
+	if (!isCommendationVendor && !vend->SellsItem(item)) {
+		Game::logger->Log("GameMessages", "User %llu %s tried to buy an item %i from a vendor when they do not sell said item", player->GetObjectID(), user->GetUsername().c_str(), item);
+		return;
+	}
+
 	CDComponentsRegistryTable* compRegistryTable = CDClientManager::Instance().GetTable<CDComponentsRegistryTable>();
 	CDItemComponentTable* itemComponentTable = CDClientManager::Instance().GetTable<CDItemComponentTable>();
 
@@ -5124,7 +5131,7 @@ void GameMessages::HandlePlayEmote(RakNet::BitStream* inStream, Entity* entity)
 		if (emote) sAnimationName = emote->animationName;
 	}
 
-	GameMessages::SendPlayAnimation(entity, GeneralUtils::ASCIIToUTF16(sAnimationName));
+	RenderComponent::PlayAnimation(entity, sAnimationName);
 }
 
 void GameMessages::HandleModularBuildConvertModel(RakNet::BitStream* inStream, Entity* entity, const SystemAddress& sysAddr) {
@@ -6204,3 +6211,15 @@ void GameMessages::SendShowBillboardInteractIcon(const SystemAddress& sysAddr, L
 	if (sysAddr == UNASSIGNED_SYSTEM_ADDRESS) SEND_PACKET_BROADCAST
 	else SEND_PACKET
 }
+
+void GameMessages::HandleRequestActivityExit(RakNet::BitStream* inStream, Entity* entity) {
+	bool canceled = false;
+	inStream->Read(canceled);
+	if (!canceled) return;
+
+	LWOOBJID player_id = LWOOBJID_EMPTY;
+	inStream->Read(player_id);
+	auto player = EntityManager::Instance()->GetEntity(player_id);
+	if (!entity || !player) return;
+	entity->RequestActivityExit(entity, player_id, canceled);
+}

dGame/dGameMessages/GameMessages.h

@@ -12,7 +12,7 @@
 #include "eLootSourceType.h"
 #include "Brick.h"
 
-class AMFValue;
+class AMFBaseValue;
 class Entity;
 class Item;
 class NiQuaternion;
@@ -88,8 +88,8 @@ namespace GameMessages {
 	void NotifyLevelRewards(LWOOBJID objectID, const SystemAddress& sysAddr, int level, bool sending_rewards);
 
 	void SendModifyLEGOScore(Entity* entity, const SystemAddress& sysAddr, int64_t score, eLootSourceType sourceType);
-	void SendUIMessageServerToSingleClient(Entity* entity, const SystemAddress& sysAddr, const std::string& message, AMFValue* args);
-	void SendUIMessageServerToAllClients(const std::string& message, AMFValue* args);
+	void SendUIMessageServerToSingleClient(Entity* entity, const SystemAddress& sysAddr, const std::string& message, AMFBaseValue& args);
+	void SendUIMessageServerToAllClients(const std::string& message, AMFBaseValue& args);
 
 	void SendPlayEmbeddedEffectOnAllClientsNearObject(Entity* entity, std::u16string effectName, const LWOOBJID& fromObjectID, float radius);
 	void SendPlayFXEffect(Entity* entity, int32_t effectID, const std::u16string& effectType, const std::string& name, LWOOBJID secondary, float priority = 1, float scale = 1, bool serialize = true);
@@ -648,6 +648,7 @@ namespace GameMessages {
 	void SendDeactivateBubbleBuffFromServer(LWOOBJID objectId, const SystemAddress& sysAddr);
 
 	void HandleZoneSummaryDismissed(RakNet::BitStream* inStream, Entity* entity);
+	void HandleRequestActivityExit(RakNet::BitStream* inStream, Entity* entity);
 };
 
 #endif // GAMEMESSAGES_H

dGame/dPropertyBehaviors/ControlBehaviorMessages/Action.cpp

@@ -12,19 +12,19 @@ Action::Action(AMFArrayValue* arguments) {
 	valueParameterName = "";
 	valueParameterString = "";
 	valueParameterDouble = 0.0;
-	for (auto& typeValueMap : arguments->GetAssociativeMap()) {
+	for (auto& typeValueMap : arguments->GetAssociative()) {
 		if (typeValueMap.first == "Type") {
-			if (typeValueMap.second->GetValueType() != AMFValueType::AMFString) continue;
-			type = static_cast<AMFStringValue*>(typeValueMap.second)->GetStringValue();
+			if (typeValueMap.second->GetValueType() != eAmf::String) continue;
+			type = static_cast<AMFStringValue*>(typeValueMap.second)->GetValue();
 		} else {
 			valueParameterName = typeValueMap.first;
 			// Message is the only known string parameter
 			if (valueParameterName == "Message") {
-				if (typeValueMap.second->GetValueType() != AMFValueType::AMFString) continue;
-				valueParameterString = static_cast<AMFStringValue*>(typeValueMap.second)->GetStringValue();
+				if (typeValueMap.second->GetValueType() != eAmf::String) continue;
+				valueParameterString = static_cast<AMFStringValue*>(typeValueMap.second)->GetValue();
 			} else {
-				if (typeValueMap.second->GetValueType() != AMFValueType::AMFDouble) continue;
-				valueParameterDouble = static_cast<AMFDoubleValue*>(typeValueMap.second)->GetDoubleValue();
+				if (typeValueMap.second->GetValueType() != eAmf::Double) continue;
+				valueParameterDouble = static_cast<AMFDoubleValue*>(typeValueMap.second)->GetValue();
 			}
 		}
 	}

dGame/dPropertyBehaviors/ControlBehaviorMessages/ActionContext.cpp

@@ -2,7 +2,7 @@
 
 #include <stdexcept>
 
-#include "AMFFormat.h"
+#include "Amf3.h"
 
 ActionContext::ActionContext() {
 	stripId = 0;
@@ -17,15 +17,15 @@ ActionContext::ActionContext(AMFArrayValue* arguments, std::string customStateKe
 }
 
 BehaviorState ActionContext::GetBehaviorStateFromArgument(AMFArrayValue* arguments, const std::string& key) {
-	auto* stateIDValue = arguments->FindValue<AMFDoubleValue>(key);
+	auto* stateIDValue = arguments->Get<double>(key);
 	if (!stateIDValue) throw std::invalid_argument("Unable to find behavior state from argument \"" + key + "\"");
 
-	return static_cast<BehaviorState>(stateIDValue->GetDoubleValue());
+	return static_cast<BehaviorState>(stateIDValue->GetValue());
 }
 
 StripId ActionContext::GetStripIdFromArgument(AMFArrayValue* arguments, const std::string& key) {
-	auto* stripIdValue = arguments->FindValue<AMFDoubleValue>(key);
+	auto* stripIdValue = arguments->Get<double>(key);
 	if (!stripIdValue) throw std::invalid_argument("Unable to find strip ID from argument \"" + key + "\"");
 
-	return static_cast<StripId>(stripIdValue->GetDoubleValue());
+	return static_cast<StripId>(stripIdValue->GetValue());
 }

dGame/dPropertyBehaviors/ControlBehaviorMessages/AddActionMessage.cpp

@@ -4,7 +4,7 @@ AddActionMessage::AddActionMessage(AMFArrayValue* arguments) : BehaviorMessageBa
 	actionContext = ActionContext(arguments);
 	actionIndex = GetActionIndexFromArgument(arguments);
 
-	auto* actionValue = arguments->FindValue<AMFArrayValue>("action");
+	auto* actionValue = arguments->GetArray("action");
 	if (!actionValue) return;
 
 	action = Action(actionValue);

dGame/dPropertyBehaviors/ControlBehaviorMessages/AddMessage.cpp

@@ -2,10 +2,10 @@
 
 AddMessage::AddMessage(AMFArrayValue* arguments) : BehaviorMessageBase(arguments) {
 	behaviorIndex = 0;
-	auto* behaviorIndexValue = arguments->FindValue<AMFDoubleValue>("BehaviorIndex");
+	auto* behaviorIndexValue = arguments->Get<double>("BehaviorIndex");
 
 	if (!behaviorIndexValue) return;
 
-	behaviorIndex = static_cast<uint32_t>(behaviorIndexValue->GetDoubleValue());
+	behaviorIndex = static_cast<uint32_t>(behaviorIndexValue->GetValue());
 	Game::logger->LogDebug("AddMessage", "behaviorId %i index %i", behaviorId, behaviorIndex);
 }

dGame/dPropertyBehaviors/ControlBehaviorMessages/AddStripMessage.cpp

@@ -4,17 +4,16 @@
 
 AddStripMessage::AddStripMessage(AMFArrayValue* arguments) : BehaviorMessageBase(arguments) {
 	actionContext = ActionContext(arguments);
-
 	position = StripUiPosition(arguments);
 
-	auto* strip = arguments->FindValue<AMFArrayValue>("strip");
+	auto* strip = arguments->GetArray("strip");
 	if (!strip) return;
 
-	auto* actions = strip->FindValue<AMFArrayValue>("actions");
+	auto* actions = strip->GetArray("actions");
 	if (!actions) return;
 
-	for (uint32_t actionNumber = 0; actionNumber < actions->GetDenseValueSize(); actionNumber++) {
-		auto* actionValue = actions->GetValueAt<AMFArrayValue>(actionNumber);
+	for (uint32_t actionNumber = 0; actionNumber < actions->GetDense().size(); actionNumber++) {
+		auto* actionValue = actions->GetArray(actionNumber);
 		if (!actionValue) continue;
 
 		actionsToAdd.push_back(Action(actionValue));

dGame/dPropertyBehaviors/ControlBehaviorMessages/BehaviorMessageBase.cpp

@@ -1,6 +1,6 @@
 #include "BehaviorMessageBase.h"
 
-#include "AMFFormat.h"
+#include "Amf3.h"
 #include "BehaviorStates.h"
 #include "dCommonVars.h"
 
@@ -11,12 +11,12 @@ BehaviorMessageBase::BehaviorMessageBase(AMFArrayValue* arguments) {
 
 int32_t BehaviorMessageBase::GetBehaviorIdFromArgument(AMFArrayValue* arguments) {
 	const auto* key = "BehaviorID";
-	auto* behaviorIDValue = arguments->FindValue<AMFStringValue>(key);
+	auto* behaviorIDValue = arguments->Get<std::string>(key);
 	int32_t behaviorID = -1;
 
-	if (behaviorIDValue) {
-		behaviorID = std::stoul(behaviorIDValue->GetStringValue());
-	} else if (!arguments->FindValue<AMFUndefinedValue>(key)) {
+	if (behaviorIDValue && behaviorIDValue->GetValueType() == eAmf::String) {
+		behaviorID = std::stoul(behaviorIDValue->GetValue());
+	} else if (arguments->Get(key)->GetValueType() != eAmf::Undefined) {
 		throw std::invalid_argument("Unable to find behavior ID");
 	}
 
@@ -24,10 +24,10 @@ int32_t BehaviorMessageBase::GetBehaviorIdFromArgument(AMFArrayValue* arguments)
 }
 
 uint32_t BehaviorMessageBase::GetActionIndexFromArgument(AMFArrayValue* arguments, const std::string& keyName) {
-	auto* actionIndexAmf = arguments->FindValue<AMFDoubleValue>(keyName);
+	auto* actionIndexAmf = arguments->Get<double>(keyName);
 	if (!actionIndexAmf) {
 		throw std::invalid_argument("Unable to find actionIndex");
 	}
 
-	return static_cast<uint32_t>(actionIndexAmf->GetDoubleValue());
+	return static_cast<uint32_t>(actionIndexAmf->GetValue());
 }

dGame/dPropertyBehaviors/ControlBehaviorMessages/BehaviorMessageBase.h

@@ -4,7 +4,7 @@
 #include <stdexcept>
 #include <string>
 
-#include "AMFFormat.h"
+#include "Amf3.h"
 #include "dCommonVars.h"
 
 #include "Game.h"

dGame/dPropertyBehaviors/ControlBehaviorMessages/MoveToInventoryMessage.cpp

@@ -1,9 +1,9 @@
 #include "MoveToInventoryMessage.h"
 
 MoveToInventoryMessage::MoveToInventoryMessage(AMFArrayValue* arguments) : BehaviorMessageBase(arguments) {
-	auto* behaviorIndexValue = arguments->FindValue<AMFDoubleValue>("BehaviorIndex");
+	auto* behaviorIndexValue = arguments->Get<double>("BehaviorIndex");
 	if (!behaviorIndexValue) return;
 
-	behaviorIndex = static_cast<uint32_t>(behaviorIndexValue->GetDoubleValue());
+	behaviorIndex = static_cast<uint32_t>(behaviorIndexValue->GetValue());
 	Game::logger->LogDebug("MoveToInventoryMessage", "behaviorId %i behaviorIndex %i", behaviorId, behaviorIndex);
 }

dGame/dPropertyBehaviors/ControlBehaviorMessages/RenameMessage.cpp

@@ -1,9 +1,9 @@
 #include "RenameMessage.h"
 
 RenameMessage::RenameMessage(AMFArrayValue* arguments) : BehaviorMessageBase(arguments) {
-	auto* nameAmf = arguments->FindValue<AMFStringValue>("Name");
+	auto* nameAmf = arguments->Get<std::string>("Name");
 	if (!nameAmf) return;
 
-	name = nameAmf->GetStringValue();
+	name = nameAmf->GetValue();
 	Game::logger->LogDebug("RenameMessage", "behaviorId %i n %s", behaviorId, name.c_str());
 }

dGame/dPropertyBehaviors/ControlBehaviorMessages/StripUiPosition.cpp

@@ -1,6 +1,6 @@
 #include "StripUiPosition.h"
 
-#include "AMFFormat.h"
+#include "Amf3.h"
 
 StripUiPosition::StripUiPosition() {
 	xPosition = 0.0;
@@ -10,13 +10,13 @@ StripUiPosition::StripUiPosition() {
 StripUiPosition::StripUiPosition(AMFArrayValue* arguments, std::string uiKeyName) {
 	xPosition = 0.0;
 	yPosition = 0.0;
-	auto* uiArray = arguments->FindValue<AMFArrayValue>(uiKeyName);
+	auto* uiArray = arguments->GetArray(uiKeyName);
 	if (!uiArray) return;
 
-	auto* xPositionValue = uiArray->FindValue<AMFDoubleValue>("x");
-	auto* yPositionValue = uiArray->FindValue<AMFDoubleValue>("y");
+	auto* xPositionValue = uiArray->Get<double>("x");
+	auto* yPositionValue = uiArray->Get<double>("y");
 	if (!xPositionValue || !yPositionValue) return;
 
-	yPosition = yPositionValue->GetDoubleValue();
-	xPosition = xPositionValue->GetDoubleValue();
+	yPosition = yPositionValue->GetValue();
+	xPosition = xPositionValue->GetValue();
 }

dGame/dPropertyBehaviors/ControlBehaviorMessages/UpdateActionMessage.cpp

@@ -5,7 +5,7 @@
 UpdateActionMessage::UpdateActionMessage(AMFArrayValue* arguments) : BehaviorMessageBase(arguments) {
 	actionContext = ActionContext(arguments);
 
-	auto* actionValue = arguments->FindValue<AMFArrayValue>("action");
+	auto* actionValue = arguments->GetArray("action");
 	if (!actionValue) return;
 
 	action = Action(actionValue);

dGame/dPropertyBehaviors/ControlBehaviors.cpp

@@ -1,6 +1,6 @@
 #include "ControlBehaviors.h"
 
-#include "AMFFormat.h"
+#include "Amf3.h"
 #include "Entity.h"
 #include "Game.h"
 #include "GameMessages.h"
@@ -43,11 +43,11 @@ void ControlBehaviors::RequestUpdatedID(int32_t behaviorID, ModelComponent* mode
 	// 		AMFArrayValue args;
 
 	// 		AMFStringValue* behaviorIDString = new AMFStringValue();
-	// 		behaviorIDString->SetStringValue(std::to_string(persistentId));
+	// 		behaviorIDString->SetValue(std::to_string(persistentId));
 	// 		args.InsertValue("behaviorID", behaviorIDString);
 
 	// 		AMFStringValue* objectIDAsString = new AMFStringValue();
-	// 		objectIDAsString->SetStringValue(std::to_string(modelComponent->GetParent()->GetObjectID()));
+	// 		objectIDAsString->SetValue(std::to_string(modelComponent->GetParent()->GetObjectID()));
 	// 		args.InsertValue("objectID", objectIDAsString);
 
 	// 		GameMessages::SendUIMessageServerToSingleClient(modelOwner, sysAddr, "UpdateBehaviorID", &args);
@@ -63,8 +63,6 @@ void ControlBehaviors::SendBehaviorListToClient(Entity* modelEntity, const Syste
 
 	AMFArrayValue behaviorsToSerialize;
 
-	AMFArrayValue* behaviors = new AMFArrayValue(); // Empty for now
-
 	/**
 	 * The behaviors AMFArray will have up to 5 elements in the dense portion.
 	 * Each element in the dense portion will be made up of another AMFArray
@@ -75,20 +73,17 @@ void ControlBehaviors::SendBehaviorListToClient(Entity* modelEntity, const Syste
 	 * "name": The name of the behavior formatted as an AMFString
 	 */
 
-	behaviorsToSerialize.InsertValue("behaviors", behaviors);
+	behaviorsToSerialize.Insert("behaviors");
+	behaviorsToSerialize.Insert("objectID", std::to_string(modelComponent->GetParent()->GetObjectID()));
 
-	AMFStringValue* amfStringValueForObjectID = new AMFStringValue();
-	amfStringValueForObjectID->SetStringValue(std::to_string(modelComponent->GetParent()->GetObjectID()));
-
-	behaviorsToSerialize.InsertValue("objectID", amfStringValueForObjectID);
-	GameMessages::SendUIMessageServerToSingleClient(modelOwner, sysAddr, "UpdateBehaviorList", &behaviorsToSerialize);
+	GameMessages::SendUIMessageServerToSingleClient(modelOwner, sysAddr, "UpdateBehaviorList", behaviorsToSerialize);
 }
 
 void ControlBehaviors::ModelTypeChanged(AMFArrayValue* arguments, ModelComponent* ModelComponent) {
-	auto* modelTypeAmf = arguments->FindValue<AMFDoubleValue>("ModelType");
+	auto* modelTypeAmf = arguments->Get<double>("ModelType");
 	if (!modelTypeAmf) return;
 
-	uint32_t modelType = static_cast<uint32_t>(modelTypeAmf->GetDoubleValue());
+	uint32_t modelType = static_cast<uint32_t>(modelTypeAmf->GetValue());
 
 	//TODO Update the model type here
 }
@@ -179,7 +174,7 @@ void ControlBehaviors::SendBehaviorBlocksToClient(ModelComponent* modelComponent
 	// 	AMFArrayValue* state = new AMFArrayValue();
 
 	// 	AMFDoubleValue* stateAsDouble = new AMFDoubleValue();
-	// 	stateAsDouble->SetDoubleValue(it->first);
+	// 	stateAsDouble->SetValue(it->first);
 	// 	state->InsertValue("id", stateAsDouble);
 
 	// 	AMFArrayValue* strips = new AMFArrayValue();
@@ -189,16 +184,16 @@ void ControlBehaviors::SendBehaviorBlocksToClient(ModelComponent* modelComponent
 	// 		AMFArrayValue* thisStrip = new AMFArrayValue();
 
 	// 		AMFDoubleValue* stripID = new AMFDoubleValue();
-	// 		stripID->SetDoubleValue(strip->first);
+	// 		stripID->SetValue(strip->first);
 	// 		thisStrip->InsertValue("id", stripID);
 
 	// 		AMFArrayValue* uiArray = new AMFArrayValue();
 	// 		AMFDoubleValue* yPosition = new AMFDoubleValue();
-	// 		yPosition->SetDoubleValue(strip->second->GetYPosition());
+	// 		yPosition->SetValue(strip->second->GetYPosition());
 	// 		uiArray->InsertValue("y", yPosition);
 
 	// 		AMFDoubleValue* xPosition = new AMFDoubleValue();
-	// 		xPosition->SetDoubleValue(strip->second->GetXPosition());
+	// 		xPosition->SetValue(strip->second->GetXPosition());
 	// 		uiArray->InsertValue("x", xPosition);
 
 	// 		thisStrip->InsertValue("ui", uiArray);
@@ -211,19 +206,19 @@ void ControlBehaviors::SendBehaviorBlocksToClient(ModelComponent* modelComponent
 	// 			AMFArrayValue* thisAction = new AMFArrayValue();
 
 	// 			AMFStringValue* actionName = new AMFStringValue();
-	// 			actionName->SetStringValue(behaviorAction->actionName);
+	// 			actionName->SetValue(behaviorAction->actionName);
 	// 			thisAction->InsertValue("Type", actionName);
 
 	// 			if (behaviorAction->parameterValueString != "")
 	// 			{
 	// 				AMFStringValue* valueAsString = new AMFStringValue();
-	// 				valueAsString->SetStringValue(behaviorAction->parameterValueString);
+	// 				valueAsString->SetValue(behaviorAction->parameterValueString);
 	// 				thisAction->InsertValue(behaviorAction->parameterName, valueAsString);
 	// 			}
 	// 			else if (behaviorAction->parameterValueDouble != 0.0)
 	// 			{
 	// 				AMFDoubleValue* valueAsDouble = new AMFDoubleValue();
-	// 				valueAsDouble->SetDoubleValue(behaviorAction->parameterValueDouble);
+	// 				valueAsDouble->SetValue(behaviorAction->parameterValueDouble);
 	// 				thisAction->InsertValue(behaviorAction->parameterName, valueAsDouble);
 	// 			}
 	// 			stripSerialize->PushBackValue(thisAction);
@@ -237,11 +232,11 @@ void ControlBehaviors::SendBehaviorBlocksToClient(ModelComponent* modelComponent
 	// behaviorInfo.InsertValue("states", stateSerialize);
 
 	// AMFStringValue* objectidAsString = new AMFStringValue();
-	// objectidAsString->SetStringValue(std::to_string(targetObjectID));
+	// objectidAsString->SetValue(std::to_string(targetObjectID));
 	// behaviorInfo.InsertValue("objectID", objectidAsString);
 
 	// AMFStringValue* behaviorIDAsString = new AMFStringValue();
-	// behaviorIDAsString->SetStringValue(std::to_string(behaviorID));
+	// behaviorIDAsString->SetValue(std::to_string(behaviorID));
 	// behaviorInfo.InsertValue("BehaviorID", behaviorIDAsString);
 
 	// GameMessages::SendUIMessageServerToSingleClient(modelOwner, sysAddr, "UpdateBehaviorBlocks", &behaviorInfo);
@@ -275,10 +270,9 @@ void ControlBehaviors::MoveToInventory(ModelComponent* modelComponent, const Sys
 	// This closes the UI menu should it be open while the player is removing behaviors
 	AMFArrayValue args;
 
-	AMFFalseValue* stateToPop = new AMFFalseValue();
-	args.InsertValue("visible", stateToPop);
+	args.Insert("visible", false);
 
-	GameMessages::SendUIMessageServerToSingleClient(modelOwner, modelOwner->GetParentUser()->GetSystemAddress(), "ToggleBehaviorEditor", &args);
+	GameMessages::SendUIMessageServerToSingleClient(modelOwner, modelOwner->GetParentUser()->GetSystemAddress(), "ToggleBehaviorEditor", args);
 
 	MoveToInventoryMessage moveToInventoryMessage(arguments);
 

dGame/dUtilities/SlashCommandHandler.cpp

@@ -69,7 +69,7 @@
 #include "BinaryPathFinder.h"
 #include "dConfig.h"
 #include "eBubbleType.h"
-#include "AMFFormat.h"
+#include "Amf3.h"
 #include "MovingPlatformComponent.h"
 #include "eMissionState.h"
 #include "TriggerComponent.h"
@@ -77,6 +77,7 @@
 #include "eObjectBits.h"
 #include "eGameMasterLevel.h"
 #include "eReplicaComponentType.h"
+#include "RenderComponent.h"
 #include "eControlScheme.h"
 #include "eConnectionType.h"
 #include "eChatInternalMessageType.h"
@@ -251,26 +252,20 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 		{
 			AMFArrayValue args;
 
-			auto* state = new AMFStringValue();
-			state->SetStringValue("Story");
+			args.Insert("state", "Story");
 
-			args.InsertValue("state", state);
-
-			GameMessages::SendUIMessageServerToSingleClient(entity, entity->GetSystemAddress(), "pushGameState", &args);
+			GameMessages::SendUIMessageServerToSingleClient(entity, entity->GetSystemAddress(), "pushGameState", args);
 		}
 
 		entity->AddCallbackTimer(0.5f, [customText, entity]() {
 			AMFArrayValue args;
 
-			auto* text = new AMFStringValue();
-			text->SetStringValue(customText);
-
-			args.InsertValue("visible", new AMFTrueValue());
-			args.InsertValue("text", text);
+			args.Insert("visible", true);
+			args.Insert("text", customText);
 
 			Game::logger->Log("SlashCommandHandler", "Sending %s", customText.c_str());
 
-			GameMessages::SendUIMessageServerToSingleClient(entity, entity->GetSystemAddress(), "ToggleStoryBox", &args);
+			GameMessages::SendUIMessageServerToSingleClient(entity, entity->GetSystemAddress(), "ToggleStoryBox", args);
 			});
 
 		return;
@@ -279,7 +274,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 	if (chatCommand == "leave-zone") {
 		const auto currentZone = dZoneManager::Instance()->GetZone()->GetZoneID().GetMapID();
 
-		auto newZone = 0;
+		LWOMAPID newZone = 0;
 		if (currentZone % 100 == 0) {
 			ChatPackets::SendSystemMessage(sysAddr, u"You are not in an instanced zone.");
 			return;
@@ -287,7 +282,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 			newZone = (currentZone / 100) * 100;
 		}
 		// If new zone would be inaccessible, then default to Avant Gardens.
-		if (!CheckIfAccessibleZone(newZone)) newZone = 1100;
+		if (!dZoneManager::Instance()->CheckIfAccessibleZone(newZone)) newZone = 1100;
 
 		ChatPackets::SendSystemMessage(sysAddr, u"Leaving zone...");
 
@@ -417,11 +412,11 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 
 	if ((chatCommand == "playanimation" || chatCommand == "playanim") && args.size() == 1 && entity->GetGMLevel() >= eGameMasterLevel::DEVELOPER) {
 		std::u16string anim = GeneralUtils::ASCIIToUTF16(args[0], args[0].size());
-		GameMessages::SendPlayAnimation(entity, anim);
+		RenderComponent::PlayAnimation(entity, anim);
 		auto* possessorComponent = entity->GetComponent<PossessorComponent>();
 		if (possessorComponent) {
 			auto* possessedComponent = EntityManager::Instance()->GetEntity(possessorComponent->GetPossessable());
-			if (possessedComponent) GameMessages::SendPlayAnimation(possessedComponent, anim);
+			if (possessedComponent) RenderComponent::PlayAnimation(possessedComponent, anim);
 		}
 	}
 
@@ -530,12 +525,11 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 	}
 
 	if (chatCommand == "setuistate" && args.size() == 1 && entity->GetGMLevel() >= eGameMasterLevel::DEVELOPER) {
-		AMFStringValue* value = new AMFStringValue();
-		value->SetStringValue(args[0]);
+		AMFArrayValue uiState;
 
-		AMFArrayValue args;
-		args.InsertValue("state", value);
-		GameMessages::SendUIMessageServerToSingleClient(entity, sysAddr, "pushGameState", &args);
+		uiState.Insert("state", args.at(0));
+
+		GameMessages::SendUIMessageServerToSingleClient(entity, sysAddr, "pushGameState", uiState);
 
 		ChatPackets::SendSystemMessage(sysAddr, u"Switched UI state.");
 
@@ -543,11 +537,11 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 	}
 
 	if (chatCommand == "toggle" && args.size() == 1 && entity->GetGMLevel() >= eGameMasterLevel::DEVELOPER) {
-		AMFTrueValue* value = new AMFTrueValue();
-
 		AMFArrayValue amfArgs;
-		amfArgs.InsertValue("visible", value);
-		GameMessages::SendUIMessageServerToSingleClient(entity, sysAddr, args[0], &amfArgs);
+
+		amfArgs.Insert("visible", true);
+
+		GameMessages::SendUIMessageServerToSingleClient(entity, sysAddr, args[0], amfArgs);
 
 		ChatPackets::SendSystemMessage(sysAddr, u"Toggled UI state.");
 
@@ -1559,7 +1553,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 
 		const auto objid = entity->GetObjectID();
 
-		if (force || CheckIfAccessibleZone(reqZone)) { // to prevent tomfoolery
+		if (force || dZoneManager::Instance()->CheckIfAccessibleZone(reqZone)) { // to prevent tomfoolery
 
 			ZoneInstanceManager::Instance()->RequestZoneTransfer(Game::server, reqZone, cloneId, false, [objid](bool mythranShift, uint32_t zoneID, uint32_t zoneInstance, uint32_t zoneClone, std::string serverIP, uint16_t serverPort) {
 
@@ -1617,7 +1611,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 	if ((chatCommand == "debugui") && entity->GetGMLevel() >= eGameMasterLevel::DEVELOPER) {
 		ChatPackets::SendSystemMessage(sysAddr, u"Opening UIDebugger...");
 		AMFArrayValue args;
-		GameMessages::SendUIMessageServerToSingleClient(entity, sysAddr, "ToggleUIDebugger;", nullptr);
+		GameMessages::SendUIMessageServerToSingleClient(entity, sysAddr, "ToggleUIDebugger;", args);
 	}
 
 	if ((chatCommand == "boost") && entity->GetGMLevel() >= eGameMasterLevel::DEVELOPER) {
@@ -1954,7 +1948,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 
 				EntityManager::Instance()->SerializeEntity(closest);
 			} else if (args[1] == "-a" && args.size() >= 3) {
-				GameMessages::SendPlayAnimation(closest, GeneralUtils::UTF8ToUTF16(args[2]));
+				RenderComponent::PlayAnimation(closest, args.at(2));
 			} else if (args[1] == "-s") {
 				for (auto* entry : closest->GetSettings()) {
 					ChatPackets::SendSystemMessage(sysAddr, GeneralUtils::UTF8ToUTF16(entry->GetString()));
@@ -2021,28 +2015,13 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
 	}
 }
 
-bool SlashCommandHandler::CheckIfAccessibleZone(const unsigned int zoneID) {
-	//We're gonna go ahead and presume we've got the db loaded already:
-	CDZoneTableTable* zoneTable = CDClientManager::Instance().GetTable<CDZoneTableTable>();
-	const CDZoneTable* zone = zoneTable->Query(zoneID);
-	if (zone != nullptr) {
-		return Game::assetManager->HasFile(("maps/" + zone->zoneName).c_str());
-	} else {
-		return false;
-	}
-}
-
 void SlashCommandHandler::SendAnnouncement(const std::string& title, const std::string& message) {
 	AMFArrayValue args;
-	auto* titleValue = new AMFStringValue();
-	titleValue->SetStringValue(title);
-	auto* messageValue = new AMFStringValue();
-	messageValue->SetStringValue(message);
 
-	args.InsertValue("title", titleValue);
-	args.InsertValue("message", messageValue);
+	args.Insert("title", title);
+	args.Insert("message", message);
 
-	GameMessages::SendUIMessageServerToAllClients("ToggleAnnounce", &args);
+	GameMessages::SendUIMessageServerToAllClients("ToggleAnnounce", args);
 
 	//Notify chat about it
 	CBITSTREAM;

dGame/dUtilities/SlashCommandHandler.h

@@ -13,8 +13,6 @@ class Entity;
 
 namespace SlashCommandHandler {
 	void HandleChatCommand(const std::u16string& command, Entity* entity, const SystemAddress& sysAddr);
-	bool CheckIfAccessibleZone(const unsigned int zoneID);
-
 	void SendAnnouncement(const std::string& title, const std::string& message);
 };
 

dMasterServer/MasterServer.cpp

@@ -50,6 +50,7 @@ namespace Game {
 	dConfig* config = nullptr;
 	AssetManager* assetManager = nullptr;
 	bool shouldShutdown = false;
+	std::mt19937 randomEngine;
 } //namespace Game
 
 bool shutdownSequenceStarted = false;
@@ -291,6 +292,7 @@ int main(int argc, char** argv) {
 		return EXIT_SUCCESS;
 	}
 
+	Game::randomEngine = std::mt19937(time(0));
 	uint32_t maxClients = 999;
 	uint32_t ourPort = 1000;
 	if (Game::config->GetValue("max_clients") != "") maxClients = std::stoi(Game::config->GetValue("max_clients"));
@@ -335,7 +337,6 @@ int main(int argc, char** argv) {
 
 		Game::im->GetInstance(0, false, 0);
 		Game::im->GetInstance(1000, false, 0);
-
 		StartAuthServer();
 	}
 

dNet/ClientPackets.cpp

@@ -46,9 +46,7 @@ void ClientPackets::HandleChatMessage(const SystemAddress& sysAddr, Packet* pack
 		return;
 	}
 
-	CINSTREAM;
-	uint64_t header;
-	inStream.Read(header);
+	CINSTREAM_SKIP_HEADER;
 
 	char chatChannel;
 	uint16_t unknown;
@@ -82,9 +80,7 @@ void ClientPackets::HandleClientPositionUpdate(const SystemAddress& sysAddr, Pac
 		return;
 	}
 
-	CINSTREAM;
-	uint64_t header;
-	inStream.Read(header);
+	CINSTREAM_SKIP_HEADER;
 
 	Entity* entity = EntityManager::Instance()->GetEntity(user->GetLastUsedChar()->GetObjectID());
 	if (!entity) return;

dPhysics/dpGrid.cpp

@@ -43,8 +43,8 @@ void dpGrid::Add(dpEntity* entity) {
 
 	if (cellX < 0) cellX = 0;
 	if (cellZ < 0) cellZ = 0;
-	if (cellX > NUM_CELLS) cellX = NUM_CELLS;
-	if (cellZ > NUM_CELLS) cellZ = NUM_CELLS;
+	if (cellX >= NUM_CELLS) cellX = NUM_CELLS - 1;
+	if (cellZ >= NUM_CELLS) cellZ = NUM_CELLS - 1;
 
 	//Add to cell:
 	m_Cells[cellX][cellZ].push_front(entity);
@@ -87,8 +87,8 @@ void dpGrid::Delete(dpEntity* entity) {
 
 	if (oldCellX < 0) oldCellX = 0;
 	if (oldCellZ < 0) oldCellZ = 0;
-	if (oldCellX > NUM_CELLS) oldCellX = NUM_CELLS;
-	if (oldCellZ > NUM_CELLS) oldCellZ = NUM_CELLS;
+	if (oldCellX >= NUM_CELLS) oldCellX = NUM_CELLS - 1;
+	if (oldCellZ >= NUM_CELLS) oldCellZ = NUM_CELLS - 1;
 
 	m_Cells[oldCellX][oldCellZ].remove(entity);
 

dScripts/02_server/DLU/DLUVanityNPC.cpp

@@ -2,6 +2,7 @@
 #include "GameMessages.h"
 #include "dServer.h"
 #include "VanityUtilities.h"
+#include "RenderComponent.h"
 
 void DLUVanityNPC::OnStartup(Entity* self) {
 	m_NPC = VanityUtilities::GetNPC("averysumner - Destroyer of Worlds");
@@ -17,7 +18,7 @@ void DLUVanityNPC::OnStartup(Entity* self) {
 
 void DLUVanityNPC::OnTimerDone(Entity* self, std::string timerName) {
 	if (timerName == "setupTeleport") {
-		GameMessages::SendPlayAnimation(self, u"interact");
+		RenderComponent::PlayAnimation(self, u"interact");
 		GameMessages::SendPlayFXEffect(self->GetObjectID(), 6478, u"teleportBeam", "teleportBeam");
 		GameMessages::SendPlayFXEffect(self->GetObjectID(), 6478, u"teleportRings", "teleportRings");
 

dScripts/02_server/Enemy/AG/BossSpiderQueenEnemyServer.cpp

@@ -14,6 +14,7 @@
 #include "GameMessages.h"
 #include "SkillComponent.h"
 #include "eReplicaComponentType.h"
+#include "RenderComponent.h"
 
 #include <vector>
 
@@ -616,11 +617,11 @@ float BossSpiderQueenEnemyServer::PlayAnimAndReturnTime(Entity* self, const std:
 	//TODO: Get the actual animation time
 
 	// Get the anim time
-	float animTimer = defaultAnimPause; //self:GetAnimationTime{animationID = animID}.time
+	float animTimer = RenderComponent::GetAnimationTime(self, animID);
 
 	// If we have an animation play it
 	if (animTimer > 0) {
-		GameMessages::SendPlayAnimation(self, animID);
+		animTimer = RenderComponent::PlayAnimation(self, animID);
 	}
 
 	// If the anim time is less than the the default time use default

dScripts/02_server/Enemy/AM/AmDarklingDragon.cpp

@@ -7,6 +7,7 @@
 #include "BaseCombatAIComponent.h"
 #include "EntityInfo.h"
 #include "eAninmationFlags.h"
+#include "RenderComponent.h"
 
 void AmDarklingDragon::OnStartup(Entity* self) {
 	self->SetVar<int32_t>(u"weakspot", 0);
@@ -70,9 +71,9 @@ void AmDarklingDragon::OnHitOrHealResult(Entity* self, Entity* attacker, int32_t
 
 			self->SetVar<int32_t>(u"weakpoint", 2);
 			GameMessages::SendChangeIdleFlags(self->GetObjectID(), eAnimationFlags::IDLE_NONE, eAnimationFlags::IDLE_COMBAT, UNASSIGNED_SYSTEM_ADDRESS);
-			GameMessages::SendPlayAnimation(self, u"stunstart", 1.7f);
+			float animationTime = RenderComponent::PlayAnimation(self, u"stunstart", 1.7f);
 
-			self->AddTimer("timeToStunLoop", 1);
+			self->AddTimer("timeToStunLoop", 1.0f);
 
 			auto position = self->GetPosition();
 			auto forward = self->GetRotation().GetForwardVector();
@@ -121,9 +122,9 @@ void AmDarklingDragon::OnTimerDone(Entity* self, std::string timerName) {
 	} else if (timerName == "ExposeWeakSpotTimer") {
 		self->SetVar<int32_t>(u"weakspot", 1);
 	} else if (timerName == "timeToStunLoop") {
-		GameMessages::SendPlayAnimation(self, u"stunloop", 1.8f);
+		RenderComponent::PlayAnimation(self, u"stunloop", 1.8f);
 	} else if (timerName == "ReviveTimer") {
-		GameMessages::SendPlayAnimation(self, u"stunend", 2.0f);
+		RenderComponent::PlayAnimation(self, u"stunend", 2.0f);
 		self->AddTimer("backToAttack", 1);
 	} else if (timerName == "backToAttack") {
 		auto* baseCombatAIComponent = self->GetComponent<BaseCombatAIComponent>();
@@ -153,5 +154,5 @@ void AmDarklingDragon::OnFireEventServerSide(Entity* self, Entity* sender, std::
 
 	self->SetVar<LWOOBJID>(u"Golem", sender->GetObjectID());
 
-	GameMessages::SendPlayAnimation(self, u"quickbuildhold", 1.9f);
+	RenderComponent::PlayAnimation(self, u"quickbuildhold", 1.9f);
 }

dScripts/02_server/Enemy/FV/FvMaelstromDragon.cpp

@@ -5,6 +5,7 @@
 #include "DestroyableComponent.h"
 #include "eAninmationFlags.h"
 #include "EntityInfo.h"
+#include "RenderComponent.h"
 
 void FvMaelstromDragon::OnStartup(Entity* self) {
 	self->SetVar<int32_t>(u"weakspot", 0);
@@ -86,9 +87,9 @@ void FvMaelstromDragon::OnHitOrHealResult(Entity* self, Entity* attacker, int32_
 			self->SetVar<int32_t>(u"weakpoint", 2);
 
 			GameMessages::SendChangeIdleFlags(self->GetObjectID(), eAnimationFlags::IDLE_NONE, eAnimationFlags::IDLE_COMBAT, UNASSIGNED_SYSTEM_ADDRESS);
-			GameMessages::SendPlayAnimation(self, u"stunstart", 1.7f);
+			RenderComponent::PlayAnimation(self, u"stunstart", 1.7f);
 
-			self->AddTimer("timeToStunLoop", 1);
+			self->AddTimer("timeToStunLoop", 1.0f);
 
 			auto position = self->GetPosition();
 			auto forward = self->GetRotation().GetForwardVector();
@@ -137,10 +138,10 @@ void FvMaelstromDragon::OnTimerDone(Entity* self, std::string timerName) {
 	} else if (timerName == "ExposeWeakSpotTimer") {
 		self->SetVar<int32_t>(u"weakspot", 1);
 	} else if (timerName == "timeToStunLoop") {
-		GameMessages::SendPlayAnimation(self, u"stunloop", 1.8f);
+		RenderComponent::PlayAnimation(self, u"stunloop", 1.8f);
 	} else if (timerName == "ReviveTimer") {
-		GameMessages::SendPlayAnimation(self, u"stunend", 2.0f);
-		self->AddTimer("backToAttack", 1);
+		RenderComponent::PlayAnimation(self, u"stunend", 2.0f);
+		self->AddTimer("backToAttack", 1.0f);
 	} else if (timerName == "backToAttack") {
 		auto* baseCombatAIComponent = self->GetComponent<BaseCombatAIComponent>();
 		auto* skillComponent = self->GetComponent<SkillComponent>();
@@ -174,5 +175,5 @@ FvMaelstromDragon::OnFireEventServerSide(Entity* self, Entity* sender, std::stri
 
 	self->SetVar<LWOOBJID>(u"Golem", sender->GetObjectID());
 
-	GameMessages::SendPlayAnimation(self, u"quickbuildhold", 1.9f);
+	RenderComponent::PlayAnimation(self, u"quickbuildhold", 1.9f);
 }

dScripts/02_server/Enemy/General/BaseEnemyApe.cpp

@@ -6,6 +6,7 @@
 #include "EntityInfo.h"
 #include "SkillComponent.h"
 #include "eAninmationFlags.h"
+#include "RenderComponent.h"
 #include "eStateChangeType.h"
 
 void BaseEnemyApe::OnStartup(Entity* self) {
@@ -38,7 +39,7 @@ void BaseEnemyApe::OnHit(Entity* self, Entity* attacker) {
 		if (skillComponent) {
 			skillComponent->Reset();
 		}
-		GameMessages::SendPlayAnimation(self, u"disable", 1.7f);
+		RenderComponent::PlayAnimation(self, u"disable", 1.7f);
 		GameMessages::SendChangeIdleFlags(self->GetObjectID(), eAnimationFlags::IDLE_NONE, eAnimationFlags::IDLE_COMBAT, UNASSIGNED_SYSTEM_ADDRESS);
 		const auto reviveTime = self->GetVar<float_t>(u"reviveTime") != 0.0f
 			? self->GetVar<float_t>(u"reviveTime") : 12.0f;

dScripts/02_server/Enemy/General/GfApeSmashingQB.cpp

@@ -1,6 +1,8 @@
 #include "GfApeSmashingQB.h"
 #include "EntityManager.h"
 #include "GameMessages.h"
+#include "Entity.h"
+#include "RenderComponent.h"
 
 void GfApeSmashingQB::OnStartup(Entity* self) {
 	self->SetNetworkVar<LWOOBJID>(u"lootTagOwner", self->GetVar<LWOOBJID>(u"lootTagOwner"));
@@ -16,7 +18,7 @@ void GfApeSmashingQB::OnRebuildComplete(Entity* self, Entity* target) {
 	auto* ape = EntityManager::Instance()->GetEntity(self->GetVar<LWOOBJID>(u"ape"));
 	if (ape != nullptr) {
 		ape->OnFireEventServerSide(target, "rebuildDone");
-		GameMessages::SendPlayAnimation(self, u"smash", 1.7f);
+		RenderComponent::PlayAnimation(self, u"smash", 1.7f);
 		self->AddTimer("anchorBreakTime", 1.0f);
 	}
 }

dScripts/02_server/Equipment/MaestromExtracticatorServer.cpp

@@ -4,19 +4,18 @@
 #include "EntityManager.h"
 #include "MissionComponent.h"
 #include "eMissionTaskType.h"
+#include "RenderComponent.h"
 
 void MaestromExtracticatorServer::OnStartup(Entity* self) {
-	//self:SetNetworkVar("current_anim", failAnim)
-	GameMessages::SendPlayAnimation(self, GeneralUtils::ASCIIToUTF16(failAnim));
+	float animTime = RenderComponent::PlayAnimation(self, failAnim);
+	if (animTime == 0.0f) animTime = defaultTime;
 
-	self->AddTimer("PlayFail", defaultTime);
+	self->AddTimer("PlayFail", animTime);
 	self->AddTimer("RemoveSample", destroyAfterNoSampleTime);
 }
 
-void MaestromExtracticatorServer::OnFireEventServerSide(Entity* self, Entity* sender, std::string args, int32_t param1,
-	int32_t param2, int32_t param3) {
-	if (sender == nullptr)
-		return;
+void MaestromExtracticatorServer::OnFireEventServerSide(Entity* self, Entity* sender, std::string args, int32_t param1, int32_t param2, int32_t param3) {
+	if (sender == nullptr) return;
 
 	if (args == "attemptCollection") {
 		Entity* player = EntityManager::Instance()->GetEntity(self->GetSpawnerID());
@@ -32,20 +31,17 @@ void MaestromExtracticatorServer::OnFireEventServerSide(Entity* self, Entity* se
 }
 
 void MaestromExtracticatorServer::CollectSample(Entity* self, LWOOBJID sampleObj) {
-	PlayAnimAndReturnTime(self, collectAnim);
-	self->AddTimer("RemoveSample", defaultTime);
+	self->AddTimer("RemoveSample", PlayAnimAndReturnTime(self, collectAnim));
 }
 
-void MaestromExtracticatorServer::PlayAnimAndReturnTime(Entity* self, std::string animID) {
-	GameMessages::SendPlayAnimation(self, GeneralUtils::ASCIIToUTF16(animID));
+float MaestromExtracticatorServer::PlayAnimAndReturnTime(Entity* self, std::string animID) {
+	return RenderComponent::PlayAnimation(self, animID);
 }
 
 void MaestromExtracticatorServer::OnTimerDone(Entity* self, std::string timerName) {
 	if (timerName == "RemoveSample") {
 		self->ScheduleKillAfterUpdate();
-	}
-
-	if (timerName == "PlayFail") {
-		GameMessages::SendPlayAnimation(self, GeneralUtils::ASCIIToUTF16(failAnim));
+	} else if (timerName == "PlayFail") {
+		RenderComponent::PlayAnimation(self, failAnim);
 	}
 }

dScripts/02_server/Equipment/MaestromExtracticatorServer.h

@@ -7,7 +7,7 @@ public:
 	void OnFireEventServerSide(Entity* self, Entity* sender, std::string args, int32_t param1, int32_t param2,
 		int32_t param3);
 	void CollectSample(Entity* self, LWOOBJID sampleObj);
-	void PlayAnimAndReturnTime(Entity* self, std::string animID);
+	float PlayAnimAndReturnTime(Entity* self, std::string animID);
 	void OnTimerDone(Entity* self, std::string timerName);
 
 private:

dScripts/02_server/Map/AG/AgLaserSensorServer.cpp

@@ -2,56 +2,27 @@
 
 #include "PhantomPhysicsComponent.h"
 #include "SkillComponent.h"
-#include "EntityManager.h"
-#include "AgMonumentLaserServer.h"
-#include "EntityManager.h"
 #include "ePhysicsEffectType.h"
-#include "eReplicaComponentType.h"
 
 void AgLaserSensorServer::OnStartup(Entity* self) {
-
-	PhantomPhysicsComponent* physComp = static_cast<PhantomPhysicsComponent*>(self->GetComponent(eReplicaComponentType::PHANTOM_PHYSICS));
-	physComp->SetPhysicsEffectActive(true);
-	physComp->SetEffectType(ePhysicsEffectType::REPULSE);
-	physComp->SetDirectionalMultiplier(static_cast<float>(m_RepelForce));
-	physComp->SetDirection(NiPoint3::UNIT_Y);
-
-	m_Skill = self->GetComponent<SkillComponent>();
+	self->SetBoolean(u"active", true);
+	auto repelForce = self->GetVarAs<float>(u"repelForce");
+	if (!repelForce) repelForce = m_RepelForce;
+	auto* phantomPhysicsComponent = self->GetComponent<PhantomPhysicsComponent>();
+	if (!phantomPhysicsComponent) return;
+	phantomPhysicsComponent->SetPhysicsEffectActive(true);
+	phantomPhysicsComponent->SetEffectType(ePhysicsEffectType::REPULSE);
+	phantomPhysicsComponent->SetDirectionalMultiplier(repelForce);
+	phantomPhysicsComponent->SetDirection(NiPoint3::UNIT_Y);
 }
 
 
 void AgLaserSensorServer::OnCollisionPhantom(Entity* self, Entity* target) {
-
-	if (!m_Skill) return;
-
-
-	Entity* laser = nullptr;
-
-	for (auto script : EntityManager::Instance()->GetEntitiesByComponent(eReplicaComponentType::SCRIPT)) {
-
-		AgMonumentLaserServer* hasLaser = (AgMonumentLaserServer*)script;
-
-		if (hasLaser) {
-			const auto source = script->GetPosition();
-			const auto obj = self->GetObjectID();
-
-			if (obj == 76690936093053 && Vector3::DistanceSquared(source, NiPoint3(149.007f, 417.083f, 218.346f)) <= 1.0f) {
-				laser = script;
-				break;
-			} else if (obj == 75866302318824 && Vector3::DistanceSquared(source, NiPoint3(48.6403f, 403.803f, 196.711f)) <= 1.0f) {
-				laser = script;
-				break;
-			} else if (obj == 75866302318822 && Vector3::DistanceSquared(source, NiPoint3(19.2155f, 420.083f, 249.226f)) <= 1.0f) {
-				laser = script;
-				break;
-			} else if (obj == 75866302318823 && Vector3::DistanceSquared(source, NiPoint3(-6.61596f, 404.633f, 274.323f)) <= 1.0f) {
-				laser = script;
-				break;
-			}
-		}
-	}
-
-	if (laser != nullptr) {
-		m_Skill->CalculateBehavior(m_SkillCastID, 15714, target->GetObjectID());
-	}
+	auto active = self->GetVar<bool>(u"active");
+	if (!active) return;
+	auto skillCastID = self->GetVarAs<float>(u"skillCastID");
+	if (skillCastID == 0) skillCastID = m_SkillCastID;
+	auto* skillComponent = self->GetComponent<SkillComponent>();
+	if (!skillComponent) return;
+	skillComponent->CastSkill(m_SkillCastID, target->GetObjectID());
 }

dScripts/02_server/Map/AG/AgLaserSensorServer.h

@@ -8,8 +8,7 @@ public:
 	void OnStartup(Entity* self);
 	void OnCollisionPhantom(Entity* self, Entity* target);
 private:
-	SkillComponent* m_Skill;
-	int m_RepelForce = -25;
+	float m_RepelForce = -25.0f;
 	int m_SkillCastID = 163;
 };
 

dScripts/02_server/Map/AG/AgMonumentBirds.cpp

@@ -1,5 +1,8 @@
 #include "AgMonumentBirds.h"
 #include "GameMessages.h"
+#include "Entity.h"
+#include "RenderComponent.h"
+#include "EntityManager.h"
 
 //--------------------------------------------------------------
 //Makes the ag birds fly away when you get close and smashes them.
@@ -16,7 +19,7 @@ void AgMonumentBirds::OnProximityUpdate(Entity* self, Entity* entering, std::str
 
 	if (name == "MonumentBirds" && status == "ENTER") {
 		self->AddTimer("killBird", 1.0f);
-		GameMessages::SendPlayAnimation(self, sOnProximityAnim);
+		RenderComponent::PlayAnimation(self, sOnProximityAnim);
 		self->SetVar<bool>(u"IsFlying", true);
 		self->SetVar<LWOOBJID>(u"PlayerID", entering->GetObjectID());
 	}

dScripts/02_server/Map/AG/AgMonumentLaserServer.cpp

@@ -1,20 +1,17 @@
 #include "AgMonumentLaserServer.h"
+#include "EntityManager.h"
 
 void AgMonumentLaserServer::OnStartup(Entity* self) {
-	/*
-	self->SetProximityRadius(m_Radius, "MonumentLaser");
-
-	std::cout << "Monument Laser " << self->GetObjectID() << " is at " << self->GetPosition().GetX()
-		<< ","<< self->GetPosition().GetY() << "," << self->GetPosition().GetZ() << std::endl;
-	*/
+	auto lasers = EntityManager::Instance()->GetEntitiesInGroup(self->GetVarAsString(u"volGroup"));
+	for (auto laser : lasers) {
+		if (laser) laser->SetBoolean(u"active", true);
+	}
 }
 
-void AgMonumentLaserServer::OnProximityUpdate(Entity* self, Entity* entering, std::string name, std::string status) {
-	/*
-	if (status == "ENTER") {
-
-		std::cout << "Monument laser ID: " << self->GetObjectID() << std::endl;
+void AgMonumentLaserServer::OnDie(Entity* self, Entity* killer) {
+	auto lasers = EntityManager::Instance()->GetEntitiesInGroup(self->GetVarAsString(u"volGroup"));
+	for (auto laser : lasers) {
+		if (laser) laser->SetBoolean(u"active", false);
 	}
-	*/
 }
 

dScripts/02_server/Map/AG/AgMonumentLaserServer.h

@@ -3,8 +3,6 @@
 
 class AgMonumentLaserServer : public CppScripts::Script {
 public:
-	void OnStartup(Entity* self);
-	void OnProximityUpdate(Entity* self, Entity* entering, std::string name, std::string status);
-private:
-	float m_Radius = 25.0f;
+	void OnStartup(Entity* self) override;
+	void OnDie(Entity* self, Entity* killer) override;
 };

dScripts/02_server/Map/AM/AmBlueX.cpp

@@ -18,7 +18,7 @@ void AmBlueX::OnSkillEventFired(Entity* self, Entity* caster, const std::string&
 
 		auto* character = caster->GetCharacter();
 		if (character != nullptr) {
-			character->SetPlayerFlag(self->GetVar<uint32_t>(m_FlagVariable), true);
+			character->SetPlayerFlag(self->GetVar<int32_t>(m_FlagVariable), true);
 		}
 
 		EntityInfo info{};

dScripts/02_server/Map/AM/AmConsoleTeleportServer.cpp

@@ -1,6 +1,6 @@
 #include "AmConsoleTeleportServer.h"
 #include "ChooseYourDestinationNsToNt.h"
-#include "AMFFormat.h"
+#include "Amf3.h"
 
 void AmConsoleTeleportServer::OnStartup(Entity* self) {
 	self->SetVar(u"teleportAnim", m_TeleportAnim);

dScripts/02_server/Map/AM/AmSkullkinDrill.cpp

@@ -5,6 +5,7 @@
 #include "ProximityMonitorComponent.h"
 #include "MissionComponent.h"
 #include "EntityInfo.h"
+#include "RenderComponent.h"
 #include "eStateChangeType.h"
 
 void AmSkullkinDrill::OnStartup(Entity* self) {
@@ -71,7 +72,7 @@ void AmSkullkinDrill::OnSkillEventFired(Entity* self, Entity* caster, const std:
 }
 
 void AmSkullkinDrill::TriggerDrill(Entity* self) {
-	GameMessages::SendPlayAnimation(self, u"slowdown");
+	RenderComponent::PlayAnimation(self, u"slowdown");
 
 	self->AddTimer("killDrill", 10.0f);
 
@@ -171,7 +172,7 @@ void AmSkullkinDrill::OnArrived(Entity* self, uint32_t waypointIndex) {
 	auto* standObj = GetStandObj(self);
 
 	if (waypointIndex == 1) {
-		GameMessages::SendPlayAnimation(self, u"no-spin");
+		RenderComponent::PlayAnimation(self, u"no-spin");
 		GameMessages::SendStopFXEffect(self, true, "active");
 		GameMessages::SendPlayFXEffect(self->GetObjectID(), -1, u"indicator", "indicator");
 
@@ -191,7 +192,7 @@ void AmSkullkinDrill::OnArrived(Entity* self, uint32_t waypointIndex) {
 
 		return;
 	} else {
-		GameMessages::SendPlayAnimation(self, u"idle");
+		RenderComponent::PlayAnimation(self, u"idle");
 		GameMessages::SendPlayFXEffect(self->GetObjectID(), -1, u"spin", "active");
 		GameMessages::SendStopFXEffect(self, true, "indicator");
 	}
@@ -216,7 +217,7 @@ void AmSkullkinDrill::PlayCinematic(Entity* self) {
 void AmSkullkinDrill::PlayAnim(Entity* self, Entity* player, const std::string& animName) {
 	const auto animTime = animName == "spinjitzu-staff-end" ? 0.5f : 1.0f;
 
-	GameMessages::SendPlayAnimation(player, GeneralUtils::ASCIIToUTF16(animName));
+	RenderComponent::PlayAnimation(player, animName);
 
 	self->AddTimer("AnimDone_" + animName, animTime);
 }
@@ -309,7 +310,7 @@ void AmSkullkinDrill::OnTimerDone(Entity* self, std::string timerName) {
 		if (animName == "spinjitzu-staff-windup") {
 			TriggerDrill(self);
 
-			GameMessages::SendPlayAnimation(player, u"spinjitzu-staff-loop");
+			RenderComponent::PlayAnimation(player, u"spinjitzu-staff-loop");
 		} else if (animName == "spinjitzu-staff-end") {
 			FreezePlayer(self, player, false);
 

dScripts/02_server/Map/AM/AmSkullkinDrillStand.cpp

@@ -1,6 +1,8 @@
 #include "AmSkullkinDrillStand.h"
 #include "GameMessages.h"
 #include "dpEntity.h"
+#include "Entity.h"
+#include "RenderComponent.h"
 
 void AmSkullkinDrillStand::OnStartup(Entity* self) {
 	self->SetVar(u"bActive", true);
@@ -31,5 +33,5 @@ void AmSkullkinDrillStand::OnProximityUpdate(Entity* self, Entity* entering, std
 
 	GameMessages::SendPlayFXEffect(entering->GetObjectID(), 1378, u"create", "pushBack");
 
-	GameMessages::SendPlayAnimation(entering, u"knockback-recovery");
+	RenderComponent::PlayAnimation(entering, u"knockback-recovery");
 }

dScripts/02_server/Map/AM/AmSkullkinTower.cpp

@@ -5,6 +5,7 @@
 #include "EntityInfo.h"
 #include "GameMessages.h"
 #include "MissionComponent.h"
+#include "RenderComponent.h"
 
 void AmSkullkinTower::OnStartup(Entity* self) {
 	self->SetProximityRadius(20, "Tower");
@@ -117,13 +118,13 @@ void AmSkullkinTower::OnChildRemoved(Entity* self, Entity* child) {
 	self->SetVar(u"legTable", legTable);
 
 	if (legTable.size() == 2) {
-		GameMessages::SendPlayAnimation(self, u"wobble-1");
+		RenderComponent::PlayAnimation(self, u"wobble-1");
 	} else if (legTable.size() == 1) {
-		GameMessages::SendPlayAnimation(self, u"wobble-2");
+		RenderComponent::PlayAnimation(self, u"wobble-2");
 	} else if (legTable.empty()) {
 		const auto animTime = 2.5f;
 
-		GameMessages::SendPlayAnimation(self, u"fall");
+		RenderComponent::PlayAnimation(self, u"fall");
 
 		self->AddTimer("spawnGuys", animTime - 0.2f);
 

dScripts/02_server/Map/GF/GfCaptainsCannon.cpp

@@ -2,6 +2,7 @@
 #include "GameMessages.h"
 #include "EntityManager.h"
 #include "MissionComponent.h"
+#include "RenderComponent.h"
 #include "eTerminateType.h"
 #include "eStateChangeType.h"
 
@@ -29,7 +30,7 @@ void GfCaptainsCannon::OnUse(Entity* self, Entity* user) {
 
 	GameMessages::SendTeleport(user->GetObjectID(), position, rotation, user->GetSystemAddress());
 
-	GameMessages::SendPlayAnimation(user, u"cannon-strike-no-equip");
+	RenderComponent::PlayAnimation(user, u"cannon-strike-no-equip");
 
 	GameMessages::SendPlayFXEffect(user->GetObjectID(), 6039, u"hook", "hook", LWOOBJID_EMPTY, 1, 1, true);
 
@@ -60,7 +61,7 @@ void GfCaptainsCannon::OnTimerDone(Entity* self, std::string timerName) {
 		for (auto* shark : sharkObjects) {
 			if (shark->GetLOT() != m_SharkItemID) continue;
 
-			GameMessages::SendPlayAnimation(shark, u"cannon");
+			RenderComponent::PlayAnimation(shark, u"cannon");
 		}
 
 		GameMessages::SendPlay2DAmbientSound(player, "{7457d85c-4537-4317-ac9d-2f549219ea87}");

dScripts/02_server/Map/GF/GfTikiTorch.cpp

@@ -5,6 +5,7 @@
 #include "RenderComponent.h"
 #include "eMissionTaskType.h"
 #include "eReplicaComponentType.h"
+#include "RenderComponent.h"
 #include "eTerminateType.h"
 
 void GfTikiTorch::OnStartup(Entity* self) {
@@ -17,7 +18,7 @@ void GfTikiTorch::OnUse(Entity* self, Entity* killer) {
 		return;
 	}
 
-	GameMessages::SendPlayAnimation(self, u"interact");
+	RenderComponent::PlayAnimation(self, u"interact");
 	self->SetI64(u"userID", killer->GetObjectID());
 
 	for (int i = 0; i < m_numspawn; i++) {
@@ -56,7 +57,7 @@ void GfTikiTorch::LightTorch(Entity* self) {
 
 void GfTikiTorch::OnSkillEventFired(Entity* self, Entity* caster, const std::string& message) {
 	if (self->GetBoolean(u"isBurning") && message == "waterspray") {
-		GameMessages::SendPlayAnimation(self, u"water");
+		RenderComponent::PlayAnimation(self, u"water");
 
 		auto* renderComponent = self->GetComponent<RenderComponent>();
 		if (renderComponent != nullptr) {

dScripts/02_server/Map/GF/MastTeleport.cpp

@@ -10,6 +10,7 @@
 #define _USE_MATH_DEFINES
 #include <math.h>
 #endif
+#include "RenderComponent.h"
 
 void MastTeleport::OnStartup(Entity* self) {
 	self->SetNetworkVar<std::string>(u"hookPreconditions", "154;44", UNASSIGNED_SYSTEM_ADDRESS);
@@ -43,10 +44,13 @@ void MastTeleport::OnTimerDone(Entity* self, std::string timerName) {
 		GameMessages::SendTeleport(playerId, position, rotation, player->GetSystemAddress(), true);
 
 		// Hacky fix for odd rotations
-		if (self->GetVar<std::u16string>(u"MastName") != u"Jail") {
+		auto mastName = self->GetVar<std::u16string>(u"MastName");
+		if (mastName == u"Elephant") {
 			GameMessages::SendOrientToAngle(playerId, true, (M_PI / 180) * 140.0f, player->GetSystemAddress());
-		} else {
+		} else if (mastName == u"Jail") {
 			GameMessages::SendOrientToAngle(playerId, true, (M_PI / 180) * 100.0f, player->GetSystemAddress());
+		} else if (mastName == u""){
+			GameMessages::SendOrientToAngle(playerId, true, (M_PI / 180) * 203.0f, player->GetSystemAddress());
 		}
 
 		const auto cinematic = GeneralUtils::UTF16ToWTF8(self->GetVar<std::u16string>(u"Cinematic"));
@@ -60,11 +64,12 @@ void MastTeleport::OnTimerDone(Entity* self, std::string timerName) {
 
 		GameMessages::SendPlayFXEffect(playerId, 6039, u"hook", "hook", LWOOBJID_EMPTY, 1, 1, true);
 
-		GameMessages::SendPlayAnimation(player, u"crow-swing-no-equip", 4.0f);
+		float animationTime = 6.25f;
+		animationTime = RenderComponent::PlayAnimation(player, "crow-swing-no-equip", 4.0f);
 
-		GameMessages::SendPlayAnimation(self, u"swing");
+		RenderComponent::PlayAnimation(self, u"swing");
 
-		self->AddTimer("PlayerAnimDone", 6.25f);
+		self->AddTimer("PlayerAnimDone", animationTime);
 	} else if (timerName == "PlayerAnimDone") {
 		GameMessages::SendStopFXEffect(player, true, "hook");
 

dScripts/02_server/Map/General/BankInteractServer.cpp

@@ -1,24 +1,24 @@
 #include "BankInteractServer.h"
 #include "GameMessages.h"
 #include "Entity.h"
-#include "AMFFormat.h"
+#include "Amf3.h"
 
 void BankInteractServer::OnUse(Entity* self, Entity* user) {
 	AMFArrayValue args;
-	AMFStringValue* bank = new AMFStringValue();
-	bank->SetStringValue("bank");
-	args.InsertValue("state", bank);
 
-	GameMessages::SendUIMessageServerToSingleClient(user, user->GetSystemAddress(), "pushGameState", &args);
+	args.Insert("state", "bank");
+
+	GameMessages::SendUIMessageServerToSingleClient(user, user->GetSystemAddress(), "pushGameState", args);
 }
 
 void BankInteractServer::OnFireEventServerSide(Entity* self, Entity* sender, std::string args, int32_t param1,
 	int32_t param2, int32_t param3) {
 	if (args == "ToggleBank") {
 		AMFArrayValue args;
-		args.InsertValue("visible", new AMFFalseValue());
 
-		GameMessages::SendUIMessageServerToSingleClient(sender, sender->GetSystemAddress(), "ToggleBank", &args);
+		args.Insert("visible", false);
+
+		GameMessages::SendUIMessageServerToSingleClient(sender, sender->GetSystemAddress(), "ToggleBank", args);
 
 		GameMessages::SendNotifyClientObject(self->GetObjectID(), u"CloseBank", 0, 0, LWOOBJID_EMPTY, "", sender->GetSystemAddress());
 	}

dScripts/02_server/Map/General/ExplodingAsset.cpp

@@ -4,6 +4,7 @@
 #include "MissionComponent.h"
 #include "SkillComponent.h"
 #include "eMissionTaskType.h"
+#include "RenderComponent.h"
 
 //TODO: this has to be updated so that you only get killed if you're in a certain radius.
 //And so that all entities in a certain radius are killed, not just the attacker.
@@ -69,23 +70,6 @@ void ExplodingAsset::OnHit(Entity* self, Entity* attacker) {
 }
 
 void ExplodingAsset::OnProximityUpdate(Entity* self, Entity* entering, std::string name, std::string status) {
-	/*
-	if msg.objId:BelongsToFaction{factionID = 1}.bIsInFaction then
-		if (msg.status == "ENTER") then
-			self:PlayAnimation{ animationID = "bounce" }
-			self:PlayFXEffect{ name = "bouncin", effectType = "anim" }
-			self:SetVar("playersNearChest", (self:GetVar("playersNearChest") + 1 ))
-		elseif (msg.status == "LEAVE") then
-			self:SetVar("playersNearChest", (self:GetVar("playersNearChest") - 1 ))
-			if self:GetVar("playersNearChest") < 1 then
-				self:PlayAnimation{ animationID = "idle" }
-				self:StopFXEffect{ name = "bouncin" }
-				self:SetVar("playersNearChest", 0)
-			end
-		end
-	end
-	*/
-
 	auto* destuctableComponent = entering->GetComponent<DestroyableComponent>();
 
 	if (destuctableComponent == nullptr) return;
@@ -95,14 +79,14 @@ void ExplodingAsset::OnProximityUpdate(Entity* self, Entity* entering, std::stri
 	if (!std::count(factions.begin(), factions.end(), 1)) return;
 
 	if (status == "ENTER") {
-		GameMessages::SendPlayAnimation(self, u"bounce");
+		RenderComponent::PlayAnimation(self, u"bounce");
 		GameMessages::SendPlayFXEffect(self, -1, u"anim", "bouncin", LWOOBJID_EMPTY, 1, 1, true);
 		self->SetVar(u"playersNearChest", self->GetVar<int32_t>(u"playersNearChest") + 1);
 	} else if (status == "LEAVE") {
 		self->SetVar(u"playersNearChest", self->GetVar<int32_t>(u"playersNearChest") - 1);
 
 		if (self->GetVar<int32_t>(u"playersNearChest") < 1) {
-			GameMessages::SendPlayAnimation(self, u"idle");
+			RenderComponent::PlayAnimation(self, u"idle");
 			GameMessages::SendStopFXEffect(self, true, "bouncin");
 			self->SetVar<int32_t>(u"playersNearChest", 0);
 		}

dScripts/02_server/Map/General/MailBoxServer.cpp

@@ -1,19 +1,20 @@
 #include "MailBoxServer.h"
-#include "AMFFormat.h"
+#include "Amf3.h"
 #include "GameMessages.h"
+#include "Entity.h"
 
 void MailBoxServer::OnUse(Entity* self, Entity* user) {
-	AMFStringValue* value = new AMFStringValue();
-	value->SetStringValue("Mail");
 	AMFArrayValue args;
-	args.InsertValue("state", value);
-	GameMessages::SendUIMessageServerToSingleClient(user, user->GetSystemAddress(), "pushGameState", &args);
+
+	args.Insert("state", "Mail");
+
+	GameMessages::SendUIMessageServerToSingleClient(user, user->GetSystemAddress(), "pushGameState", args);
 }
 
 void MailBoxServer::OnFireEventServerSide(Entity* self, Entity* sender, std::string args, int32_t param1, int32_t param2, int32_t param3) {
 	if (args == "toggleMail") {
 		AMFArrayValue args;
-		args.InsertValue("visible", new AMFFalseValue());
-		GameMessages::SendUIMessageServerToSingleClient(sender, sender->GetSystemAddress(), "ToggleMail", &args);
+		args.Insert("visible", false);
+		GameMessages::SendUIMessageServerToSingleClient(sender, sender->GetSystemAddress(), "ToggleMail", args);
 	}
 }

dScripts/02_server/Map/General/Ninjago/NjIceRailActivator.cpp

@@ -1,6 +1,8 @@
 #include "NjIceRailActivator.h"
 #include "EntityManager.h"
 #include "GameMessages.h"
+#include "Entity.h"
+#include "RenderComponent.h"
 
 void NjIceRailActivator::OnPlayerRailArrived(Entity* self, Entity* sender, const std::u16string& pathName,
 	int32_t waypoint) {
@@ -9,7 +11,7 @@ void NjIceRailActivator::OnPlayerRailArrived(Entity* self, Entity* sender, const
 		const auto& blockGroup = self->GetVar<std::u16string>(BlockGroupVariable);
 
 		for (auto* block : EntityManager::Instance()->GetEntitiesInGroup(GeneralUtils::UTF16ToWTF8(blockGroup))) {
-			GameMessages::SendPlayAnimation(block, u"explode");
+			RenderComponent::PlayAnimation(block, u"explode");
 
 			const auto blockID = block->GetObjectID();
 

dScripts/02_server/Map/General/StoryBoxInteractServer.cpp

@@ -2,7 +2,8 @@
 #include "Character.h"
 #include "GameMessages.h"
 #include "dServer.h"
-#include "AMFFormat.h"
+#include "Amf3.h"
+#include "Entity.h"
 
 void StoryBoxInteractServer::OnUse(Entity* self, Entity* user) {
 	if (self->GetVar<bool>(u"hasCustomText")) {
@@ -11,24 +12,18 @@ void StoryBoxInteractServer::OnUse(Entity* self, Entity* user) {
 		{
 			AMFArrayValue args;
 
-			auto* state = new AMFStringValue();
-			state->SetStringValue("Story");
+			args.Insert("state", "Story");
 
-			args.InsertValue("state", state);
-
-			GameMessages::SendUIMessageServerToSingleClient(user, user->GetSystemAddress(), "pushGameState", &args);
+			GameMessages::SendUIMessageServerToSingleClient(user, user->GetSystemAddress(), "pushGameState", args);
 		}
 
 		user->AddCallbackTimer(0.1f, [user, customText]() {
 			AMFArrayValue args;
 
-			auto* text = new AMFStringValue();
-			text->SetStringValue(customText);
+			args.Insert("visible", true);
+			args.Insert("text", customText);
 
-			args.InsertValue("visible", new AMFTrueValue());
-			args.InsertValue("text", text);
-
-			GameMessages::SendUIMessageServerToSingleClient(user, user->GetSystemAddress(), "ToggleStoryBox", &args);
+			GameMessages::SendUIMessageServerToSingleClient(user, user->GetSystemAddress(), "ToggleStoryBox", args);
 			});
 
 		return;

dScripts/02_server/Map/NS/NsLegoClubDoor.cpp

@@ -1,7 +1,7 @@
 #include "NsLegoClubDoor.h"
 #include "dZoneManager.h"
 #include "GameMessages.h"
-#include "AMFFormat.h"
+#include "Amf3.h"
 
 void NsLegoClubDoor::OnStartup(Entity* self) {
 	self->SetVar(u"currentZone", (int32_t)dZoneManager::Instance()->GetZoneID().GetMapID());
@@ -12,116 +12,56 @@ void NsLegoClubDoor::OnStartup(Entity* self) {
 
 	args = {};
 
-	AMFStringValue* callbackClient = new AMFStringValue();
-	callbackClient->SetStringValue(std::to_string(self->GetObjectID()));
-	args.InsertValue("callbackClient", callbackClient);
+	args.Insert("callbackClient", std::to_string(self->GetObjectID()));
+	args.Insert("strIdentifier", "choiceDoor");
+	args.Insert("title", "%[UI_CHOICE_DESTINATION]");
 
-	AMFStringValue* strIdentifier = new AMFStringValue();
-	strIdentifier->SetStringValue("choiceDoor");
-	args.InsertValue("strIdentifier", strIdentifier);
-
-	AMFStringValue* title = new AMFStringValue();
-	title->SetStringValue("%[UI_CHOICE_DESTINATION]");
-	args.InsertValue("title", title);
-
-	AMFArrayValue* choiceOptions = new AMFArrayValue();
+	AMFArrayValue* choiceOptions = args.InsertArray("options");
 
 	{
-		AMFArrayValue* nsArgs = new AMFArrayValue();
+		AMFArrayValue* nsArgs = choiceOptions->PushArray();
 
-		AMFStringValue* image = new AMFStringValue();
-		image->SetStringValue("textures/ui/zone_thumnails/Nimbus_Station.dds");
-		nsArgs->InsertValue("image", image);
-
-		AMFStringValue* caption = new AMFStringValue();
-		caption->SetStringValue("%[UI_CHOICE_NS]");
-		nsArgs->InsertValue("caption", caption);
-
-		AMFStringValue* identifier = new AMFStringValue();
-		identifier->SetStringValue("zoneID_1200");
-		nsArgs->InsertValue("identifier", identifier);
-
-		AMFStringValue* tooltipText = new AMFStringValue();
-		tooltipText->SetStringValue("%[UI_CHOICE_NS_HOVER]");
-		nsArgs->InsertValue("tooltipText", tooltipText);
-
-		choiceOptions->PushBackValue(nsArgs);
+		nsArgs->Insert("image", "textures/ui/zone_thumnails/Nimbus_Station.dds");
+		nsArgs->Insert("caption", "%[UI_CHOICE_NS]");
+		nsArgs->Insert("identifier", "zoneID_1200");
+		nsArgs->Insert("tooltipText", "%[UI_CHOICE_NS_HOVER]");
 	}
 
 	{
-		AMFArrayValue* ntArgs = new AMFArrayValue();
+		AMFArrayValue* ntArgs = choiceOptions->PushArray();
 
-		AMFStringValue* image = new AMFStringValue();
-		image->SetStringValue("textures/ui/zone_thumnails/Nexus_Tower.dds");
-		ntArgs->InsertValue("image", image);
-
-		AMFStringValue* caption = new AMFStringValue();
-		caption->SetStringValue("%[UI_CHOICE_NT]");
-		ntArgs->InsertValue("caption", caption);
-
-		AMFStringValue* identifier = new AMFStringValue();
-		identifier->SetStringValue("zoneID_1900");
-		ntArgs->InsertValue("identifier", identifier);
-
-		AMFStringValue* tooltipText = new AMFStringValue();
-		tooltipText->SetStringValue("%[UI_CHOICE_NT_HOVER]");
-		ntArgs->InsertValue("tooltipText", tooltipText);
-
-		choiceOptions->PushBackValue(ntArgs);
+		ntArgs->Insert("image", "textures/ui/zone_thumnails/Nexus_Tower.dds");
+		ntArgs->Insert("caption", "%[UI_CHOICE_NT]");
+		ntArgs->Insert("identifier", "zoneID_1900");
+		ntArgs->Insert("tooltipText", "%[UI_CHOICE_NT_HOVER]");
 	}
 
 	options = choiceOptions;
-
-	args.InsertValue("options", choiceOptions);
 }
 
 void NsLegoClubDoor::OnUse(Entity* self, Entity* user) {
 	auto* player = user;
 
 	if (CheckChoice(self, player)) {
-		AMFArrayValue* multiArgs = new AMFArrayValue();
+		AMFArrayValue multiArgs;
 
-		AMFStringValue* callbackClient = new AMFStringValue();
-		callbackClient->SetStringValue(std::to_string(self->GetObjectID()));
-		multiArgs->InsertValue("callbackClient", callbackClient);
-
-		AMFStringValue* strIdentifier = new AMFStringValue();
-		strIdentifier->SetStringValue("choiceDoor");
-		multiArgs->InsertValue("strIdentifier", strIdentifier);
-
-		AMFStringValue* title = new AMFStringValue();
-		title->SetStringValue("%[UI_CHOICE_DESTINATION]");
-		multiArgs->InsertValue("title", title);
-
-		multiArgs->InsertValue("options", options);
+		multiArgs.Insert("callbackClient", std::to_string(self->GetObjectID()));
+		multiArgs.Insert("strIdentifier", "choiceDoor");
+		multiArgs.Insert("title", "%[UI_CHOICE_DESTINATION]");
+		multiArgs.Insert("options", static_cast<AMFBaseValue*>(options));
 
 		GameMessages::SendUIMessageServerToSingleClient(player, player->GetSystemAddress(), "QueueChoiceBox", multiArgs);
+
+		multiArgs.Remove("options", false); // We do not want the local amf to delete the options!
 	} else if (self->GetVar<int32_t>(u"currentZone") != m_ChoiceZoneID) {
-		AMFArrayValue* multiArgs = new AMFArrayValue();
+		AMFArrayValue multiArgs;
+		multiArgs.Insert("state", "Lobby");
 
-		AMFStringValue* state = new AMFStringValue();
-		state->SetStringValue("Lobby");
-		multiArgs->InsertValue("state", state);
-
-		AMFArrayValue* context = new AMFArrayValue();
-
-		AMFStringValue* user = new AMFStringValue();
-		user->SetStringValue(std::to_string(player->GetObjectID()));
-		context->InsertValue("user", user);
-
-		AMFStringValue* callbackObj = new AMFStringValue();
-		callbackObj->SetStringValue(std::to_string(self->GetObjectID()));
-		context->InsertValue("callbackObj", callbackObj);
-
-		AMFStringValue* helpVisible = new AMFStringValue();
-		helpVisible->SetStringValue("show");
-		context->InsertValue("HelpVisible", helpVisible);
-
-		AMFStringValue* type = new AMFStringValue();
-		type->SetStringValue("Lego_Club_Valid");
-		context->InsertValue("type", type);
-
-		multiArgs->InsertValue("context", context);
+		AMFArrayValue* context = multiArgs.InsertArray("context");
+		context->Insert("user", std::to_string(player->GetObjectID()));
+		context->Insert("callbackObj", std::to_string(self->GetObjectID()));
+		context->Insert("HelpVisible", "show");
+		context->Insert("type", "Lego_Club_Valid");
 
 		GameMessages::SendUIMessageServerToSingleClient(player, player->GetSystemAddress(), "pushGameState", multiArgs);
 	} else {