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

Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource

Browse Source 
Conflicts:
	src/artifact.c
This commit is contained in:
nhmall
2015-05-28 21:56:42 -04:00
parent b46e61d486 29617ada12
commit 3bb9ea62db
2 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/artifact.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 artifact.c $NHDT-Date: 1432512770 2015/05/25 00:12:50 $ $NHDT-Branch: master $:$NHDT-Revision: 1.86 $ */ /* NetHack 3.6 artifact.c $NHDT-Date: 1432863398 2015/05/29 01:36:38 $ $NHDT-Branch: master $:$NHDT-Revision: 1.87 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1813,15 +1813,24 @@ Sting_effects(orc_count)
int orc_count; int orc_count;
{ {
if (uwep && uwep->oartifact == ART_STING) { if (uwep && uwep->oartifact == ART_STING) {
/*
* Toggling blindness in between warning messages can result in
* Sting glows light blue! [...] Sting stops quivering.
* or
* Sting quivers slightly. [...] Sting stops glowing.
* but addressing that is far more trouble than it's worth.
*/
if (orc_count > 0 && warn_obj_cnt == 0) { if (orc_count > 0 && warn_obj_cnt == 0) {
if (!Blind) { if (!Blind)
pline("%s %s %s!", bare_artifactname(uwep), otense(uwep, "glow"), pline("%s %s %s!", bare_artifactname(uwep),
otense(uwep, "glow"),
hcolor(NH_LIGHT_BLUE)); hcolor(NH_LIGHT_BLUE));
} else if (!Deaf) { else
pline("A very faint portamento briefly emanates from %s!", bare_artifactname(uwep)); pline("%s quivers slightly.", bare_artifactname(uwep));
} } else if (orc_count == 0 && warn_obj_cnt > 0) {
} else if (orc_count == 0 && warn_obj_cnt > 0 && !Blind) pline("%s stops %s.", bare_artifactname(uwep),
pline("%s stops glowing.", bare_artifactname(uwep)); !Blind ? "glowing" : "quivering");
}
} }
} }

9
src/display.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 display.c $NHDT-Date: 1432536528 2015/05/25 06:48:48 $ $NHDT-Branch: master $:$NHDT-Revision: 1.54 $ */ /* NetHack 3.6 display.c $NHDT-Date: 1432863399 2015/05/29 01:36:39 $ $NHDT-Branch: master $:$NHDT-Revision: 1.55 $ */
/* Copyright (c) Dean Luick, with acknowledgements to Kevin Darcy */ /* Copyright (c) Dean Luick, with acknowledgements to Kevin Darcy */
/* and Dave Cohrs, 1990. */ /* and Dave Cohrs, 1990. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -1141,11 +1141,8 @@ see_monsters()
newsym(mon->mx, mon->my); newsym(mon->mx, mon->my);
if (mon->wormno) if (mon->wormno)
see_wsegs(mon); see_wsegs(mon);
if (MATCH_WARN_OF_MON(mon)) { if (Warn_of_mon && (context.warntype.obj & mon->data->mflags2) != 0L)
if (context.warntype.obj new_warn_obj_cnt++;
&& (context.warntype.obj & mon->data->mflags2))
new_warn_obj_cnt++;
}
} }
/* /*
* Make Sting glow blue or stop glowing if required. * Make Sting glow blue or stop glowing if required.