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

Handle natures as pointers instead of values.
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse Source
This commit is contained in:
Deukhoofd
2020-04-17 18:39:04 +02:00
parent 086438f547
commit 6b704224d0
8 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/LibraryTests/NatureLibraryTests.cpp
View File

@@ -12,19 +12,19 @@ TEST_CASE("Able to create and delete nature library", "library") {
TEST_CASE("Able to insert into nature library", "library") {
auto lib = new NatureLibrary();
lib->LoadNature("testNature"_cnc, Nature(Statistic::PhysicalAttack, Statistic::Speed));
lib->LoadNature("testNature"_cnc, new Nature(Statistic::PhysicalAttack, Statistic::Speed));
delete lib;
}
TEST_CASE("Able to retrieve nature by name", "library") {
auto lib = new NatureLibrary();
lib->LoadNature("testNature"_cnc, Nature(Statistic::PhysicalAttack, Statistic::Speed));
lib->LoadNature("testNature"_cnc, new Nature(Statistic::PhysicalAttack, Statistic::Speed));
auto nature = lib->GetNatureByName("testNature"_cnc);
REQUIRE(nature.GetIncreasedStat() == Statistic::PhysicalAttack);
REQUIRE(nature.GetDecreasedStat() == Statistic::Speed);
REQUIRE(nature.GetIncreaseModifier() == 1.1f);
REQUIRE(nature.GetDecreaseModifier() == 0.9f);
REQUIRE(nature->GetIncreasedStat() == Statistic::PhysicalAttack);
REQUIRE(nature->GetDecreasedStat() == Statistic::Speed);
REQUIRE(nature->GetIncreaseModifier() == 1.1f);
REQUIRE(nature->GetDecreaseModifier() == 0.9f);
delete lib;
}

4
tests/PokemonTests/BasicPokemonTests.cpp
View File

@@ -15,8 +15,8 @@ TEST_CASE("Get Nature from Pokemon"){
.WithNature("neutralNature"_cnc)
->Build();
auto nature = mon->GetNature();
REQUIRE(nature.GetDecreaseModifier() == 1);
REQUIRE(nature.GetIncreaseModifier() == 1);
REQUIRE(nature->GetDecreaseModifier() == 1);
REQUIRE(nature->GetIncreaseModifier() == 1);
delete mon;
}

4
tests/TestLibrary/TestLibrary.hpp
View File

@@ -65,10 +65,10 @@ public:
static PkmnLib::Library::NatureLibrary* BuildNatureLibrary() {
auto lib = new PkmnLib::Library::NatureLibrary();
lib->LoadNature("neutralNature"_cnc,
PkmnLib::Library::Nature(PkmnLib::Library::Statistic::PhysicalAttack,
new PkmnLib::Library::Nature(PkmnLib::Library::Statistic::PhysicalAttack,
PkmnLib::Library::Statistic::PhysicalDefense, 1, 1));
lib->LoadNature("buffsAttackNerfsSpeed"_cnc,
PkmnLib::Library::Nature(PkmnLib::Library::Statistic::PhysicalAttack,
new PkmnLib::Library::Nature(PkmnLib::Library::Statistic::PhysicalAttack,
PkmnLib::Library::Statistic::Speed, 1.1, 0.9));
return lib;
}