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

Unify dropping boulder on monster

Browse Source
This commit is contained in:
Pasi Kallinen
2015-04-21 22:40:27 +03:00
parent a155d1d474
commit c9bb75eaf3
3 changed files with 67 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/extern.h
View File

@@ -1863,6 +1863,7 @@ E void FDECL(forget_levels, (int));
E void NDECL(forget_traps);
E void FDECL(forget_map, (int));
E int FDECL(seffects, (struct obj *));
E boolean FDECL(drop_boulder_on_monster, (int, int, BOOLEAN_P, BOOLEAN_P));
E void FDECL(wand_explode, (struct obj *,int));
#ifdef USE_TRAMPOLI
E void FDECL(set_lit, (int,int,genericptr_t));

53
src/muse.c
View File

@@ -1352,58 +1352,7 @@ struct monst *mtmp;
(((x == mmx) && (y == mmy)) ?
!otmp->blessed : !otmp->cursed) &&
(x != u.ux || y != u.uy)) {
register struct obj *otmp2;
register struct monst *mtmp2;
/* Make the object(s) */
otmp2 = mksobj(confused ? ROCK : BOULDER,
FALSE, FALSE);
if (!otmp2) continue; /* Shouldn't happen */
otmp2->quan = confused ? rn1(5,2) : 1;
otmp2->owt = weight(otmp2);
/* Find the monster here (might be same as mtmp) */
mtmp2 = m_at(x, y);
if (mtmp2 && !amorphous(mtmp2->data) &&
!passes_walls(mtmp2->data) &&
!noncorporeal(mtmp2->data) &&
!unsolid(mtmp2->data)) {
struct obj *helmet = which_armor(mtmp2, W_ARMH);
int mdmg;
if (cansee(mtmp2->mx, mtmp2->my)) {
pline("%s is hit by %s!", Monnam(mtmp2),
doname(otmp2));
if (mtmp2->minvis && !canspotmon(mtmp2))
map_invisible(mtmp2->mx, mtmp2->my);
}
mdmg = dmgval(otmp2, mtmp2) * otmp2->quan;
if (helmet) {
if(is_metallic(helmet)) {
if (canspotmon(mtmp2))
pline("Fortunately, %s is wearing a hard helmet.", mon_nam(mtmp2));
else if (!Deaf)
You_hear("a clanging sound.");
if (mdmg > 2) mdmg = 2;
} else {
if (canspotmon(mtmp2))
pline("%s's %s does not protect %s.",
Monnam(mtmp2), xname(helmet),
mhim(mtmp2));
}
}
mtmp2->mhp -= mdmg;
if (mtmp2->mhp <= 0) {
pline("%s is killed.", Monnam(mtmp2));
mondied(mtmp2);
}
}
/* Drop the rock/boulder to the floor */
if (!flooreffects(otmp2, x, y, "fall")) {
place_object(otmp2, x, y);
stackobj(otmp2);
newsym(x, y); /* map the rock */
}
(void) drop_boulder_on_monster(x,y, confused, FALSE);
}
}
}

115
src/read.c
View File

@@ -1538,56 +1538,7 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */
!IS_ROCK(levl[x][y].typ) &&
!IS_AIR(levl[x][y].typ) &&
(x != u.ux || y != u.uy)) {
register struct obj *otmp2;
register struct monst *mtmp;
/* Make the object(s) */
otmp2 = mksobj(confused ? ROCK : BOULDER,
FALSE, FALSE);
if (!otmp2) continue; /* Shouldn't happen */
otmp2->quan = confused ? rn1(5,2) : 1;
otmp2->owt = weight(otmp2);
/* Find the monster here (won't be player) */
mtmp = m_at(x, y);
if (mtmp && !amorphous(mtmp->data) &&
!passes_walls(mtmp->data) &&
!noncorporeal(mtmp->data) &&
!unsolid(mtmp->data)) {
struct obj *helmet = which_armor(mtmp, W_ARMH);
int mdmg;
if (cansee(mtmp->mx, mtmp->my)) {
pline("%s is hit by %s!", Monnam(mtmp),
doname(otmp2));
if (mtmp->minvis && !canspotmon(mtmp))
map_invisible(mtmp->mx, mtmp->my);
}
mdmg = dmgval(otmp2, mtmp) * otmp2->quan;
if (helmet) {
if(is_metallic(helmet)) {
if (canspotmon(mtmp))
pline("Fortunately, %s is wearing a hard helmet.", mon_nam(mtmp));
else if (!Deaf)
You_hear("a clanging sound.");
if (mdmg > 2) mdmg = 2;
} else {
if (canspotmon(mtmp))
pline("%s's %s does not protect %s.",
Monnam(mtmp), xname(helmet),
mhim(mtmp));
}
}
mtmp->mhp -= mdmg;
if (mtmp->mhp <= 0)
xkilled(mtmp, 1);
}
/* Drop the rock/boulder to the floor */
if (!flooreffects(otmp2, x, y, "fall")) {
place_object(otmp2, x, y);
stackobj(otmp2);
newsym(x, y); /* map the rock */
}
(void) drop_boulder_on_monster(x, y, confused, TRUE);
}
}
}
@@ -1666,6 +1617,70 @@ struct obj *sobj; /* scroll, or fake spellbook object for scroll-like spell */
return sobj ? 0 : 1;
}
boolean
drop_boulder_on_monster(x,y, confused, byu)
int x,y;
boolean confused;
boolean byu;
{
register struct obj *otmp2;
register struct monst *mtmp;
/* Make the object(s) */
otmp2 = mksobj(confused ? ROCK : BOULDER, FALSE, FALSE);
if (!otmp2) return FALSE; /* Shouldn't happen */
otmp2->quan = confused ? rn1(5,2) : 1;
otmp2->owt = weight(otmp2);
/* Find the monster here (won't be player) */
mtmp = m_at(x, y);
if (mtmp && !amorphous(mtmp->data) &&
!passes_walls(mtmp->data) &&
!noncorporeal(mtmp->data) &&
!unsolid(mtmp->data)) {
struct obj *helmet = which_armor(mtmp, W_ARMH);
int mdmg;
if (cansee(mtmp->mx, mtmp->my)) {
pline("%s is hit by %s!", Monnam(mtmp),
doname(otmp2));
if (mtmp->minvis && !canspotmon(mtmp))
map_invisible(mtmp->mx, mtmp->my);
}
mdmg = dmgval(otmp2, mtmp) * otmp2->quan;
if (helmet) {
if(is_metallic(helmet)) {
if (canspotmon(mtmp))
pline("Fortunately, %s is wearing a hard helmet.", mon_nam(mtmp));
else if (!Deaf)
You_hear("a clanging sound.");
if (mdmg > 2) mdmg = 2;
} else {
if (canspotmon(mtmp))
pline("%s's %s does not protect %s.",
Monnam(mtmp), xname(helmet),
mhim(mtmp));
}
}
mtmp->mhp -= mdmg;
if (mtmp->mhp <= 0) {
if (byu)
xkilled(mtmp, 1);
else {
pline("%s is killed.", Monnam(mtmp));
mondied(mtmp);
}
}
}
/* Drop the rock/boulder to the floor */
if (!flooreffects(otmp2, x, y, "fall")) {
place_object(otmp2, x, y);
stackobj(otmp2);
newsym(x, y); /* map the rock */
}
return TRUE;
}
/* overcharging any wand or zapping/engraving cursed wand */
void
wand_explode(obj, chg)