diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-09-03 12:07:34 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-09-03 12:07:34 +0000 |
| commit | 63199a9ac44a4e029eb1195554bf7bdc1142d442 (patch) | |
| tree | 0607510f5584759ef2485c83d85c0a1b2c4e4dc0 | |
| parent | e30f59c25855ee942926f0719ef7648b9b97ed31 (diff) | |
| download | crawl-ref-63199a9ac44a4e029eb1195554bf7bdc1142d442.tar.gz crawl-ref-63199a9ac44a4e029eb1195554bf7bdc1142d442.zip | |
r78@xenon: dshaligram | 2006-09-03 17:38:52 +051800
* Fixed vorpal brand not being displayed for daggers (and others)
* Fixed incorrect debug messages for god conducts
* Added kludge to load new-style ARM_CAP items as ARM_HELMET until ARM_CAP is
fully integrated.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@28 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/itemname.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 7 | ||||
| -rw-r--r-- | crawl-ref/source/tags.cc | 5 |
3 files changed, 16 insertions, 2 deletions
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index b1e31a277e..89c7441b45 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -484,6 +484,12 @@ static char item_name_2( const item_def &item, char buff[ITEMNAME_SIZE], case DVORP_CHOPPING: strncat(buff, (terse) ? " (chop)" : " of chopping", ITEMNAME_SIZE ); break; + case DVORP_SLASHING: + strncat(buff, (terse) ? " (slash)" : " of slashing", ITEMNAME_SIZE ); + break; + case DVORP_STABBING: + strncat(buff, (terse) ? " (stab)" : " of stabbing", ITEMNAME_SIZE ); + break; } break; diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 2cfd469994..d558c51ad8 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -1321,12 +1321,15 @@ bool did_god_conduct( int thing_done, int level ) { static const char *conducts[] = { + "", "Necromancy", "Unholy", "Attack Holy", "Attack Friend", "Friend Died", "Stab", "Poison", "Field Sacrifice", - "Kill Living", "Kill Undead", "Kill Demon", "Kill Wizard", + "Kill Living", "Kill Undead", "Kill Demon", "Kill Natural Evil", + "Kill Wizard", "Kill Priest", "Kill Angel", "Undead Slave Kill Living", "Servant Kill Living", "Servant Kill Undead", - "Servant Kill Demon", "Servant Kill Angel", + "Servant Kill Demon", "Servant Kill Natural Evil", + "Servant Kill Angel", "Spell Memorise", "Spell Cast", "Spell Practise", "Spell Nonutility", "Cards", "Stimulants", "Eat Meat", "Create Life" }; diff --git a/crawl-ref/source/tags.cc b/crawl-ref/source/tags.cc index 715fb01285..25e4382274 100644 --- a/crawl-ref/source/tags.cc +++ b/crawl-ref/source/tags.cc @@ -1668,6 +1668,11 @@ static void tag_read_level_items(struct tagHeader &th, char minorVersion) mitm[i].flags = (unsigned long) unmarshallLong(th); } + // [dshaligram] FIXME, remove this kludge when ARM_CAP is fully + // integrated. + if (mitm[i].base_type == OBJ_ARMOUR && mitm[i].sub_type == ARM_CAP) + mitm[i].sub_type = ARM_HELMET; + // pre 4.2 files had monster items stacked at (2,2) -- moved to (0,0) if (minorVersion < 2 && mitm[i].x == 2 && mitm[i].y == 2) { |