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

zap colors

Browse Source 
One of the comments for pull request #234 mentions that the colors
for sleep and poison are backwards.  Yellow dragons had green breath.
Green dragons would have had yellow breath if they used the normal
zap symbols, but they use the poison cloud one which is green so
they had green breath.  I rarely have color enabled and had never
noticed.  (At the moment I can't find where the switch from zap to
cloud is being done.)

Pull request #234 is based on #231, about control of the shield
effect animation when resisting.  But it changes struct flags so
would break 3.6.x save file compatibility.
This commit is contained in:
PatR
2019-10-17 15:50:33 -07:00
parent 70c9b801bd
commit 389c496055
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/fixes36.3
View File

@@ -1,4 +1,4 @@
$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.139 $ $NHDT-Date: 1571313651 2019/10/17 12:00:51 $
$NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.140 $ $NHDT-Date: 1571352531 2019/10/17 22:48:51 $
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,
@@ -187,6 +187,7 @@ fix launched rolling boulder code accessing deleted trap
fix monster stepping on a land mine code accessing deleted trap
revise 'O' to show symbol sets in the same order they appear in the symbols
file and order the sets in dat/symbols to yield a sensible symset menu
yellow dragons had green breath
Fixes to Post-3.6.2 Problems that Were Exposed Via git Repository

9
src/decl.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 decl.c $NHDT-Date: 1547025164 2019/01/09 09:12:44 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.141 $ */
/* NetHack 3.6 decl.c $NHDT-Date: 1571352532 2019/10/17 22:48:52 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.146 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Michael Allison, 2009. */
/* NetHack may be freely redistributed. See license for details. */
@@ -168,6 +168,7 @@ NEARDATA struct obj
#ifdef TEXTCOLOR
/*
* This must be the same order as used for buzz() in zap.c.
* (They're only used in mapglyph.c so probably shouldn't be here.)
*/
const int zapcolors[NUM_ZAP] = {
HI_ZAP, /* 0 - missile */
@@ -176,8 +177,10 @@ const int zapcolors[NUM_ZAP] = {
HI_ZAP, /* 3 - sleep */
CLR_BLACK, /* 4 - death */
CLR_WHITE, /* 5 - lightning */
CLR_YELLOW, /* 6 - poison gas */
CLR_GREEN, /* 7 - acid */
/* 3.6.3: poison gas zap used to be yellow and acid zap was green,
which conflicted with the corresponding dragon colors */
CLR_GREEN, /* 6 - poison gas */
CLR_YELLOW, /* 7 - acid */
};
#endif /* text color */