nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

paranoid_confirmation [expanded user patch] (trunk only; 2 of 2)

Browse Source 
[Short writeup; see 'cvs log' of flag.h or options.c for the long one.]

     This is a reworking of user contributed patch known as Paranoid_Quit.

     Add a new compound option, paranoid_confirmation, accepting a space
separated list of values "quit die attack pray Remove"; default is "pray".
paranoid:quit   - yes vs y for "really quit?" and "enter explore mode?"
paranoid:die    - yes vs y for "die?" in explore mode or wizard mode
paranoid:attack - yes vs y for "really attack <peacful monster>?"
paranoid:pray   - y to pray; supersedes prayconfirm boolean; on by default
paranoid:Remove - always issue an inventory prompt for 'R' an 'T', even
  when only one applicable item is currently worn.
This commit is contained in:
nethack.rankin
2011-03-05 10:09:48 +00:00
parent fa6098bfd4
commit 2ec7b5d2f6
11 changed files with 126 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/do_wear.c
View File

@@ -1232,12 +1232,12 @@ dotakeoff()
" Use 'R' command to remove accessories." : "");
return 0;
}
if (armorpieces > 1)
if (armorpieces > 1 || ParanoidRemove)
otmp = getobj(clothes, "take off");
if (otmp == 0) return(0);
if (!otmp) return 0;
if (!(otmp->owornmask & W_ARMOR)) {
You("are not wearing that.");
return(0);
return 0;
}
/* note: the `uskin' case shouldn't be able to happen here; dragons
can't wear any armor so will end up with `armorpieces == 0' above */
@@ -1295,11 +1295,12 @@ doremring()
" Use 'T' command to take off armor." : "");
return(0);
}
if (Accessories != 1) otmp = getobj(accessories, "remove");
if(!otmp) return(0);
if(!(otmp->owornmask & (W_RING | W_AMUL | W_TOOL))) {
if (Accessories > 1 || ParanoidRemove)
otmp = getobj(accessories, "remove");
if (!otmp) return 0;
if (!(otmp->owornmask & (W_RING | W_AMUL | W_TOOL))) {
You("are not wearing that.");
return(0);
return 0;
}
reset_remarm(); /* clear context.takeoff.mask and context.takeoff.what */