1
0
Fork 0
mirror of https://codeberg.org/noisytoot/notnotdnethack.git synced 2025-07-31 01:42:24 +01:00

Bugfix: Eden was getting unbound by some enemy actions

Also, fix tabbing
This commit is contained in:
Chris-plus-alphanumericgibberish 2015-09-21 20:12:17 -04:00
parent 21cb82692d
commit 2cae2ff342

View file

@ -248,25 +248,25 @@ dig()
((digging.down ? (dpx != u.ux || dpy != u.uy)
: (distu(dpx,dpy) > 2)))
) return(0);
if (digging.down) {
if(!dig_check(BY_YOU, TRUE, u.ux, u.uy)) return(0);
if(!dig_check(BY_YOU, TRUE, u.ux, u.uy)) return(0);
} else { /* !digging.down */
if (IS_TREES(lev->typ) && !may_dig(dpx,dpy) &&
if (IS_TREES(lev->typ) && !may_dig(dpx,dpy) &&
dig_typ(uwep, dpx, dpy) == DIGTYP_TREE
) {
pline("This tree seems to be petrified.");
return(0);
}
pline("This tree seems to be petrified.");
return(0);
}
/* ALI - Artifact doors from Slash'em */
if (IS_ROCK(lev->typ) && !may_dig(dpx,dpy) &&
if (IS_ROCK(lev->typ) && !may_dig(dpx,dpy) &&
dig_typ(uwep, dpx, dpy) == DIGTYP_ROCK ||
(IS_DOOR(lev->typ) && artifact_door(dpx, dpy))
) {
pline("This %s is too hard to %s.",
IS_DOOR(lev->typ) ? "door" : "wall", verb);
return(0);
}
pline("This %s is too hard to %s.",
IS_DOOR(lev->typ) ? "door" : "wall", verb);
return(0);
}
}
if(Fumbling &&
/* Can't exactly miss holding a lightsaber to the wall */
@ -412,7 +412,7 @@ dig()
staff->spe = 0;
staff->cursed = staff->blessed = FALSE;
}
if(u.sealsActive&SEAL_EDEN) unbind(SEAL_EDEN,TRUE);
if(!flags.mon_moving && u.sealsActive&SEAL_EDEN) unbind(SEAL_EDEN,TRUE);
} else if (lev->typ == IRONBARS) {
int numbars;
struct obj *bars;
@ -500,7 +500,7 @@ cleanup:
"", "rock", "statue", "boulder", "door", "tree", "bars", "chains"
};
int dig_target = dig_typ(uwep, dpx, dpy);
if(uwep && is_lightsaber(uwep)) uwep->age -= 100;
if (IS_WALL(lev->typ) || dig_target == DIGTYP_DOOR) {
@ -593,7 +593,7 @@ boolean msgs;
dogushforth(FALSE);
SET_FOUNTAIN_WARNED(x,y); /* force dryup */
dryup(x, y, madeby_u);
if(u.sealsActive&SEAL_EDEN) unbind(SEAL_EDEN,TRUE);
if(!flags.mon_moving && u.sealsActive&SEAL_EDEN) unbind(SEAL_EDEN,TRUE);
return;
#ifdef SINKS
} else if (IS_SINK(lev->typ)) {
@ -1311,7 +1311,7 @@ fakerocktrap()
body_part(HEAD));
if (uarmh) {
if(is_metallic(uarmh) || uarmh->otyp == FLACK_HELMET || uarmh->otyp == DROVEN_HELM) {
if(is_hard(uarmh)) {
pline("Fortunately, you are wearing a hard helmet.");
dmg = 2;
} else if (flags.verbose) {
@ -1594,8 +1594,8 @@ struct obj *obj;
if (trap && trap->ttyp == WEB) {
if (!trap->tseen) {
seetrap(trap);
There("is a spider web there!");
seetrap(trap);
There("is a spider web there!");
}
if(digtyp == 1){
Your("%s through in the web.",
@ -1603,12 +1603,12 @@ struct obj *obj;
deltrap(trap);
newsym(rx, ry);
} else {
Your("%s entangled in the web.",
aobjnam(obj, "become"));
/* you ought to be able to let go; tough luck */
/* (maybe `move_into_trap()' would be better) */
nomul(-d(2,2), "entangled in a web");
nomovemsg = "You pull free.";
Your("%s entangled in the web.",
aobjnam(obj, "become"));
/* you ought to be able to let go; tough luck */
/* (maybe `move_into_trap()' would be better) */
nomul(-d(2,2), "entangled in a web");
nomovemsg = "You pull free.";
}
} else if (lev->typ == IRONBARS) {
pline("Clang!");
@ -1972,7 +1972,7 @@ register int zx, zy, digdepth;
} else if (IS_TREE(room->typ)) {
room->typ = ROOM;
digdepth -= 2;
if(u.sealsActive&SEAL_EDEN) unbind(SEAL_EDEN,TRUE);
if(!flags.mon_moving && u.sealsActive&SEAL_EDEN) unbind(SEAL_EDEN,TRUE);
} else { /* IS_ROCK but not IS_WALL or SDOOR */
room->typ = CORR;
digdepth--;