Skip to content

Commit

Permalink
Prevent most (but not all) auras from affecting firewood (Sastreii)
Browse files Browse the repository at this point in the history
This was less obvious when the main aura being deployed was torpor snails
and thus players only saw them when a wand of charming or a scroll of
summoning got a friendly torpor snail to affect firewood. Now that
polterguardians can make rare V plants repel missiles and apises can
double the vigour of nearby Shoals or Holy Pan plants (yet not prevent them
from withering away entirely), this is conspicuous enough that it's now
disabled for most auras by default.

(The main exception here is for martyred shades, as Fedhas doesn't
complain about summoning ghosts these days and they definitely _should_ be
able to support player or enemy briar patches. For now, unless further
aura effects produce a second exception, said injury bond is the only one
that still affects firewood.)
  • Loading branch information
regret-index committed Sep 29, 2024
1 parent 437a092 commit 0e69982
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions crawl-ref/source/mon-aura.cc
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,13 @@ static bool _aura_could_affect(const mon_aura_data& aura, const monster& source,
if (mons_aligned(&source, &victim) == aura.is_hostile)
return false;

// Is the aura something that should affect firewood?
if (victim.is_monster() && mons_is_firewood(*victim.as_monster())
&& aura.ench_type != ENCH_INJURY_BOND)
{
return false;
}

// If the aura suppressed by sanctuary?
if (aura.is_hostile && (is_sanctuary(source.pos()) || is_sanctuary(victim.pos())))
return false;
Expand Down

0 comments on commit 0e69982

Please sign in to comment.