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

Smart pointers for most library and battle classes.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd
2020-06-02 20:37:21 +02:00
parent 1d1dc877a0
commit 2d3a2fc63b
22 changed files with 91 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Library/Evolutions/EvolutionData.hpp
View File

@@ -2,12 +2,15 @@
#define PKMNLIB_EVOLUTIONDATA_HPP
#include <Arbutils/Collections/List.hpp>
#include <Arbutils/Memory/BorrowedPtr.hpp>
#include <Arbutils/Memory/UniquePtrList.hpp>
#include <CreatureLib/Library/EffectParameter.hpp>
#include <CreatureLib/Library/Gender.hpp>
#include <string>
#include <utility>
#include "../TimeOfDay.hpp"
#include "EvolutionMethod.hpp"
namespace PkmnLib::Library {
class PokemonSpecies;
class MoveData;
@@ -15,20 +18,16 @@ namespace PkmnLib::Library {
class EvolutionData {
private:
const PokemonSpecies* _evolvesInto;
ArbUt::BorrowedPtr<const PokemonSpecies> _evolvesInto;
EvolutionMethod _method;
ArbUt::List<const CreatureLib::Library::EffectParameter*> _evolutionData;
ArbUt::UniquePtrList<const CreatureLib::Library::EffectParameter> _evolutionData;
EvolutionData(EvolutionMethod method, ArbUt::List<const CreatureLib::Library::EffectParameter*> data,
EvolutionData(EvolutionMethod method, std::vector<const CreatureLib::Library::EffectParameter*> data,
const PokemonSpecies* next)
: _evolvesInto(next), _method(method), _evolutionData(std::move(data)) {}
public:
~EvolutionData() {
for (auto v : _evolutionData) {
delete v;
}
}
~EvolutionData() = default;
static inline const EvolutionData* CreateLevelEvolution(uint8_t level, const PokemonSpecies* into) {
return new EvolutionData(EvolutionMethod::Level,
@@ -67,15 +66,18 @@ namespace PkmnLib::Library {
static const EvolutionData* CreateTradeWithSpeciesEvolution(const PokemonSpecies* traded,
const PokemonSpecies* into);
static inline const EvolutionData*
CreateCustomEvolution(const ArbUt::List<const CreatureLib::Library::EffectParameter*>& data,
CreateCustomEvolution(const std::vector<const CreatureLib::Library::EffectParameter*>& data,
const PokemonSpecies* into) {
return new EvolutionData(EvolutionMethod::Custom, data, into);
}
[[nodiscard]] inline const PokemonSpecies* GetNewSpecies() const noexcept { return _evolvesInto; }
[[nodiscard]] inline ArbUt::BorrowedPtr<const PokemonSpecies> GetNewSpecies() const noexcept {
return _evolvesInto;
}
[[nodiscard]] inline EvolutionMethod GetMethod() const noexcept { return _method; }
[[nodiscard]] inline size_t GetDataCount() const noexcept { return _evolutionData.Count(); }
[[nodiscard]] inline const CreatureLib::Library::EffectParameter* GetData(size_t index) const {
[[nodiscard]] inline ArbUt::BorrowedPtr<const CreatureLib::Library::EffectParameter>
GetData(size_t index) const {
return _evolutionData.At(index);
}
};

33
src/Library/Natures/NatureLibrary.hpp
View File

@@ -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;
}
}

6
src/Library/PokemonLibrary.hpp
View File

@@ -11,10 +11,10 @@
namespace PkmnLib::Library {
class PokemonLibrary : public CreatureLib::Library::DataLibrary {
private:
const NatureLibrary* _natures;
std::unique_ptr<const NatureLibrary> _natures;
public:
~PokemonLibrary() override { delete _natures; }
~PokemonLibrary() override = default;
PokemonLibrary(PkmnLib::Library::LibrarySettings* settings, SpeciesLibrary* species, MoveLibrary* moves,
ItemLibrary* items, CreatureLib::Library::GrowthRateLibrary* growthRates,
@@ -37,7 +37,7 @@ namespace PkmnLib::Library {
return (const std::unique_ptr<const ItemLibrary>&)CreatureLib::Library::DataLibrary::GetItemLibrary();
}
[[nodiscard]] const NatureLibrary* GetNatureLibrary() const noexcept { return _natures; }
[[nodiscard]] ArbUt::BorrowedPtr<const NatureLibrary> GetNatureLibrary() const noexcept { return _natures; }
};
}

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

@@ -1,5 +1,6 @@
#ifndef PKMNLIB_POKEMONSPECIES_HPP
#define PKMNLIB_POKEMONSPECIES_HPP
#include <Arbutils/Memory/UniquePtrList.hpp>
#include <CreatureLib/Battling/Models/Creature.hpp>
#include "../Evolutions/EvolutionData.hpp"
#include "PokemonForme.hpp"
@@ -8,7 +9,7 @@ namespace PkmnLib::Library {
class PokemonSpecies : public CreatureLib::Library::CreatureSpecies {
private:
uint8_t _baseHappiness;
ArbUt::List<const EvolutionData*> _evolutions;
ArbUt::UniquePtrList<const EvolutionData> _evolutions;
public:
PokemonSpecies(uint16_t id, const ArbUt::CaseInsensitiveConstString& name, const PokemonForme* defaultForme,
@@ -17,11 +18,7 @@ namespace PkmnLib::Library {
: CreatureSpecies(id, name, defaultForme, genderRatio, growthRate, captureRate),
_baseHappiness(baseHappiness) {}
~PokemonSpecies() override {
for (auto evo : _evolutions) {
delete evo;
}
}
~PokemonSpecies() override = default;
inline uint8_t GetBaseHappiness() const { return _baseHappiness; }
@@ -44,7 +41,7 @@ namespace PkmnLib::Library {
}
inline void AddEvolution(const EvolutionData* data) noexcept { _evolutions.Append(data); }
const ArbUt::List<const EvolutionData*>& GetEvolutions() const noexcept { return _evolutions; }
const ArbUt::UniquePtrList<const EvolutionData>& GetEvolutions() const noexcept { return _evolutions; }
};
}