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

U1039 passive() stoning check tweak

Browse Source 
>If you hit a cockatrice with a weapon that immediately breaks
>(like a potion, mirror, or cockatrice egg) you get stoned,

Add a parameter to passive() to make it possible to pass
additional information that indicates that the weapon was
there at the start of the turn, but destroyed during the turn.
This commit is contained in:
nethack.allison
2004-05-09 16:53:16 +00:00
parent c25746f0bf
commit 3ad4bf5b3a
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/dokick.c
View File

@@ -106,7 +106,7 @@ register boolean clumsy;
}
}
(void) passive(mon, TRUE, mon->mhp > 0, AT_KICK);
(void) passive(mon, TRUE, mon->mhp > 0, AT_KICK, FALSE);
if (mon->mhp <= 0 && !trapkilled) killed(mon);
/* may bring up a dialog, so put this after all messages */
@@ -157,12 +157,12 @@ register xchar x, y;
} else if (tmp > (kickdieroll = rnd(20))) {
You("kick %s.", mon_nam(mon));
sum = damageum(mon, uattk);
(void)passive(mon, (boolean)(sum > 0), (sum != 2), AT_KICK);
(void)passive(mon, (boolean)(sum > 0), (sum != 2), AT_KICK, FALSE);
if (sum == 2)
break; /* Defender died */
} else {
missum(mon, uattk, (tmp + armorpenalty > kickdieroll));
(void)passive(mon, 0, 1, AT_KICK);
(void)passive(mon, 0, 1, AT_KICK,FALSE);
}
}
return;
@@ -172,7 +172,7 @@ register xchar x, y;
!is_flyer(mon->data)) {
pline("Floating in the air, you miss wildly!");
exercise(A_DEX, FALSE);
(void) passive(mon, FALSE, 1, AT_KICK);
(void) passive(mon, FALSE, 1, AT_KICK, FALSE);
return;
}
@@ -183,7 +183,7 @@ register xchar x, y;
if(!rn2((i < j/10) ? 2 : (i < j/5) ? 3 : 4)) {
if(martial() && !rn2(2)) goto doit;
Your("clumsy kick does no damage.");
(void) passive(mon, FALSE, 1, AT_KICK);
(void) passive(mon, FALSE, 1, AT_KICK, FALSE);
return;
}
if(i < j/10) clumsy = TRUE;
@@ -204,7 +204,7 @@ doit:
if(!nohands(mon->data) && !rn2(martial() ? 5 : 3)) {
pline("%s blocks your %skick.", Monnam(mon),
clumsy ? "clumsy " : "");
(void) passive(mon, FALSE, 1, AT_KICK);
(void) passive(mon, FALSE, 1, AT_KICK, FALSE);
return;
} else {
mnexto(mon);
@@ -221,7 +221,7 @@ doit:
"slides" : "jumps"),
clumsy ? "easily" : "nimbly",
clumsy ? "clumsy " : "");
(void) passive(mon, FALSE, 1, AT_KICK);
(void) passive(mon, FALSE, 1, AT_KICK, FALSE);
return;
}
}