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

Fix name serialization for secret stashes (#3301)

Browse Source 
* Fix name serialization for secret stashes

* Fix old usages of secret part name
This commit is contained in:
DrSmugleaf
2021-02-19 19:29:24 +01:00
committed by GitHub
parent 65d1df4f0f
commit 6d666b92e9
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/GameObjects/Components/Items/Storage/SecretStashComponent.cs
View File

@@ -20,10 +20,12 @@ namespace Content.Server.GameObjects.Components.Items.Storage
public override string Name => "SecretStash"; public override string Name => "SecretStash";
[ViewVariables] private int _maxItemSize; [ViewVariables] private int _maxItemSize;
[ViewVariables] private string _secretPartName = ""; [ViewVariables] private string? _secretPartName;
[ViewVariables] private ContainerSlot _itemContainer = default!; [ViewVariables] private ContainerSlot _itemContainer = default!;
public string SecretPartName => _secretPartName ?? Loc.GetString("{0:theName}", Owner);
public override void Initialize() public override void Initialize()
{ {
base.Initialize(); base.Initialize();
@@ -32,8 +34,9 @@ namespace Content.Server.GameObjects.Components.Items.Storage
public override void ExposeData(ObjectSerializer serializer) public override void ExposeData(ObjectSerializer serializer)
{ {
base.ExposeData(serializer); base.ExposeData(serializer);
serializer.DataField(ref _maxItemSize, "maxItemSize", (int) ReferenceSizes.Pocket); serializer.DataField(ref _maxItemSize, "maxItemSize", (int) ReferenceSizes.Pocket);
serializer.DataField(ref _secretPartName, "secretPartName", Loc.GetString("{0:theName}")); serializer.DataField(ref _secretPartName, "secretPartName", null);
} }
/// <summary> /// <summary>
@@ -56,7 +59,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage
if (item.Size > _maxItemSize) if (item.Size > _maxItemSize)
{ {
Owner.PopupMessage(user, Owner.PopupMessage(user,
Loc.GetString("{0:TheName} is too big to fit in {1}!", itemToHide, _secretPartName)); Loc.GetString("{0:TheName} is too big to fit in {1}!", itemToHide, SecretPartName));
return false; return false;
} }
@@ -66,7 +69,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage
if (!hands.Drop(itemToHide, _itemContainer)) if (!hands.Drop(itemToHide, _itemContainer))
return false; return false;
Owner.PopupMessage(user, Loc.GetString("You hide {0:theName} in {1}.", itemToHide, _secretPartName)); Owner.PopupMessage(user, Loc.GetString("You hide {0:theName} in {1}.", itemToHide, SecretPartName));
return true; return true;
} }
@@ -81,7 +84,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage
if (_itemContainer.ContainedEntity == null) if (_itemContainer.ContainedEntity == null)
return false; return false;
Owner.PopupMessage(user, Loc.GetString("There was something inside {0}!", _secretPartName)); Owner.PopupMessage(user, Loc.GetString("There was something inside {0}!", SecretPartName));
if (user.TryGetComponent(out HandsComponent? hands)) if (user.TryGetComponent(out HandsComponent? hands))
{ {