This commit is contained in:
@@ -6,17 +6,23 @@
|
||||
namespace PkmnLib::Library {
|
||||
class ItemLibrary final : public CreatureLib::Library::ItemLibrary {
|
||||
public:
|
||||
inline std::optional<ArbUt::BorrowedPtr<const Item>> TryGet(const ArbUt::BasicStringView& name) const {
|
||||
auto res = CreatureLib::Library::ItemLibrary::TryGet(name.GetHash());
|
||||
inline std::optional<ArbUt::BorrowedPtr<const Item>> TryGet(const ArbUt::StringView& name) const {
|
||||
auto res = CreatureLib::Library::ItemLibrary::TryGet(name);
|
||||
if (!res.has_value())
|
||||
return {};
|
||||
return res.value().ForceAs<const Item>();
|
||||
}
|
||||
inline std::optional<ArbUt::BorrowedPtr<const Item>> TryGet(u32 hashedKey) const {
|
||||
auto res = CreatureLib::Library::ItemLibrary::TryGetByHash(hashedKey);
|
||||
if (!res.has_value())
|
||||
return {};
|
||||
return res.value().ForceAs<const Item>();
|
||||
}
|
||||
|
||||
inline ArbUt::BorrowedPtr<const Item> Get(const ArbUt::BasicStringView& name) const {
|
||||
inline ArbUt::BorrowedPtr<const Item> Get(const ArbUt::StringView& name) const {
|
||||
return CreatureLib::Library::ItemLibrary::Get(name).ForceAs<const Item>();
|
||||
}
|
||||
inline ArbUt::BorrowedPtr<const Item> operator[](const ArbUt::BasicStringView& name) const { return Get(name); }
|
||||
inline ArbUt::BorrowedPtr<const Item> operator[](const ArbUt::StringView& name) const { return Get(name); }
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@@ -12,24 +12,24 @@ namespace PkmnLib::Library {
|
||||
return Get(name);
|
||||
}
|
||||
|
||||
inline std::optional<ArbUt::BorrowedPtr<const MoveData>> TryGet(const ArbUt::BasicStringView& name) const {
|
||||
inline std::optional<ArbUt::BorrowedPtr<const MoveData>> TryGet(const ArbUt::StringView& name) const {
|
||||
auto res = CreatureLib::Library::AttackLibrary::TryGet(name);
|
||||
if (!res.has_value())
|
||||
return {};
|
||||
return res.value().ForceAs<const MoveData>();
|
||||
}
|
||||
inline std::optional<ArbUt::BorrowedPtr<const MoveData>> TryGet(u32 hash) const {
|
||||
auto res = CreatureLib::Library::AttackLibrary::TryGet(hash);
|
||||
inline std::optional<ArbUt::BorrowedPtr<const MoveData>> TryGetByHash(u32 hash) const {
|
||||
auto res = CreatureLib::Library::AttackLibrary::TryGetByHash(hash);
|
||||
if (!res.has_value())
|
||||
return {};
|
||||
return res.value().ForceAs<const MoveData>();
|
||||
}
|
||||
|
||||
inline ArbUt::BorrowedPtr<const MoveData> Get(const ArbUt::BasicStringView& name) const {
|
||||
inline ArbUt::BorrowedPtr<const MoveData> Get(const ArbUt::StringView& name) const {
|
||||
return CreatureLib::Library::AttackLibrary::Get(name).As<const MoveData>();
|
||||
}
|
||||
inline ArbUt::BorrowedPtr<const MoveData> Get(u32 hash) const {
|
||||
return CreatureLib::Library::AttackLibrary::Get(hash).As<const MoveData>();
|
||||
return CreatureLib::Library::AttackLibrary::GetByHash(hash).As<const MoveData>();
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#ifndef PKMNLIB_NATURELIBRARY_HPP
|
||||
#define PKMNLIB_NATURELIBRARY_HPP
|
||||
|
||||
#include <Arbutils/Collections/StringViewDictionary.hpp>
|
||||
#include <Arbutils/Memory/Memory.hpp>
|
||||
#include <Arbutils/Random.hpp>
|
||||
#include <CreatureLib/Library/Exceptions/CreatureException.hpp>
|
||||
@@ -9,7 +10,7 @@
|
||||
namespace PkmnLib::Library {
|
||||
class NatureLibrary {
|
||||
private:
|
||||
std::unordered_map<ArbUt::StringView, std::unique_ptr<const Nature>> _items;
|
||||
ArbUt::StringViewDictionary<std::unique_ptr<const Nature>> _items;
|
||||
|
||||
public:
|
||||
explicit NatureLibrary(size_t size = 32) noexcept : _items(size) {}
|
||||
@@ -17,19 +18,23 @@ namespace PkmnLib::Library {
|
||||
~NatureLibrary() = default;
|
||||
|
||||
inline void LoadNature(const ArbUt::StringView& name, const Nature* nature) {
|
||||
_items.insert({name, std::unique_ptr<const Nature>(nature)});
|
||||
_items.GetStdMap().insert({name, std::unique_ptr<const Nature>(nature)});
|
||||
}
|
||||
|
||||
inline ArbUt::BorrowedPtr<const Nature> GetNatureByName(const ArbUt::StringView& name) const {
|
||||
return _items.at(name);
|
||||
return _items.Get(name);
|
||||
}
|
||||
|
||||
inline ArbUt::BorrowedPtr<const Nature> GetNatureByHash(u32 hash) const {
|
||||
return _items.GetFromHash(hash);
|
||||
}
|
||||
|
||||
inline const ArbUt::StringView& GetRandomNatureName(ArbUt::Random rand = ArbUt::Random()) const {
|
||||
auto i = rand.Get(_items.size());
|
||||
auto i = rand.Get(_items.Count());
|
||||
return std::next(std::begin(_items), i)->first;
|
||||
}
|
||||
|
||||
inline ArbUt::StringView GetNatureName(ArbUt::BorrowedPtr<const Nature> nature) {
|
||||
inline const ArbUt::StringView& GetNatureName(ArbUt::BorrowedPtr<const Nature> nature) {
|
||||
for (const auto& v : _items) {
|
||||
if (v.second.get() == nature.GetRaw()) {
|
||||
return v.first;
|
||||
@@ -38,7 +43,7 @@ namespace PkmnLib::Library {
|
||||
throw ArbUt::Exception("Nature not found.");
|
||||
}
|
||||
|
||||
size_t GetNatureCount() const noexcept { return _items.size(); }
|
||||
size_t GetNatureCount() const noexcept { return _items.Count(); }
|
||||
inline const ArbUt::StringView& GetNatureFromIndex(size_t index) const {
|
||||
return std::next(std::begin(_items), index)->first;
|
||||
}
|
||||
|
||||
@@ -12,19 +12,28 @@ namespace PkmnLib::Library {
|
||||
public:
|
||||
SpeciesLibrary(size_t initialCapacity = 32) : CreatureLib::Library::SpeciesLibrary(initialCapacity) {}
|
||||
|
||||
inline std::optional<ArbUt::BorrowedPtr<const PokemonSpecies>>
|
||||
TryGet(const ArbUt::BasicStringView& name) const {
|
||||
inline std::optional<ArbUt::BorrowedPtr<const PokemonSpecies>> TryGet(const ArbUt::StringView& name) const {
|
||||
auto res = CreatureLib::Library::SpeciesLibrary::TryGet(name);
|
||||
if (!res.has_value())
|
||||
return {};
|
||||
return res.value().ForceAs<const PokemonSpecies>();
|
||||
}
|
||||
|
||||
inline ArbUt::BorrowedPtr<const PokemonSpecies> Get(const ArbUt::BasicStringView& name) const {
|
||||
return CreatureLib::Library::SpeciesLibrary::Get(name).As<const PokemonSpecies>();
|
||||
inline std::optional<ArbUt::BorrowedPtr<const PokemonSpecies>> TryGetByHash(u32 hashedKey) const {
|
||||
auto res = CreatureLib::Library::SpeciesLibrary::TryGetByHash(hashedKey);
|
||||
if (!res.has_value())
|
||||
return {};
|
||||
return res.value().ForceAs<const PokemonSpecies>();
|
||||
}
|
||||
|
||||
ArbUt::BorrowedPtr<const PokemonSpecies> operator[](const ArbUt::BasicStringView& name) const {
|
||||
inline ArbUt::BorrowedPtr<const PokemonSpecies> Get(const ArbUt::StringView& name) const {
|
||||
return CreatureLib::Library::SpeciesLibrary::Get(name).As<const PokemonSpecies>();
|
||||
}
|
||||
inline ArbUt::BorrowedPtr<const PokemonSpecies> GetByHash(u32 hashedKey) const {
|
||||
return CreatureLib::Library::SpeciesLibrary::GetByHash(hashedKey).As<const PokemonSpecies>();
|
||||
}
|
||||
|
||||
ArbUt::BorrowedPtr<const PokemonSpecies> operator[](const ArbUt::StringView& name) const {
|
||||
return Get(name);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user