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

Merge branch 'dev' of https://github.com/Regalis11/Barotrauma.git

Browse Source
This commit is contained in:
Evil Factory
2021-12-16 15:09:48 -03:00
parent 9927b5370e e2ce85884e
commit f71f598976
10 changed files with 34 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/SharedSource/Items/Components/Machines/Deconstructor.cs
+11 -4
View File
@@ -266,7 +266,6 @@ namespace Barotrauma.Items.Components
}
int amount = (int)amountMultiplier;
for (int i = 0; i < amount; i++)
{
Entity.Spawner.AddToSpawnQueue(itemPrefab, outputContainer.Inventory, condition, onSpawned: (Item spawnedItem) =>
@@ -276,16 +275,24 @@ namespace Barotrauma.Items.Components
for (int i = 0; i < outputContainer.Capacity; i++)
{
var containedItem = outputContainer.Inventory.GetItemAt(i);
bool combined = false;
if (containedItem?.OwnInventory != null)
{
foreach (Item subItem in containedItem.ContainedItems.ToList())
{
if (subItem.Combine(spawnedItem, null)) { break; }
if (subItem.Combine(spawnedItem, null))
{
combined = true;
break;
}
}
}
else if (containedItem?.Combine(spawnedItem, null) ?? false)
if (!combined)
{
break;
if (containedItem?.Combine(spawnedItem, null) ?? false)
{
break;
}
}
}
PutItemsToLinkedContainer();
Barotrauma/BarotraumaShared/changelog.txt
+7 -2
View File
@@ -1,14 +1,19 @@
---------------------------------------------------------------------------------------------------------
v0.15.22.1
---------------------------------------------------------------------------------------------------------
- Fixed GameAnalytics consent prompt still going outside the window on small resolutions and/or large text sizes.
- Fixed deconstructor not being able to put the items into containers in the output slots.
---------------------------------------------------------------------------------------------------------
v0.15.22.0
---------------------------------------------------------------------------------------------------------
- Fixed crashing on startup on some versions of macOS.
- Fixed GameAnalytics consent prompt going outside the window on small resolutions and/or large text sizes.
- Fixed Kastrull's drone sometimes spawning inside the sub client-side in multiplayer.
- Fixed opening the settings menu resetting the game window, which caused screen capture software to stop capturing the window.
- Fixed certain mods that don't configure the "you are here" circle sprite for the status monitors causing crashes.
- Fixed abilities that give simultaneous skill gain (minor in mechanics, once upon a time in europa, apprenticeship) not giving the extra skill points.
- Fixed deconstructor not being able to put the items into containers in the output slots.
---------------------------------------------------------------------------------------------------------
v0.15.21.0