diff --git a/src/Battling/Library/BattleLibrary.hpp b/src/Battling/Library/BattleLibrary.hpp index 6023aec..0b2705d 100644 --- a/src/Battling/Library/BattleLibrary.hpp +++ b/src/Battling/Library/BattleLibrary.hpp @@ -4,24 +4,24 @@ #include #include "../../Library/PokemonLibrary.hpp" #include "DamageLibrary.hpp" +#include "MiscLibrary.hpp" #include "StatCalculator.hpp" namespace PkmnLib::Battling { class BattleLibrary : public CreatureLib::Battling::BattleLibrary { public: - BattleLibrary(Library::PokemonLibrary* staticLib, StatCalculator* statCalculator, - DamageLibrary* damageLibrary, + BattleLibrary(Library::PokemonLibrary* staticLib, StatCalculator* statCalculator, DamageLibrary* damageLibrary, CreatureLib::Battling::ExperienceLibrary* experienceLibrary, CreatureLib::Battling::ScriptResolver* scriptResolver, - CreatureLib::Battling::MiscLibrary* miscLibrary) + PkmnLib::Battling::MiscLibrary* miscLibrary) : CreatureLib::Battling::BattleLibrary(staticLib, statCalculator, damageLibrary, experienceLibrary, scriptResolver, miscLibrary) {} - const Library::LibrarySettings* GetSettings() const{ + const Library::LibrarySettings* GetSettings() const { return static_cast(_staticLib->GetSettings()); } - const Library::PokemonLibrary* GetStaticLib() const{ + const Library::PokemonLibrary* GetStaticLib() const { return dynamic_cast(CreatureLib::Battling::BattleLibrary::_staticLib); } @@ -31,19 +31,14 @@ namespace PkmnLib::Battling { } const Library::MoveLibrary* GetMoveLibrary() const { - return dynamic_cast( - CreatureLib::Battling::BattleLibrary::GetAttackLibrary()); + return dynamic_cast(CreatureLib::Battling::BattleLibrary::GetAttackLibrary()); } - const Library::ItemLibrary* GetItemLibrary() const { - return dynamic_cast( - CreatureLib::Battling::BattleLibrary::GetItemLibrary()); + return dynamic_cast(CreatureLib::Battling::BattleLibrary::GetItemLibrary()); } - const Library::NatureLibrary* GetNatureLibrary() const { - return GetStaticLib()->GetNatureLibrary(); - } + const Library::NatureLibrary* GetNatureLibrary() const { return GetStaticLib()->GetNatureLibrary(); } static CreatureLib::Battling::ScriptResolver* CreateScriptResolver(); }; diff --git a/src/Battling/Library/MiscLibrary.hpp b/src/Battling/Library/MiscLibrary.hpp index 35b3472..6c76d75 100644 --- a/src/Battling/Library/MiscLibrary.hpp +++ b/src/Battling/Library/MiscLibrary.hpp @@ -4,7 +4,7 @@ #include namespace PkmnLib::Battling{ - class MiscLibrary : CreatureLib::Battling::MiscLibrary { + class MiscLibrary : public CreatureLib::Battling::MiscLibrary { ~MiscLibrary() override = default; bool IsCritical(CreatureLib::Battling::ExecutingAttack* attack, CreatureLib::Battling::Creature* target, uint8_t hit) const override; diff --git a/tests/TestLibrary/TestLibrary.hpp b/tests/TestLibrary/TestLibrary.hpp index ee21e32..e4502f7 100644 --- a/tests/TestLibrary/TestLibrary.hpp +++ b/tests/TestLibrary/TestLibrary.hpp @@ -3,6 +3,7 @@ #include #include "../../src/Battling/Library/BattleLibrary.hpp" +#include "../../src/Battling/Library/MiscLibrary.hpp" #include "../../src/Library/Moves/MoveLibrary.hpp" #include "../../src/Library/PokemonLibrary.hpp" #include "../../src/Library/Statistic.hpp" @@ -24,7 +25,7 @@ public: auto scriptResolver = PkmnLib::Battling::BattleLibrary::CreateScriptResolver(); auto lib = new PkmnLib::Battling::BattleLibrary( BuildStaticLibrary(), statCalc, new PkmnLib::Battling::DamageLibrary(), - new CreatureLib::Battling::ExperienceLibrary(), scriptResolver, new CreatureLib::Battling::MiscLibrary()); + new CreatureLib::Battling::ExperienceLibrary(), scriptResolver, new PkmnLib::Battling::MiscLibrary()); scriptResolver->Initialize(lib); return lib; } @@ -66,10 +67,10 @@ public: auto lib = new PkmnLib::Library::NatureLibrary(); lib->LoadNature("neutralNature"_cnc, new PkmnLib::Library::Nature(PkmnLib::Library::Statistic::PhysicalAttack, - PkmnLib::Library::Statistic::PhysicalDefense, 1, 1)); + PkmnLib::Library::Statistic::PhysicalDefense, 1, 1)); lib->LoadNature("buffsAttackNerfsSpeed"_cnc, new PkmnLib::Library::Nature(PkmnLib::Library::Statistic::PhysicalAttack, - PkmnLib::Library::Statistic::Speed, 1.1, 0.9)); + PkmnLib::Library::Statistic::Speed, 1.1, 0.9)); return lib; } };