diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-13 16:04:24 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-13 16:04:24 +0000 |
| commit | 280d409759be7af8b54366f07ccba17348ea24f9 (patch) | |
| tree | 99b931599c7a6544a9c9b3f4aeb7d9c99752b5d9 /crawl-ref/source/enum.h | |
| parent | 8b4a043aa12cf1492ff94b0ef071afce5997dff2 (diff) | |
| download | crawl-ref-280d409759be7af8b54366f07ccba17348ea24f9.tar.gz crawl-ref-280d409759be7af8b54366f07ccba17348ea24f9.zip | |
Commit several patches:
* patch 2849505 by weyrava: make submerged monsters use the correct colour
* patch 2857771 by caotto: another Feawn update
* patch 2838771 by camedo: add potions of brilliance/agility
* BR 2841651 by bookofjude: allow Merfolk to control-tele into deep water
Now we need tiles for the new potions!
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10669 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/enum.h')
| -rw-r--r-- | crawl-ref/source/enum.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index be7e2799ad..8d5fdbd98e 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -107,9 +107,10 @@ enum ability_type ABIL_JIYVA_JELLY_SHIELD, // 240 ABIL_JIYVA_SLIMIFY, ABIL_JIYVA_CURE_BAD_MUTATION, + ABIL_FEAWN_PLANTWALK, ABIL_FEAWN_FUNGAL_BLOOM, - ABIL_FEAWN_SUNLIGHT, - ABIL_FEAWN_RAIN, // 245 + ABIL_FEAWN_SUNLIGHT, // 245 + ABIL_FEAWN_RAIN, ABIL_FEAWN_PLANT_RING, ABIL_FEAWN_SPAWN_SPORES, ABIL_FEAWN_EVOLUTION, @@ -1192,6 +1193,8 @@ enum duration_type DUR_MESMERISED, DUR_HASTE, DUR_MIGHT, + DUR_BRILLIANCE, + DUR_AGILITY, DUR_LEVITATION, DUR_BERSERKER, DUR_POISONING, @@ -2471,6 +2474,8 @@ enum potion_type POT_HEAL_WOUNDS, POT_SPEED, POT_MIGHT, + POT_BRILLIANCE, + POT_AGILITY, POT_GAIN_STRENGTH, POT_GAIN_DEXTERITY, // 5 POT_GAIN_INTELLIGENCE, |