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

Added "user" parameter to Inventory.PutItem and Inventory.TryPutItem. + More descriptive wiring logging: the logs don't list all the wires in a connectionpanel but only the changes a player does to the wiring. Disconnecting wires by picking them up and wiring done by the host are also logged now.

Browse Source
This commit is contained in:
Joonas Rikkonen
2017-07-17 23:27:31 +03:00
parent f1edb14f3f
commit 575b643c62
16 changed files with 125 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Items/Components/Signal/Wire.cs
+25 -5
View File
@@ -187,21 +187,21 @@ namespace Barotrauma.Items.Components
public override void Equip(Character character)
{
ClearConnections();
ClearConnections(character);
IsActive = true;
}
public override void Unequip(Character character)
{
ClearConnections();
ClearConnections(character);
IsActive = false;
}
public override void Drop(Character dropper)
{
ClearConnections();
ClearConnections(dropper);
IsActive = false;
}
@@ -252,7 +252,7 @@ namespace Barotrauma.Items.Components
public override bool Pick(Character picker)
{
ClearConnections();
ClearConnections(picker);
return true;
}
@@ -295,10 +295,30 @@ namespace Barotrauma.Items.Components
Drawable = IsActive || sections.Count > 0;
}
private void ClearConnections()
private void ClearConnections(Character user = null)
{
nodes.Clear();
sections.Clear();
if (user != null)
{
if (connections[0] != null && connections[1] != null)
{
GameServer.Log(Character.Controlled.Name + " disconnected a wire from " +
connections[0].Item.Name + " (" + connections[0].Name + ") to "+
connections[1].Item.Name + " (" + connections[1].Name + ")", ServerLog.MessageType.ItemInteraction);
}
else if (connections[0] != null)
{
GameServer.Log(Character.Controlled.Name + " disconnected a wire from " +
connections[0].Item.Name + " (" + connections[0].Name + ")", ServerLog.MessageType.ItemInteraction);
}
else if (connections[1] != null)
{
GameServer.Log(Character.Controlled.Name + " disconnected a wire from " +
connections[1].Item.Name + " (" + connections[1].Name + ")", ServerLog.MessageType.ItemInteraction);
}
}
for (int i = 0; i < 2; i++)
{