Salvage magnet revamp (#23119)

* Generic offering window

* More work

* weh

* Parity

* Progression meter

* magnet

* rona

* PG asteroid work

* code red

* Asteroid spawnings

* clams

* a

* Marker fixes

* More fixes

* Workings of biome asteroids

* A

* Fix this loading code

* a

* Fix masking

* weh

* Fixes

* Magnet claiming

* toe

* petogue

* magnet

* Bunch of fixes

* Fix default

* Fixes

* asteroids

* Fix offerings

* Localisation and a bunch of fixes

* a

* Fixes

* Preliminary draft

* Announcement fixes

* Fixes and bump spawn rate

* Fix asteroid spawns and UI

* More fixes

* Expeditions fix

* fix

* Gravity

* Fix announcement rounding

* a

* Offset tweak

* sus

* jankass

* Fix merge

Resources/Prototypes/Procedural/Magnet/asteroid.yml

@@ -0,0 +1,116 @@
+- type: weightedRandom
+  id: AsteroidOre
+  weights:
+    OreTin: 1.0
+    OreQuartz: 1.0
+    OreCoal: 1.0
+    OreGold: 0.25
+    OreSilver: 0.25
+    OrePlasma: 0.15
+    OreUranium: 0.15
+
+# Large asteroids, typically 1
+- type: dungeonConfig
+  id: BlobAsteroid
+  # Floor generation
+  generator: !type:NoiseDunGen
+    tileCap: 1500
+    capStd: 32
+    iterations: 1
+    layers:
+      - tile: FloorAsteroidSand
+        threshold: 0.30
+        noise:
+          frequency: 0.020
+          noiseType: OpenSimplex2
+          fractalType: FBm
+          octaves: 2
+          lacunarity: 2
+  # Everything else
+  postGeneration:
+    # Generate biome
+    - !type:BiomePostGen
+      biomeTemplate: Asteroid
+
+    # Generate ore veins
+    - !type:MarkerLayerPostGen
+      markerTemplate: AsteroidOre
+
+# Multiple smaller asteroids
+# This is a pain so we generate fewer tiles
+- type: dungeonConfig
+  id: ClusterAsteroid
+  # Floor generation
+  generator: !type:NoiseDunGen
+    tileCap: 1000
+    capStd: 32
+    layers:
+      - tile: FloorAsteroidSand
+        threshold: 0.10
+        noise:
+          frequency: 0.130
+          noiseType: OpenSimplex2
+          fractalType: FBm
+          octaves: 2
+          lacunarity: 2
+  # Everything else
+  postGeneration:
+    # Generate biome
+    - !type:BiomePostGen
+      biomeTemplate: Asteroid
+
+    # Generate ore veins
+    - !type:MarkerLayerPostGen
+      markerTemplate: AsteroidOre
+
+# Long and spindly, less smooth than blob
+- type: dungeonConfig
+  id: SpindlyAsteroid
+  # Floor generation
+  generator: !type:NoiseDunGen
+    tileCap: 1500
+    capStd: 32
+    layers:
+      - tile: FloorAsteroidSand
+        threshold: -0.50
+        noise:
+          frequency: 0.055
+          noiseType: Cellular
+          fractalType: FBm
+          octaves: 3
+          lacunarity: 2
+          cellularDistanceFunction: Euclidean
+  postGeneration:
+    # Generate biome
+    - !type:BiomePostGen
+      biomeTemplate: Asteroid
+
+    # Generate ore veins
+    - !type:MarkerLayerPostGen
+      markerTemplate: AsteroidOre
+
+# Lots of holes in it
+- type: dungeonConfig
+  id: SwissCheeseAsteroid
+  # Floor generation
+  generator: !type:NoiseDunGen
+    tileCap: 1500
+    capStd: 32
+    layers:
+      - tile: FloorAsteroidSand
+        threshold: -0.10
+        noise:
+          frequency: 0.155
+          noiseType: OpenSimplex2
+          fractalType: FBm
+          octaves: 2
+          lacunarity: 2
+  # Everything else
+  postGeneration:
+    # Generate biome
+    - !type:BiomePostGen
+      biomeTemplate: Asteroid
+
+    # Generate ore veins
+    - !type:MarkerLayerPostGen
+      markerTemplate: AsteroidOre

Resources/Prototypes/Procedural/biome_ore_templates.yml

@@ -2,6 +2,7 @@
 - type: biomeMarkerLayer
   id: OreTin
   entityMask:
+    AsteroidRock: AsteroidRockTin
     WallRock: WallRockTin
     WallRockBasalt: WallRockBasaltTin
     WallRockChromite: WallRockChromiteTin
@@ -15,6 +16,7 @@
 - type: biomeMarkerLayer
   id: OreQuartz
   entityMask:
+    AsteroidRock: AsteroidRockQuartz
     WallRock: WallRockQuartz
     WallRockBasalt: WallRockBasaltQuartz
     WallRockChromite: WallRockChromiteQuartz
@@ -27,6 +29,7 @@
 - type: biomeMarkerLayer
   id: OreCoal
   entityMask:
+    AsteroidRock: AsteroidRockCoal
     WallRock: WallRockCoal
     WallRockBasalt: WallRockBasaltCoal
     WallRockChromite: WallRockChromiteCoal
@@ -42,6 +45,7 @@
 - type: biomeMarkerLayer
   id: OreGold
   entityMask:
+    AsteroidRock: AsteroidRockGold
     WallRock: WallRockGold
     WallRockBasalt: WallRockBasaltGold
     WallRockChromite: WallRockChromiteGold
@@ -56,6 +60,7 @@
 - type: biomeMarkerLayer
   id: OreSilver
   entityMask:
+    AsteroidRock: AsteroidRockSilver
     WallRock: WallRockSilver
     WallRockBasalt: WallRockBasaltSilver
     WallRockChromite: WallRockChromiteSilver
@@ -71,6 +76,7 @@
 - type: biomeMarkerLayer
   id: OrePlasma
   entityMask:
+    AsteroidRock: AsteroidRockPlasma
     WallRock: WallRockPlasma
     WallRockBasalt: WallRockBasaltPlasma
     WallRockChromite: WallRockChromitePlasma
@@ -85,6 +91,7 @@
 - type: biomeMarkerLayer
   id: OreUranium
   entityMask:
+    AsteroidRock: AsteroidRockUranium
     WallRock: WallRockUranium
     WallRockBasalt: WallRockBasaltUranium
     WallRockChromite: WallRockChromiteUranium
@@ -98,6 +105,7 @@
 - type: biomeMarkerLayer
   id: OreBananium
   entityMask:
+    AsteroidRock: AsteroidRockBananium
     WallRock: WallRockBananium
     WallRockBasalt: WallRockBasaltBananium
     WallRockChromite: WallRockChromiteBananium
@@ -112,6 +120,7 @@
 - type: biomeMarkerLayer
   id: OreArtifactFragment
   entityMask:
+    AsteroidRock: AsteroidRockArtifactFragment
     WallRock: WallRockArtifactFragment
     WallRockBasalt: WallRockBasaltArtifactFragment
     WallRockChromite: WallRockChromiteArtifactFragment

Resources/Prototypes/Procedural/biome_templates.yml

@@ -602,3 +602,63 @@
         noiseType: OpenSimplex2
         frequency: 2
       tile: FloorAsteroidSand
+
+# Asteroid
+- type: biomeTemplate
+  id: Asteroid
+  layers:
+    - !type:BiomeEntityLayer
+      threshold: 0.85
+      noise:
+        seed: 2
+        noiseType: OpenSimplex2
+        fractalType: PingPong
+      allowedTiles:
+        - FloorAsteroidSand
+      entities:
+        - CrystalGreen
+        - CrystalPink
+        - CrystalOrange
+        - CrystalBlue
+        - CrystalCyan
+    - !type:BiomeEntityLayer
+      threshold: 0.95
+      noise:
+        seed: 1
+        noiseType: OpenSimplex2
+        frequency: 1
+      allowedTiles:
+        - FloorAsteroidSand
+      entities:
+        - FloraStalagmite1
+        - FloraStalagmite2
+        - FloraStalagmite3
+        - FloraStalagmite4
+        - FloraStalagmite5
+        - FloraStalagmite6
+    - !type:BiomeEntityLayer
+      threshold: -0.6
+      invert: true
+      noise:
+        seed: 0
+        noiseType: Perlin
+        fractalType: Ridged
+        octaves: 1
+        frequency: 0.1
+        gain: 0.5
+      allowedTiles:
+        - FloorAsteroidSand
+      entities:
+        - AsteroidRock
+    - !type:BiomeTileLayer
+      threshold: -1.0
+      tile: FloorAsteroidSand
+      variants:
+        - 0
+    - !type:BiomeTileLayer
+      threshold: 0.5
+      noise:
+        seed: 1
+        noiseType: OpenSimplex2
+        frequency: 2
+      tile: FloorAsteroidSand