Demiplan examination (#578)

* demiplan examining * cargo demiplanes update * Update positions_buy.ftl * Update crates.yml
2024-11-12 13:33:19 +03:00
parent b106554cfe
commit df4900e148
20 changed files with 207 additions and 42 deletions
--- a/Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Cargo/crates.yml
@@ -59,4 +59,20 @@
      - id: CP14SeedCucumber
        amount: 3
      - id: CP14SeedTomato
-        amount: 3
+        amount: 3
+
+- type: entity
+  parent: CP14BrassChest
+  id: CP14BrassChestFilledDemiplanes
+  suffix: Demiplanes
+  components:
+  - type: StorageFill
+    contents:
+      - id: CP14DemiplanKey
+        amount: 9
+      - id: CP14DemiplanKey
+        amount: 1
+        prob: 0.5
+      - id: CP14DemiplanKey
+        amount: 1
+        prob: 0.5
--- a/Resources/Prototypes/_CP14/Entities/subdimensionGenTEST.yml
+++ b/Resources/Prototypes/_CP14/Entities/subdimensionGenTEST.yml
@@ -26,26 +26,6 @@
    difficultyLimit: 0.75
    maxModifiers: 6

- type: entity
-  id: CP14DemiplanKeyHard
-  parent: CP14BaseSubdimensionalKey
-  name: hard demiplan key - hard
-  components:
-  - type: CP14DemiplaneGeneratorData
-    rewardLimit: 2.25
-    difficultyLimit: 1.75
-    maxModifiers: 10
-
- type: entity
-  id: CP14DemiplanKeyHardcore
-  parent: CP14BaseSubdimensionalKey
-  name: demiplan key - HARDCORE
-  components: 
-  - type: CP14DemiplaneGeneratorData
-    rewardLimit: 4.25
-    difficultyLimit: 2.75
-    maxModifiers: 15
-
 - type: entity
  id: CP14DemiplanRiftCore
  categories: [ ForkFiltered ]
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_caves.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_caves.yml
@@ -1,6 +1,7 @@
 - type: cp14DemiplaneLocation
  id: T1Caves
  locationConfig: CP14DemiplaneCaves
+  name: cp14-demiplane-location-cave
  tags:
  - CP14DemiplaneCave
  - CP14DemiplaneUnderground
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_caves_ring.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_caves_ring.yml
@@ -1,6 +1,7 @@
 - type: cp14DemiplaneLocation
  id: T1CavesRing
  locationConfig: CP14DemiplaneCavesRing
+  name: cp14-demiplane-location-cave
  tags:
  - CP14DemiplaneCave
  - CP14DemiplaneUnderground
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grass_geode.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grass_geode.yml
@@ -1,6 +1,7 @@
 - type: cp14DemiplaneLocation
  id: T1GrassGeode
  locationConfig: CP14DemiplaneGrassGeode
+  name: cp14-demiplane-location-cave-grass
  tags:
  - CP14DemiplaneCave
  - CP14DemiplaneGrass
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grassland_island.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grassland_island.yml
@@ -1,6 +1,7 @@
 - type: cp14DemiplaneLocation
  id: T1GrasslandIsland
  locationConfig: CP14DemiplaneGrasslandIsland
+  name: cp14-demiplane-location-grassland-island
  tags:
  - CP14DemiplaneCave
  - CP14DemiplaneOpenSky
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grassland_island_ring.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Locations/t1_grassland_island_ring.yml
@@ -1,6 +1,7 @@
 - type: cp14DemiplaneLocation
  id: T1GrasslandIslandRing
  locationConfig: CP14DemiplaneGrasslandIslandRing
+  name: cp14-demiplane-location-grassland-island
  tags:
  - CP14DemiplaneOpenSky
  - CP14DemiplaneGrass
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/test.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/test.yml
@@ -1,5 +1,6 @@
 - type: cp14DemiplaneModifier
  id: GoldOre
+  name: cp14-modifier-gold-ore
  unique: false
  reward: 0.5
  requiredTags:
@@ -15,6 +16,7 @@

 - type: cp14DemiplaneModifier
  id: IronOre
+  name: cp14-modifier-iron-ore
  unique: false
  reward: 0.4
  requiredTags:
@@ -30,6 +32,7 @@

 - type: cp14DemiplaneModifier
  id: CopperOre
+  name: cp14-modifier-copper-ore
  unique: false
  reward: 0.3
  requiredTags:
@@ -45,6 +48,7 @@

 - type: cp14DemiplaneModifier
  id: QuartzCrystal
+  name: cp14-modifier-quartz-crystal
  reward: 0.1
  requiredTags:
  - CP14DemiplaneCave
@@ -59,6 +63,7 @@

 - type: cp14DemiplaneModifier
  id: QuartzCrystalRubies
+  name: cp14-modifier-quartz-crystal
  reward: 0.2
  generationWeight: 0.1
  requiredTags:
@@ -75,6 +80,7 @@

 - type: cp14DemiplaneModifier
  id: QuartzCrystalTopazes
+  name: cp14-modifier-quartz-crystal
  reward: 0.2
  generationWeight: 0.1
  requiredTags:
@@ -91,6 +97,7 @@

 - type: cp14DemiplaneModifier
  id: QuartzCrystalEmeralds
+  name: cp14-modifier-quartz-crystal
  reward: 0.2
  generationWeight: 0.1
  requiredTags:
@@ -109,6 +116,7 @@

 - type: cp14DemiplaneModifier
  id: QuartzCrystalSapphires
+  name: cp14-modifier-quartz-crystal
  reward: 0.2
  generationWeight: 0.1
  requiredTags:
@@ -127,6 +135,7 @@

 - type: cp14DemiplaneModifier
  id: QuartzCrystalAmethysts
+  name: cp14-modifier-quartz-crystal
  reward: 0.2
  generationWeight: 0.1
  requiredTags:
@@ -143,6 +152,7 @@

 - type: cp14DemiplaneModifier
  id: QuartzCrystalDiamonds
+  name: cp14-modifier-quartz-crystal
  reward: 0.2
  generationWeight: 0.1
  requiredTags:
@@ -160,6 +170,7 @@

 - type: cp14DemiplaneModifier
  id: Dayflin
+  name: cp14-modifier-dayflin
  reward: 0.2
  requiredTags:
  - CP14DemiplaneGrass
@@ -175,8 +186,27 @@
      minGroupSize: 3
      maxGroupSize: 5

+- type: cp14DemiplaneModifier
+  id: FlyAgaric
+  name: cp14-modifier-fly-agaric
+  reward: 0.2
+  requiredTags:
+  - CP14DemiplaneGrass
+  layers:
+    - !type:OreDunGen
+      tileMask: 
+      - CP14FloorBase
+      - CP14FloorGrass
+      - CP14FloorGrassLight
+      - CP14FloorGrassTall
+      entity: CP14GatherableFlyAgaric
+      count: 10
+      minGroupSize: 3
+      maxGroupSize: 5
+
 - type: cp14DemiplaneModifier
  id: BlueAmanita
+  name: cp14-modifier-blue-amanita
  reward: 0.2
  requiredTags:
  - CP14DemiplaneGrass
@@ -193,6 +223,7 @@

 - type: cp14DemiplaneModifier
  id: BloodFlower
+  name: cp14-modifier-blood-flower
  reward: 0.2
  requiredTags:
  - CP14DemiplaneGrass
@@ -209,6 +240,7 @@

 - type: cp14DemiplaneModifier
  id: WildSage
+  name: cp14-modifier-wild-sage
  reward: 0.2
  requiredTags:
  - CP14DemiplaneGrass
@@ -226,6 +258,7 @@

 - type: cp14DemiplaneModifier
  id: LumiShroom
+  name: cp14-modifier-lumisroom
  reward: 0.2
  requiredTags:
  - CP14DemiplaneUnderground
@@ -243,6 +276,7 @@

 - type: cp14DemiplaneModifier
  id: Explosive
+  name: cp14-modifier-explosive
  difficulty: 0.4
  generationWeight: 0.25
  layers:
@@ -254,6 +288,7 @@

 - type: cp14DemiplaneModifier
  id: Ruins
+  name: cp14-modifier-ruins
  reward: 0.35
  generationWeight: 2
  layers:
@@ -265,6 +300,7 @@

 - type: cp14DemiplaneModifier
  id: EnemyXeno
+  name: cp14-modifier-xeno
  difficulty: 0.5
  requiredTags:
  - CP14DemiplaneUnderground
@@ -282,6 +318,7 @@

 - type: cp14DemiplaneModifier
  id: EnemyZombie
+  name: cp14-modifier-zombie
  difficulty: 0.4
  generationWeight: 1.5
  layers:
@@ -293,6 +330,7 @@

 - type: cp14DemiplaneModifier
  id: EnemyDyno
+  name: cp14-modifier-dyno
  difficulty: 0.5
  requiredTags:
  - CP14DemiplaneOpenSky
@@ -306,6 +344,7 @@

 - type: cp14DemiplaneModifier
  id: SmallHydra
+  name: cp14-modifier-dyno
  difficulty: 0.5
  requiredTags:
  - CP14DemiplaneGrass
@@ -318,7 +357,8 @@

 - type: cp14DemiplaneModifier
  id: EnemyMole
-  difficulty: 0.5
+  name: cp14-modifier-mole
+  difficulty: 0.4
  requiredTags:
  - CP14DemiplaneUnderground
  - CP14DemiplaneCave
@@ -327,23 +367,13 @@
      tileMask: 
      - CP14FloorBase
      entity: CP14MobMonsterMole
-      count: 5
+      count: 6
      minGroupSize: 1
-      maxGroupSize: 2
-
- type: cp14DemiplaneModifier
-  id: EnemyMagmawind
-  difficulty: 0.3
-  generationWeight: 0.4
-  layers:
-    - !type:OreDunGen
-      entity: CP14MobWatcherMagmawing
-      count: 5
-      minGroupSize: 2
-      maxGroupSize: 3
+      maxGroupSize: 1

 - type: cp14DemiplaneModifier
  id: Rabbits
+  name: cp14-modifier-rabbits
  reward: 0.2
  generationWeight: 0.4
  requiredTags:
@@ -361,6 +391,7 @@

 - type: cp14DemiplaneModifier
  id: Boar
+  name: cp14-modifier-boars
  reward: 0.2
  difficulty: 0.2
  generationWeight: 0.4
@@ -379,6 +410,7 @@

 - type: cp14DemiplaneModifier
  id: Chasm
+  name: cp14-modifier-chasm
  difficulty: 0.2
  generationWeight: 0.6
  layers:
--- a/Resources/Prototypes/_CP14/Store/buy.yml
+++ b/Resources/Prototypes/_CP14/Store/buy.yml
@@ -63,10 +63,10 @@
      CP14BrassChestFilledFarmSeeds: 1

 - type: storePositionBuy
-  id: Demiplan
+  id: Demiplane
  name: cp14-store-buy-alchemy-demiplan-name
  desc: cp14-store-buy-alchemy-demiplan-desc
-  code: DEMIPLAN
+  code: DEMIPLANE
  icon: 
    sprite: /Textures/_CP14/Structures/Dungeon/demiplan_rift.rsi
    state: pulse
@@ -76,4 +76,4 @@
  services:
  - !type:CP14BuyItemsService
    product:
-      CP14DemiplanKey: 1
+      CP14BrassChestFilledDemiplanes: 1