Remove GetProperty macro, as it wasn't that intuitive, and caused issues later.

src/Library/CreatureData/CreatureSpecies.cpp

@@ -4,7 +4,7 @@ using namespace CreatureLib::Library;
 
 CreatureSpecies::CreatureSpecies(uint16_t id, std::string name, const SpeciesVariant* defaultVariant, float genderRatio,
                                  std::string growthRate, uint8_t captureRate)
-    : __Id(id), __GenderRate(genderRatio), __GrowthRate(std::move(growthRate)), __CaptureRate(captureRate),
+    : _id(id), _genderRate(genderRatio), _growthRate(std::move(growthRate)), _captureRate(captureRate),
       _variants({{"default", defaultVariant}}), _name(std::move(name)) {}
 
 const SpeciesVariant* CreatureSpecies::GetVariant(const std::string& key) const { return _variants.at(key); }
@@ -12,7 +12,7 @@ const SpeciesVariant* CreatureSpecies::GetVariant(const std::string& key) const
 Gender CreatureSpecies::GetRandomGender(CreatureLib::Core::Random& rand) const {
     // TODO: Genderless creatures
     auto val = rand.GetDouble();
-    if (val >= this->__GenderRate)
+    if (val >= this->_genderRate)
         return Gender ::Female;
     return Gender ::Male;
 }

src/Library/CreatureData/CreatureSpecies.hpp

@@ -12,10 +12,10 @@ namespace CreatureLib::Library {
     creatures with.
      */
     class CreatureSpecies {
-        GetProperty(uint16_t, Id);
-        GetProperty(float, GenderRate);
-        GetProperty(std::string, GrowthRate);
-        GetProperty(uint8_t, CaptureRate);
+        uint16_t _id;
+        float _genderRate;
+        std::string _growthRate;
+        uint8_t _captureRate;
 
     private:
         std::unordered_map<std::string, const SpeciesVariant*> _variants;
@@ -31,6 +31,11 @@ namespace CreatureLib::Library {
             _variants.clear();
         }
 
+        inline uint16_t GetId() const { return _id; }
+        inline float GetGenderRate() const { return _genderRate; }
+        inline const std::string& GetGrowthRate() const { return _growthRate; }
+        inline uint8_t GetCaptureRate() const { return _captureRate; }
+
         [[nodiscard]] const SpeciesVariant* GetVariant(const std::string& key) const;
         [[nodiscard]] Gender GetRandomGender(Core::Random& rand) const;
         [[nodiscard]] const std::string& GetName() const;

src/Library/CreatureData/SpeciesVariant.cpp

@@ -50,7 +50,7 @@ CreatureLib::Library::SpeciesVariant::SpeciesVariant(std::string name, float hei
                                                      std::vector<std::string> talents,
                                                      std::vector<std::string> secretTalents,
                                                      const LearnableAttacks* attacks)
-    : __Name(std::move(name)), __Height(height), __Weight(weight), __BaseExperience(baseExperience),
+    : _name(std::move(name)), _height(height), _weight(weight), _baseExperience(baseExperience),
       _types(std::move(types)), _baseStatistics(baseStats), _talents(std::move(talents)),
       _secretTalents(std::move(secretTalents)), _attacks(attacks) {}
 

src/Library/CreatureData/SpeciesVariant.hpp

@@ -5,7 +5,6 @@
 #include <vector>
 #include "../../Core/Random.hpp"
 #include "../../Core/StatisticSet.hpp"
-#include "../../GenericTemplates.hpp"
 #include "CreatureMoves.hpp"
 #include "LearnableAttacks.hpp"
 
@@ -14,10 +13,11 @@ namespace CreatureLib::Library {
     \brief A single species can have more than one variant. This class holds the data for those variants.
      */
     class SpeciesVariant {
-        GetProperty(std::string, Name);
-        GetProperty(float, Height);
-        GetProperty(float, Weight);
-        GetProperty(uint32_t, BaseExperience);
+    protected:
+        std::string _name;
+        float _height;
+        float _weight;
+        uint32_t _baseExperience;
 
     private:
         std::vector<uint8_t> _types;
@@ -34,6 +34,11 @@ namespace CreatureLib::Library {
 
         ~SpeciesVariant();
 
+        inline const std::string& GetName() const { return _name; }
+        inline float GetHeight() const { return _height; }
+        inline float GetWeight() const { return _weight; }
+        inline uint32_t GetBaseExperience() const { return _baseExperience; }
+
         [[nodiscard]] size_t GetTypeCount() const;
         [[nodiscard]] uint8_t GetType(size_t index) const;
         [[nodiscard]] const std::vector<uint8_t>& GetTypes() const;