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

R920: Weird message when stoning quest nemesis

Browse Source 
Make all the quest nemesis monsters resist stoning so their death messages
make sense.  Some already did resist.  Stoning seems like such a trivial
way to overcome a quest nemesis anyway.  If it were to be allowed, multiple
death messages would be needed in the quests.
This commit is contained in:
cohrs
2002-06-26 15:19:05 +00:00
parent 9524894d3f
commit c0f63425df
2 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/fixes34.1
View File

@@ -124,6 +124,7 @@ prevent getting stuck in infinite loop when using wizard mode #levelchange
command to reduce level while having level-drain resistance
naming an already wielded elven dagger "Sting" activates warning against orcs
naming either of the wielded weapons unintentionally ends two-weapon combat
Various nemesis monsters must resist stoning so their death messages make sense
Platform- and/or Interface-Specific Fixes

26
src/monst.c
View File

@@ -3138,7 +3138,7 @@ struct permonst _mons2[] = {
LVL(20, 12, 0, 30, -20), (G_NOGEN|G_UNIQ),
A(ATTK(AT_WEAP, AD_PHYS, 2, 6), ATTK(AT_WEAP, AD_PHYS, 2, 6),
ATTK(AT_CLAW, AD_SAMU, 2, 4), NO_ATTK, NO_ATTK, NO_ATTK),
SIZ(WT_HUMAN, 400, 0, MS_LEADER, MZ_HUMAN), 0, 0,
SIZ(WT_HUMAN, 400, 0, MS_LEADER, MZ_HUMAN), MR_STONE, 0,
M1_HUMANOID|M1_OMNIVORE,
M2_NOPOLY|M2_HUMAN|M2_PEACEFUL|M2_STRONG|M2_MALE|M2_GREEDY|
M2_JEWELS|M2_COLLECT|M2_MAGIC,
@@ -3189,8 +3189,8 @@ struct permonst _mons2[] = {
A(ATTK(AT_WEAP, AD_PHYS, 8, 4), ATTK(AT_WEAP, AD_PHYS, 4, 6),
ATTK(AT_MAGC, AD_SPEL, 0, 0), ATTK(AT_CLAW, AD_SAMU, 2, 6),
NO_ATTK, NO_ATTK),
SIZ(WT_HUMAN, 400, 0, MS_NEMESIS, MZ_LARGE), MR_FIRE|MR_POISON, 0,
M1_FLY|M1_SEE_INVIS|M1_POIS,
SIZ(WT_HUMAN, 400, 0, MS_NEMESIS, MZ_LARGE),
MR_FIRE|MR_POISON|MR_STONE, 0, M1_FLY|M1_SEE_INVIS|M1_POIS,
M2_NOPOLY|M2_DEMON|M2_STALK|M2_HOSTILE|M2_STRONG|M2_NASTY|M2_COLLECT,
M3_WANTSARTI|M3_WAITFORU|M3_INFRAVISION|M3_INFRAVISIBLE, CLR_RED),
MON("Thoth Amon", S_HUMAN,
@@ -3198,7 +3198,7 @@ struct permonst _mons2[] = {
A(ATTK(AT_WEAP, AD_PHYS, 1, 6), ATTK(AT_MAGC, AD_SPEL, 0, 0),
ATTK(AT_MAGC, AD_SPEL, 0, 0), ATTK(AT_CLAW, AD_SAMU, 1, 4),
NO_ATTK, NO_ATTK),
SIZ(WT_HUMAN, 400, 0, MS_NEMESIS, MZ_HUMAN), MR_POISON, 0,
SIZ(WT_HUMAN, 400, 0, MS_NEMESIS, MZ_HUMAN), MR_POISON|MR_STONE, 0,
M1_HUMANOID|M1_OMNIVORE,
M2_NOPOLY|M2_HUMAN|M2_PNAME|M2_STRONG|M2_MALE|M2_STALK|M2_HOSTILE|
M2_NASTY|M2_COLLECT|M2_MAGIC,
@@ -3233,7 +3233,7 @@ struct permonst _mons2[] = {
LVL(18, 12, 0, 0, -15), (G_NOGEN|G_UNIQ),
A(ATTK(AT_WEAP, AD_PHYS, 4, 8), ATTK(AT_WEAP, AD_PHYS, 4, 8),
ATTK(AT_CLAW, AD_SAMU, 2, 6), NO_ATTK, NO_ATTK, NO_ATTK),
SIZ(1900, 700, 0, MS_NEMESIS, MZ_HUGE), 0, 0,
SIZ(1900, 700, 0, MS_NEMESIS, MZ_HUGE), MR_STONE, 0,
M1_HUMANOID|M1_OMNIVORE,
M2_NOPOLY|M2_GIANT|M2_STRONG|M2_ROCKTHROW|M2_STALK|M2_HOSTILE|
M2_NASTY|M2_MALE|M2_JEWELS|M2_COLLECT,
@@ -3243,7 +3243,8 @@ struct permonst _mons2[] = {
A(ATTK(AT_BREA, AD_FIRE, 8, 6), ATTK(AT_BITE, AD_PHYS, 4, 8),
ATTK(AT_MAGC, AD_SPEL, 0, 0), ATTK(AT_CLAW, AD_PHYS, 2, 4),
ATTK(AT_CLAW, AD_SAMU, 2, 4), NO_ATTK ),
SIZ(WT_DRAGON, 1600, 0, MS_NEMESIS, MZ_GIGANTIC), MR_FIRE, MR_FIRE,
SIZ(WT_DRAGON, 1600, 0, MS_NEMESIS, MZ_GIGANTIC),
MR_FIRE|MR_STONE, MR_FIRE,
M1_FLY|M1_THICK_HIDE|M1_NOHANDS|M1_CARNIVORE|M1_SEE_INVIS,
M2_NOPOLY|M2_PNAME|M2_HOSTILE|M2_STRONG|M2_NASTY|M2_STALK|
M2_GREEDY|M2_JEWELS|M2_MAGIC,
@@ -3253,7 +3254,8 @@ struct permonst _mons2[] = {
A(ATTK(AT_CLAW, AD_PHYS, 16, 2), ATTK(AT_CLAW, AD_PHYS, 16, 2),
ATTK(AT_MAGC, AD_CLRC, 0, 0), ATTK(AT_CLAW, AD_SAMU, 1, 4),
NO_ATTK, NO_ATTK),
SIZ(WT_HUMAN, 400, 0, MS_NEMESIS, MZ_HUMAN), MR_POISON, MR_POISON,
SIZ(WT_HUMAN, 400, 0, MS_NEMESIS, MZ_HUMAN),
MR_POISON|MR_STONE, MR_POISON,
M1_HUMANOID|M1_HERBIVORE|M1_SEE_INVIS,
M2_NOPOLY|M2_HUMAN|M2_PNAME|M2_HOSTILE|M2_STRONG|M2_NASTY|
M2_STALK|M2_COLLECT|M2_MAGIC,
@@ -3263,8 +3265,8 @@ struct permonst _mons2[] = {
A(ATTK(AT_WEAP, AD_PHYS, 8, 4), ATTK(AT_WEAP, AD_PHYS, 4, 6),
ATTK(AT_MAGC, AD_SPEL, 0, 0), ATTK(AT_CLAW, AD_SAMU, 2, 6),
NO_ATTK, NO_ATTK),
SIZ(WT_HUMAN, 400, 0, MS_NEMESIS, MZ_LARGE), MR_FIRE|MR_POISON, 0,
M1_FLY|M1_SEE_INVIS|M1_POIS,
SIZ(WT_HUMAN, 400, 0, MS_NEMESIS, MZ_LARGE),
MR_FIRE|MR_POISON|MR_STONE, 0, M1_FLY|M1_SEE_INVIS|M1_POIS,
M2_NOPOLY|M2_DEMON|M2_PNAME|M2_HOSTILE|M2_STRONG|M2_STALK|
M2_NASTY|M2_COLLECT,
M3_WANTSARTI|M3_WAITFORU|M3_INFRAVISION|M3_INFRAVISIBLE, CLR_RED),
@@ -3272,7 +3274,7 @@ struct permonst _mons2[] = {
LVL(15, 12, 10, 0, -15), (G_NOGEN|G_UNIQ),
A(ATTK(AT_CLAW, AD_PHYS, 2, 6), ATTK(AT_CLAW, AD_SAMU, 2, 6),
ATTK(AT_STNG, AD_DISE, 1, 4), NO_ATTK, NO_ATTK, NO_ATTK),
SIZ(750, 350, 0, MS_NEMESIS, MZ_HUMAN), MR_POISON, MR_POISON,
SIZ(750, 350, 0, MS_NEMESIS, MZ_HUMAN), MR_POISON|MR_STONE, MR_POISON,
M1_ANIMAL|M1_NOHANDS|M1_OVIPAROUS|M1_POIS|M1_CARNIVORE,
M2_NOPOLY|M2_PNAME|M2_HOSTILE|M2_STRONG|M2_STALK|M2_NASTY|
M2_COLLECT|M2_MAGIC,
@@ -3293,7 +3295,7 @@ struct permonst _mons2[] = {
LVL(15, 12, 0, 40, -13), (G_NOGEN|G_UNIQ|G_NOCORPSE),
A(ATTK(AT_WEAP, AD_PHYS, 2, 6), ATTK(AT_WEAP, AD_PHYS, 2, 6),
ATTK(AT_CLAW, AD_SAMU, 2, 6), NO_ATTK, NO_ATTK, NO_ATTK),
SIZ(WT_HUMAN, 400, 0, MS_NEMESIS, MZ_HUMAN), 0, 0,
SIZ(WT_HUMAN, 400, 0, MS_NEMESIS, MZ_HUMAN), MR_STONE, 0,
M1_HUMANOID|M1_OMNIVORE,
M2_NOPOLY|M2_HUMAN|M2_PNAME|M2_HOSTILE|M2_STRONG|M2_STALK|
M2_NASTY|M2_MALE|M2_COLLECT|M2_MAGIC,
@@ -3317,7 +3319,7 @@ struct permonst _mons2[] = {
A(ATTK(AT_WEAP, AD_PHYS, 1, 6), ATTK(AT_WEAP, AD_PHYS, 1, 6),
ATTK(AT_CLAW, AD_SAMU, 1, 4), ATTK(AT_MAGC, AD_SPEL, 0, 0),
NO_ATTK, NO_ATTK),
SIZ(WT_HUMAN, 400, 0, MS_NEMESIS, MZ_HUMAN), 0, 0,
SIZ(WT_HUMAN, 400, 0, MS_NEMESIS, MZ_HUMAN), MR_STONE, 0,
M1_HUMANOID|M1_OMNIVORE,
M2_NOPOLY|M2_HUMAN|M2_STRONG|M2_HOSTILE|M2_STALK|M2_NASTY|
M2_COLLECT|M2_MAGIC,