[Loot] Remove from shared memory, simplification (#3988)

* First pass of pulling loot out of shared memory, functional * More code cleanup * More cleanup * More cleanup * More cleanup * Add loot reload type * Reload, logging * Update npc.h * Cleanup * Logging, don't load attempt to load loottable id 0 * Update worldserver.cpp * Update client.cpp * Update zone_loot.cpp * PR feedback * Update zone.cpp * Memory leak suggestion * Update CMakeLists.txt * Post rebase issues
2026-08-28 20:07:56 +00:00 · 2024-02-05 15:17:53 -06:00
parent fcbf5cae47
commit c654c1d674
55 changed files with 1595 additions and 1890 deletions
@@ -0,0 +1,200 @@
+#include <vector>
+#include "zone.h"
+#include "../common/repositories/loottable_repository.h"
+#include "../common/repositories/loottable_entries_repository.h"
+#include "../common/repositories/lootdrop_repository.h"
+#include "../common/repositories/lootdrop_entries_repository.h"
+
+void Zone::LoadLootTables(const std::vector<uint32> &loottable_ids)
+{
+	BenchTimer timer;
+
+	// check if table is already loaded
+	for (const auto &e: loottable_ids) {
+		for (const auto &f: m_loottables) {
+			if (e == f.id) {
+				LogLootDetail("Loottable [{}] already loaded", e);
+				return;
+			}
+		}
+	}
+
+	if (loottable_ids.empty()) {
+		LogLootDetail("No loottables to load");
+		return;
+	}
+
+	auto loottables = LoottableRepository::GetWhere(
+		content_db,
+		fmt::format(
+			"id IN ({})",
+			Strings::Join(loottable_ids, ",")
+		)
+	);
+
+	auto loottable_entries = LoottableEntriesRepository::GetWhere(
+		content_db,
+		fmt::format(
+			"loottable_id IN ({})",
+			Strings::Join(loottable_ids, ",")
+		)
+	);
+
+	std::vector<uint32> lootdrop_ids;
+	for (const auto     &e: loottable_entries) {
+		if (std::find(
+			lootdrop_ids.begin(),
+			lootdrop_ids.end(),
+			e.lootdrop_id
+		) == lootdrop_ids.end()) {
+			lootdrop_ids.push_back(e.lootdrop_id);
+		}
+	}
+
+	if (lootdrop_ids.empty()) {
+		LogLoot("No lootdrops to load for loottable(s) [{}]", Strings::Join(loottable_ids, ","));
+		return;
+	}
+
+	auto lootdrops = LootdropRepository::GetWhere(
+		content_db,
+		fmt::format(
+			"id IN ({})",
+			Strings::Join(lootdrop_ids, ",")
+		)
+	);
+
+	auto lootdrop_entries = LootdropEntriesRepository::GetWhere(
+		content_db,
+		fmt::format(
+			"lootdrop_id IN ({})",
+			Strings::Join(lootdrop_ids, ",")
+		)
+	);
+
+	// emplace back tables to m_loottables if not exists
+	for (const auto &e: loottables) {
+		bool has_table = false;
+
+		for (const auto &l: m_loottables) {
+			if (e.id == l.id) {
+				has_table = true;
+				break;
+			}
+		}
+		if (!has_table) {
+			// add loottable
+			m_loottables.emplace_back(e);
+
+			// add loottable entries
+			for (const auto &f: loottable_entries) {
+				if (e.id == f.loottable_id) {
+					m_loottable_entries.emplace_back(f);
+
+					// add lootdrop
+					for (const auto &g: lootdrops) {
+						if (f.lootdrop_id == g.id) {
+							m_lootdrops.emplace_back(g);
+
+							// add lootdrop entries
+							for (const auto &h: lootdrop_entries) {
+								if (g.id == h.lootdrop_id) {
+									m_lootdrop_entries.emplace_back(h);
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	if (loottable_ids.size() > 1) {
+		LogInfo("Loaded [{}] loottables ({}s)", m_loottables.size(), std::to_string(timer.elapsed()));
+	}
+}
+
+void Zone::LoadLootTable(const uint32 loottable_id)
+{
+	if (loottable_id == 0) {
+		return;
+	}
+
+	LoadLootTables({loottable_id});
+}
+
+void Zone::ClearLootTables()
+{
+	m_loottables.clear();
+	m_loottable_entries.clear();
+	m_lootdrops.clear();
+	m_lootdrop_entries.clear();
+}
+
+void Zone::ReloadLootTables()
+{
+	ClearLootTables();
+
+	std::vector<uint32> loottable_ids = {};
+	for (const auto& n : entity_list.GetNPCList()) {
+		// only add loottable if it's not already in the list
+		if (n.second->GetLoottableID() != 0) {
+			if (std::find(
+				loottable_ids.begin(),
+				loottable_ids.end(),
+				n.second->GetLoottableID()
+			) == loottable_ids.end()) {
+				loottable_ids.push_back(n.second->GetLoottableID());
+			}
+		}
+	}
+
+	LoadLootTables(loottable_ids);
+}
+
+LoottableRepository::Loottable *Zone::GetLootTable(const uint32 loottable_id)
+{
+	for (auto &e: m_loottables) {
+		if (e.id == loottable_id) {
+			return &e;
+		}
+	}
+
+	return nullptr;
+}
+
+std::vector<LoottableEntriesRepository::LoottableEntries> Zone::GetLootTableEntries(const uint32 loottable_id) const
+{
+	std::vector<LoottableEntriesRepository::LoottableEntries> entries = {};
+	for (const auto &e: m_loottable_entries) {
+		if (e.loottable_id == loottable_id) {
+			entries.emplace_back(e);
+		}
+	}
+
+	return entries;
+}
+
+LootdropRepository::Lootdrop Zone::GetLootdrop(const uint32 lootdrop_id) const
+{
+	for (const auto &e: m_lootdrops) {
+		if (e.id == lootdrop_id) {
+			return e;
+		}
+	}
+
+	return {};
+}
+
+std::vector<LootdropEntriesRepository::LootdropEntries> Zone::GetLootdropEntries(const uint32 lootdrop_id) const
+{
+	std::vector<LootdropEntriesRepository::LootdropEntries> entries = {};
+	for (const auto &e: m_lootdrop_entries) {
+		if (e.lootdrop_id == lootdrop_id) {
+			entries.emplace_back(e);
+		}
+	}
+
+	return entries;
+}
+