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

Adds tests for MoveData type in AngelScript.
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Deukhoofd
2020-01-18 14:35:08 +01:00
parent f32db7a751
commit 9372ba4b27
8 changed files with 170 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/AngelScript/TypeRegistry/Library/RegisterMoveTypes.cpp
View File

@@ -45,7 +45,7 @@ void RegisterMoveTypes::RegisterMoveType(asIScriptEngine* engine) {
r = engine->RegisterObjectMethod("MoveData", "const string& get_Name() const property",
asMETHOD(PkmnLib::Library::MoveData, GetName), asCALL_THISCALL);
assert(r >= 0);
r = engine->RegisterObjectMethod("MoveData", "const string& get_Type() const property",
r = engine->RegisterObjectMethod("MoveData", "uint8 get_Type() const property",
asMETHOD(PkmnLib::Library::MoveData, GetType), asCALL_THISCALL);
assert(r >= 0);
r = engine->RegisterObjectMethod("MoveData", "MoveCategory get_Category() const property",

12
src/Battling/Library/BattleLibrary.hpp
View File

@@ -17,16 +17,22 @@ namespace PkmnLib::Battling {
scriptResolver, miscLibrary) {}
const Library::PokemonLibrary* GetStaticLib() const{
return reinterpret_cast<const Library::PokemonLibrary*>(CreatureLib::Battling::BattleLibrary::_staticLib);
return dynamic_cast<const Library::PokemonLibrary*>(CreatureLib::Battling::BattleLibrary::_staticLib);
}
const Library::SpeciesLibrary* GetSpeciesLibrary() const {
return reinterpret_cast<const Library::SpeciesLibrary*>(
return dynamic_cast<const Library::SpeciesLibrary*>(
CreatureLib::Battling::BattleLibrary::GetSpeciesLibrary());
}
const Library::MoveLibrary* GetMoveLibrary() const {
return dynamic_cast<const Library::MoveLibrary*>(
CreatureLib::Battling::BattleLibrary::GetAttackLibrary());
}
const Library::ItemLibrary* GetItemLibrary() const {
return reinterpret_cast<const Library::ItemLibrary*>(
return dynamic_cast<const Library::ItemLibrary*>(
CreatureLib::Battling::BattleLibrary::GetItemLibrary());
}

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

@@ -1,6 +1,6 @@
#include "MoveData.hpp"
#include <utility>
PkmnLib::Library::MoveData::MoveData(const std::string& name, const std::string& type,
PkmnLib::Library::MoveData::MoveData(const std::string& name, uint8_t type,
PkmnLib::Library::MoveCategory category, uint8_t power, uint8_t accuracy,
uint8_t baseUsage, CreatureLib::Library::AttackTarget target, uint8_t priority,
std::unordered_set<std::string> flags)

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

@@ -9,7 +9,7 @@ namespace PkmnLib::Library {
private:
public:
MoveData(const std::string& name, const std::string& type, PkmnLib::Library::MoveCategory category, uint8_t power,
MoveData(const std::string& name, uint8_t type, PkmnLib::Library::MoveCategory category, uint8_t power,
uint8_t accuracy, uint8_t baseUsage, CreatureLib::Library::AttackTarget target, uint8_t priority,
std::unordered_set<std::string> flags);