summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/hiscores.cc
diff options
context:
space:
mode:
authorSteve Melenchuk <smelenchuk@gmail.com>2014-01-14 20:58:51 -0700
committerSteve Melenchuk <smelenchuk@gmail.com>2014-01-14 20:58:51 -0700
commit58d5a39bc2126cac1d1ab9d5ac839827b2ed8817 (patch)
treebee6e8e68d33a4fb3a574591f3088fddc13a5851 /crawl-ref/source/hiscores.cc
parent958ac0acf9b4b4ad0ada5a88a9bbbe95efdb5bea (diff)
parent7782a6fd92d933f96a52a1a65da7c47dafd612d2 (diff)
downloadcrawl-ref-58d5a39bc2126cac1d1ab9d5ac839827b2ed8817.tar.gz
crawl-ref-58d5a39bc2126cac1d1ab9d5ac839827b2ed8817.zip
Merge branch 'shadow-god'
With bugfixes and more general balancing out of the way, and with the generally positive reception this has had to this point, it's time for fine-tuning the balance by way of the widespread feedback bringing this to trunk will yield.
Diffstat (limited to 'crawl-ref/source/hiscores.cc')
-rw-r--r--crawl-ref/source/hiscores.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/hiscores.cc b/crawl-ref/source/hiscores.cc
index 0b56a66623..4dbd88cccc 100644
--- a/crawl-ref/source/hiscores.cc
+++ b/crawl-ref/source/hiscores.cc
@@ -1214,6 +1214,9 @@ void scorefile_entry::init_death_cause(int dam, int dsrc,
if (death || you.can_see(mons))
death_source_name = mons->full_name(desc, true);
+ if (mons->mid == MID_PLAYER)
+ death_source_name = "their own shadow"; // heh
+
if (death && mons->type == MONS_MARA_FAKE)
death_source_name = "an illusion of Mara";
@@ -1551,7 +1554,7 @@ void scorefile_entry::init(time_t dt)
STATUS_REGENERATION,
STATUS_SICK,
STATUS_SPEED,
- DUR_INVIS,
+ STATUS_INVISIBLE,
DUR_POISONING,
STATUS_MISSILES,
DUR_SURE_BLADE,