Salvage Equipment Rebalance [Reclaimer Removal] (#31333)

* Salvage Equipment Rebalance

* oh yeah!

* make fire extinguisher 100%

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml b/Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml
index 4a0da9179eda3e7ffc590c309453b5571c6f7c70..427123c35f832756ebc91d3642a61dcf75ae7fd4 100644 (file)
--- 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

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index f718eea1cc53e91ea7532fec21df7dd3b23cddef..fcb8474ae50f3bdc2040a6a16efed0658494ca62 100644 (file)
--- 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
\ No newline at end of file
+    - id: BikeHorn

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml b/Resources/Prototypes/Catalog/Fills/Lockers/suit_storage.yml
index 5d48f9efab8aca46a67896ec4e8f17b56333fb89..41a11561e80b42e9f09f3d32d05c70fdff8f3f70 100644 (file)
--- 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"]]
 

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/salvage.yml
index b5665df37ba44549c5f4dab11f140f21f6a4f56a..b7e5e9ffcb9280deb707ae4e878128c25f3d29eb 100644 (file)
--- 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

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
index 1ee0f123ef6a6b2fa70697b2d5d4f91775cdbb09..9bdaed0b936ec6de98adc6efbb56a73821c295d6 100644 (file)
--- 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

diff --git a/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml b/Resources/Prototypes/Entities/Objects/Devices/Circuitboards/computer.yml
index ed919edab5b722fd078f53de8b9367da3fa4a243..cadb99f5fe82dc321f1792f7d0325ee965acd142 100644 (file)
--- 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

diff --git a/Resources/Prototypes/Entities/Stations/base.yml b/Resources/Prototypes/Entities/Stations/base.yml
index 1910cf4085289bc26159cff85feb9b1f728a749d..2197629980cede672540bfc3ca5ecea0107fcd50 100644 (file)
--- 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

diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml
index 8d1480e779c5f1178795ad1da430ace070c6c12f..a340c00a690aef3b14723a9f38c878594552e4e8 100644 (file)
--- 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

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 1d2f1cdadb521934703592f3718317b82c0684a1..130a0ca5e7c3292a282f1b036d62eb8c58f193c5 100644 (file)
--- 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

diff --git a/Resources/Prototypes/Objectives/stealTargetGroups.yml b/Resources/Prototypes/Objectives/stealTargetGroups.yml
index 5b57a9550310c6a2949b373812e5f9bfe7b144f3..b22e952e7e60e0f858eac6c7b0cf03555d16348c 100644 (file)
--- 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

diff --git a/Resources/Prototypes/Objectives/thief.yml b/Resources/Prototypes/Objectives/thief.yml
index df34d09c246502674af7ff72a52352fe0f694896..f8e44d831e94e0777c8f51434f6fc41bb906e064 100644 (file)
--- 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

diff --git a/Resources/migration.yml b/Resources/migration.yml
index 3b480b8e68d3ca2a45711ef6a74f15c785b1da24..65007e50b59cb8de3ceb8dc1893cb4aa9e9910a2 100644 (file)
--- 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