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

Merge branch 'feature/sounds' of https://github.com/NullCGT/NetHack into NullCGT-minotaurs-pr298

Browse Source
This commit is contained in:
nhmall
2020-02-09 20:38:22 -05:00
parent 89c1b09d70 a634dd01b6
commit 9b0ded6ff6
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/monflag.h
View File

@@ -45,7 +45,8 @@
#define MS_PRIEST 36 /* ask for contribution; do cleansing */ #define MS_PRIEST 36 /* ask for contribution; do cleansing */
#define MS_SPELL 37 /* spellcaster not matching any of the above */ #define MS_SPELL 37 /* spellcaster not matching any of the above */
#define MS_WERE 38 /* lycanthrope in human form */ #define MS_WERE 38 /* lycanthrope in human form */
#define MS_BOAST 39 /* giants */ #define MS_MOO 39 /* minotaurs */
#define MS_BOAST 40 /* giants */
#define MR_FIRE 0x01 /* resists fire */ #define MR_FIRE 0x01 /* resists fire */
#define MR_COLD 0x02 /* resists cold */ #define MR_COLD 0x02 /* resists cold */

2
src/monst.c
View File

@@ -1449,7 +1449,7 @@ struct permonst _mons2[] = {
MON("minotaur", S_GIANT, LVL(15, 15, 6, 0, 0), (G_GENO | G_NOGEN), MON("minotaur", S_GIANT, LVL(15, 15, 6, 0, 0), (G_GENO | G_NOGEN),
A(ATTK(AT_CLAW, AD_PHYS, 3, 10), ATTK(AT_CLAW, AD_PHYS, 3, 10), A(ATTK(AT_CLAW, AD_PHYS, 3, 10), ATTK(AT_CLAW, AD_PHYS, 3, 10),
ATTK(AT_BUTT, AD_PHYS, 2, 8), NO_ATTK, NO_ATTK, NO_ATTK), ATTK(AT_BUTT, AD_PHYS, 2, 8), NO_ATTK, NO_ATTK, NO_ATTK),
SIZ(1500, 700, MS_SILENT, MZ_LARGE), 0, 0, SIZ(1500, 700, MS_MOO, MZ_LARGE), 0, 0,
M1_ANIMAL | M1_HUMANOID | M1_CARNIVORE, M1_ANIMAL | M1_HUMANOID | M1_CARNIVORE,
M2_HOSTILE | M2_STRONG | M2_NASTY, M3_INFRAVISIBLE | M3_INFRAVISION, M2_HOSTILE | M2_STRONG | M2_NASTY, M3_INFRAVISIBLE | M3_INFRAVISION,
17, CLR_BROWN), 17, CLR_BROWN),

9
src/sounds.c
View File

@@ -339,6 +339,9 @@ register struct monst *mtmp;
case MS_WAIL: case MS_WAIL:
ret = "wail"; ret = "wail";
break; break;
case MS_MOO:
ret = "low";
break;
case MS_SILENT: case MS_SILENT:
ret = "commotion"; ret = "commotion";
break; break;
@@ -750,6 +753,12 @@ register struct monst *mtmp;
#endif #endif
} }
break; break;
case MS_MOO:
if (!mtmp->mpeaceful)
pline_msg = "bellows!";
else
pline_msg = "moos.";
break;
case MS_BOAST: /* giants */ case MS_BOAST: /* giants */
if (!mtmp->mpeaceful) { if (!mtmp->mpeaceful) {
switch (rn2(4)) { switch (rn2(4)) {