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

fix #2495 - light vs gremlins (trunk only)

Browse Source 
From a bug report, flashing yourself
with a camera while in gremlin form blinded as with any other form, but
didn't inflict any damage the way that flashing a monster gremlin does.
This fixes that, and also makes light from wand/scroll/spell that hits
you-as-gremlin or monster gremlins do 1d5 damage too.  It happens even
if the target is already in a lit spot, but doesn't continue afterwards:
simply being in a lit spot doesn't cause any damage, nor does lamp light.
This commit is contained in:
nethack.rankin
2011-10-17 01:32:23 +00:00
parent 2402f43776
commit 897d527837
5 changed files with 94 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/read.c
View File

@@ -1158,6 +1158,9 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */
if (!confused || rn2(5)) {
if(!Blind) known = TRUE;
litroom(!confused && !scursed, sobj);
if (!confused && !scursed) {
if (lightdamage(sobj, TRUE, 5)) known = TRUE;
}
} else {
/* could be scroll of create monster, don't set known ...*/
(void) create_critters(1, !scursed ?
@@ -1518,6 +1521,14 @@ int chg; /* recharging */
exercise(A_STR, FALSE);
}
/* used to collect gremlins being hit by light so that they can be processed
after vision for the entire lit area has been brought up to date */
struct litmon {
struct monst *mon;
struct litmon *nxt;
};
STATIC_VAR struct litmon *gremlins = 0;
/*
* Low-level lit-field update routine.
*/
@@ -1526,9 +1537,18 @@ set_lit(x,y,val)
int x, y;
genericptr_t val;
{
if (val)
struct monst *mtmp;
struct litmon *gremlin;
if (val) {
levl[x][y].lit = 1;
else {
if ((mtmp = m_at(x, y)) != 0 && mtmp->data == &mons[PM_GREMLIN]) {
gremlin = (struct litmon *)alloc(sizeof *gremlin);
gremlin->mon = mtmp;
gremlin->nxt = gremlins;
gremlins = gremlin;
}
} else {
levl[x][y].lit = 0;
snuff_light_source(x, y);
}
@@ -1627,6 +1647,20 @@ do_it:
}
vision_full_recalc = 1; /* delayed vision recalculation */
if (gremlins) {
struct litmon *gremlin;
/* can't delay vision recalc after all */
vision_recalc(0);
/* after vision has been updated, monsters who are affected
when hit by light can now be hit by it */
do {
gremlin = gremlins;
gremlins = gremlin->nxt;
light_hits_gremlin(gremlin->mon, rnd(5));
free((genericptr_t)gremlin);
} while (gremlins);
}
}
STATIC_OVL void