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

Implements Attack Use event.
continuous-integration/drone/push Build is passing Details 

Signed-off-by: Deukhoofd <Deukhoofd@gmail.com>
This commit is contained in:
Deukhoofd 2020-08-14 14:00:41 +02:00
parent 64b08d4ff0
commit 5536a6b83d
Signed by: Deukhoofd
GPG Key ID: F63E044490819F6F
4 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Battling/EventHooks/EventDataClasses.hpp
View File

@ -1,6 +1,7 @@
#ifndef CREATURELIB_EVENTDATACLASSES_HPP #ifndef CREATURELIB_EVENTDATACLASSES_HPP
#define CREATURELIB_EVENTDATACLASSES_HPP #define CREATURELIB_EVENTDATACLASSES_HPP
#include "Events/AttackUseEvent.hpp"
#include "Events/ChangeSpeciesEvent.hpp" #include "Events/ChangeSpeciesEvent.hpp"
#include "Events/ChangeVariantEvent.hpp" #include "Events/ChangeVariantEvent.hpp"
#include "Events/DamageEvent.hpp" #include "Events/DamageEvent.hpp"

2
src/Battling/EventHooks/EventDataKind.hpp
View File

@ -4,7 +4,7 @@
namespace CreatureLib::Battling { namespace CreatureLib::Battling {
ENUM(EventDataKind, uint8_t, Damage, Heal, Faint, Switch, TurnStart, TurnEnd, ExperienceGain, Miss, DisplayText, ENUM(EventDataKind, uint8_t, Damage, Heal, Faint, Switch, TurnStart, TurnEnd, ExperienceGain, Miss, DisplayText,
ChangeSpecies, ChangeVariant) ChangeSpecies, ChangeVariant, AttackUse)
} }
#endif // CREATURELIB_EVENTDATAKIND_HPP #endif // CREATURELIB_EVENTDATAKIND_HPP

16
src/Battling/EventHooks/Events/AttackUseEvent.hpp Normal file
View File

@ -0,0 +1,16 @@
#ifndef CREATURELIB_ATTACKUSEEVENT_HPP
#define CREATURELIB_ATTACKUSEEVENT_HPP
#include "EventData.hpp"
namespace CreatureLib::Battling {
class AttackUseEvent : public EventData {
ArbUt::BorrowedPtr<ExecutingAttack> _attack;
public:
AttackUseEvent(const ArbUt::BorrowedPtr<ExecutingAttack>& attack) noexcept : _attack(attack) {}
EventDataKind GetKind() const noexcept override { return EventDataKind ::AttackUse; }
const ArbUt::BorrowedPtr<ExecutingAttack>& GetAttack() const noexcept { return _attack; }
};
}
#endif // CREATURELIB_ATTACKUSEEVENT_HPP

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

@ -82,9 +82,9 @@ void TurnHandler::ExecuteAttackChoice(ArbUt::BorrowedPtr<AttackTurnChoice> choic
TargetResolver::ResolveTargets(choice->GetTarget(), targetType, choice->GetUser()->GetBattle()); TargetResolver::ResolveTargets(choice->GetTarget(), targetType, choice->GetUser()->GetBattle());
, "Exception during target determination"); , "Exception during target determination");
auto attack = ExecutingAttack(targets, 1, choice->GetUser(), choice->GetAttack(), choice->GetAttackScript()); auto attack = new ExecutingAttack(targets, 1, choice->GetUser(), choice->GetAttack(), choice->GetAttackScript());
bool prevented = false; bool prevented = false;
HOOK_LOCAL(PreventAttack, attack, &attack, &prevented); HOOK(PreventAttack, attack, attack, &prevented);
if (prevented) { if (prevented) {
return; return;
} }
@ -95,25 +95,29 @@ void TurnHandler::ExecuteAttackChoice(ArbUt::BorrowedPtr<AttackTurnChoice> choic
return; return;
} }
attack->GetUser()->GetBattle()->TriggerEventListener<AttackUseEvent>(attack);
// HOOK: check if attack fails // HOOK: check if attack fails
bool fail = false; bool fail = false;
HOOK_LOCAL(FailAttack, attack, &attack, &fail); HOOK(FailAttack, attack, attack, &fail);
if (fail) { if (fail) {
// TODO: Fail handling. // TODO: Fail handling.
return; return;
} }
bool stopBeforeAttack = false; bool stopBeforeAttack = false;
HOOK_LOCAL(StopBeforeAttack, attack, &attack, &stopBeforeAttack); HOOK(StopBeforeAttack, attack, attack, &stopBeforeAttack);
if (stopBeforeAttack) { if (stopBeforeAttack) {
return; return;
} }
HOOK_LOCAL(OnBeforeAttack, attack, &attack); HOOK(OnBeforeAttack, attack, attack);
for (uint8_t i = 0; i < attack.GetTargetCount(); i++) { for (uint8_t i = 0; i < attack->GetTargetCount(); i++) {
auto target = attack.GetTargets()[i]; auto target = attack->GetTargets()[i];
try_creature(HandleAttackForTarget(&attack, target), "Exception occurred during handling attack for target"); try_creature(HandleAttackForTarget(attack, target), "Exception occurred during handling attack for target");
} }
delete attack;
} }
void TurnHandler::HandleAttackForTarget(ExecutingAttack* attack, const ArbUt::BorrowedPtr<Creature>& target) { void TurnHandler::HandleAttackForTarget(ExecutingAttack* attack, const ArbUt::BorrowedPtr<Creature>& target) {