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>
87 lines
2.7 KiB
C#
87 lines
2.7 KiB
C#
using System.Diagnostics.CodeAnalysis;
|
|
using Content.Shared.Localizations;
|
|
using Content.Shared.Preferences;
|
|
using JetBrains.Annotations;
|
|
using Robust.Shared.Prototypes;
|
|
using Robust.Shared.Serialization;
|
|
using Robust.Shared.Utility;
|
|
|
|
namespace Content.Shared.Roles;
|
|
|
|
[UsedImplicitly]
|
|
[Serializable, NetSerializable]
|
|
public sealed partial class DepartmentTimeRequirement : JobRequirement
|
|
{
|
|
/// <summary>
|
|
/// Which department needs the required amount of time.
|
|
/// </summary>
|
|
[DataField(required: true)]
|
|
public ProtoId<DepartmentPrototype> Department;
|
|
|
|
/// <summary>
|
|
/// How long (in seconds) this requirement is.
|
|
/// </summary>
|
|
[DataField(required: true)]
|
|
public TimeSpan Time;
|
|
|
|
public override bool Check(IEntityManager entManager,
|
|
IPrototypeManager protoManager,
|
|
HumanoidCharacterProfile? profile,
|
|
IReadOnlyDictionary<string, TimeSpan> playTimes,
|
|
[NotNullWhen(false)] out FormattedMessage? reason)
|
|
{
|
|
reason = new FormattedMessage();
|
|
var playtime = TimeSpan.Zero;
|
|
|
|
// Check all jobs' departments
|
|
var department = protoManager.Index(Department);
|
|
var jobs = department.Roles;
|
|
string proto;
|
|
|
|
// Check all jobs' playtime
|
|
foreach (var other in jobs)
|
|
{
|
|
// The schema is stored on the Job role but we want to explode if the timer isn't found anyway.
|
|
proto = protoManager.Index(other).PlayTimeTracker;
|
|
|
|
playTimes.TryGetValue(proto, out var otherTime);
|
|
playtime += otherTime;
|
|
}
|
|
|
|
var deptDiffSpan = Time - playtime;
|
|
var deptDiff = deptDiffSpan.TotalMinutes;
|
|
var formattedDeptDiff = ContentLocalizationManager.FormatPlaytime(deptDiffSpan);
|
|
var nameDepartment = "role-timer-department-unknown";
|
|
|
|
if (protoManager.Resolve(Department, out var departmentIndexed))
|
|
{
|
|
nameDepartment = departmentIndexed.Name;
|
|
}
|
|
|
|
if (!Inverted)
|
|
{
|
|
if (deptDiff <= 0)
|
|
return true;
|
|
|
|
reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
|
|
"role-timer-department-insufficient",
|
|
("time", formattedDeptDiff),
|
|
("department", Loc.GetString(nameDepartment)),
|
|
("departmentColor", department.Color.ToHex())));
|
|
return false;
|
|
}
|
|
|
|
if (deptDiff <= 0)
|
|
{
|
|
reason = FormattedMessage.FromMarkupPermissive(Loc.GetString(
|
|
"role-timer-department-too-high",
|
|
("time", formattedDeptDiff),
|
|
("department", Loc.GetString(nameDepartment)),
|
|
("departmentColor", department.Color.ToHex())));
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
}
|