diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-17 16:15:20 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-17 16:15:20 +0000 |
| commit | e06f39be1017c28488a0ca4b61bb9962ad5ee196 (patch) | |
| tree | 1c07d339c478cf73db6e03febda70d3023782d20 /crawl-ref/source/enum.h | |
| parent | 58fadd8bee0e04b270522f5024bb2777ea1fb66d (diff) | |
| download | crawl-ref-e06f39be1017c28488a0ca4b61bb9962ad5ee196.tar.gz crawl-ref-e06f39be1017c28488a0ca4b61bb9962ad5ee196.zip | |
Add the most recent version of Adam's kraken patch into trunk.
Might still need some tweaks but overall looks great!
And... we need more tiles (kraken head + tentacles).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10691 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/enum.h')
| -rw-r--r-- | crawl-ref/source/enum.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 01e5d8fe5a..cbc4892717 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -1991,9 +1991,10 @@ enum monster_type // (int) menv[].type MONS_ERESHKIGAL, // 344 MONS_ANCIENT_LICH = 356, // 356 - MONS_OOZE, // 357 - - MONS_VAULT_GUARD = 360, // 360 + MONS_OOZE, + MONS_KRAKEN, + MONS_KRAKEN_TENTACLE, + MONS_VAULT_GUARD, // 360 MONS_CURSE_SKULL, MONS_VAMPIRE_KNIGHT, MONS_VAMPIRE_MAGE, @@ -2212,6 +2213,7 @@ enum mon_spellbook_type MST_GIANT_ORANGE_BRAIN, MST_RAKSHASA, MST_GREAT_ORB_OF_EYES, // 55 + MST_KRAKEN, MST_ORC_SORCERER, MST_STEAM_DRAGON, MST_HELL_KNIGHT_I = 60, @@ -2880,8 +2882,9 @@ enum spell_type SPELL_DRACONIAN_BREATH, SPELL_WATER_ELEMENTALS, SPELL_PORKALATOR, // 198 + SPELL_KRAKEN_TENTACLES, - NUM_SPELLS // 199 + NUM_SPELLS // 200 }; enum slot_select_mode |