mirror of
https://codeberg.org/noisytoot/notnotdnethack.git
synced 2025-07-27 07:52:25 +01:00
Bugfix: Reduce monster infighting on fixed levels.
All monsters in the sanctum and moloch's temple are yendorian faction. All hostile monsters on peanut island are yendorian faction. -Use tower macro instead of checking dnum -The black temple case was mis-placed, the peaceful priest wasn't on-team.
This commit is contained in:
parent
bab5a8beb1
commit
263f5fc3e3
1 changed files with 6 additions and 3 deletions
|
@ -12724,13 +12724,16 @@ struct monst * mon;
|
|||
|| (mon->mtyp == PM_STAR_ELF && Role_if(PM_MADMAN))
|
||||
)
|
||||
out_faction = YELLOW_FACTION;
|
||||
else if(Is_knox(&u.uz) || Is_sanctum(&u.uz))
|
||||
else if(Is_knox(&u.uz)
|
||||
|| Is_sanctum(&u.uz)
|
||||
|| In_moloch_temple(&u.uz)
|
||||
)
|
||||
out_faction = YENDORIAN_FACTION;
|
||||
else if((In_quest(&u.uz)
|
||||
|| Is_stronghold(&u.uz)
|
||||
|| u.uz.dnum == temple_dnum
|
||||
|| u.uz.dnum == tower_dnum
|
||||
|| In_tower(&u.uz)
|
||||
|| Is_astralevel(&u.uz)
|
||||
|| Is_peanut(&u.uz)
|
||||
) && !peaceful)
|
||||
out_faction = YENDORIAN_FACTION;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue