[Skill Caps] Further improvements (#4205)

common/CMakeLists.txt

@@ -83,6 +83,7 @@ SET(common_sources
     shared_tasks.cpp
     shareddb.cpp
     skills.cpp
+    skill_caps.cpp
     spdat.cpp
     strings.cpp
     struct_strategy.cpp
@@ -492,7 +493,7 @@ SET(repositories
     repositories/zone_repository.h
     repositories/zone_points_repository.h
 
-    )
+)
 
 SET(common_headers
     additive_lagged_fibonacci_engine.h
@@ -592,7 +593,7 @@ SET(common_headers
     ptimer.h
     queue.h
     races.h
-	raid.h
+    raid.h
     random.h
     rdtsc.h
     rulesys.h
@@ -606,6 +607,7 @@ SET(common_headers
     shared_tasks.h
     shareddb.h
     skills.h
+    skill_caps.h
     spdat.h
     strings.h
     struct_strategy.h
@@ -681,13 +683,13 @@ SOURCE_GROUP(Event FILES
     event/event_loop.h
     event/timer.h
     event/task.h
-    )
+)
 
 SOURCE_GROUP(Json FILES
     json/json.h
     json/jsoncpp.cpp
     json/json-forwards.h
-    )
+)
 
 SOURCE_GROUP(Net FILES
     net/console_server.cpp
@@ -724,7 +726,7 @@ SOURCE_GROUP(Net FILES
     net/websocket_server.h
     net/websocket_server_connection.cpp
     net/websocket_server_connection.h
-    )
+)
 
 SOURCE_GROUP(Patches FILES
     patches/patches.h
@@ -768,12 +770,12 @@ SOURCE_GROUP(Patches FILES
     patches/titanium_limits.cpp
     patches/uf.cpp
     patches/uf_limits.cpp
-    )
+)
 
 SOURCE_GROUP(StackWalker FILES
     StackWalker/StackWalker.h
     StackWalker/StackWalker.cpp
-    )
+)
 
 SOURCE_GROUP(Util FILES
     util/memory_stream.h
@@ -781,7 +783,7 @@ SOURCE_GROUP(Util FILES
     util/directory.h
     util/uuid.cpp
     util/uuid.h
-    )
+)
 
 INCLUDE_DIRECTORIES(Patches SocketLib StackWalker)
 
@@ -794,6 +796,6 @@ ENDIF (UNIX)
 
 IF (WIN32 AND EQEMU_BUILD_PCH)
     TARGET_PRECOMPILE_HEADERS(common PRIVATE pch/pch.h)
-ENDIF()
+ENDIF ()
 
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)

common/shareddb.cpp

@@ -1914,24 +1914,3 @@ void SharedDatabase::SetSharedSpellsCount(uint32 shared_spells_count)
 {
 	SharedDatabase::m_shared_spells_count = shared_spells_count;
 }
-
-uint16 SharedDatabase::GetSkillCap(uint8 class_id, EQ::skills::SkillType skill_id, uint8 level)
-{
-	const auto& l = SkillCapsRepository::GetWhere(
-		*this,
-		fmt::format(
-			"`class_id` = {} AND `skill_id` = {} AND `level` = {} LIMIT 1",
-			class_id,
-			static_cast<uint16>(skill_id),
-			level
-		)
-	);
-
-	if (l.empty()) {
-		return 0;
-	}
-
-	const auto& e = l.front();
-
-	return e.cap;
-}

common/shareddb.h

@@ -160,8 +160,6 @@ public:
 	uint32 GetSharedItemsCount() { return m_shared_items_count; }
 	uint32 GetItemsCount();
 
-	uint16 GetSkillCap(uint8 class_id, EQ::skills::SkillType skill_id, uint8 level);
-
 	/**
 	 * spells
 	 */

common/skill_caps.cpp

@@ -0,0 +1,91 @@
+#include "skill_caps.h"
+
+SkillCaps *SkillCaps::SetContentDatabase(Database *db)
+{
+	m_content_database = db;
+
+	return this;
+}
+
+SkillCapsRepository::SkillCaps SkillCaps::GetSkillCap(uint8 class_id, EQ::skills::SkillType skill_id, uint8 level)
+{
+	if (!IsPlayerClass(class_id)) {
+		return SkillCapsRepository::NewEntity();
+	}
+
+	for (const auto &e: m_skill_caps) {
+		if (
+			e.class_id == class_id &&
+			e.level == level &&
+			static_cast<EQ::skills::SkillType>(e.skill_id) == skill_id
+			) {
+			return e;
+		}
+	}
+
+	return SkillCapsRepository::NewEntity();
+}
+
+uint8 SkillCaps::GetTrainLevel(uint8 class_id, EQ::skills::SkillType skill_id, uint8 level)
+{
+	if (
+		!IsPlayerClass(class_id) ||
+		class_id > Class::PLAYER_CLASS_COUNT ||
+		static_cast<uint32>(skill_id) > (EQ::skills::HIGHEST_SKILL + 1)
+		) {
+		return 0;
+	}
+
+	const uint8 skill_cap_max_level = (
+		RuleI(Character, SkillCapMaxLevel) > 0 ?
+			RuleI(Character, SkillCapMaxLevel) :
+			RuleI(Character, MaxLevel)
+	);
+
+	const uint8 max_level = level > skill_cap_max_level ? level : skill_cap_max_level;
+
+	for (const auto &e: m_skill_caps) {
+		for (uint8 current_level = 1; current_level <= max_level; current_level++) {
+			if (
+				e.class_id == class_id &&
+				static_cast<EQ::skills::SkillType>(e.skill_id) == skill_id &&
+				e.level == current_level
+				) {
+				return current_level;
+			}
+		}
+	}
+
+	return 0;
+}
+
+void SkillCaps::LoadSkillCaps()
+{
+	const auto &l = SkillCapsRepository::All(*m_content_database);
+
+	m_skill_caps.reserve(l.size());
+
+	for (const auto &e: l) {
+		if (
+			e.level < 1 ||
+			!IsPlayerClass(e.class_id) ||
+			static_cast<EQ::skills::SkillType>(e.skill_id) >= EQ::skills::SkillCount
+			) {
+			continue;
+		}
+
+		m_skill_caps.emplace_back(e);
+	}
+
+	LogInfo(
+		"Loaded [{}] Skill Cap Entr{}",
+		l.size(),
+		l.size() != 1 ? "ies" : "y"
+	);
+}
+
+void SkillCaps::ReloadSkillCaps()
+{
+	ClearSkillCaps();
+	LoadSkillCaps();
+}

common/skill_caps.h

@@ -0,0 +1,26 @@
+#ifndef CODE_SKILL_CAPS_H
+#define CODE_SKILL_CAPS_H
+
+#include "repositories/skill_caps_repository.h"
+#include "types.h"
+#include "classes.h"
+#include "skills.h"
+
+class SkillCaps {
+public:
+	inline void ClearSkillCaps() { m_skill_caps.clear(); }
+	SkillCapsRepository::SkillCaps GetSkillCap(uint8 class_id, EQ::skills::SkillType skill_id, uint8 level);
+	uint8 GetTrainLevel(uint8 class_id, EQ::skills::SkillType skill_id, uint8 level);
+	void LoadSkillCaps();
+	void ReloadSkillCaps();
+
+	SkillCaps *SetContentDatabase(Database *db);
+private:
+	Database                                    *m_content_database{};
+	std::vector<SkillCapsRepository::SkillCaps> m_skill_caps = {};
+};
+
+extern SkillCaps skill_caps;
+
+
+#endif //CODE_SKILL_CAPS_H

common/skills.cpp

@@ -18,10 +18,10 @@
 */
 
 #include "skills.h"
+#include "classes.h"
 
 #include <string.h>
 
-
 bool EQ::skills::IsTradeskill(SkillType skill)
 {
 	switch (skill) {

common/skills.h

@@ -26,7 +26,6 @@
 #include <map>
 #include <vector>
 
-
 namespace EQ
 {
 	namespace skills {