diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-08-03 20:51:16 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-08-03 20:51:16 +0000 |
| commit | 55772ba95bacafb30770fcddf422da5cdc8038d9 (patch) | |
| tree | 3d457d34ab466a289d13c29bbec0042097cac045 /crawl-ref/source/enum.h | |
| parent | 606e14406ef0ae5f12dccad44b6f0f0b3433f013 (diff) | |
| download | crawl-ref-55772ba95bacafb30770fcddf422da5cdc8038d9.tar.gz crawl-ref-55772ba95bacafb30770fcddf422da5cdc8038d9.zip | |
First part of godly changes.
Ely now has "Destroy Weapon" ability, and Trog "Burn Books".
The latter is very powerful as it explicitly allows burning
monsters, which is cool but might be too strong. I couldn't
think of a rationale for Trog not to allow this, though.
Also, all killings are now accepted without prayer, and
sacrifice-loving gods won't acccept rotten corpses anymore.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1959 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/enum.h')
| -rw-r--r-- | crawl-ref/source/enum.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index d9ed05cb3c..8a651cfeda 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -93,7 +93,7 @@ enum ability_type ABIL_YRED_CONTROL_UNDEAD, // 144 // 160 - reserved for Vehumet ABIL_OKAWARU_MIGHT = 170, // 170 - ABIL_OKAWARU_HEALING, + // Okawaru no longer heals (JPEG) ABIL_OKAWARU_HASTE, // 172 ABIL_MAKHLEB_MINOR_DESTRUCTION = 180, // 180 ABIL_MAKHLEB_LESSER_SERVANT_OF_MAKHLEB, @@ -101,9 +101,11 @@ enum ability_type ABIL_MAKHLEB_GREATER_SERVANT_OF_MAKHLEB, // 183 ABIL_SIF_MUNA_CHANNEL_ENERGY = 190, // 190 ABIL_SIF_MUNA_FORGET_SPELL, + ABIL_TROG_BURN_BOOKS, ABIL_TROG_BERSERK = 200, // 200 ABIL_TROG_MIGHT, ABIL_TROG_HASTE_SELF, // 202 + ABIL_ELYVILON_DESTROY_WEAPONS, ABIL_ELYVILON_LESSER_HEALING = 220, // 220 ABIL_ELYVILON_PURIFICATION, ABIL_ELYVILON_HEALING, @@ -780,15 +782,13 @@ enum conduct_type DID_STABBING, DID_POISON, DID_DEDICATED_BUTCHERY, - DID_DEDICATED_KILL_LIVING, - DID_DEDICATED_KILL_UNDEAD, - DID_DEDICATED_KILL_DEMON, - DID_DEDICATED_KILL_NATURAL_EVIL, // unused - DID_DEDICATED_KILL_WIZARD, - DID_DEDICATED_KILL_PRIEST, - - // [dshaligram] No distinction between killing Angels during prayer or - // otherwise, borrowed from bwr 4.1. + // killings need no longer be dedicated (JPEG) + DID_KILL_LIVING, + DID_KILL_UNDEAD, + DID_KILL_DEMON, + DID_KILL_NATURAL_EVIL, // unused + DID_KILL_WIZARD, + DID_KILL_PRIEST, DID_KILL_ANGEL, DID_LIVING_KILLED_BY_UNDEAD_SLAVE, DID_LIVING_KILLED_BY_SERVANT, |