v1.5.7.0 (Summer Update)

This commit is contained in:
Regalis11
2024-06-18 16:49:51 +03:00
parent 4a63dacbce
commit 230d1b6e78
263 changed files with 7792 additions and 2845 deletions
@@ -268,8 +268,10 @@ namespace Barotrauma.Items.Components
CreateNetworkEvent();
}
#endif
//the wire is active if only one end has been connected
IsActive = connections[0] == null ^ connections[1] == null;
//the wire is active if it's currently being wired to something (in character inventory and connected from one end)
IsActive =
item.ParentInventory is CharacterInventory &&
connections[0] == null ^ connections[1] == null;
}
Drawable = IsActive || nodes.Any();
@@ -839,9 +841,9 @@ namespace Barotrauma.Items.Components
}
}
public override void Load(ContentXElement componentElement, bool usePrefabValues, IdRemap idRemap)
public override void Load(ContentXElement componentElement, bool usePrefabValues, IdRemap idRemap, bool isItemSwap)
{
base.Load(componentElement, usePrefabValues, idRemap);
base.Load(componentElement, usePrefabValues, idRemap, isItemSwap);
nodes.AddRange(ExtractNodes(componentElement));