From 9b2b6042af10535537920daa9cc5e7f650053084 Mon Sep 17 00:00:00 2001
From: Pete Hurst <pete@streamuniverse.tv>
Date: Thu, 14 Mar 2013 12:58:03 +0000
Subject: [PATCH] Player is not the Bugblatter Beast. Fixes disjunction not
 working against monsters that can't see you.

---
 crawl-ref/source/spl-transloc.cc | 2 +-
 crawl-ref/source/teleport.cc     | 4 ++--
 crawl-ref/source/teleport.h      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crawl-ref/source/spl-transloc.cc b/crawl-ref/source/spl-transloc.cc
index 32b0a61..3932f00 100644
--- a/crawl-ref/source/spl-transloc.cc
+++ b/crawl-ref/source/spl-transloc.cc
@@ -109,7 +109,7 @@ void disjunction()
             int decay = max(1, (dist - 1) * (dist + 1));
             int chance = pow(0.8, 1.0 / decay) * 1000;
             if (!x_chance_in_y(chance, 1000))
-                blink_away(mons, &you);
+                blink_away(mons, &you, false);
         }
     }
 }
diff --git a/crawl-ref/source/teleport.cc b/crawl-ref/source/teleport.cc
index f5198fa..66223af 100644
--- a/crawl-ref/source/teleport.cc
+++ b/crawl-ref/source/teleport.cc
@@ -156,9 +156,9 @@ void blink_other_close(actor* victim, const coord_def &target)
 }
 
 // Blink a monster away from the caster.
-bool blink_away(monster* mon, actor* caster)
+bool blink_away(monster* mon, actor* caster, bool from_seen)
 {
-    if (!mon->can_see(caster))
+    if (from_seen && !mon->can_see(caster))
         return false;
     coord_def dest = random_space_weighted(mon, caster, false, false);
     if (dest.origin())
diff --git a/crawl-ref/source/teleport.h b/crawl-ref/source/teleport.h
index 7a96fae..b0f4500 100644
--- a/crawl-ref/source/teleport.h
+++ b/crawl-ref/source/teleport.h
@@ -6,7 +6,7 @@ class monster;
 
 void blink_other_close(actor* victim, const coord_def& target);
 bool blink_away(monster* mon);
-bool blink_away(monster* mon, actor* caster);
+bool blink_away(monster* mon, actor* caster, bool from_seen = true);
 void blink_range(monster* mon);
 void blink_close(monster* mon);
 
-- 
1.8.0