Merge branch 'master' into ed-04-08-2025-upstream-sync

Resources/Prototypes/Entities/Effects/admin_triggers.yml

@@ -32,6 +32,7 @@
   id: AdminInstantEffectFlash
   suffix: Flash
   parent: AdminInstantEffectBase
+  categories: [ ForkFiltered ] #Allow in for CE
   components:
   - type: FlashOnTrigger
     range: 7
@@ -42,6 +43,7 @@
   id: AdminInstantEffectSmoke3
   suffix: Smoke (03 sec)
   parent: AdminInstantEffectBase
+  categories: [ ForkFiltered ] #Allow in for CE
   components:
   - type: SmokeOnTrigger
     duration: 3
@@ -56,6 +58,7 @@
   id: AdminInstantEffectSmoke10
   suffix: Smoke (10 sec)
   parent: AdminInstantEffectBase
+  categories: [ ForkFiltered ] #Allow in for CE
   components:
   - type: SmokeOnTrigger
     duration: 10
@@ -70,6 +73,7 @@
   id: AdminInstantEffectSmoke30
   suffix: Smoke (30 sec)
   parent: AdminInstantEffectBase
+  categories: [ ForkFiltered ] #Allow in for CE
   components:
   - type: SmokeOnTrigger
     duration: 30
@@ -97,6 +101,7 @@
   id: AdminInstantEffectGravityWell
   suffix: Gravity Well
   parent: AdminInstantEffectBase
+  categories: [ ForkFiltered ] #Allow in for CE
   components: 
   - type: SoundOnTrigger
     removeOnTrigger: true

Resources/Prototypes/_CP14/Catalog/Fills/dresser.yml

@@ -125,7 +125,6 @@
   components:
   - type: StorageFill
     contents:
-      - id: CP14GuidebookDemiplanes
       - id: CP14ClothingCloakGuildmasterCape
         prob: 1
       - id: CP14ClothingShirtCottonWhite

Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_demiplane_infiltration.yml

@@ -1,63 +0,0 @@
-- type: entity
-  id: CP14ActionSpellDemiplaneInfiltration
-  parent: CP14ActionSpellBase
-  name: Demiplane infiltration
-  description: You get inside the demiplane of your choice.
-  components:
-  - type: Sprite
-    sprite: _CP14/Actions/Spells/dimension.rsi
-    state: rift_arrow
-  - type: CP14MagicEffectManaCost
-    manaCost: 25
-  - type: CP14MagicEffect
-    telegraphyEffects:
-    - !type:CP14SpellSpawnEntityOnTarget
-      spawns:
-      - CP14ImpactEffectShadowStep
-    effects:
-    - !type:CP14SpellDemiplaneInfiltration
-  - type: CP14MagicEffectVerbalAspect
-    startSpeech: "Ego intrabo et..."
-    endSpeech: "salvabo socios meos"
-  - type: CP14MagicEffectCastingVisual
-    proto: CP14RuneDemiplaneInfiltration
-  - type: Action
-    icon:
-      sprite: _CP14/Actions/Spells/dimension.rsi
-      state: rift_arrow
-  - type: TargetAction
-    checkCanAccess: true
-    range: 3
-  - type: EntityTargetAction
-    whitelist:
-      components:
-      - CP14DemiplaneRift
-    canTargetSelf: false
-    event: !type:CP14DelayedEntityTargetActionEvent
-      cooldown: 50
-      castDelay: 5
-      distanceThreshold: 3
-      breakOnMove: true
-
-- type: entity
-  id: CP14RuneDemiplaneInfiltration
-  parent: CP14BaseMagicRune
-  categories: [ HideSpawnMenu ]
-  save: false
-  components:
-  - type: PointLight
-    color: "#5e427e"
-  - type: Sprite
-    layers:
-    - state: sun
-      color: "#5e427e"
-      shader: unshaded
-
-- type: entity
-  parent: CP14BaseSpellScrollDimension
-  id: CP14SpellScrollDemiplaneInfiltration
-  name: demiplane infiltration spell scroll
-  components:
-  - type: CP14SpellStorage
-    spells:
-    - CP14ActionSpellDemiplaneInfiltration

Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_monolith_warp.yml

@@ -1,76 +0,0 @@
-- type: entity
-  id: CP14ActionSpellMonolithWarp
-  parent: CP14ActionSpellBase
-  name: Monolith warp
-  description: You open a dimensional rift that transports the creatures around it to the demiplane link crystal
-  components:
-  - type: Sprite
-    sprite: _CP14/Actions/Spells/dimension.rsi
-    state: demi_arrow
-  - type: CP14MagicEffectManaCost
-    manaCost: 25
-  - type: CP14MagicEffect
-    telegraphyEffects:
-    - !type:CP14SpellSpawnEntityOnTarget
-      spawns:
-      - CP14ImpactEffectShadowStep
-    effects:
-    - !type:CP14SpellSpawnEntityOnTarget
-      spawns:
-      - CP14GuildmaterTimedTeleport
-  - type: CP14MagicEffectVerbalAspect
-    startSpeech: "Crystal, ego..."
-    endSpeech: "vado ad vos"
-  - type: CP14MagicEffectCastingVisual
-    proto: CP14RuneDemiplaneInfiltration
-  - type: Action
-    icon:
-      sprite: _CP14/Actions/Spells/dimension.rsi
-      state: demi_arrow
-  - type: TargetAction
-    range: 7
-  - type: WorldTargetAction
-    event: !type:CP14DelayedWorldTargetActionEvent
-      cooldown: 50
-
-- type: entity
-  id: CP14GuildmaterTimedTeleport
-  categories: [ ForkFiltered ]
-  suffix: Teleport to demiplane crystal
-  name: pulsating demiplane rift
-  description: This rift is gaining strength, and will trap all nearby creatures in a demiplane in a second!
-  save: false
-  components:
-  - type: Transform
-    anchored: True
-  - type: Clickable
-  - type: Physics
-    canCollide: false
-    bodyType: Static
-  - type: Sprite
-    drawdepth: Effects
-    sprite: /Textures/_CP14/Structures/Dungeon/demiplan_rift.rsi
-    layers:
-    - state: pulse
-      shader: unshaded
-  - type: PointLight
-    radius: 8
-    color: "#5e427e"
-  - type: SingularityDistortion
-    falloffPower: 1.5
-    intensity: 50
-  - type: AmbientSound
-    volume: -3
-    range: 7
-    sound:
-      path: /Audio/Ambience/Objects/gravity_gen_hum.ogg
-  - type: CP14MonolithTimedPassway
-
-- type: entity
-  parent: CP14BaseSpellScrollDimension
-  id: CP14SpellScrollMonolithWarp
-  name: demiplane link spell scroll
-  components:
-  - type: CP14SpellStorage
-    spells:
-    - CP14ActionSpellMonolithWarp

Resources/Prototypes/_CP14/Entities/Actions/Spells/base.yml

@@ -43,5 +43,4 @@
     drawdepth: Effects
     sprite: _CP14/Effects/Magic/cast_impact.rsi
     noRot: true
-  - type: CP14SpawnOutOfDemiplane
 

Resources/Prototypes/_CP14/Entities/Effects/admin_triggers.yml

@@ -0,0 +1,29 @@
+- type: entity
+  id: CP14ShipExplosion
+  parent: AdminInstantEffectBase
+  categories: [ ForkFiltered ]
+  suffix: Fire Explosion
+  components:
+  - type: Explosive
+    totalIntensity: 75
+    intensitySlope: 1
+    maxIntensity: 400
+    explosionType: FireBomb
+  - type: ExplodeOnTrigger
+
+- type: entity
+  id: CP14ShipExplosionBig
+  parent: AdminInstantEffectBase
+  categories: [ ForkFiltered ]
+  suffix: Big Fire Explosion
+  components:
+  - type: Explosive
+    totalIntensity: 90
+    intensitySlope: 0.1
+    maxIntensity: 400
+    explosionType: Default
+  - type: ExplodeOnTrigger
+  - type: FlashOnTrigger
+    range: 30
+  - type: SpawnOnTrigger 
+    proto: GrenadeFlashEffect

Resources/Prototypes/_CP14/Entities/Markers/Spawners/misc.yml

@@ -0,0 +1,36 @@
+- 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

Resources/Prototypes/_CP14/Entities/Markers/misc.yml

@@ -1,12 +0,0 @@
-- type: entity
-  parent: MarkerBase
-  id: CP14DemiplaneEntryPointMarker
-  name: demiplane entry point
-  categories: [ ForkFiltered ]
-  components:
-  - type: Sprite
-    layers:
-    - state: green
-    - sprite: /Textures/_CP14/Structures/Dungeon/demiplan_rift.rsi
-      state: pulse
-  - type: CP14DemiplaneRift

Resources/Prototypes/_CP14/Entities/Mobs/Player/Patrons/gods.yml

@@ -67,7 +67,6 @@
       types:
         CP14ManaDepletion: 1
   - type: CP14ZLevelMover
-  - type: CP14DemiplaneForceExtract
   - type: UserInterface
     interfaces:
       enum.CP14ReligionEntityUiKey.Key:

Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml

@@ -213,9 +213,6 @@
   - type: Tag
     tags:
     - FootstepSound
-  - type: CP14DemiplaneForceExtract
-  - type: CP14DemiplaneStabilizer
-    requireAlive: true
   - type: CP14IgnitionModifier
     ignitionTimeModifier: 2.5
   - type: MovementAlwaysTouching

Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml

@@ -112,10 +112,6 @@
   - type: Inventory
     templateId: CP14Human
   - type: TransferMindOnGib
-  - type: CP14DemiplaneForceExtract
-    enabled: false
-  - type: CP14DemiplaneStabilizer
-    enabled: false
   - type: GhostTakeoverAvailable
 
 - type: entity

Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/Books/guidebooks.yml

@@ -39,25 +39,3 @@
     guides:
     - CP14_RU_Alchemy
     - CP14_EN_Alchemy
-
-- type: entity
-  id: CP14GuidebookDemiplanes
-  parent: CP14GuidebookBase
-  name: demiplane research guide
-  description: "A 20-minute adventure: in and out."
-  components:
-  - type: Sprite
-    layers:
-    - state: paper
-    - state: cover_base
-      color: "#5f1280"
-    - state: decor_frame
-      color: "#ffe269"
-    - state: icon_magic
-      shader: unshaded
-    - state: bookmark_short
-  - type: GuideHelp
-    guides:
-    - CP14_RU_Demiplanes
-    - CP14_EN_Demiplanes
-

Resources/Prototypes/_CP14/Entities/Objects/Tools/demiplane_keys.yml

@@ -1,54 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: CP14BaseDemiplaneKey
-  categories: [ ForkFiltered ]
-  name: demiplane coordinate key
-  description: A temporary blob of energy linking the real world and the demiplane. Use it before it dissipates.
-  components:
-  - type: Item
-    size: Ginormous
-  - type: Sprite
-    noRot: true
-    drawdepth: Effects
-    sprite: _CP14/Structures/Dungeon/demiplan_rift_core.rsi
-    layers:
-    - state: coord
-  - type: GuideHelp
-    guides:
-    - CP14_RU_Demiplanes
-    - CP14_EN_Demiplanes
-  - type: CP14DemiplaneUsingOpen
-  - type: CP14DemiplaneData
-    selectedModifiers:
-    - DemiplaneDecor
-    - Core
-    - EntryRoom
-    - Exit
-  - type: TimedDespawn
-    lifetime: 120
-  - type: CanMoveInAir
-  - type: RandomWalk
-    minSpeed: 0.25
-    maxSpeed: 0.75
-  - type: Physics
-    bodyType: Dynamic
-    bodyStatus: InAir
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.25,-0.25,0.25,0.25"
-        density: 20
-        mask:
-        #- ItemMask # CP14 swap ItemMask to Impassable only
-        - Impassable
-        restitution: 0.3  # fite me
-        friction: 0.2
-  - type: PointLight
-    enabled: true
-    color: "#8f42ff"
-    energy: 1
-    radius: 2
-    netsync: false
-

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Magic/twoHandedStaffs.yml

@@ -79,7 +79,6 @@
     - CP14ActionSpellShadowStep
     - CP14ActionSpellShadowGrab
     - CP14ActionSpellShadowSwap
-    - CP14ActionSpellDemiplaneInfiltration
   - type: Sprite
     sprite: _CP14/Objects/Weapons/Magic/TwoHandedStaff/shadow_staff.rsi
   - type: Clothing

Resources/Prototypes/_CP14/Entities/Stations/base.yml

@@ -8,7 +8,6 @@
   - BaseStationAlertLevels
   - BaseStationRecords # Required for lobby manifest + cryo leave
   - CP14BaseStationCommonObjectives
-  - CP14BaseStationDemiplaneMap
   - CP14BaseStationEconomy
   #- CP14BaseStationGods
 
@@ -18,12 +17,6 @@
   components:
     - type: CP14StationCommonObjectives
 
-- type: entity
-  id: CP14BaseStationDemiplaneMap
-  abstract: true
-  components:
-    - type: CP14StationDemiplaneMap
-
 - type: entity
   id: CP14BaseStationEconomy
   abstract: true

Resources/Prototypes/_CP14/Entities/Structures/Flora/demiplane_hint.yml

@@ -1,31 +0,0 @@
-- type: entity
-  id: CP14DemiplaneHint
-  name: astral crack
-  description: Those cracks always lead to a way out of the damn place
-  categories: [ ForkFiltered ]
-  placement:
-    mode: SnapgridCenter
-  components:
-    - type: Clickable
-    - type: Sprite
-      sprite: /Textures/_CP14/Structures/Flora/demiplane_cracks.rsi
-      layers:
-        - state: crack3
-          shader: unshaded
-      drawdepth: LowFloors
-    - type: SyncSprite
-    - type: RequiresTile
-    - type: CP14DemiplaneHint
-    - type: RandomSprite
-      available:
-        - 0:
-            crack: ""
-            crack2: ""
-            crack3: ""
-            crack4: ""
-    - type: PointLight
-      netSync: false
-      radius: 1.3
-      color: "#c6529f"
-      energy: 1
-

Resources/Prototypes/_CP14/Entities/Structures/Furniture/bookshelf.yml

@@ -91,7 +91,6 @@
       children:
       - id: CP14GuidebookImperialLaws
       - id: CP14GuidebookAlchemy
-      - id: CP14GuidebookDemiplanes
     #Lore books
     - !type:GroupSelector
       children:

Resources/Prototypes/_CP14/Entities/Structures/Specific/Demiplanes/rifts.yml

@@ -1,107 +0,0 @@
-- type: entity
-  id: CP14DemiplanRiftCore
-  categories: [ ForkFiltered ]
-  name: demiplan rift core
-  description: A subtle connection between the real world and the demiplane where the adventurers went. Sooner or later they will return from there.
-  components:
-  - type: CP14DemiplaneRift
-  - type: Transform
-    anchored: True
-  - type: Clickable
-  - type: Physics
-    canCollide: false
-    bodyType: Static
-  - type: Sprite
-    noRot: true
-    drawdepth: Effects
-    sprite: /Textures/_CP14/Structures/Dungeon/demiplan_rift_core.rsi
-    layers:
-    - state: connective
-      shader: unshaded
-  - type: PointLight
-    radius: 2
-    energy: 2
-    color: "#371c5c"
-    netsync: false
-  - type: GuideHelp
-    guides:
-    - CP14_RU_Demiplanes
-    - CP14_EN_Demiplanes
-  - type: Speech
-    speechVerb: Ghost
-
-
-- type: entity
-  id: CP14DemiplaneTimedRadiusPassway
-  parent: CP14DemiplanRiftCore
-  name: pulsating demiplane rift
-  description: This rift is gaining strength, and will trap all nearby creatures in a demiplane in a second!
-  components:
-  - type: CP14DemiplaneRift
-    activeTeleport: false
-  - type: CP14DemiplaneRadiusTimedPassway
-    maxEntities: 4
-    delay: 4
-  - type: Sprite
-    drawdepth: Effects
-    sprite: /Textures/_CP14/Structures/Dungeon/demiplan_rift.rsi
-    layers:
-    - state: pulse
-      shader: unshaded
-  - type: PointLight
-    radius: 8
-  - type: SingularityDistortion
-    falloffPower: 1.5
-    intensity: 50
-  - type: AmbientSound
-    volume: -3
-    range: 7
-    sound:
-      path: /Audio/Ambience/Objects/gravity_gen_hum.ogg
-  - type: GuideHelp
-    guides:
-    - CP14_RU_Demiplanes
-    - CP14_EN_Demiplanes
-
-- type: entity
-  id: CP14DemiplanePassway
-  parent: CP14DemiplanRiftCore
-  name: demiplane rift
-  description: A gap in space that allows you to travel between world and demiplanes.
-  components:
-  - type: CP14DemiplaneRiftOpened
-  - type: CP14DemiplaneRift
-    activeTeleport: false
-  - 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: GuideHelp
-    guides:
-    - CP14_RU_Demiplanes
-    - CP14_EN_Demiplanes
-
-- type: entity
-  id: CP14DemiplanePasswayRed
-  parent: CP14DemiplanePassway
-  components:
-  - type: Sprite
-    drawdepth: Effects
-    sprite: /Textures/_CP14/Structures/Dungeon/demiplan_rift.rsi
-    layers:
-    - state: anom
-      shader: unshaded
-      color: red
-  - type: PointLight
-    color: red
-

Resources/Prototypes/_CP14/Entities/Structures/Specific/Demiplanes/round_end.yml

@@ -34,8 +34,8 @@
       - !type:PulseBehaviour
         interpolate: Cubic
         maxDuration: 5
-        startValue: 1.0
-        endValue: 40.0
+        startValue: 0.1
+        endValue: 2.0
         property: Energy
         isLooped: true
         enabled: true
@@ -52,15 +52,6 @@
     range: 10
     sound:
       path: /Audio/_CP14/Effects/demiplane_heartbeat.ogg
-  - type: ActivatableUI
-    key: enum.CP14DemiplaneMapUiKey.Key
-    requiresComplex: true
-    singleUser: true
-  - type: CP14DemiplaneNavigationMap
-  - type: UserInterface
-    interfaces:
-      enum.CP14DemiplaneMapUiKey.Key:
-        type: CP14DemiplaneMapBoundUserInterface
 
 - type: entity
   id: CP14PortalFrameCrystal
@@ -112,89 +103,4 @@
   - type: PointLight
     color: "#9c34e6"
     energy: 2.5
-    radius: 8
-
-- type: entity
-  id: CP14DemiplaneCore
-  categories: [ ForkFiltered ]
-  parent: BaseStructure
-  name: demiplane core
-  description: The heart of the demiplane. Your task is to break it and escape from this place before it collapses.
-  components:
-  - type: CP14DemiplaneCore
-  - type: Transform
-    anchored: true
-  - type: Clickable
-  - type: Physics
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.25,-0.25,0.25,0.25"
-        density: 600
-        mask:
-        - MachineMask
-        layer:
-        - MidImpassable
-        - LowImpassable
-  - type: Tag
-    tags:
-      - Structure
-  - type: Sprite
-    noRot: true
-    sprite: _CP14/Structures/Specific/Thaumaturgy/energy_monolith_big.rsi
-    layers:
-    - state: dimension_core
-    drawdepth: Mobs
-    offset: 0,0.4
-  - type: PointLight
-    enabled: true
-    color: "#8f42ff"
-    castShadows: false
-    energy: 1
-    radius: 5
-    netsync: false
-  - type: LightBehaviour
-    behaviours:
-      - !type:PulseBehaviour
-        interpolate: Cubic
-        maxDuration: 5
-        startValue: 1.0
-        endValue: 40.0
-        property: Energy
-        isLooped: true
-        enabled: true
-  - type: AmbientSound
-    volume: 5
-    range: 10
-    sound:
-      path: /Audio/_CP14/Effects/demiplane_heartbeat.ogg
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: CP14Rock
-  - type: MeleeSound
-    soundGroups:
-      Brute:
-        collection: GlassSmash
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 50
-      behaviors:
-        - !type:PlaySoundBehavior
-          sound:
-            collection: GlassBreak
-        - !type:DoActsBehavior
-          acts: ["Destruction"]
-        - !type:SpawnEntitiesBehavior
-          spawn:
-            CP14DimensitCrystal:
-              min: 2
-              max: 5
-        - !type:SpawnEntitiesBehavior
-          spawn:
-            CP14SkyLightningPurple:
-              min: 1
-              max: 1
+    radius: 8

Resources/Prototypes/_CP14/GameRules/roundstart.yml

@@ -32,6 +32,20 @@
       CP14Innkeeper:
       - CP14PersonalCurrencyCollectObjectiveGroup
 
+# crashing
+
+#- type: entity
+#  id: CP14CrashToWindlandsRule
+#  parent: CP14BaseGameRule
+#  components:
+#  - type: CP14CrashingShipRule
+#  - type: CP14ExpeditionToWindlandsRule
+#    modifiers:
+#    - WeatherInfinityStorm
+#    - MapLightCycleDefault
+#    - Ruins
+#    - Geodes
+
 # event schedulers
 
 - type: entity

Resources/Prototypes/_CP14/Guidebook/Eng/jobs.yml

@@ -18,7 +18,6 @@
   name: Adventurers
   text: "/ServerInfo/_CP14/Guidebook_EN/JobsTabs/Adventurers.xml"
   children:
-  - CP14_EN_Demiplanes
   - CP14_EN_Monster_Toxins
   filterEnabled: True
 

Resources/Prototypes/_CP14/Guidebook/Eng/misc.yml

@@ -5,13 +5,6 @@
   text: "/ServerInfo/_CP14/Guidebook_EN/ImperialLaws.xml"
   filterEnabled: True
 
-- type: guideEntry
-  crystallPunkAllowed: true
-  id: CP14_EN_Demiplanes
-  name: Demiplanes exploration
-  text: "/ServerInfo/_CP14/Guidebook_EN/JobsTabs/AdventurersTabs/Demiplanes.xml"
-  filterEnabled: True
-
 - type: guideEntry
   crystallPunkAllowed: true
   id: CP14_EN_Locks_and_Keys

Resources/Prototypes/_CP14/Guidebook/Ru/jobs.yml

@@ -18,7 +18,6 @@
   name: Авантюрист
   text: "/ServerInfo/_CP14/Guidebook_RU/JobsTabs/Adventurers.xml"
   children:
-  - CP14_RU_Demiplanes
   - CP14_RU_Monster_Toxins
   filterEnabled: True
 

Resources/Prototypes/_CP14/Guidebook/Ru/misc.yml

@@ -5,13 +5,6 @@
   text: "/ServerInfo/_CP14/Guidebook_RU/ImperialLaws.xml"
   filterEnabled: True
 
-- type: guideEntry
-  crystallPunkAllowed: true
-  id: CP14_RU_Demiplanes
-  name: Исследование демипланов
-  text: "/ServerInfo/_CP14/Guidebook_RU/JobsTabs/AdventurersTabs/Demiplanes.xml"
-  filterEnabled: True
-
 - type: guideEntry
   crystallPunkAllowed: true
   id: CP14_RU_Locks_and_Keys

Resources/Prototypes/_CP14/Maps/Frigid_Coast.yml

@@ -1,47 +0,0 @@
-- type: gameMap
-  id: Frigid_Coast
-  mapName: "Frigid Coast"
-  mapPath: /Maps/_CP14/Frigid_Coast.yml
-  maxRandomOffset: 0
-  randomRotation: false
-  minPlayers: 0
-  stations:
-    Frigid_Coast:
-      stationProto: CP14BaseExpedition
-      components:
-        - type: StationNameSetup
-          mapNameTemplate: "Frigid Coast"
-        - type: StationJobs
-          availableJobs:
-            #Mercenary
-            #CP14Guildmaster: [1, 1]
-            CP14Adventurer: [ -1, -1 ]
-            #Artisans
-            CP14Apprentice: [ 3, 3 ]
-            CP14Alchemist: [ 2, 2 ]
-            CP14Blacksmith: [ 2, 2 ]
-            CP14Innkeeper: [ 2, 3 ]
-            CP14Merchant: [2, 2]
-            #Guard
-            #CP14Guard: [5, 5]
-            #CP14GuardCommander: [1, 1]
-        - type: CP14StationZLevels
-          defaultMapLevel: 0
-          levels:
-            -1:
-              path: /Maps/_CP14/Frigid_Coast_d.yml
-        - type: CP14StationKeyDistribution
-          keys:
-          - Alchemy1
-          - Alchemy2
-          - Blacksmith1
-          - Blacksmith2
-          - Shop1
-          - Shop2
-          - PersonalHouse1
-          - PersonalHouse2
-          - PersonalHouse3
-          - PersonalHouse4
-          - PersonalHouse5
-          - PersonalHouse6
-          - PersonalHouse7

Resources/Prototypes/_CP14/Maps/Pools/default.yml

@@ -9,3 +9,8 @@
   id: DeathMatchMapPool
   maps:
   - MeteorArena
+  
+#- type: gameMapPool
+#  id: ShipMapPool
+#  maps:
+#   - NautilusShip

Resources/Prototypes/_CP14/Maps/comoss.yml

@@ -49,3 +49,8 @@
           - PersonalHouse8
           - PersonalHouse9
           - PersonalHouse10
+        - type: CP14StationGlobalWorld
+        - type: CP14StationGlobalWorldIntegration
+          location: ComossIsland
+          modifiers:
+          - RaidSpawners

Resources/Prototypes/_CP14/Maps/nautilus_ship.yml

@@ -0,0 +1,19 @@
+#- type: gameMap
+#  id: NautilusShip
+#  mapName: "Nautilus ship"
+#  mapPath: /Maps/_CP14/nautilus_ship.yml
+#  maxRandomOffset: 0
+#  randomRotation: false
+#  minPlayers: 0
+#  maxPlayers: 20
+#  stations:
+#    NautilusShip:
+#      stationProto: CP14BaseExpedition
+#      components:
+#        - type: StationNameSetup
+#          mapNameTemplate: "Nautilus ship"
+#        - type: StationJobs
+#          availableJobs:
+#            #Mercenary
+#            CP14Adventurer: [ -1, -1 ]
+#        - type: CP14StationGlobalWorld

Resources/Prototypes/_CP14/Maps/venicialis.yml

@@ -44,4 +44,9 @@
           - PersonalHouse3
           - PersonalHouse4
           - PersonalHouse5
-          - PersonalHouse6
+          - PersonalHouse6
+        - type: CP14StationGlobalWorld
+        - type: CP14StationGlobalWorldIntegration
+          location: VenicialistFort
+          modifiers:
+          - RaidSpawners

Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/StationMaps/comoss_island.yml

@@ -0,0 +1,75 @@
+- type: cp14Location
+  id: ComossIsland
+  locationConfig: CP14ComossIsland
+  connection: ConnectionGrass
+  generationProb: 0 #Special location for map only
+  tags:
+  - CP14DemiplaneOres
+  - CP14DemiplaneHerbals
+  - CP14DemiplaneOpenSky
+  - CP14DemiplanePeacefulAnimals
+  components:
+  - type: MapLight
+    ambientLightColor: "#BFEEFFFF"
+  - type: CP14CloudShadows
+  - type: Biome
+    template: CP14SandOceanFill
+  - type: SunShadow
+  - type: SunShadowCycle
+  - type: Roof
+
+- type: dungeonConfig
+  id: CP14ComossIsland
+  layers:
+  # Masks
+  - !type:NoiseDistanceDunGen
+    size: 220, 220
+    distanceConfig: !type:DunGenEuclideanSquaredDistance
+      blendWeight: 0.8
+    layers:
+    - tile: CP14FloorSand
+      threshold: 0.50
+      noise:
+        frequency: 0.010
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        octaves: 5
+        lacunarity: 2
+        gain: 0.5
+  - !type:NoiseDistanceDunGen
+    size: 215, 215
+    distanceConfig: !type:DunGenEuclideanSquaredDistance
+      blendWeight: 0.7
+    layers:
+    - tile: CP14FloorGrass
+      threshold: 0.50
+      noise:
+        frequency: 0.010
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        octaves: 5
+        lacunarity: 2
+        gain: 0.5
+  - !type:NoiseDistanceDunGen
+    size: 140, 140
+    distanceConfig: !type:DunGenEuclideanSquaredDistance
+      blendWeight: 0.6
+    layers:
+    - tile: CP14FloorBase
+      threshold: 0.50
+      noise:
+        frequency: 0.010
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        octaves: 5
+        lacunarity: 2
+        gain: 0.5
+  # Biomes
+  - !type:CP14BiomeDunGen
+    biomeTemplate: CP14CavesGeneric
+    tileMask:
+    - CP14FloorBase
+  - !type:CP14BiomeDunGen
+    biomeTemplate: CP14GrasslandTestResult
+    tileMask:
+    - CP14FloorGrass

Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/StationMaps/venicialis_fort.yml

@@ -0,0 +1,61 @@
+- type: cp14Location
+  id: VenicialistFort
+  locationConfig: CP14VenicialistFort
+  connection: ConnectionSnow
+  generationProb: 0 #Special location for map only
+  tags:
+  - CP14DemiplaneOres
+  - CP14DemiplaneOpenSky
+  - CP14DemiplanePeacefulAnimals
+  - CP14DemiplaneCold
+  components:
+  - type: MapLight
+    ambientLightColor: "#BFEEFFFF"
+  - type: CP14CloudShadows
+  - type: Biome
+    template: CP14IceOceanFill
+  - type: SunShadow
+  - type: SunShadowCycle
+  - type: Roof
+
+- type: dungeonConfig
+  id: CP14VenicialistFort
+  layers:
+    # Masks
+    - !type:NoiseDistanceDunGen
+      size: 220, 220
+      distanceConfig: !type:DunGenEuclideanSquaredDistance
+        blendWeight: 0.8
+      layers:
+      - tile: CP14FloorGrass
+        threshold: 0.50
+        noise:
+          frequency: 0.010
+          noiseType: OpenSimplex2
+          fractalType: FBm
+          octaves: 5
+          lacunarity: 2
+          gain: 0.5
+    - !type:NoiseDistanceDunGen
+      size: 140, 140
+      distanceConfig: !type:DunGenEuclideanSquaredDistance
+        blendWeight: 0.7
+      layers:
+      - tile: CP14FloorBase
+        threshold: 0.50
+        noise:
+          frequency: 0.010
+          noiseType: OpenSimplex2
+          fractalType: FBm
+          octaves: 5
+          lacunarity: 2
+          gain: 0.5
+    # Biomes
+    - !type:CP14BiomeDunGen
+      biomeTemplate: CP14IceCavesGeneric
+      tileMask:
+      - CP14FloorBase
+    - !type:CP14BiomeDunGen
+      biomeTemplate: CP14SnowlandTestResult
+      tileMask:
+      - CP14FloorGrass

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

@@ -1,13 +1,10 @@
-- type: cp14DemiplaneLocation
-  id: T1Caves
+- type: cp14Location
+  id: Caves
   levels:
     min: 1
-    max: 5
-  icon:
-    sprite: _CP14/Interface/Misc/demiplane_locations.rsi
-    state: caves
-  locationConfig: CP14DemiplaneCaves
-  name: cp14-demiplane-location-cave
+    max: 2
+  locationConfig: CP14Caves
+  connection: ConnectionStone
   tags:
   - CP14DemiplaneOres
   - CP14DemiplaneUnderground
@@ -16,26 +13,9 @@
     template: CP14CavesIndestructibleFill
 
 - type: dungeonConfig
-  id: CP14DemiplaneCaves
-  layers:
-    # Masks
-    - !type:PrototypeDunGen
-      proto: CP14DemiplaneCavesFloorMaskStone
-    - !type:PrototypeDunGen
-      proto: CP14DemiplaneCavesFloorMaskAir
-    # Biomes
-    - !type:BiomeDunGen
-      biomeTemplate: CP14CavesGeneric
-      tileMask:
-      - CP14FloorSand
-    - !type:BiomeDunGen
-      biomeTemplate: CP14CavesFloor
-      tileMask:
-      - CP14FloorGrass
-
-- type: dungeonConfig
-  id: CP14DemiplaneCavesFloorMaskStone
+  id: CP14Caves
   layers:
+  # Masks
   - !type:NoiseDistanceDunGen
     size: 120, 120
     distanceConfig: !type:DunGenEuclideanSquaredDistance
@@ -50,10 +30,6 @@
         octaves: 5
         lacunarity: 2
         gain: 0.5
-
-- type: dungeonConfig
-  id: CP14DemiplaneCavesFloorMaskAir
-  layers:
   - !type:NoiseDistanceDunGen
     size: 80, 80
     distanceConfig: !type:DunGenEuclideanSquaredDistance
@@ -68,4 +44,12 @@
         octaves: 5
         lacunarity: 2
         gain: 0.5
-
+  # Biomes
+  - !type:CP14BiomeDunGen
+    biomeTemplate: CP14CavesGeneric
+    tileMask:
+    - CP14FloorSand
+  - !type:CP14BiomeDunGen
+    biomeTemplate: CP14CavesFloor
+    tileMask:
+    - CP14FloorGrass

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

@@ -1,13 +1,10 @@
-- type: cp14DemiplaneLocation
-  id: T1IceCaves
+- type: cp14Location
+  id: IceCaves
   levels:
     min: 2
-    max: 7
-  icon:
-    sprite: _CP14/Interface/Misc/demiplane_locations.rsi
-    state: ice_caves
-  locationConfig: CP14DemiplaneIceCaves
-  name: cp14-demiplane-location-ice-cave
+    max: 10
+  locationConfig: CP14IceCaves
+  connection: ConnectionSnow
   tags:
   - CP14DemiplaneOres
   - CP14DemiplaneUnderground
@@ -17,20 +14,44 @@
     template: CP14IceChasmFill
 
 - type: dungeonConfig
-  id: CP14DemiplaneIceCaves
+  id: CP14IceCaves
   layers:
     # Masks
-    - !type:PrototypeDunGen
-      proto: CP14DemiplaneCavesFloorMaskStone
-    - !type:PrototypeDunGen
-      proto: CP14DemiplaneCavesFloorMaskAir
-    # Biomes
-    - !type:BiomeDunGen
-      biomeTemplate: CP14IceCavesGeneric
-      tileMask:
-      - CP14FloorSand
-    - !type:BiomeDunGen
-      biomeTemplate: CP14IceCavesFloor
-      tileMask:
-      - CP14FloorGrass
+  - !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: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
+  # Biomes
+  - !type:CP14BiomeDunGen
+    biomeTemplate: CP14IceCavesGeneric
+    tileMask:
+    - CP14FloorSand
+  - !type:CP14BiomeDunGen
+    biomeTemplate: CP14IceCavesFloor
+    tileMask:
+    - CP14FloorGrass
 

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

@@ -1,13 +1,10 @@
-- type: cp14DemiplaneLocation
-  id: T1MagmaCaves
+- type: cp14Location
+  id: MagmaCaves
   levels:
-    min: 4
-    max: 20
-  icon:
-    sprite: _CP14/Interface/Misc/demiplane_locations.rsi
-    state: magma_caves
-  locationConfig: CP14DemiplaneCavesRing
-  name: cp14-demiplane-location-cave-magma
+    min: 3
+    max: 10
+  locationConfig: CP14MagmaCaves
+  connection: ConnectionStone
   tags:
   - CP14DemiplaneOres
   - CP14DemiplaneUnderground
@@ -17,34 +14,9 @@
     template: CP14LavaOceanFill
 
 - type: dungeonConfig
-  id: CP14DemiplaneCavesRing
-  layers:
-    # Masks
-    - !type:PrototypeDunGen
-      proto: CP14DemiplaneCavesRingFloorMaskStone
-    - !type:PrototypeDunGen
-      proto: CP14DemiplaneCavesRingFloorMaskAir
-    - !type:PrototypeDunGen
-      proto: CP14DemiplaneCavesRingFloorMaskStone2
-    - !type:PrototypeDunGen
-      proto: CP14DemiplaneCavesRingFloorMaskBorderCenter
-    # Biomes
-    - !type:BiomeDunGen
-      biomeTemplate: CP14CavesGeneric
-      tileMask:
-      - CP14FloorSand
-    - !type:BiomeDunGen
-      biomeTemplate: CP14CavesFloor
-      tileMask:
-      - CP14FloorGrass
-    - !type:BiomeDunGen
-      biomeTemplate: CP14MarbleCaves
-      tileMask:
-      - CP14FloorMarble
-
-- type: dungeonConfig
-  id: CP14DemiplaneCavesRingFloorMaskStone
+  id: CP14MagmaCaves
   layers:
+  # Masks
   - !type:NoiseDistanceDunGen
     size: 120, 120
     distanceConfig: !type:DunGenEuclideanSquaredDistance
@@ -59,10 +31,6 @@
         octaves: 5
         lacunarity: 2
         gain: 0.5
-
-- type: dungeonConfig
-  id: CP14DemiplaneCavesRingFloorMaskAir
-  layers:
   - !type:NoiseDistanceDunGen
     size: 110, 110
     distanceConfig: !type:DunGenEuclideanSquaredDistance
@@ -77,10 +45,6 @@
         octaves: 5
         lacunarity: 2
         gain: 0.5
-
-- type: dungeonConfig
-  id: CP14DemiplaneCavesRingFloorMaskStone2
-  layers:
   - !type:NoiseDistanceDunGen
     size: 80, 80
     distanceConfig: !type:DunGenEuclideanSquaredDistance
@@ -95,10 +59,6 @@
         octaves: 5
         lacunarity: 2
         gain: 0.5
-
-- type: dungeonConfig
-  id: CP14DemiplaneCavesRingFloorMaskBorderCenter
-  layers:
   - !type:NoiseDistanceDunGen
     size: 50, 50
     distanceConfig: !type:DunGenEuclideanSquaredDistance
@@ -113,4 +73,16 @@
         octaves: 5
         lacunarity: 2
         gain: 0.5
-
+  # Biomes
+  - !type:CP14BiomeDunGen
+    biomeTemplate: CP14CavesGeneric
+    tileMask:
+    - CP14FloorSand
+  - !type:CP14BiomeDunGen
+    biomeTemplate: CP14CavesFloor
+    tileMask:
+    - CP14FloorGrass
+  - !type:CP14BiomeDunGen
+    biomeTemplate: CP14MarbleCaves
+    tileMask:
+    - CP14FloorMarble

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

@@ -1,13 +1,10 @@
-- type: cp14DemiplaneLocation
-  id: T1MushroomCaves
+- type: cp14Location
+  id: MushroomCaves
   levels:
     min: 1
-    max: 5
-  icon:
-    sprite: _CP14/Interface/Misc/demiplane_locations.rsi
-    state: mushroom_caves
-  locationConfig: CP14DemiplaneMushroomCaves
-  name: cp14-demiplane-location-mushroom-caves
+    max: 10
+  locationConfig: CP14MushroomCaves
+  connection: ConnectionMushroom
   tags:
   - CP14DemiplaneOres
   - CP14DemiplaneUnderground
@@ -17,19 +14,43 @@
     template: CP14ChasmFill
 
 - type: dungeonConfig
-  id: CP14DemiplaneMushroomCaves
+  id: CP14MushroomCaves
   layers:
-    # Masks
-    - !type:PrototypeDunGen
-      proto: CP14DemiplaneCavesFloorMaskStone
-    - !type:PrototypeDunGen
-      proto: CP14DemiplaneCavesFloorMaskAir
-    # Biomes
-    - !type:BiomeDunGen
-      biomeTemplate: CP14MushroomsCaveResult
-      tileMask:
-      - CP14FloorSand
-    - !type:BiomeDunGen
-      biomeTemplate: CP14CavesMushroomFloor
-      tileMask:
-      - CP14FloorGrass
+  # Masks
+  - !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: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
+  # Biomes
+  - !type:CP14BiomeDunGen
+    biomeTemplate: CP14MushroomsCaveResult
+    tileMask:
+    - CP14FloorSand
+  - !type:CP14BiomeDunGen
+    biomeTemplate: CP14CavesMushroomFloor
+    tileMask:
+    - CP14FloorGrass

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

@@ -1,13 +1,10 @@
-- type: cp14DemiplaneLocation
-  id: T1SwampCaves
+- type: cp14Location
+  id: SwampCaves
   levels:
-    min: 2
-    max: 5
-  icon:
-    sprite: _CP14/Interface/Misc/demiplane_locations.rsi
-    state: swamp_caves
-  locationConfig: CP14DemiplaneSwampGeode
-  name: cp14-demiplane-location-cave-grass
+    min: 1
+    max: 10
+  locationConfig: CP14SwampGeode
+  connection: ConnectionGrass
   tags:
   - CP14DemiplaneOres
   - CP14DemiplaneHerbals
@@ -19,44 +16,9 @@
     template: CP14CavesIndestructibleFill
 
 - type: dungeonConfig
-  id: CP14DemiplaneSwampGeode
-  layers:
-    # Masks
-    - !type:PrototypeDunGen
-      proto: CP14DemiplaneGrassGeodeFloorMaskStone
-    - !type:PrototypeDunGen
-      proto: CP14DemiplaneGrassGeodeFloorMaskAir
-    # Biomes
-    - !type:BiomeDunGen
-      biomeTemplate: CP14SwampFill
-      tileMask:
-      - CP14FloorGrass
-    - !type:BiomeDunGen
-      biomeTemplate: CP14CavesGeneric
-      tileMask:
-      - CP14FloorSand
-
-- type: dungeonConfig
-  id: CP14DemiplaneGrassGeodeFloorMaskAir
-  layers:
-  - !type:NoiseDistanceDunGen
-    size: 80, 80
-    distanceConfig: !type:DunGenEuclideanSquaredDistance
-      blendWeight: 0.7
-    layers:
-    - tile: CP14FloorGrass
-      threshold: 0.50
-      noise:
-        frequency: 0.030
-        noiseType: OpenSimplex2
-        fractalType: FBm
-        octaves: 5
-        lacunarity: 2
-        gain: 0.5
-
-- type: dungeonConfig
-  id: CP14DemiplaneGrassGeodeFloorMaskStone
+  id: CP14SwampGeode
   layers:
+  # Masks
   - !type:NoiseDistanceDunGen
     size: 120, 120
     distanceConfig: !type:DunGenEuclideanSquaredDistance
@@ -71,22 +33,26 @@
         octaves: 5
         lacunarity: 2
         gain: 0.5
-
-- type: dungeonConfig
-  id: CP14DemiplaneGrassGeodeFloorMaskBorder
-  layers:
   - !type:NoiseDistanceDunGen
-    size: 130, 130
+    size: 80, 80
     distanceConfig: !type:DunGenEuclideanSquaredDistance
-      blendWeight: 1
+      blendWeight: 0.7
     layers:
-    - tile: CP14FloorBase
+    - tile: CP14FloorGrass
       threshold: 0.50
       noise:
-        frequency: 0.010
+        frequency: 0.030
         noiseType: OpenSimplex2
         fractalType: FBm
         octaves: 5
         lacunarity: 2
         gain: 0.5
-
+  # Biomes
+  - !type:CP14BiomeDunGen
+    biomeTemplate: CP14SwampFill
+    tileMask:
+    - CP14FloorGrass
+  - !type:CP14BiomeDunGen
+    biomeTemplate: CP14CavesGeneric
+    tileMask:
+    - CP14FloorSand

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

@@ -1,13 +1,10 @@
-- type: cp14DemiplaneLocation
-  id: T1GrasslandIsland
+- type: cp14Location
+  id: GrasslandIsland
   levels:
-    min: 1
+    min: 0
     max: 2
-  icon:
-    sprite: _CP14/Interface/Misc/demiplane_locations.rsi
-    state: grassland_island
-  locationConfig: CP14DemiplaneGrasslandIsland
-  name: cp14-demiplane-location-grassland-island
+  locationConfig: CP14GrasslandIsland
+  connection: ConnectionGrass
   tags:
   - CP14DemiplaneOres
   - CP14DemiplaneHerbals
@@ -24,64 +21,9 @@
   - type: Roof
 
 - type: dungeonConfig
-  id: CP14DemiplaneGrasslandIsland
-  layers:
-    # Masks
-    - !type:PrototypeDunGen
-      proto: CP14DemiplaneGrasslandIslandFloorMaskSand
-    - !type:PrototypeDunGen
-      proto: CP14DemiplaneGrasslandIslandFloorMaskGrass
-    - !type:PrototypeDunGen
-      proto: CP14DemiplaneGrasslandIslandFloorMaskStone
-    # Biomes
-    - !type:BiomeDunGen
-      biomeTemplate: CP14CavesGeneric
-      tileMask:
-      - CP14FloorBase
-    - !type:BiomeDunGen
-      biomeTemplate: CP14GrasslandTestResult
-      tileMask:
-      - CP14FloorGrass
-
-- type: dungeonConfig
-  id: CP14DemiplaneGrasslandIslandFloorMaskStone
-  layers:
-  - !type:NoiseDistanceDunGen
-    size: 110, 110
-    distanceConfig: !type:DunGenEuclideanSquaredDistance
-      blendWeight: 0.5
-    layers:
-    - tile: CP14FloorBase
-      threshold: 0.50
-      noise:
-        frequency: 0.010
-        noiseType: OpenSimplex2
-        fractalType: FBm
-        octaves: 5
-        lacunarity: 2
-        gain: 0.5
-
-- type: dungeonConfig
-  id: CP14DemiplaneGrasslandIslandFloorMaskGrass
-  layers:
-  - !type:NoiseDistanceDunGen
-    size: 150, 150
-    distanceConfig: !type:DunGenEuclideanSquaredDistance
-      blendWeight: 0.6
-    layers:
-    - tile: CP14FloorGrass
-      threshold: 0.50
-      noise:
-        frequency: 0.010
-        noiseType: OpenSimplex2
-        fractalType: FBm
-        octaves: 5
-        lacunarity: 2
-        gain: 0.5
-
-- type: dungeonConfig
-  id: CP14DemiplaneGrasslandIslandFloorMaskSand
+  id: CP14GrasslandIsland
   layers:
+  # Masks
   - !type:NoiseDistanceDunGen
     size: 160, 160
     distanceConfig: !type:DunGenEuclideanSquaredDistance
@@ -96,4 +38,40 @@
         octaves: 5
         lacunarity: 2
         gain: 0.5
-
+  - !type:NoiseDistanceDunGen
+    size: 150, 150
+    distanceConfig: !type:DunGenEuclideanSquaredDistance
+      blendWeight: 0.6
+    layers:
+    - tile: CP14FloorGrass
+      threshold: 0.50
+      noise:
+        frequency: 0.010
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        octaves: 5
+        lacunarity: 2
+        gain: 0.5
+  - !type:NoiseDistanceDunGen
+    size: 110, 110
+    distanceConfig: !type:DunGenEuclideanSquaredDistance
+      blendWeight: 0.5
+    layers:
+    - tile: CP14FloorBase
+      threshold: 0.50
+      noise:
+        frequency: 0.010
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        octaves: 5
+        lacunarity: 2
+        gain: 0.5
+  # Biomes
+  - !type:CP14BiomeDunGen
+    biomeTemplate: CP14CavesGeneric
+    tileMask:
+    - CP14FloorBase
+  - !type:CP14BiomeDunGen
+    biomeTemplate: CP14GrasslandTestResult
+    tileMask:
+    - CP14FloorGrass

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

@@ -1,13 +1,10 @@
-- type: cp14DemiplaneLocation
-  id: T1SnowIsland
+- type: cp14Location
+  id: SnowIsland
   levels:
     min: 2
-    max: 5
-  icon:
-    sprite: _CP14/Interface/Misc/demiplane_locations.rsi
-    state: snow_island
-  locationConfig: CP14DemiplaneSnowIsland
-  name: cp14-demiplane-location-snow-island
+    max: 10
+  locationConfig: CP14SnowIsland
+  connection: ConnectionSnow
   tags:
   - CP14DemiplaneOres
   - CP14DemiplaneOpenSky
@@ -24,32 +21,9 @@
   - type: Roof
 
 - type: dungeonConfig
-  id: CP14DemiplaneSnowIsland
-  layers:
-    # Masks
-    - !type:PrototypeDunGen
-      proto: CP14DemiplaneIslandFloorMaskSnow
-    - !type:PrototypeDunGen
-      proto: CP14DemiplaneGrasslandIslandFloorMaskGrass
-    - !type:PrototypeDunGen
-      proto: CP14DemiplaneGrasslandIslandFloorMaskStone
-    # Biomes
-    - !type:BiomeDunGen
-      biomeTemplate: CP14SnowlandSwamp
-      tileMask:
-      - CP14FloorSand
-    - !type:BiomeDunGen
-      biomeTemplate: CP14IceCavesGeneric
-      tileMask:
-      - CP14FloorBase
-    - !type:BiomeDunGen
-      biomeTemplate: CP14SnowlandTestResult
-      tileMask:
-      - CP14FloorGrass
-
-- type: dungeonConfig
-  id: CP14DemiplaneIslandFloorMaskSnow
+  id: CP14SnowIsland
   layers:
+  # Masks
   - !type:NoiseDistanceDunGen
     size: 160, 160
     distanceConfig: !type:DunGenEuclideanSquaredDistance
@@ -64,4 +38,44 @@
         octaves: 5
         lacunarity: 2
         gain: 0.5
-
+  - !type:NoiseDistanceDunGen
+    size: 150, 150
+    distanceConfig: !type:DunGenEuclideanSquaredDistance
+      blendWeight: 0.6
+    layers:
+    - tile: CP14FloorGrass
+      threshold: 0.50
+      noise:
+        frequency: 0.010
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        octaves: 5
+        lacunarity: 2
+        gain: 0.5
+  - !type:NoiseDistanceDunGen
+    size: 110, 110
+    distanceConfig: !type:DunGenEuclideanSquaredDistance
+      blendWeight: 0.5
+    layers:
+    - tile: CP14FloorBase
+      threshold: 0.50
+      noise:
+        frequency: 0.010
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        octaves: 5
+        lacunarity: 2
+        gain: 0.5
+  # Biomes
+  - !type:CP14BiomeDunGen
+    biomeTemplate: CP14SnowlandSwamp
+    tileMask:
+    - CP14FloorSand
+  - !type:CP14BiomeDunGen
+    biomeTemplate: CP14IceCavesGeneric
+    tileMask:
+    - CP14FloorBase
+  - !type:CP14BiomeDunGen
+    biomeTemplate: CP14SnowlandTestResult
+    tileMask:
+    - CP14FloorGrass

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

@@ -1,13 +1,10 @@
-- type: cp14DemiplaneLocation
-  id: T1LeafMaze
+- type: cp14Location
+  id: LeafMaze
   levels:
-    min: 3
-    max: 6
-  icon:
-    sprite: _CP14/Interface/Misc/demiplane_locations.rsi
-    state: leaf_maze
-  locationConfig: CP14DemiplaneLeafMaze
-  name: cp14-demiplane-location-leaf-maze
+    min: 1
+    max: 10
+  locationConfig: CP14LeafMaze
+  connection: ConnectionGrass
   tags:
   - CP14DemiplaneHerbals
   - CP14DemiplaneOpenSky
@@ -25,20 +22,44 @@
   - type: CP14CloudShadows
 
 - type: dungeonConfig
-  id: CP14DemiplaneLeafMaze
+  id: CP14LeafMaze
   layers:
-    # Masks
-    - !type:PrototypeDunGen
-      proto: CP14DemiplaneCavesFloorMaskStone
-    - !type:PrototypeDunGen
-      proto: CP14DemiplaneCavesFloorMaskAir
-    # Biomes
-    - !type:BiomeDunGen
-      biomeTemplate: CP14LeafMaze
-      tileMask:
-      - CP14FloorSand
-    - !type:BiomeDunGen
-      biomeTemplate: CP14Grassland
-      tileMask:
-      - CP14FloorGrass
+  # Masks
+  - !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: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
+  # Biomes
+  - !type:CP14BiomeDunGen
+    biomeTemplate: CP14LeafMaze
+    tileMask:
+    - CP14FloorSand
+  - !type:CP14BiomeDunGen
+    biomeTemplate: CP14Grassland
+    tileMask:
+    - CP14FloorGrass
 

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

@@ -1,13 +1,10 @@
-- type: cp14DemiplaneLocation
+- type: cp14Location
   id: T1Wastelands
   levels:
-    min: 3
-    max: 7
-  icon:
-    sprite: _CP14/Interface/Misc/demiplane_locations.rsi
-    state: wastelands
-  locationConfig: CP14DemiplaneWastelandsIsland
-  name: cp14-demiplane-location-wastelands
+    min: 2
+    max: 2
+  locationConfig: CP14WastelandsIsland
+  connection: ConnectionStone
   tags:
   - CP14DemiplaneOres
   - CP14DemiplaneOpenSky
@@ -22,26 +19,61 @@
   - type: Roof
 
 - type: dungeonConfig
-  id: CP14DemiplaneWastelandsIsland
+  id: CP14WastelandsIsland
   layers:
-    # Masks
-    - !type:PrototypeDunGen
-      proto: CP14DemiplaneGrasslandIslandFloorMaskSand
-    - !type:PrototypeDunGen
-      proto: CP14DemiplaneGrasslandIslandFloorMaskGrass
-    - !type:PrototypeDunGen
-      proto: CP14DemiplaneGrasslandIslandFloorMaskStone
-    # Biomes
-    - !type:BiomeDunGen
-      biomeTemplate: CP14CavesGeneric
-      tileMask:
-      - CP14FloorBase
-    - !type:BiomeDunGen
-      biomeTemplate: CP14Wastelands
-      tileMask:
-      - CP14FloorGrass
-    - !type:BiomeDunGen
-      biomeTemplate: CP14Wastelands
-      tileMask:
-      - CP14FloorSand
-
+  # Masks
+  - !type:NoiseDistanceDunGen
+    size: 160, 160
+    distanceConfig: !type:DunGenEuclideanSquaredDistance
+      blendWeight: 0.7
+    layers:
+    - tile: CP14FloorSand
+      threshold: 0.50
+      noise:
+        frequency: 0.010
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        octaves: 5
+        lacunarity: 2
+        gain: 0.5
+  - !type:NoiseDistanceDunGen
+    size: 150, 150
+    distanceConfig: !type:DunGenEuclideanSquaredDistance
+      blendWeight: 0.6
+    layers:
+    - tile: CP14FloorGrass
+      threshold: 0.50
+      noise:
+        frequency: 0.010
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        octaves: 5
+        lacunarity: 2
+        gain: 0.5
+  - !type:NoiseDistanceDunGen
+    size: 110, 110
+    distanceConfig: !type:DunGenEuclideanSquaredDistance
+      blendWeight: 0.5
+    layers:
+    - tile: CP14FloorBase
+      threshold: 0.50
+      noise:
+        frequency: 0.010
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        octaves: 5
+        lacunarity: 2
+        gain: 0.5
+  # Biomes
+  - !type:BiomeDunGen
+    biomeTemplate: CP14CavesGeneric
+    tileMask:
+    - CP14FloorBase
+  - !type:BiomeDunGen
+    biomeTemplate: CP14Wastelands
+    tileMask:
+    - CP14FloorGrass
+  - !type:BiomeDunGen
+    biomeTemplate: CP14Wastelands
+    tileMask:
+    - CP14FloorSand

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/misc.yml

@@ -1,6 +1,6 @@
 # TIER 1
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: Lava
   levels:
     min: 2
@@ -20,51 +20,4 @@
       minGroupSize: 3
       maxGroupSize: 5
 
-# TIER 2
-
-- type: cp14DemiplaneModifier
-  id: Explosive
-  levels:
-    min: 5
-    max: 10
-  name: cp14-modifier-explosive
-  generationWeight: 0.25
-  categories:
-    Danger: 0.2
-  layers:
-    - !type:CP14OreDunGen
-      entity: LandMineExplosive
-      count: 20
-      minGroupSize: 1
-      maxGroupSize: 2
-
-- type: cp14DemiplaneModifier
-  id: ShadowKudzu
-  levels:
-    min: 5
-    max: 10
-  name: cp14-modifier-shadow-kudzu
-  categories:
-    Danger: 0.25
-  layers:
-    - !type:CP14OreDunGen
-      entity: CP14AstralHaze
-      count: 10
-      minGroupSize: 1
-      maxGroupSize: 1
-
-- type: cp14DemiplaneModifier
-  id: AdditionalEntry
-  levels:
-    min: 2
-    max: 10
-  name: cp14-modifier-additional-entry
-  categories:
-    Danger: 0.15
-  generationProb: 0.8
-  generationWeight: 0.25
-  layers:
-    - !type:CP14RoomsDunGen
-      count: 1
-      tags:
-      - CP14DemiplanEnterRoom
+# TIER 2

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml

@@ -1,9 +1,9 @@
 # TIER 1
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: EnemyZombie
   levels:
-    min: 1
+    min: 0
     max: 6
   name: cp14-modifier-zombie
   generationWeight: 1.5
@@ -18,10 +18,10 @@
       minGroupSize: 3
       maxGroupSize: 5
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: EnemyDyno
   levels:
-    min: 3
+    min: 2
     max: 8
   name: cp14-modifier-dyno
   categories:
@@ -36,10 +36,10 @@
       minGroupSize: 1
       maxGroupSize: 2
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: MonsterMosquito
   levels:
-    min: 1
+    min: 0
     max: 5
   name: cp14-modifier-dyno
   categories:
@@ -48,6 +48,7 @@
   - CP14DemiplaneHerbals
   blacklistTags:
   - CP14DemiplaneHot
+  - CP14DemiplaneCold
   layers:
     - !type:CP14OreDunGen
       entity: CP14SpawnMobMonsterMosquito
@@ -55,10 +56,10 @@
       minGroupSize: 2
       maxGroupSize: 6
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: Fairy
   levels:
-    min: 2
+    min: 0
     max: 5
   categories:
     Danger: 0.20
@@ -71,10 +72,10 @@
       minGroupSize: 2
       maxGroupSize: 3
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: SmallHydra
   levels:
-    min: 1
+    min: 0
     max: 5
   name: cp14-modifier-dyno
   categories:
@@ -88,10 +89,10 @@
       minGroupSize: 2
       maxGroupSize: 3
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: EnemyFlem
   levels:
-    min: 1
+    min: 0
     max: 8
   name: cp14-modifier-flem
   generationWeight: 0.33
@@ -109,10 +110,10 @@
 
 # TIER 2
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: EnemyMole
   levels:
-    min: 6
+    min: 1
     max: 10
   name: cp14-modifier-mole
   categories:
@@ -126,10 +127,10 @@
       minGroupSize: 1
       maxGroupSize: 3
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: EnemyIceSpectre
   levels:
-    min: 6
+    min: 0
     max: 10
   name: cp14-modifier-zombie
   categories:
@@ -145,27 +146,10 @@
       minGroupSize: 1
       maxGroupSize: 3
 
-#- type: cp14DemiplaneModifier #Removed to Whistler rebalance
-#  id: EnemyInvisibleWhistler
-#  levels:
-#    min: 6
-#    max: 10
-#  name: cp14-modifier-invisible-whistler
-#  categories:
-#    Danger: 0.4
-#  requiredTags:
-#  - CP14DemiplaneUnderground
-#  layers:
-#    - !type:CP14OreDunGen
-#      entity: CP14MobMonsterInvisibleWhistler
-#      count: 2
-#      minGroupSize: 1
-#      maxGroupSize: 2
-
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: MobSlimeElectric
   levels:
-    min: 5
+    min: 1
     max: 10
   name: cp14-modifier-slime
   categories:
@@ -177,10 +161,10 @@
       minGroupSize: 1
       maxGroupSize: 1
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: MobSlimeFire
   levels:
-    min: 4
+    min: 2
     max: 10
   name: cp14-modifier-slime
   categories:
@@ -194,10 +178,10 @@
       minGroupSize: 1
       maxGroupSize: 2
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: MobSlimeIce
   levels:
-    min: 1
+    min: 0
     max: 10
   name: cp14-modifier-slime
   categories:
@@ -211,10 +195,10 @@
       minGroupSize: 1
       maxGroupSize: 2
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: MobSlimeBase
   levels:
-    min: 1
+    min: 0
     max: 5
   categories:
     Danger: 0.25
@@ -225,10 +209,10 @@
       minGroupSize: 1
       maxGroupSize: 2
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: MobWatcherIce
   levels:
-    min: 3
+    min: 1
     max: 10
   name: cp14-modifier-watcher
   categories:
@@ -244,10 +228,10 @@
       minGroupSize: 2
       maxGroupSize: 3
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: MobWatcherMagma
   levels:
-    min: 3
+    min: 1
     max: 10
   name: cp14-modifier-watcher
   categories:
@@ -263,7 +247,7 @@
       minGroupSize: 2
       maxGroupSize: 3
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: MobSpiders
   levels:
     min: 1
@@ -290,10 +274,10 @@
       minGroupSize: 5
       maxGroupSize: 15
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: MobBigBear
   levels:
-    min: 5
+    min: 2
     max: 10
   categories:
     Danger: 0.5
@@ -307,10 +291,10 @@
       minGroupSize: 1
       maxGroupSize: 1
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: MyconideFlyagaric
   levels:
-    min: 1
+    min: 0
     max: 10
   categories:
     Danger: 0.3
@@ -320,13 +304,13 @@
     - !type:CP14OreDunGen
       entity: CP14MobMonsterMyconideFlyagaric
       count: 5
-      minGroupSize: 8
-      maxGroupSize: 14
+      minGroupSize: 7
+      maxGroupSize: 12
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: MyconideLumish
   levels:
-    min: 1
+    min: 0
     max: 10
   categories:
     Danger: 0.3
@@ -336,5 +320,5 @@
     - !type:CP14OreDunGen
       entity: CP14MobMonsterMyconideLumish
       count: 5
-      minGroupSize: 8
-      maxGroupSize: 14
+      minGroupSize: 7
+      maxGroupSize: 12

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Fun/lol.yml

@@ -1,7 +1,7 @@
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: RoyalPumpkin
   levels:
-    min: 1
+    min: 0
     max: 10
   generationWeight: 0.1
   generationProb: 0.1
@@ -21,10 +21,10 @@
       minGroupSize: 1
       maxGroupSize: 1
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: LucenTree
   levels:
-    min: 6
+    min: 0
     max: 10
   generationWeight: 0.1
   generationProb: 0.1
@@ -44,10 +44,10 @@
       minGroupSize: 1
       maxGroupSize: 1
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: StatueStoneHead
   levels:
-    min: 2
+    min: 0
     max: 6
   generationWeight: 0.1
   generationProb: 0.1

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/GhostRoleDanger/misc.yml

@@ -1,4 +1,4 @@
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: EnemySkeletonT1
   levels:
     min: 2
@@ -15,7 +15,7 @@
       minGroupSize: 1
       maxGroupSize: 3
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: EnemySkeletonT2
   levels:
     min: 4
@@ -31,10 +31,10 @@
       minGroupSize: 2
       maxGroupSize: 3
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: EnemyLurker
   levels:
-    min: 2
+    min: 0
     max: 10
   generationWeight: 0.33
   generationProb: 0.25

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/MapLight/mapLight.yml

@@ -1,7 +1,7 @@
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: MapLightDarkness
   levels:
-    min: 3
+    min: 2
     max: 10
   generationWeight: 2
   categories:
@@ -11,10 +11,10 @@
   - type: MapLight
     ambientLightColor: "#000000"
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: MapLightDarkRed
   levels:
-    min: 5
+    min: 3
     max: 10
   categories:
     MapLight: 1
@@ -23,7 +23,7 @@
   - type: MapLight
     ambientLightColor: "#0f0104"
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: MapLightDarkPurple
   levels:
     min: 1
@@ -35,7 +35,7 @@
   - type: MapLight
     ambientLightColor: "#09010f"
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: MapLightDarkGreen
   levels:
     min: 1
@@ -47,7 +47,7 @@
   - type: MapLight
     ambientLightColor: "#000502"
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: MapLightDarkNight
   levels:
     min: 1
@@ -61,10 +61,10 @@
 
 # Open sky time entries
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: MapLightCycleDefault
   levels:
-    min: 1
+    min: 0
     max: 10
   categories:
     MapLight: 1
@@ -74,10 +74,10 @@
   components:
   - type: LightCycle
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: MapLightCycleCold
   levels:
-    min: 1
+    min: 0
     max: 10
   categories:
     MapLight: 1
@@ -89,10 +89,10 @@
   - type: LightCycle
     originalColor: "#7bc2e0"
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: MapLightCycleHot
   levels:
-    min: 1
+    min: 0
     max: 10
   categories:
     MapLight: 1
@@ -103,10 +103,10 @@
   - type: LightCycle
     originalColor: "#ff8929"
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: MapLightCycleHot2
   levels:
-    min: 1
+    min: 0
     max: 10
   categories:
     MapLight: 1

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Ore/ores.yml

@@ -1,9 +1,9 @@
 # TIER 1
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: IronOre
   levels:
-    min: 1
+    min: 0
     max: 10
   name: cp14-modifier-iron-ore
   unique: false
@@ -21,10 +21,10 @@
       minGroupSize: 2
       maxGroupSize: 4
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: IronOreUnderground
   levels:
-    min: 1
+    min: 0
     max: 10
   name: cp14-modifier-iron-ore
   unique: false
@@ -42,10 +42,10 @@
       minGroupSize: 4
       maxGroupSize: 6
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: CopperOre
   levels:
-    min: 1
+    min: 0
     max: 5
   name: cp14-modifier-copper-ore
   unique: false
@@ -63,10 +63,10 @@
       minGroupSize: 2
       maxGroupSize: 4
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: CopperOreUnderground
   levels:
-    min: 1
+    min: 0
     max: 5
   name: cp14-modifier-copper-ore
   unique: false
@@ -84,10 +84,10 @@
       minGroupSize: 4
       maxGroupSize: 6
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: CoalOre
   levels:
-    min: 1
+    min: 0
     max: 8
   name: cp14-modifier-coal-ore
   unique: false
@@ -105,10 +105,10 @@
       minGroupSize: 4
       maxGroupSize: 6
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: CoalOreUnderground
   levels:
-    min: 1
+    min: 0
     max: 8
   name: cp14-modifier-copper-ore
   unique: false
@@ -128,7 +128,7 @@
 
 # TIER 2
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: GoldOre
   levels:
     min: 2
@@ -147,10 +147,10 @@
       minGroupSize: 1
       maxGroupSize: 2
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: MithrilOre
   levels:
-    min: 3
+    min: 2
     max: 10
   name: cp14-modifier-mithril-ore
   unique: false
@@ -168,10 +168,10 @@
       minGroupSize: 2
       maxGroupSize: 4
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: MithrilOreUnderground
   levels:
-    min: 3
+    min: 2
     max: 10
   name: cp14-modifier-mithril-ore
   unique: false

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/crystals.yml

@@ -1,24 +1,21 @@
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: Quartz
   levels:
-    min: 1
+    min: 0
     max: 10
   categories:
     Reward: 0.15
   layers:
     - !type:CP14OreDunGen
-      tileMask:
-      - CP14FloorBase
-      - CP14FloorIce
       entity: CP14CrystalQuartz
       count: 30
       minGroupSize: 1
       maxGroupSize: 5
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: CP14CrystalQuartzEarth
   levels:
-    min: 1
+    min: 0
     max: 10
   generationWeight: 0.1
   requiredTags:
@@ -27,18 +24,15 @@
     Reward: 0.15
   layers:
     - !type:CP14OreDunGen
-      tileMask:
-      - CP14FloorBase
-      - CP14FloorIce
       entity: CP14CrystalQuartzEarth
       count: 15
       minGroupSize: 1
       maxGroupSize: 2
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: CP14CrystalQuartzFire
   levels:
-    min: 1
+    min: 0
     max: 10
   generationWeight: 0.1
   requiredTags:
@@ -47,18 +41,15 @@
     Reward: 0.15
   layers:
     - !type:CP14OreDunGen
-      tileMask:
-      - CP14FloorBase
-      - CP14FloorIce
       entity: CP14CrystalQuartzFire
       count: 15
       minGroupSize: 1
       maxGroupSize: 2
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: CP14CrystalQuartzWater
   levels:
-    min: 1
+    min: 0
     max: 10
   generationWeight: 0.1
   requiredTags:
@@ -67,18 +58,15 @@
     Reward: 0.15
   layers:
     - !type:CP14OreDunGen
-      tileMask:
-      - CP14FloorBase
-      - CP14FloorIce
       entity: CP14CrystalQuartzWater
       count: 15
       minGroupSize: 1
       maxGroupSize: 2
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: CP14CrystalQuartzAir
   levels:
-    min: 1
+    min: 0
     max: 10
   generationWeight: 0.1
   requiredTags:
@@ -87,45 +75,36 @@
     Reward: 0.15
   layers:
     - !type:CP14OreDunGen
-      tileMask:
-      - CP14FloorBase
-      - CP14FloorIce
       entity: CP14CrystalQuartzAir
       count: 15
       minGroupSize: 1
       maxGroupSize: 2
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: CP14CrystalQuartzOrder
   levels:
-    min: 1
+    min: 0
     max: 10
   generationWeight: 0.1
   categories:
     Reward: 0.15
   layers:
     - !type:CP14OreDunGen
-      tileMask:
-      - CP14FloorBase
-      - CP14FloorIce
       entity: CP14CrystalQuartzOrder
       count: 15
       minGroupSize: 1
       maxGroupSize: 2
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: CP14CrystalQuartzChaos
   levels:
-    min: 1
+    min: 0
     max: 10
   generationWeight: 0.1
   categories:
     Reward: 0.15
   layers:
     - !type:CP14OreDunGen
-      tileMask:
-      - CP14FloorBase
-      - CP14FloorIce
       entity: CP14CrystalQuartzChaos
       count: 15
       minGroupSize: 1

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/herbals.yml

@@ -1,7 +1,7 @@
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: Dayflin
   levels:
-    min: 1
+    min: 0
     max: 10
   name: cp14-modifier-dayflin
   categories:
@@ -20,10 +20,10 @@
       minGroupSize: 3
       maxGroupSize: 5
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: SilverNeedle
   levels:
-    min: 1
+    min: 0
     max: 10
   name: cp14-modifier-silver-needle
   categories:
@@ -41,10 +41,10 @@
       minGroupSize: 3
       maxGroupSize: 5
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: FlyAgaric
   levels:
-    min: 1
+    min: 0
     max: 10
   name: cp14-modifier-fly-agaric
   categories:
@@ -65,10 +65,10 @@
       minGroupSize: 3
       maxGroupSize: 5
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: FlyAgaric2
   levels:
-    min: 1
+    min: 0
     max: 10
   name: cp14-modifier-fly-agaric
   categories:
@@ -85,10 +85,10 @@
       minGroupSize: 6
       maxGroupSize: 10
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: BlueAmanita
   levels:
-    min: 1
+    min: 0
     max: 10
   name: cp14-modifier-blue-amanita
   categories:
@@ -106,10 +106,10 @@
       minGroupSize: 3
       maxGroupSize: 5
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: BloodFlower
   levels:
-    min: 1
+    min: 0
     max: 10
   name: cp14-modifier-blood-flower
   categories:
@@ -127,10 +127,10 @@
       minGroupSize: 3
       maxGroupSize: 5
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: WildSage
   levels:
-    min: 1
+    min: 0
     max: 10
   name: cp14-modifier-wild-sage
   categories:
@@ -149,10 +149,10 @@
       minGroupSize: 3
       maxGroupSize: 5
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: AirLily
   levels:
-    min: 1
+    min: 0
     max: 10
   name: cp14-modifier-air-lily
   categories:
@@ -170,12 +170,10 @@
       minGroupSize: 1
       maxGroupSize: 2
 
-# TIER 2
-
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: LumiShroom
   levels:
-    min: 4
+    min: 0
     max: 10
   name: cp14-modifier-lumisroom
   categories:
@@ -201,10 +199,10 @@
       minGroupSize: 3
       maxGroupSize: 5
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: LumiShroom2
   levels:
-    min: 4
+    min: 0
     max: 10
   name: cp14-modifier-lumisroom
   categories:

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/misc.yml

@@ -1,9 +1,9 @@
 # TIER 1
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: LootT1
   levels:
-    min: 1
+    min: 0
     max: 3
   generationWeight: 2
   categories:
@@ -15,10 +15,10 @@
       minGroupSize: 2
       maxGroupSize: 3
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: Rabbits
   levels:
-    min: 1
+    min: 0
     max: 10
   name: cp14-modifier-rabbits
   generationWeight: 0.4
@@ -33,10 +33,10 @@
       minGroupSize: 2
       maxGroupSize: 3
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: Boar
   levels:
-    min: 1
+    min: 0
     max: 10
   name: cp14-modifier-boars
   generationWeight: 0.4
@@ -51,10 +51,10 @@
       minGroupSize: 2
       maxGroupSize: 3
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: Frog
   levels:
-    min: 1
+    min: 0
     max: 10
   generationWeight: 0.4
   categories:
@@ -72,10 +72,10 @@
       minGroupSize: 2
       maxGroupSize: 3
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: Sheep
   levels:
-    min: 1
+    min: 0
     max: 10
   name: cp14-modifier-sheeps
   generationWeight: 0.4
@@ -92,10 +92,10 @@
 
 # TIER 2
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: LootT2
   levels:
-    min: 5
+    min: 2
     max: 10
   generationWeight: 2
   categories:

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Reward/rooms.yml

@@ -1,7 +1,7 @@
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: ArtifactRoom
   levels:
-    min: 3
+    min: 1
     max: 10
   generationWeight: 2
   categories:
@@ -12,7 +12,7 @@
       tags:
       - CP14DemiplaneArtifactRoom
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: Ruins
   levels:
     min: 0
@@ -27,7 +27,7 @@
       tags:
       - CP14DemiplaneRuins
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: Geodes
   levels:
     min: 0

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Weather/weather.yml

@@ -1,11 +1,17 @@
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: WeatherNone
+  levels:
+    min: 1
+    max: 10
   generationWeight: 3
   categories:
     Weather: 1
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: WeatherInfinityMist
+  levels:
+    min: 1
+    max: 10
   categories:
     Weather: 1
   components:
@@ -13,8 +19,11 @@
     entries:
     - visuals: CP14Mist
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: WeatherRain
+  levels:
+    min: 0
+    max: 10
   categories:
     Weather: 1
   requiredTags:
@@ -31,10 +40,10 @@
         min: 180
         max: 240
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: WeatherInfinityStorm
   levels:
-    min: 3
+    min: 2
     max: 10
   name: cp14-modifier-storm
   categories:
@@ -51,11 +60,11 @@
       tags:
       - CP14DemiplaneRuins
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: WeatherSnow
   levels:
-    min: 1
-    max: 4
+    min: 0
+    max: 10
   categories:
     Weather: 1
   requiredTags:
@@ -63,6 +72,10 @@
   components:
   - type: CP14WeatherController
     entries:
+    - visuals: null
+      duration:
+        min: 30
+        max: 120
     - visuals: CP14SnowLight
       duration:
         min: 30
@@ -72,10 +85,10 @@
         min: 30
         max: 180
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: WeatherSnowHeavy
   levels:
-    min: 5
+    min: 1
     max: 10
   name: cp14-modifier-snow-storm
   categories:
@@ -99,11 +112,11 @@
       tags:
       - CP14DemiplaneRuins
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: CP14ManaMist
   name: cp14-modifier-mana-mist
   levels:
-    min: 0
+    min: 1
     max: 10
   categories:
     Weather: 1
@@ -117,11 +130,11 @@
       tags:
       - CP14DemiplaneRuins
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: CP14AntiManaMist
   name: cp14-modifier-anti-mana-mist
   levels:
-    min: 4
+    min: 1
     max: 10
   categories:
     Weather: 1
@@ -135,11 +148,11 @@
       tags:
       - CP14DemiplaneRuins
 
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: CP14FireStormPeriod
   name: cp14-modifier-fire-storm
   levels:
-    min: 4
+    min: 2
     max: 10
   requiredTags:
   - CP14DemiplaneHot

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

@@ -1,21 +1,21 @@
-- type: cp14DemiplaneModifierCategory
+- type: cp14LocationModifierCategory
   id: Danger
 
-- type: cp14DemiplaneModifierCategory
+- type: cp14LocationModifierCategory
   id: GhostRoleDanger
 
-- type: cp14DemiplaneModifierCategory
+- type: cp14LocationModifierCategory
   id: Reward
 
-- type: cp14DemiplaneModifierCategory
+- type: cp14LocationModifierCategory
   id: Ore
 
-- type: cp14DemiplaneModifierCategory
+- type: cp14LocationModifierCategory
   id: Fun
 
-- type: cp14DemiplaneModifierCategory
+- type: cp14LocationModifierCategory
   id: Weather
 
-- type: cp14DemiplaneModifierCategory
+- type: cp14LocationModifierCategory
   id: MapLight
 

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

@@ -0,0 +1,35 @@
+- 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

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

@@ -1,36 +1,4 @@
-- type: cp14DemiplaneModifier
-  id: EntryRoom
-  generationProb: 0
-  layers:
-    - !type:CP14RoomsDunGen
-      count: 1
-      tags:
-      - CP14DemiplanEnterRoom
-
-- type: cp14DemiplaneModifier
-  id: Core
-  generationProb: 0
-  layers:
-    - !type:CP14RoomsDunGen
-      count: 1
-      tags:
-      - CP14DemiplanCoreRoom
-
-- type: cp14DemiplaneModifier
-  id: Exit
-  generationProb: 0
-  layers:
-    - !type:CP14RoomsDunGen
-      count: 1
-      tags:
-      - CP14DemiplanExitRoom
-    - !type:CP14OreDunGen
-      entity: CP14DemiplaneHint
-      count: 20
-      minGroupSize: 1
-      maxGroupSize: 1
-
-- type: cp14DemiplaneModifier
+- type: cp14LocationModifier
   id: DemiplaneDecor
   generationProb: 0
   layers:
@@ -49,3 +17,16 @@
       minGroupSize: 3
       maxGroupSize: 5
 
+- type: cp14LocationModifier
+  id: RaidSpawners
+  generationProb: 0
+  layers:
+    - !type:CP14OreDunGen
+      entity: CP14VentCritterMarker
+      tileMask:
+      - CP14FloorSand
+      - CP14FloorBase
+      - CP14FloorSnow
+      count: 8
+      minGroupSize: 3
+      maxGroupSize: 3

Resources/Prototypes/_CP14/Procedural/Demiplane/Rooms/location_connections.yml

@@ -0,0 +1,86 @@
+- 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

Resources/Prototypes/_CP14/Procedural/Demiplane/Special/misc.yml

@@ -1,72 +0,0 @@
-- type: cp14SpecialDemiplane
-  id: Ensure4Entry1
-  levels:
-    min: 1
-    max: 1
-
-- type: cp14SpecialDemiplane
-  id: Ensure4Entry2
-  levels:
-    min: 1
-    max: 1
-
-- type: cp14SpecialDemiplane
-  id: Ensure4Entry3
-  levels:
-    min: 1
-    max: 1
-
-- type: cp14SpecialDemiplane
-  id: Ensure4Entry4
-  levels:
-    min: 1
-    max: 1
-
-- type: cp14SpecialDemiplane
-  id: Test
-  levels:
-    min: 5
-    max: 5
-
-- type: cp14SpecialDemiplane
-  id: Test2
-  levels:
-    min: 5
-    max: 5
-
-- type: cp14SpecialDemiplane
-  id: Test3
-  levels:
-    min: 5
-    max: 5
-
-- type: cp14SpecialDemiplane
-  id: Test4
-  levels:
-    min: 5
-    max: 5
-
-- type: cp14SpecialDemiplane
-  id: Test5
-  levels:
-    min: 5
-    max: 5
-
-- type: cp14SpecialDemiplane
-  id: Test6
-  levels:
-    min: 5
-    max: 5
-
-- type: cp14SpecialDemiplane
-  id: Test7
-  levels:
-    min: 9
-    max: 9
-
-- type: cp14SpecialDemiplane
-  id: Test8
-  levels:
-    min: 9
-    max: 9
-

Resources/Prototypes/_CP14/Trading/BuyPositions/thaumaturgy.yml

@@ -145,18 +145,6 @@
   service: !type:CP14BuyItemsService
     product: CP14ManaOperationGlove
 
-- type: cp14TradingPosition
-  id: CP14SpellScrollDemiplaneInfiltration
-  priceMarkup: 5 #Unique trade spells
-  faction: Thaumaturgy
-  reputationLevel: 1
-  uiPosition: 6
-  icon:
-    sprite: _CP14/Actions/Spells/dimension.rsi
-    state: rift_arrow
-  service: !type:CP14BuyItemsService
-    product: CP14SpellScrollDemiplaneInfiltration
-
 - type: cp14TradingPosition
   id: CP14SpellScrollEarthWall
   faction: Thaumaturgy

Resources/Prototypes/_CP14/game_presets.yml

@@ -33,14 +33,13 @@
     #- CP14RoundObjectivesRule
     - CP14BasicStationEventScheduler
 
-- type: gamePreset
-  id: CP14JudgmentNight
-  name: cp14-judge-night-title
-  description: cp14-judge-night-desc
-  showInVote: true
-  cP14Allowed: true
-  rules:
-    #- CP14RoundObjectivesRule
-    - CP14BasicStationEventScheduler
-    - CP14BloodMoonRule
-
+#- type: gamePreset
+#  id: CP14Survival
+#  name: cp14-gamemode-survival-title
+#  description: cp14-gamemode-survival-description
+#  showInVote: true
+#  cP14Allowed: true
+#  supportedMaps: ShipMapPool
+#  rules:
+#    - Sandbox
+#    - CP14CrashToWindlandsRule