From 17652535bdeaf8d56ee88ed9296708ff6efd8a31 Mon Sep 17 00:00:00 2001 From: j-p-e-g Date: Mon, 21 Jul 2008 18:22:37 +0000 Subject: Add immunity checks for prompts about beams potentially hitting yourself (not counting self-targetting since what we're trying to avoid in that case is loss of magic as well as self-damage) and add some special cases for Evaporate, so the potions use appropriate resistances without leaking information on the random choices. Let Enhancers start with Short Blades skill 1. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6627 c06c8d41-db1a-0410-9941-cceddc491573 --- crawl-ref/source/spells1.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/spells1.cc') diff --git a/crawl-ref/source/spells1.cc b/crawl-ref/source/spells1.cc index e544ecfb7c..5f9b8a3f4c 100644 --- a/crawl-ref/source/spells1.cc +++ b/crawl-ref/source/spells1.cc @@ -571,7 +571,6 @@ bool stinking_cloud( int pow, bolt &beem ) beem.damage = dice_def( 1, 0 ); beem.hit = 20; beem.type = dchar_glyph(DCHAR_FIRED_ZAP); - beem.flavour = BEAM_MMISSILE; beem.ench_power = pow; beem.beam_source = MHITYOU; beem.thrower = KILL_YOU; @@ -588,10 +587,11 @@ bool stinking_cloud( int pow, bolt &beem ) beem.smart_monster = true; beem.attitude = ATT_FRIENDLY; beem.fr_count = 0; + beem.flavour = BEAM_POTION_STINKING_CLOUD; beem.is_tracer = true; fire_beam(beem); - if (beem.fr_count > 0) + if (beem.beam_cancelled) { // We don't want to fire through friendlies. canned_msg(MSG_OK); @@ -600,6 +600,7 @@ bool stinking_cloud( int pow, bolt &beem ) } // Really fire. + beem.flavour = BEAM_MMISSILE; beem.is_tracer = false; fire_beam(beem); -- cgit v1.2.3-54-g00ecf