{
jobButton.Disabled = true;
- if (!string.IsNullOrEmpty(reason))
+ if (!reason.IsEmpty)
{
- jobButton.ToolTip = reason;
+ var tooltip = new Tooltip();
+ tooltip.SetMessage(reason);
+ jobButton.TooltipSupplier = _ => tooltip;
}
jobSelector.AddChild(new TextureRect
using Robust.Shared.Configuration;
using Robust.Shared.Network;
using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
namespace Content.Client.Players.PlayTimeTracking;
[Dependency] private readonly IBaseClient _client = default!;
[Dependency] private readonly IClientNetManager _net = default!;
[Dependency] private readonly IConfigurationManager _cfg = default!;
+ [Dependency] private readonly IEntityManager _entManager = default!;
[Dependency] private readonly IPlayerManager _playerManager = default!;
[Dependency] private readonly IPrototypeManager _prototypes = default!;
Updated?.Invoke();
}
- public bool IsAllowed(JobPrototype job, [NotNullWhen(false)] out string? reason)
+ public bool IsAllowed(JobPrototype job, [NotNullWhen(false)] out FormattedMessage? reason)
{
reason = null;
if (_roleBans.Contains($"Job:{job.ID}"))
{
- reason = Loc.GetString("role-ban");
+ reason = FormattedMessage.FromUnformatted(Loc.GetString("role-ban"));
return false;
}
var reasonBuilder = new StringBuilder();
- var first = true;
foreach (var requirement in job.Requirements)
{
- if (JobRequirements.TryRequirementMet(requirement, _roles, out reason, _prototypes))
+ if (JobRequirements.TryRequirementMet(requirement, _roles, out var jobReason, _entManager, _prototypes))
continue;
- if (!first)
- reasonBuilder.Append('\n');
- first = false;
-
- reasonBuilder.AppendLine(reason);
+ reasonBuilder.AppendLine(jobReason.ToMarkup());
}
- reason = reasonBuilder.Length == 0 ? null : reasonBuilder.ToString();
+ reason = reasonBuilder.Length == 0 ? null : FormattedMessage.FromMarkup(reasonBuilder.ToString().Trim());
return reason == null;
}
}
using Robust.Client.Graphics;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.Controls;
+using Robust.Client.UserInterface.CustomControls;
using Robust.Client.UserInterface.XAML;
using Robust.Client.Utility;
using Robust.Shared.Configuration;
});
}
- public void LockRequirements(string requirements)
+ public void LockRequirements(FormattedMessage requirements)
{
- _lockStripe.ToolTip = requirements;
+ var tooltip = new Tooltip();
+ tooltip.SetMessage(requirements);
+ _lockStripe.TooltipSupplier = _ => tooltip;
_lockStripe.Visible = true;
_optionButton.Visible = false;
}
--- /dev/null
+using Content.Shared.Roles;
+using Content.Shared.Roles.Jobs;
+
+namespace Content.Client.Roles;
+
+public sealed class JobSystem : SharedJobSystem
+{
+
+}
var playTimes = _tracking.GetTrackerTimes(player);
- return JobRequirements.TryRequirementsMet(job, playTimes, out _, _prototypes);
+ return JobRequirements.TryRequirementsMet(job, playTimes, out _, EntityManager, _prototypes);
}
public HashSet<string> GetDisallowedJobs(IPlayerSession player)
{
foreach (var requirement in job.Requirements)
{
- if (JobRequirements.TryRequirementMet(requirement, playTimes, out _, _prototypes))
+ if (JobRequirements.TryRequirementMet(requirement, playTimes, out _, EntityManager, _prototypes))
continue;
goto NoRole;
foreach (var requirement in jobber.Requirements)
{
- if (JobRequirements.TryRequirementMet(requirement, playTimes, out _, _prototypes))
+ if (JobRequirements.TryRequirementMet(requirement, playTimes, out _, EntityManager, _prototypes))
continue;
jobs.RemoveSwap(i);
using Content.Shared.Mind;
using Content.Shared.Roles;
using Content.Shared.Roles.Jobs;
+using Robust.Shared.Prototypes;
namespace Content.Server.Roles.Jobs;
+/// <summary>
+/// Handles the job data on mind entities.
+/// </summary>
public sealed class JobSystem : SharedJobSystem
{
[Dependency] private readonly IChatManager _chat = default!;
- [Dependency] private readonly MindSystem _minds = default!;
- [Dependency] private readonly SharedRoleSystem _roles = default!;
+ [Dependency] private readonly MindSystem _mind = default!;
+ [Dependency] private readonly RoleSystem _roles = default!;
public override void Initialize()
{
if (args.Silent)
return;
- if (!_minds.TryGetSession(mindId, out var session))
+ if (!_mind.TryGetSession(mindId, out var session))
return;
if (!MindTryGetJob(mindId, out _, out var prototype))
using System.Diagnostics.CodeAnalysis;
using Content.Shared.Players.PlayTimeTracking;
+using Content.Shared.Roles.Jobs;
using JetBrains.Annotations;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Robust.Shared.Utility;
namespace Content.Shared.Roles
{
public static bool TryRequirementsMet(
JobPrototype job,
Dictionary<string, TimeSpan> playTimes,
- [NotNullWhen(false)] out string? reason,
+ [NotNullWhen(false)] out FormattedMessage? reason,
+ IEntityManager entManager,
IPrototypeManager prototypes)
{
reason = null;
foreach (var requirement in job.Requirements)
{
- if (!TryRequirementMet(requirement, playTimes, out reason, prototypes))
+ if (!TryRequirementMet(requirement, playTimes, out reason, entManager, prototypes))
return false;
}
public static bool TryRequirementMet(
JobRequirement requirement,
Dictionary<string, TimeSpan> playTimes,
- [NotNullWhen(false)] out string? reason,
+ [NotNullWhen(false)] out FormattedMessage? reason,
+ IEntityManager entManager,
IPrototypeManager prototypes)
-
{
reason = null;
var playtime = TimeSpan.Zero;
// Check all jobs' departments
- var jobs = prototypes.Index<DepartmentPrototype>(deptRequirement.Department).Roles;
+ var department = prototypes.Index<DepartmentPrototype>(deptRequirement.Department);
+ var jobs = department.Roles;
string proto;
// Check all jobs' playtime
if (deptDiff <= 0)
return true;
- reason = Loc.GetString(
+ reason = FormattedMessage.FromMarkup(Loc.GetString(
"role-timer-department-insufficient",
("time", deptDiff),
- ("department", Loc.GetString(deptRequirement.Department)));
+ ("department", Loc.GetString(deptRequirement.Department)),
+ ("departmentColor", department.Color.ToHex())));
return false;
}
else
{
if (deptDiff <= 0)
{
- reason = Loc.GetString(
+ reason = FormattedMessage.FromMarkup(Loc.GetString(
"role-timer-department-too-high",
("time", -deptDiff),
- ("department", Loc.GetString(deptRequirement.Department)));
+ ("department", Loc.GetString(deptRequirement.Department)),
+ ("departmentColor", department.Color.ToHex())));
return false;
}
if (overallDiff <= 0 || overallTime >= overallRequirement.Time)
return true;
- reason = Loc.GetString("role-timer-overall-insufficient", ("time", overallDiff));
+ reason = FormattedMessage.FromMarkup(Loc.GetString("role-timer-overall-insufficient", ("time", overallDiff)));
return false;
}
else
{
if (overallDiff <= 0 || overallTime >= overallRequirement.Time)
{
- reason = Loc.GetString("role-timer-overall-too-high", ("time", -overallDiff));
+ reason = FormattedMessage.FromMarkup(Loc.GetString("role-timer-overall-too-high", ("time", -overallDiff)));
return false;
}
playTimes.TryGetValue(proto, out var roleTime);
var roleDiff = roleRequirement.Time.TotalMinutes - roleTime.TotalMinutes;
+ var departmentColor = Color.Yellow;
+
+ if (entManager.EntitySysManager.TryGetEntitySystem(out SharedJobSystem? jobSystem))
+ {
+ var jobProto = jobSystem.GetJobPrototype(proto);
+
+ if (jobSystem.TryGetDepartment(jobProto, out var departmentProto))
+ departmentColor = departmentProto.Color;
+ }
if (!roleRequirement.Inverted)
{
if (roleDiff <= 0)
return true;
- reason = Loc.GetString(
+ reason = FormattedMessage.FromMarkup(Loc.GetString(
"role-timer-role-insufficient",
("time", roleDiff),
- ("job", Loc.GetString(proto)));
+ ("job", Loc.GetString(proto)),
+ ("departmentColor", departmentColor.ToHex())));
return false;
}
else
{
if (roleDiff <= 0)
{
- reason = Loc.GetString(
+ reason = FormattedMessage.FromMarkup(Loc.GetString(
"role-timer-role-too-high",
("time", -roleDiff),
- ("job", Loc.GetString(proto)));
+ ("job", Loc.GetString(proto)),
+ ("departmentColor", departmentColor.ToHex())));
return false;
}
using System.Diagnostics.CodeAnalysis;
+using System.Linq;
using Content.Shared.Players;
+using Content.Shared.Players.PlayTimeTracking;
using Robust.Shared.Players;
using Robust.Shared.Prototypes;
+using Robust.Shared.Utility;
namespace Content.Shared.Roles.Jobs;
[Dependency] private readonly IPrototypeManager _prototypes = default!;
[Dependency] private readonly SharedPlayerSystem _playerSystem = default!;
+ [Dependency] private readonly IPrototypeManager _protoManager = default!;
+ private readonly Dictionary<string, string> _inverseTrackerLookup = new();
+
+ public override void Initialize()
+ {
+ base.Initialize();
+ _protoManager.PrototypesReloaded += OnProtoReload;
+ SetupTrackerLookup();
+ }
+
+ public override void Shutdown()
+ {
+ base.Shutdown();
+ _protoManager.PrototypesReloaded -= OnProtoReload;
+ _inverseTrackerLookup.Clear();
+ }
+
+ private void OnProtoReload(PrototypesReloadedEventArgs obj)
+ {
+ _inverseTrackerLookup.Clear();
+ SetupTrackerLookup();
+ }
+
+ private void SetupTrackerLookup()
+ {
+ // This breaks if you have N trackers to 1 JobId but future concern.
+ foreach (var job in _protoManager.EnumeratePrototypes<JobPrototype>())
+ {
+ _inverseTrackerLookup.Add(job.PlayTimeTracker, job.ID);
+ }
+ }
+
+ /// <summary>
+ /// Gets the corresponding Job Prototype to a <see cref="PlayTimeTrackerPrototype"/>
+ /// </summary>
+ /// <param name="trackerProto"></param>
+ /// <returns></returns>
+ public string GetJobPrototype(string trackerProto)
+ {
+ DebugTools.Assert(_protoManager.HasIndex<PlayTimeTrackerPrototype>(trackerProto));
+ return _inverseTrackerLookup[trackerProto];
+ }
+
+ /// <summary>
+ /// Tries to get the first corresponding department for this job prototype.
+ /// </summary>
+ public bool TryGetDepartment(string jobProto, [NotNullWhen(true)] out DepartmentPrototype? departmentPrototype)
+ {
+ // Not that many departments so we can just eat the cost instead of storing the inverse lookup.
+ var departmentProtos = _protoManager.EnumeratePrototypes<DepartmentPrototype>().ToList();
+ departmentProtos.Sort((x, y) => string.Compare(x.ID, y.ID, StringComparison.Ordinal));
+
+ foreach (var department in departmentProtos)
+ {
+ if (department.Roles.Contains(jobProto))
+ {
+ departmentPrototype = department;
+ return true;
+ }
+ }
+
+ departmentPrototype = null;
+ return false;
+ }
+
public bool MindHasJobWithId(EntityUid? mindId, string prototypeId)
{
return CompOrNull<JobComponent>(mindId)?.PrototypeId == prototypeId;
-role-timer-department-insufficient = You require {TOSTRING($time, "0")} more minutes in {$department} department to play this role.
-role-timer-department-too-high = You require {TOSTRING($time, "0")} fewer minutes in {$department} department to play this role. (Are you trying to play a trainee role?)
-role-timer-overall-insufficient = You require {TOSTRING($time, "0")} more minutes of playtime to play this role.
-role-timer-overall-too-high = You require {TOSTRING($time, "0")} fewer minutes of playtime to play this role. (Are you trying to play a trainee role?)
-role-timer-role-insufficient = You require {TOSTRING($time, "0")} more minutes with {$job} to play this role.
-role-timer-role-too-high = You require {TOSTRING($time, "0")} fewer minutes with {$job} to play this role. (Are you trying to play a trainee role?)
+role-timer-department-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes of [color={$departmentColor}]{$department}[/color] department playtime to play this role.
+role-timer-department-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes in [color={$departmentColor}]{$department}[/color] department to play this role. (Are you trying to play a trainee role?)
+role-timer-overall-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes of playtime to play this role.
+role-timer-overall-too-high = You require [color=yellow]{TOSTRING($time, "0")}[/color] fewer minutes of playtime to play this role. (Are you trying to play a trainee role?)
+role-timer-role-insufficient = You require [color=yellow]{TOSTRING($time, "0")}[/color] more minutes with [color={$departmentColor}]{$job}[/color] to play this role.
+role-timer-role-too-high = You require[color=yellow] {TOSTRING($time, "0")}[/color] fewer minutes with [color={$departmentColor}]{$job}[/color] to play this role. (Are you trying to play a trainee role?)
role-timer-locked = Locked (hover for details)
projects / space-station-14.git / commitdiff