diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-02-14 12:13:03 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-02-14 12:13:03 +0000 |
| commit | b12baff21ddd117bc4ca6cf0e8abfa42ec53177b (patch) | |
| tree | c4bc1a449d2166ecbca0ed34e882d2bb3c7ffcc8 /crawl-ref/source/religion.cc | |
| parent | c71960644c0d905e02565dfe5ab87a4e7a49ee2e (diff) | |
| download | crawl-ref-b12baff21ddd117bc4ca6cf0e8abfa42ec53177b.tar.gz crawl-ref-b12baff21ddd117bc4ca6cf0e8abfa42ec53177b.zip | |
Fix 1893419: Add "kill neutral" to debugging list.
Fix 1893422: Move tutorial just_triggered information at beginning of
learned_something_new() etc. code.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3436 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/religion.cc')
| -rw-r--r-- | crawl-ref/source/religion.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index 9ab03c81be..0508f22c25 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -1664,8 +1664,8 @@ bool did_god_conduct( conduct_type thing_done, int level, bool known, "Friend Died", "Stab", "Poison", "Field Sacrifice", "Kill Living", "Kill Undead", "Kill Demon", "Kill Natural Evil", "Kill Mutator Or Rotter", "Kill Wizard", "Kill Priest", - "Kill Angel", "Undead Slave Kill Living", "Servant Kill Living", - "Servant Kill Undead", "Servant Kill Demon", + "Kill Angel", "Kill Neutral", "Undead Slave Kill Living", + "Servant Kill Living", "Servant Kill Undead", "Servant Kill Demon", "Servant Kill Natural Evil", "Servant Kill Angel", "Spell Memorise", "Spell Cast", "Spell Practise", "Spell Nonutility", "Cards", "Stimulants", "Drink Blood", "Cannibalism", "Eat Meat", |