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

[lack of] autopickup inside shops

Browse Source 
When being inside a shop inhibits autopickup, menion that in ^X
feedback about autopickup.
This commit is contained in:
PatR
2021-02-23 02:42:28 -08:00
parent 27a0351cd2
commit 3be4e49552
2 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/fixes37.0
View File

@@ -1,4 +1,4 @@
NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.461 $ $NHDT-Date: 1614074653 2021/02/23 10:04:13 $ NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.462 $ $NHDT-Date: 1614076940 2021/02/23 10:42:20 $
General Fixes and Modified Features General Fixes and Modified Features
----------------------------------- -----------------------------------
@@ -386,6 +386,7 @@ when an explosion scatters objects, make any that fly over sinks stop there
output message when changing fastmove mode while cursor targetting output message when changing fastmove mode while cursor targetting
messages when Minetown watchmen become angry could report "you see an angry messages when Minetown watchmen become angry could report "you see an angry
guard approaching" even if he was invisible and hero can't see invis guard approaching" even if he was invisible and hero can't see invis
when autopickup is on but disabled due to being inside a shop, have ^X say so
Fixes to 3.7.0-x Problems that Were Exposed Via git Repository Fixes to 3.7.0-x Problems that Were Exposed Via git Repository

21
src/insight.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.7 insight.c $NHDT-Date: 1608115734 2020/12/16 10:48:54 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.23 $ */ /* NetHack 3.7 insight.c $NHDT-Date: 1614076940 2021/02/23 10:42:20 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.33 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -614,13 +614,18 @@ basics_enlightenment(int mode UNUSED, int final)
char ocl[MAXOCLASSES + 1]; char ocl[MAXOCLASSES + 1];
Strcpy(buf, "on"); Strcpy(buf, "on");
oc_to_str(flags.pickup_types, ocl); if (costly_spot(u.ux, u.uy)) {
Sprintf(eos(buf), " for %s%s%s", /* being in a shop inhibits autopickup, even 'pickup_thrown' */
*ocl ? "'" : "", *ocl ? ocl : "all types", *ocl ? "'" : ""); Strcat(buf, ", but temporarily disabled while inside the shop");
if (flags.pickup_thrown && *ocl) /* *ocl: don't show if 'all types' */ } else {
Strcat(buf, " plus thrown"); oc_to_str(flags.pickup_types, ocl);
if (g.apelist) Sprintf(eos(buf), " for %s%s%s", *ocl ? "'" : "",
Strcat(buf, ", with exceptions"); *ocl ? ocl : "all types", *ocl ? "'" : "");
if (flags.pickup_thrown && *ocl)
Strcat(buf, " plus thrown"); /* show when not 'all types' */
if (g.apelist)
Strcat(buf, ", with exceptions");
}
} else } else
Strcpy(buf, "off"); Strcpy(buf, "off");
enl_msg("Autopickup ", "is ", "was ", buf, ""); enl_msg("Autopickup ", "is ", "was ", buf, "");