Demiplanes redesign again (#1616)

* global demi refactor * rebalance, smaller demiplanes * remove outdated connections * audio design + room coords fix * Update CP14Rooms.cs * Update wastelands.yml * hotfixes * Update CP14SpellThrowFromUser.cs * Update sky_lightning.yml
2025-08-05 12:15:24 +03:00
parent 4f431f9b70
commit b60ceb38ca
50 changed files with 1523 additions and 4294 deletions
--- a/Resources/Prototypes/_CP14/Entities/Effects/sky_lightning.yml
+++ b/Resources/Prototypes/_CP14/Entities/Effects/sky_lightning.yml
@@ -69,7 +69,6 @@
  - type: CP14AreaEntityEffect
    range: 1
    effects:
-    - !type:CP14SpellThrowFromUser
    - !type:CP14SpellApplyEntityEffect
      effects:
      - !type:Electrocute
@@ -77,7 +76,7 @@
      - !type:HealthChange
        damage:
          types:
-            Shock: 15
+            Shock: 0
  - type: CP14FarSound
    closeSound:
      path: /Audio/_CP14/Ambience/Lightning/lightning_close1.ogg
--- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/misc.yml
+++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/misc.yml
@@ -1,36 +0,0 @@
- type: entity
-  parent: MarkerBase
-  id: CP14SpawnerLocationConnection
-  name: Location connection
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - sprite: _CP14/Structures/Flora/demiplane_cracks.rsi
-      state: crack
-  - type: CP14GlobalWorldConnector
-
- type: entity
-  id: CP14LocationPassway
-  parent: BasePortal
-  categories: [ HideSpawnMenu ]
-  name: location passway
-  description: A gap in space that allows you to travel between worlds.
-  components:
-  - type: Sprite
-    drawdepth: Effects
-    sprite: /Textures/_CP14/Structures/Dungeon/demiplan_rift.rsi
-    layers:
-    - state: anom
-      shader: unshaded
-  - type: SingularityDistortion
-    falloffPower: 1.5
-    intensity: 50
-  - type: AmbientSound
-    volume: -3
-    range: 7
-    sound:
-      path: /Audio/Ambience/Objects/gravity_gen_hum.ogg
-  - type: Portal
-    canTeleportToOtherMaps: true
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml
@@ -113,6 +113,7 @@
    templateId: CP14Human
  - type: TransferMindOnGib
  - type: GhostTakeoverAvailable
+  - type: CP14DemiplaneBlockInteractions

 - type: entity
  parent: CP14BaseSpeciesDummy
--- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Demiplanes/rifts.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Demiplanes/rifts.yml
@@ -0,0 +1,111 @@
+- type: entity
+  id: CP14DemiplaneRiftCore
+  name: demiplane rift core
+  description: Touch to open the door to a new world
+  categories: [ ForkFiltered ]
+  placement:
+    mode: SnapgridCenter
+  components:
+  - type: Sprite
+    noRot: true
+    drawdepth: Mobs
+    sprite: /Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi
+    layers:
+    - state: connective
+      shader: unshaded
+  - type: CP14DemiplaneRift
+  - type: Clickable
+  - type: InteractionOutline
+  - type: PointLight
+    enabled: true
+    color: "#8f42ff"
+    energy: 1
+    radius: 5
+
+- type: entity
+  parent: MarkerBase
+  id: CP14DemiplaneEnterPointMarker
+  name: demiplane enter point
+  categories: [ ForkFiltered ]
+  components:
+  - type: Sprite
+    layers:
+    - state: green
+    - sprite: /Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi
+      state: core1
+  - type: CP14DemiplaneEnterPoint
+
+- type: entity
+  id: CP14DemiplaneRiftAwaiting
+  parent: BasePortal
+  categories: [ ForkFiltered ]
+  name: unstable demiplane rift
+  description: A gap in space that allows you to travel between worlds. It is still unstable, and entering it is hazardous to your health.
+  components:
+  - type: Sprite
+    noRot: true
+    drawdepth: Effects
+    sprite: /Textures/_CP14/Structures/Dungeon/demiplan_rift.rsi
+    layers:
+    - state: pulse
+      shader: unshaded
+  - type: PointLight
+    enabled: true
+    color: "#8f42ff"
+    energy: 1
+    radius: 5
+  - type: SingularityDistortion
+    falloffPower: 1.5
+    intensity: 50
+  - type: LightBehaviour
+    behaviours:
+      - !type:PulseBehaviour
+        interpolate: Cubic
+        maxDuration: 2
+        startValue: 0.1
+        endValue: 1.0
+        property: Energy
+        isLooped: true
+        enabled: true
+  - type: AmbientSound
+    volume: -3
+    range: 7
+    sound:
+      path: /Audio/Ambience/anomaly_scary.ogg
+  - type: Portal
+    maxRandomRadius: 10
+  - type: ConditionalSpawner
+    prototypes:
+    - CP14SkyLightningPurple
+
+- type: entity
+  id: CP14DemiplaneRiftPortal
+  parent: BasePortal
+  categories: [ ForkFiltered ]
+  name: demiplane rift
+  description: A gap in space that allows you to travel between worlds.
+  components:
+  - type: Sprite
+    noRot: true
+    drawdepth: Effects
+    sprite: /Textures/_CP14/Structures/Dungeon/demiplan_rift.rsi
+    layers:
+    - state: anom
+      shader: unshaded
+  - type: PointLight
+    enabled: true
+    color: "#8f42ff"
+    energy: 1
+    radius: 5
+  - type: AmbientSound
+    volume: -3
+    range: 7
+    sound:
+      path: /Audio/Ambience/Objects/gravity_gen_hum.ogg
+  - type: Portal
+    canTeleportToOtherMaps: true
+  - type: EmitSoundOnSpawn
+    sound: 
+      path: /Audio/_CP14/Effects/ritual_end.ogg
+      params:
+        variation: 0.3
--- a/Resources/Prototypes/_CP14/Maps/comoss.yml
+++ b/Resources/Prototypes/_CP14/Maps/comoss.yml
@@ -49,8 +49,19 @@
          - PersonalHouse8
          - PersonalHouse9
          - PersonalHouse10
-        - type: CP14StationGlobalWorld
-        - type: CP14StationGlobalWorldIntegration
+        - type: CP14StationProceduralLocation
          location: ComossIsland
          modifiers:
+          - DemiplaneArcTriple
          - RaidSpawners
+          - SmallHydra
+          - EnemyFlem
+          - MonsterMosquito
+          - Marble
+          - CopperOre
+          - CopperOre
+          - CoalOre
+          - CP14CrystalQuartzOrder
+          - Quartz
+          - FlyAgaric
+          - BloodFlower
--- a/Resources/Prototypes/_CP14/Maps/nautilus_ship.yml
+++ b/Resources/Prototypes/_CP14/Maps/nautilus_ship.yml
@@ -15,5 +15,4 @@
 #        - type: StationJobs
 #          availableJobs:
 #            #Mercenary
-#            CP14Adventurer: [ -1, -1 ]
-#        - type: CP14StationGlobalWorld
+#            CP14Adventurer: [ -1, -1 ]
--- a/Resources/Prototypes/_CP14/Maps/venicialis.yml
+++ b/Resources/Prototypes/_CP14/Maps/venicialis.yml
@@ -45,8 +45,18 @@
          - PersonalHouse4
          - PersonalHouse5
          - PersonalHouse6
-        - type: CP14StationGlobalWorld
-        - type: CP14StationGlobalWorldIntegration
+        - type: CP14StationProceduralLocation
          location: VenicialistFort
          modifiers:
+          - DemiplaneArcTriple
          - RaidSpawners
+          - CopperOre
+          - CopperOre
+          - CoalOre
+          - CP14CrystalQuartzWater
+          - Quartz
+          - Ruins
+          - EnemyZombie
+          - MobSlimeIce
+          - LumiShroom
+          - SilverNeedle
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/StationMaps/comoss_island.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/StationMaps/comoss_island.yml
@@ -1,7 +1,6 @@
 - type: cp14Location
  id: ComossIsland
  locationConfig: CP14ComossIsland
-  connection: ConnectionGrass
  generationProb: 0 #Special location for map only
  tags:
  - CP14DemiplaneOres
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/StationMaps/venicialis_fort.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/StationMaps/venicialis_fort.yml
@@ -1,7 +1,6 @@
 - type: cp14Location
  id: VenicialistFort
  locationConfig: CP14VenicialistFort
-  connection: ConnectionSnow
  generationProb: 0 #Special location for map only
  tags:
  - CP14DemiplaneOres
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/cave.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/cave.yml
@@ -4,7 +4,6 @@
    min: 1
    max: 2
  locationConfig: CP14Caves
-  connection: ConnectionStone
  tags:
  - CP14DemiplaneOres
  - CP14DemiplaneUnderground
@@ -17,7 +16,7 @@
  layers:
  # Masks
  - !type:NoiseDistanceDunGen
-    size: 120, 120
+    size: 90, 90
    distanceConfig: !type:DunGenEuclideanSquaredDistance
      blendWeight: 0.9
    layers:
@@ -31,7 +30,7 @@
        lacunarity: 2
        gain: 0.5
  - !type:NoiseDistanceDunGen
-    size: 80, 80
+    size: 60, 60
    distanceConfig: !type:DunGenEuclideanSquaredDistance
      blendWeight: 0.5
    layers:
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/cave_ice.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/cave_ice.yml
@@ -4,7 +4,6 @@
    min: 2
    max: 10
  locationConfig: CP14IceCaves
-  connection: ConnectionSnow
  tags:
  - CP14DemiplaneOres
  - CP14DemiplaneUnderground
@@ -18,7 +17,7 @@
  layers:
    # Masks
  - !type:NoiseDistanceDunGen
-    size: 120, 120
+    size: 90, 90
    distanceConfig: !type:DunGenEuclideanSquaredDistance
      blendWeight: 0.9
    layers:
@@ -32,7 +31,7 @@
        lacunarity: 2
        gain: 0.5
  - !type:NoiseDistanceDunGen
-    size: 80, 80
+    size: 60, 60
    distanceConfig: !type:DunGenEuclideanSquaredDistance
      blendWeight: 0.5
    layers:
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/cave_magma.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/cave_magma.yml
@@ -4,7 +4,6 @@
    min: 3
    max: 10
  locationConfig: CP14MagmaCaves
-  connection: ConnectionStone
  tags:
  - CP14DemiplaneOres
  - CP14DemiplaneUnderground
@@ -18,7 +17,7 @@
  layers:
  # Masks
  - !type:NoiseDistanceDunGen
-    size: 120, 120
+    size: 90, 90
    distanceConfig: !type:DunGenEuclideanSquaredDistance
      blendWeight: 0.7
    layers:
@@ -32,7 +31,7 @@
        lacunarity: 2
        gain: 0.5
  - !type:NoiseDistanceDunGen
-    size: 110, 110
+    size: 80, 80
    distanceConfig: !type:DunGenEuclideanSquaredDistance
      blendWeight: 0.8
    layers:
@@ -46,7 +45,7 @@
        lacunarity: 2
        gain: 0.5
  - !type:NoiseDistanceDunGen
-    size: 80, 80
+    size: 60, 60
    distanceConfig: !type:DunGenEuclideanSquaredDistance
      blendWeight: 0.7
    layers:
@@ -60,7 +59,7 @@
        lacunarity: 2
        gain: 0.5
  - !type:NoiseDistanceDunGen
-    size: 50, 50
+    size: 30, 30
    distanceConfig: !type:DunGenEuclideanSquaredDistance
      blendWeight: 0.8
    layers:
@@ -83,6 +82,6 @@
    tileMask:
    - CP14FloorGrass
  - !type:CP14BiomeDunGen
-    biomeTemplate: CP14MarbleCaves
+    biomeTemplate: CP14LavaOceanFill
    tileMask:
    - CP14FloorMarble
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/cave_mushroom.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/cave_mushroom.yml
@@ -4,7 +4,6 @@
    min: 1
    max: 10
  locationConfig: CP14MushroomCaves
-  connection: ConnectionMushroom
  tags:
  - CP14DemiplaneOres
  - CP14DemiplaneUnderground
@@ -18,7 +17,7 @@
  layers:
  # Masks
  - !type:NoiseDistanceDunGen
-    size: 120, 120
+    size: 90, 90
    distanceConfig: !type:DunGenEuclideanSquaredDistance
      blendWeight: 0.9
    layers:
@@ -32,7 +31,7 @@
        lacunarity: 2
        gain: 0.5
  - !type:NoiseDistanceDunGen
-    size: 80, 80
+    size: 60, 60
    distanceConfig: !type:DunGenEuclideanSquaredDistance
      blendWeight: 0.5
    layers:
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/cave_swamp.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/cave_swamp.yml
@@ -4,7 +4,6 @@
    min: 1
    max: 10
  locationConfig: CP14SwampGeode
-  connection: ConnectionGrass
  tags:
  - CP14DemiplaneOres
  - CP14DemiplaneHerbals
@@ -20,7 +19,7 @@
  layers:
  # Masks
  - !type:NoiseDistanceDunGen
-    size: 120, 120
+    size: 90, 90
    distanceConfig: !type:DunGenEuclideanSquaredDistance
      blendWeight: 0.9
    layers:
@@ -34,7 +33,7 @@
        lacunarity: 2
        gain: 0.5
  - !type:NoiseDistanceDunGen
-    size: 80, 80
+    size: 60, 60
    distanceConfig: !type:DunGenEuclideanSquaredDistance
      blendWeight: 0.7
    layers:
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/island_grassland.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/island_grassland.yml
@@ -4,7 +4,6 @@
    min: 0
    max: 2
  locationConfig: CP14GrasslandIsland
-  connection: ConnectionGrass
  tags:
  - CP14DemiplaneOres
  - CP14DemiplaneHerbals
@@ -25,7 +24,7 @@
  layers:
  # Masks
  - !type:NoiseDistanceDunGen
-    size: 160, 160
+    size: 120, 120
    distanceConfig: !type:DunGenEuclideanSquaredDistance
      blendWeight: 0.7
    layers:
@@ -39,7 +38,7 @@
        lacunarity: 2
        gain: 0.5
  - !type:NoiseDistanceDunGen
-    size: 150, 150
+    size: 115, 115
    distanceConfig: !type:DunGenEuclideanSquaredDistance
      blendWeight: 0.6
    layers:
@@ -53,7 +52,7 @@
        lacunarity: 2
        gain: 0.5
  - !type:NoiseDistanceDunGen
-    size: 110, 110
+    size: 90, 90
    distanceConfig: !type:DunGenEuclideanSquaredDistance
      blendWeight: 0.5
    layers:
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/island_snow.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/island_snow.yml
@@ -4,7 +4,6 @@
    min: 2
    max: 10
  locationConfig: CP14SnowIsland
-  connection: ConnectionSnow
  tags:
  - CP14DemiplaneOres
  - CP14DemiplaneOpenSky
@@ -25,7 +24,7 @@
  layers:
  # Masks
  - !type:NoiseDistanceDunGen
-    size: 160, 160
+    size: 120, 120
    distanceConfig: !type:DunGenEuclideanSquaredDistance
      blendWeight: 0.7
    layers:
@@ -39,7 +38,7 @@
        lacunarity: 2
        gain: 0.5
  - !type:NoiseDistanceDunGen
-    size: 150, 150
+    size: 115, 115
    distanceConfig: !type:DunGenEuclideanSquaredDistance
      blendWeight: 0.6
    layers:
@@ -53,7 +52,7 @@
        lacunarity: 2
        gain: 0.5
  - !type:NoiseDistanceDunGen
-    size: 110, 110
+    size: 90, 90
    distanceConfig: !type:DunGenEuclideanSquaredDistance
      blendWeight: 0.5
    layers:
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/leaf_maze.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/leaf_maze.yml
@@ -4,7 +4,6 @@
    min: 1
    max: 10
  locationConfig: CP14LeafMaze
-  connection: ConnectionGrass
  tags:
  - CP14DemiplaneHerbals
  - CP14DemiplaneOpenSky
@@ -26,7 +25,7 @@
  layers:
  # Masks
  - !type:NoiseDistanceDunGen
-    size: 120, 120
+    size: 90, 90
    distanceConfig: !type:DunGenEuclideanSquaredDistance
      blendWeight: 0.9
    layers:
@@ -40,7 +39,7 @@
        lacunarity: 2
        gain: 0.5
  - !type:NoiseDistanceDunGen
-    size: 80, 80
+    size: 60, 60
    distanceConfig: !type:DunGenEuclideanSquaredDistance
      blendWeight: 0.5
    layers:
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/wastelands.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/wastelands.yml
@@ -1,10 +1,9 @@
 - type: cp14Location
  id: T1Wastelands
  levels:
-    min: 2
-    max: 2
+    min: 3
+    max: 5
  locationConfig: CP14WastelandsIsland
-  connection: ConnectionStone
  tags:
  - CP14DemiplaneOres
  - CP14DemiplaneOpenSky
@@ -23,7 +22,7 @@
  layers:
  # Masks
  - !type:NoiseDistanceDunGen
-    size: 160, 160
+    size: 120, 120
    distanceConfig: !type:DunGenEuclideanSquaredDistance
      blendWeight: 0.7
    layers:
@@ -37,7 +36,7 @@
        lacunarity: 2
        gain: 0.5
  - !type:NoiseDistanceDunGen
-    size: 150, 150
+    size: 115, 115
    distanceConfig: !type:DunGenEuclideanSquaredDistance
      blendWeight: 0.6
    layers:
@@ -51,7 +50,7 @@
        lacunarity: 2
        gain: 0.5
  - !type:NoiseDistanceDunGen
-    size: 110, 110
+    size: 90, 90
    distanceConfig: !type:DunGenEuclideanSquaredDistance
      blendWeight: 0.5
    layers:
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/misc.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/misc.yml
@@ -4,7 +4,7 @@
  id: Lava
  levels:
    min: 2
-    max: 10
+    max: 5
  generationWeight: 0.3
  categories:
    Danger: 0.25
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml
@@ -4,7 +4,7 @@
  id: EnemyZombie
  levels:
    min: 0
-    max: 6
+    max: 3
  name: cp14-modifier-zombie
  generationWeight: 1.5
  categories:
@@ -21,8 +21,8 @@
 - type: cp14LocationModifier
  id: EnemyDyno
  levels:
-    min: 2
-    max: 8
+    min: 3
+    max: 5
  name: cp14-modifier-dyno
  categories:
    Danger: 0.4
@@ -40,7 +40,7 @@
  id: MonsterMosquito
  levels:
    min: 0
-    max: 5
+    max: 2
  name: cp14-modifier-dyno
  categories:
    Danger: 0.25
@@ -60,7 +60,7 @@
  id: Fairy
  levels:
    min: 0
-    max: 5
+    max: 3
  categories:
    Danger: 0.20
  requiredTags:
@@ -76,7 +76,7 @@
  id: SmallHydra
  levels:
    min: 0
-    max: 5
+    max: 2
  name: cp14-modifier-dyno
  categories:
    Danger: 0.25
@@ -93,7 +93,7 @@
  id: EnemyFlem
  levels:
    min: 0
-    max: 8
+    max: 2
  name: cp14-modifier-flem
  generationWeight: 0.33
  categories:
@@ -113,8 +113,8 @@
 - type: cp14LocationModifier
  id: EnemyMole
  levels:
-    min: 1
-    max: 10
+    min: 2
+    max: 5
  name: cp14-modifier-mole
  categories:
    Danger: 0.4
@@ -130,8 +130,8 @@
 - type: cp14LocationModifier
  id: EnemyIceSpectre
  levels:
-    min: 0
-    max: 10
+    min: 2
+    max: 5
  name: cp14-modifier-zombie
  categories:
    Danger: 0.4
@@ -150,7 +150,7 @@
  id: MobSlimeElectric
  levels:
    min: 1
-    max: 10
+    max: 5
  name: cp14-modifier-slime
  categories:
    Danger: 0.35
@@ -165,7 +165,7 @@
  id: MobSlimeFire
  levels:
    min: 2
-    max: 10
+    max: 5
  name: cp14-modifier-slime
  categories:
    Danger: 0.3
@@ -182,7 +182,7 @@
  id: MobSlimeIce
  levels:
    min: 0
-    max: 10
+    max: 5
  name: cp14-modifier-slime
  categories:
    Danger: 0.3
@@ -199,7 +199,7 @@
  id: MobSlimeBase
  levels:
    min: 0
-    max: 5
+    max: 1
  categories:
    Danger: 0.25
  layers:
@@ -213,7 +213,7 @@
  id: MobWatcherIce
  levels:
    min: 1
-    max: 10
+    max: 2
  name: cp14-modifier-watcher
  categories:
    Danger: 0.3
@@ -232,7 +232,7 @@
  id: MobWatcherMagma
  levels:
    min: 1
-    max: 10
+    max: 2
  name: cp14-modifier-watcher
  categories:
    Danger: 0.3
@@ -250,8 +250,8 @@
 - type: cp14LocationModifier
  id: MobSpiders
  levels:
-    min: 1
-    max: 10
+    min: 2
+    max: 4
  name: cp14-modifier-spiders
  categories:
    Danger: 0.3
@@ -277,8 +277,8 @@
 - type: cp14LocationModifier
  id: MobBigBear
  levels:
-    min: 2
-    max: 10
+    min: 3
+    max: 5
  categories:
    Danger: 0.5
  requiredTags:
@@ -295,7 +295,7 @@
  id: MyconideFlyagaric
  levels:
    min: 0
-    max: 10
+    max: 5
  categories:
    Danger: 0.3
  requiredTags:
@@ -311,7 +311,7 @@
  id: MyconideLumish
  levels:
    min: 0
-    max: 10
+    max: 5
  categories:
    Danger: 0.3
  requiredTags:
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Fun/lol.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Fun/lol.yml
@@ -2,7 +2,7 @@
  id: RoyalPumpkin
  levels:
    min: 0
-    max: 10
+    max: 5
  generationWeight: 0.1
  generationProb: 0.1
  categories:
@@ -25,7 +25,7 @@
  id: LucenTree
  levels:
    min: 0
-    max: 10
+    max: 5
  generationWeight: 0.1
  generationProb: 0.1
  categories:
@@ -48,7 +48,7 @@
  id: StatueStoneHead
  levels:
    min: 0
-    max: 6
+    max: 5
  generationWeight: 0.1
  generationProb: 0.1
  categories:
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/GhostRoleDanger/misc.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/GhostRoleDanger/misc.yml
@@ -19,7 +19,7 @@
  id: EnemySkeletonT2
  levels:
    min: 4
-    max: 10
+    max: 5
  name: cp14-modifier-skeleton
  generationWeight: 2.0
  categories:
@@ -35,7 +35,7 @@
  id: EnemyLurker
  levels:
    min: 0
-    max: 10
+    max: 5
  generationWeight: 0.33
  generationProb: 0.25
  categories:
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/MapLight/mapLight.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/MapLight/mapLight.yml
@@ -2,7 +2,7 @@
  id: MapLightDarkness
  levels:
    min: 2
-    max: 10
+    max: 5
  generationWeight: 2
  categories:
    MapLight: 1
@@ -15,7 +15,7 @@
  id: MapLightDarkRed
  levels:
    min: 3
-    max: 10
+    max: 5
  categories:
    MapLight: 1
  name: cp14-modifier-night
@@ -65,7 +65,7 @@
  id: MapLightCycleDefault
  levels:
    min: 0
-    max: 10
+    max: 5
  categories:
    MapLight: 1
  generationWeight: 2
@@ -78,7 +78,7 @@
  id: MapLightCycleCold
  levels:
    min: 0
-    max: 10
+    max: 5
  categories:
    MapLight: 1
  generationWeight: 2
@@ -93,7 +93,7 @@
  id: MapLightCycleHot
  levels:
    min: 0
-    max: 10
+    max: 5
  categories:
    MapLight: 1
  requiredTags:
@@ -107,7 +107,7 @@
  id: MapLightCycleHot2
  levels:
    min: 0
-    max: 10
+    max: 5
  categories:
    MapLight: 1
  requiredTags:
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Ore/ores.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Ore/ores.yml
@@ -1,10 +1,29 @@
 # TIER 1

+- type: cp14LocationModifier
+  id: Marble
+  levels:
+    min: 0
+    max: 5
+  unique: true
+  categories:
+    Ore: 0
+  requiredTags:
+  - CP14DemiplaneOres
+  layers:
+    - !type:CP14OreDunGen
+      entityMask:
+      - CP14WallStone
+      entity: CP14WallMarbleStone
+      count: 5
+      minGroupSize: 5
+      maxGroupSize: 10
+
 - type: cp14LocationModifier
  id: IronOre
  levels:
-    min: 0
-    max: 10
+    min: 1
+    max: 5
  name: cp14-modifier-iron-ore
  unique: false
  categories:
@@ -24,8 +43,8 @@
 - type: cp14LocationModifier
  id: IronOreUnderground
  levels:
-    min: 0
-    max: 10
+    min: 1
+    max: 5
  name: cp14-modifier-iron-ore
  unique: false
  categories:
@@ -46,7 +65,7 @@
  id: CopperOre
  levels:
    min: 0
-    max: 5
+    max: 2
  name: cp14-modifier-copper-ore
  unique: false
  categories:
@@ -67,7 +86,7 @@
  id: CopperOreUnderground
  levels:
    min: 0
-    max: 5
+    max: 2
  name: cp14-modifier-copper-ore
  unique: false
  categories:
@@ -88,7 +107,7 @@
  id: CoalOre
  levels:
    min: 0
-    max: 8
+    max: 2
  name: cp14-modifier-coal-ore
  unique: false
  categories:
@@ -109,7 +128,7 @@
  id: CoalOreUnderground
  levels:
    min: 0
-    max: 8
+    max: 2
  name: cp14-modifier-copper-ore
  unique: false
  categories:
@@ -131,8 +150,8 @@
 - type: cp14LocationModifier
  id: GoldOre
  levels:
-    min: 2
-    max: 10
+    min: 3
+    max: 5
  unique: false
  categories:
    Ore: 0.25
@@ -150,8 +169,8 @@
 - type: cp14LocationModifier
  id: MithrilOre
  levels:
-    min: 2
-    max: 10
+    min: 4
+    max: 5
  name: cp14-modifier-mithril-ore
  unique: false
  categories:
@@ -171,8 +190,8 @@
 - type: cp14LocationModifier
  id: MithrilOreUnderground
  levels:
-    min: 2
-    max: 10
+    min: 4
+    max: 5
  name: cp14-modifier-mithril-ore
  unique: false
  categories:
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Passage/passage.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Passage/passage.yml
@@ -0,0 +1,41 @@
+- type: cp14LocationModifier
+  id: DemiplaneArcTriple
+  levels:
+    min: 0
+    max: 1
+  generationWeight: 0.3
+  categories:
+    Passage: 1
+  layers:
+    - !type:CP14RoomsDunGen
+      count: 3
+      tags:
+      - CP14DemiplanArcRoom
+
+- type: cp14LocationModifier
+  id: DemiplaneArcDouble
+  levels:
+    min: 0
+    max: 3
+  generationWeight: 0.6
+  categories:
+    Passage: 1
+  layers:
+    - !type:CP14RoomsDunGen
+      count: 2
+      tags:
+      - CP14DemiplanArcRoom
+
+- type: cp14LocationModifier
+  id: DemiplaneArcSingle
+  levels:
+    min: 1
+    max: 4
+  generationWeight: 1
+  categories:
+    Passage: 1
+  layers:
+    - !type:CP14RoomsDunGen
+      count: 1
+      tags:
+      - CP14DemiplanArcRoom
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/crystals.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/crystals.yml
@@ -2,7 +2,7 @@
  id: Quartz
  levels:
    min: 0
-    max: 10
+    max: 2
  categories:
    Reward: 0.15
  layers:
@@ -15,8 +15,8 @@
 - type: cp14LocationModifier
  id: CP14CrystalQuartzEarth
  levels:
-    min: 0
-    max: 10
+    min: 2
+    max: 5
  generationWeight: 0.1
  requiredTags:
  - CP14DemiplaneUnderground
@@ -32,8 +32,8 @@
 - type: cp14LocationModifier
  id: CP14CrystalQuartzFire
  levels:
-    min: 0
-    max: 10
+    min: 2
+    max: 5
  generationWeight: 0.1
  requiredTags:
  - CP14DemiplaneHot
@@ -49,8 +49,8 @@
 - type: cp14LocationModifier
  id: CP14CrystalQuartzWater
  levels:
-    min: 0
-    max: 10
+    min: 2
+    max: 5
  generationWeight: 0.1
  requiredTags:
  - CP14DemiplaneWater
@@ -66,8 +66,8 @@
 - type: cp14LocationModifier
  id: CP14CrystalQuartzAir
  levels:
-    min: 0
-    max: 10
+    min: 2
+    max: 5
  generationWeight: 0.1
  requiredTags:
  - CP14DemiplaneOpenSky
@@ -83,8 +83,8 @@
 - type: cp14LocationModifier
  id: CP14CrystalQuartzOrder
  levels:
-    min: 0
-    max: 10
+    min: 2
+    max: 5
  generationWeight: 0.1
  categories:
    Reward: 0.15
@@ -98,8 +98,8 @@
 - type: cp14LocationModifier
  id: CP14CrystalQuartzChaos
  levels:
-    min: 0
-    max: 10
+    min: 2
+    max: 5
  generationWeight: 0.1
  categories:
    Reward: 0.15
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/misc.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/misc.yml
@@ -4,7 +4,7 @@
  id: LootT1
  levels:
    min: 0
-    max: 3
+    max: 2
  generationWeight: 2
  categories:
    Reward: 0.15
@@ -19,7 +19,7 @@
  id: Rabbits
  levels:
    min: 0
-    max: 10
+    max: 5
  name: cp14-modifier-rabbits
  generationWeight: 0.4
  categories:
@@ -37,7 +37,7 @@
  id: Boar
  levels:
    min: 0
-    max: 10
+    max: 3
  name: cp14-modifier-boars
  generationWeight: 0.4
  categories:
@@ -55,7 +55,7 @@
  id: Frog
  levels:
    min: 0
-    max: 10
+    max: 3
  generationWeight: 0.4
  categories:
    Reward: 0.1
@@ -76,7 +76,7 @@
  id: Sheep
  levels:
    min: 0
-    max: 10
+    max: 3
  name: cp14-modifier-sheeps
  generationWeight: 0.4
  categories:
@@ -95,8 +95,8 @@
 - type: cp14LocationModifier
  id: LootT2
  levels:
-    min: 2
-    max: 10
+    min: 4
+    max: 5
  generationWeight: 2
  categories:
    Reward: 0.15
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/rooms.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/rooms.yml
@@ -1,8 +1,8 @@
 - type: cp14LocationModifier
  id: ArtifactRoom
  levels:
-    min: 1
-    max: 10
+    min: 3
+    max: 5
  generationWeight: 2
  categories:
    Reward: 0.15
@@ -16,7 +16,7 @@
  id: Ruins
  levels:
    min: 0
-    max: 10
+    max: 5
  name: cp14-modifier-ruins
  categories:
    Reward: 0.2
@@ -30,8 +30,8 @@
 - type: cp14LocationModifier
  id: Geodes
  levels:
-    min: 0
-    max: 10
+    min: 1
+    max: 3
  name: cp14-modifier-ruins
  categories:
    Reward: 0.15
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/categories.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/categories.yml
@@ -19,3 +19,6 @@
 - type: cp14LocationModifierCategory
  id: MapLight

+- type: cp14LocationModifierCategory
+  id: Passage
+
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/connections.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/connections.yml
@@ -1,35 +0,0 @@
- type: cp14LocationModifier
-  id: ConnectionStone
-  generationProb: 0
-  layers:
-    - !type:CP14RoomsDunGen
-      count: 2
-      tags:
-      - CP14LocationConnectionStone
-
- type: cp14LocationModifier
-  id: ConnectionSnow
-  generationProb: 0
-  layers:
-    - !type:CP14RoomsDunGen
-      count: 2
-      tags:
-      - CP14LocationConnectionSnow
-
- type: cp14LocationModifier
-  id: ConnectionMushroom
-  generationProb: 0
-  layers:
-    - !type:CP14RoomsDunGen
-      count: 2
-      tags:
-      - CP14LocationConnectionMushroom
-
- type: cp14LocationModifier
-  id: ConnectionGrass
-  generationProb: 0
-  layers:
-    - !type:CP14RoomsDunGen
-      count: 2
-      tags:
-      - CP14LocationConnectionGrass
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/special.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/special.yml
@@ -29,4 +29,13 @@
      - CP14FloorSnow
      count: 8
      minGroupSize: 3
-      maxGroupSize: 3
+      maxGroupSize: 3
+
+- type: cp14LocationModifier
+  id: CP14DemiplanEnterRoom
+  generationProb: 0
+  layers:
+    - !type:CP14RoomsDunGen
+      count: 2
+      tags:
+      - CP14DemiplanEnterRoom
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Rooms/demiplane_arc.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Rooms/demiplane_arc.yml
@@ -0,0 +1,47 @@
+- type: Tag
+  id: CP14DemiplanArcRoom
+
+- type: dungeonRoom
+  id: CP14DemiplanArcRoom_1
+  size: 7,7
+  atlas: /Maps/_CP14/Dungeon/demiplane_arc.yml
+  ignoreTile: FloorShuttlePurple
+  offset: 0,0
+  tags:
+    - CP14DemiplanArcRoom
+
+- type: dungeonRoom
+  id: CP14DemiplanArcRoom_2
+  size: 7,7
+  atlas: /Maps/_CP14/Dungeon/demiplane_arc.yml
+  ignoreTile: FloorShuttlePurple
+  offset: 8,0
+  tags:
+    - CP14DemiplanArcRoom
+
+- type: dungeonRoom
+  id: CP14DemiplanArcRoom_3
+  size: 7,7
+  atlas: /Maps/_CP14/Dungeon/demiplane_arc.yml
+  ignoreTile: FloorShuttlePurple
+  offset: 16,0
+  tags:
+    - CP14DemiplanArcRoom
+
+- type: dungeonRoom
+  id: CP14DemiplanArcRoom_4
+  size: 7,7
+  atlas: /Maps/_CP14/Dungeon/demiplane_arc.yml
+  ignoreTile: FloorShuttlePurple
+  offset: 24,0
+  tags:
+    - CP14DemiplanArcRoom
+
+- type: dungeonRoom
+  id: CP14DemiplanArcRoom_5
+  size: 7,7
+  atlas: /Maps/_CP14/Dungeon/demiplane_arc.yml
+  ignoreTile: FloorShuttlePurple
+  offset: 32,0
+  tags:
+    - CP14DemiplanArcRoom
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Rooms/demiplane_enter.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Rooms/demiplane_enter.yml
@@ -42,24 +42,6 @@
  size: 7,7
  atlas: /Maps/_CP14/Dungeon/demiplane_enter.yml
  ignoreTile: FloorShuttlePurple
-  offset: 0,8
+  offset: 32,0
  tags:
-    - CP14DemiplanEnterRoom
-
- type: dungeonRoom
-  id: CP14DemiplanEnterRoom_6
-  size: 9,7
-  atlas: /Maps/_CP14/Dungeon/demiplane_enter.yml
-  ignoreTile: FloorShuttlePurple
-  offset: 8,8
-  tags:
-    - CP14DemiplanEnterRoom
-
- type: dungeonRoom
-  id: CP14DemiplanEnterRoom_7
-  size: 7,7
-  atlas: /Maps/_CP14/Dungeon/demiplane_enter.yml
-  ignoreTile: FloorShuttlePurple
-  offset: 19,8
-  tags:
-    - CP14DemiplanEnterRoom
+    - CP14DemiplanEnterRoom
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Rooms/location_connections.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Rooms/location_connections.yml
@@ -1,86 +0,0 @@
- type: Tag
-  id: CP14LocationConnectionStone
-
- type: dungeonRoom
-  id: CP14LocationConnectionStone_1
-  size: 7,7
-  atlas: /Maps/_CP14/Dungeon/location_connections.yml
-  ignoreTile: FloorShuttlePurple
-  offset: 0,0
-  tags:
-    - CP14LocationConnectionStone
-
- type: dungeonRoom
-  id: CP14LocationConnectionStone_2
-  size: 7,7
-  atlas: /Maps/_CP14/Dungeon/location_connections.yml
-  ignoreTile: FloorShuttlePurple
-  offset: 8,0
-  tags:
-    - CP14LocationConnectionStone
-
-
- type: Tag
-  id: CP14LocationConnectionSnow
-
- type: dungeonRoom
-  id: CP14LocationConnectionSnow_1
-  size: 7,7
-  atlas: /Maps/_CP14/Dungeon/location_connections.yml
-  ignoreTile: FloorShuttlePurple
-  offset: 16,0
-  tags:
-    - CP14LocationConnectionSnow
-
- type: dungeonRoom
-  id: CP14LocationConnectionSnow_2
-  size: 7,7
-  atlas: /Maps/_CP14/Dungeon/location_connections.yml
-  ignoreTile: FloorShuttlePurple
-  offset: 24,0
-  tags:
-    - CP14LocationConnectionSnow
-
-
- type: Tag
-  id: CP14LocationConnectionMushroom
-
- type: dungeonRoom
-  id: CP14LocationConnectionMushroom_1
-  size: 7,7
-  atlas: /Maps/_CP14/Dungeon/location_connections.yml
-  ignoreTile: FloorShuttlePurple
-  offset: 32,0
-  tags:
-    - CP14LocationConnectionMushroom
-
- type: dungeonRoom
-  id: CP14LocationConnectionMushroom_2
-  size: 7,7
-  atlas: /Maps/_CP14/Dungeon/location_connections.yml
-  ignoreTile: FloorShuttlePurple
-  offset: 40,0
-  tags:
-    - CP14LocationConnectionMushroom
-
-
- type: Tag
-  id: CP14LocationConnectionGrass
-
- type: dungeonRoom
-  id: CP14LocationConnectionGrass_1
-  size: 7,7
-  atlas: /Maps/_CP14/Dungeon/location_connections.yml
-  ignoreTile: FloorShuttlePurple
-  offset: 0,8
-  tags:
-    - CP14LocationConnectionGrass
-
- type: dungeonRoom
-  id: CP14LocationConnectionGrass_2
-  size: 7,7
-  atlas: /Maps/_CP14/Dungeon/location_connections.yml
-  ignoreTile: FloorShuttlePurple
-  offset: 8,8
-  tags:
-    - CP14LocationConnectionGrass