summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/enum.h
diff options
context:
space:
mode:
authorDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-11-19 18:02:42 -0600
committerDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-11-19 18:15:26 -0600
commit0b00d0d2282f9572320a647c30d8334020fce6f6 (patch)
tree636046cf36a2371b8623fb0779348a3a07d0fa48 /crawl-ref/source/enum.h
parentf9f2105b119464e055df7999096593fa105ed5ea (diff)
downloadcrawl-ref-0b00d0d2282f9572320a647c30d8334020fce6f6.tar.gz
crawl-ref-0b00d0d2282f9572320a647c30d8334020fce6f6.zip
Split the kill-natural-unholy/evil and kill-unclean/chaotic conducts.
Diffstat (limited to 'crawl-ref/source/enum.h')
-rw-r--r--crawl-ref/source/enum.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 3e39f69df1..8bd163a786 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -747,7 +747,9 @@ enum conduct_type
DID_KILL_LIVING,
DID_KILL_UNDEAD,
DID_KILL_DEMON,
+ DID_KILL_NATURAL_UNHOLY, // TSO
DID_KILL_NATURAL_EVIL, // TSO
+ DID_KILL_UNCLEAN, // Zin
DID_KILL_CHAOTIC, // Zin
DID_KILL_WIZARD, // Trog
DID_KILL_PRIEST, // Beogh
@@ -759,6 +761,7 @@ enum conduct_type
DID_UNDEAD_KILLED_BY_SERVANT,
DID_DEMON_KILLED_BY_UNDEAD_SLAVE,
DID_DEMON_KILLED_BY_SERVANT,
+ DID_NATURAL_UNHOLY_KILLED_BY_SERVANT, // TSO
DID_NATURAL_EVIL_KILLED_BY_SERVANT, // TSO
DID_HOLY_KILLED_BY_UNDEAD_SLAVE,
DID_HOLY_KILLED_BY_SERVANT,