From 7f702488368fab187abe792b5e866aaea5d82eae Mon Sep 17 00:00:00 2001 From: Lucy <44952533+Skyliegirl33@users.noreply.github.com> Date: Mon, 6 Mar 2023 23:04:30 +0100 Subject: [PATCH] Check statuses to determine valid lut entry --- src/world/Action/Action.cpp | 3 ++- src/world/Action/ActionLut.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp index d78ebe2e..c522015d 100644 --- a/src/world/Action/Action.cpp +++ b/src/world/Action/Action.cpp @@ -864,7 +864,8 @@ Entity::CharaPtr Action::Action::getHitChara() bool Action::Action::hasValidLutEntry() const { return m_lutEntry.potency != 0 || m_lutEntry.comboPotency != 0 || m_lutEntry.flankPotency != 0 || m_lutEntry.frontPotency != 0 || - m_lutEntry.rearPotency != 0 || m_lutEntry.curePotency != 0 || m_lutEntry.restoreMPPercentage != 0; + m_lutEntry.rearPotency != 0 || m_lutEntry.curePotency != 0 || m_lutEntry.restoreMPPercentage != 0 || + m_lutEntry.statuses.caster.size() > 0 || m_lutEntry.statuses.target.size() > 0; } Action::EffectBuilderPtr Action::Action::getEffectbuilder() diff --git a/src/world/Action/ActionLut.cpp b/src/world/Action/ActionLut.cpp index 38746ca9..69824c43 100644 --- a/src/world/Action/ActionLut.cpp +++ b/src/world/Action/ActionLut.cpp @@ -15,7 +15,8 @@ bool ActionLut::validEntryExists( uint16_t actionId ) // if all of the fields are 0, it's not 'valid' due to parse error or no useful data in the tooltip return entry.potency != 0 || entry.comboPotency != 0 || entry.flankPotency != 0 || entry.frontPotency != 0 || - entry.rearPotency != 0 || entry.curePotency != 0; + entry.rearPotency != 0 || entry.curePotency != 0 || + entry.statuses.caster.size() > 0 || entry.statuses.target.size() > 0; } const ActionEntry& ActionLut::getEntry( uint16_t actionId )