summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/enum.h
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-01-24 23:58:22 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-01-24 23:58:22 +0000
commit54022e5775e364b6be880373b9603f9094f20525 (patch)
treed86a1de4058cdc3941674bddb0ed72afc7868529 /crawl-ref/source/enum.h
parent41d70af6d353eb5f2da26f908fb75e02e1e9af57 (diff)
downloadcrawl-ref-54022e5775e364b6be880373b9603f9094f20525.tar.gz
crawl-ref-54022e5775e364b6be880373b9603f9094f20525.zip
Remove GLAMOUR, and introduce RECITE (new Zin invocation)
The latter is a work in progress and may have strange results. It is intended as a multiturn invocation that is interrupted by large hp losses. IMHO, reciting things is an action that needs to take several turns. Each turn an attempt at influencing intelligent monsters is made. They usually fall asleep, are confused or turn berserk. The delay gets cancelled when the player is heavily wounded or when there are no impressionable monsters around anymore. I think the power formula will have to be tweaked. Comments welcome! git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3321 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/enum.h')
-rw-r--r--crawl-ref/source/enum.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index c70edd1b95..fd5f87287d 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -36,7 +36,6 @@ enum ability_type
{
ABIL_NON_ABILITY = -1,
ABIL_SPIT_POISON = 1, // 1
- ABIL_GLAMOUR,
ABIL_MAPPING,
ABIL_TELEPORTATION,
ABIL_BREATHE_FIRE, // 5
@@ -75,7 +74,8 @@ enum ability_type
ABIL_END_TRANSFORMATION, // 55
// Divine abilities
- ABIL_ZIN_SMITING = 110, // 110
+ ABIL_ZIN_RECITE = 110, // 110
+ ABIL_ZIN_SMITING,
ABIL_ZIN_REVITALISATION,
ABIL_ZIN_SANCTUARY,
ABIL_TSO_REPEL_UNDEAD = 120, // 120
@@ -704,6 +704,7 @@ enum delay_type
DELAY_MULTIDROP,
DELAY_ASCENDING_STAIRS,
DELAY_DESCENDING_STAIRS,
+ DELAY_RECITE, // Zin's Recite invocation
// [dshaligram] Shift-running, resting, travel and macros are now
// also handled as delays.
@@ -1075,7 +1076,6 @@ enum duration_type
DUR_SEE_INVISIBLE,
DUR_WEAPON_BRAND, // general "branding" spell counter
DUR_SILENCE,
- DUR_GLAMOUR,
DUR_CONDENSATION_SHIELD,
DUR_STONESKIN,
DUR_REPEL_UNDEAD,
@@ -1122,6 +1122,7 @@ enum enchant_type
ENCH_FATIGUE, // Post-berserk fatigue.
ENCH_HELD, // caught in a net
ENCH_BATTLE_FRENZY, // Monster is in a battle frenzy
+ ENCH_NEUTRAL,
NUM_ENCHANTMENTS
};
@@ -2512,7 +2513,6 @@ enum spell_type
SPELL_BEND,
SPELL_BACKLIGHT,
SPELL_INTOXICATE, // confusion but only "smart" creatures
- SPELL_GLAMOUR, // charm/confuse/sleep but only "smart" creatures 190
SPELL_EVAPORATE, // turn a potion into a cloud
SPELL_ERINGYAS_SURPRISING_BOUQUET, // turn sticks into herbivore food
SPELL_FRAGMENTATION, // replacement for "orb of frag"