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-07-20 18:07:51 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2009-07-20 18:07:51 +0000
commit3a83e92a99ce7a161f36e0bd2f1412580ef9bca0 (patch)
treefd7ccbbc3c039f7dac530a0822797913e6dbb7cc /crawl-ref/source/enum.h
parent0bcbd855b8b1b0a9291aa6b78f2785ffc9987dce (diff)
downloadcrawl-ref-3a83e92a99ce7a161f36e0bd2f1412580ef9bca0.tar.gz
crawl-ref-3a83e92a99ce7a161f36e0bd2f1412580ef9bca0.zip
Apply caotto's plant god patch, for now named "Feawn".
Also fix potions of porridge's menu colour being yellow for Mummies. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10355 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/enum.h')
-rw-r--r--crawl-ref/source/enum.h20
1 files changed, 14 insertions, 6 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h
index b1d476bd15..4d942ddb2d 100644
--- a/crawl-ref/source/enum.h
+++ b/crawl-ref/source/enum.h
@@ -107,11 +107,17 @@ enum ability_type
ABIL_JIYVA_JELLY_SHIELD, // 240
ABIL_JIYVA_SLIMIFY,
ABIL_JIYVA_CURE_BAD_MUTATION,
-
- ABIL_TRAN_BAT = 244,
+ ABIL_FEAWN_FUNGAL_BLOOM,
+ ABIL_FEAWN_SUNLIGHT,
+ ABIL_FEAWN_RAIN, // 245
+ ABIL_FEAWN_PLANT_RING,
+ ABIL_FEAWN_SPAWN_SPORES,
+ ABIL_FEAWN_EVOLUTION,
+
+ ABIL_TRAN_BAT = 250,
ABIL_HARM_PROTECTION,
- ABIL_HARM_PROTECTION_II, // 246
- ABIL_RENOUNCE_RELIGION = 250 // 250
+ ABIL_HARM_PROTECTION_II, // 252
+ ABIL_RENOUNCE_RELIGION = 260 // 260
};
enum activity_interrupt_type
@@ -1104,7 +1110,8 @@ enum dungeon_feature_type
DNGN_ALTAR_LUGONU,
DNGN_ALTAR_BEOGH,
DNGN_ALTAR_JIYVA,
- DNGN_ALTAR_LAST_GOD = DNGN_ALTAR_JIYVA,
+ DNGN_ALTAR_FEAWN,
+ DNGN_ALTAR_LAST_GOD = DNGN_ALTAR_FEAWN,
DNGN_FOUNTAIN_BLUE = 200, // 200
DNGN_FOUNTAIN_SPARKLING, // aka 'Magic Fountain' {dlb}
@@ -1344,7 +1351,8 @@ enum god_type
GOD_ELYVILON,
GOD_LUGONU,
GOD_BEOGH,
- GOD_JIYVA,
+ GOD_JIYVA, // 15
+ GOD_FEAWN,
NUM_GODS, // always after last god
GOD_RANDOM = 100,