Update CreatureLib headers, move header files to PkmnLib subdirectory.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2020-02-08 19:22:29 +01:00
parent c55524be69
commit 61e9c9ba1f
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
27 changed files with 31 additions and 31 deletions

View File

@ -24,7 +24,7 @@ class PkmnLibConan(ConanFile):
cmake.build() cmake.build()
def package(self): def package(self):
self.copy("*.hpp", dst="include", src="src") self.copy("*.hpp", dst="include/PkmnLib", src="src")
self.copy("*.dll", dst="bin", keep_path=False) self.copy("*.dll", dst="bin", keep_path=False)
self.copy("*.so", dst="lib", keep_path=False) self.copy("*.so", dst="lib", keep_path=False)
@ -44,7 +44,7 @@ class PkmnLibConan(ConanFile):
self.options["AngelScript"].link_std_statically = True self.options["AngelScript"].link_std_statically = True
def requirements(self): def requirements(self):
self.requires("CreatureLib/52d24922ff6dfbe0b9fb128bbfa0637d147c47cc@creaturelib/master") self.requires("CreatureLib/3303dfd82de510d1bf7f978e1f996d4a9a297960@creaturelib/master")
if self.options.script_handler == "angelscript": if self.options.script_handler == "angelscript":
self.requires("AngelScript/2.34@AngelScript/Deukhoofd") self.requires("AngelScript/2.34@AngelScript/Deukhoofd")
else: else:

View File

@ -1,7 +1,7 @@
#ifndef PKMNLIB_BATTLELIBRARY_HPP #ifndef PKMNLIB_BATTLELIBRARY_HPP
#define PKMNLIB_BATTLELIBRARY_HPP #define PKMNLIB_BATTLELIBRARY_HPP
#include <Battling/Library/BattleLibrary.hpp> #include <CreatureLib/Battling/Library/BattleLibrary.hpp>
#include "../../Library/PokemonLibrary.hpp" #include "../../Library/PokemonLibrary.hpp"
#include "DamageLibrary.hpp" #include "DamageLibrary.hpp"
#include "StatCalculator.hpp" #include "StatCalculator.hpp"

View File

@ -1,7 +1,7 @@
#ifndef PKMNLIB_DAMAGELIBRARY_HPP #ifndef PKMNLIB_DAMAGELIBRARY_HPP
#define PKMNLIB_DAMAGELIBRARY_HPP #define PKMNLIB_DAMAGELIBRARY_HPP
#include <Battling/Library/DamageLibrary.hpp> #include <CreatureLib/Battling/Library/DamageLibrary.hpp>
namespace PkmnLib::Battling { namespace PkmnLib::Battling {
class DamageLibrary : public CreatureLib::Battling::DamageLibrary { class DamageLibrary : public CreatureLib::Battling::DamageLibrary {
public: public:

View File

@ -1,7 +1,7 @@
#ifndef PKMNLIB_STATCALCULATOR_HPP #ifndef PKMNLIB_STATCALCULATOR_HPP
#define PKMNLIB_STATCALCULATOR_HPP #define PKMNLIB_STATCALCULATOR_HPP
#include <Battling/Library/BattleStatCalculator.hpp> #include <CreatureLib/Battling/Library/BattleStatCalculator.hpp>
#include "../../Library/Statistic.hpp" #include "../../Library/Statistic.hpp"
namespace PkmnLib::Battling { namespace PkmnLib::Battling {

View File

@ -1,7 +1,7 @@
#ifndef PKMNLIB_LEARNEDMOVE_HPP #ifndef PKMNLIB_LEARNEDMOVE_HPP
#define PKMNLIB_LEARNEDMOVE_HPP #define PKMNLIB_LEARNEDMOVE_HPP
#include <Battling/Models/LearnedAttack.hpp> #include <CreatureLib/Battling/Models/LearnedAttack.hpp>
#include "../../Library/Moves/MoveData.hpp" #include "../../Library/Moves/MoveData.hpp"
namespace PkmnLib::Battling { namespace PkmnLib::Battling {
class LearnedMove : public CreatureLib::Battling::LearnedAttack { class LearnedMove : public CreatureLib::Battling::LearnedAttack {

View File

@ -1,7 +1,7 @@
#ifndef PKMNLIB_POKEMON_HPP #ifndef PKMNLIB_POKEMON_HPP
#define PKMNLIB_POKEMON_HPP #define PKMNLIB_POKEMON_HPP
#include <Battling/Models/Creature.hpp> #include <CreatureLib/Battling/Models/Creature.hpp>
#include <utility> #include <utility>
#include "../../Library/Statistic.hpp" #include "../../Library/Statistic.hpp"
#include "../Library/BattleLibrary.hpp" #include "../Library/BattleLibrary.hpp"

View File

@ -1,7 +1,7 @@
#ifndef PKMNLIB_EVOLUTIONDATA_HPP #ifndef PKMNLIB_EVOLUTIONDATA_HPP
#define PKMNLIB_EVOLUTIONDATA_HPP #define PKMNLIB_EVOLUTIONDATA_HPP
#include <Library/Gender.hpp> #include <CreatureLib/Library/Gender.hpp>
#include <any> #include <any>
#include <string> #include <string>
#include <utility> #include <utility>

View File

@ -1,7 +1,7 @@
#ifndef PKMNLIB_ITEM_HPP #ifndef PKMNLIB_ITEM_HPP
#define PKMNLIB_ITEM_HPP #define PKMNLIB_ITEM_HPP
#include <Library/Items/Item.hpp> #include <CreatureLib/Library/Items/Item.hpp>
namespace PkmnLib::Library { namespace PkmnLib::Library {
class Item : public CreatureLib::Library::Item { class Item : public CreatureLib::Library::Item {
public: public:

View File

@ -1,7 +1,7 @@
#ifndef PKMNLIB_ITEMLIBRARY_HPP #ifndef PKMNLIB_ITEMLIBRARY_HPP
#define PKMNLIB_ITEMLIBRARY_HPP #define PKMNLIB_ITEMLIBRARY_HPP
#include <Library/ItemLibrary.hpp> #include <CreatureLib/Library/ItemLibrary.hpp>
#include "Item.hpp" #include "Item.hpp"
namespace PkmnLib::Library { namespace PkmnLib::Library {
class ItemLibrary : public CreatureLib::Library::ItemLibrary { class ItemLibrary : public CreatureLib::Library::ItemLibrary {

View File

@ -1,7 +1,7 @@
#ifndef PKMNLIB_LIBRARYSETTINGS_HPP #ifndef PKMNLIB_LIBRARYSETTINGS_HPP
#define PKMNLIB_LIBRARYSETTINGS_HPP #define PKMNLIB_LIBRARYSETTINGS_HPP
#include <Library/LibrarySettings.hpp> #include <CreatureLib/Library/LibrarySettings.hpp>
namespace PkmnLib::Library { namespace PkmnLib::Library {
class LibrarySettings : public CreatureLib::Library::LibrarySettings { class LibrarySettings : public CreatureLib::Library::LibrarySettings {

View File

@ -1,7 +1,7 @@
#ifndef PKMNLIB_MOVEDATA_HPP #ifndef PKMNLIB_MOVEDATA_HPP
#define PKMNLIB_MOVEDATA_HPP #define PKMNLIB_MOVEDATA_HPP
#include <Library/Attacks/AttackData.hpp> #include <CreatureLib/Library/Attacks/AttackData.hpp>
#include "MoveCategory.hpp" #include "MoveCategory.hpp"
namespace PkmnLib::Library { namespace PkmnLib::Library {

View File

@ -1,7 +1,7 @@
#ifndef PKMNLIB_MOVELIBRARY_HPP #ifndef PKMNLIB_MOVELIBRARY_HPP
#define PKMNLIB_MOVELIBRARY_HPP #define PKMNLIB_MOVELIBRARY_HPP
#include <Library/AttackLibrary.hpp> #include <CreatureLib/Library/AttackLibrary.hpp>
#include "MoveData.hpp" #include "MoveData.hpp"
namespace PkmnLib::Library { namespace PkmnLib::Library {
class MoveLibrary : public CreatureLib::Library::AttackLibrary { class MoveLibrary : public CreatureLib::Library::AttackLibrary {

View File

@ -1,7 +1,7 @@
#ifndef PKMNLIB_NATURE_HPP #ifndef PKMNLIB_NATURE_HPP
#define PKMNLIB_NATURE_HPP #define PKMNLIB_NATURE_HPP
#include <Core/Statistic.hpp> #include <CreatureLib/Core/Statistic.hpp>
namespace PkmnLib::Library { namespace PkmnLib::Library {
class Nature { class Nature {
private: private:

View File

@ -1,8 +1,8 @@
#ifndef PKMNLIB_NATURELIBRARY_HPP #ifndef PKMNLIB_NATURELIBRARY_HPP
#define PKMNLIB_NATURELIBRARY_HPP #define PKMNLIB_NATURELIBRARY_HPP
#include <Core/Exceptions/CreatureException.hpp> #include <CreatureLib/Core/Exceptions/CreatureException.hpp>
#include <Core/Random.hpp> #include <CreatureLib/Core/Random.hpp>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include "Nature.hpp" #include "Nature.hpp"

View File

@ -1,7 +1,7 @@
#ifndef PKMNLIB_POKEMONLIBRARY_HPP #ifndef PKMNLIB_POKEMONLIBRARY_HPP
#define PKMNLIB_POKEMONLIBRARY_HPP #define PKMNLIB_POKEMONLIBRARY_HPP
#include <Library/DataLibrary.hpp> #include <CreatureLib/Library/DataLibrary.hpp>
#include "Items/ItemLibrary.hpp" #include "Items/ItemLibrary.hpp"
#include "LibrarySettings.hpp" #include "LibrarySettings.hpp"
#include "Moves/MoveLibrary.hpp" #include "Moves/MoveLibrary.hpp"

View File

@ -1,7 +1,7 @@
#ifndef PKMNLIB_POKEMONFORME_HPP #ifndef PKMNLIB_POKEMONFORME_HPP
#define PKMNLIB_POKEMONFORME_HPP #define PKMNLIB_POKEMONFORME_HPP
#include <Library/CreatureData/SpeciesVariant.hpp> #include <CreatureLib/Library/CreatureData/SpeciesVariant.hpp>
namespace PkmnLib::Library { namespace PkmnLib::Library {
class PokemonForme : public CreatureLib::Library::SpeciesVariant { class PokemonForme : public CreatureLib::Library::SpeciesVariant {

View File

@ -1,6 +1,6 @@
#ifndef PKMNLIB_POKEMONSPECIES_HPP #ifndef PKMNLIB_POKEMONSPECIES_HPP
#define PKMNLIB_POKEMONSPECIES_HPP #define PKMNLIB_POKEMONSPECIES_HPP
#include <Battling/Models/Creature.hpp> #include <CreatureLib/Battling/Models/Creature.hpp>
#include "../Evolutions/EvolutionData.hpp" #include "../Evolutions/EvolutionData.hpp"
#include "PokemonForme.hpp" #include "PokemonForme.hpp"

View File

@ -1,7 +1,7 @@
#ifndef PKMNLIB_SPECIESLIBRARY_HPP #ifndef PKMNLIB_SPECIESLIBRARY_HPP
#define PKMNLIB_SPECIESLIBRARY_HPP #define PKMNLIB_SPECIESLIBRARY_HPP
#include <Library/SpeciesLibrary.hpp> #include <CreatureLib/Library/SpeciesLibrary.hpp>
#include "PokemonSpecies.hpp" #include "PokemonSpecies.hpp"
namespace PkmnLib::Library { namespace PkmnLib::Library {

View File

@ -1,7 +1,7 @@
#ifndef PKMNLIB_STATISTIC_HPP #ifndef PKMNLIB_STATISTIC_HPP
#define PKMNLIB_STATISTIC_HPP #define PKMNLIB_STATISTIC_HPP
#include <Core/Statistic.hpp> #include <CreatureLib/Core/Statistic.hpp>
namespace PkmnLib::Library { namespace PkmnLib::Library {
class Statistic { class Statistic {
public: public:

View File

@ -1,7 +1,7 @@
#ifndef PKMNLIB_ANGELSCRIPRESOLVER_HPP #ifndef PKMNLIB_ANGELSCRIPRESOLVER_HPP
#define PKMNLIB_ANGELSCRIPRESOLVER_HPP #define PKMNLIB_ANGELSCRIPRESOLVER_HPP
#include <Battling/ScriptHandling/ScriptResolver.hpp> #include <CreatureLib/Battling/ScriptHandling/ScriptResolver.hpp>
#include "../../Battling/Library/BattleLibrary.hpp" #include "../../Battling/Library/BattleLibrary.hpp"
#define ANGELSCRIPT_DLL_LIBRARY_IMPORT #define ANGELSCRIPT_DLL_LIBRARY_IMPORT

View File

@ -1,8 +1,8 @@
#ifndef PKMNLIB_ANGELSCRIPTSCRIPT_HPP #ifndef PKMNLIB_ANGELSCRIPTSCRIPT_HPP
#define PKMNLIB_ANGELSCRIPTSCRIPT_HPP #define PKMNLIB_ANGELSCRIPTSCRIPT_HPP
#include <Battling/ScriptHandling/Script.hpp> #include <CreatureLib/Battling/ScriptHandling/Script.hpp>
#define ANGELSCRIPT_DLL_LIBRARY_IMPORT #define ANGELSCRIPT_DLL_LIBRARY_IMPORT
#include <Core/Exceptions/NotImplementedException.hpp> #include <CreatureLib/Core/Exceptions/NotImplementedException.hpp>
#include <angelscript.h> #include <angelscript.h>
#include "AngelScriptTypeInfo.hpp" #include "AngelScriptTypeInfo.hpp"
#include "ContextPool.hpp" #include "ContextPool.hpp"

View File

@ -2,7 +2,7 @@
#define PKMNLIB_ANGELSCRIPTTYPEINFO_HPP #define PKMNLIB_ANGELSCRIPTTYPEINFO_HPP
#define ANGELSCRIPT_DLL_LIBRARY_IMPORT #define ANGELSCRIPT_DLL_LIBRARY_IMPORT
#include <Core/Exceptions/CreatureException.hpp> #include <CreatureLib/Core/Exceptions/CreatureException.hpp>
#include <angelscript.h> #include <angelscript.h>
#include <cstring> #include <cstring>
#include <unordered_map> #include <unordered_map>

View File

@ -1,5 +1,5 @@
#include "RegisterExecutingAttack.hpp" #include "RegisterExecutingAttack.hpp"
#include <Battling/Models/ExecutingAttack.hpp> #include <CreatureLib/Battling/Models/ExecutingAttack.hpp>
#include <cassert> #include <cassert>
void RegisterExecutingAttack::Register(asIScriptEngine* engine) { void RegisterExecutingAttack::Register(asIScriptEngine* engine) {

View File

@ -1,5 +1,5 @@
#include "RegisterPokemonClass.hpp" #include "RegisterPokemonClass.hpp"
#include <Battling/Models/LearnedAttack.hpp> #include <CreatureLib/Battling/Models/LearnedAttack.hpp>
#include <cassert> #include <cassert>
#include "../../../../../extern/angelscript_addons/scriptarray/scriptarray.h" #include "../../../../../extern/angelscript_addons/scriptarray/scriptarray.h"
#include "../../../../Battling/Pokemon/Pokemon.hpp" #include "../../../../Battling/Pokemon/Pokemon.hpp"

View File

@ -1,6 +1,6 @@
#include "RegisterGrowthRateTypes.hpp" #include "RegisterGrowthRateTypes.hpp"
#include <Library/GrowthRates/GrowthRate.hpp> #include <CreatureLib/Library/GrowthRates/GrowthRate.hpp>
#include <Library/GrowthRates/GrowthRateLibrary.hpp> #include <CreatureLib/Library/GrowthRates/GrowthRateLibrary.hpp>
#include <cassert> #include <cassert>
void RegisterGrowthRateTypes::Register(asIScriptEngine* engine) { void RegisterGrowthRateTypes::Register(asIScriptEngine* engine) {

View File

@ -1,5 +1,5 @@
#include "RegisterTypeLibrary.hpp" #include "RegisterTypeLibrary.hpp"
#include <Library/TypeLibrary.hpp> #include <CreatureLib/Library/TypeLibrary.hpp>
#include <cassert> #include <cassert>
void RegisterTypeLibrary::Register(asIScriptEngine* engine) { void RegisterTypeLibrary::Register(asIScriptEngine* engine) {

View File

@ -1,7 +1,7 @@
#ifndef PKMNLIB_TESTLIBRARY_HPP #ifndef PKMNLIB_TESTLIBRARY_HPP
#define PKMNLIB_TESTLIBRARY_HPP #define PKMNLIB_TESTLIBRARY_HPP
#include <Library/GrowthRates/LookupGrowthRate.hpp> #include <CreatureLib/Library/GrowthRates/LookupGrowthRate.hpp>
#include "../../src/Battling/Library/BattleLibrary.hpp" #include "../../src/Battling/Library/BattleLibrary.hpp"
#include "../../src/Library/Moves/MoveLibrary.hpp" #include "../../src/Library/Moves/MoveLibrary.hpp"
#include "../../src/Library/PokemonLibrary.hpp" #include "../../src/Library/PokemonLibrary.hpp"