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

fix #H2645 - invulnerability during prayer is vulernable to stinking cloud

Browse Source 
From a bug report, stinking cloud
harms hero even when u.uninvulnerable is set during successful prayer.
This makes the cloud harmless during prayer as he suggested.

     It also makes being inside a stinking cloud become a major trouble
that prayer can fix.  (With magical breathing such a cloud is harmless and
with poison resistance it is just a nuisance; it won't be considered to be
trouble in such cases.)  The fix is to clear away the cloud, or to teleport
the hero if he's inside multiple overlapping clouds or in one that is
marked as permanent (which I think isn't currently possible).
This commit is contained in:
nethack.rankin
2012-05-07 01:44:38 +00:00
parent b1dbd463c5
commit 0add521787
4 changed files with 74 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/region.c
View File

@@ -918,7 +918,7 @@ genericptr_t p2;
reg = (NhRegion *) p1;
dam = reg->arg.a_int;
if (p2 == (genericptr_t)0) { /* This means *YOU* Bozo! */
if (nonliving(youmonst.data) || Breathless)
if (u.uinvulnerable || nonliving(youmonst.data) || Breathless)
return FALSE;
if (!Blind) {
Your("%s sting.", makeplural(body_part(EYE)));
@@ -1000,4 +1000,59 @@ int damage;
return cloud;
}
/* for checking troubles during prayer; is hero at risk? */
boolean
region_danger()
{
int i, f_indx, n = 0;
for (i = 0; i < n_regions; i++) {
/* only care about regions that hero is in */
if (!hero_inside(regions[i])) continue;
f_indx = regions[i]->inside_f;
/* the only type of region we understand is gas_cloud */
if (f_indx == INSIDE_GAS_CLOUD) {
/* completely harmless if you don't need to breathe */
if (nonliving(youmonst.data) || Breathless) continue;
/* minor inconvenience if you're posion resistant;
not harmful enough to be a prayer-level trouble */
if (Poison_resistance) continue;
++n;
}
}
return n ? TRUE : FALSE;
}
/* for fixing trouble at end of prayer;
danger detected at start of prayer might have expired by now */
void
region_safety()
{
NhRegion *r = 0;
int i, f_indx, n = 0;
for (i = 0; i < n_regions; i++) {
/* only care about regions that hero is in */
if (!hero_inside(regions[i])) continue;
f_indx = regions[i]->inside_f;
/* the only type of region we understand is gas_cloud */
if (f_indx == INSIDE_GAS_CLOUD) {
if (!n++ && regions[i]->ttl >= 0) r = regions[i];
}
}
if (n > 1 || (n == 1 && !r)) {
/* multiple overlapping cloud regions or non-expiring one */
safe_teleds(FALSE);
} else if (r) {
remove_region(r);
pline_The("gas cloud enveloping you dissipates.");
} else {
/* cloud dissipated on its own, so nothing needs to be done */
pline_The("gas cloud has dissipated.");
}
/* maybe cure blindness too */
if ((Blinded && TIMEOUT) == 1L) make_blinded(0L, TRUE);
}
/*region.c*/