Unlocking doors with o (#open)

Ignore-this: 59e27183e3669b20e2ae49640edf949e

darcs-hash:20110328222821-b78f9-4c0f5b6627eb834619e73deb6bd1074d64b6f6ee

Author: Alex Smith

doc/fixes36.0

@@ -417,6 +417,8 @@ G: A combined command for controlled teleportation, jumping, and
 riding. (They're all forms of jump, if you think about it.)
 ^I: Now a synonym for #adjust.
 M: Now a synonym for #monster.
+o: Now both opens and closes doors; and unlocks known locked doors
+with the most recently used unlocking tool in inventory.
 q: Allows , as an argument, to drink from sinks/fountains.
 Q: No longer prints a message about #quit.
 s: No longer wakes mimics (instead, upon detecting a mimic, an

include/extern.h

@@ -177,6 +177,7 @@ E int FDECL(movecmd, (CHAR_P));
 E int FDECL(movecmdui, (CHAR_P));
 E void FDECL(setnextgetdir, (int));
 E void FDECL(setnextgetdirdxdy, (int,int));
+E boolean NDECL(isnextgetdirset);
 E int FDECL(getdir, (const char *,int,int));
 E void NDECL(confdir);
 E int FDECL(isok, (int,int));

include/obj.h

@@ -1,6 +1,6 @@
 /*	SCCS Id: @(#)obj.h	3.4	2002/01/07	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
-/* Modified 26 Mar 2011 by Alex Smith */
+/* Modified 28 Mar 2011 by Alex Smith */
 /* NetHack may be freely redistributed.  See license for details. */
 
 #ifndef OBJ_H
@@ -95,10 +95,11 @@ struct obj {
 	Bitfield(was_thrown,1);	/* thrown by the hero since last picked up */
 	/* 5 free bits */
 
-	int	corpsenm;	/* type of corpse is mons[corpsenm] */
+	long	corpsenm;	/* type of corpse is mons[corpsenm] */
 #define leashmon  corpsenm	/* gets m_id of attached pet */
 #define spestudied corpsenm	/* # of times a spellbook has been studied */
 #define fromsink  corpsenm	/* a potion from a sink */
+#define lastused  corpsenm      /* most recent use time for autousable tools */
 	unsigned oeaten;	/* nutrition left in food, if partly eaten */
 	long age;		/* creation date */
 

src/cmd.c

@@ -1554,8 +1554,7 @@ struct ext_func_tab extcmdlist[] = {
   {"northwestfarcareful", "move northwest until something interesting happens",
    0, FALSE, 23, C('y'), 0, 0, C('y')},
   {"offer", "offer a sacrifice to the gods", dosacrifice, FALSE, 1, M('o'), 0, 0, 0},
-  {"open", "open or close a door or container on the ground", doopen,
-   FALSE, 11, 'o', M('l'), 0, 0},
+  {"open", "open, close, or unlock a door", doopen, FALSE, 11, 'o', M('l'), 0, 0},
   {"options", "change game options", doset, TRUE, 10, 'O', 0, 0, 0},
   {"overview", "show an overview of the dungeon", dooverview, TRUE, 5, C('o'), 0, 0, 0},
   {"pickup", "pick up one or more items", dopickup, FALSE, 10, ',', 0, 0, 0},
@@ -2354,6 +2353,12 @@ int dx,dy;
     if (dx  > 0 && dy  > 0) setnextgetdir('n');
 }
 
+boolean
+isnextgetdirset()
+{
+    return !!nextgetdir;
+}
+
 /* Gets a direction from the player.
    The second argument specifies how to highlight directions.
    Returns 1 on success; on error, sets getdir_errorkey to the

src/lock.c

@@ -234,8 +234,10 @@ pick_lock(pick) /* pick a lock with a given object */
 	struct rm	*door;
 	struct obj	*otmp;
 	char qbuf[QBUFSZ];
+        boolean is_automatic = isnextgetdirset();
 
 	picktyp = pick->otyp;
+        pick->lastused = monstermoves; /* so 'o' knows which item to use */
 
 	/* check whether we're resuming an interrupted previous attempt */
 	if (xlock.usedtime && picktyp == xlock.picktyp) {
@@ -414,7 +416,8 @@ pick_lock(pick) /* pick a lock with a given object */
 		    Sprintf(qbuf,"%sock it?",
 			(door->doormask & D_LOCKED) ? "Unl" : "L" );
 
-		    c = yn(qbuf);
+		    if (is_automatic) c = 'y';
+                    else c = yn(qbuf);
 		    if(c == 'n') return(0);
 
 		    switch(picktyp) {
@@ -512,6 +515,8 @@ doopen()		/* try to open a door */
 	coord cc;
 	register struct rm *door;
 	struct monst *mtmp;
+        struct obj *otmp;
+        boolean is_automatic = isnextgetdirset();
 
 	if (nohands(youmonst.data)) {
 	    You_cant("open anything -- you have no hands!");
@@ -523,7 +528,7 @@ doopen()		/* try to open a door */
 	    return 0;
 	}
 
-	if(!get_adjacent_loc("Open or close a door in which direction?",
+	if(!get_adjacent_loc("Open/close/unlock a door in which direction?",
                              (char *)0, u.ux, u.uy, &cc)) return(0);
 
 	if((cc.x == u.ux) && (cc.y == u.uy)) return(0);
@@ -555,6 +560,38 @@ doopen()		/* try to open a door */
           return doclose();
         }
 
+        if (door->doormask == D_LOCKED &&
+            door->fknown & FKNOWN_LOCKED &&
+            !is_automatic) {
+          struct obj *bestpick = 0;
+          /* 'o' command on a door the player knows is locked should try
+             to unlock it, otherwise tries to open it and fails (next
+             case) */
+          for (otmp = invent; otmp; otmp = otmp->nobj) {
+            if (otmp->otyp == LOCK_PICK ||
+#ifdef TOURIST
+                otmp->otyp == CREDIT_CARD ||
+#endif
+                otmp->otyp == SKELETON_KEY) {
+              if (!bestpick || otmp->lastused > bestpick->lastused)
+                bestpick = otmp;
+            }
+          }
+          if (!bestpick) {
+            pline("You have nothing to unlock that with.");
+          } else if(!bestpick->lastused) {
+            pline("Use an unlocking tool manually so I know which one "
+                  "you want to use.");
+          } else {
+            int turncount;
+            setnextgetdirdxdy(cc.x-u.ux, cc.y-u.uy);
+            turncount = pick_lock(bestpick);
+            setnextgetdir(0); /* paranoia against lack of hands */
+            return turncount;
+          }
+          return 0;
+        }
+
 	if (!(door->doormask & D_CLOSED)) {
 	    const char *mesg;
 

src/mkobj.c

@@ -1,6 +1,6 @@
 /*	SCCS Id: @(#)mkobj.c	3.4	2002/10/07	*/
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
-/* Modified 9 Aug 2010 by Alex Smith */
+/* Modified 28 Mar 2011 by Alex Smith */
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
@@ -382,6 +382,7 @@ boolean artif;
 	otmp->otyp = otyp;
 	otmp->where = OBJ_FREE;
 	otmp->dknown = index(dknowns, let) ? 0 : 1;
+        otmp->lastused = 0;
 	if ((otmp->otyp >= ELVEN_SHIELD && otmp->otyp <= ORCISH_SHIELD) ||
 			otmp->otyp == SHIELD_OF_REFLECTION)
 		otmp->dknown = 0;