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

Docking ports have a power connector that can be used for distributing power between docked subs, already connected wires in respawn shuttles and the tutorial subs can't be disconnected, flares burn longer

Browse Source
This commit is contained in:
Regalis
2016-08-13 17:52:35 +03:00
parent d5cd6f83ae
commit ec59c47041
8 changed files with 115 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Subsurface/Source/Items/Components/DockingPort.cs
+44 -13
View File
@@ -105,7 +105,7 @@ namespace Barotrauma.Items.Components
break;
}
}
IsActive = true;
hullIds = new ushort?[2];
@@ -131,18 +131,25 @@ namespace Barotrauma.Items.Components
private void AttemptDock()
{
var adjacentPort = FindAdjacentPort();
if (adjacentPort != null) Dock(adjacentPort);
}
public void Dock(DockingPort target)
{
if (item.Submarine.DockedTo.Contains(target.item.Submarine)) return;
if (dockingTarget != null)
{
Undock();
}
if (target.item.Submarine == item.Submarine)
{
DebugConsole.ThrowError("Error - tried to a submarine to itself");
return;
}
PlaySound(ActionType.OnUse, item.WorldPosition);
if (!item.linkedTo.Contains(target.item)) item.linkedTo.Add(target.item);
@@ -225,6 +232,32 @@ namespace Barotrauma.Items.Components
joint.CollideConnected = true;
}
private void ConnectWireBetweenPorts()
{
Wire wire = item.GetComponent<Wire>();
if (wire == null) return;
wire.Hidden = true;
wire.Locked = true;
if (Item.Connections == null) return;
var powerConnection = Item.Connections.Find(c => c.IsPower);
if (powerConnection == null) return;
if (dockingTarget == null || dockingTarget.item.Connections == null) return;
var recipient = dockingTarget.item.Connections.Find(c => c.IsPower);
if (recipient == null) return;
wire.RemoveConnection(item);
wire.RemoveConnection(dockingTarget.item);
powerConnection.AddLink(4, wire);
wire.Connect(powerConnection, false);
recipient.AddLink(4, wire);
wire.Connect(recipient, false);
}
private void CreateHull()
{
var hullRects = new Rectangle[] { item.WorldRect, dockingTarget.item.WorldRect };
@@ -374,6 +407,12 @@ namespace Barotrauma.Items.Components
dockingTarget.Undock();
dockingTarget = null;
var wire = item.GetComponent<Wire>();
if (wire != null)
{
wire.Drop(null);
}
if (joint != null)
{
GameMain.World.RemoveJoint(joint);
@@ -427,17 +466,6 @@ namespace Barotrauma.Items.Components
if (!docked)
{
Dock(dockingTarget);
//if (joint.BodyA.Mass < joint.BodyB.Mass)
//{
// joint.BodyA.SetTransform(joint.BodyA.Position + (joint.WorldAnchorB - joint.WorldAnchorA), 0.0f);
//}
//else
//{
// joint.BodyB.SetTransform(joint.BodyB.Position + (joint.WorldAnchorA - joint.WorldAnchorB), 0.0f);
//}
}
if (joint is DistanceJoint)
@@ -450,6 +478,9 @@ namespace Barotrauma.Items.Components
PlaySound(ActionType.OnSecondaryUse, item.WorldPosition);
ConnectWireBetweenPorts();
CreateJoint(true);
if (!item.linkedTo.Any(e => e is Hull) && !dockingTarget.item.linkedTo.Any(e => e is Hull))