Support natures for Pokemon.
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
@@ -12,16 +12,23 @@ namespace PkmnLib::Battling {
|
||||
CreatureLib::Core::StatisticSet<uint8_t> _individualValues;
|
||||
CreatureLib::Core::StatisticSet<uint8_t> _effortValues;
|
||||
|
||||
uint8_t _nature;
|
||||
const Library::Nature* _natureCache = nullptr;
|
||||
|
||||
const BattleLibrary* GetLibrary() { return reinterpret_cast<const BattleLibrary*>(_library); }
|
||||
|
||||
public:
|
||||
Pokemon(const BattleLibrary* library, const Library::PokemonSpecies* species,
|
||||
const Library::PokemonForme* forme, uint8_t level, uint32_t experience, uint32_t uid,
|
||||
CreatureLib::Library::Gender gender, uint8_t coloring, const Library::Item* heldItem,
|
||||
const std::string& nickname, int8_t talent, std::vector<CreatureLib::Battling::LearnedAttack*> moves,
|
||||
CreatureLib::Core::StatisticSet<uint8_t> individualValues,
|
||||
CreatureLib::Core::StatisticSet<uint8_t> effortValues)
|
||||
CreatureLib::Core::StatisticSet<uint8_t> effortValues, uint8_t nature)
|
||||
: CreatureLib::Battling::Creature(library, species, forme, level, experience, uid, gender, coloring,
|
||||
heldItem, nickname, talent, std::move(moves)),
|
||||
_individualValues(individualValues), _effortValues(effortValues) {}
|
||||
_individualValues(individualValues), _effortValues(effortValues), _nature(nature) {}
|
||||
|
||||
const Library::Nature& GetNature();
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user