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

Covetous Monsters don't steal from the rightful owner.

Browse source 
AoYendor:
-Wizard won't steal from elder priest (but demon lords will)
-Nothing steals from the wizard, except another wizard (clones squabling).

Bell of Opening:
-Nothing steals from the nemesis.
-Rebels don't steal from each-other

Candelabrum:
-Nothing steals from Vlad

Book of the Dead:
-Nothing steals from the Wizard.
This commit is contained in:
chris 2022-02-24 19:33:39 -05:00
parent c25873aefd
commit c8d06e3c80
1 changed files with 35 additions and 1 deletions

36
src/wizard.c
View file

@ -18,6 +18,7 @@ extern const int monstr[];
STATIC_DCL short FDECL(which_arti, (long int));
STATIC_DCL boolean FDECL(mon_has_arti, (struct monst *,SHORT_P));
STATIC_DCL struct monst *FDECL(other_mon_has_arti, (struct monst *,SHORT_P));
STATIC_DCL boolean FDECL(rightful_owner, (struct monst *,SHORT_P, struct monst *));
STATIC_DCL struct obj *FDECL(on_ground, (SHORT_P));
STATIC_DCL boolean FDECL(you_have, (long int));
STATIC_DCL long FDECL(target_on, (long int,struct monst *));
@ -205,6 +206,39 @@ other_mon_has_arti(mtmp, otyp)
return((struct monst *)0);
}
STATIC_OVL boolean
rightful_owner(holder, otyp, seeker)
register struct monst *holder;
register short otyp;
register struct monst *seeker;
{
switch(otyp){
case AMULET_OF_YENDOR:
//Note: the Wizard won't steal from the EP (but demon lords will)
// Monsters won't attack the wizard (but the wizard will squable with himself)
if((holder->mtyp == PM_ELDER_PRIEST && seeker->iswiz)
|| (holder->iswiz && !seeker->iswiz)
)
return TRUE;
break;
case BELL_OF_OPENING:
if(holder->data->msound == MS_NEMESIS)
return TRUE;
if(is_Rebel(holder->data) && is_Rebel(seeker->data))
return TRUE;
break;
case CANDELABRUM_OF_INVOCATION:
if(holder->mtyp == PM_VLAD_THE_IMPALER)
return TRUE;
break;
case SPE_BOOK_OF_THE_DEAD:
if(holder->iswiz)
return TRUE;
break;
}
return FALSE;
}
STATIC_OVL struct obj *
on_ground(otyp)
register short otyp;
@ -252,7 +286,7 @@ target_on(mask, mtmp)
return(STRAT(STRAT_PLAYER, u.ux, u.uy, mask));
else if((otmp = on_ground(otyp))){
return(STRAT(STRAT_GROUND, otmp->ox, otmp->oy, mask));
} else if(!is_Rebel(mtmp->data) && (mtmp2 = other_mon_has_arti(mtmp, otyp)))
} else if((mtmp2 = other_mon_has_arti(mtmp, otyp)) && !rightful_owner(mtmp2, otyp, mtmp))
return(STRAT(STRAT_MONSTR, mtmp2->mx, mtmp2->my, mask));
}
return(STRAT_NONE);