Change autopickup and color default values

Change the default value of autopickup to off. Having it on is
harmful for new players, making them very easily burdened.
We can't expect new players to know how to configure
pickup_types, pickup_burden, and pickup exceptions.

Change the default value of color to on. We can safely assume
new users have a terminal that supports color, and most people
want color.

diff --git a/doc/Guidebook.mn b/doc/Guidebook.mn
index 83ecc57c84944ab89ee872d1a4b93706e05bc52e..b64d37de321108baa1feaed68d9bb0fcf1c50fce 100644 (file)
--- a/doc/Guidebook.mn
+++ b/doc/Guidebook.mn
@@ -2253,11 +2253,13 @@ location ordinarily wouldn't be seen any more.
 Objects
 .pg
 When you find something in the dungeon, it is common to want to pick
-it up.  In NetHack, this is accomplished automatically by walking over
+it up.  In NetHack, this is accomplished by using the \(oq,\(cq command.
+automatically by walking over
 the object (unless you turn off the
+If
 .op autopickup
-option (see below), or move with the \(oqm\(cq prefix (see above)), or
-manually by using the \(oq,\(cq command.
+option is on, you will automatically pick up the object
+by walking over, unless you move with the \(oqm\(cq prefix.
 .pg
 If you're carrying too many items, NetHack will tell you so and you won't
 be able to pick up anything more.
@@ -3550,7 +3552,7 @@ Persistent.
 Walking into a closed door attempts to open it (default true).
 Persistent.
 .lp "autopickup  "
-Automatically pick up things onto which you move (default on).
+Automatically pick up things onto which you move (default off).
 Persistent.
 .lp ""
 See
@@ -4382,7 +4384,7 @@ to \fITrue\fP forces
 to be \fIFalse\fP.
 .lp color
 If NetHack can, it should display color if it can for different monsters,
-objects, and dungeon features.
+objects, and dungeon features (default on).
 .lp eight_bit_tty
 If NetHack can, it should pass eight-bit character values (for example,
 specified with the

diff --git a/doc/Guidebook.tex b/doc/Guidebook.tex
index ed0e0329b85c917f252ce23d57aef8e02340e6fe..b0c630a870a0ede96ba2fc2dd49b3bcbf8d0447b 100644 (file)
--- a/doc/Guidebook.tex
+++ b/doc/Guidebook.tex
@@ -2461,10 +2461,9 @@ location ordinarily wouldn't be seen any more.
 
 %.pg
 When you find something in the dungeon, it is common to want to pick
-it up.  In {\it NetHack}, this is accomplished automatically by walking over
-the object (unless you turn off the {\it autopickup\/}
-option (see below), or move with the `{\tt m}' prefix (see above)), or
-manually by using the `{\tt ,}' command.
+it up.  In {\it NetHack}, this is accomplished by using the `{\tt ,}' command.
+If {\it autopickup\/} option is on, you will automatically pick up the object
+by walking over it, unless you move with the `{\tt m}' prefix.
 %.pg
 If you're carrying too many items, {\it NetHack\/} will tell you so and you
 won't be able to pick up anything more.  Otherwise, it will add the object(s)
@@ -3837,7 +3836,7 @@ Walking into a closed door attempts to open it (default true).
 Persistent.
 %.lp
 \item[\ib{autopickup}]
-Automatically pick up things onto which you move (default on).
+Automatically pick up things onto which you move (default off).
 Persistent.
 \\
 %.lp ""
@@ -4776,8 +4775,7 @@ Setting {\tt ascii\verb+_+map} to {\it True\/} forces
 %.lp
 \item[\ib{color}]
 If {\it NetHack\/} can, it should display color for different monsters,
-objects, and dungeon features.
-
+objects, and dungeon features (default on).
 %.lp
 \item[\ib{eight\verb+_+bit\verb+_+tty}]
 Pass eight-bit character values (for example, specified with the

diff --git a/doc/fixes37.0 b/doc/fixes37.0
index 46870f52458ec5c4b33484ab7353747f220ca286..c550b2e30e0cf2bcaeda603297277d0de56b7a1a 100644 (file)
--- a/doc/fixes37.0
+++ b/doc/fixes37.0
@@ -540,6 +540,7 @@ when moving the cursor to examine the map, have '^' move to next trap even if
 change valkyrie and warrior (valk quest) monsters from chaotic to lawful
 change attendant (healer quest) monster from lawful to neutral
 quit is not longer bound to M-q
+change default value of autopickup to off and color to on
 
 
 Fixes to 3.7.0-x Problems that Were Exposed Via git Repository

diff --git a/include/optlist.h b/include/optlist.h
index 123c5ad69f0cc56120d4c763e19717f47a4536ca..416eb63d21a11fc325e15b68ce1a3a28af44c450 100644 (file)
--- a/include/optlist.h
+++ b/include/optlist.h
@@ -105,7 +105,7 @@ opt_##a,
                 &flags.autodig)
     NHOPTB(autoopen, 0, opt_out, set_in_game, On, Yes, No, No, NoAlias,
                 &flags.autoopen)
-    NHOPTB(autopickup, 0, opt_out, set_in_game, On, Yes, No, No, NoAlias,
+    NHOPTB(autopickup, 0, opt_out, set_in_game, Off, Yes, No, No, NoAlias,
                 &flags.pickup)
     NHOPTO("autopickup exceptions", o_autopickup_exceptions, BUFSZ, opt_in,
            set_in_game, No, Yes, No, NoAlias, "edit autopickup exceptions")
@@ -141,7 +141,7 @@ opt_##a,
                 &iflags.clicklook)
     NHOPTB(cmdassist, 0, opt_out, set_in_game, On, Yes, No, No, NoAlias,
                 &iflags.cmdassist)
-    NHOPTB(color, 0, opt_in, set_in_game, Off, Yes, No, No, "colour",
+    NHOPTB(color, 0, opt_in, set_in_game, On, Yes, No, No, "colour",
                 &iflags.wc_color)
     NHOPTB(confirm, 0, opt_out, set_in_game, On, Yes, No, No, NoAlias,
                 &flags.confirm)