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

Update CreatureLib, handle getting formes cleaner.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2020-02-13 18:00:23 +01:00
parent dd45fea342
commit 7aa29e4543
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conanfile.py
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/611198009b81f58f72011887ecc0e1bf2c93e342@creaturelib/master") self.requires("CreatureLib/667821df28235613bf46549734a2799b5537566f@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:

11
src/Battling/Pokemon/CreatePokemon.cpp
View File

@ -41,9 +41,16 @@ PkmnLib::Battling::Pokemon* PkmnLib::Battling::CreatePokemon::Build() {
auto rand = CreatureLib::Core::Random(); auto rand = CreatureLib::Core::Random();
const PkmnLib::Library::PokemonSpecies* species = nullptr; const PkmnLib::Library::PokemonSpecies* species = nullptr;
if (!this->_library->GetSpeciesLibrary()->TryGetPkmnSpecies(this->_species, species)) { if (!this->_library->GetSpeciesLibrary()->TryGetPkmnSpecies(this->_species, species)) {
throw CreatureException("Invalid species: " + _species); std::stringstream err;
err << "Invalid species '" << _species << "'.";
throw CreatureException(err.str());
}
const PkmnLib::Library::PokemonForme* forme;
if (!species->TryGetForme(this->_forme, forme)){
std::stringstream err;
err << "Invalid forme '" << _forme << "' for species '" << _forme << "'.";
throw CreatureException(err.str());
} }
auto forme = species->GetForme(this->_forme);
int8_t ability; int8_t ability;
if (this->_ability.empty()) { if (this->_ability.empty()) {
ability = forme->GetRandomTalent(&rand); ability = forme->GetRandomTalent(&rand);

1
src/Battling/Pokemon/Pokemon.hpp
View File

@ -29,6 +29,7 @@ namespace PkmnLib::Battling {
heldItem, nickname, talent, std::move(moves)), heldItem, nickname, talent, std::move(moves)),
_individualValues(individualValues), _effortValues(effortValues), _nature(nature) {} _individualValues(individualValues), _effortValues(effortValues), _nature(nature) {}
const Library::PokemonForme* GetForme() const { const Library::PokemonForme* GetForme() const {
return dynamic_cast<const Library::PokemonForme*>(GetVariant()); return dynamic_cast<const Library::PokemonForme*>(GetVariant());
} }

6
src/Library/Species/PokemonSpecies.hpp
View File

@ -24,6 +24,12 @@ namespace PkmnLib::Library {
return reinterpret_cast<const PokemonForme*>(CreatureSpecies::GetVariant("default")); return reinterpret_cast<const PokemonForme*>(CreatureSpecies::GetVariant("default"));
} }
inline bool HasForme(const std::string& key) const { return HasVariant(key); }
inline bool TryGetForme(const std::string& key, const PokemonForme*& forme) const {
return TryGetVariant(key, (const CreatureLib::Library::SpeciesVariant*&)forme);
}
inline const PokemonForme* GetForme(const std::string& key) const { inline const PokemonForme* GetForme(const std::string& key) const {
return reinterpret_cast<const PokemonForme*>(CreatureSpecies::GetVariant(key)); return reinterpret_cast<const PokemonForme*>(CreatureSpecies::GetVariant(key));
} }