diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-30 12:31:12 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-12-30 12:31:12 +0000 |
| commit | 3aa8f2c3c6a065779bdb64db863fbb4fcf8102c8 (patch) | |
| tree | be2729a1a305593cf6562b3aa9b76e81c01a899b /crawl-ref/source/beam.cc | |
| parent | beac344a52eafddd8a3ae1d67635773cf9216325 (diff) | |
| download | crawl-ref-3aa8f2c3c6a065779bdb64db863fbb4fcf8102c8.tar.gz crawl-ref-3aa8f2c3c6a065779bdb64db863fbb4fcf8102c8.zip | |
* Fix charge/enchantment description leaking information about
unidentified items.
* Add two new inscriptions: {fully charged} and {tried on item}
* Add freshness to default sort_menus (sorting chunks by age)
One question: Is it guaranteed that artefacts (of any type) will have
different descriptions than ego items?
If so, we should probably display the "This is an ancient artefact. It
cannot be modified by any means. It may have hidden properties" text for
unidentified ones.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8030 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/beam.cc')
| -rw-r--r-- | crawl-ref/source/beam.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crawl-ref/source/beam.cc b/crawl-ref/source/beam.cc index 394760c4ce..99b1e1b0ab 100644 --- a/crawl-ref/source/beam.cc +++ b/crawl-ref/source/beam.cc @@ -3490,7 +3490,8 @@ bool bolt::misses_player() return (false); } -void bolt::affect_player_enchantment() { +void bolt::affect_player_enchantment() +{ if ((has_saving_throw() || flavour == BEAM_POLYMORPH) && you_resist_magic(ench_power)) { @@ -4606,9 +4607,9 @@ bool _ench_flavour_affects_monster(beam_type flavour, const monsters* mon) break; case BEAM_SLEEP: - rc = !mon->has_ench(ENCH_SLEEP_WARY) // slept recently - && mons_holiness(mon) == MH_NATURAL // no unnatural - && mons_res_cold(mon) <= 0; // can't be hibernated + rc = !mon->has_ench(ENCH_SLEEP_WARY) // slept recently + && mons_holiness(mon) == MH_NATURAL // no unnatural + && mons_res_cold(mon) <= 0; // can't be hibernated break; default: |