This commit is contained in:
@@ -29,7 +29,8 @@ const EvolutionData* EvolutionData::CreateTradeWithItemEvolution(const Item* ite
|
||||
return new EvolutionData(EvolutionMethod::TradeWithHeldItem,
|
||||
{new CreatureLib::Library::EffectParameter(item->GetName())}, into);
|
||||
}
|
||||
const EvolutionData* EvolutionData::CreateTradeWithSpeciesEvolution(const PokemonSpecies* traded, const PokemonSpecies* into) {
|
||||
const EvolutionData* EvolutionData::CreateTradeWithSpeciesEvolution(const PokemonSpecies* traded,
|
||||
const PokemonSpecies* into) {
|
||||
return new EvolutionData(EvolutionMethod::TradeWithSpecificPokemon,
|
||||
{new CreatureLib::Library::EffectParameter(traded->GetName())}, into);
|
||||
}
|
||||
|
||||
@@ -5,8 +5,7 @@
|
||||
namespace PkmnLib::Library {
|
||||
ENUM(EvolutionMethod, uint8_t, Level, HighFriendship, KnownMove, LocationBased, TimeBased, HoldsItem,
|
||||
IsGenderAndLevel, EvolutionItemUse, EvolutionItemUseWithGender, Trade, TradeWithHeldItem,
|
||||
TradeWithSpecificPokemon, Custom
|
||||
)
|
||||
TradeWithSpecificPokemon, Custom)
|
||||
}
|
||||
|
||||
#endif // PKMNLIB_EVOLUTIONMETHOD_HPP
|
||||
|
||||
@@ -12,7 +12,7 @@ namespace PkmnLib::Library {
|
||||
|
||||
inline bool TryGet(const Arbutils::CaseInsensitiveConstString& name, const MoveData*& move) const {
|
||||
const CreatureLib::Library::AttackData* ptr;
|
||||
if (CreatureLib::Library::AttackLibrary::TryGet(name, ptr)){
|
||||
if (CreatureLib::Library::AttackLibrary::TryGet(name, ptr)) {
|
||||
move = dynamic_cast<const MoveData*>(ptr);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -38,8 +38,7 @@ namespace PkmnLib::Library {
|
||||
auto& map = _items.GetStdMap();
|
||||
return std::next(std::begin(map), i)->first;
|
||||
}
|
||||
inline const Arbutils::CaseInsensitiveConstString&
|
||||
GetRandomNatureName(Arbutils::Random* rand) const {
|
||||
inline const Arbutils::CaseInsensitiveConstString& GetRandomNatureName(Arbutils::Random* rand) const {
|
||||
auto i = rand->Get(_items.Count());
|
||||
auto& map = _items.GetStdMap();
|
||||
return std::next(std::begin(map), i)->first;
|
||||
|
||||
@@ -14,16 +14,14 @@ namespace PkmnLib::Library {
|
||||
const NatureLibrary* _natures;
|
||||
|
||||
public:
|
||||
~PokemonLibrary() override {
|
||||
delete _natures;
|
||||
}
|
||||
~PokemonLibrary() override { delete _natures; }
|
||||
|
||||
PokemonLibrary(PkmnLib::Library::LibrarySettings* settings, SpeciesLibrary* species, MoveLibrary* moves,
|
||||
ItemLibrary* items, CreatureLib::Library::GrowthRateLibrary* growthRates,
|
||||
CreatureLib::Library::TypeLibrary* typeLibrary, NatureLibrary* natures)
|
||||
: DataLibrary(settings, species, moves, items, growthRates, typeLibrary), _natures(natures) {}
|
||||
|
||||
const PkmnLib::Library::LibrarySettings* GetSettings() const{
|
||||
const PkmnLib::Library::LibrarySettings* GetSettings() const {
|
||||
return static_cast<const LibrarySettings*>(CreatureLib::Library::DataLibrary::GetSettings());
|
||||
}
|
||||
|
||||
@@ -39,9 +37,7 @@ namespace PkmnLib::Library {
|
||||
return (const ItemLibrary*)(CreatureLib::Library::DataLibrary::GetItemLibrary());
|
||||
}
|
||||
|
||||
[[nodiscard]] const NatureLibrary* GetNatureLibrary() const {
|
||||
return _natures;
|
||||
}
|
||||
[[nodiscard]] const NatureLibrary* GetNatureLibrary() const { return _natures; }
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user