Skip to content

Commit

Permalink
Revert "Extinguish burning creatures in gas-obstructing tiles"
Browse files Browse the repository at this point in the history
This reverts commit 928f4cf. In playtesting,
the staff of obstruction was highlighted as a means of holding a monster in
place for killing with other staves, including firebolt. As this change was
quite significant for that area of gameplay, I considered it too much for
CE right now so I am reverting it.
  • Loading branch information
tmewett committed Nov 28, 2019
1 parent 324a5ad commit 436e75e
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
4 changes: 0 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ unreleased
-
The frequencies of various special ally-related rooms have been reverted
to their 1.7.4 values
-
Burning creatures are now extinguished when encased in a solid tile,
such as crystal from a staff of obstruction. (Does not apply to those
which burn unceasingly)
-
Wands of plenty now reduce the the maximum health of the target by 50%
before cloning
Expand Down
4 changes: 2 additions & 2 deletions src/brogue/Time.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,8 @@ void applyInstantTileEffectsToCreature(creature *monst) {
}
}

// Water and "solid" tiles (ones which gas cannot occupy) put out fire.
if ((cellHasTMFlag(*x, *y, TM_EXTINGUISHES_FIRE) || cellHasTerrainFlag(*x, *y, T_OBSTRUCTS_GAS))
// Water puts out fire.
if (cellHasTMFlag(*x, *y, TM_EXTINGUISHES_FIRE)
&& monst->status[STATUS_BURNING]
&& !monst->status[STATUS_LEVITATING]
&& !(monst->info.flags & MONST_ATTACKABLE_THRU_WALLS)
Expand Down

0 comments on commit 436e75e

Please sign in to comment.