Merge branch 'master' of https://github.com/Regalis11/Barotrauma

2023-10-19 13:36:40 -03:00
parent a65d99021c 72f860acfd
commit 7f311a6526
21 changed files with 196 additions and 89 deletions
@@ -342,6 +342,8 @@ namespace Barotrauma

        public bool IsOriginallyOnPlayerTeam => originalTeamID == CharacterTeamType.Team1 || originalTeamID == CharacterTeamType.Team2;

+        public bool IsFriendlyNPCTurnedHostile => originalTeamID == CharacterTeamType.FriendlyNPC && teamID == CharacterTeamType.Team2;
+
        public bool IsInstigator => CombatAction != null && CombatAction.IsInstigator;
        public CombatAction CombatAction;