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

Updates CreatureLib, implements ConstStrings.
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Deukhoofd
2020-02-27 18:59:15 +01:00
parent d57b5852f1
commit 40a003429e
24 changed files with 214 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,8 +11,10 @@ namespace PkmnLib::Library {
std::vector<EvolutionData> _evolutions;
public:
PokemonSpecies(uint16_t id, const std::string& name, const PokemonForme* defaultVariant, float genderRatio,
const std::string& growthRate, uint8_t captureRate, uint8_t baseHappiness)
PokemonSpecies(uint16_t id, const Arbutils::CaseInsensitiveConstString& name,
const PokemonForme* defaultVariant, float genderRatio,
const Arbutils::CaseInsensitiveConstString& growthRate, uint8_t captureRate,
uint8_t baseHappiness)
: CreatureSpecies(id, name, defaultVariant, genderRatio, growthRate, captureRate),
_baseHappiness(baseHappiness) {}
@@ -21,20 +23,20 @@ namespace PkmnLib::Library {
inline uint8_t GetBaseHappiness() const { return _baseHappiness; }
inline const PokemonForme* GetDefaultForme() const {
return reinterpret_cast<const PokemonForme*>(CreatureSpecies::GetVariant("default"));
return reinterpret_cast<const PokemonForme*>(CreatureSpecies::GetVariant("default"_cnc));
}
inline bool HasForme(const std::string& key) const { return HasVariant(key); }
inline bool HasForme(const Arbutils::CaseInsensitiveConstString& key) const { return HasVariant(key); }
inline bool TryGetForme(const std::string& key, const PokemonForme*& forme) const {
inline bool TryGetForme(const Arbutils::CaseInsensitiveConstString& 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 Arbutils::CaseInsensitiveConstString& key) const {
return reinterpret_cast<const PokemonForme*>(CreatureSpecies::GetVariant(key));
}
inline void AddEvolution(EvolutionData data) { _evolutions.push_back(data); }
inline void AddEvolution(const EvolutionData& data) { _evolutions.push_back(data); }
const std::vector<EvolutionData>& GetEvolutions() const { return _evolutions; }
};
}

8
src/Library/Species/SpeciesLibrary.hpp
View File

@@ -7,18 +7,18 @@
namespace PkmnLib::Library {
class SpeciesLibrary : public CreatureLib::Library::SpeciesLibrary {
public:
inline bool TryGet(const char* name, const PokemonSpecies*& outSpecies) const {
inline bool TryGet(const Arbutils::CaseInsensitiveConstString& name, const PokemonSpecies*& outSpecies) const {
return CreatureLib::Library::SpeciesLibrary::TryGet(
name, (const CreatureLib::Library::CreatureSpecies*&)outSpecies);
}
inline const PokemonSpecies* Get(const char* name) const {
inline const PokemonSpecies* Get(const Arbutils::CaseInsensitiveConstString& name) const {
return dynamic_cast<const PokemonSpecies*>(CreatureLib::Library::SpeciesLibrary::Get(name));
}
const PokemonSpecies* operator[](const char* name) const { return Get(name); }
const PokemonSpecies* operator[](const Arbutils::CaseInsensitiveConstString& name) const { return Get(name); }
void Insert(const char* name, const PokemonSpecies* species) {
void Insert(const Arbutils::CaseInsensitiveConstString& name, const PokemonSpecies* species) {
CreatureLib::Library::SpeciesLibrary::Insert(name, species);
}
};