Skip to content

isDanger(): don't mark visitors hostile #5076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
myk002 merged 11 commits into from
Dec 7, 2024
Merged

isDanger(): don't mark visitors hostile #5076

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0d103ef
isDanger(): don't mark visitors are hostile
dhthwy Dec 3, 2024
5c56b0f
Merge branch 'develop' into dangertweak
dhthwy Dec 5, 2024
fbd332b
#5076: night and OpposedToLife creatures are not dangerous when visiting
dhthwy Dec 5, 2024
ba7886c
Merge branch 'develop' into dangertweak
dhthwy Dec 6, 2024
1dc2b14
Merge branch 'develop' into dangertweak
dhthwy Dec 7, 2024
3f64111
#5076: isDanger(): flag uninvited visitors as dangerous
dhthwy Dec 7, 2024
0502952
#5076: isDanger(): hopefully finalize tweaks
dhthwy Dec 7, 2024
01a21d9
Merge branch 'develop' into dangertweak
dhthwy Dec 7, 2024
08ea4e9
fix syntax typo
myk002 Dec 7, 2024
6418720
fix missing unit typo
dhthwy Dec 7, 2024
269284f
Merge branch 'develop' into dangertweak
dhthwy Dec 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions library/modules/Units.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,13 +642,14 @@ bool Units::isDanger(df::unit *unit) {
if (isTame(unit) || isOwnGroup(unit))
return false;

// NOTE: demons from hell have visitor/visitor_unvited set to false
// other demons may visit as a diplomat
return isCrazed(unit)
|| isInvader(unit)
|| isOpposedToLife(unit)
|| isAgitated(unit)
|| isSemiMegabeast(unit)
|| isNightCreature(unit)
|| isGreatDanger(unit);
|| unit->flags2.bits.visitor_uninvited
|| ((isGreatDanger(unit) || isNightCreature(unit)) && !unit->flags2.bits.visitor);
}

bool Units::isGreatDanger(df::unit *unit) {
Expand Down
Loading