let monsters benefit from rings of searching, as per PLAYING.markdown

AllureOfTheStars · Jul 23, 2011 · e696d1f · e696d1f
1 parent d0ae836
commit e696d1f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/Actions.hs b/src/Actions.hs
@@ -252,11 +252,14 @@ actorOpenClose actor v o dir =
     let isPlayer  = actor == pl
     let isVerbose = v && isPlayer
     let dloc = shift loc dir  -- location we act upon
+    let openPower = case strongestItem (mitems body) "ring" of
+                      Just i  -> niq (mkind body) + ipower i
+                      Nothing -> niq (mkind body)
       in case lmap `at` dloc of
            Tile d@(Door hv o') []
              | secret o' && isPlayer -> -- door is secret, cannot be opened or closed by the player
                                        neverMind isVerbose
-             | maybe o ((|| not o) . (>= (niq (mkind body)))) o' ->
+             | maybe o ((|| not o) . (>= openPower)) o' ->
                                        -- door is in unsuitable state
                                        abortIfWith isVerbose ("already " ++ txt)
              | not (unoccupied hms dloc) ->

diff --git a/src/StrategyState.hs b/src/StrategyState.hs
@@ -97,8 +97,12 @@ strategy actor
     onlyKeepsDir_9 = only (\ x -> maybe True (\ d -> neg x /= d) mdir)
     onlyUnoccupied = onlyMoves (unoccupied (levelMonsterList delState)) me
     -- Monsters don't see doors more secret than that. Enforced when actually
-    -- opening doors, too, so that monsters don't cheat.
+    -- opening doors, too, so that monsters don't cheat. TODO: remove the code
-    openableHere   = openable (niq mk) lmap
+    -- duplication, though.
+    openPower      = case strongestItem items "ring" of
+                       Just i  -> niq mk + ipower i
+                       Nothing -> niq mk
+    openableHere   = openable openPower lmap
     onlyOpenable   = onlyMoves openableHere me
     accessibleHere = accessible lmap me
     onlySensible   = onlyMoves (\ l -> accessibleHere l || openableHere l) me