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

head revolutionaries are now blue (#23432)

Browse Source 
* inital2

* raemove break
This commit is contained in:
Mr. 27
2024-01-03 03:32:38 -05:00
committed by GitHub
parent 9f47079d02
commit 0e18d54cf7
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
View File

@@ -7,7 +7,6 @@ using Content.Server.GameTicking.Rules.Components;
using Content.Server.Mind; using Content.Server.Mind;
using Content.Server.NPC.Components; using Content.Server.NPC.Components;
using Content.Server.NPC.Systems; using Content.Server.NPC.Systems;
using Content.Server.Objectives;
using Content.Server.Popups; using Content.Server.Popups;
using Content.Server.Revolutionary.Components; using Content.Server.Revolutionary.Components;
using Content.Server.Roles; using Content.Server.Roles;
@@ -43,7 +42,6 @@ public sealed class RevolutionaryRuleSystem : GameRuleSystem<RevolutionaryRuleCo
[Dependency] private readonly MindSystem _mind = default!; [Dependency] private readonly MindSystem _mind = default!;
[Dependency] private readonly MobStateSystem _mobState = default!; [Dependency] private readonly MobStateSystem _mobState = default!;
[Dependency] private readonly NpcFactionSystem _npcFaction = default!; [Dependency] private readonly NpcFactionSystem _npcFaction = default!;
[Dependency] private readonly ObjectivesSystem _objectives = default!;
[Dependency] private readonly PopupSystem _popup = default!; [Dependency] private readonly PopupSystem _popup = default!;
[Dependency] private readonly RoleSystem _role = default!; [Dependency] private readonly RoleSystem _role = default!;
[Dependency] private readonly SharedStunSystem _stun = default!; [Dependency] private readonly SharedStunSystem _stun = default!;
@@ -104,15 +102,24 @@ public sealed class RevolutionaryRuleSystem : GameRuleSystem<RevolutionaryRuleCo
ev.AddLine(Loc.GetString(Outcomes[index])); ev.AddLine(Loc.GetString(Outcomes[index]));
ev.AddLine(Loc.GetString("rev-headrev-count", ("initialCount", headrev.HeadRevs.Count))); ev.AddLine(Loc.GetString("rev-headrev-count", ("initialCount", headrev.HeadRevs.Count)));
foreach (var player in headrev.HeadRevs.Values) foreach (var player in headrev.HeadRevs)
{ {
var title = _objectives.GetTitle(player);
if (title == null)
continue;
// TODO: when role entities are a thing this has to change // TODO: when role entities are a thing this has to change
var count = CompOrNull<RevolutionaryRoleComponent>(player)?.ConvertedCount ?? 0; var count = CompOrNull<RevolutionaryRoleComponent>(player.Value)?.ConvertedCount ?? 0;
ev.AddLine(Loc.GetString("rev-headrev-player", ("title", title), ("count", count)));
_mind.TryGetSession(player.Value, out var session);
var username = session?.Name;
if (username != null)
{
ev.AddLine(Loc.GetString("rev-headrev-name-user",
("name", player.Key),
("username", username), ("count", count)));
}
else
{
ev.AddLine(Loc.GetString("rev-headrev-name",
("name", player.Key), ("count", count)));
}
// TODO: someone suggested listing all alive? revs maybe implement at some point // TODO: someone suggested listing all alive? revs maybe implement at some point
} }

9
Resources/Locale/en-US/game-ticking/game-presets/preset-revolutionary.ftl
View File

@@ -55,7 +55,12 @@ rev-headrev-count = {$initialCount ->
*[other] There were {$initialCount} Head Revolutionaries: *[other] There were {$initialCount} Head Revolutionaries:
} }
rev-headrev-player = {$title} converted {$count} {$count -> rev-headrev-name-user = [color=#5e9cff]{$name}[/color] ([color=gray]{$username}[/color]) converted {$count} {$count ->
[one] person [one] person
*[other] people *[other] people
}. }
rev-headrev-name = [color=#5e9cff]{$name}[/color] converted {$count} {$count ->
[one] person
*[other] people
}