Xom doesn't even attempt to do the teleportation journey if the player

is wearing a randart that prevents teleportation. Spells don't face any
such restriction seeing as the direct call of your_spells() bypasses the
randart check.
Also, a few more spacing cleanups.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9673 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 8 insertions, 0 deletions

diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index bf0ff04478..47f5ef2293 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -1667,6 +1667,10 @@ static bool _xom_is_good(int sever, int tension)
     }
     else if (x_chance_in_y(11, sever) && you.level_type != LEVEL_ABYSS)
     {
+        // Try something else if teleportation is impossible.
+        if (scan_randarts(RAP_PREVENT_TELEPORTATION))
+            return (false);
+
         // This is not very interesting if the level is already fully
         // explored (presumably cleared). Even then, it may occasionally
         // happen.
@@ -2662,6 +2666,10 @@ static bool _xom_is_bad(int sever, int tension)
         }
         else if (x_chance_in_y(7, sever) && you.level_type != LEVEL_ABYSS)
         {
+            // Try something else if teleportation is impossible.
+            if (scan_randarts(RAP_PREVENT_TELEPORTATION))
+                return (false);
+
             // This is not particularly exciting if the level is already fully
             // explored (presumably cleared). If Xom is feeling nasty this
             // is likelier to happen if the level is unexplored.