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

Deconstructors & fabricators drop created items on the floor if there's no more room in the inventory, deconstructor doesn't reset the activation button after deconstructing an item if there are still more items to go

Browse Source
This commit is contained in:
Regalis
2017-03-23 18:55:39 +02:00
parent e9e4e5f9d3
commit 4d19d0afc1
2 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Subsurface/Source/Items/Components/Machines/Deconstructor.cs
View File

@@ -30,12 +30,9 @@ namespace Barotrauma.Items.Components
public override void Update(float deltaTime, Camera cam)
{
if (container == null || !container.Inventory.Items.Any(i=>i!=null))
if (container == null || container.Inventory.Items.All(i => i == null))
{
progressBar.BarSize = 0.0f;
//activateButton.Enabled = true;
if (container != null) container.Inventory.Locked = false;
IsActive = false;
SetActive(false);
return;
}
@@ -68,15 +65,27 @@ namespace Barotrauma.Items.Components
DebugConsole.ThrowError("Tried to deconstruct item \""+targetItem.Name+"\" but couldn't find item prefab \""+deconstructProduct+"\"!");
continue;
}
Item.Spawner.QueueItem(itemPrefab, containers[1].Inventory);
//container full, drop the items outside the deconstructor
if (containers[1].Inventory.Items.All(i => i != null))
{
Item.Spawner.QueueItem(itemPrefab, item.Position, item.Submarine);
}
else
{
Item.Spawner.QueueItem(itemPrefab, containers[1].Inventory);
}
}
container.Inventory.RemoveItem(targetItem);
Item.Remover.QueueItem(targetItem);
activateButton.Text = "Deconstruct";
progressBar.BarSize = 0.0f;
progressTimer = 0.0f;
if (container.Inventory.Items.Any(i => i != null))
{
progressTimer = 0.0f;
progressBar.BarSize = 0.0f;
}
}
}
@@ -115,6 +124,8 @@ namespace Barotrauma.Items.Components
return;
}
if (container.Inventory.Items.All(i => i == null)) active = false;
IsActive = active;
if (!IsActive)
@@ -126,7 +137,6 @@ namespace Barotrauma.Items.Components
}
else
{
if (container.Inventory.Items.All(i => i == null)) return;
activateButton.Text = "Cancel";
}

10
Subsurface/Source/Items/Components/Machines/Fabricator.cs
View File

@@ -375,7 +375,15 @@ namespace Barotrauma.Items.Components
}
}
Item.Spawner.QueueItem(fabricatedItem.TargetItem, containers[1].Inventory);
if (containers[1].Inventory.Items.All(i => i != null))
{
Item.Spawner.QueueItem(fabricatedItem.TargetItem, item.Position, item.Submarine);
}
else
{
Item.Spawner.QueueItem(fabricatedItem.TargetItem, containers[1].Inventory);
}
CancelFabricating();
}