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

fix(contraband): Make contraband work with chameleon items (#30986)

Browse Source 
* formatting

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
This commit is contained in:
Brandon Hu
2024-09-23 20:19:15 +00:00
committed by GitHub
parent 5e9a0c9d9d
commit 20bb9ede11
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs
View File

@@ -1,5 +1,6 @@
using Content.Shared.Access.Components;
using Content.Shared.Clothing.Components;
using Content.Shared.Contraband;
using Content.Shared.Inventory;
using Content.Shared.Inventory.Events;
using Content.Shared.Item;
@@ -13,6 +14,7 @@ public abstract class SharedChameleonClothingSystem : EntitySystem
[Dependency] private readonly IComponentFactory _factory = default!;
[Dependency] private readonly IPrototypeManager _proto = default!;
[Dependency] private readonly ClothingSystem _clothingSystem = default!;
[Dependency] private readonly ContrabandSystem _contraband = default!;
[Dependency] private readonly MetaDataSystem _metaData = default!;
[Dependency] private readonly SharedItemSystem _itemSystem = default!;
[Dependency] private readonly TagSystem _tag = default!;
@@ -68,6 +70,17 @@ public abstract class SharedChameleonClothingSystem : EntitySystem
{
_clothingSystem.CopyVisuals(uid, otherClothing, clothing);
}
// properly mark contraband
if (proto.TryGetComponent("Contraband", out ContrabandComponent? contra))
{
EnsureComp<ContrabandComponent>(uid, out var current);
_contraband.CopyDetails(uid, contra, current);
}
else
{
RemComp<ContrabandComponent>(uid);
}
}
protected virtual void UpdateSprite(EntityUid uid, EntityPrototype proto) { }

12
Content.Shared/Contraband/ContrabandSystem.cs
View File

@@ -33,6 +33,16 @@ public sealed class ContrabandSystem : EntitySystem
_contrabandExamineEnabled = val;
}
public void CopyDetails(EntityUid uid, ContrabandComponent other, ContrabandComponent? contraband = null)
{
if (!Resolve(uid, ref contraband))
return;
contraband.Severity = other.Severity;
contraband.AllowedDepartments = other.AllowedDepartments;
Dirty(uid, contraband);
}
private void OnExamined(Entity<ContrabandComponent> ent, ref ExaminedEvent args)
{
if (!_contrabandExamineEnabled)
@@ -45,7 +55,7 @@ public sealed class ContrabandSystem : EntitySystem
using (args.PushGroup(nameof(ContrabandComponent)))
{
var severity = _proto.Index(ent.Comp.Severity);
if (severity.ShowDepartments && ent.Comp is { AllowedDepartments: not null })
if (severity.ShowDepartments && ent.Comp is { AllowedDepartments: not null })
{
// TODO shouldn't department prototypes have a localized name instead of just using the ID for this?
var list = ContentLocalizationManager.FormatList(ent.Comp.AllowedDepartments.Select(p => Loc.GetString($"department-{p.Id}")).ToList());