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

Make TOURIST unconditional.

Browse Source
This commit is contained in:
Sean Hunt
2015-02-13 23:31:41 -05:00
committed by Pasi Kallinen
parent 44ca9fc16a
commit bb647dc33c
43 changed files with 27 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/monst.c
View File

@@ -3021,7 +3021,6 @@ struct permonst _mons2[] = {
SIZ(WT_HUMAN, 400, MS_HUMANOID, MZ_HUMAN), 0, 0,
M1_HUMANOID|M1_OMNIVORE,
M2_NOPOLY|M2_HUMAN|M2_STRONG|M2_COLLECT, M3_INFRAVISIBLE, HI_DOMESTIC),
#ifdef TOURIST
MON("tourist", S_HUMAN,
LVL(10, 12, 10, 1, 0), G_NOGEN,
A(ATTK(AT_WEAP, AD_PHYS, 1, 6), ATTK(AT_WEAP, AD_PHYS, 1, 6),
@@ -3029,7 +3028,6 @@ struct permonst _mons2[] = {
SIZ(WT_HUMAN, 400, MS_HUMANOID, MZ_HUMAN), 0, 0,
M1_HUMANOID|M1_OMNIVORE,
M2_NOPOLY|M2_HUMAN|M2_STRONG|M2_COLLECT, M3_INFRAVISIBLE, HI_DOMESTIC),
#endif
MON("valkyrie", S_HUMAN,
LVL(10, 12, 10, 1, -1), G_NOGEN,
A(ATTK(AT_WEAP, AD_PHYS, 1, 8), ATTK(AT_WEAP, AD_PHYS, 1, 8),
@@ -3165,7 +3163,6 @@ struct permonst _mons2[] = {
M2_NOPOLY|M2_HUMAN|M2_PNAME|M2_PEACEFUL|M2_STRONG|M2_MALE|
M2_COLLECT|M2_MAGIC,
M3_CLOSE|M3_INFRAVISIBLE, HI_LORD),
#ifdef TOURIST
MON("Twoflower", S_HUMAN,
LVL(20, 12, 10, 20, 0), (G_NOGEN|G_UNIQ),
A(ATTK(AT_WEAP, AD_PHYS, 1, 6), ATTK(AT_WEAP, AD_PHYS, 1, 6),
@@ -3175,7 +3172,6 @@ struct permonst _mons2[] = {
M2_NOPOLY|M2_HUMAN|M2_PNAME|M2_PEACEFUL|M2_STRONG|M2_MALE|
M2_COLLECT|M2_MAGIC,
M3_CLOSE|M3_INFRAVISIBLE, HI_DOMESTIC),
#endif
MON("Norn", S_HUMAN,
LVL(20, 12, 0, 80, 0), (G_NOGEN|G_UNIQ),
A(ATTK(AT_WEAP, AD_PHYS, 1, 8), ATTK(AT_WEAP, AD_PHYS, 1, 6),
@@ -3313,11 +3309,9 @@ struct permonst _mons2[] = {
M2_NOPOLY|M2_HUMAN|M2_PNAME|M2_HOSTILE|M2_STRONG|M2_STALK|
M2_NASTY|M2_MALE|M2_COLLECT|M2_MAGIC,
M3_WANTSARTI|M3_WAITFORU|M3_INFRAVISIBLE, HI_LORD),
#ifdef TOURIST
/*
* Note: the Master of Thieves was defined above.
*/
#endif
MON("Lord Surtur", S_GIANT,
LVL(15, 12, 2, 50, 12), (G_NOGEN|G_UNIQ),
A(ATTK(AT_WEAP, AD_PHYS, 2,10), ATTK(AT_WEAP, AD_PHYS, 2,10),
@@ -3438,7 +3432,6 @@ struct permonst _mons2[] = {
M1_HUMANOID|M1_OMNIVORE,
M2_NOPOLY|M2_HUMAN|M2_PEACEFUL|M2_STRONG|M2_COLLECT, M3_INFRAVISIBLE,
HI_DOMESTIC),
#ifdef TOURIST
MON("guide", S_HUMAN,
LVL(5, 12, 10, 20, 0), G_NOGEN,
A(ATTK(AT_WEAP, AD_PHYS, 1, 6), ATTK(AT_MAGC, AD_SPEL, 0, 0),
@@ -3447,7 +3440,6 @@ struct permonst _mons2[] = {
M1_HUMANOID|M1_OMNIVORE,
M2_NOPOLY|M2_HUMAN|M2_PEACEFUL | M2_STRONG|M2_COLLECT|M2_MAGIC,
M3_INFRAVISIBLE, HI_DOMESTIC),
#endif
MON("warrior", S_HUMAN,
LVL(5, 12, 10, 10, -1), G_NOGEN,
A(ATTK(AT_WEAP, AD_PHYS, 1, 8), ATTK(AT_WEAP, AD_PHYS, 1, 8),