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/transfor.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/transfor.cc')
| -rw-r--r-- | crawl-ref/source/transfor.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crawl-ref/source/transfor.cc b/crawl-ref/source/transfor.cc index 12329c658d..dac21e32aa 100644 --- a/crawl-ref/source/transfor.cc +++ b/crawl-ref/source/transfor.cc @@ -358,6 +358,10 @@ bool check_transformation_stat_loss(const std::set<equipment_type> &remove, // and Might running out at an inopportune moment. if (you.duration[DUR_MIGHT]) prop_str += 5; + if (you.duration[DUR_BRILLIANCE]) + prop_int += 5; + if (you.duration[DUR_AGILITY]) + prop_dex += 5; if (prop_str >= you.strength || prop_int >= you.intel |