github PR #259 - paranoid_confirmation:trap

Fairly old pull request from copperwater:  add new paranoid_confirm
setting 'trap'.

The old commit suffered from bit rot and merging needed too much
fixing up despite there not being many bands of change in the commit's
diffs.  I ultimately redid it from scratch, although the two biggest
chunks of code started with copy+paste of the pull request's commit.

It operates like paranoid:pray.  Setting paranoid:trap adds a new
"Really step into <trap>?" y/n prompt when attempting to move
into/onto a known trap, even if an object covers it on the map.
Setting both 'paranoid:Confirm trap' turns that into a yes/no prompt.
(Adding 'Confirm' affects other paranoid confirmations; in addition
to requiring yes<return> rather than just y to accept, it also forces
no<return> to reject.)

However, moving into a known trap that is considered to be harmless
behaves as if no trap was present.  Some of the trap classification
might be out of date; several types of traps have undergone changes
since implementation of the original pull request, notably anti-magic
field.  When the hero is hallucinating, all known traps are considered
harmful since the map no longer reliably describes them.

Preceding a movement command with the 'm' prefix also behaves as if
no trap was present, bypassing confirmation for that move, similar to
how paranoid:swim currently behaves.  Being stunned or confused also
behaves as if no trap was present, taking priority over hallucination.

This updates the documentation.

Supersedes #259
Closes #259

doc/Guidebook.mn

@@ -37,7 +37,7 @@
 .ds f0 "\*(vr
 .ds f1
 .\"DO NOT REMOVE NH_DATESUB .ds f2 "DATE(%B %-d, %Y)
-.ds f2 "August 5, 2023
+.ds f2 "September 8, 2023
 .
 .\" A note on some special characters:
 .\" \(lq = left double quote
@@ -4246,6 +4246,11 @@ to lycanthropy when hero has polymorph control;
 require \(oqy\(cq to confirm an attempt to pray rather
 than immediately praying; on by default;
 (to require \(lqyes\(rq rather than just \(oqy\(cq, set Confirm too);
+.PL trap
+require \(oqy\(cq to confirm an attempt to move into or onto a known trap,
+unless doing so is considered to be harmless;
+(to require \(lqyes\(rq rather than just \(oqy\(cq, set Confirm too);
+confirmation can be skipped by using the \(oq\f(CRm\fP\(cq movement prefix;
 .PL swim
 prevent walking into water or lava; on by default; (to deliberately step
 onto/into such terrain when this is set, use the \(oq\f(CRm\fP\(cq

doc/Guidebook.tex

@@ -46,7 +46,7 @@
 \author{Original version - Eric S. Raymond\\
 (Edited and expanded for 3.7.0 by Mike Stephenson and others)}
 %DO NOT REMOVE NH_DATESUB \date{DATE(%B %-d, %Y)}
-\date{August 5, 2023}
+\date{September 8, 2023}
 
 \maketitle
 
@@ -4646,7 +4646,7 @@ a peaceful monster;
 \item[{\tt wand-break}]
 require ``{\tt yes}'' rather than `{\tt y}' to confirm breaking
 a wand with the {\it apply} command;
-\item[{\tt eating}]
+\item[{\tt eating~}]
 require ``{\tt yes}'' rather than `{\tt y}' to confirm whether to
 continue eating;
 \item[{\tt Were-change}]
@@ -4656,6 +4656,11 @@ to lycanthropy when hero has polymorph control;
 require `{\tt y}' to confirm an attempt to pray rather
 than immediately praying; on by default;
 (to require ``yes'' rather than just `y', set Confirm too);
+\item[{\tt trap~~~}]
+require `{\tt y}' to confirm an attempt to move into or onto a known trap,
+unless doing so is considered to be harmless;
+(to require ``yes'' rather than just `y', set Confirm too);
+confirmation can be skipped by using the `{\tt m}' movement prefix;
 \item[{\tt swim~~~}]
 prevent walking into water or lava; on by default; (to deliberately step
 onto/into such terrain when this is set, use the `{\tt m}'

doc/fixes3-7-0.txt

@@ -1234,6 +1234,8 @@ if Magicbane cancelled a shapeshifter, forcing it to 'unshift', subsequent
 a pet that was poison resistant but not stoning resistant would eat Medusa's
 	corpse and be turned to stone
 ring of hunger prevents choking on your food
+paranoid_confirm:pray can be changed to require yes/no response instead of y/n
+	by also setting paranoid_confirm:Confirm
 
 
 Fixes to 3.7.0-x General Problems Exposed Via git Repository
@@ -2171,6 +2173,9 @@ reading a blessed scroll of light has a chance to improve bless/curse state
 added a chronicle of major events, and optional live logging of those
 paranoid_confirm:swim to prevent accidental dunking into dangerous liquids;
         joins paranoid_confirm:pray as the default setting
+paranoid_confirm:trap to confirm entering a known trap unless it is harmless;
+	like revised paranoid_confirm:pray, requires y/n response; add
+	paranoid_confirm:Confirm to require yes/no instead
 paranoid_confirm:Autoall to confirm picking 'A' in menustyle:Full filter menu
 looking at a monster will indicate whether it is asleep, and waking up a
 	monster yields a message