Storagefill component refactor (#2093)

* refactored storagefill component to allow for random items, amount, and conditional exclusion * i fudged it * yaml for the already deleted filler components * ignoredcomponents & janifill * remainder of toolboxes done * emergencyclosetfill * really makes you think * it DOES really make you think * orGroup * exp111 suggestions * last touches * isNullOrEmpty
2020-09-21 12:47:52 +02:00
parent 8238a89190
commit 37d6ca556f
23 changed files with 247 additions and 562 deletions
--- a/Resources/Prototypes/Catalog/Fills/backpack.yml
+++ b/Resources/Prototypes/Catalog/Fills/backpack.yml
@@ -5,7 +5,7 @@
  components:
  - type: StorageFill
    contents:
-      - BoxSurvival
+      - name: BoxSurvival

 - type: entity
  abstract: true
@@ -14,7 +14,7 @@
  components:
  - type: StorageFill
    contents:
-      - BoxSurvival
+      - name: BoxSurvival

 - type: entity
  abstract: true
@@ -23,9 +23,9 @@
  components:
  - type: StorageFill
    contents:
-      - BoxSurvival
-      - Stunbaton
-      - Flash
+      - name: BoxSurvival
+      - name: Stunbaton
+      - name: Flash

 - type: entity
  abstract: true
@@ -34,7 +34,7 @@
  components:
  - type: StorageFill
    contents:
-      - BoxSurvival
+      - name: BoxSurvival

 - type: entity
  abstract: true
@@ -43,9 +43,9 @@
  components:
  - type: StorageFill
    contents:
-      - BoxSurvival
-      #- StationCharter
-      #- TelescopicBaton
+      - name: BoxSurvival
+      #- name: StationCharter
+      #- name: TelescopicBaton

 - type: entity
  abstract: true
@@ -54,4 +54,4 @@
  components:
  - type: StorageFill
    contents:
-      - BoxSurvival
+      - name: BoxSurvival
--- a/Resources/Prototypes/Catalog/Fills/belt.yml
+++ b/Resources/Prototypes/Catalog/Fills/belt.yml
@@ -3,4 +3,12 @@
  parent: UtilityBeltClothing
  suffix: Filled
  components:
-  - type: UtilityBeltClothingFill
+  - type: StorageFill
+    contents:
+      - name: Crowbar
+      - name: Wrench
+      - name: Screwdriver
+      - name: Wirecutter
+      - name: Welder
+      - name: Multitool
+      - name: ApcExtensionCableStack
--- a/Resources/Prototypes/Catalog/Fills/crate.yml
+++ b/Resources/Prototypes/Catalog/Fills/crate.yml
@@ -5,11 +5,8 @@
  components:
  - type: StorageFill
    contents:
-      - FlashlightLantern
-      - FlashlightLantern
-      - FlashlightLantern
-      - FlashlightLantern
-      - FlashlightLantern
+      - name: FlashlightLantern
+        amount: 5

 - type: entity
  id: CrateLightBulb
@@ -18,16 +15,8 @@
  components:
  - type: StorageFill
    contents:
-      - LightBulb
-      - LightBulb
-      - LightBulb
-      - LightBulb
-      - LightBulb
-      - LightBulb
-      - LightBulb
-      - LightBulb
-      - LightBulb
-      - LightBulb
+      - name: LightBulb
+        amount: 10

 - type: entity
  id: CrateFireExtinguisher
@@ -36,9 +25,8 @@
  components:
  - type: StorageFill
    contents:
-      - FireExtinguisher
-      - FireExtinguisher
-      - FireExtinguisher
+      - name: FireExtinguisher
+        amount: 3

 - type: entity
  id: CratePen
@@ -47,16 +35,8 @@
  components:
  - type: StorageFill
    contents:
-      - Pen
-      - Pen
-      - Pen
-      - Pen
-      - Pen
-      - Pen
-      - Pen
-      - Pen
-      - Pen
-      - Pen
+      - name: Pen
+        amount: 10

 - type: entity
  id: CrateBikeHorn
@@ -65,11 +45,8 @@
  components:
  - type: StorageFill
    contents:
-      - BikeHorn
-      - BikeHorn
-      - BikeHorn
-      - BikeHorn
-      - BikeHorn
+      - name: BikeHorn
+        amount: 5

 - type: entity
  id: CrateCleaver
@@ -78,11 +55,8 @@
  components:
  - type: StorageFill
    contents:
-      - ButchCleaver
-      - ButchCleaver
-      - ButchCleaver
-      - ButchCleaver
-      - ButchCleaver
+      - name: ButchCleaver
+        amount: 5

 - type: entity
  id: CrateFuelTank
@@ -91,7 +65,7 @@
  components:
  - type: StorageFill
    contents:
-      - WeldingFuelTank
+      - name: WeldingFuelTank

 - type: entity
  id: CrateMedicalScanner
@@ -100,7 +74,7 @@
  components:
  - type: StorageFill
    contents:
-      - MedicalScanner
+      - name: MedicalScanner

 - type: entity
  id: CrateGlass
@@ -109,7 +83,7 @@
  components:
  - type: StorageFill
    contents:
-      - GlassStack
+      - name: GlassStack

 - type: entity
  id: CrateCable
@@ -118,4 +92,4 @@
  components:
  - type: StorageFill
    contents:
-      - CableStack1
+      - name: CableStack1
--- a/Resources/Prototypes/Catalog/Fills/lockers.yml
+++ b/Resources/Prototypes/Catalog/Fills/lockers.yml
@@ -4,21 +4,73 @@
  name: "custodial closet"
  description: "It's a storage unit for janitorial clothes and gear."
  components:
-  - type: CustodialClosetFill
+  - type: StorageFill
+    contents:
+      - name: MopItem
+      - name: MopBucket
+      - name: WetFloorSign
+        amount: 3
+      - name: TrashBag
+        amount: 2

 - type: entity
  id: LockerToolFilled
  parent: LockerTool
  suffix: Filled
  components:
-  - type: ToolLockerFill
+  - type: StorageFill
+    contents:
+      - name: OuterclothingHazard
+        prob: 0.4
+      - name: FlashlightLantern
+        prob: 0.7
+      - name: Screwdriver
+        prob: 0.7
+      - name: Wrench
+        prob: 0.7
+      - name: Welder
+        prob: 0.7
+      - name: Crowbar
+        prob: 0.7
+      - name: Wirecutter
+        prob: 0.7
+      - name: Multitool
+        prob: 0.2
+      - name: UtilityBeltClothing
+        prob: 0.2
+      - name: GlovesYellow
+        prob: 0.05
+      - name: HatHardhatRed
+        prob: 0.4
+      - name: ApcExtensionCableStack
+        prob: 0.3
+      - name: ApcExtensionCableStack
+        prob: 0.3
+      - name: ApcExtensionCableStack
+        prob: 0.3

 - type: entity
  id: LockerEmergencyFilledRandom
  parent: LockerEmergency
  suffix: Filled, Random
  components:
-  - type: EmergencyClosetFill
+  - type: StorageFill
+    contents:
+      - name: ToolboxEmergencyFilled
+        prob: 0.4
+      - name: BreathMaskClothing
+        prob: 0.4
+      - name: BreathMaskClothing
+        prob: 0.25
+      # TODO: uncomment when we actually have these items.
+      #- name: TankOxygenSmallFilled
+      #  prob: 0.4s
+      #- name: TankOxygenSmallFilled
+      #  prob: 0.25
+      #- name: MedkitOxygenFilled
+      #  prob: 0.25
+      #- name: TankOxygenFilled
+      #  prob: 0.2

 - type: entity
  id: LockerBoozeFilled
--- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
+++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml
@@ -127,11 +127,11 @@
    sprite: Clothing/Back/Duffels/duffel_med.rsi
  - type: StorageFill
    contents:
-      - Hemostat
-      - BoneSaw
-      - Drill
-      - Cautery
-      - Retractor
-      - Scalpel
+      - name: Hemostat
+      - name: BoneSaw
+      - name: Drill
+      - name: Cautery
+      - name: Retractor
+      - name: Scalpel
  - type: Storage
    capacity: 30
--- a/Resources/Prototypes/Entities/Objects/Boxes/boxes_food.yml
+++ b/Resources/Prototypes/Entities/Objects/Boxes/boxes_food.yml
@@ -6,12 +6,8 @@
  components:
  - type: StorageFill
    contents:
-      - FoodDonkPocket
-      - FoodDonkPocket
-      - FoodDonkPocket
-      - FoodDonkPocket
-      - FoodDonkPocket
-      - FoodDonkPocket
+      - name: FoodDonkPocket
+        amount: 6
  - type: Sprite
    sprite: Objects/Storage/donkpocket.rsi
    state: icon
--- a/Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml
+++ b/Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml
@@ -6,18 +6,8 @@
  components:
  - type: StorageFill
    contents:
-      - LightBulb
-      - LightBulb
-      - LightBulb
-      - LightBulb
-      - LightBulb
-      - LightBulb
-      - LightBulb
-      - LightBulb
-      - LightBulb
-      - LightBulb
-      - LightBulb
-      - LightBulb
+      - name: LightBulb
+        amount: 12
  - type: Sprite
    layers:
      - state: box
@@ -34,18 +24,8 @@
  components:
  - type: StorageFill
    contents:
-      - LightTube
-      - LightTube
-      - LightTube
-      - LightTube
-      - LightTube
-      - LightTube
-      - LightTube
-      - LightTube
-      - LightTube
-      - LightTube
-      - LightTube
-      - LightTube
+      - name: LightTube
+        amount: 12
  - type: Sprite
    layers:
      - state: box
@@ -62,18 +42,8 @@
  components:
  - type: StorageFill
    contents:
-      - LightTube
-      - LightTube
-      - LightTube
-      - LightTube
-      - LightTube
-      - LightTube
-      - LightBulb
-      - LightBulb
-      - LightBulb
-      - LightBulb
-      - LightBulb
-      - LightBulb
+      - name: LightTube
+        amount: 12
  - type: Sprite
    layers:
      - state: box
@@ -90,9 +60,8 @@
  components:
  - type: StorageFill
    contents:
-      - AssistantPDA
-      - AssistantPDA
-      - AssistantPDA
+      - name: AssistantPDA
+        amount: 3
  - type: Sprite
    layers:
      - state: box
@@ -111,10 +80,8 @@
  components:
  - type: StorageFill
    contents:
-      - MesonGlasses
-      - MesonGlasses
-      - MesonGlasses
-      - MesonGlasses
+      - name: MesonGlasses
+        amount: 4
  - type: Sprite
    layers:
      - state: box
@@ -133,9 +100,9 @@
  components:
  - type: StorageFill
    contents:
-      - BreathMaskClothing
-      #- O2 Canister
-      #- Injector
+      - name: BreathMaskClothing
+      #- name: O2 Canister
+      #- name: Injector
  - type: Sprite
    layers:
      - state: box
--- a/Resources/Prototypes/Entities/Objects/Boxes/boxes_medical.yml
+++ b/Resources/Prototypes/Entities/Objects/Boxes/boxes_medical.yml
@@ -6,12 +6,8 @@
  components:
  - type: StorageFill
    contents:
-      - Syringe
-      - Syringe
-      - Syringe
-      - Syringe
-      - Syringe
-      - Syringe
+      - name: Syringe
+        amount: 6
  - type: Sprite
    layers:
      - state: box
@@ -30,10 +26,8 @@
  components:
  - type: StorageFill
    contents:
-      - MaskSterile
-      - MaskSterile
-      - MaskSterile
-      - MaskSterile
+      - name: MaskSterile
+        amount: 4
  - type: Sprite
    layers:
      - state: box
@@ -52,10 +46,8 @@
  components:
  - type: StorageFill
    contents:
-      - GlovesLatex
-      - GlovesLatex
-      - GlovesLatex
-      - GlovesLatex
+      - name: GlovesLatex
+        amount: 4
  - type: Sprite
    layers:
      - state: box
--- a/Resources/Prototypes/Entities/Objects/Boxes/boxes_science.yml
+++ b/Resources/Prototypes/Entities/Objects/Boxes/boxes_science.yml
@@ -6,12 +6,10 @@
  components:
  - type: StorageFill
    contents:
-      - Beaker
-      - Beaker
-      - Beaker
-      - LargeBeaker
-      - LargeBeaker
-      - LargeBeaker
+      - name: Beaker
+        amount: 3
+      - name: LargeBeaker
+        amount: 3
  - type: Sprite
    layers:
      - state: box
--- a/Resources/Prototypes/Entities/Objects/Boxes/boxes_security.yml
+++ b/Resources/Prototypes/Entities/Objects/Boxes/boxes_security.yml
@@ -6,12 +6,8 @@
  components:
  - type: StorageFill
    contents:
-      - Handcuffs
-      - Handcuffs
-      - Handcuffs
-      - Handcuffs
-      - Handcuffs
-      - Handcuffs
+      - name: Handcuffs
+        amount: 6
  - type: Sprite
    layers:
      - state: box_security
@@ -30,10 +26,8 @@
  components:
  - type: StorageFill
    contents:
-      - GrenadeFlashBang
-      - GrenadeFlashBang
-      - GrenadeFlashBang
-      - GrenadeFlashBang
+      - name: GrenadeFlashBang
+        amount: 4
  - type: Sprite
    layers:
      - state: box_security
@@ -52,10 +46,8 @@
  components:
  - type: StorageFill
    contents:
-      - SecGlasses
-      - SecGlasses
-      - SecGlasses
-      - SecGlasses
+      - name: SecGlasses
+        amount: 4
  - type: Sprite
    layers:
      - state: box_security
--- a/Resources/Prototypes/Entities/Objects/Specific/medical.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/medical.yml
@@ -15,9 +15,16 @@

 - type: entity
  id: MedkitFilled
+  suffix: Filled
  parent: Medkit
  components:
-  - type: MedkitFill # 3 Ointment, 3 Roll of Gauze. TODO 1 Health Analyzer once it exists
+  - type: StorageFill
+    contents:
+      - name: Brutepack
+        amount: 3
+      - name: Ointment
+        amount: 3
+      # todo 1 Health Analyzer once it exists

 - type: entity
  name: medical stack
--- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml
@@ -32,7 +32,18 @@
  parent: ToolboxEmergency
  suffix: Filled
  components:
-  - type: ToolboxEmergencyFill
+  - type: StorageFill
+    contents:
+      - name: BreathMaskClothing
+        amount: 2
+      - name: FoodChocolateBar
+      - name: FlashlightLantern
+        amount: 2
+      - name: HarmonicaInstrument
+        prob: 0.15
+        orGroup: HarmonicaOrChocolate
+      - name: FoodChocolateBar
+        orGroup: HarmonicaOrChocolate

 - type: entity
  name: mechanical toolbox
@@ -70,7 +81,18 @@
  suffix: Filled
  parent: ToolboxElectrical
  components:
-  - type: ToolboxElectricalFill
+  - type: StorageFill
+    contents:
+      - name: Screwdriver
+      - name: Crowbar
+      - name: Wirecutter
+      - name: ApcExtensionCableStack
+      - name: MVWireStack
+      - name: GlovesYellow
+        prob: 0.05
+        orGroup: GlovesOrWires
+      - name: HVWireStack
+        orGroup: GlovesOrWires

 - type: entity
  name: artistic toolbox
@@ -123,4 +145,12 @@
  parent: ToolboxGolden
  suffix: Filled
  components:
-  - type: ToolboxGoldFill
+  - type: StorageFill
+    contents:
+      - name: GoldStack
+        amount: 5
+      - name: DrinkGoldenCup
+        prob: 0.05
+        orGroup: CupOrGold
+      - name: GoldStack
+        orGroup: CupOrGold