From 6ff9753029ab187ca238169d68beb9313efea031 Mon Sep 17 00:00:00 2001 From: nhmall Date: Fri, 7 Dec 2018 19:12:56 -0500 Subject: [PATCH] back out some spider changes After consultation with the original committer, this is being pulled out, possibly revisited later. There was originally meant to be a follow-up piece to this that he never had a chance to integrate for various reasons. --- doc/fixes36.2 | 1 - src/monmove.c | 40 ---------------------------------------- 2 files changed, 41 deletions(-) diff --git a/doc/fixes36.2 b/doc/fixes36.2 index 11aa182ff..b4403f0fe 100644 --- a/doc/fixes36.2 +++ b/doc/fixes36.2 @@ -384,7 +384,6 @@ make it clear when a leprechaun dodges your attack wizard mode #wizidentify can now select individual items for permanent identification and don't display the selection to permanently identify everything if everything is already fully identified -spiders will occasionally spin webs when moving around make mine town "orctown" variation a multiple level feature of the mines replace #monpolycontrol command with monpolycontrol boolean option replace #wizdebug_traveldisplay command with travel_debug boolean option diff --git a/src/monmove.c b/src/monmove.c index 5694a31b8..c501cf421 100644 --- a/src/monmove.c +++ b/src/monmove.c @@ -14,7 +14,6 @@ STATIC_DCL int FDECL(disturb, (struct monst *)); STATIC_DCL void FDECL(release_hero, (struct monst *)); STATIC_DCL void FDECL(distfleeck, (struct monst *, int *, int *, int *)); STATIC_DCL int FDECL(m_arrival, (struct monst *)); -STATIC_DCL int FDECL(count_webbing_walls, (XCHAR_P, XCHAR_P)); STATIC_DCL boolean FDECL(stuff_prevents_passage, (struct monst *)); STATIC_DCL int FDECL(vamp_shift, (struct monst *, struct permonst *, BOOLEAN_P)); @@ -759,24 +758,6 @@ xchar nix,niy; return FALSE; } -/* returns the number of walls in the four cardinal directions that could - hold up a web */ -STATIC_OVL int -count_webbing_walls(x, y) -xchar x, y; -{ -#define holds_up_web(X, Y) ((!isok((X), (Y)) \ - || IS_ROCK(levl[X][Y].typ) \ - || (levl[X][Y].typ == STAIRS \ - && (X) == xupstair && (Y) == yupstair) \ - || (levl[X][Y].typ == LADDER \ - && (X) == xupladder && (Y) == yupladder) \ - || levl[X][Y].typ == IRONBARS) ? 1 : 0) - return (holds_up_web(x, y - 1) + holds_up_web(x + 1, y) - + holds_up_web(x, y + 1) + holds_up_web(x - 1, y)); -#undef holds_up_web -} - /* Return values: * 0: did not move, but can still attack and do other stuff. * 1: moved, possibly can attack. @@ -1472,27 +1453,6 @@ postmov: } } - /* maybe spin a web -- this needs work; if the spider is far away, - it might spin a lot of webs before hero encounters it */ - if (webmaker(ptr) && !mtmp->mspec_used && !t_at(mtmp->mx, mtmp->my)) { - struct trap *trap; - int prob = ((ptr == &mons[PM_GIANT_SPIDER]) ? 15 : 5) - * (count_webbing_walls(mtmp->mx, mtmp->my) + 1); - - if (rn2(1000) < prob - && (trap = maketrap(mtmp->mx, mtmp->my, WEB)) != 0) { - mtmp->mspec_used = d(4, 4); /* 4..16 */ - if (cansee(mtmp->mx, mtmp->my)) { - char mbuf[BUFSZ]; - - Strcpy(mbuf, - canspotmon(mtmp) ? y_monnam(mtmp) : something); - pline("%s spins a web.", upstart(mbuf)); - trap->tseen = 1; - } - } - } - if (hides_under(ptr) || ptr->mlet == S_EEL) { /* Always set--or reset--mundetected if it's already hidden (just in case the object it was hiding under went away); -- 2.40.0