loadouts

Simple-Station · Mar 25, 2024 · 9384b92 · 9384b92
1 parent 2047b04
commit 9384b92
Show file tree

Hide file tree

Showing 19 changed files with 1,629 additions and 509 deletions.
diff --git a/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs b/Content.Client/Lobby/UI/LobbyCharacterPreviewPanel.cs
@@ -5,6 +5,9 @@
 using Content.Client.Inventory;
 using Content.Client.Preferences;
 using Content.Client.UserInterface.Controls;
+using Content.Shared.Clothing;
+using Content.Shared.Clothing.Loadouts;
+using Content.Shared.Clothing.Loadouts.Systems;
 using Content.Shared.GameTicking;
 using Content.Shared.Humanoid.Prototypes;
 using Content.Shared.Inventory;
@@ -126,6 +129,7 @@ public void UpdateUI()
                     _summaryLabel.Text = selectedCharacter.Summary;
                     _entityManager.System<HumanoidAppearanceSystem>().LoadProfile(_previewDummy.Value, selectedCharacter);
                     GiveDummyJobClothes(_previewDummy.Value, selectedCharacter);
+                    GiveDummyLoadoutItems(_previewDummy.Value, selectedCharacter);
                 }
             }
         }
@@ -162,5 +166,13 @@ public static void GiveDummyJobClothes(EntityUid dummy, HumanoidCharacterProfile
                 }
             }
         }
+
+        public static void GiveDummyLoadoutItems(EntityUid dummy, HumanoidCharacterProfile profile)
+        {
+            var highPriorityJobId = profile.JobPriorities.FirstOrDefault(j => j.Value == JobPriority.High).Key;
+            var highPriorityJob = IoCManager.Resolve<IPrototypeManager>().Index<JobPrototype>(highPriorityJobId ?? SharedGameTicker.FallbackOverflowJob);
+
+            EntitySystem.Get<LoadoutSystem>().ApplyCharacterLoadout(dummy, highPriorityJob, profile);
+        }
     }
 }
diff --git a/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs b/Content.Client/Players/PlayTimeTracking/JobRequirementsManager.cs
@@ -21,7 +21,7 @@ public sealed partial class JobRequirementsManager
     [Dependency] private readonly IPlayerManager _playerManager = default!;
     [Dependency] private readonly IPrototypeManager _prototypes = default!;
 
-    private readonly Dictionary<string, TimeSpan> _roles = new();
+    public readonly Dictionary<string, TimeSpan> PlayTimes = new();
     private readonly List<string> _roleBans = new();
 
     private ISawmill _sawmill = default!;
@@ -45,7 +45,7 @@ private void ClientOnRunLevelChanged(object? sender, RunLevelChangedEventArgs e)
         if (e.NewLevel == ClientRunLevel.Initialize)
         {
             // Reset on disconnect, just in case.
-            _roles.Clear();
+            PlayTimes.Clear();
         }
     }
 
@@ -63,12 +63,12 @@ private void RxRoleBans(MsgRoleBans message)
 
     private void RxPlayTime(MsgPlayTime message)
     {
-        _roles.Clear();
+        PlayTimes.Clear();
 
         // NOTE: do not assign _roles = message.Trackers due to implicit data sharing in integration tests.
         foreach (var (tracker, time) in message.Trackers)
         {
-            _roles[tracker] = time;
+            PlayTimes[tracker] = time;
         }
 
         /*var sawmill = Logger.GetSawmill("play_time");
@@ -102,7 +102,7 @@ public bool IsAllowed(JobPrototype job, [NotNullWhen(false)] out FormattedMessag
         return CheckRoleTime(job.Requirements, out reason);
     }
 
-    public bool CheckRoleTime(HashSet<JobRequirement>? requirements, [NotNullWhen(false)] out FormattedMessage? reason)
+    public bool CheckRoleTime(HashSet<JobRequirement>? requirements, [NotNullWhen(false)] out FormattedMessage? reason, string? localePrefix = null)
     {
         reason = null;
 
@@ -112,7 +112,7 @@ public bool CheckRoleTime(HashSet<JobRequirement>? requirements, [NotNullWhen(fa
         var reasons = new List<string>();
         foreach (var requirement in requirements)
         {
-            if (JobRequirements.TryRequirementMet(requirement, _roles, out var jobReason, _entManager, _prototypes, _whitelisted))
+            if (JobRequirements.TryRequirementMet(requirement, PlayTimes, out var jobReason, _entManager, _prototypes, _whitelisted, localePrefix))
                 continue;
 
             reasons.Add(jobReason.ToMarkup());
@@ -124,7 +124,7 @@ public bool CheckRoleTime(HashSet<JobRequirement>? requirements, [NotNullWhen(fa
 
     public TimeSpan FetchOverallPlaytime()
     {
-        return _roles.TryGetValue("Overall", out var overallPlaytime) ? overallPlaytime : TimeSpan.Zero;
+        return PlayTimes.TryGetValue("Overall", out var overallPlaytime) ? overallPlaytime : TimeSpan.Zero;
     }
 
     public IEnumerable<KeyValuePair<string, TimeSpan>> FetchPlaytimeByRoles()
@@ -133,7 +133,7 @@ public IEnumerable<KeyValuePair<string, TimeSpan>> FetchPlaytimeByRoles()
 
         foreach (var job in jobsToMap)
         {
-            if (_roles.TryGetValue(job.PlayTimeTracker, out var locJobName))
+            if (PlayTimes.TryGetValue(job.PlayTimeTracker, out var locJobName))
             {
                 yield return new KeyValuePair<string, TimeSpan>(job.Name, locJobName);
             }

diff --git a/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs b/Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
@@ -181,6 +181,7 @@ public CharacterPickerButton(
                 if (humanoid != null)
                 {
                     LobbyCharacterPreviewPanel.GiveDummyJobClothes(_previewDummy, humanoid);
+                    LobbyCharacterPreviewPanel.GiveDummyLoadoutItems(_previewDummy, humanoid);
                 }
 
                 var isSelectedCharacter = profile == preferencesManager.Preferences?.SelectedCharacter;
@@ -229,10 +230,8 @@ public CharacterPickerButton(
                 };
                 deleteButton.OnPressed += _ =>
                 {
-
                     deleteButton.Visible = false;
                     confirmDeleteButton.Visible = true;
-
                 };
 
                 var internalHBox = new BoxContainer

diff --git a/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml b/Content.Client/Preferences/UI/HumanoidProfileEditor.xaml
@@ -85,6 +85,12 @@
                                     <Control HorizontalExpand="True"/>
                                     <Button Name="ShowClothes" Pressed="True" ToggleMode="True" Text="{Loc 'humanoid-profile-editor-clothing-show'}" HorizontalAlignment="Right" />
                                 </BoxContainer>
+                                <!-- Show loadouts -->
+                                <BoxContainer HorizontalExpand="True">
+                                    <Label Text="{Loc 'humanoid-profile-editor-loadouts'}" />
+                                    <Control HorizontalExpand="True"/>
+                                    <Button Name="ShowLoadouts" Pressed="True" ToggleMode="True" Text="{Loc 'Show'}" HorizontalAlignment="Right" />
+                                </BoxContainer>
                                 <!-- Clothing -->
                                 <BoxContainer HorizontalExpand="True">
                                     <Label Text="{Loc 'humanoid-profile-editor-clothing-label'}" />
@@ -142,6 +148,15 @@
                         <BoxContainer Name="CTraitsList" Orientation="Vertical" />
                     </ScrollContainer>
                 </BoxContainer>
+                <BoxContainer Name="CLoadoutsTab" Orientation="Vertical" Margin="10">
+                    <!-- Loadouts -->
+                    <Label Name="LoadoutPointsLabel" HorizontalAlignment="Stretch" Align="Center" />
+                    <ProgressBar Name="LoadoutPointsBar" MaxValue="1" Value="1" MaxHeight="8" Margin="0 5" />
+
+                    <Button Name="CHideShowUnusableButton" Text="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button'}" ToolTip="{Loc 'humanoid-profile-editor-loadouts-show-unusable-button-tooltip'}" ToggleMode="True" Margin="0 0 0 5" />
+
+                    <TabContainer Name="CLoadoutsTabs" VerticalExpand="True" />
+                </BoxContainer>
                 <BoxContainer Name="CMarkingsTab" Orientation="Vertical" Margin="10">
                     <!-- Markings -->
                     <ScrollContainer VerticalExpand="True">