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

4
src/Library/Items/Item.hpp
View File

@@ -7,9 +7,9 @@ namespace PkmnLib::Library {
uint8_t _flingPower;
public:
Item(std::string name, CreatureLib::Library::ItemCategory category,
Item(const Arbutils::CaseInsensitiveConstString& name, CreatureLib::Library::ItemCategory category,
CreatureLib::Library::BattleItemCategory battleCategory, int32_t price,
std::unordered_set<std::string> flags, uint8_t flingPower)
std::unordered_set<Arbutils::CaseInsensitiveConstString> flags, uint8_t flingPower)
: CreatureLib::Library::Item(name, category, battleCategory, price, flags), _flingPower(flingPower) {}
inline uint8_t GetFlingPower() const { return _flingPower; }

8
src/Library/Items/ItemLibrary.hpp
View File

@@ -6,16 +6,16 @@
namespace PkmnLib::Library {
class ItemLibrary : public CreatureLib::Library::ItemLibrary {
public:
inline bool TryGet(const char* name, const Item*& item) const{
inline bool TryGet(const Arbutils::CaseInsensitiveConstString& name, const Item*& item) const {
return CreatureLib::Library::ItemLibrary::TryGet(name, (const CreatureLib::Library::Item*&)item);
}
inline const Item* Get(const char* name) const{
inline const Item* Get(const Arbutils::CaseInsensitiveConstString& name) const {
return reinterpret_cast<const Item*>(CreatureLib::Library::ItemLibrary::Get(name));
}
const Item* operator[](const char* name) const { return Get(name); }
const Item* operator[](const Arbutils::CaseInsensitiveConstString& name) const { return Get(name); }
void Insert(const char* name, const Item* item) {
void Insert(const Arbutils::CaseInsensitiveConstString& name, const Item* item) {
CreatureLib::Library::ItemLibrary::Insert(name, item);
}
};

2
src/Library/Moves/MoveData.cpp
View File

@@ -3,7 +3,7 @@
PkmnLib::Library::MoveData::MoveData(const std::string& name, uint8_t type,
PkmnLib::Library::MoveCategory category, uint8_t power, uint8_t accuracy,
uint8_t baseUsage, CreatureLib::Library::AttackTarget target, int8_t priority,
std::unordered_set<std::string> flags)
std::unordered_set<Arbutils::CaseInsensitiveConstString> flags)
: AttackData(name, type, static_cast<CreatureLib::Library::AttackCategory>(category), power, accuracy, baseUsage,
target, priority, std::move(flags)) {}

2
src/Library/Moves/MoveData.hpp
View File

@@ -11,7 +11,7 @@ namespace PkmnLib::Library {
public:
MoveData(const std::string& name, uint8_t type, PkmnLib::Library::MoveCategory category, uint8_t power,
uint8_t accuracy, uint8_t baseUsage, CreatureLib::Library::AttackTarget target, int8_t priority,
std::unordered_set<std::string> flags);
std::unordered_set<Arbutils::CaseInsensitiveConstString> flags);
PkmnLib::Library::MoveCategory GetCategory() const;
};

6
src/Library/Moves/MoveLibrary.hpp
View File

@@ -8,12 +8,12 @@ namespace PkmnLib::Library {
public:
MoveLibrary(size_t initialCapacity = 32) : CreatureLib::Library::AttackLibrary(initialCapacity) {}
virtual const MoveData* operator[](const char* name) const { return Get(name); }
virtual const MoveData* operator[](const Arbutils::CaseInsensitiveConstString& name) const { return Get(name); }
inline bool TryGet(const char* name, const MoveData*& move) const {
inline bool TryGet(const Arbutils::CaseInsensitiveConstString& name, const MoveData*& move) const {
return CreatureLib::Library::AttackLibrary::TryGet(name, (const CreatureLib::Library::AttackData*&)move);
}
const MoveData* Get(const char* name) const {
const MoveData* Get(const Arbutils::CaseInsensitiveConstString& name) const {
return dynamic_cast<const MoveData*>(CreatureLib::Library::AttackLibrary::Get(name));
}
};

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

@@ -2,7 +2,7 @@
#define PKMNLIB_NATURELIBRARY_HPP
#include <CreatureLib/Core/Exceptions/CreatureException.hpp>
#include <CreatureLib/Core/Random.hpp>
#include <Arbutils/Random.hpp>
#include <unordered_map>
#include <vector>
#include "Nature.hpp"
@@ -50,7 +50,7 @@ namespace PkmnLib::Library {
return _keyLookup.at(name);
}
uint8_t GetRandomNature(CreatureLib::Core::Random rand = CreatureLib::Core::Random()) const{
uint8_t GetRandomNature(Arbutils::Random rand = Arbutils::Random()) const{
return rand.Get(_current);
}
};

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

2
src/Library/TimeOfDay.hpp
View File

@@ -1,7 +1,7 @@
#ifndef PKMNLIB_TIMEOFDAY_HPP
#define PKMNLIB_TIMEOFDAY_HPP
#include <CreatureLib/Core/Enum.hpp>
#include <Arbutils/Enum.hpp>
#include <cstdint>
namespace PkmnLib::Library {