Deukhoofd
/
PkmnLib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to new CreatureLib version.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2020-04-10 22:27:40 +02:00
parent f1cc8a7b07
commit 2ad441debc
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Library/Moves/MoveData.cpp
View File

@ -3,7 +3,7 @@
PkmnLib::Library::MoveData::MoveData(const Arbutils::CaseInsensitiveConstString& name, uint8_t type, PkmnLib::Library::MoveData::MoveData(const Arbutils::CaseInsensitiveConstString& name, uint8_t type,
PkmnLib::Library::MoveCategory category, uint8_t power, uint8_t accuracy, PkmnLib::Library::MoveCategory category, uint8_t power, uint8_t accuracy,
uint8_t baseUsage, CreatureLib::Library::AttackTarget target, int8_t priority, uint8_t baseUsage, CreatureLib::Library::AttackTarget target, int8_t priority,
const CreatureLib::Library::SecondaryEffect& effect, const CreatureLib::Library::SecondaryEffect* effect,
std::unordered_set<uint32_t> flags) std::unordered_set<uint32_t> flags)
: AttackData(name, type, static_cast<CreatureLib::Library::AttackCategory>(category), power, accuracy, baseUsage, : AttackData(name, type, static_cast<CreatureLib::Library::AttackCategory>(category), power, accuracy, baseUsage,
target, priority, effect, std::move(flags)) {} target, priority, effect, std::move(flags)) {}

2
src/Library/Moves/MoveData.hpp
View File

@ -11,7 +11,7 @@ namespace PkmnLib::Library {
MoveData(const Arbutils::CaseInsensitiveConstString& name, uint8_t type, MoveData(const Arbutils::CaseInsensitiveConstString& name, uint8_t type,
PkmnLib::Library::MoveCategory category, uint8_t power, uint8_t accuracy, uint8_t baseUsage, PkmnLib::Library::MoveCategory category, uint8_t power, uint8_t accuracy, uint8_t baseUsage,
CreatureLib::Library::AttackTarget target, int8_t priority, CreatureLib::Library::AttackTarget target, int8_t priority,
const CreatureLib::Library::SecondaryEffect& effect, std::unordered_set<uint32_t> flags); const CreatureLib::Library::SecondaryEffect* effect, std::unordered_set<uint32_t> flags);
PkmnLib::Library::MoveCategory GetCategory() const; PkmnLib::Library::MoveCategory GetCategory() const;
}; };

4
tests/TestLibrary/TestLibrary.cpp
View File

@ -44,11 +44,11 @@ PkmnLib::Library::MoveLibrary* TestLibrary::BuildMoveLibrary() {
lib->Insert("testMove"_cnc.GetHash(), lib->Insert("testMove"_cnc.GetHash(),
new PkmnLib::Library::MoveData("testMove"_cnc, 0, PkmnLib::Library::MoveCategory::Physical, 50, 100, 20, new PkmnLib::Library::MoveData("testMove"_cnc, 0, PkmnLib::Library::MoveCategory::Physical, 50, 100, 20,
CreatureLib::Library::AttackTarget::Adjacent, 0, CreatureLib::Library::AttackTarget::Adjacent, 0,
CreatureLib::Library::SecondaryEffect(), {})); new CreatureLib::Library::SecondaryEffect(), {}));
lib->Insert("testMove2"_cnc.GetHash(), lib->Insert("testMove2"_cnc.GetHash(),
new PkmnLib::Library::MoveData("testMove2"_cnc, 0, PkmnLib::Library::MoveCategory::Special, 30, 100, 10, new PkmnLib::Library::MoveData("testMove2"_cnc, 0, PkmnLib::Library::MoveCategory::Special, 30, 100, 10,
CreatureLib::Library::AttackTarget::Adjacent, 0, CreatureLib::Library::AttackTarget::Adjacent, 0,
CreatureLib::Library::SecondaryEffect(), {})); new CreatureLib::Library::SecondaryEffect(), {}));
return lib; return lib;
} }
PkmnLib::Library::ItemLibrary* TestLibrary::BuildItemLibrary() { PkmnLib::Library::ItemLibrary* TestLibrary::BuildItemLibrary() {