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

buglist: cutting Shopkeeper the long worm

Browse Source 
Cutting a shopkeeper poly'd as a long worm would generate strange messages
and could result in a crash.  cutworm didn't deal with all the intricacies
of duplicating a monster.   Fixed by changing cutworm() to use clone_mon()
to do most of its dirty work.  It seems to me that without this change,
cutting a tame long worm could also have similar bad effects.
Other side effects of this change:
- clone_mon now takes x,y coordinates, 0,0 results in previous behavior
- clone_mon no longer always makes cloned monsters tame/peaceful if player
  caused the clone, using the same formula previously in cutworm.  Someone
  else may wish to tweak this for gremlins.
- clone_mon will christen the new mon with the old shopkeeper's name, even
  though clones are never shopkeepers (game can't handle 2 for a shop)
- cutworm can now be called during conflict or pet combat, although I
  added no such calls (yet)
This commit is contained in:
cohrs
2003-10-23 02:30:46 +00:00
parent cc52b2f533
commit f4fbe1a13e
7 changed files with 49 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/worm.c
View File

@@ -341,7 +341,7 @@ cutworm(worm, x, y, weap)
while ( (curr->wx != x) || (curr->wy != y) ) {
curr = curr->nseg;
if (!curr) {
impossible("cut_worm: no segment at (%d,%d)", (int) x, (int) y);
impossible("cutworm: no segment at (%d,%d)", (int) x, (int) y);
return;
}
}
@@ -368,27 +368,19 @@ cutworm(worm, x, y, weap)
/* Sometimes the tail end dies. */
if (rn2(3) || !(new_wnum = get_wormno())) {
You("cut part of the tail off of %s.", mon_nam(worm));
if (context.mon_moving)
pline("Part of the tail of %s is cut off.", mon_nam(worm));
else
You("cut part of the tail off of %s.", mon_nam(worm));
toss_wsegs(new_tail, TRUE);
if (worm->mhp > 1) worm->mhp /= 2;
return;
}
/* Create the second worm. */
new_worm = newmonst(0);
*new_worm = *worm; /* make a copy of the old worm */
new_worm->m_id = context.ident++; /* make sure it has a unique id */
remove_monster(x, y); /* clone_mon puts new head here */
new_worm = clone_mon(worm, x, y);
new_worm->wormno = new_wnum; /* affix new worm number */
if (worm->mtame)
new_worm->mtame = (rn2(max(2 + u.uluck, 2)) ? worm->mtame : 0);
else
if (worm->mpeaceful)
new_worm->mpeaceful = (rn2(max(2 + u.uluck, 2)) ? 1 : 0);
set_malign(new_worm);
new_worm->mxlth = new_worm->mnamelth = 0;
/* Devalue the monster level of both halves of the worm. */
worm->m_lev = ((unsigned)worm->m_lev <= 3) ?
(unsigned)worm->m_lev : max((unsigned)worm->m_lev - 2, 3);
@@ -403,14 +395,6 @@ cutworm(worm, x, y, weap)
if (worm->mhpmax < worm->mhp) worm->mhp = worm->mhpmax;
}
/* Add new monster to mon chain. */
new_worm->nmon = fmon;
fmon = new_worm;
/* Initialize the new worm. */
place_monster(new_worm, x, y); /* put worm in level.monsters[][] */
newsym(x, y); /* make sure new worm shows up */
wtails[new_wnum] = new_tail; /* We've got all the info right now */
wheads[new_wnum] = curr; /* so we can do this faster than */
wgrowtime[new_wnum] = 0L; /* trying to call initworm(). */
@@ -418,14 +402,10 @@ cutworm(worm, x, y, weap)
/* Place the new monster at all the segment locations. */
place_wsegs(new_worm);
#if 0 /* long worms don't glow in the dark... */
if (emits_light(worm->data))
new_light_source(new_worm->mx, new_worm->my,
emits_light(worm->data),
LS_MONSTER, (genericptr_t)new_worm);
#endif
You("cut %s in half.", mon_nam(worm));
if (context.mon_moving)
pline("%s is cut in half.", Monnam(worm));
else
You("cut %s in half.", mon_nam(worm));
}