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

Set data for executing attacks.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2019-11-24 11:06:51 +01:00
parent 583bde3768
commit aa356d74d7
Signed by: Deukhoofd
GPG Key ID: ADF2E9256009EDCE
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Battling/Flow/TurnHandler.cpp
View File

@ -62,8 +62,12 @@ void TurnHandler::ExecuteAttackChoice(AttackTurnChoice *choice) {
//TODO: Change attack
}
// FIXME: Resolve all targets
auto target = choice->GetUser()->GetBattle()->GetTarget(choice->GetTarget());
std::vector<Creature*> targets = {target};
//TODO: Set ExecutingAttack data
auto attack = new ExecutingAttack();
auto attack = new ExecutingAttack(targets, 1, choice->GetUser(), choice->GetAttack(), choice->GetAttackScript());
bool prevented = false;
HOOK(PreventAttack, attack, attack, prevented);
if (prevented){

10
src/Battling/Models/ExecutingAttack.hpp
View File

@ -67,6 +67,16 @@ namespace CreatureLib::Battling {
LearnedAttack* _attack;
Script* _script;
public:
ExecutingAttack(const std::vector<Creature*>& targets, uint8_t numberHits, Creature* user, LearnedAttack* attack,
Script* script)
: _user(user), _attack(attack), _script(script)
{
_targets.reserve(targets.size());
for (auto target: targets){
_targets.insert({target, TargetData(numberHits)});
}
}
virtual ~ExecutingAttack() = default;
TargetData& GetAttackDataForTarget(Creature* creature){

4
src/Battling/TurnChoices/AttackTurnChoice.hpp
View File

@ -31,6 +31,10 @@ namespace CreatureLib::Battling{
return _target;
}
Script* GetAttackScript(){
return _attackScript;
}
protected:
void GetActiveScripts(std::vector<ScriptWrapper> &scripts) override {
scripts.emplace_back(&_attackScript);