Rebalance magnet debris, update worldgen (#37025)

diff --git a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
index eb8ff289583a0590cca0f05b8307fadfa888fd3c..2e4c8a7531755c0045b227e1c4c79ebdfa4746c1 100644 (file)
--- a/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
+++ b/Resources/ConfigPresets/WizardsDen/wizardsDen.toml
@@ -54,9 +54,6 @@ allow_multi_server_play = false
 [atmos]
 max_explosion_range = 5
 
-[worldgen]
-enabled = true
-
 [status]
 privacy_policy_link = "https://spacestation14.com/about/privacy/#game-server-privacy-policy"
 privacy_policy_identifier = "wizden"

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/spawners.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/spawners.yml
index 7e147ba7110e6fdb6d136a3f79526f658982d5d0..f1d632c186860e95eb6f64b3fcd2494dacd6d429 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/spawners.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Salvage/spawners.yml
@@ -266,16 +266,16 @@
       children:
       - !type:NestedSelector
         tableId: SalvageEquipmentCommon
-        weight: 50
+        weight: 20
       - !type:NestedSelector
         tableId: SalvageEquipmentUncommon
         weight: 35
       - !type:NestedSelector
         tableId: SalvageEquipmentRare
-        weight: 14
+        weight: 35
       - !type:NestedSelector
         tableId: SalvageEquipmentLegendary
-        weight: 1
+        weight: 10
     # 5% chance of decent-ish treasure
     - !type:GroupSelector
       weight: 5
@@ -325,16 +325,16 @@
       children:
       - !type:NestedSelector
         tableId: SalvageEquipmentCommon
-        weight: 15
+        weight: 5
       - !type:NestedSelector
         tableId: SalvageEquipmentUncommon
-        weight: 40
+        weight: 25
       - !type:NestedSelector
         tableId: SalvageEquipmentRare
-        weight: 35
+        weight: 45
       - !type:NestedSelector
         tableId: SalvageEquipmentLegendary
-        weight: 10
+        weight: 25
     # 5% chance of decent-ish treasure
     - !type:GroupSelector
       weight: 5
@@ -407,20 +407,36 @@
   id: SalvageMagnetMobTable
   table: !type:GroupSelector
     children:
-    - id: MobCarpSalvage
-      weight: 80
-    - id: MobCarpSalvage
-      weight: 15
-      amount: !type:RangeNumberSelector
-        range: 1, 3
-    - !type:AllSelector
-      weight: 5
+    - !type:GroupSelector # normal theats
+      weight: 95
       children:
-      - id: MobSharkSalvage
       - id: MobCarpSalvage
-        amount: !type:ConstantNumberSelector
-          value: 2
-    # - id: MobHivebot (solo hivebot spawn)
+        weight: 2
+      - !type:AllSelector
+        weight: 1
+        children:
+        - id: LandMineExplosive
+        - !type:NestedSelector # what's that thing underneath the scrap?
+          prob: 0.33
+          tableId: SalvageScrapSpawnerCommon
+    - !type:GroupSelector # scary monsters
+      weight: 5
+      children:
+      - !type:AllSelector
+        children:
+        - id: MobSharkSalvage
+        - id: MobCarpSalvage
+          amount: !type:ConstantNumberSelector
+            value: 2
+        - !type:NestedSelector
+          rolls: !type:RangeNumberSelector
+            range: 1, 3
+          tableId: SalvageTreasureSpawnerValuable
+        - !type:NestedSelector
+          rolls: !type:RangeNumberSelector
+            range: 7, 10
+          tableId: TreasureCoinPileRare
+      #- id: MobHivebot (solo hivebot spawn)
 
 - type: entity
   parent: MarkerBase
@@ -458,6 +474,42 @@
       prob: 1.0
       tableId: SalvageMagnetMobTable
 
+- type: entity
+  parent: MarkerBase
+  id: SalvageSpawnerStructuresVarious
+  name: Space Debris Structure Spawner
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: Structures/Storage/tanks.rsi
+      state: fueltank-2
+  - type: EntityTableSpawner
+    table: !type:GroupSelector
+      children:
+      - id: WeldingFuelTankFull
+        weight: 0.5
+      - !type:GroupSelector
+        children:
+        - id: Table
+          weight: 2
+        - id: TableFrame
+      - id: SalvageCanisterSpawner
+      - id: Rack
+      - !type:NestedSelector
+        weight: 0.5
+        tableId: LowValueCrateTable
+      - id: ComputerBroken
+        weight: 0.1
+      - id: CrateGeneric
+        weight: 0.25
+      - id: ClosetMaintenanceFilledRandom
+        weight: 2
+      - !type:GroupSelector
+        children:
+        - id: Thruster
+        - id: Gyroscope
+
 - type: entity
   parent: MarkerBase
   id: SalvageSpawnerMobShark

diff --git a/Resources/Prototypes/Entities/Stations/base.yml b/Resources/Prototypes/Entities/Stations/base.yml
index 3f5232b430831563e78727642e135963b7d27af7..a5c5e56680a2ced69200be6b653795f6dfd74693 100644 (file)
--- a/Resources/Prototypes/Entities/Stations/base.yml
+++ b/Resources/Prototypes/Entities/Stations/base.yml
@@ -80,6 +80,25 @@
           - /Maps/Ruins/whiteship_ancient.yml
           - /Maps/Ruins/whiteship_bluespacejumper.yml
           - /Maps/Ruins/wrecklaimer.yml
+        wrecks: !type:DungeonSpawnGroup
+          minimumDistance: 150
+          maximumDistance: 300
+          stationGrid: false
+          minCount: 12
+          maxCount: 16
+          addComponents:
+          - type: Gravity
+            enabled: true
+            inherent: true
+          - type: IFF
+            flags: HideLabel
+            color: "#88b0d1"
+          protos:
+          - ChunkDebrisSmall
+          - ChunkDebrisSmall
+          - ChunkDebrisSmall
+          - ChunkDebrisSmall
+          - ChunkDebris
         vgroid: !type:DungeonSpawnGroup
           minimumDistance: 300
           maximumDistance: 350
@@ -89,6 +108,9 @@
           - type: Gravity
             enabled: true
             inherent: true
+          - type: IFF
+            flags: HideLabel
+            color: "#d67e27"
           protos:
           - VGRoid
 

diff --git a/Resources/Prototypes/Procedural/Magnet/space_debris.yml b/Resources/Prototypes/Procedural/Magnet/space_debris.yml
index aab5cada9a50900810806f2ce331853d78086457..11c1afdabe9fc42fbcf50c92d252724e32375967 100644 (file)
--- a/Resources/Prototypes/Procedural/Magnet/space_debris.yml
+++ b/Resources/Prototypes/Procedural/Magnet/space_debris.yml
@@ -38,3 +38,44 @@
     # Generate biome
     - !type:BiomeDunGen
       biomeTemplate: SpaceDebris
+
+- type: dungeonConfig
+  id: ChunkDebrisSmall
+  # Floor generation
+  layers:
+  - !type:NoiseDunGen
+    tileCap: 150
+    capStd: 32
+    iterations: 3
+    layers:
+    - tile: FloorSteel
+      threshold: 0.50
+      noise:
+        frequency: 0.05
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        octaves: 3
+        lacunarity: 3
+        gain: 0.5
+    - tile: Plating
+      threshold: 0.35
+      noise:
+        frequency: 0.05
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        octaves: 3
+        lacunarity: 3
+        gain: 0.3
+    - tile: Lattice
+      threshold: 0.25
+      noise:
+        frequency: 0.05
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        octaves: 3
+        lacunarity: 3
+        gain: 0.5
+
+  # Generate biome
+  - !type:BiomeDunGen
+    biomeTemplate: SpaceDebris

diff --git a/Resources/Prototypes/Procedural/Magnet/space_debris_templates.yml b/Resources/Prototypes/Procedural/Magnet/space_debris_templates.yml
index 5a96fcd269d161d5d27b77bf6d140ffd27d9e650..cc08f51755d5932494a32aa0c223c23aeae6443a 100644 (file)
--- a/Resources/Prototypes/Procedural/Magnet/space_debris_templates.yml
+++ b/Resources/Prototypes/Procedural/Magnet/space_debris_templates.yml
@@ -70,12 +70,7 @@
     - Plating
     - FloorSteel
     entities:
-    - WeldingFuelTankFull
-    - Table
-    - SalvageCanisterSpawner
-    - Rack
-    - ClosetMaintenanceFilledRandom
-    - ClosetMaintenanceFilledRandom
+    - SalvageSpawnerStructuresVarious
   - !type:BiomeEntityLayer
     allowedTiles:
     - FloorSteel
@@ -108,7 +103,8 @@
   - !type:BiomeEntityLayer
     allowedTiles:
     - FloorSteel
-    threshold: 0.90
+    - Plating
+    threshold: 0.925
     noise:
       seed: 1
       frequency: 1