diff --git a/conanfile.py b/conanfile.py index 4272ce6..95ef4e8 100644 --- a/conanfile.py +++ b/conanfile.py @@ -44,7 +44,7 @@ class PkmnLibConan(ConanFile): self.options["AngelScript"].link_std_statically = True def requirements(self): - self.requires("CreatureLib/f3b5f9e8f929a10867512f71f54ff02448b58f5c@creaturelib/master") + self.requires("CreatureLib/428483e73d1c4ba33efbb49fa39fac36774d997d@creaturelib/master") if self.options.script_handler == "angelscript": self.requires("AngelScript/2.34@AngelScript/Deukhoofd") else: diff --git a/src/Battling/Battle/Battle.cpp b/src/Battling/Battle/Battle.cpp new file mode 100644 index 0000000..6a50a07 --- /dev/null +++ b/src/Battling/Battle/Battle.cpp @@ -0,0 +1 @@ +#include "Battle.hpp" diff --git a/src/Battling/Battle/Battle.hpp b/src/Battling/Battle/Battle.hpp new file mode 100644 index 0000000..bf14e28 --- /dev/null +++ b/src/Battling/Battle/Battle.hpp @@ -0,0 +1,16 @@ +#ifndef PKMNLIB_BATTLE_HPP +#define PKMNLIB_BATTLE_HPP + +#include +#include "../Library/BattleLibrary.hpp" + +namespace PkmnLib::Battling { + class Battle : CreatureLib::Battling::Battle { + public: + Battle(const BattleLibrary* library, const std::vector& parties, + bool canFlee = true, uint8_t numberOfSides = 2, uint8_t creaturesPerSide = 1) + : CreatureLib::Battling::Battle(library, parties, canFlee, numberOfSides, creaturesPerSide) {} + }; +} + +#endif // PKMNLIB_BATTLE_HPP diff --git a/src/ScriptResolving/AngelScript/TypeRegistry/BasicScriptClass.cpp b/src/ScriptResolving/AngelScript/TypeRegistry/BasicScriptClass.cpp index 5c82759..454e297 100644 --- a/src/ScriptResolving/AngelScript/TypeRegistry/BasicScriptClass.cpp +++ b/src/ScriptResolving/AngelScript/TypeRegistry/BasicScriptClass.cpp @@ -22,6 +22,7 @@ shared abstract class PkmnScript { void OnAfterHits(ExecutingMove@ attack, Pokemon@ target){}; void ModifyEffectChance(ExecutingMove@ attack, Pokemon@ target, uint16& chance){}; + void ModifyIncomingEffectChance(ExecutingMove@ attack, Pokemon@ target, uint16& chance){}; } )"); assert(r >= 0);