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

Sunsword can be invoked to create a blinding ray

Browse Source
This commit is contained in:
Pasi Kallinen
2024-03-31 19:43:33 +03:00
parent 5ee813091a
commit c71e8ec8d4
6 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/apply.c
View File

@@ -54,11 +54,24 @@ staticfn boolean find_poleable_mon(coord *, int, int);
static const char
no_elbow_room[] = "don't have enough elbow-room to maneuver.";
void
do_blinding_ray(struct obj *obj)
{
struct monst *mtmp = bhit(u.dx, u.dy, COLNO, FLASHED_LIGHT,
(int (*) (MONST_P, OBJ_P)) 0,
(int (*) (OBJ_P, OBJ_P)) 0, &obj);
obj->ox = u.ux, obj->oy = u.uy; /* flash_hits_mon() wants this */
if (mtmp)
(void) flash_hits_mon(mtmp, obj);
/* normally bhit() would do this but for FLASHED_LIGHT we want it
to be deferred until after flash_hits_mon() */
transient_light_cleanup();
}
staticfn int
use_camera(struct obj *obj)
{
struct monst *mtmp;
if (Underwater) {
pline("Using your camera underwater would void the warranty.");
return ECMD_OK;
@@ -83,15 +96,7 @@ use_camera(struct obj *obj)
} else if (!u.dx && !u.dy) {
(void) zapyourself(obj, TRUE);
} else {
mtmp = bhit(u.dx, u.dy, COLNO, FLASHED_LIGHT,
(int (*) (MONST_P, OBJ_P)) 0,
(int (*) (OBJ_P, OBJ_P)) 0, &obj);
obj->ox = u.ux, obj->oy = u.uy; /* flash_hits_mon() wants this */
if (mtmp)
(void) flash_hits_mon(mtmp, obj);
/* normally bhit() would do this but for FLASHED_LIGHT we want it
to be deferred until after flash_hits_mon() */
transient_light_cleanup();
do_blinding_ray(obj);
}
return ECMD_TIME;
}

4
src/artifact.c
View File

@@ -1916,6 +1916,10 @@ arti_invoke(struct obj *obj)
}
break;
}
case BLINDING_RAY:
if (getdir((char *) 0))
do_blinding_ray(obj);
break;
}
} else {
long eprop = (u.uprops[oart->inv_prop].extrinsic ^= W_ARTI),