Made headers cpp specific (hpp instead of h), modern include guard, fixed issue with json deserialisation and added hash to save to avoid manual editing

Author: nbollom

game/CMakeLists.txt

@@ -14,9 +14,48 @@ FetchContent_Declare(
 
 FetchContent_MakeAvailable(nlohmann_json)
 
-set(SOURCE_FILES game.cpp spells.h spells.cpp game.h types.h offensiveattributes.h offensiveattributes.cpp defensiveattributes.h defensiveattributes.cpp shields.cpp shields.h armors.cpp armors.h weapons.cpp weapons.h specials.cpp specials.h itemattributes.cpp itemattributes.h itemofs.cpp itemofs.h boringitems.cpp boringitems.h monsters.cpp monsters.h races.cpp races.h classes.cpp classes.h titles.cpp titles.h newgame.cpp newgame.h character.h monstermods.cpp monstermods.h
+set(
+        SOURCE_FILES
+        game.cpp
+        spells.hpp
+        spells.cpp
+        game.hpp
+        types.hpp
+        offensiveattributes.hpp
+        offensiveattributes.cpp
+        defensiveattributes.hpp
+        defensiveattributes.cpp
+        shields.cpp
+        shields.hpp
+        armors.cpp
+        armors.hpp
+        weapons.cpp
+        weapons.hpp
+        specials.cpp
+        specials.hpp
+        itemattributes.cpp
+        itemattributes.hpp
+        itemofs.cpp
+        itemofs.hpp
+        boringitems.cpp
+        boringitems.hpp
+        monsters.cpp
+        monsters.hpp
+        races.cpp
+        races.hpp
+        classes.cpp
+        classes.hpp
+        titles.cpp
+        titles.hpp
+        newgame.cpp
+        newgame.hpp
+        character.hpp
+        monstermods.cpp
+        monstermods.hpp
         jsonserialiser.cpp
-        jsonserialiser.h)
+        jsonserialiser.hpp
+        character.cpp
+)
 
 add_library(pq2game SHARED ${SOURCE_FILES})
 

game/armors.cpp

@@ -2,7 +2,7 @@
 // Created by nbollom on 1/06/16.
 //
 
-#include "armors.h"
+#include "armors.hpp"
 #include <vector>
 
 using namespace std;

game/armors.h

@@ -0,0 +1,15 @@
+//
+// Created by nbollom on 1/06/16.
+//
+
+#pragma once
+
+#include <random>
+#include <memory>
+#include "types.hpp"
+
+namespace data {
+
+    [[nodiscard]] Item get_random_armor(const std::shared_ptr<std::mt19937_64>& engine);
+
+}

game/armors.hpp

@@ -2,7 +2,7 @@
 // Created by nbollom on 1/06/16.
 //
 
-#include "boringitems.h"
+#include "boringitems.hpp"
 #include <vector>
 
 using namespace std;

game/boringitems.cpp

@@ -0,0 +1,15 @@
+//
+// Created by nbollom on 1/06/16.
+//
+
+#pragma once
+
+#include <string>
+#include <random>
+#include <memory>
+
+namespace data {
+
+    [[nodiscard]] std::string get_random_boring_item(const std::shared_ptr<std::mt19937_64>& engine);
+
+}

game/boringitems.h

@@ -0,0 +1,142 @@
+//
+// Created by nbollom on 22/12/24.
+//
+
+#include "character.hpp"
+
+using namespace data;
+
+template<>
+struct std::hash<Race>
+{
+    std::size_t operator()(const Race& race) const noexcept
+    {
+        size_t hash = 17;
+        hash = hash * 31 + std::hash<std::string>{}(race.name);
+        for (const auto &attribute : race.attributes) {
+            hash = hash * 31 + std::hash<std::string>{}(attribute);
+        }
+        return hash;
+    }
+};
+
+template<>
+struct std::hash<Class>
+{
+    std::size_t operator()(const Class& cls) const noexcept
+    {
+        size_t hash = 17;
+        hash = hash * 31 + std::hash<std::string>{}(cls.name);
+        for (const auto &attribute : cls.attributes) {
+            hash = hash * 31 + std::hash<std::string>{}(attribute);
+        }
+        return hash;
+    }
+};
+
+template<>
+struct std::hash<Stack>
+{
+    std::size_t operator()(const Stack& stack) const noexcept
+    {
+        size_t hash = 17;
+        hash = hash * 31 + std::hash<std::string>{}(stack.name);
+        hash = hash * 31 + std::hash<uint64_t>{}(stack.count);
+        return hash;
+    }
+};
+
+template<>
+struct std::hash<Monster>
+{
+    std::size_t operator()(const Monster& monster) const noexcept
+    {
+        size_t hash = 17;
+        hash = hash * 31 + std::hash<std::string>{}(monster.name);
+        hash = hash * 31 + std::hash<uint64_t>{}(monster.level);
+        hash = hash * 31 + std::hash<std::string>{}(monster.drop);
+        return hash;
+    }
+};
+
+template<>
+struct std::hash<Quest>
+{
+    std::size_t operator()(const Quest& quest) const noexcept
+    {
+        size_t hash = 17;
+        hash = hash * 31 + std::hash<std::string>{}(quest.label);
+        if (quest.monster.has_value()) {
+            hash = hash * 31 + std::hash<Monster>{}(quest.monster.value());
+        }
+        return hash;
+    }
+};
+
+template<>
+struct std::hash<QueueItem>
+{
+    std::size_t operator()(const QueueItem& queue_item) const noexcept
+    {
+        size_t hash = 17;
+        hash = hash * 31 + std::hash<std::string>{}(queue_item.label);
+        hash = hash * 31 + std::hash<uint64_t>{}(queue_item.ms);
+        hash = hash * 31 + std::hash<QueueItemType>{}(queue_item.type);
+        return hash;
+    }
+};
+
+
+uint64_t Character::CalculateHash() const {
+    size_t hash = 17;
+    hash = hash * 31 + std::hash<std::string>{}(Name);
+    hash = hash * 31 + std::hash<Race>{}(CharacterRace);
+    hash = hash * 31 + std::hash<Class>{}(CharacterClass);
+    hash = hash * 31 + std::hash<uint64_t>{}(Level);
+    hash = hash * 31 + std::hash<uint64_t>{}(Experience);
+    hash = hash * 31 + std::hash<uint64_t>{}(STR);
+    hash = hash * 31 + std::hash<uint64_t>{}(CON);
+    hash = hash * 31 + std::hash<uint64_t>{}(DEX);
+    hash = hash * 31 + std::hash<uint64_t>{}(INT);
+    hash = hash * 31 + std::hash<uint64_t>{}(WIS);
+    hash = hash * 31 + std::hash<uint64_t>{}(CHA);
+    hash = hash * 31 + std::hash<uint64_t>{}(MAX_HP);
+    hash = hash * 31 + std::hash<uint64_t>{}(MAX_MP);
+    hash = hash * 31 + std::hash<uint64_t>{}(Gold);
+
+    for (const auto &spell : Spells) {
+        hash = hash * 31 + std::hash<Stack>{}(spell);
+    }
+
+    for (const auto &equipment : Equipment) {
+        hash = hash * 31 + std::hash<std::string>{}(equipment);
+    }
+
+    for (const auto &item : Inventory) {
+        hash = hash * 31 + std::hash<Stack>{}(item);
+    }
+
+    for (const auto &plot_item : Plot) {
+        hash = hash * 31 + std::hash<std::string>{}(plot_item);
+    }
+
+    for (const auto &quest : Quests) {
+        hash = hash * 31 + std::hash<Quest>{}(quest);
+    }
+
+    for (const auto &queue_item : Queue) {
+        hash = hash * 31 + std::hash<QueueItem>{}(queue_item);
+    }
+
+    hash = hash * 31 + std::hash<CurrentActionType>{}(CurrentAction);
+    hash = hash * 31 + std::hash<std::string>{}(CurrentActionLabel);
+    hash = hash * 31 + std::hash<Monster>{}(CurrentMonster);
+    hash = hash * 31 + std::hash<uint64_t>{}(CurrentProgress);
+    hash = hash * 31 + std::hash<uint64_t>{}(MaxProgress);
+    hash = hash * 31 + std::hash<uint64_t>{}(CurrentPlotProgress);
+    hash = hash * 31 + std::hash<uint64_t>{}(CurrentQuestProgress);
+    hash = hash * 31 + std::hash<uint64_t>{}(MaxQuestProgress);
+
+    return hash;
+}
+

game/boringitems.hpp

@@ -2,15 +2,14 @@
 // Created by nbollom on 3/06/16.
 //
 
-#ifndef PQ2_CHARACTER_H
-#define PQ2_CHARACTER_H
+#pragma once
 
 #include <string>
 #include <array>
 #include <vector>
 #include <deque>
 
-#include "types.h"
+#include "types.hpp"
 
 struct Character {
 
@@ -51,6 +50,6 @@ struct Character {
     uint64_t CurrentQuestProgress;
     uint64_t MaxQuestProgress;
 
-};
+    uint64_t CalculateHash() const;
 
-#endif //PQ2_CHARACTER_H
+};

game/character.cpp

@@ -2,7 +2,7 @@
 // Created by nbollom on 2/06/16.
 //
 
-#include "classes.h"
+#include "classes.hpp"
 #include <vector>
 
 using namespace std;

game/character.h game/character.hpp

@@ -0,0 +1,17 @@
+//
+// Created by nbollom on 2/06/16.
+//
+
+#pragma once
+
+#include <random>
+#include <memory>
+#include "types.hpp"
+
+namespace data {
+
+    [[nodiscard]] Class get_random_class(const std::shared_ptr<std::mt19937_64>& engine);
+
+    [[nodiscard]] std::vector<Class> get_class_list();
+
+}

game/classes.cpp

@@ -2,7 +2,7 @@
 // Created by nbollom on 26/05/16.
 //
 
-#include "defensiveattributes.h"
+#include "defensiveattributes.hpp"
 #include <vector>
 
 using namespace std;