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

Merge branch 'NetHack-3.6'

Browse Source
This commit is contained in:
nhmall
2019-11-21 23:50:01 -05:00
parent 3545374e9c a62d6145bd
commit 39bc7e9bb9
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dat/bogusmon.txt
+4 -1
View File
@@ -1,4 +1,4 @@
# NetHack 3.6 bogusmon.txt $NHDT-Date: 1524689579 2018/04/25 20:52:59 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.7 $ # NetHack 3.6 bogusmon.txt $NHDT-Date: 1574387024 2019/11/22 01:43:44 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.8 $
# Copyright (c) 2016 by Pasi Kallinen # Copyright (c) 2016 by Pasi Kallinen
# NetHack may be freely redistributed. See license for details. # NetHack may be freely redistributed. See license for details.
# #
@@ -189,6 +189,9 @@ Dalek
microscopic space fleet microscopic space fleet
Ravenous Bugblatter Beast of Traal Ravenous Bugblatter Beast of Traal
# The Tough Guide to Fantasyland
leathery-winged avian
# TMNT # TMNT
teenage mutant ninja turtle teenage mutant ninja turtle
doc/fixes36.3
+2 -1
View File
@@ -1,4 +1,4 @@
$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.184 $ $NHDT-Date: 1574107001 2019/11/18 19:56:41 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.187 $ $NHDT-Date: 1574387029 2019/11/22 01:43:49 $
This fixes36.3 file is here to capture information about updates in the 3.6.x 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, lineage following the release of 3.6.2 in May 2019. Please note, however,
@@ -291,6 +291,7 @@ Fixes post-beta1
fix several tribute typos fix several tribute typos
pluralization correction for unlikely epoch and loch pluralization correction for unlikely epoch and loch
ensure that --showpaths displays the personal configuration file last ensure that --showpaths displays the personal configuration file last
don't strip leading slash from hallucinatory monster name "/b/tard"
unix: Fix double DLB definition in linux hints file unix: Fix double DLB definition in linux hints file
windows: fix --showpaths output for the data file which relies on being windows: fix --showpaths output for the data file which relies on being
constructed programmatically to incorporate the version suffix constructed programmatically to incorporate the version suffix
src/do_name.c
+5 -4
View File
@@ -1,4 +1,4 @@
/* NetHack 3.6 do_name.c $NHDT-Date: 1573940540 2019/11/16 21:42:20 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.150 $ */ /* NetHack 3.6 do_name.c $NHDT-Date: 1574387027 2019/11/22 01:43:47 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.151 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Pasi Kallinen, 2018. */ /*-Copyright (c) Pasi Kallinen, 2018. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1733,8 +1733,8 @@ boolean called;
Strcat(buf, "saddled "); Strcat(buf, "saddled ");
has_adjectives = (buf[0] != '\0'); has_adjectives = (buf[0] != '\0');
/* Put the actual monster name or type into the buffer now */ /* Put the actual monster name or type into the buffer now.
/* Be sure to remember whether the buffer starts with a name */ Remember whether the buffer starts with a personal name. */
if (do_hallu) { if (do_hallu) {
char rnamecode; char rnamecode;
char *rname = rndmonnam(&rnamecode); char *rname = rndmonnam(&rnamecode);
@@ -2014,11 +2014,12 @@ static char *
bogusmon(buf, code) bogusmon(buf, code)
char *buf, *code; char *buf, *code;
{ {
static const char bogon_codes[] = "-_+|="; /* see dat/bonusmon.txt */
char *mname = buf; char *mname = buf;
get_rnd_text(BOGUSMONFILE, buf, rn2_on_display_rng); get_rnd_text(BOGUSMONFILE, buf, rn2_on_display_rng);
/* strip prefix if present */ /* strip prefix if present */
if (!letter(*mname)) { if (index(bogon_codes, *mname)) {
if (code) if (code)
*code = *mname; *code = *mname;
++mname; ++mname;