Update locker storage to entity tables (#37809)

* Update locker storage to entity tables

* tidy

* Requested changes

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>

Resources/Prototypes/Catalog/Fills/Lockers/biohazard.yml

@@ -1,49 +1,84 @@
- - type: entity
+- type: entity
-   id: ClosetL3Filled
+  id: ClosetL3Filled
-   suffix: Filled, Generic
+  suffix: Filled, Generic
-   parent: ClosetL3
+  parent: ClosetL3
-   components:
+  components:
-   - type: StorageFill
+  - type: EntityTableContainerFill
-     contents:
+    containers:
-       - id: ClothingOuterBioGeneral
+      entity_storage: !type:NestedSelector
-       - id: ClothingHeadHatHoodBioGeneral
+        tableId: FillBiohazardGearGeneric
 
- - type: entity
+- type: entityTable
-   id: ClosetL3VirologyFilled
+  id: FillBiohazardGearGeneric
-   suffix: Filled, Virology
+  table: !type:AllSelector
-   parent: ClosetL3Virology
+    children:
-   components:
+    - id: ClothingOuterBioGeneral
-   - type: StorageFill
+    - id: ClothingHeadHatHoodBioGeneral
-     contents:
-       - id: ClothingOuterBioVirology
-       - id: ClothingHeadHatHoodBioVirology
 
- - type: entity
+- type: entity
-   id: ClosetL3SecurityFilled
+  id: ClosetL3VirologyFilled
-   suffix: Filled, Security
+  suffix: Filled, Virology
-   parent: ClosetL3Security
+  parent: ClosetL3Virology
-   components:
+  components:
-   - type: StorageFill
+  - type: EntityTableContainerFill
-     contents:
+    containers:
-       - id: ClothingOuterBioSecurity
+      entity_storage: !type:NestedSelector
-       - id: ClothingHeadHatHoodBioSecurity
+        tableId: FillBiohazardGearVirology
 
- - type: entity
+- type: entityTable
-   id: ClosetL3JanitorFilled
+  id: FillBiohazardGearVirology
-   suffix: Filled, Janitor
+  table: !type:AllSelector
-   parent: ClosetL3Janitor
+    children:
-   components:
+    - id: ClothingOuterBioVirology
-   - type: StorageFill
+    - id: ClothingHeadHatHoodBioVirology
-     contents:
-       - id: ClothingOuterBioJanitor
-       - id: ClothingHeadHatHoodBioJanitor
 
- - type: entity
+- type: entity
-   id: ClosetL3ScienceFilled
+  id: ClosetL3SecurityFilled
-   suffix: Filled, Science
+  suffix: Filled, Security
-   parent: ClosetL3Science
+  parent: ClosetL3Security
-   components:
+  components:
-   - type: StorageFill
+  - type: EntityTableContainerFill
-     contents:
+    containers:
-       - id: ClothingOuterBioScientist
+      entity_storage: !type:NestedSelector
-       - id: ClothingHeadHatHoodBioScientist
+        tableId: FillBiohazardGearSecurity
+
+- type: entityTable
+  id: FillBiohazardGearSecurity
+  table: !type:AllSelector
+    children:
+    - id: ClothingOuterBioSecurity
+    - id: ClothingHeadHatHoodBioSecurity
+
+- type: entity
+  id: ClosetL3JanitorFilled
+  suffix: Filled, Janitor
+  parent: ClosetL3Janitor
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillBiohazardGearJanitor
+
+- type: entityTable
+  id: FillBiohazardGearJanitor
+  table: !type:AllSelector
+    children:
+    - id: ClothingOuterBioJanitor
+    - id: ClothingHeadHatHoodBioJanitor
+
+- type: entity
+  id: ClosetL3ScienceFilled
+  suffix: Filled, Science
+  parent: ClosetL3Science
+  components:
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillBiohazardGearScience
+
+- type: entityTable
+  id: FillBiohazardGearScience
+  table: !type:AllSelector
+    children:
+    - id: ClothingOuterBioScientist
+    - id: ClothingHeadHatHoodBioScientist

Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml

@@ -3,60 +3,83 @@
   parent: ClosetTool
   suffix: Filled
   components:
-  - type: StorageFill
+  - type: EntityTableContainerFill
-    contents:
+    containers:
-      - id: ClothingOuterVestHazard
+      entity_storage: !type:NestedSelector
-        prob: 0.4
+        tableId: FillClosetTool
-      - id: FlashlightLantern
+
-        prob: 0.7
+- type: entityTable
-      - id: Screwdriver
+  id: FillClosetTool
-        prob: 0.7
+  table: !type:AllSelector
-      - id: Wrench
+    children:
-        prob: 0.7
+    - id: ClothingOuterVestHazard
-      - id: Welder
+      prob: 0.4
-        prob: 0.7
+    - id: FlashlightLantern
-      - id: Crowbar
+      prob: 0.7
-        prob: 0.7
+    - id: Screwdriver
-      - id: Wirecutter
+      prob: 0.7
-        prob: 0.7
+    - id: Wrench
-      - id: Multitool
+      prob: 0.7
-        prob: 0.2
+    - id: Welder
-      - id: trayScanner
+      prob: 0.7
-        prob: 0.7
+    - id: Crowbar
-      - id: GasAnalyzer
+      prob: 0.7
-        prob: 0.7
+    - id: Wirecutter
-      - id: ClothingBeltUtility
+      prob: 0.7
-        prob: 0.2
+    - id: Multitool
-      - id: ClothingHandsGlovesColorYellow
+      prob: 0.2
-        prob: 0.05
+    - id: trayScanner
+      prob: 0.7
+    - id: GasAnalyzer
+      prob: 0.7
+    - id: ClothingBeltUtility
+      prob: 0.2
+    - id: ClothingHandsGlovesColorYellow
+      prob: 0.05
+    - !type:GroupSelector
+      prob: 0.4
+      children:
       - id: ClothingHeadHatHardhatRed
-        prob: 0.4
+      - id: ClothingHeadHatHardhatBlue
-      - id: CableApcStack
+      - id: ClothingHeadHatHardhatOrange
-        prob: 0.3
+      - id: ClothingHeadHatHardhatWhite
-      - id: CableApcStack
+      - id: ClothingHeadHatHardhatYellow
-        prob: 0.3
+      - id: ClothingHeadHatHardhatYellowDark
-      - id: CableApcStack
+    - id: CableApcStack
-        prob: 0.3
+      prob: 0.3
-      - id: SprayPainter
+      rolls: !type:ConstantNumberSelector
-        prob: 0.7
+        value: 3
+    - id: SprayPainter
+      prob: 0.7
 
 - type: entity
   id: LockerElectricalSuppliesFilled
   suffix: Filled
   parent: LockerElectricalSupplies
   components:
-  - type: StorageFill
+  - type: EntityTableContainerFill
-    contents:
+    containers:
-      - id: ToolboxElectricalFilled
+      entity_storage: !type:NestedSelector
-        prob: 0.7
+        tableId: FillElectricalSupplies
-      - id: FirelockElectronics
+
-        prob: 0.05
+- type: entityTable
-      - id: APCElectronics
+  id: FillElectricalSupplies
-        prob: 0.1
+  table: !type:AllSelector
-      - id: CableMVStack
+    children:
-        prob: 0.2
+    - id: ToolboxElectricalFilled
+      prob: 0.7
+    - id: FirelockElectronics
+      prob: 0.05
+    - id: APCElectronics
+      prob: 0.1
+    - !type:GroupSelector
+      prob: 0.5
+      children:
       - id: CableApcStack
-        prob: 0.3
+        weight: 5
+      - id: CableMVStack
+      - id: CableHVStack
+        weight: 0.5
 
 - type: entity
   id: LockerWeldingSuppliesFilled
@@ -104,73 +127,108 @@
   suffix: Filled, Hardsuit
   parent: LockerAtmospherics
   components:
-  - type: StorageFill
+  - type: EntityTableContainerFill
-    contents:
+    containers:
-      - id: ClothingOuterHardsuitAtmos
+      entity_storage: !type:AllSelector
-      - id: ClothingMaskGasAtmos
+        children:
-      - id: ClothingOuterSuitAtmosFire
+        - !type:NestedSelector
-      - id: ClothingHeadHelmetAtmosFire
+          tableId: FillLockerAtmospherics
-      - id: GasAnalyzer
+        - !type:NestedSelector
-      - id: MedkitOxygenFilled
+          tableId: FillAtmosphericsHardsuit
-      - id: HolofanProjector
-      - id: RCD
-      - id: RCDAmmo
-      - id: AirGrenade
 
 - type: entity
   id: LockerAtmosphericsFilled
   suffix: Filled
   parent: LockerAtmospherics
   components:
-  - type: StorageFill
+  - type: EntityTableContainerFill
-    contents:
+    containers:
-      - id: ClothingMaskGasAtmos
+      entity_storage: !type:NestedSelector
-      - id: ClothingOuterSuitAtmosFire
+        tableId: FillLockerAtmospherics
-      - id: ClothingHeadHelmetAtmosFire
+
-      - id: GasAnalyzer
+- type: entityTable
-      - id: MedkitOxygenFilled
+  id: FillLockerAtmospherics
-      - id: HolofanProjector
+  table: !type:AllSelector
-      - id: RCD
+    children:
-      - id: RCDAmmo
+    - id: ClothingMaskGasAtmos
-      - id: AirGrenade
+    - id: ClothingOuterSuitAtmosFire
+    - id: ClothingHeadHelmetAtmosFire
+    - id: GasAnalyzer
+    - id: MedkitOxygenFilled
+    - id: HolofanProjector
+    - id: RCD
+    - id: RCDAmmo
+    - id: AirGrenade
+
+- type: entityTable
+  id: FillAtmosphericsHardsuit
+  table: !type:AllSelector
+    children:
+    - id: ClothingOuterHardsuitAtmos
+    - id: OxygenTankFilled
+    - id: ClothingMaskBreath
 
 - type: entity
   id: LockerEngineerFilledHardsuit
   suffix: Filled, Hardsuit
   parent: LockerEngineer
   components:
-  - type: StorageFill
+  - type: EntityTableContainerFill
-    contents:
+    containers:
-      - id: ClothingOuterHardsuitEngineering
+      entity_storage: !type:AllSelector
-      - id: ClothingHandsGlovesColorYellow
+        children:
-      - id: ClothingMaskGas
+        - !type:NestedSelector
-      - id: ClothingShoesBootsMag
+          tableId: FillLockerEngineer
-      - id: RCD
+        - !type:NestedSelector
-      - id: RCDAmmo
+          tableId: FillEngineerHardsuit
-      - id: MetalFoamGrenade
 
 - type: entity
   id: LockerEngineerFilled
   suffix: Filled
   parent: LockerEngineer
   components:
-  - type: StorageFill
+  - type: EntityTableContainerFill
-    contents:
+    containers:
-      - id: ClothingHandsGlovesColorYellow
+      entity_storage: !type:NestedSelector
-      - id: ClothingMaskGas
+        tableId: FillLockerEngineer
-      - id: trayScanner
+
-      - id: RCD
+- type: entityTable
-      - id: RCDAmmo
+  id: FillLockerEngineer
-      - id: MetalFoamGrenade
+  table: !type:AllSelector
+    children:
+    - id: ClothingHandsGlovesColorYellow
+    - id: ClothingMaskGas
+    - id: trayScanner
+    - id: RCD
+    - id: RCDAmmo
+    - id: MetalFoamGrenade
+
+- type: entityTable
+  id: FillEngineerHardsuit
+  table: !type:AllSelector
+    children:
+    - id: ClothingOuterHardsuitEngineering
+    - id: OxygenTankFilled
+    - id: ClothingShoesBootsMag
+    - id: ClothingMaskBreath
 
 - type: entity
   id: ClosetRadiationSuitFilled
   parent: ClosetRadiationSuit
   suffix: Filled
   components:
-  - type: StorageFill
+  - type: EntityTableContainerFill
-    contents:
+    containers:
-      - id: ClothingOuterSuitRad
+      entity_storage: !type:NestedSelector
-        amount: 2
+        tableId: FillRadiationSuit
-      - id: GeigerCounter
+
-        amount: 2
+- type: entityTable
+  id: FillRadiationSuit
+  table: !type:AllSelector
+    children:
+    - id: ClothingOuterSuitRad
+      amount: !type:ConstantNumberSelector
+        value: 2
+    - id: GeigerCounter
+      amount: !type:ConstantNumberSelector
+        value: 2

Resources/Prototypes/Catalog/Fills/Lockers/science.yml

@@ -3,13 +3,20 @@
   suffix: Filled
   parent: LockerScientist
   components:
-  - type: StorageFill
+  - type: EntityTableContainerFill
-    contents:
+    containers:
-      - id: ClothingHandsGlovesLatex
+      entity_storage: !type:NestedSelector
-      - id: ClothingHeadsetScience
+        tableId: FillLockerScientist
-      - id: ClothingMaskSterile
+
-      - id: ClothingOuterCoatRnd
+- type: entityTable
-      - id: AnomalyScanner
+  id: FillLockerScientist
-      - id: NodeScanner
+  table: !type:AllSelector
-      - id: NetworkConfigurator
+    children:
-        prob: 0.5
+    - id: ClothingHandsGlovesLatex
+    - id: ClothingHeadsetScience
+    - id: ClothingMaskSterile
+    - id: ClothingOuterCoatRnd
+    - id: AnomalyScanner
+    - id: NodeScanner
+    - id: NetworkConfigurator
+      prob: 0.5

Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml

@@ -95,12 +95,10 @@
   parent: SuitStorageBase
   suffix: Station Engineer
   components:
-  - type: StorageFill
+  - type: EntityTableContainerFill
-    contents:
+    containers:
-        - id: OxygenTankFilled
+      entity_storage: !type:NestedSelector
-        - id: ClothingShoesBootsMag
+        tableId: FillEngineerHardsuit
-        - id: ClothingOuterHardsuitEngineering
-        - id: ClothingMaskBreath
   - type: AccessReader
     access: [["Engineering"]]
 
@@ -110,11 +108,10 @@
   parent: SuitStorageBase
   suffix: Atmospheric Technician
   components:
-  - type: StorageFill
+  - type: EntityTableContainerFill
-    contents:
+    containers:
-        - id: OxygenTankFilled
+      entity_storage: !type:NestedSelector
-        - id: ClothingOuterHardsuitAtmos
+        tableId: FillAtmosphericsHardsuit
-        - id: ClothingMaskBreath
   - type: AccessReader
     access: [["Atmospherics"]]