Changes for EffectParameter type in AngelScript, fixes for ConstString memory leak in AngelScript.

src/Library/Evolutions/EvolutionData.cpp

@@ -0,0 +1,9 @@
+#include "EvolutionData.hpp"
+#include "../Moves/MoveData.hpp"
+using namespace PkmnLib::Library;
+
+const EvolutionData* PkmnLib::Library::EvolutionData::CreateKnownMoveEvolution(const MoveData* move,
+                                                                               const PokemonSpecies* into) {
+    return new EvolutionData(EvolutionMethod::KnownMove, {new CreatureLib::Library::EffectParameter(move->GetName())},
+                             into);
+}

src/Library/Evolutions/EvolutionData.hpp

@@ -1,73 +1,100 @@
 #ifndef PKMNLIB_EVOLUTIONDATA_HPP
 #define PKMNLIB_EVOLUTIONDATA_HPP
 
+#include <Arbutils/Collections/List.hpp>
+#include <CreatureLib/Library/EffectParameter.hpp>
 #include <CreatureLib/Library/Gender.hpp>
-#include <any>
 #include <string>
 #include <utility>
-#include <vector>
 #include "../TimeOfDay.hpp"
 #include "EvolutionMethod.hpp"
 namespace PkmnLib::Library {
     class PokemonSpecies;
-    class Move;
+    class MoveData;
     class Item;
 
     class EvolutionData {
     private:
         const PokemonSpecies* _evolvesInto;
         EvolutionMethod _method;
-        std::vector<std::any> _evolutionData; // This can probably be done in a better way, can't think of it now.
+        Arbutils::Collections::List<const CreatureLib::Library::EffectParameter*> _evolutionData;
 
-        EvolutionData(EvolutionMethod method, std::vector<std::any> data, const PokemonSpecies* next)
+        EvolutionData(EvolutionMethod method,
+                      Arbutils::Collections::List<const CreatureLib::Library::EffectParameter*> data,
+                      const PokemonSpecies* next)
             : _evolvesInto(next), _method(method), _evolutionData(std::move(data)) {}
 
     public:
-        static EvolutionData CreateLevelEvolution(uint8_t level, const PokemonSpecies* into) {
-            return EvolutionData(EvolutionMethod::Level, {std::any(level)}, into);
+        ~EvolutionData() {
+            for (auto v : _evolutionData) {
+                delete v;
+            }
         }
-        static EvolutionData CreateFriendshipEvolution(uint8_t friendship, const PokemonSpecies* into) {
-            return EvolutionData(EvolutionMethod::HighFriendship, {std::any(friendship)}, into);
+
+        static inline const EvolutionData* CreateLevelEvolution(uint8_t level, const PokemonSpecies* into) {
+            return new EvolutionData(EvolutionMethod::Level,
+                                     {new CreatureLib::Library::EffectParameter((int64_t)level)}, into);
         }
-        static EvolutionData CreateKnownMoveEvolution(const Move* move, const PokemonSpecies* into) {
-            return EvolutionData(EvolutionMethod::KnownMove, {std::any(move)}, into);
+        static inline const EvolutionData* CreateFriendshipEvolution(uint8_t friendship, const PokemonSpecies* into) {
+            return new EvolutionData(EvolutionMethod::HighFriendship,
+                                     {new CreatureLib::Library::EffectParameter((int64_t)friendship)}, into);
         }
-        static EvolutionData CreateLocationEvolution(const std::string& location, const PokemonSpecies* into) {
-            return EvolutionData(EvolutionMethod::LocationBased, {std::any(location)}, into);
+        static const EvolutionData* CreateKnownMoveEvolution(const MoveData* move, const PokemonSpecies* into);
+        static inline const EvolutionData* CreateLocationEvolution(const Arbutils::CaseInsensitiveConstString& location,
+                                                                   const PokemonSpecies* into) {
+            return new EvolutionData(EvolutionMethod::LocationBased,
+                                     {new CreatureLib::Library::EffectParameter(location)}, into);
         }
-        static EvolutionData CreateTimeEvolution(TimeOfDay time, const PokemonSpecies* into) {
-            return EvolutionData(EvolutionMethod::TimeBased, {std::any(time)}, into);
+        static inline const EvolutionData* CreateTimeEvolution(TimeOfDay time, const PokemonSpecies* into) {
+            return new EvolutionData(EvolutionMethod::TimeBased,
+                                     {new CreatureLib::Library::EffectParameter((int64_t)time)}, into);
         }
-        static EvolutionData CreateHeldItemEvolution(const Item* item, const PokemonSpecies* into) {
-            return EvolutionData(EvolutionMethod::HoldsItem, {std::any(item)}, into);
+        static inline const EvolutionData* CreateHeldItemEvolution(const Item* item, const PokemonSpecies* into) {
+            return new EvolutionData(EvolutionMethod::HoldsItem, {new CreatureLib::Library::EffectParameter(item)},
+                                     into);
         }
-        static EvolutionData CreateGenderBasedEvolution(CreatureLib::Library::Gender gender, uint8_t level,
-                                                        const PokemonSpecies* into) {
-            return EvolutionData(EvolutionMethod::IsGenderAndLevel, {std::any(gender), std::any(level)}, into);
+        static inline const EvolutionData* CreateGenderBasedEvolution(CreatureLib::Library::Gender gender,
+                                                                      uint8_t level, const PokemonSpecies* into) {
+            return new EvolutionData(EvolutionMethod::IsGenderAndLevel,
+                                     {new CreatureLib::Library::EffectParameter((int64_t)gender),
+                                      new CreatureLib::Library::EffectParameter((int64_t)level)},
+                                     into);
         }
-        static EvolutionData CreateItemUseEvolution(const Item* item, const PokemonSpecies* into) {
-            return EvolutionData(EvolutionMethod::EvolutionItemUse, {std::any(item)}, into);
+        static inline const EvolutionData* CreateItemUseEvolution(const Item* item, const PokemonSpecies* into) {
+            return new EvolutionData(EvolutionMethod::EvolutionItemUse,
+                                     {new CreatureLib::Library::EffectParameter(item)}, into);
         }
-        static EvolutionData CreateItemUseWithGenderEvolution(const Item* item, CreatureLib::Library::Gender gender,
-                                                              const PokemonSpecies* into) {
-            return EvolutionData(EvolutionMethod::EvolutionItemUseWithGender, {std::any(item), std::any(gender)}, into);
+        static inline const EvolutionData* CreateItemUseWithGenderEvolution(const Item* item,
+                                                                            CreatureLib::Library::Gender gender,
+                                                                            const PokemonSpecies* into) {
+            return new EvolutionData(EvolutionMethod::EvolutionItemUseWithGender,
+                                     {new CreatureLib::Library::EffectParameter(item),
+                                      new CreatureLib::Library::EffectParameter((int64_t)gender)},
+                                     into);
         }
-        static EvolutionData CreateTradeEvolution(const PokemonSpecies* into) {
-            return EvolutionData(EvolutionMethod::Trade, {}, into);
+        static inline const EvolutionData* CreateTradeEvolution(const PokemonSpecies* into) {
+            return new EvolutionData(EvolutionMethod::Trade, {}, into);
         }
-        static EvolutionData CreateTradeWithItemEvolution(const Item* item, const PokemonSpecies* into) {
-            return EvolutionData(EvolutionMethod::TradeWithHeldItem, {std::any(item)}, into);
+        static inline const EvolutionData* CreateTradeWithItemEvolution(const Item* item, const PokemonSpecies* into) {
+            return new EvolutionData(EvolutionMethod::TradeWithHeldItem,
+                                     {new CreatureLib::Library::EffectParameter(item)}, into);
         }
-        static EvolutionData CreateTradeWithSpeciesEvolution(const PokemonSpecies* traded, const PokemonSpecies* into) {
-            return EvolutionData(EvolutionMethod::TradeWithSpecificPokemon, {std::any(traded)}, into);
+        static inline const EvolutionData* CreateTradeWithSpeciesEvolution(const PokemonSpecies* traded,
+                                                                           const PokemonSpecies* into) {
+            return new EvolutionData(EvolutionMethod::TradeWithSpecificPokemon,
+                                     {new CreatureLib::Library::EffectParameter(traded)}, into);
         }
-        static EvolutionData CreateCustomEvolution(std::vector<std::any> data, const PokemonSpecies* into) {
-            return EvolutionData(EvolutionMethod::Custom, std::move(data), into);
+        static inline const EvolutionData*
+        CreateCustomEvolution(const Arbutils::Collections::List<const CreatureLib::Library::EffectParameter*>& data,
+                              const PokemonSpecies* into) {
+            return new EvolutionData(EvolutionMethod::Custom, data, into);
         }
 
         [[nodiscard]] inline const PokemonSpecies* GetNewSpecies() const { return _evolvesInto; }
         [[nodiscard]] inline EvolutionMethod GetMethod() const { return _method; }
-        [[nodiscard]] inline const std::any& GetData(size_t index) const { return _evolutionData.at(index); }
+        [[nodiscard]] inline const CreatureLib::Library::EffectParameter* GetData(size_t index) const {
+            return _evolutionData.At(index);
+        }
     };
 }
 

src/Library/Species/PokemonSpecies.hpp

@@ -8,7 +8,7 @@ namespace PkmnLib::Library {
     class PokemonSpecies : public CreatureLib::Library::CreatureSpecies {
     private:
         uint8_t _baseHappiness;
-        std::vector<EvolutionData> _evolutions;
+        std::vector<const EvolutionData*> _evolutions;
 
     public:
         PokemonSpecies(uint16_t id, const Arbutils::CaseInsensitiveConstString& name,
@@ -18,7 +18,11 @@ namespace PkmnLib::Library {
             : CreatureSpecies(id, name, defaultVariant, genderRatio, growthRate, captureRate),
               _baseHappiness(baseHappiness) {}
 
-        ~PokemonSpecies() override = default;
+        ~PokemonSpecies() override {
+            for (auto evo : _evolutions) {
+                delete evo;
+            }
+        }
 
         inline uint8_t GetBaseHappiness() const { return _baseHappiness; }
 
@@ -36,8 +40,8 @@ namespace PkmnLib::Library {
             return reinterpret_cast<const PokemonForme*>(CreatureSpecies::GetVariant(key));
         }
 
-        inline void AddEvolution(const EvolutionData& data) { _evolutions.push_back(data); }
-        const std::vector<EvolutionData>& GetEvolutions() const { return _evolutions; }
+        inline void AddEvolution(const EvolutionData* data) { _evolutions.push_back(data); }
+        const std::vector<const EvolutionData*>& GetEvolutions() const { return _evolutions; }
     };
 }