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

Changed my mind about some parameter naming to be clearer.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
Deukhoofd 2021-11-21 10:47:16 +01:00
parent 44dbb5601f
commit 54eddba913
Signed by: Deukhoofd
GPG Key ID: F63E044490819F6F
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,9 +224,9 @@ void TurnHandler::HandleAttackForTarget(ExecutingAttack* attack, const ArbUt::Bo
auto effectiveness = typeLibrary->GetEffectiveness(hitType, target->GetTypes());
HOOK(ChangeEffectiveness, attack, attack, target.GetRaw(), hitIndex, &effectiveness)
hit.SetEffectiveness(effectiveness);
bool canBeCritical = true;
HOOK(BlockCritical, attack, attack, target.GetRaw(), hitIndex, &canBeCritical);
if (canBeCritical) {
bool blockCritical = true;
HOOK(BlockCritical, attack, attack, target.GetRaw(), hitIndex, &blockCritical);
if (!blockCritical) {
hit.SetCritical(miscLibrary->IsCritical(attack, target.GetRaw(), hitIndex));
} else {
hit.SetCritical(false);

2
src/Battling/ScriptHandling/BattleScript.hpp
View File

@ -63,7 +63,7 @@ namespace CreatureLib::Battling {
virtual void ChangeEffectiveness([[maybe_unused]] ExecutingAttack* attack, [[maybe_unused]] Creature* target,
[[maybe_unused]] u8 hitNumber, [[maybe_unused]] float* effectiveness){};
virtual void BlockCritical([[maybe_unused]] ExecutingAttack* attack, [[maybe_unused]] Creature* target,
[[maybe_unused]] u8 hitNumber, [[maybe_unused]] bool* canBeCritical){};
[[maybe_unused]] u8 hitNumber, [[maybe_unused]] bool* blockCritical){};
virtual void OverrideBasePower([[maybe_unused]] ExecutingAttack* attack, [[maybe_unused]] Creature* target,
[[maybe_unused]] u8 hitIndex, [[maybe_unused]] u8* basePower){};