Update to latest version of CreatureLib, apply new ENUM macro.
continuous-integration/drone/push Build is failing Details

This commit is contained in:
Deukhoofd 2020-02-12 20:30:22 +01:00
parent 9974adb5ad
commit b8d7e5624c
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
3 changed files with 10 additions and 24 deletions

View File

@ -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/3f57051219232f42bacf3475d231cfe693e1e101@creaturelib/master") self.requires("CreatureLib/1969f59a9ca1408b6c107d679a83f6b73aeb2af9@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

@ -2,22 +2,11 @@
#define PKMNLIB_EVOLUTIONMETHOD_HPP #define PKMNLIB_EVOLUTIONMETHOD_HPP
#include <cstdint> #include <cstdint>
namespace PkmnLib::Library{ namespace PkmnLib::Library {
enum class EvolutionMethod : uint8_t{ ENUM(EvolutionMethod, uint8_t, Level, HighFriendship, KnownMove, LocationBased, TimeBased, HoldsItem,
Level, IsGenderAndLevel, EvolutionItemUse, EvolutionItemUseWithGender, Trade, TradeWithHeldItem,
HighFriendship, TradeWithSpecificPokemon, Custom
KnownMove, )
LocationBased,
TimeBased,
HoldsItem,
IsGenderAndLevel,
EvolutionItemUse,
EvolutionItemUseWithGender,
Trade,
TradeWithHeldItem,
TradeWithSpecificPokemon,
Custom
};
} }
#endif // PKMNLIB_EVOLUTIONMETHOD_HPP #endif // PKMNLIB_EVOLUTIONMETHOD_HPP

View File

@ -1,14 +1,11 @@
#ifndef PKMNLIB_TIMEOFDAY_HPP #ifndef PKMNLIB_TIMEOFDAY_HPP
#define PKMNLIB_TIMEOFDAY_HPP #define PKMNLIB_TIMEOFDAY_HPP
#include <CreatureLib/Core/Enum.hpp>
#include <cstdint> #include <cstdint>
namespace PkmnLib::Library{
enum class TimeOfDay : uint8_t { namespace PkmnLib::Library {
Night, ENUM(TimeOfDay, uint8_t, Night, Morning, Afternoon, Evening)
Morning,
Afternoon,
Evening
};
} }
#endif // PKMNLIB_TIMEOFDAY_HPP #endif // PKMNLIB_TIMEOFDAY_HPP