Merge branch 'NetHack-3.6'

.travis.yml

@@ -81,6 +81,9 @@ matrix:
         - export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/lib/$WKITVER/ucrt/x86:$LIB
         - export LIB=/c/Program\ Files\ \(x86\)/Windows\ Kits/10/lib/$WKITVER/um/x86:$LIB
 #       - export
+        - git clone --depth 1 https://github.com/wmcbrine/PDCurses.git ../pdcurses
+        - export ADD_CURSES=Y
+        - export PDCURSES_TOP=../../pdcurses
         - cd src
         - cp ../sys/winnt/Makefile.msc ./Makefile
         - nmake install
@@ -88,6 +91,9 @@ matrix:
 #     install: choco install mingw
       env: HINTS=windows-mingw
       script:
+        - git clone --depth 1 https://github.com/wmcbrine/PDCurses.git ../pdcurses
+        - export ADD_CURSES=Y
+        - export PDCURSES_TOP=../../pdcurses
         - cd src
         - cp ../sys/winnt/Makefile.gcc ./Makefile
         - mingw32-make install

doc/fixes36.3

@@ -1,4 +1,4 @@
-$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.78 $ $NHDT-Date: 1561766416 2019/06/29 00:00:16 $
+$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.79 $ $NHDT-Date: 1561917056 2019/06/30 17:50:56 $
 
 This fixes36.3 file is here to capture information about updates in the 3.6.x
 lineage following the release of 3.6.2 in May 2019. Please note, however,
@@ -92,6 +92,8 @@ wizard mode ^I with 'perm_invent' On would unintentionally filter the content
 change #adjust to treat carrying only gold as not having anything to adjust
 saving bones with 'perm_invent' On could result in "Bad fruit #N" warnings
 update persistent inventory window immediately if 'sortpack' option is toggled
+grammar bit for wizard mode final disclosure; attribute section could show
+	"You had N experience points, 1 more were needed to attain level X+1."
 
 
 Fixes to Post-3.6.2 Problems that Were Exposed Via git Repository
@@ -196,6 +198,9 @@ classify sources as released, beta, or work-in-progress via NH_DEVEL_STATUS
 	rather than just released vs beta via BETA
 if you reach the edge of a level (relatively uncommon) and try to move off,
 	report that you can't go farther if the 'mention_walls' option is set
+'attributes' disclosure at end of game includes number of experience points
+	that were needed to reach the next experience level (new for normal
+	play and explore mode; previously only shown for wizard mode)
 wizard-mode: display effect to show where an unseen wished-for monster landed
 curses: enable latent mouse support
 curses: give menus and text windows a minimum size of 5x25 since tiny ones can

src/cmd.c

@@ -1,4 +1,4 @@
-/* NetHack 3.6	cmd.c	$NHDT-Date: 1561017215 2019/06/20 07:53:35 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.337 $ */
+/* NetHack 3.6	cmd.c	$NHDT-Date: 1561917056 2019/06/30 17:50:56 $  $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.338 $ */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /*-Copyright (c) Robert Patrick Rankin, 2013. */
 /* NetHack may be freely redistributed.  See license for details. */
@@ -1973,19 +1973,28 @@ int final;
         enlght_line(You_, "entered ", buf, "");
     }
     if (!Upolyd) {
-        /* flags.showexp does not matter */
+        int ulvl = (int) u.ulevel;
+        /* [flags.showexp currently does not matter; should it?] */
+
         /* experience level is already shown above */
         Sprintf(buf, "%-1ld experience point%s", u.uexp, plur(u.uexp));
-        if (wizard) {
+        /* TODO?
-            if (u.ulevel < 30) {
+         *  Remove wizard-mode restriction since patient players can
-                int ulvl = (int) u.ulevel;
+         *  determine the numbers needed without resorting to spoilers
-                long nxtlvl = newuexp(ulvl);
+         *  (even before this started being disclosed for 'final';
-                /* long oldlvl = (ulvl > 1) ? newuexp(ulvl - 1) : 0; */
+         *  just enable 'showexp' and look at normal status lines
+         *  after drinking gain level potions or eating wraith corpses
+         *  or being level-drained by vampires).
+         */
+        if (ulvl < 30 && (final || wizard)) {
+            long nxtlvl = newuexp(ulvl), delta = nxtlvl - u.uexp;
 
-                Sprintf(eos(buf), ", %ld %s%sneeded to attain level %d",
+            Sprintf(eos(buf), ", %ld %s%sneeded %s level %d",
-                        (nxtlvl - u.uexp), (u.uexp > 0) ? "more " : "",
+                    delta, (u.uexp > 0) ? "more " : "",
-                        !final ? "" : "were ", (ulvl + 1));
+                    /* present tense=="needed", past tense=="were needed" */
-            }
+                    !final ? "" : (delta == 1L) ? "was " : "were ",
+                    /* "for": grammatically iffy but less likely to wrap */
+                    (ulvl < 18) ? "to attain" : "for", (ulvl + 1));
         }
         you_have(buf, "");
     }

win/win32/vs2017/NetHack.vcxproj

@@ -31,7 +31,7 @@
   <ItemDefinitionGroup Condition="Exists('$(PDCURSES)')">
     <ClCompile>
       <AdditionalIncludeDirectories>$(PDCURSES);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>CURSES_GRAPHICS;CHTYPE_32;PDC_NCMOUSE;CURSES_DEFINE_ERASE_CHAR;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>CURSES_GRAPHICS;CHTYPE_32;PDC_NCMOUSE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>$(ToolsDir)</AdditionalLibraryDirectories>