vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unstable 1.1.14.0

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/ClientSource/Map/Submarine.cs
+25 -15
View File
@@ -1,4 +1,5 @@
using Barotrauma.Items.Components;
using Barotrauma.Extensions;
using Barotrauma.Items.Components;
using Barotrauma.Networking;
using FarseerPhysics;
using Microsoft.Xna.Framework;
@@ -70,15 +71,16 @@ namespace Barotrauma
if (visibleEntities == null)
{
visibleEntities = new List<MapEntity>(MapEntity.mapEntityList.Count);
visibleEntities = new List<MapEntity>(MapEntity.MapEntityList.Count);
}
else
{
visibleEntities.Clear();
}
foreach (MapEntity entity in MapEntity.mapEntityList)
foreach (MapEntity entity in MapEntity.MapEntityList)
{
if (entity == null || entity.Removed) { continue; }
if (entity.Submarine != null)
{
if (!visibleSubs.Contains(entity.Submarine)) { continue; }
@@ -102,7 +104,7 @@ namespace Barotrauma
public static void Draw(SpriteBatch spriteBatch, bool editing = false)
{
var entitiesToRender = !editing && visibleEntities != null ? visibleEntities : MapEntity.mapEntityList;
var entitiesToRender = !editing && visibleEntities != null ? visibleEntities : MapEntity.MapEntityList;
foreach (MapEntity e in entitiesToRender)
{
@@ -112,7 +114,7 @@ namespace Barotrauma
public static void DrawFront(SpriteBatch spriteBatch, bool editing = false, Predicate<MapEntity> predicate = null)
{
var entitiesToRender = !editing && visibleEntities != null ? visibleEntities : MapEntity.mapEntityList;
var entitiesToRender = !editing && visibleEntities != null ? visibleEntities : MapEntity.MapEntityList;
foreach (MapEntity e in entitiesToRender)
{
@@ -161,7 +163,7 @@ namespace Barotrauma
private static readonly List<Structure> depthSortedDamageable = new List<Structure>();
public static void DrawDamageable(SpriteBatch spriteBatch, Effect damageEffect, bool editing = false, Predicate<MapEntity> predicate = null)
{
var entitiesToRender = !editing && visibleEntities != null ? visibleEntities : MapEntity.mapEntityList;
var entitiesToRender = !editing && visibleEntities != null ? visibleEntities : MapEntity.MapEntityList;
depthSortedDamageable.Clear();
@@ -200,7 +202,7 @@ namespace Barotrauma
public static void DrawPaintedColors(SpriteBatch spriteBatch, bool editing = false, Predicate<MapEntity> predicate = null)
{
var entitiesToRender = !editing && visibleEntities != null ? visibleEntities : MapEntity.mapEntityList;
var entitiesToRender = !editing && visibleEntities != null ? visibleEntities : MapEntity.MapEntityList;
foreach (MapEntity e in entitiesToRender)
{
@@ -220,7 +222,7 @@ namespace Barotrauma
public static void DrawBack(SpriteBatch spriteBatch, bool editing = false, Predicate<MapEntity> predicate = null)
{
var entitiesToRender = !editing && visibleEntities != null ? visibleEntities : MapEntity.mapEntityList;
var entitiesToRender = !editing && visibleEntities != null ? visibleEntities : MapEntity.MapEntityList;
foreach (MapEntity e in entitiesToRender)
{
@@ -501,7 +503,7 @@ namespace Barotrauma
{
foreach (Item item in Item.ItemList)
{
if (item.GetComponent<Items.Components.Vent>() == null) { continue; }
if (item.GetComponent<Vent>() == null) { continue; }
if (!item.linkedTo.Any())
{
if (!IsWarningSuppressed(SubEditorScreen.WarningType.DisconnectedVents))
@@ -529,7 +531,7 @@ namespace Barotrauma
warnings.Add(SubEditorScreen.WarningType.NoCargoSpawnpoints);
}
}
if (!Item.ItemList.Any(it => it.GetComponent<Items.Components.Pump>() != null && it.HasTag("ballast")))
if (Item.ItemList.None(it => it.GetComponent<Pump>() != null && it.HasTag(Tags.Ballast)))
{
if (!IsWarningSuppressed(SubEditorScreen.WarningType.NoBallastTag))
{
@@ -537,6 +539,14 @@ namespace Barotrauma
warnings.Add(SubEditorScreen.WarningType.NoBallastTag);
}
}
if (Item.ItemList.None(it => it.HasTag(Tags.HiddenItemContainer)))
{
if (!IsWarningSuppressed(SubEditorScreen.WarningType.NoHiddenContainers))
{
errorMsgs.Add(TextManager.Get("NoHiddenContainersWarning").Value);
warnings.Add(SubEditorScreen.WarningType.NoHiddenContainers);
}
}
}
else if (Info.Type == SubmarineType.OutpostModule)
{
@@ -581,7 +591,7 @@ namespace Barotrauma
}
}
if ((MapEntity.mapEntityList.Count - Item.ItemList.Count - Hull.HullList.Count - WayPoint.WayPointList.Count - Gap.GapList.Count) > SubEditorScreen.MaxStructures * entityCountWarningThreshold)
if ((MapEntity.MapEntityList.Count - Item.ItemList.Count - Hull.HullList.Count - WayPoint.WayPointList.Count - Gap.GapList.Count) > SubEditorScreen.MaxStructures * entityCountWarningThreshold)
{
if (!IsWarningSuppressed(SubEditorScreen.WarningType.StructureCount))
{
@@ -641,7 +651,7 @@ namespace Barotrauma
}
}
foreach (MapEntity e in MapEntity.mapEntityList)
foreach (MapEntity e in MapEntity.MapEntityList)
{
if (Vector2.Distance(e.Position, HiddenSubPosition) > 20000)
{
@@ -653,7 +663,7 @@ namespace Barotrauma
}
}
foreach (MapEntity e in MapEntity.mapEntityList)
foreach (MapEntity e in MapEntity.MapEntityList)
{
if (Vector2.Distance(e.Position, HiddenSubPosition) > 20000)
{
@@ -703,12 +713,12 @@ namespace Barotrauma
return GameMain.LightManager.Lights.Count(l => l.CastShadows && !l.IsBackground) - disabledItemLightCount;
}
public static Vector2 MouseToWorldGrid(Camera cam, Submarine sub)
public static Vector2 MouseToWorldGrid(Camera cam, Submarine sub, bool round = false)
{
Vector2 position = PlayerInput.MousePosition;
position = cam.ScreenToWorld(position);
Vector2 worldGridPos = VectorToWorldGrid(position);
Vector2 worldGridPos = VectorToWorldGrid(position, round);
if (sub != null)
{