[Bug Fix] EntityList::AESpell fix for Pacify / Mez (#1354)

* [Bug Fix] EntityList::AESpell fix for Pacify / Mez

this fixes AE pacify / Mez spells only landing on 4 when it shouldn't have a cap

* Update effects.cpp

added constants

* Update effects.cpp

opmization thanks to @mackal

* Update effects.cpp

this fixes the unlimited issue

* added Spells:AOEMaxTargets to rules

incase a server doesn't want there to be a absolute unlimited AOE targeting for spells

* Update ruletypes.h
This commit is contained in:
Dencelle
2021-05-15 16:33:45 -05:00
committed by GitHub
parent c1c2d7b302
commit a59ffc6e6b
2 changed files with 3 additions and 2 deletions
+2 -2
View File
@@ -784,14 +784,14 @@ void EntityList::AESpell(
/**
* Max AOE targets
*/
int max_targets_allowed = 0; // unlimited
int max_targets_allowed = RuleI(Range, AOEMaxTargets); // unlimited
if (max_targets) { // rains pass this in since they need to preserve the count through waves
max_targets_allowed = *max_targets;
}
else if (spells[spell_id].aemaxtargets) {
max_targets_allowed = spells[spell_id].aemaxtargets;
}
else if (IsTargetableAESpell(spell_id) && is_detrimental_spell && !is_npc) {
else if (IsTargetableAESpell(spell_id) && is_detrimental_spell && !is_npc && !IsEffectInSpell(spell_id, SE_Lull) && !IsEffectInSpell(spell_id, SE_Mez)) {
max_targets_allowed = 4;
}