fix loadout (#1002)

Rxup · Jan 12, 2025 · a6369f9 · a6369f9
1 parent ac1b0b1
commit a6369f9
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 23 deletions.
diff --git a/Content.Client/Lobby/LobbyUIController.cs b/Content.Client/Lobby/LobbyUIController.cs
@@ -492,23 +492,21 @@ public EntityUid LoadProfileEntity(HumanoidCharacterProfile? humanoid, JobProtot
             if (_prototypeManager.HasIndex<RoleLoadoutPrototype>(LoadoutSystem.GetJobPrototype(job.ID)))
             {
                 var loadout = humanoid.GetLoadoutOrDefault(LoadoutSystem.GetJobPrototype(job.ID), _playerManager.LocalSession, humanoid.Species, EntityManager, _prototypeManager);
+
                 //backmen-clothing: start
-                HashSet<string> groupsToShow = ["Werx", "Niz", "Socks"];
-                if (jobClothes)
-                {
-                    foreach (var loadoutsKey in loadout.SelectedLoadouts.Keys.Where(loadoutsKey => groupsToShow.Contains(loadoutsKey)))
-                    {
-                        loadout.SelectedLoadouts.Remove(loadoutsKey);
-                    }
-                }
-                else
+                IReadOnlyList<string> groupsToShow = ["Werx", "Niz", "Socks"]; //consts
+                if (!jobClothes)
                 {
-                    foreach (var loadoutsKey in loadout.SelectedLoadouts.Keys.Where(loadoutsKey => !groupsToShow.Contains(loadoutsKey)))
+                    foreach (var loadoutsKey in loadout.SelectedLoadouts.Keys)
                     {
-                        loadout.SelectedLoadouts.Remove(loadoutsKey);
+                        if (groupsToShow.Contains(loadoutsKey.Id))
+                        {
+                            loadout.SelectedLoadouts.Remove(loadoutsKey);
+                        }
                     }
                 }
                 //backmen-clothing: end
+
                 GiveDummyLoadout(dummyEnt, loadout);
             }
         }

diff --git a/Resources/Prototypes/Corvax/Loadouts/role_loadouts.yml b/Resources/Prototypes/Corvax/Loadouts/role_loadouts.yml
@@ -1,6 +1,9 @@
 - type: roleLoadout
   id: JobIAA
   groups:
+  - Werx #backmen
+  - Niz #backmen
+  - Socks #backmen
   - LawyerNeck
   - LawyerJumpsuit
   - CommonBackpack
@@ -13,6 +16,9 @@
 - type: roleLoadout
   id: JobPilot
   groups:
+  - Werx #backmen
+  - Niz #backmen
+  - Socks #backmen
   - SecurityJumpsuit
   - SecurityBackpack
   - SecurityOuterClothing

diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml
@@ -31,7 +31,6 @@
   - HoPOuterClothing
   - Glasses
   - Medals #backmen
-  - Inventory # Corvax-Loadouts
   - Survival
   - SelfDefenceDevices # Ataraxia
   - Trinkets
@@ -60,7 +59,6 @@
   - PassengerShoes
   - Glasses
   - Medals #backmen
-  - Inventory # Corvax-Loadouts
   - Survival
   - Trinkets
   - GroupSpeciesBreathTool
@@ -79,7 +77,6 @@
   - BartenderOuterClothing
   - Glasses
   - Medals #backmen
-  - Inventory # Corvax-Loadouts
   - Survival
   - Trinkets
   - GroupSpeciesBreathTool
@@ -96,7 +93,6 @@
   - CommonBackpack
   - Glasses
   - Medals #backmen
-  - Inventory # Corvax-Loadouts
   - Survival
   - Trinkets
   - GroupSpeciesBreathTool
@@ -116,7 +112,6 @@
   - ChefOuterClothing
   - Glasses
   - Medals #backmen
-  - Inventory # Corvax-Loadouts
   - Survival
   - Trinkets
   - GroupSpeciesBreathTool
@@ -133,7 +128,6 @@
   - CommonBackpack
   - Glasses
   - Medals #backmen
-  - Inventory # Corvax-Loadouts
   - Survival
   - Trinkets
   - GroupSpeciesBreathTool
@@ -152,7 +146,6 @@
   - Glasses
   - Medals #backmen
   - Survival
-  - Inventory # Corvax-Loadouts
   - Trinkets
   - GroupSpeciesBreathTool
   - Inventory # Corvax-Loadouts
@@ -172,7 +165,6 @@
   - ChaplainOuterClothing
   - Glasses
   - Medals #backmen
-  - Inventory # Corvax-Loadouts
   - Trinkets
   - GroupSpeciesBreathTool
   - Inventory # Corvax-Loadouts
@@ -711,7 +703,6 @@
   - MedicalBackpack
   - Glasses
   - Medals #backmen
-  - Inventory # Corvax-Loadouts
   - Survival
   - Trinkets
   - GroupSpeciesBreathTool

diff --git a/Resources/Prototypes/_Backmen/Loadouts/role_loadout.yml b/Resources/Prototypes/_Backmen/Loadouts/role_loadout.yml
@@ -1,6 +1,9 @@
 - type: roleLoadout
   id: JobBKCCCargo
   groups:
+  - Werx #backmen
+  - Niz #backmen
+  - Socks #backmen
   - BKCCCargoJumpsuit
   - BKCCCargoNeck
   - BKCCCargoBackpack
@@ -28,6 +31,9 @@
 - type: roleLoadout
   id: JobBlueShield
   groups:
+  - Werx #backmen
+  - Niz #backmen
+  - Socks #backmen
   - ClothingUniformJumpsuitBlueShield
   - ClothingHeadHatBlueShield
   - ClothingOuterBlueShield
@@ -36,6 +42,3 @@
   - Survival
   - Medals #backmen
   - Inventory # Corvax-Loadouts
-  - Werx #backmen
-  - Niz #backmen
-  - Socks #backmen