diff options
author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-26 23:24:34 +0000 |
---|---|---|
committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-26 23:24:34 +0000 |
commit | f3b1762e5a7ce54cb41729e3d4cedf482c4a42e9 (patch) | |
tree | c30507d1b89fc4666967e913d39973c1c8b34bd9 /crawl-ref/source/beam.cc | |
parent | 07a3ce3ad486d8cbf07a1fda8b50a1d3d87b6143 (diff) | |
download | crawl-ref-f3b1762e5a7ce54cb41729e3d4cedf482c4a42e9.tar.gz crawl-ref-f3b1762e5a7ce54cb41729e3d4cedf482c4a42e9.zip |
* Fix Xom's interest wrapping around from 0 to 255. (!!!)
* In xom_acts, if Xom was bored (and now did something bad) reroll interest.
* Greatly decrease amusement derived from the player entering a new
level. (However, entering a new level via escape hatch or shaft is
REALLY amusing, more so the deeper the shaft.)
* Xom may be amused if you are caught in a net and there are hostile
monsters around.
* Fix draconian tiles not showing up correctly for Detect Creatures.
* Improve card descriptions output for Triple Draw/Stack Five.
* In inventory, add '&' hotkey for useless (== inedible) chunks.
Still needs documentation.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9557 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
-rw-r--r-- | crawl-ref/source/beam.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index f9fff73040..68977eecb5 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -3872,8 +3872,12 @@ void bolt::affect_player() // in item_use.cc. if (item->sub_type == MI_THROWING_NET) { - player_caught_in_net(); - was_affected = true; + if (player_caught_in_net()) + { + if (beam_source != NON_MONSTER) + xom_is_stimulated(64); + was_affected = true; + } } else if (item->special == SPMSL_CURARE) { |