Skip to content

[Fix] Trusts not getting interrupted #10477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Xaver-DaRed merged 1 commit into from
Jul 3, 2026
Merged

[Fix] Trusts not getting interrupted #10477

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 26 additions & 19 deletions src/map/utils/battleutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1903,10 +1903,14 @@ auto CalculateTPFromDamageTaken(CBattleEntity* PAttacker, CBattleEntity* PDefend

bool TryInterruptSpell(CBattleEntity* PAttacker, CBattleEntity* PDefender, CSpell* PSpell)
{
// Exceptions.
if (PDefender->objtype == TYPE_TRUST || // Caster is a trust.
PDefender->StatusEffectContainer->HasStatusEffect(xi::StatusEffect::Manafont) || // Caster has Manafont.
(SKILLTYPE)PSpell->getSkillType() == SKILL_SINGING) // Spell is a song.
// Early return: Spell can't be interrupted.
if ((SKILLTYPE)PSpell->getSkillType() == SKILL_SINGING)
{
return false;
}

// Early return: Manafont prevents interruptions.
if (PDefender->StatusEffectContainer->HasStatusEffect(xi::StatusEffect::Manafont))
{
return false;
}
Expand Down Expand Up @@ -1962,26 +1966,29 @@ bool TryInterruptSpell(CBattleEntity* PAttacker, CBattleEntity* PDefender, CSpel
// SIRDRatio: No limits. Can be negative. A negative value will guarantee NOT being interrupted.
float finalRatio = levelRatio * skillRatio * SIRDRatio; // TL;DR Higher = Worse = More chances to get interrupted.

// You get interrupted. Handle aquaveil.
if (chance < finalRatio)
// Early return: You don't get interrupted.
if (chance >= finalRatio)
{
if (PDefender->StatusEffectContainer->HasStatusEffect(xi::StatusEffect::Aquaveil))
{
auto aquaCount = PDefender->StatusEffectContainer->GetStatusEffect(xi::StatusEffect::Aquaveil)->GetPower();
if (aquaCount - 1 == 0) // removes the status, but still prevents the interrupt
{
PDefender->StatusEffectContainer->DelStatusEffect(xi::StatusEffect::Aquaveil);
}
else
{
PDefender->StatusEffectContainer->GetStatusEffect(xi::StatusEffect::Aquaveil)->SetPower(aquaCount - 1);
}
return false;
}
return false;
}

// Early return: You can't prevent interruption via Aquaveil effect.
if (!PDefender->StatusEffectContainer->HasStatusEffect(xi::StatusEffect::Aquaveil))
{
return true;
}

// Handle aquaveil.
auto aquaCount = PDefender->StatusEffectContainer->GetStatusEffect(xi::StatusEffect::Aquaveil)->GetPower();
if (aquaCount - 1 == 0) // removes the status, but still prevents the interrupt
{
PDefender->StatusEffectContainer->DelStatusEffect(xi::StatusEffect::Aquaveil);
}
else
{
PDefender->StatusEffectContainer->GetStatusEffect(xi::StatusEffect::Aquaveil)->SetPower(aquaCount - 1);
}

return false;
}

Expand Down
Loading