Make ore loot use walls as a mask (#16377)

Resources/Prototypes/Procedural/biome_ore_templates.yml

@@ -1,108 +1,54 @@
-# Allowed
-#allowedTiles:
-#- FloorPlanetGrass
-#- FloorPlanetDirt
-#- FloorSnow
-#- FloorBasalt
-#- FloorAsteroidSand
-
-- type: biomeTemplate
+# Low value
+- type: biomeMarkerLayer
   id: OreTin
-  layers:
-    - !type:BiomeEntityLayer
-      threshold: 0.90
-      allowedTiles:
-        - FloorPlanetGrass
-        - FloorPlanetDirt
-        - FloorSnow
-        - FloorBasalt
-        - FloorAsteroidSand
-      noise:
-        seed: 100
-        noiseType: OpenSimplex2
-        frequency: 0.04
-        fractalType: None
-      entities:
-        - WallRockTin
+  proto: WallRockTin
+  entityMask: WallRock
+  maxCount: 5
+  groupCount: 10
+  radius: 4
 
 # Medium value
 # Gold
-- type: biomeTemplate
+- type: biomeMarkerLayer
   id: OreGold
-  layers:
-    - !type:BiomeEntityLayer
-      threshold: 0.95
-      allowedTiles:
-        - FloorPlanetGrass
-        - FloorPlanetDirt
-        - FloorSnow
-        - FloorBasalt
-        - FloorAsteroidSand
-      noise:
-        seed: 100
-        noiseType: OpenSimplex2
-        frequency: 0.04
-        fractalType: None
-      entities:
-        - WallRockGold
+  proto: WallRockGold
+  entityMask: WallRock
+  maxCount: 5
+  groupCount: 5
+  radius: 4
 
 # Silver
-- type: biomeTemplate
+- type: biomeMarkerLayer
   id: OreSilver
-  layers:
-    - !type:BiomeEntityLayer
-      threshold: 0.95
-      allowedTiles:
-        - FloorPlanetGrass
-        - FloorPlanetDirt
-        - FloorSnow
-        - FloorBasalt
-        - FloorAsteroidSand
-      noise:
-        seed: 100
-        noiseType: OpenSimplex2
-        frequency: 0.05
-        fractalType: None
-      entities:
-        - WallRockSilver
+  proto: WallRockSilver
+  entityMask: WallRock
+  maxCount: 5
+  groupCount: 5
+  radius: 4
 
 # High value
 # Plasma
-- type: biomeTemplate
+- type: biomeMarkerLayer
   id: OrePlasma
-  layers:
-    - !type:BiomeEntityLayer
-      threshold: 0.99
-      allowedTiles:
-        - FloorPlanetGrass
-        - FloorPlanetDirt
-        - FloorSnow
-        - FloorBasalt
-        - FloorAsteroidSand
-      noise:
-        seed: 100
-        noiseType: OpenSimplex2
-        frequency: 0.04
-        fractalType: None
-      entities:
-        - WallRockPlasma
+  proto: WallRockPlasma
+  entityMask: WallRock
+  maxCount: 2
+  groupCount: 5
+  radius: 4
 
 # Uranium
-- type: biomeTemplate
+- type: biomeMarkerLayer
   id: OreUranium
-  layers:
-    - !type:BiomeEntityLayer
-      threshold: 0.99
-      allowedTiles:
-        - FloorPlanetGrass
-        - FloorPlanetDirt
-        - FloorSnow
-        - FloorBasalt
-        - FloorAsteroidSand
-      noise:
-        seed: 100
-        noiseType: OpenSimplex2
-        frequency: 0.04
-        fractalType: None
-      entities:
-        - WallRockUranium
+  proto: WallRockUranium
+  entityMask: WallRock
+  maxCount: 2
+  groupCount: 5
+  radius: 4
+
+- type: biomeMarkerLayer
+  id: OreBananium
+  proto: WallRockBananium
+  entityMask: WallRock
+  maxCount: 2
+  groupCount: 5
+  radius: 4

Resources/Prototypes/Procedural/salvage_loot.yml

@@ -56,7 +56,7 @@
   id: OreTin
   desc: Veins of steel
   loots:
-    - !type:BiomeTemplateLoot
+    - !type:BiomeMarkerLoot
       proto: OreTin
 
 # - Medium value
@@ -64,14 +64,14 @@
   id: OreGold
   desc: Veins of gold ore
   loots:
-    - !type:BiomeTemplateLoot
+    - !type:BiomeMarkerLoot
       proto: OreGold
 
 - type: salvageLoot
   id: OreSilver
   desc: Veins of silver ore
   loots:
-    - !type:BiomeTemplateLoot
+    - !type:BiomeMarkerLoot
       proto: OreSilver
 
 # - High value
@@ -79,12 +79,12 @@
   id: OrePlasma
   desc: Veins of plasma ore
   loots:
-    - !type:BiomeTemplateLoot
+    - !type:BiomeMarkerLoot
       proto: OrePlasma
 
 - type: salvageLoot
   id: OreUranium
   desc: Veins of uranium ore
   loots:
-    - !type:BiomeTemplateLoot
+    - !type:BiomeMarkerLoot
       proto: OreUranium

Resources/Prototypes/ore.yml

@@ -41,7 +41,7 @@
   id: OreBananium
   oreEntity: BananiumOre1
   minOreYield: 1
-  maxOreYield: 2
+  maxOreYield: 3
 
 - type: weightedRandom
   id: RandomOreDistributionStandard