diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-19 22:28:38 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-03-19 22:28:38 +0000 |
| commit | a56eea02ae7ce566af2baff5be396ddc15134735 (patch) | |
| tree | a10aefecf614ec03b4c08c7544814e15d4076102 /crawl-ref/source/hiscores.cc | |
| parent | dbea6550fa584e710e7788b95f1037a9ec344ba5 (diff) | |
| download | crawl-ref-a56eea02ae7ce566af2baff5be396ddc15134735.tar.gz crawl-ref-a56eea02ae7ce566af2baff5be396ddc15134735.zip | |
* For flavour, let Xom laugh himself silly whenever a follower dies.
* Fix Xom being amused about rotten corpses being butchered. (As opposed
to clean corpses becoming rotten while butchered, which is how it was
originally intended.)
* Xom no longer is amused if you deliberately hit yourself with a
missile/wand/spell in safe surroundings. (Identifying wands that way
or zapping /random effects is still considered amusing.)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9519 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/hiscores.cc')
| -rw-r--r-- | crawl-ref/source/hiscores.cc | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/crawl-ref/source/hiscores.cc b/crawl-ref/source/hiscores.cc index 587b48741a..1b5eb95249 100644 --- a/crawl-ref/source/hiscores.cc +++ b/crawl-ref/source/hiscores.cc @@ -307,8 +307,8 @@ static const char *const _range_type_verb( const char *const aux ) if (strncmp( aux, "Shot ", 5 ) == 0) // launched return ("shot"); else if (aux[0] == 0 // unknown - || strncmp( aux, "Hit ", 4 ) == 0 // thrown - || strncmp( aux, "volley ", 7 ) == 0) // manticore spikes + || strncmp( aux, "Hit ", 4 ) == 0 // thrown + || strncmp( aux, "volley ", 7 ) == 0) // manticore spikes { return ("hit from afar"); } @@ -427,7 +427,7 @@ static const char *kill_method_names[] = "wild_magic", "xom", "statue", "rotting", "targeting", "spore", "tso_smiting", "petrification", "unknown", "something", "falling_down_stairs", "acid", "curare", "melting", "bleeding", - "beogh_smiting", "divine_wrath", "bounce", "reflect" + "beogh_smiting", "divine_wrath", "bounce", "reflect", "self_aimed" }; const char *kill_method_name(kill_method_type kmt) @@ -1676,6 +1676,20 @@ std::string scorefile_entry::death_description(death_desc_verbosity verbosity) needs_damage = true; break; + case KILLED_BY_SELF_AIMED: + if (terse) + desc += "suicidal targeting"; + else + { + desc += "Shot themselves with a "; + if (auxkilldata.empty()) + desc += "beam"; + else + desc += auxkilldata; + } + needs_damage = true; + break; + case KILLED_BY_SPORE: if (terse) { |