From 7efdec7f5e56202eeb28989d4a6ff82f5568dc88 Mon Sep 17 00:00:00 2001 From: PatR Date: Mon, 4 Nov 2019 10:42:14 -0800 Subject: [PATCH] fix symset:curses S_tree Symbol set changes... curses: S_tree (use plus-or-minus sign instead of accidental horizontal line); S_bars (switch from default '#' to not-equals sign); DECgraphics: S_altar (switch from default '_' to 'pi'); S_bars (switch from 'pi' to not-equals sign); DECgraphics_2: get rid of this commented out set since its contents are now folded into DECgraphics. (The IBMgraphics one is just whitespace; delete a that precedes a .) --- dat/symbols | 31 ++++++------------------------- doc/fixes36.3 | 10 +++++++--- 2 files changed, 13 insertions(+), 28 deletions(-) diff --git a/dat/symbols b/dat/symbols index ae22419c5..06aa31f66 100644 --- a/dat/symbols +++ b/dat/symbols @@ -1,4 +1,4 @@ -# NetHack 3.6 symbols $NHDT-Date: 1571314611 2019/10/17 12:16:51 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.20 $ +# NetHack 3.6 symbols $NHDT-Date: 1572892906 2019/11/04 18:41:46 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.21 $ # Copyright (c) 2006 by Michael Allison # NetHack may be freely redistributed. See license for details. # @@ -340,7 +340,7 @@ start: IBMgraphics S_pool: \xf7 # meta-w, approx. equals S_ice: \xfa # meta-z, centered dot S_lava: \xf7 # meta-w, approx. equals - S_vodbridge: \xfa # meta-z, centered dot + S_vodbridge: \xfa # meta-z, centered dot S_hodbridge: \xfa # meta-z, centered dot S_water: \xf7 # meta-w, approx. equals S_vbeam: \xb3 # meta-3, vertical rule @@ -548,7 +548,8 @@ start: curses S_tlwall: \xf5 # meta-u, T left S_trwall: \xf4 # meta-t, T right S_ndoor: \xfe # meta-z, centered dot - S_tree: \xf1 # plus or minus symbol + S_bars: \xfc # meta-|, not-equals sign (was '#') + S_tree: \xe7 # meta-g, plus or minus sign S_room: \xfe # meta-z, centered dot S_corr: \xe1 # meta-a, solid block S_litcorr: \xe1 # meta-a, solid block @@ -581,11 +582,12 @@ start: DECgraphics S_ndoor: \xfe # meta-~, centered dot S_vodoor: \xe1 # meta-a, solid block S_hodoor: \xe1 # meta-a, solid block - S_bars: \xfb # meta-{, small pi + S_bars: \xfc # meta-|, not-equals (used to be pi) S_tree: \xe7 # meta-g, plus-or-minus S_room: \xfe # meta-~, centered dot S_upladder: \xf9 # meta-y, less-than-or-equals S_dnladder: \xfa # meta-z, greater-than-or-equals + S_altar: \xfb # meta-{, pi (used to default to '_') S_pool: \xe0 # meta-\, diamond S_ice: \xfe # meta-~, centered dot S_lava: \xe0 # meta-\, diamond @@ -604,27 +606,6 @@ start: DECgraphics S_explode8: \xf3 # meta-s, low horizontal line finish -# -# This is commented out because specifying alternate default set isn't -# implemented. -# -# DECgraphics_2: underscore (default for altar) can be hard to see if -# hero or highlighted pet is on the spot below (south of) it, making -# it look like part of slightly bigger block cursor. Bars are usually -# within walls and we have something else for doorless doorway so '#' -# for bars shouldn't be mistaken for the corridor symbol even by someone -# used to DECgraphics, at least not often enough to pose a problem. -# The pi symbol is small like lowercase but flat-topped like uppercase -# so could represent a side view of a raised platform or table. -# -# start: DECgraphics_2 -# Defaults: DECgraphics # includes 'Handling: DEC' -# Description: variation of DECgraphics (iron bars:#, altar:pi) -# S_bars: '#' # (switch from pi to plain '#') -# S_altar: \xfb # meta-{, pi (switch from underscore) -# finish -# - start: MACgraphics # Description: (pre-OSX: obsolete?) # Restrictions: primary diff --git a/doc/fixes36.3 b/doc/fixes36.3 index 4a144a25e..5c88d0381 100644 --- a/doc/fixes36.3 +++ b/doc/fixes36.3 @@ -1,4 +1,4 @@ -$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.157 $ $NHDT-Date: 1572887643 2019/11/04 17:14:03 $ +$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.159 $ $NHDT-Date: 1572892926 2019/11/04 18:42:06 $ 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, @@ -240,6 +240,8 @@ surviving death while polymorphed would yield "You are a " without 'mksobj failure' commit resulted in wrong corpse types for dying monsters a recent intended sanity check fix inadvertently bypassed placing a thrown chained ball back onto the floor +in symset:curses, symbol S_tree was accidentally set to horizontal line where + plus-or-minus sign was meant; also, change S_bars to not-equals sign curses: sometimes the message window would show a blank line after a prompt curses: the change to show map in columns 1..79 instead of 2..80 made the highlight for '@' show up in the wrong place if clipped map had been @@ -391,9 +393,11 @@ curses+'perm_invent': since persistent inventory is narrow, strip off "a", curses+'curses': change the curses map display to use new symbol set 'curses' instead of hard-coded values; it attempts to show IBMgraphics-style map using DECgraphics characters; DECgraphics can also be used as-is -fulfill a request from a blind player to have a unique overriding SYMBOL for pets - and for the player +fulfill a request from a blind player to have a unique overriding SYMBOL for + pets and for the player ROGUESYMBOLS can be overridden in config files like SYMBOLS can +in symset:DECgraphics, set S_altar to 'pi' (was default '_'), S_bars to + not-equals sign (was 'pi') NetHack Community Patches (or Variation) Included