improve target reset and guard commands that can use items from the f…

…loor
AllureOfTheStars · Apr 8, 2011 · 4dfcb34 · 4dfcb34
1 parent e4e6055
commit 4dfcb34
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/Actions.hs b/src/Actions.hs
@@ -416,13 +416,16 @@ search =
     modify (updateLevel (updateLMap (const slmap)))
     playerAdvanceTime
 
--- | Start the floor targeting mode or toggle between the two floor modes.
+-- | Start the floor targeting mode or reset the cursor location to the player.
 targetFloor :: Action ()
 targetFloor = do
-  target <- gets (mtarget . getPlayerBody)
+  ploc      <- gets (mloc . getPlayerBody)
+  target    <- gets (mtarget . getPlayerBody)
+  targeting <- gets (ctargeting . scursor)
   let tgt = case target of
-              TLoc l -> TLoc l  -- don't forget the old location target too fast
+              _ | targeting -> TLoc ploc  -- double key press: reset cursor
-              _ -> TCursor
+              TEnemy _ _ -> TCursor  -- forget enemy target, keep the cursor
+              t -> t  -- keep the target from previous targeting session
   updatePlayerBody (\ p -> p { mtarget = tgt })
   setCursor tgt
 

diff --git a/src/Command.hs b/src/Command.hs
@@ -23,8 +23,8 @@ ascendCommand    = Described "ascend a level"    (lvlChange Up)
 descendCommand   = Described "descend a level"   (lvlChange Down)
 floorCommand     = Described "target location"   targetFloor
 monsterCommand   = Described "target monster"    (checkCursor targetMonster)
-quaffCommand     = Described "quaff a potion"    quaffPotion
+quaffCommand     = Described "quaff a potion"    (checkCursor quaffPotion)
-readCommand      = Described "read a scroll"     readScroll
+readCommand      = Described "read a scroll"     (checkCursor readScroll)
 throwCommand     = Described "throw a weapon"    (checkCursor throwItem)
 aimCommand       = Described "aim a wand"        (checkCursor aimItem)
 waitCommand      = Described "wait"              playerAdvanceTime