diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-05 12:09:21 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-01-05 12:09:21 +0000 |
| commit | f9115aff53b38bae7eac6789efa6aa3177b970a8 (patch) | |
| tree | 2417810c407a216239c64f551fde0a94d387e3f4 /crawl-ref/source | |
| parent | 26336649489ca48d44b6a779ba8fffc39e5ce686 (diff) | |
| download | crawl-ref-f9115aff53b38bae7eac6789efa6aa3177b970a8.tar.gz crawl-ref-f9115aff53b38bae7eac6789efa6aa3177b970a8.zip | |
A few small sanctuary changes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3198 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/spells3.cc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc index acf3560bcc..39be278f5b 100644 --- a/crawl-ref/source/spells3.cc +++ b/crawl-ref/source/spells3.cc @@ -886,9 +886,6 @@ void decrease_sanctuary_radius() // maybe disallow recasting while previous sanctuary in effect... bool cast_sanctuary(const int power) { - // first get rid of old sanctuary - remove_sanctuary(); - if (!silenced(you.x_pos, you.y_pos)) // how did you manage that? mpr("You hear a choir sing!"); else @@ -938,19 +935,21 @@ bool cast_sanctuary(const int power) } // forming patterns - if (pattern == 0 + if (pattern == 0 // outward rays && (x == 0 || y == 0 || x == y || x == -y) - || pattern == 1 - && (dist >= (radius-1)*(radius-1) && dist <= radius*radius) - || pattern == 2 + || pattern == 1 // circles + && (dist >= (radius-1)*(radius-1) && dist <= radius*radius + || dist >= (radius/2-1)*(radius/2-1) + && dist <= radius*radius/4) + || pattern == 2 // latticed && (x%2 == 0 || y%2 == 0) - || pattern == 3 + || pattern == 3 // cross-like && (abs(x)+abs(y) < 5 && x != y && x != -y)) { - env.map[posx][posy].property = FPROP_SANCTUARY_1; + env.map[posx][posy].property = FPROP_SANCTUARY_1; // yellow } else - env.map[posx][posy].property = FPROP_SANCTUARY_2; + env.map[posx][posy].property = FPROP_SANCTUARY_2; // white } if (count == 1) simple_monster_message(&menv[monster], " turns to flee the light!"); |