Reworked retrieving talent, new method is cleaner and harder to misunderstand.

src/Library/CreatureData/SpeciesVariant.cpp

@@ -12,28 +12,22 @@ uint32_t CreatureLib::Library::SpeciesVariant::GetStatistic(CreatureLib::Core::S
     return _baseStatistics.GetStat(stat);
 }
 
-const ConstString& CreatureLib::Library::SpeciesVariant::GetTalent(int32_t index) const {
-    if (index < 0) {
-        index = -index - 1;
-        return _secretTalents[index];
+const TalentIndex CreatureLib::Library::SpeciesVariant::GetTalentIndex(const ConstString& talent) const {
+    for (size_t i = 0; i < _talents.size(); i++) {
+        if (_talents.at(i) == talent) {
+            return TalentIndex(false, i);
+        }
     }
-    return _talents[index];
-}
-
-int8_t CreatureLib::Library::SpeciesVariant::GetTalentIndex(const std::string& talent) const {
-    auto i = std::find(_talents.begin(), _talents.end(), talent);
-    if (i != _talents.end()) {
-        return std::distance(_talents.begin(), i);
-    }
-    i = std::find(_secretTalents.begin(), _secretTalents.end(), talent);
-    if (i != _secretTalents.end()) {
-        return std::distance(_secretTalents.begin(), i);
+    for (size_t i = 0; i < _secretTalents.size(); i++) {
+        if (_secretTalents.at(i) == talent) {
+            return TalentIndex(true, i);
+        }
     }
     throw CreatureException("The given talent is not a valid talent for this creature.");
 }
 
-int8_t CreatureLib::Library::SpeciesVariant::GetRandomTalent(Arbutils::Random* rand) const {
-    return rand->Get(_talents.size());
+TalentIndex CreatureLib::Library::SpeciesVariant::GetRandomTalent(Arbutils::Random* rand) const {
+    return TalentIndex(false, rand->Get(_talents.size()));
 }
 
 const CreatureLib::Library::LearnableAttacks* CreatureLib::Library::SpeciesVariant::GetLearnableAttacks() const {

src/Library/CreatureData/SpeciesVariant.hpp

@@ -7,6 +7,7 @@
 #include "../../Core/StatisticSet.hpp"
 #include "CreatureMoves.hpp"
 #include "LearnableAttacks.hpp"
+#include "TalentIndex.hpp"
 using ConstString = Arbutils::CaseInsensitiveConstString;
 
 namespace CreatureLib::Library {
@@ -44,10 +45,17 @@ namespace CreatureLib::Library {
         [[nodiscard]] uint8_t GetType(size_t index) const;
         [[nodiscard]] const std::vector<uint8_t>& GetTypes() const;
         [[nodiscard]] uint32_t GetStatistic(Core::Statistic stat) const;
-        [[nodiscard]] const ConstString& GetTalent(int32_t index) const;
+        [[nodiscard]] const size_t GetTalentCount() const { return _talents.size(); }
+        [[nodiscard]] const size_t GetSecretTalentCount() const { return _secretTalents.size(); }
+        [[nodiscard]] const ConstString& GetTalent(const TalentIndex& index) const {
+            if (index.IsSecret())
+                return _secretTalents.at(index.GetIndex());
+            return _talents.at(index.GetIndex());
+        }
+        [[nodiscard]] const TalentIndex GetTalentIndex(const ConstString& talent) const;
+
         [[nodiscard]] const LearnableAttacks* GetLearnableAttacks() const;
-        [[nodiscard]] int8_t GetTalentIndex(const std::string& talent) const;
-        [[nodiscard]] int8_t GetRandomTalent(Arbutils::Random* rand) const;
+        [[nodiscard]] TalentIndex GetRandomTalent(Arbutils::Random* rand) const;
         [[nodiscard]] inline const std::vector<ConstString>& GetTalents() const { return _talents; }
         [[nodiscard]] inline const std::vector<ConstString>& GetSecretTalents() const { return _secretTalents; }
     };

src/Library/CreatureData/TalentIndex.hpp

@@ -0,0 +1,16 @@
+#ifndef CREATURELIB_TALENTINDEX_HPP
+#define CREATURELIB_TALENTINDEX_HPP
+
+#include <cstdint>
+class TalentIndex {
+    bool _secret;
+    uint8_t _index;
+
+public:
+    TalentIndex() : _secret(false), _index(0){};
+    TalentIndex(bool secret, uint8_t index) : _secret(secret), _index(index) {}
+    constexpr inline bool IsSecret() const { return _secret; }
+    constexpr inline bool GetIndex() const { return _index; }
+};
+
+#endif // CREATURELIB_TALENTINDEX_HPP