v1.1.18.0 (Treacherous Tides Update)

This commit is contained in:
Regalis11
2023-10-19 17:18:51 +03:00
parent 12e43d95ef
commit 34ffc520cc
20 changed files with 179 additions and 43 deletions
@@ -173,6 +173,8 @@ namespace Barotrauma
public readonly HashSet<Submarine> IgnoredSubmarines = new HashSet<Submarine>();
public readonly HashSet<Character> IgnoredCharacters = new HashSet<Character>();
/// <summary>
/// Strength of the EMP effect created by the explosion.
/// </summary>
@@ -437,6 +439,8 @@ namespace Barotrauma
foreach (Character c in Character.CharacterList)
{
if (IgnoredCharacters.Contains(c)) { continue; }
if (!c.Enabled ||
Math.Abs(c.WorldPosition.X - worldPosition.X) > broadRange ||
Math.Abs(c.WorldPosition.Y - worldPosition.Y) > broadRange)
@@ -490,8 +490,8 @@ namespace Barotrauma
foreach (var moduleCount in generationParams.ModuleCounts)
{
if (!moduleCount.RequiredFaction.IsEmpty &&
location.Faction?.Prefab.Identifier != moduleCount.RequiredFaction &&
location.SecondaryFaction?.Prefab.Identifier != moduleCount.RequiredFaction)
location?.Faction?.Prefab.Identifier != moduleCount.RequiredFaction &&
location?.SecondaryFaction?.Prefab.Identifier != moduleCount.RequiredFaction)
{
continue;
}