From: PatR <rankin@nethack.org>
Date: Sat, 11 Jun 2016 07:16:11 +0000 (-0700)
Subject: dat/symbols: RogueEpyx
X-Git-Tag: NetHack-3.6.1_RC01~686
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ad584523fdff06670068d76b349405df0aa96fd;p=nethack

dat/symbols: RogueEpyx

I don't know whether this fixes #H4335 but it does eliminate a
bunch of duplicate symbol entries.  And the two whose duplicates
had different values are suspicious ones: using linefeed and tab as
the character for object class symbol, which could easily confuse
the tty interface's cursor position tracking.  But those should
have been overridden by the later entries which specified the
default object class characters--I couldn't find anything in symbol
processing which would cause it to keep the first value instead of
replacing that with the second one.

The report had a link to screen shot which showed a door (I think
an open one despite the '+' shape) in the corner inside a room,
something like
 --+-----------
 |            |
 |       =
 |          ..##
 |          .+#
 ----+---------
where the '+#' in the lower right looks like it belongs two rows up
and one column over, the upper left of the three '#' is white and
the other two gray (lit corridor or empty dooryway or what?), the
'=' is actually three horizontal bars in green, and the lower '.'
has the cursor on it.  There aren't any object class symbols shown
(unless the triple-barred = is one), so linefeed and tab don't look
like likely culprits.
---

diff --git a/dat/symbols b/dat/symbols
index 4e308a0e2..58699a8c5 100644
--- a/dat/symbols
+++ b/dat/symbols
@@ -194,20 +194,6 @@ start: RogueEpyx
 	Restrictions: rogue
 	Handling: IBM
 	Color: Yes
-	S_weapon: \x18			# up arrow
-	S_armor: \x0a			# Vert rect with o
-	S_ring: \x09			# circle with arrow
-	S_amulet: \x0c			# "female" symbol
-	S_food: \x05			# club (as in cards)
-	S_potion: \xad			# upside down '!'
-	S_scroll: \x0e			# musical note
-	S_wand: \xe7			# greek tau
-	S_coin: \x0f			# yes it's the same as gems
-	S_gem: \x0f			# fancy '*'
-	S_rock: \x60
-	S_ball: \x30
-	S_chain: \x5f
-	S_venom: \x2e
 	S_vwall: \xba			# all walls now use
 	S_hwall: \xcd			# double line graphics
 	S_tlcorn: \xc9 
@@ -249,18 +235,24 @@ start: RogueEpyx
 	S_magic_trap: \x04 
 	S_anti_magic_trap: \x04 
 	S_polymorph_trap: \x04 
-	S_weapon: \x18
-	S_armor: \x5b
-	S_ring: \x3d
-	S_amulet: \xc
-	S_tool: \x28
-	S_food: \x5
-	S_potion: \xad
-	S_scroll: \xe
-	S_book: \x2b
-	S_wand: \xe7
-	S_coin: \xf
-	S_gem: \xf
+	S_weapon: \x18			# up arrow
+# ^J	S_armor: \x0a			# Vert rect with o
+	S_armor: \x5b			# default: '['
+# ^I	S_ring: \x09			# circle with arrow
+	S_ring: \x3d			# default: '='
+	S_amulet: \x0c			# "female" symbol
+	S_tool: \x28			# default: '('
+	S_food: \x05			# club (as in cards)
+	S_potion: \xad			# upside down '!'
+	S_scroll: \x0e			# musical note
+	S_book: \x2b			# default: '+'
+	S_wand: \xe7			# greek tau
+	S_coin: \x0f			# yes it's the same as gems
+	S_gem: \x0f			# fancy '*'
+	S_rock: \x60
+	S_ball: \x30
+	S_chain: \x5f
+	S_venom: \x2e
 	S_rock: \x60
 	S_ball: \x30
 	S_chain: \x5f