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>
71 lines
2.4 KiB
C#
71 lines
2.4 KiB
C#
using Content.Client.Message;
|
|
using Content.Shared.Cargo;
|
|
using Content.Shared.Cargo.Prototypes;
|
|
using Content.Shared.Random;
|
|
using Robust.Client.AutoGenerated;
|
|
using Robust.Client.UserInterface.Controls;
|
|
using Robust.Client.UserInterface.XAML;
|
|
using Robust.Shared.Prototypes;
|
|
using Robust.Shared.Timing;
|
|
using Serilog;
|
|
|
|
namespace Content.Client.Cargo.UI;
|
|
|
|
[GenerateTypedNameReferences]
|
|
public sealed partial class BountyEntry : BoxContainer
|
|
{
|
|
[Dependency] private readonly IPrototypeManager _prototype = default!;
|
|
|
|
public Action? OnLabelButtonPressed;
|
|
public Action? OnSkipButtonPressed;
|
|
|
|
public TimeSpan EndTime;
|
|
public TimeSpan UntilNextSkip;
|
|
|
|
public BountyEntry(CargoBountyData bounty, TimeSpan untilNextSkip)
|
|
{
|
|
RobustXamlLoader.Load(this);
|
|
IoCManager.InjectDependencies(this);
|
|
|
|
UntilNextSkip = untilNextSkip;
|
|
|
|
if (!_prototype.Resolve<CargoBountyPrototype>(bounty.Bounty, out var bountyPrototype))
|
|
return;
|
|
|
|
var items = new List<string>();
|
|
foreach (var entry in bountyPrototype.Entries)
|
|
{
|
|
items.Add(Loc.GetString("bounty-console-manifest-entry",
|
|
("amount", entry.Amount),
|
|
("item", Loc.GetString(entry.Name))));
|
|
}
|
|
ManifestLabel.SetMarkup(Loc.GetString("bounty-console-manifest-label", ("item", string.Join(", ", items))));
|
|
RewardLabel.SetMarkup(Loc.GetString("bounty-console-reward-label", ("reward", bountyPrototype.Reward)));
|
|
DescriptionLabel.SetMarkup(Loc.GetString("bounty-console-description-label", ("description", Loc.GetString(bountyPrototype.Description))));
|
|
IdLabel.SetMarkup(Loc.GetString("bounty-console-id-label", ("id", bounty.Id)));
|
|
|
|
PrintButton.OnPressed += _ => OnLabelButtonPressed?.Invoke();
|
|
SkipButton.OnPressed += _ => OnSkipButtonPressed?.Invoke();
|
|
}
|
|
|
|
private void UpdateSkipButton(float deltaSeconds)
|
|
{
|
|
UntilNextSkip -= TimeSpan.FromSeconds(deltaSeconds);
|
|
if (UntilNextSkip > TimeSpan.Zero)
|
|
{
|
|
SkipButton.Label.Text = UntilNextSkip.ToString("mm\\:ss");
|
|
SkipButton.Disabled = true;
|
|
return;
|
|
}
|
|
|
|
SkipButton.Label.Text = Loc.GetString("bounty-console-skip-button-text");
|
|
SkipButton.Disabled = false;
|
|
}
|
|
|
|
protected override void FrameUpdate(FrameEventArgs args)
|
|
{
|
|
base.FrameUpdate(args);
|
|
UpdateSkipButton(args.DeltaSeconds);
|
|
}
|
|
}
|