Upgrade CreatureLib, added basic Battle class, as we'll use it later on/
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2020-02-16 17:50:16 +01:00
parent 62eaf24f31
commit 30c3c5f405
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
4 changed files with 19 additions and 1 deletions

View File

@ -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:

View File

@ -0,0 +1 @@
#include "Battle.hpp"

View File

@ -0,0 +1,16 @@
#ifndef PKMNLIB_BATTLE_HPP
#define PKMNLIB_BATTLE_HPP
#include <CreatureLib/Battling/Models/Battle.hpp>
#include "../Library/BattleLibrary.hpp"
namespace PkmnLib::Battling {
class Battle : CreatureLib::Battling::Battle {
public:
Battle(const BattleLibrary* library, const std::vector<CreatureLib::Battling::BattleParty>& parties,
bool canFlee = true, uint8_t numberOfSides = 2, uint8_t creaturesPerSide = 1)
: CreatureLib::Battling::Battle(library, parties, canFlee, numberOfSides, creaturesPerSide) {}
};
}
#endif // PKMNLIB_BATTLE_HPP

View File

@ -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);