Support Pokemon style experience gain.
Some checks failed
continuous-integration/drone/push Build is failing
Some checks failed
continuous-integration/drone/push Build is failing
This commit is contained in:
@@ -97,7 +97,7 @@ PkmnLib::Battling::Pokemon* PkmnLib::Battling::CreatePokemon::Build() {
|
||||
}
|
||||
|
||||
auto pkmn = new Pokemon(_library, species, forme, _level, experience, identifier, gender, shiny, heldItem,
|
||||
_nickname, ability, attacks, ivs, evs, nature);
|
||||
_nickname, ability, attacks, ivs, evs, nature, _allowedExperienceGain);
|
||||
pkmn->Initialize();
|
||||
return pkmn;
|
||||
}
|
||||
@@ -161,3 +161,7 @@ PkmnLib::Battling::CreatePokemon::LearnMove(const Arbutils::CaseInsensitiveConst
|
||||
_attacks.Append(ToLearnMethod(move, method));
|
||||
return *this;
|
||||
}
|
||||
PkmnLib::Battling::CreatePokemon PkmnLib::Battling::CreatePokemon::IsAllowedExperienceGain(bool value) {
|
||||
_allowedExperienceGain = value;
|
||||
return *this;
|
||||
}
|
||||
|
||||
@@ -44,6 +44,7 @@ namespace PkmnLib::Battling {
|
||||
|
||||
bool _shininessSet = false;
|
||||
bool _isShiny = false;
|
||||
bool _allowedExperienceGain = true;
|
||||
|
||||
public:
|
||||
CreatePokemon(const BattleLibrary* library, const Arbutils::CaseInsensitiveConstString& species, uint8_t level)
|
||||
@@ -66,6 +67,7 @@ namespace PkmnLib::Battling {
|
||||
uint8_t speed);
|
||||
|
||||
CreatePokemon WithNature(const Arbutils::CaseInsensitiveConstString& nature);
|
||||
CreatePokemon IsAllowedExperienceGain(bool value);
|
||||
|
||||
Pokemon* Build();
|
||||
};
|
||||
|
||||
@@ -24,9 +24,10 @@ namespace PkmnLib::Battling {
|
||||
const std::string& nickname, const CreatureLib::Library::TalentIndex& talent,
|
||||
const List<CreatureLib::Battling::LearnedAttack*>& moves,
|
||||
CreatureLib::Library::StatisticSet<uint8_t> individualValues,
|
||||
CreatureLib::Library::StatisticSet<uint8_t> effortValues, const PkmnLib::Library::Nature* nature)
|
||||
CreatureLib::Library::StatisticSet<uint8_t> effortValues, const PkmnLib::Library::Nature* nature,
|
||||
bool allowedExperienceGain = true)
|
||||
: CreatureLib::Battling::Creature(library, species, forme, level, experience, uid, gender, coloring,
|
||||
heldItem, nickname, talent, moves),
|
||||
heldItem, nickname, talent, moves, allowedExperienceGain),
|
||||
_individualValues(individualValues), _effortValues(effortValues), _nature(nature) {}
|
||||
|
||||
const Library::PokemonForme* GetForme() const {
|
||||
@@ -46,6 +47,10 @@ namespace PkmnLib::Battling {
|
||||
inline uint8_t GetEffortValue(CreatureLib::Library::Statistic stat) const {
|
||||
return _effortValues.GetStat(stat);
|
||||
}
|
||||
|
||||
inline const PkmnLib::Library::PokemonSpecies* GetPokemonSpecies() const noexcept {
|
||||
return dynamic_cast<const Library::PokemonSpecies*>(_species);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user