tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Let stacks specify if they get thrown as one item, or individual… (#679)

Browse Source
This commit is contained in:
Profane McBane
2020-02-13 22:43:02 +00:00
committed by GitHub
parent 7f9d2f9dbf
commit 9e368b336f
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/GameObjects/Components/Stack/StackComponent.cs
View File

@@ -26,6 +26,7 @@ namespace Content.Server.GameObjects.Components.Stack
private const string SerializationCache = "stack"; private const string SerializationCache = "stack";
private int _count = 50; private int _count = 50;
private int _maxCount = 50; private int _maxCount = 50;
private bool _throwIndividually = false;
[ViewVariables(VVAccess.ReadWrite)] [ViewVariables(VVAccess.ReadWrite)]
public int Count public int Count
@@ -53,6 +54,17 @@ namespace Content.Server.GameObjects.Components.Stack
} }
} }
[ViewVariables(VVAccess.ReadWrite)]
public bool ThrowIndividually
{
get => _throwIndividually;
private set
{
_throwIndividually = value;
Dirty();
}
}
[ViewVariables] [ViewVariables]
public int AvailableSpace => MaxCount - Count; public int AvailableSpace => MaxCount - Count;

4
Content.Server/GameObjects/EntitySystems/HandsSystem.cs
View File

@@ -175,8 +175,8 @@ namespace Content.Server.GameObjects.EntitySystems
if (!handsComp.ThrowItem()) if (!handsComp.ThrowItem())
return false; return false;
// pop off an item, or throw the single item in hand. // throw the item, split off from a stack if it's meant to be thrown individually
if (!throwEnt.TryGetComponent(out StackComponent stackComp) || stackComp.Count < 2) if (!throwEnt.TryGetComponent(out StackComponent stackComp) || stackComp.Count < 2 || !stackComp.ThrowIndividually)
{ {
handsComp.Drop(handsComp.ActiveIndex); handsComp.Drop(handsComp.ActiveIndex);
} }