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

Reworks nature library to be simpler.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd
2020-04-17 18:20:48 +02:00
parent 94980ef7ab
commit 086438f547
9 changed files with 41 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Battling/Pokemon/CreatePokemon.cpp
View File

@@ -80,8 +80,8 @@ PkmnLib::Battling::Pokemon* PkmnLib::Battling::CreatePokemon::Build() {
auto ivs = CreatureLib::Library::StatisticSet(_ivHp, _ivAttack, _ivDefense, _ivSpAtt, _ivSpDef, _ivSpeed);
auto evs = CreatureLib::Library::StatisticSet(_evHp, _evAttack, _evDefense, _evSpAtt, _evSpDef, _evSpeed);
if (_nature == 255) {
_nature = _library->GetNatureLibrary()->GetRandomNature(rand);
if (_nature.Empty()) {
_nature = _library->GetNatureLibrary()->GetRandomNatureName(rand);
}
auto shiny = false;
@@ -96,8 +96,8 @@ PkmnLib::Battling::Pokemon* PkmnLib::Battling::CreatePokemon::Build() {
pkmn->Initialize();
return pkmn;
}
PkmnLib::Battling::CreatePokemon* PkmnLib::Battling::CreatePokemon::WithNature(const std::string& nature) {
_nature = _library->GetNatureLibrary()->GetNatureIdByName(nature);
PkmnLib::Battling::CreatePokemon* PkmnLib::Battling::CreatePokemon::WithNature(const Arbutils::CaseInsensitiveConstString& nature) {
_nature = nature;
return this;
}
PkmnLib::Battling::CreatePokemon* PkmnLib::Battling::CreatePokemon::WithIndividualValues(uint8_t hp, uint8_t att,

4
src/Battling/Pokemon/CreatePokemon.hpp
View File

@@ -13,7 +13,7 @@ namespace PkmnLib::Battling {
std::string _nickname = "";
Arbutils::CaseInsensitiveConstString _ability = ""_cnc;
uint8_t _nature = 255;
Arbutils::CaseInsensitiveConstString _nature;
CreatureLib::Library::Gender _gender = static_cast<CreatureLib::Library::Gender>(-1);
Arbutils::CaseInsensitiveConstString _heldItem = ""_cnc;
uint32_t _identifier = 0;
@@ -54,7 +54,7 @@ namespace PkmnLib::Battling {
CreatePokemon* WithEffortValues(uint8_t hp, uint8_t att, uint8_t def, uint8_t spAtt, uint8_t spDef,
uint8_t speed);
CreatePokemon* WithNature(const std::string& nature);
CreatePokemon* WithNature(const Arbutils::CaseInsensitiveConstString& nature);
Pokemon* Build();
};

6
src/Battling/Pokemon/Pokemon.cpp
View File

@@ -1,8 +1,4 @@
#include "Pokemon.hpp"
const PkmnLib::Library::Nature& PkmnLib::Battling::Pokemon::GetNature() const{
if (_natureCache == nullptr){
auto p = const_cast<Pokemon*>(this);
p->_natureCache = this->GetLibrary()->GetNatureLibrary()->GetNaturePtr(_nature);
}
return *_natureCache;
return this->GetLibrary()->GetNatureLibrary()->GetNatureByName(_nature);
}

5
src/Battling/Pokemon/Pokemon.hpp
View File

@@ -13,8 +13,7 @@ namespace PkmnLib::Battling {
CreatureLib::Library::StatisticSet<uint8_t> _individualValues;
CreatureLib::Library::StatisticSet<uint8_t> _effortValues;
uint8_t _nature;
const Library::Nature* _natureCache = nullptr;
Arbutils::CaseInsensitiveConstString _nature;
const BattleLibrary* GetLibrary() const { return reinterpret_cast<const BattleLibrary*>(_library); }
@@ -25,7 +24,7 @@ namespace PkmnLib::Battling {
const std::string& nickname, const CreatureLib::Library::TalentIndex& talent,
List<CreatureLib::Battling::LearnedAttack*> moves,
CreatureLib::Library::StatisticSet<uint8_t> individualValues,
CreatureLib::Library::StatisticSet<uint8_t> effortValues, uint8_t nature)
CreatureLib::Library::StatisticSet<uint8_t> effortValues, const Arbutils::CaseInsensitiveConstString& nature)
: CreatureLib::Battling::Creature(library, species, forme, level, experience, uid, gender, coloring,
heldItem, nickname, talent, std::move(moves)),
_individualValues(individualValues), _effortValues(effortValues), _nature(nature) {}

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

@@ -1,57 +1,36 @@
#ifndef PKMNLIB_NATURELIBRARY_HPP
#define PKMNLIB_NATURELIBRARY_HPP
#include <CreatureLib/Library/Exceptions/CreatureException.hpp>
#include <Arbutils/Collections/Dictionary.hpp>
#include <Arbutils/Collections/List.hpp>
#include <Arbutils/ConstString.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:
std::unordered_map<std::string, uint8_t> _keyLookup;
std::vector<Nature> _natures;
uint8_t _current = 0;
Arbutils::Collections::Dictionary<Arbutils::CaseInsensitiveConstString, Nature> _items;
public:
NatureLibrary(uint8_t size = 32)
: _keyLookup(std::unordered_map<std::string, uint8_t>(size)), _natures(std::vector<Nature>(size)) {}
explicit NatureLibrary(uint8_t size = 32)
: _items(Arbutils::Collections::Dictionary<Arbutils::CaseInsensitiveConstString, Nature>(size)) {}
uint8_t LoadNature(const std::string& name, const Nature& nature) {
auto find = _keyLookup.find(name);
if (find != _keyLookup.end()) {
auto key = _keyLookup[name];
_natures[key] = nature;
return key;
} else {
auto key = _current;
_keyLookup[name] = key;
_natures[_current++] = nature;
return key;
}
inline void LoadNature(const Arbutils::CaseInsensitiveConstString& name, const Nature& nature) {
_items.Insert(name, nature);
}
const Nature& GetNatureByName(const std::string& name) const {
auto find = _keyLookup.find(name);
if (find == _keyLookup.end()) {
throw CreatureException("Invalid nature name.");
}
return _natures[_keyLookup.at(name)];
inline const Nature& GetNatureByName(const Arbutils::CaseInsensitiveConstString& name) const {
return _items[name];
}
const Nature& GetNature(uint8_t id) const { return _natures[id]; }
const Nature* GetNaturePtr(uint8_t id) const { return &_natures[id]; }
uint8_t GetNatureIdByName(const std::string& name) const {
auto find = _keyLookup.find(name);
if (find == _keyLookup.end()) {
throw CreatureException("Invalid nature name.");
}
return _keyLookup.at(name);
}
uint8_t GetRandomNature(Arbutils::Random rand = Arbutils::Random()) const{
return rand.Get(_current);
inline const Arbutils::CaseInsensitiveConstString&
GetRandomNatureName(Arbutils::Random rand = Arbutils::Random()) const {
auto i = rand.Get(_items.Count());
auto& map = _items.GetStdMap();
return std::next(std::begin(map), i)->first;
}
};
}