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

Rework CreatePokemon to not return a pointer to self every time, but return by value instead.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd
2020-04-22 14:41:20 +02:00
parent babb384166
commit b1442f25fb
5 changed files with 90 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
tests/ScriptTests/ScriptTypeTests/Battle/PokemonTests.cpp
View File

@@ -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<PkmnLib::Battling::Pokemon*>(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<PkmnLib::Battling::Pokemon*>(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<PkmnLib::Battling::Pokemon*>(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<PkmnLib::Battling::Pokemon*>(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<PkmnLib::Battling::Pokemon*>(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<PkmnLib::Battling::Pokemon*>(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<PkmnLib::Battling::Pokemon*>(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<PkmnLib::Battling::Pokemon*>(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<PkmnLib::Battling::Pokemon*>(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<PkmnLib::Battling::Pokemon*>(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<PkmnLib::Battling::Pokemon*>(mon));