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

v1.4.4.1 (Blood in the Water Update)

Browse Source
This commit is contained in:
Regalis11
2024-04-24 18:09:05 +03:00
parent 89b91d1c3e
commit ff1b8951a7
397 changed files with 15250 additions and 6479 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Items/Components/Signal/CircuitBox.cs
+105 -8
View File
@@ -22,6 +22,8 @@ namespace Barotrauma.Items.Components
public readonly List<CircuitBoxInputOutputNode> InputOutputNodes = new();
public readonly List<CircuitBoxLabelNode> Labels = new();
public readonly List<CircuitBoxWire> Wires = new List<CircuitBoxWire>();
public override bool IsActive => true;
@@ -80,6 +82,9 @@ namespace Barotrauma.Items.Components
public bool IsFull => ComponentContainer?.Inventory is { } inventory && inventory.IsFull(true);
[Editable, Serialize(false, IsPropertySaveable.Yes, description: "Locked circuit boxes can only be viewed and not interacted with.")]
public bool Locked { get; set; }
public CircuitBox(Item item, ContentXElement element) : base(item, element)
{
containers = item.GetComponents<ItemContainer>().ToArray();
@@ -176,6 +181,9 @@ namespace Barotrauma.Items.Components
case "outputnode":
LoadFor(CircuitBoxInputOutputNode.Type.Output, subElement);
break;
case "label":
Labels.Add(CircuitBoxLabelNode.LoadFromXML(subElement, this));
break;
}
}
@@ -204,11 +212,14 @@ namespace Barotrauma.Items.Components
{
Components.Clear();
Wires.Clear();
Labels.Clear();
foreach (var origComp in original.Components)
foreach (var label in original.Labels)
{
var newComponent = new CircuitBoxComponent(origComp.ID, clonedContainedItems[origComp.Item.ID], origComp.Position, this, origComp.UsedResource);
Components.Add(newComponent);
var newLabel = new CircuitBoxLabelNode(label.ID, label.Color, label.Position, this);
newLabel.EditText(label.HeaderText, label.BodyText);
newLabel.ApplyResize(label.Size, label.Position);
Labels.Add(newLabel);
}
for (int ioIndex = 0; ioIndex < original.InputOutputNodes.Count; ioIndex++)
@@ -219,10 +230,19 @@ namespace Barotrauma.Items.Components
cloneNode.Position = origNode.Position;
}
if (!clonedContainedItems.Any()) { return; }
foreach (var origComp in original.Components)
{
if (!clonedContainedItems.TryGetValue(origComp.Item.ID, out var clonedItem)) { continue; }
var newComponent = new CircuitBoxComponent(origComp.ID, clonedItem, origComp.Position, this, origComp.UsedResource);
Components.Add(newComponent);
}
foreach (var origWire in original.Wires)
{
Option<CircuitBoxConnection> to = CircuitBoxConnectorIdentifier.FromConnection(origWire.To).FindConnection(this),
from = CircuitBoxConnectorIdentifier.FromConnection(origWire.From).FindConnection(this);
from = CircuitBoxConnectorIdentifier.FromConnection(origWire.From).FindConnection(this);
if (!to.TryUnwrap(out var toConn) || !from.TryUnwrap(out var fromConn))
{
@@ -230,7 +250,8 @@ namespace Barotrauma.Items.Components
continue;
}
var newWire = new CircuitBoxWire(this, origWire.ID, origWire.BackingWire.Select(w => clonedContainedItems[w.ID]), fromConn, toConn, origWire.UsedItemPrefab);
var wireItem = origWire.BackingWire.Select(w => clonedContainedItems[w.ID]);
var newWire = new CircuitBoxWire(this, origWire.ID, wireItem, fromConn, toConn, origWire.UsedItemPrefab);
Wires.Add(newWire);
}
}
@@ -254,6 +275,11 @@ namespace Barotrauma.Items.Components
componentElement.Add(wire.Save());
}
foreach (var label in Labels)
{
componentElement.Add(label.Save());
}
return componentElement;
}
@@ -324,6 +350,36 @@ namespace Barotrauma.Items.Components
return true;
}
private void AddLabelInternal(ushort id, Color color, Vector2 pos, NetLimitedString header, NetLimitedString body)
{
var newLabel = new CircuitBoxLabelNode(id, color, pos, this);
newLabel.EditText(header, body);
Labels.Add(newLabel);
OnViewUpdateProjSpecific();
}
private void RemoveLabelInternal(IReadOnlyCollection<ushort> ids)
{
foreach (CircuitBoxLabelNode node in Labels.ToImmutableArray())
{
if (!ids.Contains(node.ID)) { continue; }
Labels.Remove(node);
}
OnViewUpdateProjSpecific();
}
private void ResizeLabelInternal(ushort id, Vector2 pos, Vector2 size)
{
size = Vector2.Max(size, CircuitBoxLabelNode.MinSize);
foreach (CircuitBoxLabelNode node in Labels)
{
if (node.ID != id) { continue; }
node.ApplyResize(size, pos);
break;
}
OnViewUpdateProjSpecific();
}
private static bool IsExternalConnection(CircuitBoxConnection conn) => conn is (CircuitBoxInputConnection or CircuitBoxOutputConnection);
private void CreateWireWithoutItem(CircuitBoxConnection one, CircuitBoxConnection two, ushort id, ItemPrefab prefab)
@@ -380,6 +436,18 @@ namespace Barotrauma.Items.Components
private void AddWireDirect(ushort id, ItemPrefab prefab, Option<Item> backingItem, CircuitBoxConnection one, CircuitBoxConnection two)
=> Wires.Add(new CircuitBoxWire(this, id, backingItem, one, two, prefab));
private void RenameLabelInternal(ushort id, Color color, NetLimitedString header, NetLimitedString body)
{
foreach (CircuitBoxLabelNode node in Labels)
{
if (node.ID != id) { continue; }
node.EditText(header, body);
node.Color = color;
break;
}
}
private bool AddComponentInternal(ushort id, ItemPrefab prefab, ItemPrefab usedResource, Vector2 pos, Character? user, Action<Item>? onItemSpawned)
{
if (id is ICircuitBoxIdentifiable.NullComponentID)
@@ -426,6 +494,21 @@ namespace Barotrauma.Items.Components
ClearSelectionFor(characterId, Components);
ClearSelectionFor(characterId, InputOutputNodes);
ClearSelectionFor(characterId, Wires);
ClearSelectionFor(characterId, Labels);
}
private void SelectLabelsInternal(IReadOnlyCollection<ushort> ids, ushort characterId, bool overwrite)
{
if (overwrite) { ClearSelectionFor(characterId, Labels); }
if (!ids.Any()) { return; }
foreach (CircuitBoxLabelNode node in Labels)
{
if (!ids.Contains(node.ID)) { continue; }
node.SetSelected(Option.Some(characterId));
}
}
private void SelectComponentsInternal(IReadOnlyCollection<ushort> ids, ushort characterId, bool overwrite)
@@ -444,7 +527,8 @@ namespace Barotrauma.Items.Components
private void UpdateSelections(ImmutableDictionary<ushort, Option<ushort>> nodeIds,
ImmutableDictionary<ushort, Option<ushort>> wireIds,
ImmutableDictionary<CircuitBoxInputOutputNode.Type, Option<ushort>> inputOutputs)
ImmutableDictionary<CircuitBoxInputOutputNode.Type, Option<ushort>> inputOutputs,
ImmutableDictionary<ushort, Option<ushort>> labels)
{
foreach (var wire in Wires)
{
@@ -474,6 +558,13 @@ namespace Barotrauma.Items.Components
node.SetSelected(selectedBy);
}
foreach (var node in Labels)
{
if (!labels.TryGetValue(node.ID, out var selectedBy)) { continue; }
node.SetSelected(selectedBy);
}
}
private void SelectWiresInternal(IReadOnlyCollection<ushort> ids, ushort characterId, bool overwrite)
@@ -555,6 +646,7 @@ namespace Barotrauma.Items.Components
private void MoveNodesInternal(IReadOnlyCollection<ushort> ids,
IReadOnlyCollection<CircuitBoxInputOutputNode.Type> ios,
IReadOnlyCollection<ushort> labels,
Vector2 moveAmount)
{
IEnumerable<CircuitBoxComponent> nodes = Components.Where(node => ids.Contains(node.ID));
@@ -563,6 +655,11 @@ namespace Barotrauma.Items.Components
node.Position += moveAmount;
}
foreach (var label in Labels.Where(n => labels.Contains(n.ID)))
{
label.Position += moveAmount;
}
foreach (var io in InputOutputNodes)
{
@@ -635,7 +732,7 @@ namespace Barotrauma.Items.Components
}
}
public static ImmutableArray<Item> GetSortedCircuitBoxSortedItemsFromPlayer(Character? character)
public static ImmutableArray<Item> GetSortedCircuitBoxItemsFromPlayer(Character? character)
=> character?.Inventory?.FindAllItems(predicate: CanItemBeAccessed, recursive: true)
.OrderBy(static i => i.Prefab.Identifier == Tags.FPGACircuit)
.ToImmutableArray() ?? ImmutableArray<Item>.Empty;
@@ -651,7 +748,7 @@ namespace Barotrauma.Items.Components
{
if (character is null) { return Option.None; }
return GetApplicableResourcePlayerHas(prefab, GetSortedCircuitBoxSortedItemsFromPlayer(character));
return GetApplicableResourcePlayerHas(prefab, GetSortedCircuitBoxItemsFromPlayer(character));
}
public static Option<Item> GetApplicableResourcePlayerHas(ItemPrefab prefab, ImmutableArray<Item> playerItems)