Smart pointers for most library and battle classes.
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:
@@ -4,49 +4,44 @@
|
||||
#include <Arbutils/Collections/Dictionary.hpp>
|
||||
#include <Arbutils/Collections/List.hpp>
|
||||
#include <Arbutils/ConstString.hpp>
|
||||
#include <Arbutils/Memory/BorrowedPtr.hpp>
|
||||
#include <Arbutils/Random.hpp>
|
||||
#include <CreatureLib/Library/Exceptions/CreatureException.hpp>
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
#include "Nature.hpp"
|
||||
|
||||
namespace PkmnLib::Library {
|
||||
class NatureLibrary {
|
||||
private:
|
||||
ArbUt::Dictionary<ArbUt::CaseInsensitiveConstString, const Nature*> _items;
|
||||
std::unordered_map<ArbUt::CaseInsensitiveConstString, std::unique_ptr<const Nature>> _items;
|
||||
|
||||
public:
|
||||
explicit NatureLibrary(size_t size = 32) noexcept
|
||||
: _items(ArbUt::Dictionary<ArbUt::CaseInsensitiveConstString, const Nature*>(size)) {}
|
||||
explicit NatureLibrary(size_t size = 32) noexcept : _items(size) {}
|
||||
|
||||
~NatureLibrary() {
|
||||
for (auto& kv : _items) {
|
||||
delete kv.second;
|
||||
}
|
||||
}
|
||||
~NatureLibrary() = default;
|
||||
|
||||
inline void LoadNature(const ArbUt::CaseInsensitiveConstString& name, const Nature* nature) {
|
||||
_items.Insert(name, nature);
|
||||
_items.insert({name, std::unique_ptr<const Nature>(nature)});
|
||||
}
|
||||
|
||||
inline const Nature* GetNatureByName(const ArbUt::CaseInsensitiveConstString& name) const {
|
||||
return _items[name];
|
||||
inline ArbUt::BorrowedPtr<const Nature> GetNatureByName(const ArbUt::CaseInsensitiveConstString& name) const {
|
||||
return _items.at(name);
|
||||
}
|
||||
|
||||
inline const ArbUt::CaseInsensitiveConstString&
|
||||
GetRandomNatureName(ArbUt::Random rand = ArbUt::Random()) const {
|
||||
auto i = rand.Get(_items.Count());
|
||||
auto& map = _items.GetStdMap();
|
||||
return std::next(std::begin(map), i)->first;
|
||||
auto i = rand.Get(_items.size());
|
||||
return std::next(std::begin(_items), i)->first;
|
||||
}
|
||||
inline const ArbUt::CaseInsensitiveConstString& GetRandomNatureName(ArbUt::Random* rand) const {
|
||||
auto i = rand->Get(_items.Count());
|
||||
auto& map = _items.GetStdMap();
|
||||
return std::next(std::begin(map), i)->first;
|
||||
auto i = rand->Get(_items.size());
|
||||
return std::next(std::begin(_items), i)->first;
|
||||
}
|
||||
|
||||
inline ArbUt::CaseInsensitiveConstString GetNatureName(const Nature* nature) {
|
||||
inline ArbUt::CaseInsensitiveConstString GetNatureName(ArbUt::BorrowedPtr<const Nature> nature) {
|
||||
for (const auto& v : _items) {
|
||||
if (v.second == nature) {
|
||||
if (v.second.get() == nature.GetRaw()) {
|
||||
return v.first;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user