From: nethack.allison <nethack.allison>
Date: Sat, 4 Jan 2003 17:37:09 +0000 (+0000)
Subject: silver dragon colour
X-Git-Tag: MOVE2GIT~2257
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b4a65cab8f6f829c379856cdad5cf934f6d18f74;p=nethack

silver dragon colour

Back in 2000 "Pat Rankin" wrote:
>      From a user (in a message which had several unrelated things):
>
> > I think the colour of silver dragon scales / scale mail should not be
> > SILVER (which is not a colour), but HI_SILVER. Of course the colour of
> > silver dragons would have to be adjusted to match this.
>
> I don't normally have access to a color display, so I hadn't noticed
> that silver dragons are CLR_BRIGHT_CYAN.  It is pure coincidence
> that material SILVER happens to have the same numeric value as that.
> Is bright cyan intentional, to make them distinguishable from gray
> dragons (since color HI_SILVER is defined to be the same as CLR_GRAY)?
> Or was it done for the monsters just because the corresponding objects
> accidentally had the wrong value?  It seems to me that they ought to
> be the same shade of silver (ie, gray) as other silver things, even
> if that makes them look identical to gray dragons.

Using the material value SILVER in the "color"
field was wrong, no matter what the reason. I
suspect it was probably a mistake originally.

This patch does not alter the displayed colour for the
bug-fix release, but does correct the misuse of the
material.
---

diff --git a/include/color.h b/include/color.h
index f791ffadc..2fe85d11c 100644
--- a/include/color.h
+++ b/include/color.h
@@ -46,6 +46,7 @@
 #define HI_PAPER	CLR_WHITE
 #define HI_GLASS	CLR_BRIGHT_CYAN
 #define HI_MINERAL	CLR_GRAY
+#define DRAGON_SILVER	CLR_BRIGHT_CYAN
 #define HI_ZAP		CLR_BRIGHT_BLUE
 
 #endif /* COLOR_H */
diff --git a/src/monst.c b/src/monst.c
index 40f004351..22e99d7d4 100644
--- a/src/monst.c
+++ b/src/monst.c
@@ -1194,7 +1194,7 @@ NEARDATA struct permonst mons[] = {
 	  NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
 	SIZ(1500, 500, 0, MS_ROAR, MZ_HUGE), 0, 0,
 	M1_FLY|M1_THICK_HIDE|M1_NOHANDS|M1_CARNIVORE,
-	M2_HOSTILE|M2_STRONG|M2_GREEDY|M2_JEWELS, 0, CLR_BRIGHT_CYAN),
+	M2_HOSTILE|M2_STRONG|M2_GREEDY|M2_JEWELS, 0, DRAGON_SILVER),
 #if 0	/* DEFERRED */
     MON("baby shimmering dragon", S_DRAGON,
 	LVL(12, 9, 2, 10, 0), G_GENO,
@@ -1202,7 +1202,7 @@ NEARDATA struct permonst mons[] = {
 	  NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK),
 	SIZ(1500, 500, 0, MS_ROAR, MZ_HUGE), 0, 0,
 	M1_FLY|M1_THICK_HIDE|M1_NOHANDS|M1_CARNIVORE,
-	M2_HOSTILE|M2_STRONG|M2_GREEDY|M2_JEWELS, 0, CLR_CYAN),
+	M2_HOSTILE|M2_STRONG|M2_GREEDY|M2_JEWELS, 0, DRAGON_SILVER),
 #endif
     MON("baby red dragon", S_DRAGON,
 	LVL(12, 9, 2, 10, 0), G_GENO,
@@ -1271,7 +1271,7 @@ NEARDATA struct permonst mons[] = {
 	M1_FLY|M1_THICK_HIDE|M1_NOHANDS|M1_SEE_INVIS|M1_OVIPAROUS|
 	  M1_CARNIVORE,
 	M2_HOSTILE|M2_STRONG|M2_NASTY|M2_GREEDY|M2_JEWELS|M2_MAGIC,
-	0, CLR_BRIGHT_CYAN),
+	0, DRAGON_SILVER),
 #if 0	/* DEFERRED */
     MON("shimmering dragon", S_DRAGON,
 	LVL(15, 9, -1, 20, 4), (G_GENO|1),
diff --git a/src/objects.c b/src/objects.c
index de69a05be..1b18a3d52 100644
--- a/src/objects.c
+++ b/src/objects.c
@@ -332,7 +332,7 @@ HELM("helm of telepathy", "visored helmet",
 /* 3.4.1: dragon scale mail reclassified as "magic" since magic is
    needed to create them */
 DRGN_ARMR("gray dragon scale mail",   1, ANTIMAGIC,  1200, 1, CLR_GRAY),
-DRGN_ARMR("silver dragon scale mail", 1, REFLECTING, 1200, 1, SILVER),
+DRGN_ARMR("silver dragon scale mail", 1, REFLECTING, 1200, 1, DRAGON_SILVER),
 #if 0	/* DEFERRED */
 DRGN_ARMR("shimmering dragon scale mail", 1, DISPLACED, 1200, 1, CLR_CYAN),
 #endif
@@ -348,7 +348,7 @@ DRGN_ARMR("yellow dragon scale mail", 1, ACID_RES,    900, 1, CLR_YELLOW),
 /* 3.4.1: dragon scales left classified as "non-magic"; they confer
    magical properties but are produced "naturally" */
 DRGN_ARMR("gray dragon scales",   0, ANTIMAGIC,  700, 7, CLR_GRAY),
-DRGN_ARMR("silver dragon scales", 0, REFLECTING, 700, 7, SILVER),
+DRGN_ARMR("silver dragon scales", 0, REFLECTING, 700, 7, DRAGON_SILVER),
 #if 0	/* DEFERRED */
 DRGN_ARMR("shimmering dragon scales", 0, DISPLACED,  700, 7, CLR_CYAN),
 #endif