From 2fea77c66cf9298ee6e427945c2a805f822bd994 Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Thu, 15 May 2025 10:57:47 -0500 Subject: [PATCH] Fix tests for GetAllEnchantsAffectingAbility. Release Build 12194. --- Adventures in Lestoria Tests/EnchantTests.cpp | 18 +++++++++++------- .../Adventures in Lestoria.vcxproj.filters | 6 +++--- Adventures in Lestoria/Version.h | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/Adventures in Lestoria Tests/EnchantTests.cpp b/Adventures in Lestoria Tests/EnchantTests.cpp index 7bf505db..f60e83b5 100644 --- a/Adventures in Lestoria Tests/EnchantTests.cpp +++ b/Adventures in Lestoria Tests/EnchantTests.cpp @@ -140,17 +140,21 @@ namespace EnchantTests const Class cl{Class(classBits)}; Game::ChangeClass(player,cl); for(const Ability&ability:player->GetAbilities()){ - Assert::AreEqual(size_t(0),ItemEnchantInfo::GetAllEnchantsAffectingAbility("Rapid Fire").size(),util::wformat("There should be no enchants affecting ability {} by default.",ability).c_str()); + Assert::AreEqual(size_t(0),ItemEnchantInfo::GetAllEnchantsAffectingAbility(ability.GetName()).size(),util::wformat("There should be no enchants affecting ability {} by default.",ability.GetName()).c_str()); } } - Game::GiveAndEquipEnchantedRing("Stealthy Retreat"); - Assert::AreEqual(size_t(1),ItemEnchantInfo::GetAllEnchantsAffectingAbility("Retreat").size(),L"There should be 1 enchant affecting ability Retreat."); - Game::GiveAndEquipEnchantedRing("Stealthy Retreat",EquipSlot::RING2); - Assert::AreEqual(size_t(2),ItemEnchantInfo::GetAllEnchantsAffectingAbility("Retreat").size(),L"There should be 2 enchants affecting ability Retreat."); + Game::GiveAndEquipEnchantedRing("Heavy Guard"); + Assert::AreEqual(size_t(1),ItemEnchantInfo::GetAllEnchantsAffectingAbility("Block").size(),L"There should be 1 enchant affecting ability Block."); + Game::GiveAndEquipEnchantedRing("Advance Shield",EquipSlot::RING2); + Assert::AreEqual(size_t(2),ItemEnchantInfo::GetAllEnchantsAffectingAbility("Block").size(),L"There should be 2 enchants affecting ability Block."); Inventory::UnequipItem(EquipSlot::RING1); - Assert::AreEqual(size_t(1),ItemEnchantInfo::GetAllEnchantsAffectingAbility("Retreat").size(),L"There should be 1 enchant affecting ability Retreat."); + Assert::AreEqual(size_t(1),ItemEnchantInfo::GetAllEnchantsAffectingAbility("Block").size(),L"There should be 1 enchant affecting ability Block."); + Game::GiveAndEquipEnchantedRing("Advance Shield"); + Assert::AreEqual(size_t(1),ItemEnchantInfo::GetAllEnchantsAffectingAbility("Block").size(),L"With two of the same enchant, there should only be 1 enchant enchants affecting ability Block."); Inventory::UnequipItem(EquipSlot::RING2); - Assert::AreEqual(size_t(0),ItemEnchantInfo::GetAllEnchantsAffectingAbility("Retreat").size(),L"There should be no enchants affecting ability Retreat by default."); + Assert::AreEqual(size_t(1),ItemEnchantInfo::GetAllEnchantsAffectingAbility("Block").size(),L"There should be 1 enchant affecting ability Block."); + Inventory::UnequipItem(EquipSlot::RING1); + Assert::AreEqual(size_t(0),ItemEnchantInfo::GetAllEnchantsAffectingAbility("Block").size(),L"There should be no enchants affecting ability Block by default."); } TEST_METHOD(HealthBoostCheck){ Assert::AreEqual(100,player->GetMaxHealth(),L"Player starts with 100 health."); diff --git a/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters b/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters index 9b5ec5be..de7bcddc 100644 --- a/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters +++ b/Adventures in Lestoria/Adventures in Lestoria.vcxproj.filters @@ -714,12 +714,12 @@ Header Files\Utils - - Header Files\Utils - Header Files\State + + Header Files\State + diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 5bbf00df..217fab89 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 1 #define VERSION_MINOR 3 #define VERSION_PATCH 0 -#define VERSION_BUILD 12193 +#define VERSION_BUILD 12194 #define stringify(a) stringify_(a) #define stringify_(a) #a