summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/enum.h
diff options
context:
space:
mode:
authorDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-11-19 17:53:34 -0600
committerDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-11-19 18:15:26 -0600
commita6b73ff91760a1cbbc876b39861c0d1c60ab78c6 (patch)
tree72e95c5fbb2747bf126701a5dc4cace87ab6572b /crawl-ref/source/enum.h
parent240c45dd9d60430db8ac0a1dd3ac4da4a939662a (diff)
downloadcrawl-ref-a6b73ff91760a1cbbc876b39861c0d1c60ab78c6.tar.gz
crawl-ref-a6b73ff91760a1cbbc876b39861c0d1c60ab78c6.zip
Add comments to properly document certain god-specific conducts.
Diffstat (limited to 'crawl-ref/source/enum.h')
-rw-r--r--crawl-ref/source/enum.h50
1 files changed, 25 insertions, 25 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 2d19fba815..3e39f69df1 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -732,14 +732,14 @@ enum command_type
enum conduct_type
{
DID_NOTHING,
- DID_NECROMANCY = 1, // vamp/drain/pain wpns, Zong/Curses
- DID_HOLY, // holy wrath wpns, holy word scrolls
- DID_UNHOLY, // demon wpns, demon spells
+ DID_NECROMANCY = 1, // vamp/drain/pain/reap, Zong/Curses
+ DID_HOLY, // holy wrath, holy word scrolls
+ DID_UNHOLY, // demon weapons, demon spells
DID_ATTACK_HOLY,
DID_ATTACK_NEUTRAL,
DID_ATTACK_FRIEND,
DID_FRIEND_DIED,
- DID_STABBING,
+ DID_STABBING, // unused
DID_UNCHIVALRIC_ATTACK,
DID_POISON,
DID_DEDICATED_BUTCHERY,
@@ -747,42 +747,42 @@ enum conduct_type
DID_KILL_LIVING,
DID_KILL_UNDEAD,
DID_KILL_DEMON,
- DID_KILL_NATURAL_EVIL, // TSO
- DID_KILL_CHAOTIC, // Zin
- DID_KILL_WIZARD,
- DID_KILL_PRIEST,
+ DID_KILL_NATURAL_EVIL, // TSO
+ DID_KILL_CHAOTIC, // Zin
+ DID_KILL_WIZARD, // Trog
+ DID_KILL_PRIEST, // Beogh
DID_KILL_HOLY,
- DID_KILL_FAST, // Cheibriados
+ DID_KILL_FAST, // Cheibriados
DID_LIVING_KILLED_BY_UNDEAD_SLAVE,
DID_LIVING_KILLED_BY_SERVANT,
DID_UNDEAD_KILLED_BY_UNDEAD_SLAVE,
DID_UNDEAD_KILLED_BY_SERVANT,
DID_DEMON_KILLED_BY_UNDEAD_SLAVE,
DID_DEMON_KILLED_BY_SERVANT,
- DID_NATURAL_EVIL_KILLED_BY_SERVANT, // TSO
+ DID_NATURAL_EVIL_KILLED_BY_SERVANT, // TSO
DID_HOLY_KILLED_BY_UNDEAD_SLAVE,
DID_HOLY_KILLED_BY_SERVANT,
DID_SPELL_MEMORISE,
DID_SPELL_CASTING,
DID_SPELL_PRACTISE,
- DID_SPELL_NONUTILITY, // unused
+ DID_SPELL_NONUTILITY, // unused
DID_CARDS,
- DID_STIMULANTS, // unused
+ DID_STIMULANTS, // unused
DID_DRINK_BLOOD,
DID_CANNIBALISM,
- DID_EAT_MEAT, // unused
- DID_EAT_SOULED_BEING, // Zin
- DID_DELIBERATE_MUTATING, // Zin
- DID_CAUSE_GLOWING, // Zin
- DID_UNCLEAN, // Zin (used unclean weapon/magic)
- DID_CHAOS, // Zin (used chaotic weapon/magic)
- DID_DESECRATE_ORCISH_REMAINS, // Beogh
- DID_DESTROY_ORCISH_IDOL, // Beogh
- DID_CREATE_LIFE, // unused
- DID_KILL_SLIME, // Jiyva
- DID_KILL_PLANT, // Fedhas
- DID_ALLY_KILLED_PLANT, // Fedhas
- DID_HASTY, // Cheibriados
+ DID_EAT_MEAT, // unused
+ DID_EAT_SOULED_BEING, // Zin
+ DID_DELIBERATE_MUTATING, // Zin
+ DID_CAUSE_GLOWING, // Zin
+ DID_UNCLEAN, // Zin (used unclean weapon/magic)
+ DID_CHAOS, // Zin (used chaotic weapon/magic)
+ DID_DESECRATE_ORCISH_REMAINS, // Beogh
+ DID_DESTROY_ORCISH_IDOL, // Beogh
+ DID_CREATE_LIFE, // unused
+ DID_KILL_SLIME, // Jiyva
+ DID_KILL_PLANT, // Fedhas
+ DID_ALLY_KILLED_PLANT, // Fedhas
+ DID_HASTY, // Cheibriados
NUM_CONDUCTS
};