(c36a1ec02) Fixed watchmen not saying the "EnterOutpost" lines in Outpost2 because the lines weren't triggered until a character enters the same hull

This commit is contained in:
Joonas Rikkonen
2019-05-16 06:02:27 +03:00
parent 6fc8b8b573
commit 6ce11d9da9
12 changed files with 338 additions and 60 deletions
@@ -132,11 +132,13 @@ namespace Barotrauma
#else
if (!CrewManager.GetCharacters().Contains(character)) { continue; }
#endif
if (character.Submarine == Level.Loaded.StartOutpost && character.CurrentHull == startWatchman.CurrentHull)
if (character.Submarine == Level.Loaded.StartOutpost &&
Vector2.DistanceSquared(character.WorldPosition, startWatchman.WorldPosition) < 500.0f * 500.0f)
{
CreateDialog(new List<Character> { startWatchman }, "EnterStartOutpost", 5 * 60.0f);
}
else if (character.Submarine == Level.Loaded.EndOutpost && character.CurrentHull == endWatchman.CurrentHull)
else if (character.Submarine == Level.Loaded.EndOutpost &&
Vector2.DistanceSquared(character.WorldPosition, endWatchman.WorldPosition) < 500.0f * 500.0f)
{
CreateDialog(new List<Character> { endWatchman }, "EnterEndOutpost", 5 * 60.0f);
}