File formatting.

CInterface/Library/LibrarySettings.cpp

@@ -2,7 +2,8 @@
 #include "../Core.hpp"
 using namespace PkmnLib::Library;
 
-export const LibrarySettings* PkmnLib_LibrarySettings_Construct(uint8_t maximalLevel, uint8_t maximalMoves, uint16_t shinyRate) {
+export const LibrarySettings* PkmnLib_LibrarySettings_Construct(uint8_t maximalLevel, uint8_t maximalMoves,
+                                                                uint16_t shinyRate) {
     return new LibrarySettings(maximalLevel, maximalMoves, shinyRate);
 }
 

CInterface/Library/Nature.cpp

@@ -2,8 +2,9 @@
 #include "../Core.hpp"
 using namespace PkmnLib::Library;
 
-export Nature* PkmnLib_Nature_Construct(CreatureLib::Library::Statistic increasedStat, CreatureLib::Library::Statistic decreasedStat,
+export Nature* PkmnLib_Nature_Construct(CreatureLib::Library::Statistic increasedStat,
-                                        float increasedModifier, float decreasedModifier) {
+                                        CreatureLib::Library::Statistic decreasedStat, float increasedModifier,
+                                        float decreasedModifier) {
     return new Nature(increasedStat, decreasedStat, increasedModifier, decreasedModifier);
 }
 export void PkmnLib_Nature_Destruct(const Nature* p) { delete p; }
@@ -18,6 +19,6 @@ SIMPLE_GET_FUNC(Nature, GetDecreasedStat, CreatureLib::Library::Statistic)
 
 #undef SIMPLE_GET_FUNC
 
-export float PkmnLib_Nature_GetStatModifier(PkmnLib::Library::Nature nature, CreatureLib::Library::Statistic stat){
+export float PkmnLib_Nature_GetStatModifier(PkmnLib::Library::Nature nature, CreatureLib::Library::Statistic stat) {
     return nature.GetStatModifier(stat);
 }

src/Battling/Library/StatCalculator.cpp

@@ -14,8 +14,7 @@ uint32_t PkmnLib::Battling::StatCalculator::CalculateOtherStat(const Pokemon* pk
     uint32_t iv = pkmn->GetIndividualValue(stat);
     uint32_t ev = pkmn->GetEffortValue(stat);
     uint8_t level = pkmn->GetLevel();
-    uint32_t unmodified =
+    uint32_t unmodified = static_cast<uint32_t>(((2 * base + iv + static_cast<uint32_t>(ev / 4)) * level) / 100) + 5;
-        static_cast<uint32_t>(((2 * base + iv + static_cast<uint32_t>(ev / 4)) * level) / 100) + 5;
     return static_cast<uint32_t>(unmodified * pkmn->GetNature()->GetStatModifier(stat));
 }
 float PkmnLib::Battling::StatCalculator::GetStatBoostModifier(const CreatureLib::Battling::Creature* pkmn,
@@ -41,8 +40,8 @@ float PkmnLib::Battling::StatCalculator::GetStatBoostModifier(const CreatureLib:
 CreatureLib::Library::StatisticSet<uint32_t>
 PkmnLib::Battling::StatCalculator::CalculateFlatStats(CreatureLib::Battling::Creature* creature) const {
     auto pkmn = dynamic_cast<Pokemon*>(creature);
-    return CreatureLib::Library::StatisticSet<uint32_t>(
+    return CreatureLib::Library::StatisticSet<uint32_t>(CalculateHealthStat(pkmn),
-        CalculateHealthStat(pkmn), CalculateOtherStat(pkmn, Library::Statistic::PhysicalAttack),
+                                                        CalculateOtherStat(pkmn, Library::Statistic::PhysicalAttack),
                                                         CalculateOtherStat(pkmn, Library::Statistic::PhysicalDefense),
                                                         CalculateOtherStat(pkmn, Library::Statistic::SpecialAttack),
                                                         CalculateOtherStat(pkmn, Library::Statistic::SpecialDefense),

src/Battling/PkmnScript.hpp

@@ -3,8 +3,8 @@
 #include <CreatureLib/Battling/ScriptHandling/Script.hpp>
 #include "Pokemon/Pokemon.hpp"
 
-namespace PkmnLib::Battling{
+namespace PkmnLib::Battling {
-    class PkmnScript : public CreatureLib::Battling::Script{
+    class PkmnScript : public CreatureLib::Battling::Script {
     public:
         virtual void ModifyCriticalStage(CreatureLib::Battling::ExecutingAttack* attack,
                                          CreatureLib::Battling::Creature* target, uint8_t hit, uint8_t* critStage){};

src/Library/Evolutions/EvolutionData.cpp

@@ -29,7 +29,8 @@ const EvolutionData* EvolutionData::CreateTradeWithItemEvolution(const Item* ite
     return new EvolutionData(EvolutionMethod::TradeWithHeldItem,
                              {new CreatureLib::Library::EffectParameter(item->GetName())}, into);
 }
-const EvolutionData* EvolutionData::CreateTradeWithSpeciesEvolution(const PokemonSpecies* traded, const PokemonSpecies* into) {
+const EvolutionData* EvolutionData::CreateTradeWithSpeciesEvolution(const PokemonSpecies* traded,
+                                                                    const PokemonSpecies* into) {
     return new EvolutionData(EvolutionMethod::TradeWithSpecificPokemon,
                              {new CreatureLib::Library::EffectParameter(traded->GetName())}, into);
 }

src/Library/Evolutions/EvolutionMethod.hpp

@@ -5,8 +5,7 @@
 namespace PkmnLib::Library {
     ENUM(EvolutionMethod, uint8_t, Level, HighFriendship, KnownMove, LocationBased, TimeBased, HoldsItem,
          IsGenderAndLevel, EvolutionItemUse, EvolutionItemUseWithGender, Trade, TradeWithHeldItem,
-         TradeWithSpecificPokemon, Custom
+         TradeWithSpecificPokemon, Custom)
-    )
 }
 
 #endif // PKMNLIB_EVOLUTIONMETHOD_HPP

src/Library/Moves/MoveLibrary.hpp

@@ -12,7 +12,7 @@ namespace PkmnLib::Library {
 
         inline bool TryGet(const Arbutils::CaseInsensitiveConstString& name, const MoveData*& move) const {
             const CreatureLib::Library::AttackData* ptr;
-            if (CreatureLib::Library::AttackLibrary::TryGet(name, ptr)){
+            if (CreatureLib::Library::AttackLibrary::TryGet(name, ptr)) {
                 move = dynamic_cast<const MoveData*>(ptr);
                 return true;
             }

src/Library/Natures/NatureLibrary.hpp

@@ -38,8 +38,7 @@ namespace PkmnLib::Library {
             auto& map = _items.GetStdMap();
             return std::next(std::begin(map), i)->first;
         }
-        inline const Arbutils::CaseInsensitiveConstString&
+        inline const Arbutils::CaseInsensitiveConstString& GetRandomNatureName(Arbutils::Random* rand) const {
-        GetRandomNatureName(Arbutils::Random* rand) const {
             auto i = rand->Get(_items.Count());
             auto& map = _items.GetStdMap();
             return std::next(std::begin(map), i)->first;

src/Library/PokemonLibrary.hpp

@@ -14,16 +14,14 @@ namespace PkmnLib::Library {
         const NatureLibrary* _natures;
 
     public:
-        ~PokemonLibrary() override {
+        ~PokemonLibrary() override { delete _natures; }
-            delete _natures;
-        }
 
         PokemonLibrary(PkmnLib::Library::LibrarySettings* settings, SpeciesLibrary* species, MoveLibrary* moves,
                        ItemLibrary* items, CreatureLib::Library::GrowthRateLibrary* growthRates,
                        CreatureLib::Library::TypeLibrary* typeLibrary, NatureLibrary* natures)
             : DataLibrary(settings, species, moves, items, growthRates, typeLibrary), _natures(natures) {}
 
-        const PkmnLib::Library::LibrarySettings* GetSettings() const{
+        const PkmnLib::Library::LibrarySettings* GetSettings() const {
             return static_cast<const LibrarySettings*>(CreatureLib::Library::DataLibrary::GetSettings());
         }
 
@@ -39,9 +37,7 @@ namespace PkmnLib::Library {
             return (const ItemLibrary*)(CreatureLib::Library::DataLibrary::GetItemLibrary());
         }
 
-        [[nodiscard]] const NatureLibrary* GetNatureLibrary() const {
+        [[nodiscard]] const NatureLibrary* GetNatureLibrary() const { return _natures; }
-            return _natures;
-        }
     };
 }
 

src/ScriptResolving/AngelScript/AngelScriptResolver.hpp

@@ -57,9 +57,9 @@ public:
         return _typeDatabase;
     }
 
-    asITypeInfo* GetBaseType(const ConstString& name){
+    asITypeInfo* GetBaseType(const ConstString& name) {
         asITypeInfo* t = nullptr;
-        if (!_baseTypes.TryGet(name, t)){
+        if (!_baseTypes.TryGet(name, t)) {
             t = this->_engine->GetTypeInfoByDecl(name.c_str());
             _baseTypes.Insert(name, t);
         }

src/ScriptResolving/AngelScript/AngelScriptScript.hpp

@@ -19,6 +19,7 @@ private:
 
     asIScriptObject* _obj = nullptr;
     CScriptArray* GetEffectParameters(const List<CreatureLib::Library::EffectParameter*>& ls);
+
 public:
     AngelScriptScript(AngelScriptResolver* resolver, AngelScriptTypeInfo* type, asIScriptObject* obj,
                       ContextPool* ctxPool)

src/ScriptResolving/AngelScript/AngelScriptTypeInfo.hpp

@@ -82,8 +82,8 @@ public:
     SCRIPT_HOOK_FUNCTION(OnInitialize, "void OnInitialize(const array<EffectParameter@> &in parameters)");
     SCRIPT_HOOK_FUNCTION(Stack, "void Stack()");
     SCRIPT_HOOK_FUNCTION(OnRemove, "void OnRemove()");
-SCRIPT_HOOK_FUNCTION(OnBeforeTurn, "void OnBeforeTurn(BaseTurnChoice@ choice)");
+    SCRIPT_HOOK_FUNCTION(OnBeforeTurn, "void OnBeforeTurn(BaseTurnChoice@ choice)");
-SCRIPT_HOOK_FUNCTION(ChangeAttack, "void ChangeAttack(MoveTurnChoice@ choice, constString& changedMove)");
+    SCRIPT_HOOK_FUNCTION(ChangeAttack, "void ChangeAttack(MoveTurnChoice@ choice, constString& changedMove)");
 
     SCRIPT_HOOK_FUNCTION(PreventAttack, "void PreventAttack(ExecutingMove@ attack, bool& result)");
     SCRIPT_HOOK_FUNCTION(FailAttack, "void FailAttack(ExecutingMove@ attack, bool& result)");

src/ScriptResolving/AngelScript/ByteCodeHandling/MemoryByteCodeStream.hpp

@@ -13,7 +13,7 @@ private:
 #define MEM_STEPS 256
 
 public:
-    MemoryByteCodeStream() : _out((uint8_t*)malloc(MEM_STEPS * sizeof(uint8_t) )), _capacity(MEM_STEPS){};
+    MemoryByteCodeStream() : _out((uint8_t*)malloc(MEM_STEPS * sizeof(uint8_t))), _capacity(MEM_STEPS){};
     MemoryByteCodeStream(uint8_t* in, size_t size) : _out(in), _size(size) {}
 
     uint8_t* GetOut() const { return _out; }

src/ScriptResolving/AngelScript/ContextPool.hpp

@@ -11,8 +11,8 @@ class ContextPool {
 public:
     ContextPool(asIScriptEngine* engine) : _engine(engine) {}
 
-    ~ContextPool(){
+    ~ContextPool() {
-        for (auto ctx: _pool){
+        for (auto ctx : _pool) {
             ctx->Release();
         }
     }

src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterBattleClass.hpp

@@ -6,6 +6,7 @@ class RegisterBattleClass {
     static void RegisterChoiceQueue(asIScriptEngine* engine);
     static void RegisterBattle(asIScriptEngine* engine);
     static void RegisterBattleRandom(asIScriptEngine* engine);
+
 public:
     static void Register(asIScriptEngine* engine);
 };

src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterBattleLibrary.hpp

@@ -5,6 +5,7 @@
 class RegisterBattleLibrary {
     static void RegisterDamageLibrary(asIScriptEngine* engine);
     static void RegisterLibrary(asIScriptEngine* engine);
+
 public:
     static void Register(asIScriptEngine* engine);
 };

src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterExecutingAttack.cpp

@@ -1,6 +1,6 @@
 #include "RegisterExecutingAttack.hpp"
-#include <CreatureLib/Battling/Models/ExecutingAttack.hpp>
 #include <Arbutils/Assert.hpp>
+#include <CreatureLib/Battling/Models/ExecutingAttack.hpp>
 
 void RegisterExecutingAttack::Register(asIScriptEngine* engine) {
     RegisterHitData(engine);
@@ -34,20 +34,16 @@ void RegisterExecutingAttack::RegisterExecutingAttackType(asIScriptEngine* engin
     [[maybe_unused]] int r = engine->RegisterObjectType("ExecutingMove", 0, asOBJ_REF | asOBJ_NOCOUNT);
     Assert(r >= 0);
     r = engine->RegisterObjectMethod("ExecutingMove", "HitData@ GetHitData(Pokemon@ target, uint8 hit) const",
-                                     asMETHOD(CreatureLib::Battling::ExecutingAttack, GetHitData),
+                                     asMETHOD(CreatureLib::Battling::ExecutingAttack, GetHitData), asCALL_THISCALL);
-                                     asCALL_THISCALL);
     Assert(r >= 0);
     r = engine->RegisterObjectMethod("ExecutingMove", "bool IsPokemonTarget(Pokemon@ pkmn) const",
                                      asMETHOD(CreatureLib::Battling::ExecutingAttack, IsCreatureTarget),
                                      asCALL_THISCALL);
     Assert(r >= 0);
     r = engine->RegisterObjectMethod("ExecutingMove", "Pokemon@ get_User() const property",
-                                     asMETHOD(CreatureLib::Battling::ExecutingAttack, GetUser),
+                                     asMETHOD(CreatureLib::Battling::ExecutingAttack, GetUser), asCALL_THISCALL);
-                                     asCALL_THISCALL);
     Assert(r >= 0);
     r = engine->RegisterObjectMethod("ExecutingMove", "LearnedMove@ get_Move() const property",
-                                     asMETHOD(CreatureLib::Battling::ExecutingAttack, GetAttack),
+                                     asMETHOD(CreatureLib::Battling::ExecutingAttack, GetAttack), asCALL_THISCALL);
-                                     asCALL_THISCALL);
     Assert(r >= 0);
-
 }

src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterExecutingAttack.hpp

@@ -6,6 +6,7 @@
 class RegisterExecutingAttack {
     static void RegisterHitData(asIScriptEngine* engine);
     static void RegisterExecutingAttackType(asIScriptEngine* engine);
+
 public:
     static void Register(asIScriptEngine* engine);
 };

src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.cpp

@@ -1,9 +1,9 @@
 #include "RegisterPokemonClass.hpp"
-#include <CreatureLib/Battling/Models/LearnedAttack.hpp>
 #include <Arbutils/Assert.hpp>
+#include <CreatureLib/Battling/Models/LearnedAttack.hpp>
 #include "../../../../../extern/angelscript_addons/scriptarray/scriptarray.h"
-#include "../../../../Battling/Pokemon/Pokemon.hpp"
 #include "../../../../Battling/PkmnDamageSource.hpp"
+#include "../../../../Battling/Pokemon/Pokemon.hpp"
 
 // Hack to handle AngelScript not recognizing different sized enums on fields, and returning invalid values due to it.
 #define ENUM__SIZE_WRAPPER(name, type, func)                                                                           \
@@ -19,13 +19,11 @@ void RegisterPokemonClass::Register(asIScriptEngine* engine) {
 void RegisterPokemonClass::RegisterDamageSource(asIScriptEngine* engine) {
     [[maybe_unused]] int r = engine->RegisterEnum("DamageSource");
     Assert(r >= 0);
-    for (auto v: CreatureLib::Battling::DamageSourceHelper::GetValues()){
+    for (auto v : CreatureLib::Battling::DamageSourceHelper::GetValues()) {
-        r = engine->RegisterEnumValue("DamageSource", CreatureLib::Battling::DamageSourceHelper::ToString(v),
+        r = engine->RegisterEnumValue("DamageSource", CreatureLib::Battling::DamageSourceHelper::ToString(v), (int)v);
-                                      (int)v);
     }
-    for (auto v: PkmnDamageSourceHelper::GetValues()){
+    for (auto v : PkmnDamageSourceHelper::GetValues()) {
-        r = engine->RegisterEnumValue("DamageSource", PkmnDamageSourceHelper::ToString(v),
+        r = engine->RegisterEnumValue("DamageSource", PkmnDamageSourceHelper::ToString(v), (int)v);
-                                      (int)v);
     }
 
     Assert(r >= 0);
@@ -94,7 +92,6 @@ static bool HasHeldItem(const PkmnLib::Battling::Pokemon* obj, const ConstString
     return obj->HasHeldItem(str.GetHash());
 }
 
-
 void RegisterPokemonClass::RegisterPokemonType(asIScriptEngine* engine) {
     [[maybe_unused]] int r = engine->RegisterObjectType("Pokemon", 0, asOBJ_REF | asOBJ_NOCOUNT);
     Assert(r >= 0);

src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterPokemonClass.hpp

@@ -7,6 +7,7 @@ class RegisterPokemonClass {
     static void RegisterMoveLearnMethod(asIScriptEngine* engine);
     static void RegisterLearnedAttack(asIScriptEngine* engine);
     static void RegisterPokemonType(asIScriptEngine* engine);
+
 public:
     static void Register(asIScriptEngine* engine);
 };

src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterTurnChoices.cpp

@@ -73,7 +73,8 @@ void RegisterTurnChoices::RegisterSwitchTurnChoice(asIScriptEngine* engine) {
                                      asMETHOD(CreatureLib::Battling::SwitchTurnChoice, GetUser), asCALL_THISCALL);
     Assert(r >= 0);
     r = engine->RegisterObjectMethod("SwitchTurnChoice", "Pokemon@ get_NewPokemon() const property",
-                                     asMETHOD(CreatureLib::Battling::SwitchTurnChoice, GetNewCreature), asCALL_THISCALL);
+                                     asMETHOD(CreatureLib::Battling::SwitchTurnChoice, GetNewCreature),
+                                     asCALL_THISCALL);
     Assert(r >= 0);
 
     r = engine->RegisterObjectMethod(

src/ScriptResolving/AngelScript/TypeRegistry/Battling/RegisterTurnChoices.hpp

@@ -7,6 +7,7 @@ class RegisterTurnChoices {
     static void RegisterBaseTurnChoice(asIScriptEngine* engine);
     static void RegisterMoveTurnChoice(asIScriptEngine* engine);
     static void RegisterSwitchTurnChoice(asIScriptEngine* engine);
+
 public:
     static void Register(asIScriptEngine* engine);
 };

src/ScriptResolving/AngelScript/TypeRegistry/ConstString.cpp

@@ -1,11 +1,9 @@
 #include "ConstString.hpp"
 using ConstString = Arbutils::CaseInsensitiveConstString;
 
-static void ConstructConstString(void* self) { new (self)ConstString(); }
+static void ConstructConstString(void* self) { new (self) ConstString(); }
-static void CopyConstructConstString(const ConstString& other, void* self) { new (self)ConstString(other); }
+static void CopyConstructConstString(const ConstString& other, void* self) { new (self) ConstString(other); }
-static void DestructConstString(void* self) {
+static void DestructConstString(void* self) { ((ConstString*)self)->~ConstString(); }
-    ((ConstString*)self)->~ConstString();
-}
 static bool ConstStringEquality(const ConstString& a, const ConstString& b) { return a == b; }
 static bool ConstStringStdStringEquality(const ConstString& a, const std::string& b) { return a == b; }
 static ConstString ImplStdStringConstStringConv(const std::string& s) { return ConstString(s); }

src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterGrowthRateTypes.cpp

@@ -34,8 +34,8 @@ void RegisterGrowthRateTypes::RegisterGrowthRateLibrary(asIScriptEngine* engine)
                                      "uint8 CalculateLevel(const constString &in growthRate, uint experience) const",
                                      asFUNCTION(CalculateLevel), asCALL_CDECL_OBJLAST);
     assert(r >= 0);
-    r = engine->RegisterObjectMethod("GrowthRateLibrary",
+    r = engine->RegisterObjectMethod(
-                                     "uint CalculateExperience(const constString &in growthRate, uint8 experience) const",
+        "GrowthRateLibrary", "uint CalculateExperience(const constString &in growthRate, uint8 experience) const",
         asFUNCTION(CalculateExperience), asCALL_CDECL_OBJLAST);
     assert(r >= 0);
 }

src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterGrowthRateTypes.hpp

@@ -5,6 +5,7 @@
 class RegisterGrowthRateTypes {
     static void RegisterGrowthRateType(asIScriptEngine* engine);
     static void RegisterGrowthRateLibrary(asIScriptEngine* engine);
+
 public:
     static void Register(asIScriptEngine* engine);
 };

src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterItemTypes.cpp

@@ -23,7 +23,8 @@ void RegisterItemTypes::RegisterItemCategoryEnum(asIScriptEngine* engine) {
     assert(r >= 0);
     r = engine->RegisterEnumValue("ItemCategory", "TM", (int)CreatureLib::Library::ItemCategory::MoveLearner);
     assert(r >= 0);
-    r = engine->RegisterEnumValue("ItemCategory", "VariantChanger", (int)CreatureLib::Library::ItemCategory::VariantChanger);
+    r = engine->RegisterEnumValue("ItemCategory", "VariantChanger",
+                                  (int)CreatureLib::Library::ItemCategory::VariantChanger);
     assert(r >= 0);
     r = engine->RegisterEnumValue("ItemCategory", "KeyItem", (int)CreatureLib::Library::ItemCategory::KeyItem);
     assert(r >= 0);
@@ -36,13 +37,17 @@ void RegisterItemTypes::RegisterBattleItemCategoryEnum(asIScriptEngine* engine)
     assert(r >= 0);
     r = engine->RegisterEnumValue("BattleItemCategory", "None", (int)CreatureLib::Library::BattleItemCategory::None);
     assert(r >= 0);
-    r = engine->RegisterEnumValue("BattleItemCategory", "Healing", (int)CreatureLib::Library::BattleItemCategory::Healing);
+    r = engine->RegisterEnumValue("BattleItemCategory", "Healing",
+                                  (int)CreatureLib::Library::BattleItemCategory::Healing);
     assert(r >= 0);
-    r = engine->RegisterEnumValue("BattleItemCategory", "StatusHealing", (int)CreatureLib::Library::BattleItemCategory::StatusHealing);
+    r = engine->RegisterEnumValue("BattleItemCategory", "StatusHealing",
+                                  (int)CreatureLib::Library::BattleItemCategory::StatusHealing);
     assert(r >= 0);
-    r = engine->RegisterEnumValue("BattleItemCategory", "CaptureDevice", (int)CreatureLib::Library::BattleItemCategory::CaptureDevice);
+    r = engine->RegisterEnumValue("BattleItemCategory", "CaptureDevice",
+                                  (int)CreatureLib::Library::BattleItemCategory::CaptureDevice);
     assert(r >= 0);
-    r = engine->RegisterEnumValue("BattleItemCategory", "Misc", (int)CreatureLib::Library::BattleItemCategory::MiscBattleItem);
+    r = engine->RegisterEnumValue("BattleItemCategory", "Misc",
+                                  (int)CreatureLib::Library::BattleItemCategory::MiscBattleItem);
     assert(r >= 0);
 }
 
@@ -57,7 +62,6 @@ static bool HasFlag(const PkmnLib::Library::Item* obj, const Arbutils::CaseInsen
     return obj->HasFlag(str);
 }
 
-
 void RegisterItemTypes::RegisterItemType(asIScriptEngine* engine) {
     [[maybe_unused]] int r = engine->RegisterObjectType("Item", 0, asOBJ_REF | asOBJ_NOCOUNT);
     assert(r >= 0);
@@ -73,11 +77,9 @@ void RegisterItemTypes::RegisterItemType(asIScriptEngine* engine) {
     r = engine->RegisterObjectMethod("Item", "int get_Price() const property",
                                      asMETHOD(PkmnLib::Library::Item, GetPrice), asCALL_THISCALL);
     assert(r >= 0);
-    r = engine->RegisterObjectMethod("Item", "bool HasFlag(const constString &in flag) const",
+    r = engine->RegisterObjectMethod("Item", "bool HasFlag(const constString &in flag) const", asFUNCTION(HasFlag),
-                                     asFUNCTION(HasFlag), asCALL_CDECL_OBJLAST);
+                                     asCALL_CDECL_OBJLAST);
     assert(r >= 0);
-
-
 }
 void RegisterItemTypes::RegisterItemLibrary(asIScriptEngine* engine) {
     [[maybe_unused]] int r = engine->RegisterObjectType("ItemLibrary", 0, asOBJ_REF | asOBJ_NOCOUNT);

src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterItemTypes.hpp

@@ -7,6 +7,7 @@ class RegisterItemTypes {
     static void RegisterBattleItemCategoryEnum(asIScriptEngine* engine);
     static void RegisterItemType(asIScriptEngine* engine);
     static void RegisterItemLibrary(asIScriptEngine* engine);
+
 public:
     static void Register(asIScriptEngine* engine);
 };

src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterMoveTypes.cpp

@@ -77,8 +77,8 @@ void RegisterMoveTypes::RegisterMoveType(asIScriptEngine* engine) {
     r = engine->RegisterObjectMethod("MoveData", "int8 get_Priority() const property",
                                      asMETHOD(PkmnLib::Library::MoveData, GetPriority), asCALL_THISCALL);
     assert(r >= 0);
-    r = engine->RegisterObjectMethod("MoveData", "bool HasFlag(const constString &in flag) const",
+    r = engine->RegisterObjectMethod("MoveData", "bool HasFlag(const constString &in flag) const", asFUNCTION(HasFlag),
-                                     asFUNCTION(HasFlag), asCALL_CDECL_OBJLAST);
+                                     asCALL_CDECL_OBJLAST);
     assert(r >= 0);
 }
 void RegisterMoveTypes::RegisterMoveLibrary(asIScriptEngine* engine) {

src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterMoveTypes.hpp

@@ -7,6 +7,7 @@ class RegisterMoveTypes {
     static void RegisterMoveTarget(asIScriptEngine* engine);
     static void RegisterMoveType(asIScriptEngine* engine);
     static void RegisterMoveLibrary(asIScriptEngine* engine);
+
 public:
     static void Register(asIScriptEngine* engine);
 };

src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterStaticLibraryTypes.cpp

@@ -41,6 +41,4 @@ void RegisterStaticLibraryTypes::RegisterLibraryType(asIScriptEngine* engine) {
     r = engine->RegisterObjectMethod("StaticLibrary", "const TypeLibrary@ get_TypeLibrary() const property",
                                      asMETHOD(PkmnLib::Library::PokemonLibrary, GetTypeLibrary), asCALL_THISCALL);
     assert(r >= 0);
-
-
 }

src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterStaticLibraryTypes.hpp

@@ -5,6 +5,7 @@
 class RegisterStaticLibraryTypes {
     static void RegisterLibrarySettingsType(asIScriptEngine* engine);
     static void RegisterLibraryType(asIScriptEngine* engine);
+
 public:
     static void Register(asIScriptEngine* engine);
 };

src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterTypeLibrary.cpp

@@ -2,9 +2,7 @@
 #include <CreatureLib/Library/TypeLibrary.hpp>
 #include <cassert>
 
-void RegisterTypeLibrary::Register(asIScriptEngine* engine) {
+void RegisterTypeLibrary::Register(asIScriptEngine* engine) { RegisterTypeLibraryType(engine); }
-    RegisterTypeLibraryType(engine);
-}
 
 static bool GetTypeId(const CreatureLib::Library::TypeLibrary* obj, const Arbutils::CaseInsensitiveConstString& str) {
     return obj->GetTypeId(str);
@@ -16,8 +14,9 @@ void RegisterTypeLibrary::RegisterTypeLibraryType(asIScriptEngine* engine) {
     r = engine->RegisterObjectMethod("TypeLibrary", "uint8 GetTypeId(const constString &in name) const",
                                      asFUNCTION(GetTypeId), asCALL_CDECL_OBJLAST);
     assert(r >= 0);
-    r = engine->RegisterObjectMethod("TypeLibrary", "float GetSingleEffectiveness(uint8 attacking, uint8 defensive) const",
+    r = engine->RegisterObjectMethod(
+        "TypeLibrary", "float GetSingleEffectiveness(uint8 attacking, uint8 defensive) const",
         asMETHOD(CreatureLib::Library::TypeLibrary, GetSingleEffectiveness), asCALL_THISCALL);
     assert(r >= 0);
-    //TODO: Register get full effectiveness method.
+    // TODO: Register get full effectiveness method.
 }

src/ScriptResolving/AngelScript/TypeRegistry/Library/RegisterTypeLibrary.hpp

@@ -4,6 +4,7 @@
 
 class RegisterTypeLibrary {
     static void RegisterTypeLibraryType(asIScriptEngine* engine);
+
 public:
     static void Register(asIScriptEngine* engine);
 };

src/ScriptResolving/AngelScript/TypeRegistry/RefCast.hpp

@@ -1,9 +1,8 @@
 #ifndef PKMNLIB_REFCAST_HPP
 #define PKMNLIB_REFCAST_HPP
-template<class A, class B>
+template <class A, class B> B* refCast(A* a) {
-B* refCast(A* a)
+    if (!a)
-{
+        return 0;
-    if( !a ) return 0;
     B* b = dynamic_cast<B*>(a);
     return b;
 }

tests/LibraryTests/SpeciesLibraryTests.cpp

@@ -36,5 +36,4 @@ TEST_CASE("Able to insert and retrieve from library", "library") {
     delete lib;
 }
 
-
 #endif

tests/ScriptTests/BaseScriptClassTests.cpp

@@ -134,9 +134,9 @@ TEST_CASE("Invoke OnInitialize script function") {
     ctx = ctxPool->RequestContext();
     script->PrepareMethod("GetStringValue"_cnc, ctx);
     REQUIRE(ctx->Execute() == asEXECUTION_FINISHED);
-//    Arbutils::CaseInsensitiveConstString s;
+    //    Arbutils::CaseInsensitiveConstString s;
-//    s = *(Arbutils::CaseInsensitiveConstString*)ctx->GetReturnAddress();
+    //    s = *(Arbutils::CaseInsensitiveConstString*)ctx->GetReturnAddress();
-//    REQUIRE(s == "foobar"_cnc);
+    //    REQUIRE(s == "foobar"_cnc);
     ctxPool->ReturnContextToPool(ctx);
 
     for (auto p : parameters) {

tests/ScriptTests/ScriptTypeTests/Battle/PokemonTests.cpp

@@ -47,7 +47,7 @@ static AngelScriptResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary*
     if (_resolverCache == nullptr) {
         _resolverCache = dynamic_cast<AngelScriptResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
         _resolverCache->Initialize(mainLib);
-        _resolverCache->CreateScript("testScript1" , _scripts["testScript1"]);
+        _resolverCache->CreateScript("testScript1", _scripts["testScript1"]);
         _resolverCache->FinalizeModule();
     }
     return _resolverCache;
@@ -351,9 +351,7 @@ TEST_CASE("Validate Pokemon HasHeldItem in Script") {
     REQUIRE(data.Context->Execute() == asEXECUTION_FINISHED);
     REQUIRE((bool)data.Context->GetReturnDWord());
 
-
     delete mon;
 }
 
-
 #endif

tests/ScriptTests/ScriptTypeTests/Library/FormesTests.cpp

@@ -32,11 +32,11 @@ struct ScriptData {
 };
 
 static AngelScriptResolver* _resolverCache = nullptr;
-static AngelScriptResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* mainLib){
+static AngelScriptResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* mainLib) {
-    if (_resolverCache == nullptr){
+    if (_resolverCache == nullptr) {
         _resolverCache = dynamic_cast<AngelScriptResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
         _resolverCache->Initialize(mainLib);
-        _resolverCache->CreateScript("testScript1" , _scripts["testScript1"]);
+        _resolverCache->CreateScript("testScript1", _scripts["testScript1"]);
         _resolverCache->FinalizeModule();
     }
     return _resolverCache;

tests/ScriptTests/ScriptTypeTests/Library/ItemDataTests.cpp

@@ -28,11 +28,11 @@ struct ScriptData {
 };
 
 static AngelScriptResolver* _resolverCache = nullptr;
-static AngelScriptResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* mainLib){
+static AngelScriptResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* mainLib) {
-    if (_resolverCache == nullptr){
+    if (_resolverCache == nullptr) {
         _resolverCache = dynamic_cast<AngelScriptResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
         _resolverCache->Initialize(mainLib);
-        _resolverCache->CreateScript("testScript1" , _scripts["testScript1"]);
+        _resolverCache->CreateScript("testScript1", _scripts["testScript1"]);
         _resolverCache->FinalizeModule();
     }
     return _resolverCache;
@@ -72,7 +72,7 @@ TEST_CASE("Validate Item Category in Script") {
 
     auto item = mainLib->GetItemLibrary()->Get("testItem"_cnc);
     data.Context->SetArgObject(0, const_cast<PkmnLib::Library::Item*>(item));
-    data.Context->SetArgDWord(1, static_cast<int32_t >(item->GetCategory()));
+    data.Context->SetArgDWord(1, static_cast<int32_t>(item->GetCategory()));
 
     REQUIRE(data.Context->Execute() == asEXECUTION_FINISHED);
     REQUIRE((bool)data.Context->GetReturnWord());
@@ -84,7 +84,7 @@ TEST_CASE("Validate Item Battle Category in Script") {
 
     auto item = mainLib->GetItemLibrary()->Get("testItem"_cnc);
     data.Context->SetArgObject(0, const_cast<PkmnLib::Library::Item*>(item));
-    data.Context->SetArgDWord(1, static_cast<int32_t >(item->GetBattleCategory()));
+    data.Context->SetArgDWord(1, static_cast<int32_t>(item->GetBattleCategory()));
 
     REQUIRE(data.Context->Execute() == asEXECUTION_FINISHED);
     REQUIRE((bool)data.Context->GetReturnWord());
@@ -96,13 +96,10 @@ TEST_CASE("Validate Item Price in Script") {
 
     auto item = mainLib->GetItemLibrary()->Get("testItem"_cnc);
     data.Context->SetArgObject(0, const_cast<PkmnLib::Library::Item*>(item));
-    data.Context->SetArgDWord(1, static_cast<int32_t >(item->GetPrice()));
+    data.Context->SetArgDWord(1, static_cast<int32_t>(item->GetPrice()));
 
     REQUIRE(data.Context->Execute() == asEXECUTION_FINISHED);
     REQUIRE((bool)data.Context->GetReturnWord());
 }
 
-
-
-
 #endif

tests/ScriptTests/ScriptTypeTests/Library/MoveTests.cpp

@@ -32,11 +32,11 @@ struct ScriptData {
 };
 
 static AngelScriptResolver* _resolverCache = nullptr;
-static AngelScriptResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* mainLib){
+static AngelScriptResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* mainLib) {
-    if (_resolverCache == nullptr){
+    if (_resolverCache == nullptr) {
         _resolverCache = dynamic_cast<AngelScriptResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
         _resolverCache->Initialize(mainLib);
-        _resolverCache->CreateScript("testScript1" , _scripts["testScript1"]);
+        _resolverCache->CreateScript("testScript1", _scripts["testScript1"]);
         _resolverCache->FinalizeModule();
     }
     return _resolverCache;
@@ -157,5 +157,4 @@ TEST_CASE("Validate Move Priority in Script") {
     REQUIRE((bool)data.Context->GetReturnWord());
 }
 
-
 #endif

tests/ScriptTests/ScriptTypeTests/Library/SpeciesTests.cpp

@@ -30,11 +30,11 @@ struct ScriptData {
 };
 
 static AngelScriptResolver* _resolverCache = nullptr;
-static AngelScriptResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* mainLib){
+static AngelScriptResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* mainLib) {
-    if (_resolverCache == nullptr){
+    if (_resolverCache == nullptr) {
         _resolverCache = dynamic_cast<AngelScriptResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
         _resolverCache->Initialize(mainLib);
-        _resolverCache->CreateScript("testScript1" , _scripts["testScript1"]);
+        _resolverCache->CreateScript("testScript1", _scripts["testScript1"]);
         _resolverCache->FinalizeModule();
     }
     return _resolverCache;
@@ -60,8 +60,7 @@ TEST_CASE("Validate Species Name in Script") {
     auto data = GetScript(mainLib, "testName"_cnc);
 
     auto species = mainLib->GetSpeciesLibrary()->Get("testSpecies2"_cnc);
-    data.Context->SetArgObject(
+    data.Context->SetArgObject(0, const_cast<PkmnLib::Library::PokemonSpecies*>(species));
-        0, const_cast<PkmnLib::Library::PokemonSpecies*>(species));
     auto name = species->GetName();
     data.Context->SetArgAddress(1, &name);
 
@@ -76,8 +75,7 @@ TEST_CASE("Validate Species Id in Script") {
     auto data = GetScript(mainLib, "testId"_cnc);
 
     auto species = mainLib->GetSpeciesLibrary()->Get("testSpecies2"_cnc);
-    data.Context->SetArgObject(
+    data.Context->SetArgObject(0, const_cast<PkmnLib::Library::PokemonSpecies*>(species));
-        0, const_cast<PkmnLib::Library::PokemonSpecies*>(species));
     data.Context->SetArgWord(1, species->GetId());
 
     auto result = data.Context->Execute();
@@ -91,8 +89,7 @@ TEST_CASE("Validate Species Gender Rate in Script") {
     auto data = GetScript(mainLib, "testGenderRate"_cnc);
 
     auto species = mainLib->GetSpeciesLibrary()->Get("testSpecies2"_cnc);
-    data.Context->SetArgObject(
+    data.Context->SetArgObject(0, const_cast<PkmnLib::Library::PokemonSpecies*>(species));
-        0, const_cast<PkmnLib::Library::PokemonSpecies*>(species));
     data.Context->SetArgFloat(1, species->GetGenderRate());
 
     auto result = data.Context->Execute();
@@ -106,8 +103,7 @@ TEST_CASE("Validate Species Capture Rate in Script") {
     auto data = GetScript(mainLib, "testCaptureRate"_cnc);
 
     auto species = mainLib->GetSpeciesLibrary()->Get("testSpecies2"_cnc);
-    data.Context->SetArgObject(
+    data.Context->SetArgObject(0, const_cast<PkmnLib::Library::PokemonSpecies*>(species));
-        0, const_cast<PkmnLib::Library::PokemonSpecies*>(species));
     data.Context->SetArgByte(1, species->GetCaptureRate());
 
     auto result = data.Context->Execute();
@@ -121,12 +117,11 @@ TEST_CASE("Validate Species Get Forme in Script") {
     auto data = GetScript(mainLib, "testGetForme"_cnc);
 
     auto species = mainLib->GetSpeciesLibrary()->Get("testSpecies2"_cnc);
-    data.Context->SetArgObject(
+    data.Context->SetArgObject(0, const_cast<PkmnLib::Library::PokemonSpecies*>(species));
-        0, const_cast<PkmnLib::Library::PokemonSpecies*>(species));
     data.Context->SetArgObject(1, const_cast<PkmnLib::Library::PokemonForme*>(species->GetForme("default"_cnc)));
 
     auto result = data.Context->Execute();
-    if (result == asEXECUTION_EXCEPTION){
+    if (result == asEXECUTION_EXCEPTION) {
         FAIL(data.Context->GetExceptionString());
     }
     REQUIRE(result == asEXECUTION_FINISHED);
@@ -148,6 +143,4 @@ TEST_CASE("Validate Species Get Default Forme in Script") {
     REQUIRE(v);
 }
 
-
-
 #endif

tests/ScriptTests/ScriptTypeTests/Library/StaticLibraryTests.cpp

@@ -31,11 +31,11 @@ struct ScriptData {
 };
 
 static AngelScriptResolver* _resolverCache = nullptr;
-static AngelScriptResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* mainLib){
+static AngelScriptResolver* GetScriptResolver(PkmnLib::Battling::BattleLibrary* mainLib) {
-    if (_resolverCache == nullptr){
+    if (_resolverCache == nullptr) {
         _resolverCache = dynamic_cast<AngelScriptResolver*>(PkmnLib::Battling::BattleLibrary::CreateScriptResolver());
         _resolverCache->Initialize(mainLib);
-        _resolverCache->CreateScript("testScript1" , _scripts["testScript1"]);
+        _resolverCache->CreateScript("testScript1", _scripts["testScript1"]);
         _resolverCache->FinalizeModule();
     }
     return _resolverCache;