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/item_use.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/item_use.cc')
| -rw-r--r-- | crawl-ref/source/item_use.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index c5cbc035f2..954046ad1e 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -3036,8 +3036,8 @@ bool thrown_object_destroyed(item_def *item, const coord_def& where, // Enchanted projectiles get an extra shot at avoiding // destruction: plus / (1 + plus) chance of survival. - bool destroyed = (chance == 0) ? false : - (one_chance_in(chance) && one_chance_in(item->plus)); + bool destroyed = (chance == 0) ? false : (one_chance_in(chance) + && one_chance_in(item->plus + 1)); bool hostile_grid = grid_destroys_items(grd(where)); // Non-returning items thrown into item-destroying grids are always @@ -4231,6 +4231,8 @@ bool _drink_fountain() 40, POT_HEAL_WOUNDS, 40, POT_SPEED, 40, POT_MIGHT, + 40, POT_AGILITY, + 40, POT_BRILLIANCE, 32, POT_DEGENERATION, 27, POT_LEVITATION, 27, POT_POISON, |