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/abl-show.cc | |
| 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/abl-show.cc')
| -rw-r--r-- | crawl-ref/source/abl-show.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index f9fffeeb6d..84ee18ceb2 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -332,6 +332,7 @@ static const ability_def Ability_List[] = 8, 0, 200, 15, ABFLAG_NONE }, // Feawn + { ABIL_FEAWN_PLANTWALK, "Plant Walking", 0, 0, 0, 0, ABFLAG_NONE }, { ABIL_FEAWN_FUNGAL_BLOOM, "Decomposition", 0, 0, 0, 0, ABFLAG_NONE }, { ABIL_FEAWN_SUNLIGHT, "Sunlight", 2, 0, 0, 0, ABFLAG_NONE}, { ABIL_FEAWN_PLANT_RING, "Growth", 2, 0, 0, 1, ABFLAG_NONE}, @@ -1976,6 +1977,10 @@ static bool _do_ability(const ability_def& abil) exercise(SK_INVOCATIONS, 1); break; + case ABIL_FEAWN_PLANTWALK: + // Activated via prayer elsewhere. + break; + case ABIL_FEAWN_FUNGAL_BLOOM: { int count = fungal_bloom(); |