fix: circular inclusions

CMakePresets.json

@@ -25,7 +25,8 @@
       "displayName": "Windows - Release",
       "description": "Windows Release Build",
       "cacheVariables": {
-        "VCPKG_TARGET_TRIPLET": "x64-windows-static"
+        "VCPKG_TARGET_TRIPLET": "x64-windows-static",
+        "SPEED_UP_BUILD_UNITY": "OFF"
       },
       "architecture": {
         "value": "x64",

src/account/account.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "account/account.hpp"
 
 #include "account/account_repository_db.hpp"

src/account/account_repository.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "account/account_repository.hpp"
 
 #include "lib/di/container.hpp"

src/account/account_repository_db.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "account/account_repository_db.hpp"
 
 #include "database/database.hpp"

src/canary_server.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "canary_server.hpp"
 
 #include "declarations.hpp"

src/config/configmanager.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "config/configmanager.hpp"
 #include "lib/di/container.hpp"
 #include "game/game.hpp"

src/creatures/appearance/mounts/mounts.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/appearance/mounts/mounts.hpp"
 #include "game/game.hpp"
 #include "utils/pugicast.hpp"

src/creatures/appearance/outfit/outfit.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/appearance/outfit/outfit.hpp"
 #include "utils/pugicast.hpp"
 #include "utils/tools.hpp"

src/creatures/combat/combat.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "declarations.hpp"
 #include "creatures/combat/combat.hpp"
 #include "lua/creature/events.hpp"

src/creatures/combat/condition.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/combat/condition.hpp"
 #include "game/game.hpp"
 #include "game/scheduling/dispatcher.hpp"

src/creatures/combat/spells.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/combat/combat.hpp"
 #include "creatures/combat/spells.hpp"
 #include "creatures/monsters/monster.hpp"

src/creatures/creature.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/creature.hpp"
 #include "declarations.hpp"
 #include "game/scheduling/dispatcher.hpp"

src/creatures/interactions/chat.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/interactions/chat.hpp"
 #include "game/game.hpp"
 #include "utils/pugicast.hpp"

src/creatures/monsters/monster.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/monsters/monster.hpp"
 #include "creatures/combat/spells.hpp"
 #include "creatures/players/wheel/player_wheel.hpp"

src/creatures/monsters/monsters.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/monsters/monsters.hpp"
 
 #include "creatures/combat/spells.hpp"

src/creatures/monsters/spawns/spawn_monster.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/monsters/spawns/spawn_monster.hpp"
 #include "game/game.hpp"
 #include "creatures/monsters/monster.hpp"

src/creatures/npcs/npc.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/npcs/npc.hpp"
 #include "creatures/npcs/npcs.hpp"
 #include "declarations.hpp"

src/creatures/npcs/npcs.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "declarations.hpp"
 #include "creatures/combat/combat.hpp"
 #include "lua/scripts/lua_environment.hpp"

src/creatures/npcs/spawns/spawn_npc.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/npcs/spawns/spawn_npc.hpp"
 #include "creatures/npcs/npc.hpp"
 #include "game/game.hpp"

src/creatures/players/achievement/player_achievement.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "player_achievement.hpp"
 
 #include "creatures/players/player.hpp"

src/creatures/players/cyclopedia/player_badge.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "player_badge.hpp"
 
 #include "creatures/players/player.hpp"

src/creatures/players/cyclopedia/player_cyclopedia.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "player_cyclopedia.hpp"
 
 #include "database/databasetasks.hpp"

src/creatures/players/cyclopedia/player_title.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "player_title.hpp"
 
 #include "creatures/players/player.hpp"

src/creatures/players/grouping/familiars.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/players/grouping/familiars.hpp"
 #include "lib/di/container.hpp"
 #include "config/configmanager.hpp"

src/creatures/players/grouping/groups.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "config/configmanager.hpp"
 #include "game/game.hpp"
 #include "creatures/players/grouping/groups.hpp"

src/creatures/players/grouping/guild.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/players/grouping/guild.hpp"
 #include "game/game.hpp"
 

src/creatures/players/grouping/party.cpp

@@ -9,8 +9,6 @@
 
 #include <utility>
 
-#include "pch.hpp"
-
 #include "creatures/players/grouping/party.hpp"
 #include "game/game.hpp"
 #include "lua/creature/events.hpp"

src/creatures/players/imbuements/imbuements.cpp

@@ -7,7 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
 #include "creatures/players/imbuements/imbuements.hpp"
 #include "lua/creature/events.hpp"
 #include "utils/pugicast.hpp"

src/creatures/players/management/ban.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/players/management/ban.hpp"
 #include "database/database.hpp"
 #include "database/databasetasks.hpp"

src/creatures/players/management/waitlist.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/players/management/waitlist.hpp"
 #include "game/game.hpp"
 

src/creatures/players/player.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/combat/combat.hpp"
 #include "creatures/interactions/chat.hpp"
 #include "creatures/monsters/monster.hpp"

src/creatures/players/storages/storages.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/players/storages/storages.hpp"
 
 #include "config/configmanager.hpp"

src/creatures/players/vip/player_vip.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/players/vip/player_vip.hpp"
 
 #include "io/iologindata.hpp"

src/creatures/players/vocations/vocation.cpp

@@ -7,8 +7,6 @@
  * Website: https://docs.opentibiabr.com/
  */
 
-#include "pch.hpp"
-
 #include "creatures/players/vocations/vocation.hpp"
 
 #include "utils/pugicast.hpp"

src/creatures/players/wheel/player_wheel.cpp

@@ -7,17 +7,16 @@
  * Website: https://docs.opentibiabr.org/
  */
 
-#include "pch.hpp"
-
 #include "creatures/players/wheel/player_wheel.hpp"
 
+#include "config/configmanager.hpp"
 #include "io/io_wheel.hpp"
-
 #include "game/game.hpp"
+#include "server/network/message/networkmessage.hpp"
 #include "creatures/players/player.hpp"
 #include "creatures/combat/spells.hpp"
-
-#include "config/configmanager.hpp"
+#include "kv/kv.hpp"
+#include "creatures/players/wheel/wheel_gems.hpp"
 
 const static std::vector<WheelGemBasicModifier_t> wheelGemBasicSlot1Allowed = {
 	WheelGemBasicModifier_t::General_FireResistance,
@@ -3151,3 +3150,46 @@ WheelGemBasicModifier_t PlayerWheel::selectBasicModifier2(WheelGemBasicModifier_
 	}
 	return modifier;
 }
+
+void PlayerWheelGem::save(const std::shared_ptr<KV> &kv) const {
+	kv->scoped("revealed")->set(uuid, serialize());
+}
+void PlayerWheelGem::remove(const std::shared_ptr<KV> &kv) const {
+	kv->scoped("revealed")->remove(uuid);
+}
+
+PlayerWheelGem PlayerWheelGem::load(const std::shared_ptr<KV> &kv, const std::string &uuid) {
+	auto val = kv->scoped("revealed")->get(uuid);
+	if (!val || !val.has_value()) {
+		return {};
+	}
+	return deserialize(uuid, val.value());
+}
+
+ValueWrapper PlayerWheelGem::serialize() const {
+	return {
+		{ "uuid", uuid },
+		{ "locked", locked },
+		{ "affinity", static_cast<IntType>(affinity) },
+		{ "quality", static_cast<IntType>(quality) },
+		{ "basicModifier1", static_cast<IntType>(basicModifier1) },
+		{ "basicModifier2", static_cast<IntType>(basicModifier2) },
+		{ "supremeModifier", static_cast<IntType>(supremeModifier) }
+	};
+}
+
+PlayerWheelGem PlayerWheelGem::deserialize(const std::string &uuid, const ValueWrapper &val) {
+	auto map = val.get<MapType>();
+	if (map.empty()) {
+		return {};
+	}
+	return {
+		uuid,
+		map["locked"]->get<BooleanType>(),
+		static_cast<WheelGemAffinity_t>(map["affinity"]->get<IntType>()),
+		static_cast<WheelGemQuality_t>(map["quality"]->get<IntType>()),
+		static_cast<WheelGemBasicModifier_t>(map["basicModifier1"]->get<IntType>()),
+		static_cast<WheelGemBasicModifier_t>(map["basicModifier2"]->get<IntType>()),
+		static_cast<WheelGemSupremeModifier_t>(map["supremeModifier"]->get<IntType>())
+	};
+}