Code refactoring

1 files changed, 11 insertions, 24 deletions

diff --git a/src/spell.h b/src/spell.h
index 31b7d72..1a560f2 100644
--- a/src/spell.h
+++ b/src/spell.h
@@ -1,44 +1,31 @@
 #pragma once
-#include "json.hpp"
 #include "entry.h"
+#include <nlohmann/json.hpp>
 
 namespace entry {
     class Spell : public Entry {
         public:
-            Spell(const nlohmann::json& data, const nlohmann::json& base) : Entry(base), level(data["level"]), classes(data["classes"]), castingTime(data["casting_time"]), range(data["range"]), components(data["components"]), duration(data["duration"]) {};
-            virtual ~Spell() {};
+            Spell() {}
+            virtual ~Spell() {}
 
-            //std::string getName(void) const {return name;}
             int getLevel(void) const {return level;}
             std::string getSchool(void) const {return getType();}
             std::vector<std::string> getClasses(void) const {return classes;}
-            std::string getCastingTime(void) const {return castingTime;}
+            std::string getCastingTime(void) const {return casting_time;}
             std::string getRange(void) const {return range;}
             std::string getComponents(void) const {return components;}
             std::string getDuration(void) const {return duration;}
 
             std::string getText(void) const override;
 
-            virtual nlohmann::json toJson(void) const {
-                auto data = Entry::toJson();
-                data["level"] = level;
-                data["classes"] = classes;
-                data["casting_time"] = castingTime;
-                data["range"] = range;
-                data["components"] = components;
-                data["duration"] = duration;
-                return data;
-            }
+            NLOHMANN_DEFINE_DERIVED_TYPE_INTRUSIVE(Entry, Spell, level, classes, casting_time, range, components, duration);
 
         private:
-            //const std::string name;
-            const int level;
-            //const std::string school;
-            const std::vector<std::string> classes;
-            const std::string castingTime;
-            const std::string range;
-            const std::string components;
-            const std::string duration;
-            //const std::string text;
+            int level;
+            std::vector<std::string> classes;
+            std::string casting_time;
+            std::string range;
+            std::string components;
+            std::string duration;
     };
 }