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/BarotraumaServer/ServerSource/Items/Components/Door.cs
+3
View File
@@ -27,6 +27,9 @@ namespace Barotrauma.Items.Components
//opening a partially stuck door makes it less stuck
if (isOpen) { stuck = MathHelper.Clamp(stuck - StuckReductionOnOpen, 0.0f, 100.0f); }
ActionType actionType = open ? ActionType.OnOpen : ActionType.OnClose;
item.ApplyStatusEffects(actionType, deltaTime: 1.0f);
if (sendNetworkMessage)
{
item.CreateServerEvent(this, new EventData(forcedOpen));
Barotrauma/BarotraumaServer/ServerSource/Items/Components/Rope.cs
+13 -13
View File
@@ -11,20 +11,20 @@ namespace Barotrauma.Items.Components
if (!Snapped)
{
msg.WriteUInt16(target?.ID ?? Entity.NullEntityID);
if (source is Entity entity && !entity.Removed)
switch (source)
{
msg.WriteUInt16(entity?.ID ?? Entity.NullEntityID);
msg.WriteByte((byte)0);
}
else if (source is Limb limb && limb.character != null && !limb.character.Removed)
{
msg.WriteUInt16(limb.character?.ID ?? Entity.NullEntityID);
msg.WriteByte((byte)limb.character.AnimController.Limbs.IndexOf(limb));
}
else
{
msg.WriteUInt16(Entity.NullEntityID);
msg.WriteByte((byte)0);
case Entity { Removed: false } entity:
msg.WriteUInt16(entity.ID);
msg.WriteByte((byte)0);
break;
case Limb { character.Removed: false } limb:
msg.WriteUInt16(limb.character.ID);
msg.WriteByte((byte)limb.character.AnimController.Limbs.IndexOf(limb));
break;
default:
msg.WriteUInt16(Entity.NullEntityID);
msg.WriteByte((byte)0);
break;
}
}
}
Barotrauma/BarotraumaServer/ServerSource/Items/Components/Signal/CircuitBox.cs
+58 -7
View File
@@ -100,7 +100,7 @@ namespace Barotrauma.Items.Components
return (msg, deliveryMethod);
}
public void CreateServerEvent(INetSerializableStruct data)
public void CreateServerEvent(INetSerializableStruct data)
=> item.CreateServerEvent(this, new CircuitBoxEventData(data));
public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData? extraData = null)
@@ -120,7 +120,7 @@ namespace Barotrauma.Items.Components
case CircuitBoxOpcode.AddComponent:
{
var data = INetSerializableStruct.Read<CircuitBoxAddComponentEvent>(msg);
if (!item.CanClientAccess(c)) { break; }
if (!CanAccessAndUnlocked(c)) { break; }
var prefab = ItemPrefab.Prefabs.Find(p => p.UintIdentifier == data.PrefabIdentifier);
if (prefab is null)
@@ -158,14 +158,14 @@ namespace Barotrauma.Items.Components
var data = INetSerializableStruct.Read<CircuitBoxMoveComponentEvent>(msg);
if (!item.CanClientAccess(c)) { break; }
MoveNodesInternal(data.TargetIDs, data.IOs, data.MoveAmount);
MoveNodesInternal(data.TargetIDs, data.IOs, data.LabelIDs, data.MoveAmount);
CreateServerEvent(data);
break;
}
case CircuitBoxOpcode.DeleteComponent:
{
var data = INetSerializableStruct.Read<CircuitBoxRemoveComponentEvent>(msg);
if (!data.TargetIDs.Any() || !item.CanClientAccess(c)) { break; }
if (!data.TargetIDs.Any() || !CanAccessAndUnlocked(c)) { break; }
CreateRefundItemsForUsedResources(data.TargetIDs, c.Character);
GameServer.Log($"{NetworkMember.ClientLogName(c)} removed {GetLogComponentName(data.TargetIDs)} from circuit box.", ServerLog.MessageType.Wiring);
@@ -180,6 +180,7 @@ namespace Barotrauma.Items.Components
SelectComponentsInternal(data.TargetIDs, c.CharacterID, data.Overwrite);
SelectInputOutputInternal(data.IOs, c.CharacterID, data.Overwrite);
SelectLabelsInternal(data.LabelIDs, c.CharacterID, data.Overwrite);
BroadcastSelectionStatus();
break;
}
@@ -195,7 +196,7 @@ namespace Barotrauma.Items.Components
case CircuitBoxOpcode.AddWire:
{
var data = INetSerializableStruct.Read<CircuitBoxClientAddWireEvent>(msg);
if (!item.CanClientAccess(c)) { break; }
if (!CanAccessAndUnlocked(c)) { break; }
var prefab = ItemPrefab.Prefabs.Find(p => p.UintIdentifier == data.SelectedWirePrefabIdentifier);
if (prefab is null)
@@ -229,13 +230,56 @@ namespace Barotrauma.Items.Components
case CircuitBoxOpcode.RemoveWire:
{
var data = INetSerializableStruct.Read<CircuitBoxRemoveWireEvent>(msg);
if (!data.TargetIDs.Any() || !item.CanClientAccess(c)) { break; }
if (!data.TargetIDs.Any() || !CanAccessAndUnlocked(c)) { break; }
GameServer.Log($"{NetworkMember.ClientLogName(c)} removed {GetLogWireName(data.TargetIDs)} from circuit box.", ServerLog.MessageType.Wiring);
RemoveWireInternal(data.TargetIDs);
CreateServerEvent(data);
break;
}
case CircuitBoxOpcode.RenameLabel:
{
var data = INetSerializableStruct.Read<CircuitBoxRenameLabelEvent>(msg);
if (!CanAccessAndUnlocked(c)) { break; }
RenameLabelInternal(data.LabelId, data.Color, data.NewHeader, data.NewBody);
CreateServerEvent(data);
break;
}
case CircuitBoxOpcode.AddLabel:
{
var data = INetSerializableStruct.Read<CircuitBoxAddLabelEvent>(msg);
if (!CanAccessAndUnlocked(c)) { break; }
ushort id = ICircuitBoxIdentifiable.FindFreeID(Labels);
if (id is ICircuitBoxIdentifiable.NullComponentID)
{
ThrowError("Unable to add label because there are no available IDs left.", c);
return;
}
AddLabelInternal(id, data.Color, data.Position, data.Header, data.Body);
CreateServerEvent(new CircuitBoxServerAddLabelEvent(id, data.Position, new Vector2(256), data.Color, data.Header, data.Body));
break;
}
case CircuitBoxOpcode.RemoveLabel:
{
var data = INetSerializableStruct.Read<CircuitBoxRemoveLabelEvent>(msg);
if (!CanAccessAndUnlocked(c)) { break; }
RemoveLabelInternal(data.TargetIDs);
CreateServerEvent(data);
break;
}
case CircuitBoxOpcode.ResizeLabel:
{
var data = INetSerializableStruct.Read<CircuitBoxResizeLabelEvent>(msg);
if (!CanAccessAndUnlocked(c)) { break; }
ResizeLabelInternal(data.ID, data.Position, data.Size);
CreateServerEvent(data with { Size = Vector2.Max(data.Size, CircuitBoxLabelNode.MinSize) });
break;
}
default:
throw new ArgumentOutOfRangeException(nameof(header), header, "This opcode cannot be handled using entity events");
}
@@ -253,6 +297,8 @@ namespace Barotrauma.Items.Components
return wire.BackingWire.TryUnwrap(out var backingWire) ? backingWire.Name : "a wire";
}
bool CanAccessAndUnlocked(Client client) => item.CanClientAccess(client) && !Locked;
}
/// <summary>
@@ -280,6 +326,7 @@ namespace Barotrauma.Items.Components
CircuitBoxInitializeStateFromServerEvent data = new(
Components: Components.Select(EventFromComponent).ToImmutableArray(),
Wires: Wires.Select(EventFromWire).ToImmutableArray(),
Labels: Labels.Select(EventFromLabel).ToImmutableArray(),
InputPos: inputPos,
OutputPos: outputPos);
@@ -297,6 +344,9 @@ namespace Barotrauma.Items.Components
var request = new CircuitBoxClientAddWireEvent(wire.Color, from, to, wire.UsedItemPrefab.UintIdentifier);
return new CircuitBoxServerCreateWireEvent(request, wire.ID, backingWire);
}
static CircuitBoxServerAddLabelEvent EventFromLabel(CircuitBoxLabelNode label)
=> new(label.ID, label.Position, label.Size, label.Color, label.HeaderText, label.BodyText);
}
// we don't care about updating the view on server
@@ -314,8 +364,9 @@ namespace Barotrauma.Items.Components
var nodes = Components.Select(static c => new CircuitBoxIdSelectionPair(c.ID, c.IsSelected ? Option.Some(c.SelectedBy) : Option.None)).ToImmutableArray();
var wires = Wires.Select(static w => new CircuitBoxIdSelectionPair(w.ID, w.IsSelected ? Option.Some(w.SelectedBy) : Option.None)).ToImmutableArray();
var ios = InputOutputNodes.Select(static n => new CircuitBoxTypeSelectionPair(n.NodeType, n.IsSelected ? Option.Some(n.SelectedBy) : Option.None)).ToImmutableArray();
var labels = Labels.Select(static n => new CircuitBoxIdSelectionPair(n.ID, n.IsSelected ? Option.Some(n.SelectedBy) : Option.None)).ToImmutableArray();
CreateServerEvent(new CircuitBoxServerUpdateSelection(nodes, wires, ios));
CreateServerEvent(new CircuitBoxServerUpdateSelection(nodes, wires, ios, labels));
}
}
}