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>2009-06-27 17:04:31 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-06-27 17:04:31 +0000
commit1be101fd1fc43a252cdc4debf475edf0c6dba81b (patch)
tree13e5c780e21268c06bb28c48994f934e906ee62e /crawl-ref/source/enum.h
parent39e1fb93fe8332c69e55c4364d28091a02d52ad5 (diff)
downloadcrawl-ref-1be101fd1fc43a252cdc4debf475edf0c6dba81b.tar.gz
crawl-ref-1be101fd1fc43a252cdc4debf475edf0c6dba81b.zip
Apply patch by Adam Borowski, introducing new unique enchantress Kirke.
This includes a new transformation TRAN_PIG that the player can not end at will but rather will have to time out. Pigs (or rather hogs) are fast but cannot use any equipment except amulets, or cast spells. If the transformation would cause death by stat loss (due to equipment loss) the player is paralysed instead. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10061 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/enum.h')
-rw-r--r--crawl-ref/source/enum.h22
1 files changed, 13 insertions, 9 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index 42cb62cc1f..67d799ef05 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -235,30 +235,31 @@ enum beam_type // beam[].flavour
BEAM_BLINK,
BEAM_PETRIFY,
BEAM_BACKLIGHT,
- BEAM_SLEEP, // 45
+ BEAM_PORKALATOR, // 45
+ BEAM_SLEEP,
BEAM_LAST_ENCHANTMENT = BEAM_SLEEP,
// new beams for evaporate
BEAM_POTION_STINKING_CLOUD,
BEAM_POTION_POISON,
BEAM_POTION_MIASMA,
- BEAM_POTION_STEAM,
- BEAM_POTION_FIRE, // 50
+ BEAM_POTION_STEAM, // 50
+ BEAM_POTION_FIRE,
BEAM_POTION_COLD,
BEAM_POTION_BLACK_SMOKE,
BEAM_POTION_GREY_SMOKE,
- BEAM_POTION_BLUE_SMOKE,
- BEAM_POTION_PURP_SMOKE, // 55
+ BEAM_POTION_BLUE_SMOKE, // 55
+ BEAM_POTION_PURP_SMOKE,
BEAM_POTION_RANDOM,
BEAM_LAST_REAL = BEAM_POTION_RANDOM,
// For getting the visual effect of a beam.
- BEAM_VISUAL, // 57
+ BEAM_VISUAL,
BEAM_TORMENT_DAMAGE, // Pseudo-beam for damage flavour.
BEAM_FIRST_PSEUDO = BEAM_TORMENT_DAMAGE,
- BEAM_STEAL_FOOD, // 59: Pseudo-beam for harpies stealing food.
+ BEAM_STEAL_FOOD, // 60: Pseudo-beam for harpies stealing food.
NUM_BEAMS
};
@@ -2018,6 +2019,7 @@ enum monster_type // (int) menv[].type
MONS_NESSOS,
MONS_LERNAEAN_HYDRA,
MONS_DISSOLUTION, // 460
+ MONS_KIRKE,
// Testing monsters
MONS_TEST_SPAWNER,
@@ -2222,6 +2224,7 @@ enum mon_spellbook_type
MST_ILSUIW,
MST_PRINCE_RIBBIT, // 145
MST_NESSOS,
+ MST_KIRKE,
MST_GERYON = 150,
MST_DISPATER,
MST_ASMODEUS,
@@ -2808,9 +2811,10 @@ enum spell_type
SPELL_FIRE_BREATH,
SPELL_COLD_BREATH, // 195
SPELL_DRACONIAN_BREATH,
- SPELL_WATER_ELEMENTALS, // 197
+ SPELL_WATER_ELEMENTALS,
+ SPELL_PORKALATOR, // 198
- NUM_SPELLS // 198
+ NUM_SPELLS // 199
};
enum slot_select_mode