trying fix caves

Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_caves.yml

@@ -1,27 +1,27 @@
 - type: cp14DemiplaneLocation
   id: T1Caves
-  locationConfig: CP14ExpeditionCaves
+  locationConfig: CP14DemiplaneCaves
   tags:
-  - CP14DemiplanOre
-  - CP14DemiplanUnderground
+  - CP14DemiplaneCave
+  - CP14DemiplaneUnderground
   components:
   - type: CP14WeatherController
     entries:
     - visuals: CP14Mist
 
 - type: dungeonConfig
-  id: CP14ExpeditionCaves
+  id: CP14DemiplaneCaves
   layers:
     # Masks
     - !type:PrototypeDunGen
-      proto: CP14ExpeditionCavesFloorMaskBorder
+      proto: CP14DemiplaneCavesFloorMaskBorder
     - !type:PrototypeDunGen
-      proto: CP14ExpeditionCavesFloorMaskStone
+      proto: CP14DemiplaneCavesFloorMaskStone
     - !type:PrototypeDunGen
-      proto: CP14ExpeditionCavesFloorMaskAir
+      proto: CP14DemiplaneCavesFloorMaskAir
     # Biomes
     - !type:PrototypeDunGen
-      proto: CP14ExpeditionCavesFillBorder
+      proto: CP14DemiplaneCavesFillBorder
     - !type:BiomeDunGen
       biomeTemplate: CP14CavesGeneric
       tileMask:
@@ -32,43 +32,7 @@
       - CP14FloorGrass
 
 - type: dungeonConfig
-  id: CP14ExpeditionCavesFloorMaskAir
-  layers:
-  - !type:NoiseDistanceDunGen
-    size: 80, 80
-    distanceConfig: !type:DunGenEuclideanSquaredDistance
-      blendWeight: 0.5
-    layers:
-    - tile: CP14FloorGrass
-      threshold: 0.50
-      noise:
-        frequency: 0.030
-        noiseType: OpenSimplex2
-        fractalType: FBm
-        octaves: 5
-        lacunarity: 2
-        gain: 0.5
-
-- type: dungeonConfig
-  id: CP14ExpeditionCavesFloorMaskStone
-  layers:
-  - !type:NoiseDistanceDunGen
-    size: 120, 120
-    distanceConfig: !type:DunGenEuclideanSquaredDistance
-      blendWeight: 0.9
-    layers:
-    - tile: CP14FloorSand
-      threshold: 0.50
-      noise:
-        frequency: 0.010
-        noiseType: OpenSimplex2
-        fractalType: FBm
-        octaves: 5
-        lacunarity: 2
-        gain: 0.5
-
-- type: dungeonConfig
-  id: CP14ExpeditionCavesFloorMaskBorder
+  id: CP14DemiplaneCavesFloorMaskBorder
   layers:
   - !type:NoiseDistanceDunGen
     size: 130, 130
@@ -86,7 +50,43 @@
         gain: 0.5
 
 - type: dungeonConfig
-  id: CP14ExpeditionCavesFillBorder
+  id: CP14DemiplaneCavesFloorMaskStone
+  layers:
+  - !type:NoiseDistanceDunGen
+    size: 120, 120
+    distanceConfig: !type:DunGenEuclideanSquaredDistance
+      blendWeight: 0.9
+    layers:
+    - tile: CP14FloorSand
+      threshold: 0.50
+      noise:
+        frequency: 0.010
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        octaves: 5
+        lacunarity: 2
+        gain: 0.5
+
+- type: dungeonConfig
+  id: CP14DemiplaneCavesFloorMaskAir
+  layers:
+  - !type:NoiseDistanceDunGen
+    size: 80, 80
+    distanceConfig: !type:DunGenEuclideanSquaredDistance
+      blendWeight: 0.5
+    layers:
+    - tile: CP14FloorGrass
+      threshold: 0.50
+      noise:
+        frequency: 0.030
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        octaves: 5
+        lacunarity: 2
+        gain: 0.5
+
+- type: dungeonConfig
+  id: CP14DemiplaneCavesFillBorder
   reserveTiles: true
   data:
     entities:

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/test.yml

@@ -3,7 +3,7 @@
   unique: false
   reward: 0.5
   requiredTags:
-  - CP14DemiplanOre
+  - CP14DemiplaneCave
   layers:
     - !type:OreDunGen
       entityMask: 
@@ -18,7 +18,7 @@
   unique: false
   reward: 0.4
   requiredTags:
-  - CP14DemiplanOre
+  - CP14DemiplaneCave
   layers:
     - !type:OreDunGen
       entityMask: 
@@ -32,7 +32,7 @@
   id: QuartzCrystal
   reward: 0.1
   requiredTags:
-  - CP14DemiplanOre
+  - CP14DemiplaneCave
   layers:
     - !type:OreDunGen
       tileMask: 
@@ -47,7 +47,7 @@
   reward: 0.2
   generationWeight: 0.1
   requiredTags:
-  - CP14DemiplanOre
+  - CP14DemiplaneCave
   - CP14DemiplanUnderground
   layers:
     - !type:OreDunGen
@@ -63,7 +63,7 @@
   reward: 0.2
   generationWeight: 0.1
   requiredTags:
-  - CP14DemiplanOre
+  - CP14DemiplaneCave
   layers:
     - !type:OreDunGen
       tileMask: 
@@ -79,7 +79,7 @@
   reward: 0.2
   generationWeight: 0.1
   requiredTags:
-  - CP14DemiplanOre
+  - CP14DemiplaneCave
   layers:
     - !type:OreDunGen
       tileMask: 
@@ -97,7 +97,7 @@
   reward: 0.2
   generationWeight: 0.1
   requiredTags:
-  - CP14DemiplanOre
+  - CP14DemiplaneCave
   layers:
     - !type:OreDunGen
       tileMask: 
@@ -115,7 +115,7 @@
   reward: 0.2
   generationWeight: 0.1
   requiredTags:
-  - CP14DemiplanOre
+  - CP14DemiplaneCave
   - CP14DemiplanUnderground
   layers:
     - !type:OreDunGen
@@ -131,7 +131,7 @@
   reward: 0.2
   generationWeight: 0.1
   requiredTags:
-  - CP14DemiplanOre
+  - CP14DemiplaneCave
   - CP14DemiplanUnderground
   layers:
     - !type:OreDunGen
@@ -231,7 +231,7 @@
   unique: false
   reward: 0.3
   requiredTags:
-  - CP14DemiplanOre
+  - CP14DemiplaneCave
   layers:
     - !type:OreDunGen
       entityMask: 
@@ -246,23 +246,22 @@
   difficulty: 0.4
   generationWeight: 0.25
   layers:
-    - !type:MobsDunGen
-      minCount: 25
-      maxCount: 50
-      groups:
-      - id: LandMineExplosive
-        amount: 1
+    - !type:OreDunGen
+      entity: LandMineExplosive
+      count: 10
+      minGroupSize: 1
+      maxGroupSize: 3
 
 - type: cp14DemiplaneModifier
   id: CommonLoot
   reward: 0.25
   generationWeight: 2
   layers:
-    - !type:EntityTableDunGen
-      minCount: 15
-      maxCount: 30
-      table: !type:NestedSelector
-        tableId: CP14TableExpeditionLootCommon
+    - !type:OreDunGen
+      entity: CP14SpawnerExpeditionLootCommon
+      count: 10
+      minGroupSize: 1
+      maxGroupSize: 3
 
 - type: cp14DemiplaneModifier
   id: EnemyXeno

Resources/Prototypes/_CP14/Procedural/Demiplane/tags.yml

@@ -1,11 +1,11 @@
 - type: Tag
-  id: CP14DemiplanOre
+  id: CP14DemiplaneCave
 
 - type: Tag
-  id: CP14DemiplanGrass
+  id: CP14DemiplaneGrass
 
 - type: Tag
-  id: CP14DemiplanOpenSky
+  id: CP14DemiplaneOpenSky
 
 - type: Tag
-  id: CP14DemiplanUnderground
+  id: CP14DemiplaneUnderground