summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/enum.h
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-24 21:43:51 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2008-11-24 21:43:51 +0000
commit1c5dd2f5fa1e94a5f6017f391e4b1d192b7d706c (patch)
treebe0c9c397bb4428abc4aa148c687db16d14d8b5b /crawl-ref/source/enum.h
parent0e3ada71c222f6905af710f63177bbee83bd409b (diff)
downloadcrawl-ref-1c5dd2f5fa1e94a5f6017f391e4b1d192b7d706c.tar.gz
crawl-ref-1c5dd2f5fa1e94a5f6017f391e4b1d192b7d706c.zip
Clean up ability handling to display costs for prayer-activated
abilities (Zin's sustenance and Yred's injury mirror) in a less hackish way. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7593 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/enum.h')
-rw-r--r--crawl-ref/source/enum.h28
1 files changed, 15 insertions, 13 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index c8d8a95ba4..2d1d42a688 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -53,40 +53,42 @@ enum ability_type
ABIL_END_TRANSFORMATION, // 55
// Divine abilities
- ABIL_ZIN_RECITE = 110, // 110
+ ABIL_ZIN_SUSTENANCE = 109, // 109
+ ABIL_ZIN_RECITE,
ABIL_ZIN_VITALISATION,
ABIL_ZIN_SANCTUARY,
ABIL_TSO_DIVINE_SHIELD = 120, // 120
ABIL_TSO_CLEANSING_FLAME,
- ABIL_TSO_SUMMON_DIVINE_WARRIOR, // 122
+ ABIL_TSO_SUMMON_DIVINE_WARRIOR,
ABIL_KIKU_RECALL_UNDEAD_SLAVES = 130, // 130
- ABIL_KIKU_ENSLAVE_UNDEAD = 132, // 132
- ABIL_KIKU_INVOKE_DEATH, // 133
- ABIL_YRED_ANIMATE_REMAINS = 140, // 140
+ ABIL_KIKU_ENSLAVE_UNDEAD = 132,
+ ABIL_KIKU_INVOKE_DEATH,
+ ABIL_YRED_INJURY_MIRROR = 139,
+ ABIL_YRED_ANIMATE_REMAINS, // 140
ABIL_YRED_RECALL_UNDEAD,
ABIL_YRED_ANIMATE_DEAD,
ABIL_YRED_DRAIN_LIFE,
- ABIL_YRED_ENSLAVE_SOUL, // 144
+ ABIL_YRED_ENSLAVE_SOUL,
// 160 - reserved for Vehumet
ABIL_OKAWARU_MIGHT = 170, // 170
// Okawaru no longer heals (JPEG)
- ABIL_OKAWARU_HASTE = 172, // 172
+ ABIL_OKAWARU_HASTE = 172,
ABIL_MAKHLEB_MINOR_DESTRUCTION = 180, // 180
ABIL_MAKHLEB_LESSER_SERVANT_OF_MAKHLEB,
ABIL_MAKHLEB_MAJOR_DESTRUCTION,
- ABIL_MAKHLEB_GREATER_SERVANT_OF_MAKHLEB,// 183
+ ABIL_MAKHLEB_GREATER_SERVANT_OF_MAKHLEB,
ABIL_SIF_MUNA_CHANNEL_ENERGY = 190, // 190
ABIL_SIF_MUNA_FORGET_SPELL,
- ABIL_TROG_BURN_BOOKS = 199,
+ ABIL_TROG_BURN_SPELLBOOKS = 199,
ABIL_TROG_BERSERK = 200, // 200
ABIL_TROG_REGENERATION,
- ABIL_TROG_BROTHERS_IN_ARMS, // 202
+ ABIL_TROG_BROTHERS_IN_ARMS,
ABIL_ELYVILON_DESTROY_WEAPONS = 219,
ABIL_ELYVILON_LESSER_HEALING = 220, // 220
ABIL_ELYVILON_PURIFICATION,
ABIL_ELYVILON_GREATER_HEALING,
ABIL_ELYVILON_RESTORATION,
- ABIL_ELYVILON_DIVINE_VIGOUR, // 224
+ ABIL_ELYVILON_DIVINE_VIGOUR,
ABIL_LUGONU_ABYSS_EXIT, // 225
ABIL_LUGONU_BEND_SPACE,
ABIL_LUGONU_BANISH,
@@ -100,12 +102,12 @@ enum ability_type
ABIL_BEOGH_SMITING, // 235
ABIL_BEOGH_RECALL_ORCISH_FOLLOWERS,
- ABIL_CHARM_SNAKE, // 237
+ ABIL_CHARM_SNAKE, // 237
ABIL_TRAN_SERPENT_OF_HELL,
ABIL_ROTTING,
ABIL_TORMENT_II,
ABIL_TRAN_BAT,
- ABIL_RENOUNCE_RELIGION = 250 // 250
+ ABIL_RENOUNCE_RELIGION = 250 // 250
};
enum activity_interrupt_type