Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Use THE() for SecretStash (#17049)

Browse Source
This commit is contained in:
Pieter-Jan Briers
2023-06-03 21:10:07 +02:00
committed by GitHub
parent 304832dcf6
commit ee784ac17c
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/Storage/EntitySystems/SecretStashSystem.cs
View File

@@ -47,11 +47,11 @@ namespace Content.Server.Storage.EntitySystems
/// <returns>True if item was hidden inside stash</returns> /// <returns>True if item was hidden inside stash</returns>
public bool TryHideItem(EntityUid uid, EntityUid userUid, EntityUid itemToHideUid, public bool TryHideItem(EntityUid uid, EntityUid userUid, EntityUid itemToHideUid,
SecretStashComponent? component = null, ItemComponent? item = null, SecretStashComponent? component = null, ItemComponent? item = null,
MetaDataComponent? itemMeta = null, HandsComponent? hands = null) HandsComponent? hands = null)
{ {
if (!Resolve(uid, ref component)) if (!Resolve(uid, ref component))
return false; return false;
if (!Resolve(itemToHideUid, ref item, ref itemMeta)) if (!Resolve(itemToHideUid, ref item))
return false; return false;
if (!Resolve(userUid, ref hands)) if (!Resolve(userUid, ref hands))
return false; return false;
@@ -66,11 +66,10 @@ namespace Content.Server.Storage.EntitySystems
} }
// check if item is too big to fit into secret stash // check if item is too big to fit into secret stash
var itemName = itemMeta.EntityName;
if (item.Size > component.MaxItemSize) if (item.Size > component.MaxItemSize)
{ {
var msg = Loc.GetString("comp-secret-stash-action-hide-item-too-big", var msg = Loc.GetString("comp-secret-stash-action-hide-item-too-big",
("item", itemName), ("stash", GetSecretPartName(uid, component))); ("item", itemToHideUid), ("stash", GetSecretPartName(uid, component)));
_popupSystem.PopupEntity(msg, uid, userUid); _popupSystem.PopupEntity(msg, uid, userUid);
return false; return false;
} }
@@ -83,7 +82,7 @@ namespace Content.Server.Storage.EntitySystems
// all done, show success message // all done, show success message
var successMsg = Loc.GetString("comp-secret-stash-action-hide-success", var successMsg = Loc.GetString("comp-secret-stash-action-hide-success",
("item", itemName), ("this", GetSecretPartName(uid, component))); ("item", itemToHideUid), ("this", GetSecretPartName(uid, component)));
_popupSystem.PopupEntity(successMsg, uid, userUid); _popupSystem.PopupEntity(successMsg, uid, userUid);
return true; return true;
} }
@@ -123,8 +122,7 @@ namespace Content.Server.Storage.EntitySystems
if (stash.SecretPartName != "") if (stash.SecretPartName != "")
return Loc.GetString(stash.SecretPartName); return Loc.GetString(stash.SecretPartName);
var meta = EntityManager.GetComponent<MetaDataComponent>(uid); var entityName = Loc.GetString("comp-secret-stash-secret-part-name", ("this", uid));
var entityName = Loc.GetString("comp-secret-stash-secret-part-name", ("name", meta.EntityName));
return entityName; return entityName;
} }

8
Resources/Locale/en-US/storage/components/secret-stash-component.ftl
View File

@@ -1,10 +1,10 @@
### Secret stash component. Stuff like potted plants, comfy chair cushions, etc... ### Secret stash component. Stuff like potted plants, comfy chair cushions, etc...
comp-secret-stash-secret-part-name = {$name} comp-secret-stash-secret-part-name = { THE($item) }
comp-secret-stash-action-hide-success = You hide {$item} in { $this } comp-secret-stash-action-hide-success = You hide { THE($item) } in { $this }
comp-secret-stash-action-hide-container-not-empty = There's already something in here?! comp-secret-stash-action-hide-container-not-empty = There's already something in here?!
comp-secret-stash-action-hide-item-too-big = {$item} is too big to fit in {$stash}! comp-secret-stash-action-hide-item-too-big = { THE($item) } is too big to fit in {$stash}!
comp-secret-stash-action-get-item-found-something = There was something inside {$stash}! comp-secret-stash-action-get-item-found-something = There was something inside {$stash}!
secret-stash-part-plant = the plant secret-stash-part-plant = the plant
secret-stash-part-toilet = the toilet cistern secret-stash-part-toilet = the toilet cistern