Unstable 1.1.14.0

This commit is contained in:
Markus Isberg
2023-10-02 16:43:54 +03:00
parent 94f5a93a0c
commit cf8f0de659
606 changed files with 21906 additions and 11456 deletions
@@ -80,7 +80,7 @@ namespace Barotrauma
{
foreach (var turret in turrets)
{
turret.UpdateAutoOperate(deltaTime, friendlyTag);
turret.UpdateAutoOperate(deltaTime, ignorePower: true, friendlyTag);
}
}
}
@@ -107,7 +107,7 @@ namespace Barotrauma
private static IEnumerable<T> GetThalamusEntities<T>(Submarine wreck, Identifier tag) where T : MapEntity => GetThalamusEntities(wreck, tag).Where(e => e is T).Select(e => e as T);
private static IEnumerable<MapEntity> GetThalamusEntities(Submarine wreck, Identifier tag) => MapEntity.mapEntityList.Where(e => e.Submarine == wreck && e.Prefab != null && IsThalamus(e.Prefab, tag));
private static IEnumerable<MapEntity> GetThalamusEntities(Submarine wreck, Identifier tag) => MapEntity.MapEntityList.Where(e => e.Submarine == wreck && e.Prefab != null && IsThalamus(e.Prefab, tag));
private static bool IsThalamus(MapEntityPrefab entityPrefab, Identifier tag) => entityPrefab.HasSubCategory("thalamus") || entityPrefab.Tags.Contains(tag);
@@ -273,6 +273,10 @@ namespace Barotrauma
}
}
destroyedOrgans.ForEach(o => spawnOrgans.Remove(o));
if (!IsClient)
{
if (!initialCellsSpawned) { SpawnInitialCells(); }
}
bool isSomeoneNearby = false;
float minDist = Sonar.DefaultSonarRange * 2.0f;
#if SERVER
@@ -322,7 +326,6 @@ namespace Barotrauma
OperateTurrets(deltaTime, Config.Entity);
if (!IsClient)
{
if (!initialCellsSpawned) { SpawnInitialCells(); }
UpdateReinforcements(deltaTime);
}
}
@@ -27,7 +27,7 @@ namespace Barotrauma
public string Brain { get; private set; }
[Serialize("", IsPropertySaveable.No)]
public string Spawner { get; private set; }
public Identifier Spawner { get; private set; }
[Serialize("", IsPropertySaveable.No)]
public string BrainRoomBackground { get; private set; }