0c97520276
* Fix usages of TryIndex()
Most usages of TryIndex() were using it incorrectly. Checking whether prototype IDs specified in prototypes actually existed before using them. This is not appropriate as it's just hiding bugs that should be getting caught by the YAML linter and other tools. (#39115)
This then resulted in TryIndex() getting modified to log errors (94f98073b0), which is incorrect as it causes false-positive errors in proper uses of the API: external data validation. (#39098)
This commit goes through and checks every call site of TryIndex() to see whether they were correct. Most call sites were replaced with the new Resolve(), which is suitable for these "defensive programming" use cases.
Fixes #39115
Breaking change: while doing this I noticed IdCardComponent and related systems were erroneously using ProtoId<AccessLevelPrototype> for job prototypes. This has been corrected.
* fix tests
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
89 lines
3.1 KiB
C#
89 lines
3.1 KiB
C#
using Content.Server.Access.Components;
|
|
using Content.Server.GameTicking;
|
|
using Content.Server.Station.Components;
|
|
using Content.Server.Station.Systems;
|
|
using Content.Shared.Access.Systems;
|
|
using Content.Shared.Roles;
|
|
using Content.Shared.StatusIcon;
|
|
using Robust.Shared.Prototypes;
|
|
|
|
namespace Content.Server.Access.Systems;
|
|
|
|
public sealed class PresetIdCardSystem : EntitySystem
|
|
{
|
|
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
|
|
[Dependency] private readonly IdCardSystem _cardSystem = default!;
|
|
[Dependency] private readonly SharedAccessSystem _accessSystem = default!;
|
|
[Dependency] private readonly StationSystem _stationSystem = default!;
|
|
|
|
public override void Initialize()
|
|
{
|
|
SubscribeLocalEvent<PresetIdCardComponent, MapInitEvent>(OnMapInit);
|
|
|
|
SubscribeLocalEvent<RulePlayerJobsAssignedEvent>(PlayerJobsAssigned);
|
|
}
|
|
|
|
private void PlayerJobsAssigned(RulePlayerJobsAssignedEvent ev)
|
|
{
|
|
// Go over all ID cards and make sure they're correctly configured for extended access.
|
|
|
|
var query = EntityQueryEnumerator<PresetIdCardComponent>();
|
|
while (query.MoveNext(out var uid, out var card))
|
|
{
|
|
var station = _stationSystem.GetOwningStation(uid);
|
|
|
|
// If we're not on an extended access station, the ID is already configured correctly from MapInit.
|
|
if (station == null || !TryComp<StationJobsComponent>(station.Value, out var jobsComp) || !jobsComp.ExtendedAccess)
|
|
continue;
|
|
|
|
SetupIdAccess(uid, card, true);
|
|
SetupIdName(uid, card);
|
|
}
|
|
}
|
|
|
|
private void OnMapInit(EntityUid uid, PresetIdCardComponent id, MapInitEvent args)
|
|
{
|
|
// If a preset ID card is spawned on a station at setup time,
|
|
// the station may not exist,
|
|
// or may not yet know whether it is on extended access (players not spawned yet).
|
|
// PlayerJobsAssigned makes sure extended access is configured correctly in that case.
|
|
|
|
var station = _stationSystem.GetOwningStation(uid);
|
|
var extended = false;
|
|
|
|
// Station not guaranteed to have jobs (e.g. nukie outpost).
|
|
if (TryComp(station, out StationJobsComponent? stationJobs))
|
|
extended = stationJobs.ExtendedAccess;
|
|
|
|
SetupIdAccess(uid, id, extended);
|
|
SetupIdName(uid, id);
|
|
}
|
|
|
|
private void SetupIdName(EntityUid uid, PresetIdCardComponent id)
|
|
{
|
|
if (id.IdName == null)
|
|
return;
|
|
_cardSystem.TryChangeFullName(uid, id.IdName);
|
|
}
|
|
|
|
private void SetupIdAccess(EntityUid uid, PresetIdCardComponent id, bool extended)
|
|
{
|
|
if (id.JobName == null)
|
|
return;
|
|
|
|
if (!_prototypeManager.TryIndex(id.JobName, out JobPrototype? job))
|
|
{
|
|
Log.Error($"Invalid job id ({id.JobName}) for preset card");
|
|
return;
|
|
}
|
|
|
|
_accessSystem.SetAccessToJob(uid, job, extended);
|
|
|
|
_cardSystem.TryChangeJobTitle(uid, job.LocalizedName);
|
|
_cardSystem.TryChangeJobDepartment(uid, job);
|
|
|
|
if (_prototypeManager.Resolve(job.Icon, out var jobIcon))
|
|
_cardSystem.TryChangeJobIcon(uid, jobIcon);
|
|
}
|
|
}
|