v0.19.14.0

2022-10-20 17:05:24 +03:00
parent 35c6bd2526
commit 6cddd03918
62 changed files with 578 additions and 338 deletions
@@ -265,6 +265,8 @@ namespace Barotrauma.Items.Components
                foreach (DeconstructItem deconstructItem in it.Prefab.DeconstructItems)
                {
                    if (!deconstructItem.IsValidDeconstructor(item)) { continue; }
+                    float percentageHealth = it.Condition / it.MaxCondition;
+                    if (percentageHealth < deconstructItem.MinCondition || percentageHealth > deconstructItem.MaxCondition) { continue; }
                    RegisterItem(deconstructItem.ItemIdentifier, deconstructItem.Amount);
                }

@@ -1028,7 +1028,7 @@ namespace Barotrauma.Items.Components
            {
                foreach (var c in MineralClusters)
                {
-                    var unobtainedMinerals = c.resources.Where(i => i != null && i.GetRootInventoryOwner() == i);
+                    var unobtainedMinerals = c.resources.Where(i => i != null && i.GetComponent<Holdable>() is { Attached: true });
                    if (unobtainedMinerals.None()) { continue; }
                    if (!CheckResourceMarkerVisibility(c.center, transducerCenter)) { continue; }
                    var i = unobtainedMinerals.FirstOrDefault();