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

Build 0.17.14.0

Browse Source
This commit is contained in:
Markus Isberg
2022-04-27 07:44:37 +09:00
parent 7a09cf3260
commit 6e38444fc4
47 changed files with 560 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/ClientSource/Items/Components/Turret.cs
+9 -12
View File
@@ -584,19 +584,16 @@ namespace Barotrauma.Items.Components
{
availableCharge = 0.0f;
availableCapacity = 0.0f;
if (item.Connections == null) { return; }
foreach (Connection c in item.Connections)
if (item.Connections == null || powerIn == null) { return; }
var recipients = powerIn.Recipients;
foreach (Connection recipient in recipients)
{
var recipients = c.Recipients;
foreach (Connection recipient in recipients)
{
if (!recipient.IsPower || !recipient.IsOutput) { continue; }
var battery = recipient.Item?.GetComponent<PowerContainer>();
if (battery == null) { continue; }
availableCharge += battery.Charge;
availableCapacity += battery.Capacity;
}
}
if (!recipient.IsPower || !recipient.IsOutput) { continue; }
var battery = recipient.Item?.GetComponent<PowerContainer>();
if (battery == null || battery.Item.Condition <= 0.0f) { continue; }
availableCharge += battery.Charge;
availableCapacity += battery.Capacity;
}
}
/// <summary>
Barotrauma/BarotraumaClient/ClientSource/Items/Inventory.cs
+10 -4
View File
@@ -273,10 +273,16 @@ namespace Barotrauma
foreach (string tag in readTags)
{
string[] s = tag.Split(':');
if (s[0] == "name")
idName = s[1];
if (s[0] == "job")
idJob = s[1];
switch (s[0])
{
case "name":
idName = s[1];
break;
case "job":
case "jobid":
idJob = s[1];
break;
}
}
if (idName != null)
{