Salvage Equipment Rebalance [Reclaimer Removal] (#31333)

* Salvage Equipment Rebalance * oh yeah! * make fire extinguisher 100%
2024-08-31 19:39:32 -04:00
parent 123d66db97
commit c88666c66e
12 changed files with 48 additions and 114 deletions
--- a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
@@ -1,48 +1,47 @@
+- type: entityTable
+  id: FillSalvageSpecialistHardsuitSpatio
+  table: !type:AllSelector
+    children:
+    - id: OxygenTankFilled
+    - id: ClothingShoesBootsMag
+    - id: ClothingOuterHardsuitSpatio
+    - id: ClothingMaskGasExplorer
+
+- type: entityTable
+  id: LockerFillSalvageSpecialist
+  table: !type:AllSelector
+    children:
+    - id: ClothingBeltUtilityFilled
+    - id: SurvivalKnife
+    - id: HandheldGPSBasic
+    - id: RadioHandheld
+    - id: AppraisalTool
+    - id: FireExtinguisher
+    - id: Flare
+      prob: 0.3
+      rolls: !type:ConstantNumberSelector
+        value: 3
+
 - type: entity
  id: LockerSalvageSpecialistFilledHardsuit
  suffix: Filled, Hardsuit
  parent: LockerSalvageSpecialist
  components:
-  - type: StorageFill
-    contents:
-      - id: ClothingOuterHardsuitSpatio
-      - id: ClothingShoesBootsMag
-      - id: ClothingMaskGasExplorer
-      - id: ClothingBeltUtilityFilled
-      - id: SurvivalKnife
-      - id: HandheldGPSBasic
-      - id: RadioHandheld
-      - id: SeismicCharge
-        amount: 2
-      - id: OreBag
-        prob: 0.5
-      - id: Flare
-        prob: 0.3
-      - id: Flare
-        prob: 0.3
-      - id: Flare
-        prob: 0.3
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:AllSelector
+        children:
+          - !type:NestedSelector
+            tableId: FillSalvageSpecialistHardsuitSpatio
+          - !type:NestedSelector
+            tableId: LockerFillSalvageSpecialist

 - type: entity
  id: LockerSalvageSpecialistFilled
  suffix: Filled
  parent: LockerSalvageSpecialist
  components:
-  - type: StorageFill
-    contents:
-# Currently do not function as 'true' mesons, so they're useless for salvagers.
-#      - id: ClothingEyesGlassesMeson
-      - id: ClothingBeltUtilityFilled
-      - id: SurvivalKnife
-      - id: HandheldGPSBasic
-      - id: RadioHandheld
-      - id: SeismicCharge
-        amount: 2
-      - id: OreBag
-        prob: 0.5
-      - id: Flare
-        prob: 0.3
-      - id: Flare
-        prob: 0.3
-      - id: Flare
-        prob: 0.3
+    - type: EntityTableContainerFill
+      containers:
+        entity_storage: !type:NestedSelector
+          tableId: LockerFillSalvageSpecialist
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -16,7 +16,6 @@
    - id: RubberStampApproved
    - id: RubberStampDenied
    - id: RubberStampQm
-    - id: SalvageShuttleConsoleCircuitboard

 - type: entity
  id: LockerQuarterMasterFilled
@@ -377,4 +376,4 @@
    - id: JetpackBlue
    - id: SpaceCash1000
    - id: BeachBall
-    - id: BikeHorn
+    - id: BikeHorn
--- a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
@@ -229,12 +229,10 @@
  parent: SuitStorageBase
  suffix: Salvage
  components:
-  - type: StorageFill
-    contents:
-      - id: OxygenTankFilled
-      - id: ClothingShoesBootsMag
-      - id: ClothingOuterHardsuitSpatio
-      - id: ClothingMaskGasExplorer
+  - type: EntityTableContainerFill
+    containers:
+      entity_storage: !type:NestedSelector
+        tableId: FillSalvageSpecialistHardsuitSpatio
  - type: AccessReader
    access: [["Salvage"]]

--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml
@@ -3,13 +3,9 @@
  startingInventory:
    Crowbar: 2
    Pickaxe: 4
-    OreBag: 4
+    OreBag: 2
    Flare: 4
    FlashlightLantern: 2
-    Floodlight: 2
    HandheldGPSBasic: 2
    RadioHandheld: 2
    WeaponProtoKineticAccelerator: 4
-    SeismicCharge: 2
-    FultonBeacon: 1
-    Fulton: 2
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
@@ -197,6 +197,7 @@
    - id: PowerCellHighPrinted
    - id: RadioHandheld
    - id: ClothingBeltUtility
+    - id: Floodlight
    - id: WeaponProtoKineticAccelerator
      weight: 0.5
    - id: OxygenTankFilled
--- a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
@@ -142,17 +142,6 @@
    - type: StealTarget
      stealGroup: CargoShuttleConsoleCircuitboard

- type: entity
-  parent: BaseComputerCircuitboard
-  id: SalvageShuttleConsoleCircuitboard
-  name: salvage shuttle console board
-  description: A computer printed circuit board for a salvage shuttle console.
-  components:
-    - type: ComputerBoard
-      prototype: ComputerShuttleSalvage
-    - type: StealTarget
-      stealGroup: SalvageShuttleConsoleCircuitboard
-
 - type: entity
  parent: BaseComputerCircuitboard
  id: SurveillanceCameraMonitorCircuitboard
--- a/Resources/Prototypes/Entities/Stations/base.yml
+++ b/Resources/Prototypes/Entities/Stations/base.yml
@@ -52,9 +52,6 @@
            - type: TradeStation
          paths:
            - /Maps/Shuttles/trading_outpost.yml
-        mining: !type:GridSpawnGroup
-          paths:
-          - /Maps/Shuttles/mining.yml
        # Spawn last
        ruins: !type:GridSpawnGroup
          hide: true
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
@@ -159,36 +159,6 @@
  - type: StealTarget
    stealGroup: CargoShuttleConsoleCircuitboard

- type: entity
-  parent: BaseComputerShuttle
-  id: ComputerShuttleSalvage
-  name: salvage shuttle console
-  description: Used to pilot the salvage shuttle.
-  components:
-    - type: Sprite
-      layers:
-        - map: ["computerLayerBody"]
-          state: computer
-        - map: ["computerLayerKeyboard"]
-          state: generic_keyboard
-        - map: ["computerLayerScreen"]
-          state: shuttle
-        - map: ["computerLayerKeys"]
-          state: generic_keys
-    - type: DroneConsole
-      components:
-        - type: SalvageShuttle
-    - type: RadarConsole
-      maxRange: 256
-    - type: PointLight
-      radius: 1.5
-      energy: 1.6
-      color: "#43ccb5"
-    - type: Computer
-      board: SalvageShuttleConsoleCircuitboard
-    - type: StealTarget
-      stealGroup: SalvageShuttleConsoleCircuitboard
-
 - type: entity
  parent: BaseComputer
  id: ComputerIFF
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -137,8 +137,6 @@
      - AirTank
      - GasAnalyzer
      - UtilityBelt
-      - Fulton
-      - FultonBeacon
      - Pickaxe
      - ModularReceiver
      - AppraisalTool
--- a/Resources/Prototypes/Objectives/stealTargetGroups.yml
+++ b/Resources/Prototypes/Objectives/stealTargetGroups.yml
@@ -235,13 +235,6 @@
    sprite: Objects/Misc/module.rsi
    state: cpuboard

- type: stealTargetGroup
-  id: SalvageShuttleConsoleCircuitboard
-  name: salvage shuttle console board
-  sprite:
-    sprite: Objects/Misc/module.rsi
-    state: cpuboard
-
 - type: stealTargetGroup
  id: ClothingEyesHudBeer
  name: beer goggles
--- a/Resources/Prototypes/Objectives/thief.yml
+++ b/Resources/Prototypes/Objectives/thief.yml
@@ -261,17 +261,6 @@
  - type: Objective
    difficulty: 0.7

- type: entity
-  parent: BaseThiefStealObjective
-  id: SalvageShuttleCircuitboardStealObjective
-  components:
-  - type: NotJobRequirement
-    job: SalvageSpecialist
-  - type: StealCondition
-    stealGroup: SalvageShuttleConsoleCircuitboard
-  - type: Objective
-    difficulty: 0.7
-
 - type: entity                                      #Service subgroup
  parent: BaseThiefStealObjective
  id: ClothingEyesHudBeerStealObjective
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -410,6 +410,11 @@ ClothingBeltSuspenders: ClothingBeltSuspendersRed
 # 2024-08-19
 ClothingNeckShockCollar: ClothingBackpackElectropack

+# 2024-08-22
+ComputerShuttleSalvage: null
+SalvageShuttleConsoleCircuitboard: null
+SalvageShuttleCircuitboardStealObjective: null
+
 # 2024-08-28
 ClothingBackpackDuffelSyndicateCostumeCentcom: null
 ClothingHeadsetAltCentComFake: null