noisytoot/notnotdnethack
1
0
Fork 0
mirror of https://codeberg.org/noisytoot/notnotdnethack.git synced 2025-05-03 05:45:08 +01:00
Code Issues Activity

Don't spam the player with "dread seraph digs a hole" messages

Browse source
This commit is contained in:
Chris-plus-alphanumericgibberish 2015-04-24 17:50:16 -04:00
parent 293b209848
commit 1b15ca724d
5 changed files with 37 additions and 36 deletions

36
src/allmain.c
View file

@ -32,7 +32,7 @@ digXchasm(mtmp)
levl[x][y].typ = CORR;
if(!does_block(x,y,&levl[x][y])) unblock_point(x,y); /* vision: can see through */
if(ttmp) delfloortrap(ttmp);
digactualhole(x, y, mtmp, HOLE, TRUE);
digactualhole(x, y, mtmp, HOLE, TRUE, FALSE);
}
}
y=y+1;
@ -42,7 +42,7 @@ digXchasm(mtmp)
levl[x][y].typ = CORR;
if(!does_block(x,y,&levl[x][y])) unblock_point(x,y); /* vision: can see through */
if(ttmp) delfloortrap(ttmp);
digactualhole(x, y, mtmp, PIT, TRUE);
digactualhole(x, y, mtmp, PIT, TRUE, FALSE);
}
}
y=y-1;
@ -53,7 +53,7 @@ digXchasm(mtmp)
levl[x][y].typ = CORR;
if(!does_block(x,y,&levl[x][y])) unblock_point(x,y); /* vision: can see through */
if(ttmp) delfloortrap(ttmp);
digactualhole(x, y, mtmp, PIT, TRUE);
digactualhole(x, y, mtmp, PIT, TRUE, FALSE);
}
}
y=y+1;
@ -65,7 +65,7 @@ digXchasm(mtmp)
levl[x][y].typ = CORR;
if(!does_block(x,y,&levl[x][y])) unblock_point(x,y); /* vision: can see through */
if(ttmp) delfloortrap(ttmp);
digactualhole(x, y, mtmp, HOLE, TRUE);
digactualhole(x, y, mtmp, HOLE, TRUE, FALSE);
}
}
y=y+1;
@ -75,7 +75,7 @@ digXchasm(mtmp)
levl[x][y].typ = CORR;
if(!does_block(x,y,&levl[x][y])) unblock_point(x,y); /* vision: can see through */
if(ttmp) delfloortrap(ttmp);
digactualhole(x, y, mtmp, PIT, TRUE);
digactualhole(x, y, mtmp, PIT, TRUE, FALSE);
}
}
y=y-1;
@ -86,7 +86,7 @@ digXchasm(mtmp)
levl[x][y].typ = CORR;
if(!does_block(x,y,&levl[x][y])) unblock_point(x,y); /* vision: can see through */
if(ttmp) delfloortrap(ttmp);
digactualhole(x, y, mtmp, PIT, TRUE);
digactualhole(x, y, mtmp, PIT, TRUE, FALSE);
}
}
y=y+1;
@ -100,7 +100,7 @@ digXchasm(mtmp)
levl[x][y].typ = CORR;
if(!does_block(x,y,&levl[x][y])) unblock_point(x,y); /* vision: can see through */
if(ttmp) delfloortrap(ttmp);
digactualhole(x, y, mtmp, HOLE, TRUE);
digactualhole(x, y, mtmp, HOLE, TRUE, FALSE);
}
}
y=y+1;
@ -110,7 +110,7 @@ digXchasm(mtmp)
levl[x][y].typ = CORR;
if(!does_block(x,y,&levl[x][y])) unblock_point(x,y); /* vision: can see through */
if(ttmp) delfloortrap(ttmp);
digactualhole(x, y, mtmp, PIT, TRUE);
digactualhole(x, y, mtmp, PIT, TRUE, FALSE);
}
}
y=y-1;
@ -121,7 +121,7 @@ digXchasm(mtmp)
levl[x][y].typ = CORR;
if(!does_block(x,y,&levl[x][y])) unblock_point(x,y); /* vision: can see through */
if(ttmp) delfloortrap(ttmp);
digactualhole(x, y, mtmp, PIT, TRUE);
digactualhole(x, y, mtmp, PIT, TRUE, FALSE);
}
}
y=y+1;
@ -144,7 +144,7 @@ digYchasm(mtmp)
levl[x][y].typ = CORR;
if(!does_block(x,y,&levl[x][y])) unblock_point(x,y); /* vision: can see through */
if(ttmp) delfloortrap(ttmp);
digactualhole(x, y, mtmp, HOLE, TRUE);
digactualhole(x, y, mtmp, HOLE, TRUE, FALSE);
}
}
x=x+1;
@ -154,7 +154,7 @@ digYchasm(mtmp)
levl[x][y].typ = CORR;
if(!does_block(x,y,&levl[x][y])) unblock_point(x,y); /* vision: can see through */
if(ttmp) delfloortrap(ttmp);
digactualhole(x, y, mtmp, PIT, TRUE);
digactualhole(x, y, mtmp, PIT, TRUE, FALSE);
}
}
x=x-1;
@ -165,7 +165,7 @@ digYchasm(mtmp)
levl[x][y].typ = CORR;
if(!does_block(x,y,&levl[x][y])) unblock_point(x,y); /* vision: can see through */
if(ttmp) delfloortrap(ttmp);
digactualhole(x, y, mtmp, PIT, TRUE);
digactualhole(x, y, mtmp, PIT, TRUE, FALSE);
}
}
x=x+1;
@ -177,7 +177,7 @@ digYchasm(mtmp)
levl[x][y].typ = CORR;
if(!does_block(x,y,&levl[x][y])) unblock_point(x,y); /* vision: can see through */
if(ttmp) delfloortrap(ttmp);
digactualhole(x, y, mtmp, HOLE, TRUE);
digactualhole(x, y, mtmp, HOLE, TRUE, FALSE);
}
}
x=x+1;
@ -187,7 +187,7 @@ digYchasm(mtmp)
levl[x][y].typ = CORR;
if(!does_block(x,y,&levl[x][y])) unblock_point(x,y); /* vision: can see through */
if(ttmp) delfloortrap(ttmp);
digactualhole(x, y, mtmp, PIT, TRUE);
digactualhole(x, y, mtmp, PIT, TRUE, FALSE);
}
}
x=x-1;
@ -198,7 +198,7 @@ digYchasm(mtmp)
levl[x][y].typ = CORR;
if(!does_block(x,y,&levl[x][y])) unblock_point(x,y); /* vision: can see through */
if(ttmp) delfloortrap(ttmp);
digactualhole(x, y, mtmp, PIT, TRUE);
digactualhole(x, y, mtmp, PIT, TRUE, FALSE);
}
}
x=x+1;
@ -212,7 +212,7 @@ digYchasm(mtmp)
levl[x][y].typ = CORR;
if(!does_block(x,y,&levl[x][y])) unblock_point(x,y); /* vision: can see through */
if(ttmp) delfloortrap(ttmp);
digactualhole(x, y, mtmp, HOLE, TRUE);
digactualhole(x, y, mtmp, HOLE, TRUE, FALSE);
}
}
x=x+1;
@ -222,7 +222,7 @@ digYchasm(mtmp)
levl[x][y].typ = CORR;
if(!does_block(x,y,&levl[x][y])) unblock_point(x,y); /* vision: can see through */
if(ttmp) delfloortrap(ttmp);
digactualhole(x, y, mtmp, PIT, TRUE);
digactualhole(x, y, mtmp, PIT, TRUE, FALSE);
}
}
x=x-1;
@ -233,7 +233,7 @@ digYchasm(mtmp)
levl[x][y].typ = CORR;
if(!does_block(x,y,&levl[x][y])) unblock_point(x,y); /* vision: can see through */
if(ttmp) delfloortrap(ttmp);
digactualhole(x, y, mtmp, PIT, TRUE);
digactualhole(x, y, mtmp, PIT, TRUE, FALSE);
}
}
x=x+1;

4
src/apply.c
View file

@ -3324,12 +3324,12 @@ do_break_wand(obj)
if (*in_rooms(x,y,SHOPBASE)) shop_damage = TRUE;
}
if(IS_GRAVE(levl[x][y].typ)){
digactualhole(x, y, BY_OBJECT, PIT, FALSE);
digactualhole(x, y, BY_OBJECT, PIT, FALSE, TRUE);
dig_up_grave(x,y);
} else{
digactualhole(x, y, BY_OBJECT,
(rn2(obj->spe) < 3 || !Can_dig_down(&u.uz)) ?
PIT : HOLE, FALSE);
PIT : HOLE, FALSE, TRUE);
}
}
continue;

4
src/cmd.c
View file

@ -568,9 +568,9 @@ domonability()
}
}
if (nohole || !ttmp || (ttmp->ttyp != PIT && ttmp->ttyp != SPIKED_PIT && ttmp->ttyp != TRAPDOOR))
digactualhole(u.ux, u.uy, &youmonst, PIT, FALSE);
digactualhole(u.ux, u.uy, &youmonst, PIT, FALSE, TRUE);
else
digactualhole(u.ux, u.uy, &youmonst, HOLE, FALSE);
digactualhole(u.ux, u.uy, &youmonst, HOLE, FALSE, TRUE);
}
} else if(youmonst.data == &mons[PM_BANDERSNATCH]){
use_reach_attack();

25
src/dig.c
View file

@ -533,11 +533,12 @@ int x, y;
}
void
digactualhole(x, y, madeby, ttyp, forceknown)
digactualhole(x, y, madeby, ttyp, forceknown, msgs)
register int x, y;
struct monst *madeby;
int ttyp;
boolean forceknown;
boolean msgs;
{
struct obj *oldobjs, *newobjs;
register struct trap *ttmp;
@ -600,9 +601,9 @@ boolean forceknown;
if(madeby_u) {
You("dig a pit in the %s.", surface_type);
if (shopdoor) pay_for_damage("ruin", FALSE);
} else if (!madeby_obj && canseemon(madeby))
} else if (!madeby_obj && canseemon(madeby) && msgs)
pline("%s digs a pit in the %s.", Monnam(madeby), surface_type);
else if (cansee(x, y) && flags.verbose)
else if (cansee(x, y) && flags.verbose && msgs)
pline("A pit appears in the %s.", surface_type);
if(at_u) {
@ -628,10 +629,10 @@ boolean forceknown;
if(madeby_u)
You("dig a hole through the %s.", surface_type);
else if(!madeby_obj && canseemon(madeby))
else if(!madeby_obj && canseemon(madeby) && msgs)
pline("%s digs a hole through the %s.",
Monnam(madeby), surface_type);
else if(cansee(x, y) && flags.verbose)
else if(cansee(x, y) && flags.verbose && msgs)
pline("A hole appears in the %s.", surface_type);
if (at_u) {
@ -688,7 +689,7 @@ boolean forceknown;
if (Is_stronghold(&u.uz)) {
assign_level(&tolevel, &valley_level);
} else if (Is_botlevel(&u.uz)) {
if (canseemon(mtmp))
if (canseemon(mtmp) && msgs)
pline("%s avoids the trap.", Monnam(mtmp));
return;
} else {
@ -933,7 +934,7 @@ boolean pit_only;
return TRUE;
} else if (IS_GRAVE(lev->typ)) {
digactualhole(u.ux, u.uy, BY_YOU, PIT, FALSE);
digactualhole(u.ux, u.uy, BY_YOU, PIT, FALSE, TRUE);
dig_up_grave(u.ux, u.uy);
return TRUE;
} else if (lev->typ == DRAWBRIDGE_UP) {
@ -986,9 +987,9 @@ boolean pit_only;
/* finally we get to make a hole */
if (nohole || pit_only)
digactualhole(u.ux, u.uy, BY_YOU, PIT, FALSE);
digactualhole(u.ux, u.uy, BY_YOU, PIT, FALSE, TRUE);
else
digactualhole(u.ux, u.uy, BY_YOU, HOLE, FALSE);
digactualhole(u.ux, u.uy, BY_YOU, HOLE, FALSE, TRUE);
return TRUE;
}
@ -2181,7 +2182,7 @@ int y;
return TRUE;
} else if (IS_GRAVE(lev->typ)) {
digactualhole(x, y, BY_YOU, PIT, FALSE);
digactualhole(x, y, BY_YOU, PIT, FALSE, TRUE);
dig_up_grave(x,y);
return TRUE;
} else if (lev->typ == DRAWBRIDGE_UP) {
@ -2235,9 +2236,9 @@ int y;
/* finally we get to make a hole */
if (nohole || pit_only)
digactualhole(x, y, BY_YOU, PIT, FALSE);
digactualhole(x, y, BY_YOU, PIT, FALSE, TRUE);
else
digactualhole(x, y, BY_YOU, HOLE, FALSE);
digactualhole(x, y, BY_YOU, HOLE, FALSE, TRUE);
return TRUE;
}

4
src/monmove.c
View file

@ -948,9 +948,9 @@ register struct monst *mtmp;
}
}
if (nohole || !ttmp || (ttmp->ttyp != PIT && ttmp->ttyp != SPIKED_PIT && ttmp->ttyp != TRAPDOOR))
digactualhole(mtmp->mx, mtmp->my, mtmp, PIT, FALSE);
digactualhole(mtmp->mx, mtmp->my, mtmp, PIT, FALSE, TRUE);
else
digactualhole(mtmp->mx, mtmp->my, mtmp, HOLE, FALSE);
digactualhole(mtmp->mx, mtmp->my, mtmp, HOLE, FALSE, TRUE);
}
} else if (is_mind_flayer(mdat) && !rn2(20)) {
struct monst *m2, *nmon = (struct monst *)0;