Skip to content

Conversation

@Alienmario
Copy link
Collaborator

Fixes #275

Guards can damage player and scientists can still pass ally triggers.

@Alienmario Alienmario requested a review from ampreeT November 17, 2025 01:16
@ampreeT
Copy link
Owner

ampreeT commented Nov 17, 2025

Looks good to me. Tested on Linux dedicated server with maps bm_c1a0a and bm_c1a1c.

@MyGamepedia
Copy link
Contributor

MyGamepedia commented Nov 17, 2025

Works on Windows dedicated server, but the guard also don't forgive me after my death. I support the ampreeT's idea. Lets say he will forgive me after any death, so it doesn't matter if he killed me or not, since my death fulfills his wish, also think he should forgive if I join spectators.

@Alienmario
Copy link
Collaborator Author

So the guards turns out don't use standard relationships. There's a specific field that controls their 'provoked' state. They will target any player, meaning collateral is to be expected after angering.
I also couldn't find a datamap behind CAI_BaseColleague::IsProvoked and had to settle with using raw offset :/

@Alienmario Alienmario marked this pull request as draft November 17, 2025 22:00
@Alienmario
Copy link
Collaborator Author

Aaah, my datamaps were out of date, should be all good now.

@Alienmario Alienmario marked this pull request as ready for review November 23, 2025 00:44
@Alienmario Alienmario merged commit b0d1a91 into master Nov 23, 2025
2 checks passed
@Alienmario Alienmario deleted the fix-player-ally branch November 23, 2025 11:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Security guard can't damage player

4 participants