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

d9e5368...df7366c

Browse Source 
commit df7366c3d0db4c5cee4d0db33a0eb2ab5c7e28e9
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Tue Mar 19 13:22:17 2019 +0200

    Save all of the inventory slot indices an item is in, instead of just the first one. Otherwise inventories can get messed up because of equipped items: for example, a revolver may be equipped in a hand slot and the 3rd Any-slot, but just putting it in the and slot during loading will cause it to be placed into the hand slot and the first free Any-slot, potentially preventing whatever was actually in the first Any-slot to be placed in the inventory. Closes #1301

commit 4eeeb3531fe88aeb0dddca2b407ec6f260ea1e8e
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Tue Mar 19 12:55:27 2019 +0200

    Fixed sub/mode voting not being enabled when changing the setting after the server has been started.

commit 7f2118b950748d30cc21869cfff9d69fd5c77b81
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Tue Mar 19 12:41:09 2019 +0200

    Doors and hatches can now be repaired also with wrenches. Changing the required equipment for anything but door components doesn't have any effect anymore. TODO: remove/disable editing the field when it cannot be edited.
This commit is contained in:
Joonas Rikkonen
2019-03-19 13:23:11 +02:00
parent 7feceab01c
commit 3b402cf335
6 changed files with 118 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaShared/Source/Characters/CharacterInfo.cs
+24 -3
View File
@@ -802,12 +802,33 @@ namespace Barotrauma
foreach (XElement itemElement in element.Elements())
{
var newItem = Item.Load(itemElement, inventory.Owner.Submarine);
int slotIndex = itemElement.GetAttributeInt("i", 0);
if (newItem == null) continue;
if (newItem == null) { continue; }
int[] slotIndices = itemElement.GetAttributeIntArray("i", new int[] { 0 });
if (!slotIndices.Any())
{
DebugConsole.ThrowError("Invalid inventory data in character \"" + Name + "\" - no slot indices found");
continue;
}
SpawnInventoryItemProjSpecific(newItem);
inventory.TryPutItem(newItem, slotIndex, false, false, null);
inventory.TryPutItem(newItem, slotIndices[0], false, false, null);
//force the item to the correct slots
// e.g. putting the item in a hand slot will also put it in the first available Any-slot,
// which may not be where it actually was
for (int i = 0; i < inventory.Capacity; i++)
{
if (slotIndices.Contains(i))
{
inventory.Items[i] = newItem;
}
else if (inventory.Items[i] == newItem)
{
inventory.Items[i] = null;
}
}
int itemContainerIndex = 0;
var itemContainers = newItem.GetComponents<ItemContainer>().ToList();