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

Handle natures as pointers instead of values.
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Deukhoofd
2020-04-17 18:39:04 +02:00
parent 086438f547
commit 6b704224d0
8 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@ namespace PkmnLib::Battling {
CreatureLib::Library::StatisticSet<uint8_t> _individualValues;
CreatureLib::Library::StatisticSet<uint8_t> _effortValues;
Arbutils::CaseInsensitiveConstString _nature;
const PkmnLib::Library::Nature* _nature;
const BattleLibrary* GetLibrary() const { return reinterpret_cast<const BattleLibrary*>(_library); }
@@ -24,7 +24,7 @@ namespace PkmnLib::Battling {
const std::string& nickname, const CreatureLib::Library::TalentIndex& talent,
List<CreatureLib::Battling::LearnedAttack*> moves,
CreatureLib::Library::StatisticSet<uint8_t> individualValues,
CreatureLib::Library::StatisticSet<uint8_t> effortValues, const Arbutils::CaseInsensitiveConstString& nature)
CreatureLib::Library::StatisticSet<uint8_t> effortValues, const PkmnLib::Library::Nature* nature)
: CreatureLib::Battling::Creature(library, species, forme, level, experience, uid, gender, coloring,
heldItem, nickname, talent, std::move(moves)),
_individualValues(individualValues), _effortValues(effortValues), _nature(nature) {}
@@ -33,13 +33,13 @@ namespace PkmnLib::Battling {
return dynamic_cast<const Library::PokemonForme*>(GetVariant());
}
const bool IsShiny() const { return _coloring == 1; }
bool IsShiny() const { return _coloring == 1; }
const std::vector<LearnedMove*>& GetMoves() const {
return reinterpret_cast<const std::vector<LearnedMove*>&>(_attacks);
}
const Library::Nature& GetNature() const;
const Library::Nature* GetNature() const;
uint8_t GetIndividualValue(CreatureLib::Library::Statistic stat) const {
return _individualValues.GetStat(stat);
}