demiplane modifiers

2024-12-12 00:58:55 +04:00
parent 06cb93fb1d
commit fc4f51f0dd
6 changed files with 100 additions and 64 deletions
--- a/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl
+++ b/Resources/Locale/en-US/_CP14/demiplane/modifiers.ftl
@@ -1,6 +1,7 @@
 cp14-modifier-gold-ore = gold ore
 cp14-modifier-iron-ore = iron ore
 cp14-modifier-copper-ore = copper ore
+cp14-modifier-glowing-iron-ore = glowing iron ore
 cp14-modifier-quartz-crystal = quartz crystals
 cp14-modifier-dayflin = dayflins
 cp14-modifier-fly-agaric = fly agaric
@@ -17,3 +18,4 @@ cp14-modifier-mole = predatory moles
 cp14-modifier-rabbits = rabbits
 cp14-modifier-boars = wild boars
 cp14-modifier-chasm = bottomless chasms
+cp14-modifier-glowing-tree = glowing trees
--- a/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl
+++ b/Resources/Locale/ru-RU/_CP14/demiplane/modifiers.ftl
@@ -1,6 +1,7 @@
 cp14-modifier-gold-ore = золотой руды
 cp14-modifier-iron-ore = железной руды
 cp14-modifier-copper-ore = медной руды
+cp14-modifier-glowing-iron-ore = руды сверкающего жезела
 cp14-modifier-quartz-crystal = кварцевых кристаллов
 cp14-modifier-dayflin = днецветов
 cp14-modifier-fly-agaric = мухоморов
@@ -17,3 +18,4 @@ cp14-modifier-mole = хищных кротов
 cp14-modifier-rabbits = кроликов
 cp14-modifier-boars = диких кабанов
 cp14-modifier-chasm = бездонных пропастей
+cp14-modifier-glowing-tree = сверкающих деревьев
--- a/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml
@@ -320,43 +320,3 @@
  - type: FoodSequenceElement
    entries:
      CP14Plate: CP14PlateTomatoesSlice
-
- type: entity
-  id: CP14FoodGlowingFruit
-  parent: FoodInjectableBase
-  categories: [ ForkFiltered ]
-  name: glowing fruit
-  description: Glowing Fruit. Exudes mana.
-  components:
-  - type: PointLight
-    radius: 1.3
-    energy: 2
-    color: "#87CEEB"
-  - type: Item
-    size: Tiny
-  - type: FlavorProfile
-    flavors:
-      - CP14Magic
-  - type: Sprite
-    sprite: _CP14/Objects/Flora/Farm/glowing_fruit.rsi
-    layers:
-      - state: base1
-        map: [ "random" ]
-  - type: RandomSprite
-    available:
-      - random:
-          base1: ""
-          base2: ""
-          base3: ""
-          base4: ""
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 11
-        reagents:
-        - ReagentId: Nutriment
-          Quantity: 4
-        - ReagentId: Vitamin
-          Quantity: 2
-        - ReagentId: CP14BlueAmanita
-          Quantity: 3
--- a/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Flora/wild.yml
@@ -221,7 +221,7 @@
  parent: CP14WildProduceBase
  name: blue Amanita
  description: A sky blue flower known for its medicinal and magical properties.
-  components: 
+  components:
  - type: Sprite
    sprite: _CP14/Objects/Flora/Wild/blue_amanita.rsi
    layers:
@@ -244,7 +244,7 @@
        reagents:
        - ReagentId: CP14BlueAmanita
          Quantity: 5
-  
+
 - type: entity
  id: CP14Dayflin
  parent: CP14WildProduceBase
@@ -272,4 +272,43 @@
        maxVol: 5
        reagents:
        - ReagentId: CP14YellowDayflinPulp
-          Quantity: 4
+          Quantity: 4
+
+- type: entity
+  id: CP14FoodGlowingFruit
+  parent: FoodInjectableBase
+  categories: [ ForkFiltered ]
+  name: glowing fruit
+  description: Glowing Fruit. Exudes mana.
+  components:
+  - type: Tag
+    tags:
+    - CP14FitInMortar
+  - type: PointLight
+    radius: 1.3
+    energy: 2
+    color: "#87CEEB"
+  - type: Item
+    size: Tiny
+  - type: FlavorProfile
+    flavors:
+      - CP14Magic
+  - type: Sprite
+    sprite: _CP14/Objects/Flora/Farm/glowing_fruit.rsi
+    layers:
+      - state: base1
+        map: [ "random" ]
+  - type: RandomSprite
+    available:
+      - random:
+          base1: ""
+          base2: ""
+          base3: ""
+          base4: ""
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: CP14BlueAmanita
+          Quantity: 4
--- a/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Walls/natural.yml
@@ -204,7 +204,7 @@
    base: wall

 - type: entity
-  id: CP14WallStoneShiningIronOre
+  id: CP14WallStoneGlowingIronOre
  suffix: glowing iron ore
  parent: CP14WallStone
  description: A solid stone natural wall. You see the shining particles in it.
--- a/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/test.yml
+++ b/Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/test.yml
@@ -7,13 +7,29 @@
  - CP14DemiplaneCave
  layers:
    - !type:OreDunGen
-      entityMask: 
+      entityMask:
      - CP14WallStone
      entity: CP14WallStoneGoldOre # Hellish gold 666
      count: 6
      minGroupSize: 6
      maxGroupSize: 6

+- type: cp14DemiplaneModifier
+  id: GlowingIronOre
+  name: cp14-modifier-glowing-iron-ore
+  unique: false
+  reward: 0.5
+  requiredTags:
+  - CP14DemiplaneCave
+  layers:
+    - !type:OreDunGen
+      entityMask:
+      - CP14WallStone
+      entity: CP14WallStoneGlowingIronOre
+      count: 6
+      minGroupSize: 6
+      maxGroupSize: 6
+
 - type: cp14DemiplaneModifier
  id: IronOre
  name: cp14-modifier-iron-ore
@@ -23,7 +39,7 @@
  - CP14DemiplaneCave
  layers:
    - !type:OreDunGen
-      entityMask: 
+      entityMask:
      - CP14WallStone
      entity: CP14WallStoneIronOre
      count: 5
@@ -39,7 +55,7 @@
  - CP14DemiplaneCave
  layers:
    - !type:OreDunGen
-      entityMask: 
+      entityMask:
      - CP14WallStone
      entity: CP14WallStoneCopperOre
      count: 10
@@ -54,7 +70,7 @@
  - CP14DemiplaneCave
  layers:
    - !type:OreDunGen
-      tileMask: 
+      tileMask:
      - CP14FloorBase
      entity: CP14QuartzCrystal
      count: 10
@@ -71,7 +87,7 @@
  - CP14DemiplaneUnderground
  layers:
    - !type:OreDunGen
-      tileMask: 
+      tileMask:
      - CP14FloorBase
      entity: CP14CrystalRubiesMedium
      count: 30
@@ -87,7 +103,7 @@
  - CP14DemiplaneCave
  layers:
    - !type:OreDunGen
-      tileMask: 
+      tileMask:
      - CP14FloorBase
      - CP14FloorSand
      entity: CP14CrystalTopazesMedium
@@ -104,7 +120,7 @@
  - CP14DemiplaneCave
  layers:
    - !type:OreDunGen
-      tileMask: 
+      tileMask:
      - CP14FloorBase
      - CP14FloorGrass
      - CP14FloorGrassLight
@@ -123,7 +139,7 @@
  - CP14DemiplaneCave
  layers:
    - !type:OreDunGen
-      tileMask: 
+      tileMask:
      - CP14FloorBase
      - CP14FloorGrass
      - CP14FloorGrassLight
@@ -143,7 +159,7 @@
  - CP14DemiplaneUnderground
  layers:
    - !type:OreDunGen
-      tileMask: 
+      tileMask:
      - CP14FloorBase
      entity: CP14CrystalAmethystsMedium
      count: 30
@@ -160,7 +176,7 @@
  - CP14DemiplaneUnderground
  layers:
    - !type:OreDunGen
-      tileMask: 
+      tileMask:
      - CP14FloorBase
      - CP14FloorSand
      entity: CP14CrystalDiamondsMedium
@@ -177,7 +193,7 @@
  - CP14DemiplaneOpenSky
  layers:
    - !type:OreDunGen
-      tileMask: 
+      tileMask:
      - CP14FloorGrass
      - CP14FloorGrassLight
      - CP14FloorGrassTall
@@ -194,7 +210,7 @@
  - CP14DemiplaneGrass
  layers:
    - !type:OreDunGen
-      tileMask: 
+      tileMask:
      - CP14FloorBase
      - CP14FloorGrass
      - CP14FloorGrassLight
@@ -212,7 +228,7 @@
  - CP14DemiplaneGrass
  layers:
    - !type:OreDunGen
-      tileMask: 
+      tileMask:
      - CP14FloorGrass
      - CP14FloorGrassLight
      - CP14FloorGrassTall
@@ -229,7 +245,7 @@
  - CP14DemiplaneGrass
  layers:
    - !type:OreDunGen
-      tileMask: 
+      tileMask:
      - CP14FloorGrass
      - CP14FloorGrassLight
      - CP14FloorGrassTall
@@ -247,7 +263,7 @@
  - CP14DemiplaneOpenSky
  layers:
    - !type:OreDunGen
-      tileMask: 
+      tileMask:
      - CP14FloorGrass
      - CP14FloorGrassLight
      - CP14FloorGrassTall
@@ -264,7 +280,7 @@
  - CP14DemiplaneUnderground
  layers:
    - !type:OreDunGen
-      tileMask: 
+      tileMask:
      - CP14FloorGrass
      - CP14FloorGrassLight
      - CP14FloorGrassTall
@@ -400,7 +416,7 @@
  - CP14DemiplaneCave
  layers:
    - !type:OreDunGen
-      tileMask: 
+      tileMask:
      - CP14FloorBase
      entity: CP14MobMonsterMole
      count: 6
@@ -416,7 +432,7 @@
  - CP14DemiplaneGrass
  layers:
    - !type:OreDunGen
-      tileMask: 
+      tileMask:
      - CP14FloorGrass
      - CP14FloorGrassLight
      - CP14FloorGrassTall
@@ -435,7 +451,7 @@
  - CP14DemiplaneGrass
  layers:
    - !type:OreDunGen
-      tileMask: 
+      tileMask:
      - CP14FloorGrass
      - CP14FloorGrassLight
      - CP14FloorGrassTall
@@ -467,7 +483,7 @@
  - CP14DemiplaneOpenSky
  layers:
    - !type:OreDunGen
-      tileMask: 
+      tileMask:
      - CP14FloorGrass
      - CP14FloorGrassLight
      - CP14FloorGrassTall
@@ -475,3 +491,20 @@
      count: 1
      minGroupSize: 1
      maxGroupSize: 1
+
+- type: cp14DemiplaneModifier
+  id: GlowingTree
+  name: cp14-modifier-glowing-tree
+  requiredTags:
+  - CP14DemiplaneGrass
+  - CP14DemiplaneOpenSky
+  layers:
+    - !type:OreDunGen
+      tileMask:
+      - CP14FloorGrass
+      - CP14FloorGrassLight
+      - CP14FloorGrassTall
+      entity: CP14RoyalPumpkin
+      count: 6
+      minGroupSize: 1
+      maxGroupSize: 3