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

fix #K3455 - rocks vs xorns

Browse Source 
Implement the suggestion that falling rock traps and rolling boulder
traps be harmless to xorns.  I've extended that to all missiles made
of stone (rocks, gems, boulders, a handful of other things that will
only matter if poly'd hero throws in '<' direction or is hit by stuff
scattered by an explosion).

I excluded ghosts because they would become even harder to kill and
the missile handling would need extra checks to test for blessed objs.
This commit is contained in:
PatR
2022-02-02 05:26:03 -08:00
parent 2b70492474
commit 9aea7b587c
8 changed files with 159 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/mthrowu.c
View File

@@ -37,17 +37,18 @@ m_has_launcher_and_ammo(struct monst* mtmp)
return FALSE;
}
/* hero is hit by something other than a monster */
/* hero is hit by something other than a monster (though it could be a
missile thrown or shot by a monster) */
int
thitu(
int tlev,
int tlev, /* pseudo-level used when deciding whether to hit hero's AC */
int dam,
struct obj **objp,
const char *name) /* if null, then format `*objp' */
{
struct obj *obj = objp ? *objp : 0;
const char *onm, *knm;
boolean is_acid;
boolean is_acid, named = (name != 0);
int kprefix = KILLED_BY_AN, dieroll;
char onmbuf[BUFSZ], knmbuf[BUFSZ];
@@ -90,6 +91,13 @@ thitu(
if (is_acid && Acid_resistance) {
pline("It doesn't seem to hurt you.");
monstseesu(M_SEEN_ACID);
} else if (stone_missile(obj) && passes_rocks(g.youmonst.data)) {
/* use 'named' as an approximation for "hitting from above";
we avoid "passes through you" for horizontal flight path
because missile stops and that wording would suggest that
it should keep going */
pline("It %s you.",
named ? "passes harmlessly through" : "doesn't harm");
} else if (obj && obj->oclass == POTION_CLASS) {
/* an explosion which scatters objects might hit hero with one
(potions deliberately thrown at hero are handled by m_throw) */
@@ -280,8 +288,8 @@ ohitmon(
struct monst *mtmp, /* accidental target, located at <g.bhitpos.x,.y> */
struct obj *otmp, /* missile; might be destroyed by drop_throw */
int range, /* how much farther will object travel if it misses;
use -1 to signify to keep going even after hit,
unless it's gone (used for rolling_boulder_traps) */
* use -1 to signify to keep going even after hit,
* unless it's gone (used for rolling_boulder_traps) */
boolean verbose)/* give message(s) even when you can't see what happened */
{
int damage, tmp;
@@ -325,6 +333,9 @@ ohitmon(
potionhit(mtmp, otmp, POTHIT_OTHER_THROW);
return 1;
} else {
int material = objects[otmp->otyp].oc_material;
boolean harmless = (stone_missile(otmp) && passes_rocks(mtmp->data));
damage = dmgval(otmp, mtmp);
if (otmp->otyp == ACID_VENOM && resists_acid(mtmp))
damage = 0;
@@ -336,12 +347,20 @@ ohitmon(
seemimic(mtmp);
mtmp->msleeping = 0;
if (vis) {
if (otmp->otyp == EGG)
if (otmp->otyp == EGG) {
pline("Splat! %s is hit with %s egg!", Monnam(mtmp),
otmp->known ? an(mons[otmp->corpsenm].pmnames[NEUTRAL])
: "an");
else
hit(distant_name(otmp, mshot_xname), mtmp, exclam(damage));
} else {
char how[BUFSZ];
if (!harmless)
Strcpy(how, exclam(damage)); /* "!" or "." */
else
Sprintf(how, " but passes harmlessly through %.9s.",
mhim(mtmp));
hit(distant_name(otmp, mshot_xname), mtmp, how);
}
} else if (verbose && !g.mtarget)
pline("%s%s is hit%s", (otmp->otyp == EGG) ? "Splat! " : "",
Monnam(mtmp), exclam(damage));
@@ -361,8 +380,7 @@ ohitmon(
}
}
}
if (objects[otmp->otyp].oc_material == SILVER
&& mon_hates_silver(mtmp)) {
if (material == SILVER && mon_hates_silver(mtmp)) {
boolean flesh = (!noncorporeal(mtmp->data)
&& !amorphous(mtmp->data));
@@ -395,7 +413,8 @@ ohitmon(
damage = 0;
}
if (!DEADMONSTER(mtmp)) { /* might already be dead (if petrified) */
/* might already be dead (if petrified) */
if (!harmless && !DEADMONSTER(mtmp)) {
mtmp->mhp -= damage;
if (DEADMONSTER(mtmp)) {
if (vis || (verbose && !g.mtarget))