diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-18 13:12:08 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-07-18 13:12:08 +0000 |
| commit | 520d68077bf669ded9ec54a1811c0ce04dd68e28 (patch) | |
| tree | 7f5c5170855aec735bfc42f02869f9d51473c3a8 /crawl-ref/source/decks.cc | |
| parent | 33ca99ed1554de6bff222448b0e8c334fcf624f1 (diff) | |
| download | crawl-ref-520d68077bf669ded9ec54a1811c0ce04dd68e28.tar.gz crawl-ref-520d68077bf669ded9ec54a1811c0ce04dd68e28.zip | |
Extend Enne's blood potion destruction fix to potions on the floor.
Fix monsters "upgrading" their ammunition even if its brand cancels out
with the launcher. Also make sure monsters aren't generated with
launcher/ammo with opposing brands.
Fix 2021310: no longer disallow blowgun acquirement.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6601 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/decks.cc')
| -rw-r--r-- | crawl-ref/source/decks.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc index 1328c4e0d3..ed25476877 100644 --- a/crawl-ref/source/decks.cc +++ b/crawl-ref/source/decks.cc @@ -1681,7 +1681,7 @@ static bool _damaging_card(card_type card, int power, deck_rarity_type rarity) card_name(card)); if (spell_direction(target, beam, DIR_NONE, TARG_ENEMY, true, true, info) - && player_tracer(ztype, power/4, beam)) + && player_tracer(ZAP_DEBUGGING_RAY, power/4, beam)) { zapping(ztype, random2(power/4), beam); } |