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

Update to the latest CreatureLib version.

Browse Source
This commit is contained in:
Deukhoofd
2020-04-06 20:03:44 +02:00
parent 29a82a5e75
commit 48ef465c82
41 changed files with 297 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Library/Natures/Nature.hpp
View File

@@ -1,21 +1,22 @@
#ifndef PKMNLIB_NATURE_HPP
#define PKMNLIB_NATURE_HPP
#include <CreatureLib/Core/Statistic.hpp>
#include <CreatureLib/Library/Statistic.hpp>
namespace PkmnLib::Library {
class Nature {
private:
CreatureLib::Core::Statistic _increaseStat;
CreatureLib::Core::Statistic _decreaseStat;
CreatureLib::Library::Statistic _increaseStat;
CreatureLib::Library::Statistic _decreaseStat;
float _increaseModifier;
float _decreaseModifier;
public:
Nature()
: _increaseStat(CreatureLib::Core::Statistic::Health), _decreaseStat(CreatureLib::Core::Statistic::Health),
_increaseModifier(1.0f), _decreaseModifier(1.0f) {}
: _increaseStat(CreatureLib::Library::Statistic::Health),
_decreaseStat(CreatureLib::Library::Statistic::Health), _increaseModifier(1.0f), _decreaseModifier(1.0f) {
}
Nature(CreatureLib::Core::Statistic increasedStat, CreatureLib::Core::Statistic decreasedStat,
Nature(CreatureLib::Library::Statistic increasedStat, CreatureLib::Library::Statistic decreasedStat,
float increasedModifier = 1.1f, float decreasedModifier = 0.9f)
: _increaseStat(increasedStat), _decreaseStat(decreasedStat), _increaseModifier(increasedModifier),
_decreaseModifier(decreasedModifier) {}
@@ -23,10 +24,10 @@ namespace PkmnLib::Library {
[[nodiscard]] float GetIncreaseModifier() const { return _increaseModifier; }
[[nodiscard]] float GetDecreaseModifier() const { return _decreaseModifier; }
[[nodiscard]] CreatureLib::Core::Statistic GetIncreasedStat() const { return _increaseStat; }
[[nodiscard]] CreatureLib::Core::Statistic GetDecreasedStat() const { return _decreaseStat; }
[[nodiscard]] CreatureLib::Library::Statistic GetIncreasedStat() const { return _increaseStat; }
[[nodiscard]] CreatureLib::Library::Statistic GetDecreasedStat() const { return _decreaseStat; }
[[nodiscard]] float GetStatModifier(CreatureLib::Core::Statistic stat) const {
[[nodiscard]] float GetStatModifier(CreatureLib::Library::Statistic stat) const {
if (stat == _increaseStat)
return _increaseModifier;
else if (stat == _decreaseStat)

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

@@ -1,7 +1,7 @@
#ifndef PKMNLIB_NATURELIBRARY_HPP
#define PKMNLIB_NATURELIBRARY_HPP
#include <CreatureLib/Core/Exceptions/CreatureException.hpp>
#include <CreatureLib/Library/Exceptions/CreatureException.hpp>
#include <Arbutils/Random.hpp>
#include <unordered_map>
#include <vector>