refactor: Rewrite Entity Component System

.editorconfig

@@ -10,7 +10,7 @@ trim_trailing_whitespace=true
 end_of_line=lf
 insert_final_newline=true
 
-[*.{c++,cc,cpp,cxx,h,h++,hh,hpp,hxx,inl,ipp,tlh,tli}]
+[*.{c++,cc,cpp,cxx,h,h++,hh,hpp,hxx,inl,ipp,tlh,tli,tcc,tpp}]
 
 vc_generate_documentation_comments=doxygen_slash_star
 

CMakeLists.txt

@@ -305,7 +305,7 @@ file(
 file(
 	GLOB HEADERS_DGAME
 	LIST_DIRECTORIES false
-	${PROJECT_SOURCE_DIR}/dGame/Entity.h
+	${PROJECT_SOURCE_DIR}/dGame/dEntity/Entity.h
 	${PROJECT_SOURCE_DIR}/dGame/dGameMessages/GameMessages.h
 	${PROJECT_SOURCE_DIR}/dGame/EntityManager.h
 	${PROJECT_SOURCE_DIR}/dScripts/CppScripts.h

CMakeVariables.txt

@@ -17,7 +17,7 @@ __dynamic=1
 # Set __compile_backtrace__ to 1 to compile the backtrace library instead of using system libraries.
 # __compile_backtrace__=1
 # Set to the number of jobs (make -j equivalent) to compile the mariadbconn files with.
-__maria_db_connector_compile_jobs__=1
+__maria_db_connector_compile_jobs__=
 # When set to 1 and uncommented, compiling and linking testing folders and libraries will be done.
 __enable_testing__=1
 # The path to OpenSSL.  Change this if your OpenSSL install path is different than the default.

dCommon/LDFFormat.h

@@ -33,7 +33,7 @@ class LDFBaseData {
 
 	virtual void WriteToPacket(RakNet::BitStream* packet) = 0;
 
-	virtual const std::u16string& GetKey() = 0;
+	virtual const std::u16string& GetKey() const = 0;
 
 	virtual eLDFType GetValueType() = 0;
 
@@ -117,7 +117,7 @@ class LDFData: public LDFBaseData {
 	/*!
 	 \return The key
 	 */
-	const std::u16string& GetKey(void) override { return this->key; }
+	const std::u16string& GetKey(void) const override { return this->key; }
 
 	//! Gets the LDF Type
 	/*!

dCommon/dEnums/dCommonVars.h

@@ -56,6 +56,13 @@ const uint32_t LWOCLONEID_INVALID = -1;     //!< Invalid LWOCLONEID
 const uint16_t LWOINSTANCEID_INVALID = -1;  //!< Invalid LWOINSTANCEID
 const uint16_t LWOMAPID_INVALID = -1;       //!< Invalid LWOMAPID
 const uint64_t LWOZONEID_INVALID = 0;       //!< Invalid LWOZONEID
+const LOT LOT_ZONE_CONTROL = 2365;
+const LOT LOT_3D_AMBIENT_SOUND = 6368;
+const LOT LOT_MODEL_IN_WORLD = 14;
+const LOT LOT_THINKING_CAP = 6086;
+const LOT LOT_ROCKET = 6416;
+const LOT LOT_LEGACY_RESPAWN_POINT = 4945;
+
 
 const float PI = 3.14159f;
 

dCommon/dEnums/ePhysicsBehaviorType.h

@@ -0,0 +1,14 @@
+#ifndef __EPHYSICSBEHAVIORTYPE__H__
+#define __EPHYSICSBEHAVIORTYPE__H__
+
+#include <cstdint>
+
+enum class ePhysicsBehaviorType : int32_t {
+	INVALID = -1,
+	GROUND,
+	FLYING,
+	STANDARD,
+	DYNAMIC
+};
+
+#endif  //!__EPHYSICSBEHAVIORTYPE__H__

dCommon/dEnums/eReplicaComponentType.h

@@ -11,14 +11,14 @@ enum class eReplicaComponentType : uint32_t {
 	CHARACTER,
 	SCRIPT,
 	BOUNCER,
-	BUFF, // buff is really 98, this is DESTROYABLE
+	DESTROYABLE,
 	GHOST,
 	SKILL,
-	SPAWNER,
+	SPAWN,
 	ITEM,
-	REBUILD,
-	REBUILD_START,
-	REBUILD_ACTIVATOR,
+	MODULAR_BUILD,
+	BUILD_CONTROLLER,
+	BUILD_ACTIVATOR,
 	ICON_ONLY,
 	VENDOR,
 	INVENTORY,
@@ -33,8 +33,8 @@ enum class eReplicaComponentType : uint32_t {
 	PET,
 	PLATFORM_BOUNDARY,
 	MODULE,
-	ARCADE,
-	VEHICLE_PHYSICS, // Havok demo based
+	JETPACKPAD,
+	HAVOK_VEHICLE_PHYSICS,
 	MOVEMENT_AI,
 	EXHIBIT,
 	OVERHEAD_ICON,
@@ -46,23 +46,23 @@ enum class eReplicaComponentType : uint32_t {
 	SCRIPTED_ACTIVITY,
 	PHANTOM_PHYSICS,
 	SPRINGPAD,
-	MODEL,
+	MODEL_BEHAVIOR,
 	PROPERTY_ENTRANCE,
 	FX,
 	PROPERTY_MANAGEMENT,
-	VEHICLE_PHYSICS_NEW, // internal physics based on havok
+	VEHICLE_PHYSICS,
 	PHYSICS_SYSTEM,
 	QUICK_BUILD,
 	SWITCH,
-	ZONE_CONTROL, // Minigame
-	CHANGLING,
+	MINIGAME_CONTROL,
+	CHANGLING_BUILD,
 	CHOICE_BUILD,
 	PACKAGE,
 	SOUND_REPEATER,
 	SOUND_AMBIENT_2D,
 	SOUND_AMBIENT_3D,
 	PRECONDITION,
-	PLAYER_FLAG,
+	FLAG,
 	CUSTOM_BUILD_ASSEMBLY,
 	BASE_COMBAT_AI,
 	MODULE_ASSEMBLY,
@@ -71,8 +71,8 @@ enum class eReplicaComponentType : uint32_t {
 	GENERIC_ACTIVATOR,
 	PROPERTY_VENDOR,
 	HF_LIGHT_DIRECTION_GADGET,
-	ROCKET_LAUNCH,
-	ROCKET_LANDING,
+	ROCKET_LAUNCHPAD_CONTROL,
+	ROCKET_ANIMATION_CONTROL,
 	TRIGGER,
 	DROPPED_LOOT,
 	RACING_CONTROL,
@@ -84,7 +84,7 @@ enum class eReplicaComponentType : uint32_t {
 	SOUND_TRIGGER,
 	PROXIMITY_MONITOR,
 	RACING_SOUND_TRIGGER,
-	CHAT,
+	CHAT_BUBBLE,
 	FRIENDS_LIST,
 	GUILD,
 	LOCAL_SYSTEM,
@@ -101,27 +101,27 @@ enum class eReplicaComponentType : uint32_t {
 	TRADE,
 	USER_CONTROL,
 	IGNORE_LIST,
-	ROCKET_LAUNCH_LUP,
-	BUFF_REAL, // the real buff component, should just be name BUFF
+	MULTI_ZONE_ENTRANCE,
+	BUFF,
 	INTERACTION_MANAGER,
 	DONATION_VENDOR,
 	COMBAT_MEDIATOR,
-	COMMENDATION_VENDOR,
+	ACHIEVEMENT_VENDOR,
 	GATE_RUSH_CONTROL,
 	RAIL_ACTIVATOR,
 	ROLLER,
 	PLAYER_FORCED_MOVEMENT,
 	CRAFTING,
 	POSSESSABLE,
 	LEVEL_PROGRESSION,
-	POSSESSOR,
+	POSSESSION,
 	MOUNT_CONTROL,
 	UNKNOWN_112,
 	PROPERTY_PLAQUE,
 	BUILD_BORDER,
 	UNKNOWN_115,
 	CULLING_PLANE,
-	DESTROYABLE = 1000 // Actually 7
+	NUMBER_OF_COMPONENTS
 };
 
 #endif  //!__EREPLICACOMPONENTTYPE__H__

dCommon/dEnums/eUgcModerationStatus.h

@@ -0,0 +1,13 @@
+
+#ifndef __EUGCMODERATIONSTATUS__H__
+#define __EUGCMODERATIONSTATUS__H__
+
+#include <cstdint>
+
+enum class eUgcModerationStatus : uint32_t {
+	NoStatus,
+	Approved,
+	Rejected,
+};
+
+#endif  //!__EUGCMODERATIONSTATUS__H__

dDatabase/Tables/CDComponentsRegistryTable.cpp

@@ -90,4 +90,11 @@ int32_t CDComponentsRegistryTable::GetByIDAndType(uint32_t id, eReplicaComponent
 	return defaultValue;
 #endif
 }
-
+std::vector<std::pair<eReplicaComponentType, uint32_t>> CDComponentsRegistryTable::GetTemplateComponents(LOT templateId) {
+	std::vector<std::pair<eReplicaComponentType, uint32_t>> components;
+	for (int8_t i = 0; static_cast<eReplicaComponentType>(i) < eReplicaComponentType::NUMBER_OF_COMPONENTS; i++) {
+		auto compId = GetByIDAndType(templateId, static_cast<eReplicaComponentType>(i), -1);
+		if (compId != -1) components.push_back(std::make_pair(static_cast<eReplicaComponentType>(i), compId));
+	}
+	return components;
+}

dDatabase/Tables/CDComponentsRegistryTable.h

@@ -2,6 +2,7 @@
 
 // Custom Classes
 #include "CDTable.h"
+#include "dCommonVars.h"
 
 enum class eReplicaComponentType : uint32_t;
 struct CDComponentsRegistry {
@@ -18,4 +19,5 @@ class CDComponentsRegistryTable : public CDTable<CDComponentsRegistryTable> {
 public:
 	CDComponentsRegistryTable();
 	int32_t GetByIDAndType(uint32_t id, eReplicaComponentType componentType, int32_t defaultValue = 0);
+	std::vector<std::pair<eReplicaComponentType, uint32_t>> GetTemplateComponents(LOT templateId);
 };

dDatabase/Tables/CDItemComponentTable.cpp

@@ -1,6 +1,8 @@
 #include "CDItemComponentTable.h"
 #include "GeneralUtils.h"
 
+#include "eItemType.h"
+
 CDItemComponent CDItemComponentTable::Default = {};
 
 //! Constructor
@@ -74,20 +76,20 @@ CDItemComponentTable::CDItemComponentTable(void) {
 #endif
 }
 
-const CDItemComponent& CDItemComponentTable::GetItemComponentByID(unsigned int skillID) {
-	const auto& it = this->entries.find(skillID);
+const CDItemComponent& CDItemComponentTable::GetItemComponentByID(unsigned int id) {
+	const auto& it = this->entries.find(id);
 	if (it != this->entries.end()) {
 		return it->second;
 	}
 
 #ifndef CDCLIENT_CACHE_ALL
 	std::stringstream query;
 
-	query << "SELECT * FROM ItemComponent WHERE id = " << std::to_string(skillID);
+	query << "SELECT * FROM ItemComponent WHERE id = " << std::to_string(id);
 
 	auto tableData = CDClientDatabase::ExecuteQuery(query.str());
 	if (tableData.eof()) {
-		entries.insert(std::make_pair(skillID, Default));
+		entries.insert(std::make_pair(id, Default));
 		return Default;
 	}
 
@@ -98,7 +100,7 @@ const CDItemComponent& CDItemComponentTable::GetItemComponentByID(unsigned int s
 		entry.baseValue = tableData.getIntField("baseValue", -1);
 		entry.isKitPiece = tableData.getIntField("isKitPiece", -1) == 1 ? true : false;
 		entry.rarity = tableData.getIntField("rarity", 0);
-		entry.itemType = tableData.getIntField("itemType", -1);
+		entry.itemType = static_cast<eItemType>(tableData.getIntField("itemType", -1));
 		entry.itemInfo = tableData.getInt64Field("itemInfo", -1);
 		entry.inLootTable = tableData.getIntField("inLootTable", -1) == 1 ? true : false;
 		entry.inVendor = tableData.getIntField("inVendor", -1) == 1 ? true : false;
@@ -140,7 +142,7 @@ const CDItemComponent& CDItemComponentTable::GetItemComponentByID(unsigned int s
 		tableData.nextRow();
 	}
 
-	const auto& it2 = this->entries.find(skillID);
+	const auto& it2 = this->entries.find(id);
 	if (it2 != this->entries.end()) {
 		return it2->second;
 	}

dDatabase/Tables/CDItemComponentTable.h

@@ -4,13 +4,15 @@
 #include "CDTable.h"
 #include "dCommonVars.h"
 
+enum class eItemType : int32_t;
+
 struct CDItemComponent {
 	unsigned int id;                        //!< The Component ID
 	std::string equipLocation;         //!< The equip location
 	unsigned int baseValue;                 //!< The monetary base value of the item
 	bool isKitPiece;                //!< Whether or not the item belongs to a kit
 	unsigned int rarity;                    //!< The rarity of the item
-	unsigned int itemType;                  //!< The item type
+	eItemType itemType;                  //!< The item type
 	int64_t itemInfo;                  //!< The item info
 	bool inLootTable;               //!< Whether or not the item is in a loot table
 	bool inVendor;                  //!< Whether or not the item is in a vendor inventory
@@ -58,7 +60,7 @@ class CDItemComponentTable : public CDTable<CDItemComponentTable> {
 	static std::map<LOT, uint32_t> ParseCraftingCurrencies(const CDItemComponent& itemComponent);
 
 	// Gets an entry by ID
-	const CDItemComponent& GetItemComponentByID(unsigned int skillID);
+	const CDItemComponent& GetItemComponentByID(unsigned int id);
 
 	static CDItemComponent Default;
 };

dDatabase/Tables/CDPhysicsComponentTable.cpp

@@ -37,10 +37,7 @@ CDPhysicsComponentTable::~CDPhysicsComponentTable() {
 }
 
 CDPhysicsComponent* CDPhysicsComponentTable::GetByID(unsigned int componentID) {
-	for (auto e : m_entries) {
-		if (e.first == componentID) return e.second;
-	}
-
-	return nullptr;
+	auto itr = m_entries.find(componentID);
+	return itr != m_entries.end() ? itr->second : nullptr;
 }
 

dGame/CMakeLists.txt

@@ -1,5 +1,4 @@
 set(DGAME_SOURCES "Character.cpp"
-		"Entity.cpp"
 		"EntityManager.cpp"
 		"LeaderboardManager.cpp"
 		"Player.cpp"