Skip to content

Commit 0e306ab

Browse files
committed
Minor monster color changes.
From NetHack 3.7 git commits 6e2fa24 and 3b2d3ea. This changes the colors of a couple demons (vrock, hezrou) and canine types (wolf, warg, werewolf in animal form) so they're more distinct from other monsters using the same glyph. Vanilla pulled over EvilHack's color changes for the Riders, the Wizard and flayers, seemed appropriate to keep in line with what they're doing in the same space.
1 parent f9ba45f commit 0e306ab

File tree

3 files changed

+32
-31
lines changed

3 files changed

+32
-31
lines changed

doc/evilhack-changelog.md

+1
Original file line numberDiff line numberDiff line change
@@ -3372,4 +3372,5 @@ The following changes to date are:
33723372
- Fix: artifact rings have a fixed material
33733373
- Revert: artifact rings have a fixed material
33743374
- Fix: artifact rings have a fixed material, take two
3375+
- Minor monster color changes
33753376

src/monst.c

+5-5
Original file line numberDiff line numberDiff line change
@@ -307,13 +307,13 @@ NEARDATA struct permonst mons[] = {
307307
NO_ATTK),
308308
SIZ(500, 250, MS_BARK, MZ_MEDIUM), 0, 0,
309309
M1_ANIMAL | M1_NOHANDS | M1_CARNIVORE, M2_HOSTILE, M3_INFRAVISIBLE,
310-
0, 0, 6, CLR_BROWN),
310+
0, 0, 6, CLR_GRAY),
311311
MON("werewolf", S_DOG, LVL(5, 12, 4, 20, -7), (G_NOGEN | G_NOCORPSE),
312312
A(ATTK(AT_BITE, AD_WERE, 2, 6), NO_ATTK, NO_ATTK, NO_ATTK, NO_ATTK,
313313
NO_ATTK),
314314
SIZ(500, 250, MS_BARK, MZ_MEDIUM), MR_POISON, 0,
315315
M1_NOHANDS | M1_POIS | M1_REGEN | M1_CARNIVORE,
316-
M2_NOPOLY | M2_HOSTILE, M3_INFRAVISIBLE, 0, MH_WERE, 7, CLR_BROWN),
316+
M2_NOPOLY | M2_HOSTILE, M3_INFRAVISIBLE, 0, MH_WERE, 7, CLR_GRAY),
317317
MON("winter wolf cub", S_DOG, LVL(5, 12, 4, 0, -5),
318318
(G_NOHELL | G_GENO | G_SGROUP | 2),
319319
A(ATTK(AT_BITE, AD_PHYS, 1, 8), ATTK(AT_BREA, AD_COLD, 1, 6), NO_ATTK,
@@ -326,7 +326,7 @@ NEARDATA struct permonst mons[] = {
326326
NO_ATTK),
327327
SIZ(850, 350, MS_BARK, MZ_LARGE), 0, 0,
328328
M1_ANIMAL | M1_NOHANDS | M1_CARNIVORE, M2_HOSTILE,
329-
M3_INFRAVISIBLE, 0, 0, 8, CLR_BROWN),
329+
M3_INFRAVISIBLE, 0, 0, 8, CLR_BLACK),
330330
MON("winter wolf", S_DOG, LVL(7, 12, 4, 20, 0), (G_NOHELL | G_GENO | 1),
331331
A(ATTK(AT_BITE, AD_PHYS, 2, 6), ATTK(AT_BREA, AD_COLD, 2, 6), NO_ATTK,
332332
NO_ATTK, NO_ATTK, NO_ATTK),
@@ -3453,14 +3453,14 @@ struct permonst _mons2[] = {
34533453
ATTK(AT_BITE, AD_PHYS, 1, 6), NO_ATTK),
34543454
SIZ(WT_HUMAN, 400, MS_SILENT, MZ_LARGE), MR_FIRE | MR_POISON, 0,
34553455
M1_FLY | M1_POIS, M2_STALK | M2_HOSTILE | M2_NASTY,
3456-
M3_INFRAVISIBLE | M3_INFRAVISION, 0, MH_DEMON, 11, CLR_RED),
3456+
M3_INFRAVISIBLE | M3_INFRAVISION, 0, MH_DEMON, 11, CLR_GREEN),
34573457
MON("hezrou", S_DEMON, LVL(9, 9, -2, 55, -10),
34583458
(G_HELL | G_NOCORPSE | G_SGROUP | 2),
34593459
A(ATTK(AT_CLAW, AD_PHYS, 1, 3), ATTK(AT_CLAW, AD_PHYS, 1, 3),
34603460
ATTK(AT_BITE, AD_PHYS, 4, 4), NO_ATTK, NO_ATTK, NO_ATTK),
34613461
SIZ(WT_HUMAN, 400, MS_SILENT, MZ_LARGE), MR_FIRE | MR_POISON, 0,
34623462
M1_HUMANOID | M1_POIS, M2_STALK | M2_HOSTILE | M2_NASTY,
3463-
M3_INFRAVISIBLE | M3_INFRAVISION, 0, MH_DEMON, 12, CLR_RED),
3463+
M3_INFRAVISIBLE | M3_INFRAVISION, 0, MH_DEMON, 12, CLR_GREEN),
34643464
MON("bone devil", S_DEMON, LVL(9, 15, -1, 40, -9),
34653465
(G_HELL | G_NOCORPSE | G_SGROUP | 2),
34663466
A(ATTK(AT_WEAP, AD_PHYS, 3, 4), ATTK(AT_STNG, AD_DRST, 2, 4), NO_ATTK,

win/share/monsters.txt

+26-26
Original file line numberDiff line numberDiff line change
@@ -581,20 +581,20 @@ Z = (195, 195, 195)
581581
# tile 29 (warg)
582582
{
583583
................
584-
...P..P....PP...
585-
...P.PP......P..
586-
..PPPP.......P.A
587-
..N.NPP......P.A
588-
.P..PPPPP....P.A
589-
PPPPDPPPPPPPPPAA
590-
DPPNDPPPPPPPPPAA
591-
..DDDPPPPPPPPPAA
592-
PNDNP.PPPPPPPPAA
593-
.PPPPAPPPPAPP.A.
594-
...PAAPPAAAAPPAA
595-
...PAAP.AAAAP.A.
596-
.PPPAAPAAAAAPAA.
597-
....PPPAA.PPPA..
584+
...P..0....P0...
585+
...0.0P......0..
586+
..0P0P.......P.A
587+
..N.N0P......0.A
588+
.P..0P0P0....P.A
589+
P0P0D0P0P0P0P0AA
590+
DP0NDP0P0P0P0PAA
591+
..DDD0P0P0P0P0AA
592+
0NDN0.0P0P0P0PAA
593+
.0P0PAP0P0A0P.A.
594+
...PAA0PAAAA0PAA
595+
...0AAP.AAAAP.A.
596+
.P0PAA0AAAAA0AA.
597+
....P0PAA.P0PA..
598598
................
599599
}
600600
# tile 30 (winter wolf)
@@ -7822,18 +7822,18 @@ Z = (195, 195, 195)
78227822
................
78237823
......OPP.O.....
78247824
......PPPP......
7825-
.....CPPDP......
7826-
....CCCPPP......
7827-
....CCPPPP......
7828-
....C..PPA......
7829-
.....DDAADD.AAA.
7830-
....DDDDDDDDAAA.
7831-
....DADDDDADAAA.
7832-
....DADDDDADAAA.
7833-
....DADDDDADAAA.
7834-
......DAADAAAA..
7835-
......DAADAA.A..
7836-
.....DDA.DDA....
7825+
.....KPPDP......
7826+
....KJJPPP......
7827+
....KJPPPP......
7828+
....K..PPA......
7829+
.....GGAAGG.AAA.
7830+
....FDFDFDFDAAA.
7831+
..G.GADGDFAGAGA.
7832+
....GAFGFGAGAAA.
7833+
..G.DADFDGAFAAA.
7834+
......GAADAAAG..
7835+
.F.G..GAAFAA.A..
7836+
.....DFA.GGA..F.
78377837
................
78387838
}
78397839
# tile 411 (hezrou)

0 commit comments

Comments
 (0)