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

Ana quest: fix the breacher code, allow deep ones to clear webs.

Browse source
This commit is contained in:
ChrisANG 2021-08-13 12:01:50 -04:00
parent e033c5fdcb
commit 32504435c3
1 changed files with 46 additions and 27 deletions

73
src/monmove.c
View file

@ -2334,56 +2334,75 @@ not_special:
//Loop to place breaching charge on ana quest home
if(Role_if(PM_ANACHRONONAUT) && !mtmp->mpeaceful && In_quest(&u.uz) && Is_qstart(&u.uz)){
if(mtmp->mhp == mtmp->mhpmax && (
if(
(mtmp->mtyp == PM_DEEP_ONE && !rn2(1000))
|| (mtmp->mtyp == PM_DEEPER_ONE && !rn2(500))
|| (mtmp->mtyp == PM_DEEPEST_ONE && !rn2(100))
)){
int i, j, count=0;
for(i = -1; i < 2; i++) for(j = -1; j < 2; j++){
if(isok(mtmp->mx+i, mtmp->my+j) && IS_WALL(levl[mtmp->mx+i][mtmp->my+j].typ)){
count++;
}
){
int i, j, count=0, tx = 0, ty = 0;
if(leader_target){
tx = sgn(gx - mtmp->mx);
ty = sgn(gy - mtmp->my);
}
if(count){
count = rn2(count);
struct obj *breacher;
if(!leader_target || !isok(tx,ty) || !IS_WALL(levl[tx][ty].typ)){
tx = 0;
ty = 0;
for(i = -1; i < 2; i++) for(j = -1; j < 2; j++){
if(isok(mtmp->mx+i, mtmp->my+j) && IS_WALL(levl[mtmp->mx+i][mtmp->my+j].typ)){
if(count-- == 0){
breacher = mksobj(STICK_OF_DYNAMITE, MKOBJ_NOINIT);
breacher->quan = 1L;
breacher->cursed = 0;
breacher->blessed = 0;
breacher->age = rn1(10,10);
fix_object(breacher);
place_object(breacher, mtmp->mx+i, mtmp->my+j);
begin_burn(breacher);
if(canseemon(mtmp))
pline("%s plants a breaching charge!", Monnam(mtmp));
count++;
}
}
if(count){
count = rn2(count);
for(i = -1; i < 2; i++) for(j = -1; j < 2; j++){
tx = mtmp->mx+i;
ty = mtmp->my+j;
if(isok(tx, ty) && IS_WALL(levl[tx][ty].typ)){
if(--count == 0)
break;
}
}
}
if(tx || ty){
struct obj *breacher;
breacher = mksobj(STICK_OF_DYNAMITE, MKOBJ_NOINIT);
breacher->quan = 1L;
breacher->cursed = 0;
breacher->blessed = 0;
breacher->age = rn1(10,10);
fix_object(breacher);
place_object(breacher, tx, ty);
begin_burn(breacher);
if(canseemon(mtmp))
pline("%s plants a breaching charge!", Monnam(mtmp));
}
}
} else if((mtmp->mtyp == PM_DEEP_ONE && !rn2(20))
|| (mtmp->mtyp == PM_DEEPER_ONE && !rn2(5))
|| (mtmp->mtyp == PM_DEEPEST_ONE)
){
int i, j, count=0;
struct trap *ttmp;
for(i = -1; i < 2; i++) for(j = -1; j < 2; j++){
if(isok(mtmp->mx+i, mtmp->my+j) && t_at(mtmp->mx+i, mtmp->my+j) && t_at(mtmp->mx+i, mtmp->my+j)->ttyp == PIT){
if(isok(mtmp->mx+i, mtmp->my+j) && (ttmp = t_at(mtmp->mx+i, mtmp->my+j)) && (ttmp->ttyp == PIT || ttmp->ttyp == WEB)){
count++;
}
}
if(count){
count = rn2(count);
struct obj *breacher;
for(i = -1; i < 2; i++) for(j = -1; j < 2; j++){
if(isok(mtmp->mx+i, mtmp->my+j) && t_at(mtmp->mx+i, mtmp->my+j) && t_at(mtmp->mx+i, mtmp->my+j)->ttyp == PIT){
if(isok(mtmp->mx+i, mtmp->my+j) && (ttmp = t_at(mtmp->mx+i, mtmp->my+j)) && (ttmp->ttyp == PIT || ttmp->ttyp == WEB)){
if(count-- == 0){
delfloortrap(t_at(mtmp->mx+i, mtmp->my+j));
if(canseemon(mtmp))
pline("%s fills in a trench!", Monnam(mtmp));
if(ttmp->ttyp == PIT){
if(canseemon(mtmp))
pline("%s fills in a trench!", Monnam(mtmp));
}
else if(ttmp->ttyp == WEB){
if(canseemon(mtmp))
pline("%s clears some webbing!", Monnam(mtmp));
}
delfloortrap(t_at(mtmp->mx+i, mtmp->my+j));
}
}
}