From b1442f25fb09aec87794b8bdd88e846731e12efd Mon Sep 17 00:00:00 2001 From: Deukhoofd Date: Wed, 22 Apr 2020 14:41:20 +0200 Subject: [PATCH] Rework CreatePokemon to not return a pointer to self every time, but return by value instead. --- src/Battling/Pokemon/CreatePokemon.cpp | 54 ++++++++-------- src/Battling/Pokemon/CreatePokemon.hpp | 22 +++---- tests/LibraryTests/StatCalculationTests.cpp | 36 +++++------ tests/PokemonTests/BasicPokemonTests.cpp | 6 +- .../ScriptTypeTests/Battle/PokemonTests.cpp | 62 +++++++++---------- 5 files changed, 90 insertions(+), 90 deletions(-) diff --git a/src/Battling/Pokemon/CreatePokemon.cpp b/src/Battling/Pokemon/CreatePokemon.cpp index 0b4c307..76ae5c9 100644 --- a/src/Battling/Pokemon/CreatePokemon.cpp +++ b/src/Battling/Pokemon/CreatePokemon.cpp @@ -1,16 +1,16 @@ #include "CreatePokemon.hpp" -PkmnLib::Battling::CreatePokemon* PkmnLib::Battling::CreatePokemon::WithRandomIndividualValues(Arbutils::Random rand) { +PkmnLib::Battling::CreatePokemon PkmnLib::Battling::CreatePokemon::WithRandomIndividualValues(Arbutils::Random rand) { _ivHp = rand.Get(0, 32); _ivAttack = rand.Get(0, 32); _ivDefense = rand.Get(0, 32); _ivSpAtt = rand.Get(0, 32); _ivSpDef = rand.Get(0, 32); _ivSpeed = rand.Get(0, 32); - return this; + return *this; } -PkmnLib::Battling::CreatePokemon* +PkmnLib::Battling::CreatePokemon PkmnLib::Battling::CreatePokemon::WithIndividualValue(CreatureLib::Library::Statistic stat, uint8_t value) { switch (stat) { case PkmnLib::Library::Statistic::HealthPoints: _ivHp = value; break; @@ -20,11 +20,11 @@ PkmnLib::Battling::CreatePokemon::WithIndividualValue(CreatureLib::Library::Stat case PkmnLib::Library::Statistic::SpecialDefense: _ivSpDef = value; break; case PkmnLib::Library::Statistic::Speed: _ivSpeed = value; break; } - return this; + return *this; } -PkmnLib::Battling::CreatePokemon* -PkmnLib::Battling::CreatePokemon::WithEffortValue(CreatureLib::Library::Statistic stat, uint8_t value) { +PkmnLib::Battling::CreatePokemon PkmnLib::Battling::CreatePokemon::WithEffortValue(CreatureLib::Library::Statistic stat, + uint8_t value) { switch (stat) { case PkmnLib::Library::Statistic::HealthPoints: _evHp = value; break; case PkmnLib::Library::Statistic::PhysicalAttack: _evAttack = value; break; @@ -33,7 +33,7 @@ PkmnLib::Battling::CreatePokemon::WithEffortValue(CreatureLib::Library::Statisti case PkmnLib::Library::Statistic::SpecialDefense: _evSpDef = value; break; case PkmnLib::Library::Statistic::Speed: _evSpeed = value; break; } - return this; + return *this; } PkmnLib::Battling::Pokemon* PkmnLib::Battling::CreatePokemon::Build() { @@ -101,53 +101,53 @@ PkmnLib::Battling::Pokemon* PkmnLib::Battling::CreatePokemon::Build() { pkmn->Initialize(); return pkmn; } -PkmnLib::Battling::CreatePokemon* +PkmnLib::Battling::CreatePokemon PkmnLib::Battling::CreatePokemon::WithNature(const Arbutils::CaseInsensitiveConstString& nature) { _nature = nature; - return this; + return *this; } -PkmnLib::Battling::CreatePokemon* PkmnLib::Battling::CreatePokemon::WithIndividualValues(uint8_t hp, uint8_t att, - uint8_t def, uint8_t spAtt, - uint8_t spDef, uint8_t speed) { +PkmnLib::Battling::CreatePokemon PkmnLib::Battling::CreatePokemon::WithIndividualValues(uint8_t hp, uint8_t att, + uint8_t def, uint8_t spAtt, + uint8_t spDef, uint8_t speed) { _ivHp = hp; _ivAttack = att; _ivDefense = def; _ivSpAtt = spAtt; _ivSpDef = spDef; _ivSpeed = speed; - return this; + return *this; } -PkmnLib::Battling::CreatePokemon* PkmnLib::Battling::CreatePokemon::WithEffortValues(uint8_t hp, uint8_t att, - uint8_t def, uint8_t spAtt, - uint8_t spDef, uint8_t speed) { +PkmnLib::Battling::CreatePokemon PkmnLib::Battling::CreatePokemon::WithEffortValues(uint8_t hp, uint8_t att, + uint8_t def, uint8_t spAtt, + uint8_t spDef, uint8_t speed) { _evHp = hp; _evAttack = att; _evDefense = def; _evSpAtt = spAtt; _evSpDef = spDef; _evSpeed = speed; - return this; + return *this; } -PkmnLib::Battling::CreatePokemon* +PkmnLib::Battling::CreatePokemon PkmnLib::Battling::CreatePokemon::WithForme(const Arbutils::CaseInsensitiveConstString& forme) { _forme = forme; - return this; + return *this; } -PkmnLib::Battling::CreatePokemon* PkmnLib::Battling::CreatePokemon::WithGender(CreatureLib::Library::Gender gender) { +PkmnLib::Battling::CreatePokemon PkmnLib::Battling::CreatePokemon::WithGender(CreatureLib::Library::Gender gender) { _gender = gender; - return this; + return *this; } -PkmnLib::Battling::CreatePokemon* PkmnLib::Battling::CreatePokemon::IsShiny(bool value) { +PkmnLib::Battling::CreatePokemon PkmnLib::Battling::CreatePokemon::IsShiny(bool value) { _shininessSet = true; _isShiny = value; - return this; + return *this; } -PkmnLib::Battling::CreatePokemon* +PkmnLib::Battling::CreatePokemon PkmnLib::Battling::CreatePokemon::WithHeldItem(const Arbutils::CaseInsensitiveConstString& item) { _heldItem = item; - return this; + return *this; } -PkmnLib::Battling::CreatePokemon* +PkmnLib::Battling::CreatePokemon PkmnLib::Battling::CreatePokemon::LearnMove(const Arbutils::CaseInsensitiveConstString& moveName, CreatureLib::Battling::AttackLearnMethod method) { const PkmnLib::Library::MoveData* move = nullptr; @@ -161,5 +161,5 @@ PkmnLib::Battling::CreatePokemon::LearnMove(const Arbutils::CaseInsensitiveConst auto& c = _attacks[_currentMove++]; c.Move = move; c.LearnMethod = method; - return this; + return *this; } diff --git a/src/Battling/Pokemon/CreatePokemon.hpp b/src/Battling/Pokemon/CreatePokemon.hpp index d9f2acb..dade885 100644 --- a/src/Battling/Pokemon/CreatePokemon.hpp +++ b/src/Battling/Pokemon/CreatePokemon.hpp @@ -49,22 +49,22 @@ namespace PkmnLib::Battling { _attacks.Resize(library->GetSettings()->GetMaximalMoves(), ToLearnMethod()); } - CreatePokemon* WithForme(const Arbutils::CaseInsensitiveConstString& forme); - CreatePokemon* WithGender(CreatureLib::Library::Gender gender); - CreatePokemon* IsShiny(bool value); - CreatePokemon* WithHeldItem(const Arbutils::CaseInsensitiveConstString& item); - CreatePokemon* LearnMove(const Arbutils::CaseInsensitiveConstString& move, + CreatePokemon WithForme(const Arbutils::CaseInsensitiveConstString& forme); + CreatePokemon WithGender(CreatureLib::Library::Gender gender); + CreatePokemon IsShiny(bool value); + CreatePokemon WithHeldItem(const Arbutils::CaseInsensitiveConstString& item); + CreatePokemon LearnMove(const Arbutils::CaseInsensitiveConstString& move, CreatureLib::Battling::AttackLearnMethod method); - CreatePokemon* WithRandomIndividualValues(Arbutils::Random rand = Arbutils::Random()); - CreatePokemon* WithIndividualValue(CreatureLib::Library::Statistic stat, uint8_t value); - CreatePokemon* WithIndividualValues(uint8_t hp, uint8_t att, uint8_t def, uint8_t spAtt, uint8_t spDef, + CreatePokemon WithRandomIndividualValues(Arbutils::Random rand = Arbutils::Random()); + CreatePokemon WithIndividualValue(CreatureLib::Library::Statistic stat, uint8_t value); + CreatePokemon WithIndividualValues(uint8_t hp, uint8_t att, uint8_t def, uint8_t spAtt, uint8_t spDef, uint8_t speed); - CreatePokemon* WithEffortValue(CreatureLib::Library::Statistic stat, uint8_t value); - CreatePokemon* WithEffortValues(uint8_t hp, uint8_t att, uint8_t def, uint8_t spAtt, uint8_t spDef, + CreatePokemon WithEffortValue(CreatureLib::Library::Statistic stat, uint8_t value); + CreatePokemon WithEffortValues(uint8_t hp, uint8_t att, uint8_t def, uint8_t spAtt, uint8_t spDef, uint8_t speed); - CreatePokemon* WithNature(const Arbutils::CaseInsensitiveConstString& nature); + CreatePokemon WithNature(const Arbutils::CaseInsensitiveConstString& nature); Pokemon* Build(); }; diff --git a/tests/LibraryTests/StatCalculationTests.cpp b/tests/LibraryTests/StatCalculationTests.cpp index de9c680..a13a7bb 100644 --- a/tests/LibraryTests/StatCalculationTests.cpp +++ b/tests/LibraryTests/StatCalculationTests.cpp @@ -7,7 +7,7 @@ using namespace PkmnLib::Battling; TEST_CASE("Low level, no IVs, no EVs, neutral nature, no stat boosts stat test") { auto pkmn = - CreatePokemon(TestLibrary::GetLibrary(), "statTestSpecies1"_cnc, 10).WithNature("neutralNature"_cnc)->Build(); + CreatePokemon(TestLibrary::GetLibrary(), "statTestSpecies1"_cnc, 10).WithNature("neutralNature"_cnc).Build(); CHECK(pkmn->GetFlatStat(PkmnLib::Library::Statistic::HealthPoints) == 40); CHECK(pkmn->GetCurrentHealth() == 40); CHECK(pkmn->GetFlatStat(PkmnLib::Library::Statistic::PhysicalAttack) == 25); @@ -20,7 +20,7 @@ TEST_CASE("Low level, no IVs, no EVs, neutral nature, no stat boosts stat test") TEST_CASE("High level, no IVs, no EVs, neutral nature, no stat boosts stat test") { auto pkmn = - CreatePokemon(TestLibrary::GetLibrary(), "statTestSpecies1"_cnc, 100).WithNature("neutralNature"_cnc)->Build(); + CreatePokemon(TestLibrary::GetLibrary(), "statTestSpecies1"_cnc, 100).WithNature("neutralNature"_cnc).Build(); CHECK(pkmn->GetFlatStat(PkmnLib::Library::Statistic::HealthPoints) == 310); CHECK(pkmn->GetCurrentHealth() == 310); CHECK(pkmn->GetFlatStat(PkmnLib::Library::Statistic::PhysicalAttack) == 205); @@ -34,8 +34,8 @@ TEST_CASE("High level, no IVs, no EVs, neutral nature, no stat boosts stat test" TEST_CASE("Low level, max IVs, no EVs, neutral nature, no stat boosts stat test") { auto pkmn = CreatePokemon(TestLibrary::GetLibrary(), "statTestSpecies1"_cnc, 10) .WithNature("neutralNature"_cnc) - ->WithIndividualValues(31, 31, 31, 31, 31, 31) - ->Build(); + .WithIndividualValues(31, 31, 31, 31, 31, 31) + .Build(); CHECK(pkmn->GetFlatStat(PkmnLib::Library::Statistic::HealthPoints) == 43); CHECK(pkmn->GetCurrentHealth() == 43); CHECK(pkmn->GetFlatStat(PkmnLib::Library::Statistic::PhysicalAttack) == 28); @@ -49,8 +49,8 @@ TEST_CASE("Low level, max IVs, no EVs, neutral nature, no stat boosts stat test" TEST_CASE("High level, max IVs, no EVs, neutral nature, no stat boosts stat test") { auto pkmn = CreatePokemon(TestLibrary::GetLibrary(), "statTestSpecies1"_cnc, 100) .WithNature("neutralNature"_cnc) - ->WithIndividualValues(31, 31, 31, 31, 31, 31) - ->Build(); + .WithIndividualValues(31, 31, 31, 31, 31, 31) + .Build(); CHECK(pkmn->GetFlatStat(PkmnLib::Library::Statistic::HealthPoints) == 341); CHECK(pkmn->GetCurrentHealth() == 341); CHECK(pkmn->GetFlatStat(PkmnLib::Library::Statistic::PhysicalAttack) == 236); @@ -64,9 +64,9 @@ TEST_CASE("High level, max IVs, no EVs, neutral nature, no stat boosts stat test TEST_CASE("High level, max IVs, max EVs, neutral nature, no stat boosts stat test") { auto pkmn = CreatePokemon(TestLibrary::GetLibrary(), "statTestSpecies1"_cnc, 100) .WithNature("neutralNature"_cnc) - ->WithIndividualValues(31, 31, 31, 31, 31, 31) - ->WithEffortValues(255, 255, 255, 255, 255, 255) - ->Build(); + .WithIndividualValues(31, 31, 31, 31, 31, 31) + .WithEffortValues(255, 255, 255, 255, 255, 255) + .Build(); CHECK(pkmn->GetFlatStat(PkmnLib::Library::Statistic::HealthPoints) == 404); CHECK(pkmn->GetCurrentHealth() == 404); CHECK(pkmn->GetFlatStat(PkmnLib::Library::Statistic::PhysicalAttack) == 299); @@ -80,9 +80,9 @@ TEST_CASE("High level, max IVs, max EVs, neutral nature, no stat boosts stat tes TEST_CASE("High level, max IVs, max EVs, nature buffs attack, nerfs speed, no stat boosts stat test") { auto pkmn = CreatePokemon(TestLibrary::GetLibrary(), "statTestSpecies1"_cnc, 100) .WithNature("buffsAttackNerfsSpeed"_cnc) - ->WithIndividualValues(31, 31, 31, 31, 31, 31) - ->WithEffortValues(255, 255, 255, 255, 255, 255) - ->Build(); + .WithIndividualValues(31, 31, 31, 31, 31, 31) + .WithEffortValues(255, 255, 255, 255, 255, 255) + .Build(); CHECK(pkmn->GetFlatStat(PkmnLib::Library::Statistic::HealthPoints) == 404); CHECK(pkmn->GetCurrentHealth() == 404); CHECK(pkmn->GetFlatStat(PkmnLib::Library::Statistic::PhysicalAttack) == 328); @@ -96,9 +96,9 @@ TEST_CASE("High level, max IVs, max EVs, nature buffs attack, nerfs speed, no st TEST_CASE("High level, max IVs, max EVs, nature buffs attack, nerfs speed, Attack boosted +6 stat test") { auto pkmn = CreatePokemon(TestLibrary::GetLibrary(), "statTestSpecies1"_cnc, 100) .WithNature("buffsAttackNerfsSpeed"_cnc) - ->WithIndividualValues(31, 31, 31, 31, 31, 31) - ->WithEffortValues(255, 255, 255, 255, 255, 255) - ->Build(); + .WithIndividualValues(31, 31, 31, 31, 31, 31) + .WithEffortValues(255, 255, 255, 255, 255, 255) + .Build(); pkmn->ChangeStatBoost(PkmnLib::Library::Statistic::PhysicalAttack, 6); @@ -115,9 +115,9 @@ TEST_CASE("High level, max IVs, max EVs, nature buffs attack, nerfs speed, Attac TEST_CASE("High level, max IVs, max EVs, nature buffs attack, nerfs speed, Attack boosted -6 stat test") { auto pkmn = CreatePokemon(TestLibrary::GetLibrary(), "statTestSpecies1"_cnc, 100) .WithNature("buffsAttackNerfsSpeed"_cnc) - ->WithIndividualValues(31, 31, 31, 31, 31, 31) - ->WithEffortValues(255, 255, 255, 255, 255, 255) - ->Build(); + .WithIndividualValues(31, 31, 31, 31, 31, 31) + .WithEffortValues(255, 255, 255, 255, 255, 255) + .Build(); pkmn->ChangeStatBoost(PkmnLib::Library::Statistic::PhysicalAttack, -6); diff --git a/tests/PokemonTests/BasicPokemonTests.cpp b/tests/PokemonTests/BasicPokemonTests.cpp index 8caac94..48ae5a9 100644 --- a/tests/PokemonTests/BasicPokemonTests.cpp +++ b/tests/PokemonTests/BasicPokemonTests.cpp @@ -11,7 +11,7 @@ TEST_CASE("Create and delete Pokemon") { TEST_CASE("Get Nature from Pokemon") { auto lib = TestLibrary::GetLibrary(); - auto mon = PkmnLib::Battling::CreatePokemon(lib, "testSpecies"_cnc, 1).WithNature("neutralNature"_cnc)->Build(); + auto mon = PkmnLib::Battling::CreatePokemon(lib, "testSpecies"_cnc, 1).WithNature("neutralNature"_cnc).Build(); auto nature = mon->GetNature(); REQUIRE(nature->GetDecreaseModifier() == 1); REQUIRE(nature->GetIncreaseModifier() == 1); @@ -23,9 +23,9 @@ TEST_CASE("Get Attack name from Pokemon") { auto mon = PkmnLib::Battling::CreatePokemon(lib, "testSpecies"_cnc, 1) .LearnMove(Arbutils::CaseInsensitiveConstString("testMove"), CreatureLib::Battling::AttackLearnMethod::Level) - ->LearnMove(Arbutils::CaseInsensitiveConstString("testMove2"), + .LearnMove(Arbutils::CaseInsensitiveConstString("testMove2"), CreatureLib::Battling::AttackLearnMethod::Level) - ->Build(); + .Build(); auto move = mon->GetMoves()[0]; REQUIRE(move->GetMoveData()->GetName() == "testMove"_cnc); auto move2 = mon->GetMoves()[1]; diff --git a/tests/ScriptTests/ScriptTypeTests/Battle/PokemonTests.cpp b/tests/ScriptTests/ScriptTypeTests/Battle/PokemonTests.cpp index 2539772..d6ec2ca 100644 --- a/tests/ScriptTests/ScriptTypeTests/Battle/PokemonTests.cpp +++ b/tests/ScriptTests/ScriptTypeTests/Battle/PokemonTests.cpp @@ -85,7 +85,7 @@ TEST_CASE("Validate Pokemon Forme in Script") { auto mainLib = TestLibrary::GetLibrary(); auto data = GetScript(mainLib, "testForme"_cnc); - auto mon = PkmnLib::Battling::CreatePokemon(mainLib, "testSpecies"_cnc, 30).WithForme("default"_cnc)->Build(); + auto mon = PkmnLib::Battling::CreatePokemon(mainLib, "testSpecies"_cnc, 30).WithForme("default"_cnc).Build(); data.Context->SetArgObject(0, const_cast(mon)); data.Context->SetArgObject(1, (void*)mon->GetForme()); @@ -98,7 +98,7 @@ TEST_CASE("Validate Pokemon Level in Script") { auto mainLib = TestLibrary::GetLibrary(); auto data = GetScript(mainLib, "testLevel"_cnc); - auto mon = PkmnLib::Battling::CreatePokemon(mainLib, "testSpecies"_cnc, 30).WithForme("default"_cnc)->Build(); + auto mon = PkmnLib::Battling::CreatePokemon(mainLib, "testSpecies"_cnc, 30).WithForme("default"_cnc).Build(); data.Context->SetArgObject(0, const_cast(mon)); data.Context->SetArgByte(1, mon->GetLevel()); @@ -111,7 +111,7 @@ TEST_CASE("Validate Pokemon Experience in Script") { auto mainLib = TestLibrary::GetLibrary(); auto data = GetScript(mainLib, "testExperience"_cnc); - auto mon = PkmnLib::Battling::CreatePokemon(mainLib, "testSpecies"_cnc, 30).WithForme("default"_cnc)->Build(); + auto mon = PkmnLib::Battling::CreatePokemon(mainLib, "testSpecies"_cnc, 30).WithForme("default"_cnc).Build(); data.Context->SetArgObject(0, const_cast(mon)); data.Context->SetArgDWord(1, mon->GetExperience()); @@ -126,8 +126,8 @@ TEST_CASE("Validate Pokemon Gender in Script") { auto mon = PkmnLib::Battling::CreatePokemon(mainLib, "testSpecies"_cnc, 30) .WithForme("default"_cnc) - ->WithGender(CreatureLib::Library::Gender::Male) - ->Build(); + .WithGender(CreatureLib::Library::Gender::Male) + .Build(); data.Context->SetArgObject(0, const_cast(mon)); data.Context->SetArgDWord(1, (int)mon->GetGender()); @@ -142,8 +142,8 @@ TEST_CASE("Validate Pokemon Shininess in Script") { auto mon = PkmnLib::Battling::CreatePokemon(mainLib, "testSpecies"_cnc, 30) .WithForme("default"_cnc) - ->WithGender(CreatureLib::Library::Gender::Male) - ->Build(); + .WithGender(CreatureLib::Library::Gender::Male) + .Build(); data.Context->SetArgObject(0, const_cast(mon)); data.Context->SetArgByte(1, mon->IsShiny()); @@ -158,9 +158,9 @@ TEST_CASE("Validate Pokemon HeldItem in Script") { auto mon = PkmnLib::Battling::CreatePokemon(mainLib, "testSpecies"_cnc, 30) .WithForme("default"_cnc) - ->WithHeldItem("testItem"_cnc) - ->WithGender(CreatureLib::Library::Gender::Male) - ->Build(); + .WithHeldItem("testItem"_cnc) + .WithGender(CreatureLib::Library::Gender::Male) + .Build(); data.Context->SetArgObject(0, const_cast(mon)); data.Context->SetArgObject(1, (void*)mon->GetHeldItem()); @@ -175,8 +175,8 @@ TEST_CASE("Validate Pokemon CurrentHealth in Script") { auto mon = PkmnLib::Battling::CreatePokemon(mainLib, "testSpecies"_cnc, 30) .WithForme("default"_cnc) - ->WithGender(CreatureLib::Library::Gender::Male) - ->Build(); + .WithGender(CreatureLib::Library::Gender::Male) + .Build(); data.Context->SetArgObject(0, const_cast(mon)); data.Context->SetArgDWord(1, mon->GetCurrentHealth()); @@ -191,8 +191,8 @@ TEST_CASE("Validate Pokemon Nickname in Script") { auto mon = PkmnLib::Battling::CreatePokemon(mainLib, "testSpecies"_cnc, 30) .WithForme("default"_cnc) - ->WithGender(CreatureLib::Library::Gender::Male) - ->Build(); + .WithGender(CreatureLib::Library::Gender::Male) + .Build(); data.Context->SetArgObject(0, const_cast(mon)); auto name = mon->GetNickname(); data.Context->SetArgAddress(1, &name); @@ -208,8 +208,8 @@ TEST_CASE("Validate Pokemon Active Ability in Script") { auto mon = PkmnLib::Battling::CreatePokemon(mainLib, "testSpecies"_cnc, 30) .WithForme("default"_cnc) - ->WithGender(CreatureLib::Library::Gender::Male) - ->Build(); + .WithGender(CreatureLib::Library::Gender::Male) + .Build(); data.Context->SetArgObject(0, (void*)mon); auto name = mon->GetActiveTalent(); data.Context->SetArgAddress(1, &name); @@ -225,8 +225,8 @@ TEST_CASE("Validate Pokemon IsFainted in Script") { auto mon = PkmnLib::Battling::CreatePokemon(mainLib, "testSpecies"_cnc, 30) .WithForme("default"_cnc) - ->WithGender(CreatureLib::Library::Gender::Male) - ->Build(); + .WithGender(CreatureLib::Library::Gender::Male) + .Build(); data.Context->SetArgObject(0, const_cast(mon)); data.Context->SetArgByte(1, mon->IsFainted()); @@ -240,8 +240,8 @@ TEST_CASE("Validate Pokemon GetTypes in Script") { auto mon = PkmnLib::Battling::CreatePokemon(mainLib, "testSpecies3"_cnc, 30) .WithForme("default"_cnc) - ->WithGender(CreatureLib::Library::Gender::Male) - ->Build(); + .WithGender(CreatureLib::Library::Gender::Male) + .Build(); for (size_t i = 0; i < mon->GetTypes().Count(); i++) { auto data = GetScript(mainLib, "testType"_cnc); @@ -260,8 +260,8 @@ TEST_CASE("Validate Pokemon HasType in Script") { auto mon = PkmnLib::Battling::CreatePokemon(mainLib, "testSpecies3"_cnc, 30) .WithForme("default"_cnc) - ->WithGender(CreatureLib::Library::Gender::Male) - ->Build(); + .WithGender(CreatureLib::Library::Gender::Male) + .Build(); for (size_t i = 0; i < mon->GetTypes().Count(); i++) { auto data = GetScript(mainLib, "testHasType"_cnc); @@ -279,8 +279,8 @@ TEST_CASE("Validate Pokemon Damage in Script") { auto mon = PkmnLib::Battling::CreatePokemon(mainLib, "testSpecies3"_cnc, 30) .WithForme("default"_cnc) - ->WithGender(CreatureLib::Library::Gender::Male) - ->Build(); + .WithGender(CreatureLib::Library::Gender::Male) + .Build(); auto data = GetScript(mainLib, "testDamage"_cnc); data.Context->SetArgObject(0, const_cast(mon)); @@ -298,8 +298,8 @@ TEST_CASE("Validate Pokemon Heal in Script") { auto mon = PkmnLib::Battling::CreatePokemon(mainLib, "testSpecies3"_cnc, 30) .WithForme("default"_cnc) - ->WithGender(CreatureLib::Library::Gender::Male) - ->Build(); + .WithGender(CreatureLib::Library::Gender::Male) + .Build(); mon->Damage(50, CreatureLib::Battling::DamageSource::AttackDamage); auto data = GetScript(mainLib, "testHeal"_cnc); @@ -317,9 +317,9 @@ TEST_CASE("Validate Pokemon GetMoves in Script") { auto mon = PkmnLib::Battling::CreatePokemon(mainLib, "testSpecies3"_cnc, 30) .WithForme("default"_cnc) - ->LearnMove("testMove"_cnc, CreatureLib::Battling::AttackLearnMethod::Level) - ->LearnMove("testMove2"_cnc, CreatureLib::Battling::AttackLearnMethod::Unknown) - ->Build(); + .LearnMove("testMove"_cnc, CreatureLib::Battling::AttackLearnMethod::Level) + .LearnMove("testMove2"_cnc, CreatureLib::Battling::AttackLearnMethod::Unknown) + .Build(); for (size_t i = 0; i < mon->GetMoves().Count(); i++) { auto data = GetScript(mainLib, "testMove"_cnc); @@ -340,8 +340,8 @@ TEST_CASE("Validate Pokemon HasHeldItem in Script") { auto mon = PkmnLib::Battling::CreatePokemon(mainLib, "testSpecies3"_cnc, 30) .WithForme("default"_cnc) - ->WithHeldItem("testItem"_cnc) - ->Build(); + .WithHeldItem("testItem"_cnc) + .Build(); auto data = GetScript(mainLib, "testHasHeldItem"_cnc); data.Context->SetArgObject(0, const_cast(mon));