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

Make KOPS unconditional.

Browse Source
This commit is contained in:
Sean Hunt
2015-02-13 22:01:44 -05:00
parent 9e65758947
commit b066b7c170
16 changed files with 9 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/muse.c
View File

@@ -920,11 +920,8 @@ struct monst *mtmp;
int trycnt = 0;
if(is_animal(pm) || attacktype(pm, AT_EXPL) || mindless(mtmp->data)
|| pm->mlet == S_GHOST
# ifdef KOPS
|| pm->mlet == S_KOP
# endif
) return 0;
|| pm->mlet == S_GHOST || pm->mlet == S_KOP)
return 0;
try_again:
switch (rn2(8 + (difficulty > 3) + (difficulty > 6) +
(difficulty > 8))) {
@@ -1535,11 +1532,8 @@ struct monst *mtmp;
int difficulty = monstr[(monsndx(pm))];
if(is_animal(pm) || attacktype(pm, AT_EXPL) || mindless(mtmp->data)
|| pm->mlet == S_GHOST
# ifdef KOPS
|| pm->mlet == S_KOP
# endif
) return 0;
|| pm->mlet == S_GHOST || pm->mlet == S_KOP)
return 0;
if (difficulty > 7 && !rn2(35)) return WAN_DEATH;
switch (rn2(9 - (difficulty < 4) + 4 * (difficulty > 6))) {
case 0: {
@@ -1943,11 +1937,8 @@ struct monst *mtmp;
int difficulty = monstr[(monsndx(pm))];
if(is_animal(pm) || attacktype(pm, AT_EXPL) || mindless(mtmp->data)
|| pm->mlet == S_GHOST
# ifdef KOPS
|| pm->mlet == S_KOP
# endif
) return 0;
|| pm->mlet == S_GHOST || pm->mlet == S_KOP)
return 0;
/* Unlike other rnd_item functions, we only allow _weak_ monsters
* to have this item; after all, the item will be used to strengthen
* the monster and strong monsters won't use it at all...