Reorganized files

CMakeLists.txt

@@ -60,8 +60,8 @@ SET(FILE_SOURCE
         )
 if (SCRIPT_PROVIDER STREQUAL "angelscript")
     SET(FILE_SOURCE ${FILE_SOURCE}
-            "src/AngelScript/*.cpp"
-            "src/AngelScript/*.hpp"
+            "src/ScriptResolving/AngelScript/*.cpp"
+            "src/ScriptResolving/AngelScript/*.hpp"
             "extern/angelscript_addons/*.cpp"
             "extern/angelscript_addons/*.h"
             )

src/ScriptResolving/AngelScript/AngelScripResolver.cpp

@@ -1,9 +1,9 @@
 #include "AngelScripResolver.hpp"
 #define AS_USE_ACCESSORS
-#include "../../extern/angelscript_addons/scriptarray/scriptarray.h"
+#include "../../../extern/angelscript_addons/scriptarray/scriptarray.h"
 #undef AS_USE_ACCESSORS
-#include "../../extern/angelscript_addons/scripthelper/scripthelper.h"
-#include "../../extern/angelscript_addons/scriptstdstring/scriptstdstring.h"
+#include "../../../extern/angelscript_addons/scripthelper/scripthelper.h"
+#include "../../../extern/angelscript_addons/scriptstdstring/scriptstdstring.h"
 #include "TypeRegistry/Battling/RegisterExecutingAttack.hpp"
 #include "TypeRegistry/Battling/RegisterPokemonClass.hpp"
 #include "TypeRegistry/Library/RegisterGrowthRateTypes.hpp"

src/ScriptResolving/AngelScript/AngelScripResolver.hpp

@@ -2,7 +2,7 @@
 #define PKMNLIB_ANGELSCRIPRESOLVER_HPP
 
 #include <Battling/ScriptHandling/ScriptResolver.hpp>
-#include "../Battling/Library/BattleLibrary.hpp"
+#include "../../Battling/Library/BattleLibrary.hpp"
 
 #define ANGELSCRIPT_DLL_LIBRARY_IMPORT
 #include <angelscript.h>

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

@@ -1,6 +1,6 @@
 #include "RegisterBattleLibrary.hpp"
 #include <cassert>
-#include "../../../Battling/Library/DamageLibrary.hpp"
+#include "../../../../Battling/Library/DamageLibrary.hpp"
 
 void RegisterBattleLibrary::Register(asIScriptEngine* engine) {
     RegisterDamageLibrary(engine);

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

@@ -1,8 +1,8 @@
 #include "RegisterPokemonClass.hpp"
 #include <Battling/Models/LearnedAttack.hpp>
 #include <cassert>
-#include "../../../../extern/angelscript_addons/scriptarray/scriptarray.h"
-#include "../../../Battling/Pokemon/Pokemon.hpp"
+#include "../../../../../extern/angelscript_addons/scriptarray/scriptarray.h"
+#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)                                                                           \

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

@@ -1,7 +1,7 @@
 #include "RegisterItemTypes.hpp"
 #include <cassert>
-#include "../../../Library/Items/Item.hpp"
-#include "../../../Library/Items/ItemLibrary.hpp"
+#include "../../../../Library/Items/Item.hpp"
+#include "../../../../Library/Items/ItemLibrary.hpp"
 
 void RegisterItemTypes::Register(asIScriptEngine* engine) {
     RegisterItemCategoryEnum(engine);

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

@@ -1,7 +1,7 @@
 #include "RegisterMoveTypes.hpp"
 #include <cassert>
-#include "../../../Library/Moves/MoveData.hpp"
-#include "../../../Library/Moves/MoveLibrary.hpp"
+#include "../../../../Library/Moves/MoveData.hpp"
+#include "../../../../Library/Moves/MoveLibrary.hpp"
 
 void RegisterMoveTypes::Register(asIScriptEngine* engine) {
     RegisterMoveCategory(engine);

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

@@ -1,8 +1,8 @@
 #include "RegisterSpeciesTypes.hpp"
 #include <cassert>
-#include "../../../Library/Species/PokemonSpecies.hpp"
-#include "../../../Library/Species/SpeciesLibrary.hpp"
-#include "../../../Library/Statistic.hpp"
+#include "../../../../Library/Species/PokemonSpecies.hpp"
+#include "../../../../Library/Species/SpeciesLibrary.hpp"
+#include "../../../../Library/Statistic.hpp"
 
 void RegisterSpeciesTypes::Register(asIScriptEngine* engine) {
     RegisterGenderEnum(engine);

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

@@ -1,6 +1,6 @@
 #include "RegisterStaticLibraryTypes.hpp"
 #include <cassert>
-#include "../../../Library/PokemonLibrary.hpp"
+#include "../../../../Library/PokemonLibrary.hpp"
 
 void RegisterStaticLibraryTypes::Register(asIScriptEngine* engine) {
     RegisterLibrarySettingsType(engine);

tests/ScriptTests/ScriptResolverTests.cpp

@@ -1,6 +1,6 @@
 #ifdef TESTS_BUILD
 #include "../../extern/catch.hpp"
-#include "../../src/AngelScript/AngelScripResolver.hpp"
+#include "../../src/ScriptResolving/AngelScript/AngelScripResolver.hpp"
 #include "../TestLibrary/TestLibrary.hpp"
 
 static std::unordered_map<const char*, const char*> _scripts =

tests/ScriptTests/ScriptTypeTests/Battle/PokemonTests.cpp

@@ -1,6 +1,6 @@
 #ifdef TESTS_BUILD
 #include "../../../../extern/catch.hpp"
-#include "../../../../src/AngelScript/AngelScripResolver.hpp"
+#include "../../../../src/ScriptResolving/AngelScript/AngelScripResolver.hpp"
 #include "../../../../src/Battling/Pokemon/CreatePokemon.hpp"
 #include "../../../TestLibrary/TestLibrary.hpp"
 

tests/ScriptTests/ScriptTypeTests/Library/FormesTests.cpp

@@ -1,6 +1,6 @@
 #ifdef TESTS_BUILD
 #include "../../../../extern/catch.hpp"
-#include "../../../../src/AngelScript/AngelScripResolver.hpp"
+#include "../../../../src/ScriptResolving/AngelScript/AngelScripResolver.hpp"
 #include "../../../TestLibrary/TestLibrary.hpp"
 
 static std::unordered_map<const char*, const char*> _scripts =

tests/ScriptTests/ScriptTypeTests/Library/ItemDataTests.cpp

@@ -1,6 +1,6 @@
 #ifdef TESTS_BUILD
 #include "../../../../extern/catch.hpp"
-#include "../../../../src/AngelScript/AngelScripResolver.hpp"
+#include "../../../../src/ScriptResolving/AngelScript/AngelScripResolver.hpp"
 #include "../../../TestLibrary/TestLibrary.hpp"
 
 static std::unordered_map<const char*, const char*> _scripts =

tests/ScriptTests/ScriptTypeTests/Library/MoveTests.cpp

@@ -1,6 +1,6 @@
 #ifdef TESTS_BUILD
 #include "../../../../extern/catch.hpp"
-#include "../../../../src/AngelScript/AngelScripResolver.hpp"
+#include "../../../../src/ScriptResolving/AngelScript/AngelScripResolver.hpp"
 #include "../../../TestLibrary/TestLibrary.hpp"
 
 static std::unordered_map<const char*, const char*> _scripts =

tests/ScriptTests/ScriptTypeTests/Library/SpeciesTests.cpp

@@ -1,6 +1,6 @@
 #ifdef TESTS_BUILD
 #include "../../../../extern/catch.hpp"
-#include "../../../../src/AngelScript/AngelScripResolver.hpp"
+#include "../../../../src/ScriptResolving/AngelScript/AngelScripResolver.hpp"
 #include "../../../TestLibrary/TestLibrary.hpp"
 
 static std::unordered_map<const char*, const char*> _scripts =

tests/ScriptTests/ScriptTypeTests/Library/StaticLibraryTests.cpp

@@ -1,6 +1,6 @@
 #ifdef TESTS_BUILD
 #include "../../../../extern/catch.hpp"
-#include "../../../../src/AngelScript/AngelScripResolver.hpp"
+#include "../../../../src/ScriptResolving/AngelScript/AngelScripResolver.hpp"
 #include "../../../TestLibrary/TestLibrary.hpp"
 
 static std::unordered_map<const char*, const char*> _scripts =