Salv Instrument Spawn Rework (#40572)

added salv table + replaced instrument table

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 9f952db002deed03f6607082d9bae6ae36f1ac0f..1263e47b6ce53fd39789546740a70dff2f3c2c33 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/tables_loot.yml
@@ -104,7 +104,7 @@
       rolls: !type:RangeNumberSelector
         range: 1, 2
     - !type:NestedSelector
-      tableId: RandomInstrumentTable
+      tableId: SalvageInstrumentTable
 
 - type: entityTable
   id: SalvageTreasureUncommon

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/instruments.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/instruments.yml
index baf1649fdf5c2615e5af0e248b991b399c3fd263..93e7e58e88952390f5a095c8adfe1c179b12c76e 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/instruments.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/instruments.yml
@@ -124,6 +124,25 @@
       children:
       - id: SuperSynthesizerInstrument
 
+- type: entityTable
+  id: SalvageInstrumentTable
+  table: !type:GroupSelector
+    children:
+    - !type:NestedSelector
+      tableId: VarietyInstrumentTable
+    - !type:NestedSelector
+      tableId: BrassInstrumentTable
+    - !type:NestedSelector
+      tableId: StringInstrumentTable
+    - !type:NestedSelector
+      tableId: KeyedPercussionInstrumentTable
+    - !type:NestedSelector
+      tableId: WoodwindInstrumentTable
+    - !type:NestedSelector
+      tableId: SpecialInstrumentTable
+    - id: SuperSynthesizerInstrument
+      weight: 0.3
+
 - type: entity
   id: RandomInstruments
   name: random instruments spawner