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

Update to latest CreatureLib.
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Deukhoofd
2020-04-23 23:31:17 +02:00
parent c6a4c87d47
commit 330a24c493
3 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/Battling/Library/MiscLibrary.cpp
View File

@@ -20,28 +20,6 @@ bool PkmnLib::Battling::MiscLibrary::CanFlee(CreatureLib::Battling::FleeTurnChoi
return CreatureLib::Battling::MiscLibrary::CanFlee(switchChoice);
}
static CreatureLib::Battling::LearnedAttack* replacementAttack = nullptr;
static PkmnLib::Library::MoveData* replacementMove = nullptr;
static PkmnLib::Library::MoveData* GetReplacementAttackData() {
if (replacementMove == nullptr) {
replacementMove =
new PkmnLib::Library::MoveData("struggle"_cnc, 0, PkmnLib::Library::MoveCategory::Physical, 50, 255, 10,
CreatureLib::Library::AttackTarget::Any, 0,
new CreatureLib::Library::SecondaryEffect(-1, "struggle"_cnc, {}), {});
}
return replacementMove;
}
static CreatureLib::Battling::LearnedAttack* GetReplacementAttack() {
if (replacementAttack == nullptr) {
replacementAttack = new PkmnLib::Battling::LearnedMove(GetReplacementAttackData(),
CreatureLib::Battling::AttackLearnMethod::Unknown);
}
replacementAttack->RestoreAllUses();
return replacementAttack;
}
CreatureLib::Battling::BaseTurnChoice*
PkmnLib::Battling::MiscLibrary::ReplacementAttack(CreatureLib::Battling::Creature* user,
CreatureLib::Battling::CreatureIndex target) const {