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

Items removed due to the "DeleteOnUse" property are removed using EntitySpawner, removing an item removes it from the selected items of all characters. Closes #306

Browse Source
This commit is contained in:
Joonas Rikkonen
2018-03-05 12:13:52 +02:00
parent f72b4c697f
commit 4e048b7895
3 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Barotrauma/BarotraumaShared/Source/Items/CharacterInventory.cs
View File

@@ -50,7 +50,14 @@ namespace Barotrauma
}
Items[slotIndex].ApplyStatusEffects(ActionType.OnUse, 1.0f, character);
foreach (ItemComponent ic in Items[slotIndex].components)
{
if (ic.DeleteOnUse)
{
Entity.Spawner.AddToRemoveQueue(Items[slotIndex]);
}
}
return true;
}

5
Barotrauma/BarotraumaShared/Source/Items/Components/Holdable/MeleeWeapon.cs
View File

@@ -288,6 +288,11 @@ namespace Barotrauma.Items.Components
if (targetCharacter != null) //TODO: Allow OnUse to happen on structures too maybe??
ApplyStatusEffects(ActionType.OnUse, 1.0f, targetCharacter != null ? targetCharacter : null);
if (DeleteOnUse)
{
Entity.Spawner.AddToRemoveQueue(item);
}
return true;
}
}

16
Barotrauma/BarotraumaShared/Source/Items/Item.cs
View File

@@ -1166,7 +1166,10 @@ namespace Barotrauma
}
}
if (remove) Remove();
if (remove)
{
Spawner.AddToRemoveQueue(this);
}
}
public void SecondaryUse(float deltaTime, Character character = null)
@@ -1845,7 +1848,16 @@ namespace Barotrauma
public override void Remove()
{
base.Remove();
foreach (Character character in Character.CharacterList)
{
if (character.SelectedConstruction == this) character.SelectedConstruction = null;
for (int i = 0; i < character.SelectedItems.Length; i++)
{
if (character.SelectedItems[i] == this) character.SelectedItems[i] = null;
}
}
if (parentInventory != null)
{
parentInventory.RemoveItem(this);