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

Merge branch 'ursinewalrus-gameFailsToStartOnStoreOverBuy'

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-07-24 18:39:16 +03:00
parent 9edbbaa170 c28fd336c9
commit 2705eddd18
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Barotrauma/BarotraumaShared/Source/GameSession/CargoManager.cs
View File

@@ -110,6 +110,7 @@ namespace Barotrauma
}
Dictionary<ItemContainer, int> availableContainers = new Dictionary<ItemContainer, int>();
ItemPrefab containerPrefab = null;
foreach (PurchasedItem Pi in itemsToSpawn)
{
Vector2 position = new Vector2(
@@ -125,7 +126,7 @@ namespace Barotrauma
if (itemContainer == null)
{
var containerPrefab = MapEntityPrefab.List.Find(ep =>
containerPrefab = MapEntityPrefab.List.Find(ep =>
ep.NameMatches(Pi.itemPrefab.CargoContainerName) ||
(ep.Tags != null && ep.Tags.Contains(Pi.itemPrefab.CargoContainerName.ToLowerInvariant()))) as ItemPrefab;
@@ -151,6 +152,13 @@ namespace Barotrauma
}
for (int i = 0; i < Pi.quantity; i++)
{
if (!availableContainers.ContainsKey(itemContainer))
{
Item containerItemOverFlow = new Item(containerPrefab, position, wp.Submarine);
itemContainer = containerItemOverFlow.GetComponent<ItemContainer>();
availableContainers.Add(itemContainer, itemContainer.Capacity);
}
if (itemContainer == null)
{
//no container, place at the waypoint
@@ -177,8 +185,12 @@ namespace Barotrauma
}
//reduce the number of available slots in the container
availableContainers[itemContainer]--;
if (availableContainers[itemContainer] <= 0)
//if there is a container
if (availableContainers.ContainsKey(itemContainer))
{
availableContainers[itemContainer]--;
}
if (availableContainers.ContainsKey(itemContainer) && availableContainers[itemContainer] <= 0)
{
availableContainers.Remove(itemContainer);
}