Lumishroom (#226)

* added lumishroom art * lumishroom * Update migration.yml * fix * fix x2 * Update alchemy_test_layer2.yml * worldgen * Update chromium_inverse.yml * add new barrels and vials
2024-06-08 01:03:21 +03:00
parent 278e41c694
commit d998e6bf9a
29 changed files with 340 additions and 160 deletions
--- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/herbal_gather.yml
+++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/herbal_gather.yml
@@ -1,24 +1,3 @@
- type: entity
-  id: CP14RandomSpawnerGatherGloodgrass
-  name: bloodgrass spawner
-  parent: MarkerBase
-  categories:
-  - Spawner
-  components:
-  - type: Sprite
-    layers:
-      - state: red
-      - sprite: _CP14/Objects/Specific/Alchemy/Herbal/bloodgrass.rsi
-        state: grass1
-  - type: RandomSpawner
-    prototypes:
-    - CP14GatherableBloodgrass
-    - CP14GatherableBloodgrass2
-    - CP14GatherableBloodgrass3
-    - CP14GatherableBloodgrass4
-    - CP14GatherableBloodgrass5
-    chance: 1
-
 - type: entity
  id: CP14RandomSpawnerGatherAgaricShroom
  name: agaric shroom spawner
@@ -34,9 +13,4 @@
  - type: RandomSpawner
    prototypes:
    - CP14GatherableFlyAgaric
-    - CP14GatherableFlyAgaric2
-    - CP14GatherableFlyAgaric3
-    - CP14GatherableFlyAgaric4
-    - CP14GatherableFlyAgaric5
-    - CP14GatherableFlyAgaric6
    chance: 0.05
--- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/herbals.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/herbals.yml
@@ -181,4 +181,46 @@
    juiceSolution:
      reagents:
      - ReagentId: CP14GroundQuartz
-        Quantity: 3
+        Quantity: 3
+
+- type: entity
+  id: CP14LumiMushroom
+  parent: FoodProduceBase
+  name: lumishroom
+  description: A faintly luminous mushroom. Often used by alchemists as a means of concentrating solutions.
+  components:
+  - type: Tag
+    tags:
+    - CP14FitInMortar
+  - type: BadFood
+  - type: Item
+    size: Tiny
+  - type: Produce
+  - type: Sprite
+    sprite: _CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi
+    layers:
+      - state: base1
+        map: ["random"]
+  - type: RandomSprite
+    available:
+    - random:
+        base1: ""
+        base2: ""
+        base3: ""
+        base4: ""
+        base5: ""
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: CP14LumiMushroom
+        Quantity: 4
+  - type: PointLight
+    color: "#36c98f"
+    radius: 1.2
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: CP14LumiMushroom
+          Quantity: 4
--- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/vials.yml
@@ -144,7 +144,7 @@
 - type: entity
  id: CP14VialSmallBloodgrassSap
  parent: CP14VialSmall
-  suffix: bloodgrass sap
+  suffix: Bloodgrass sap
  components:
  - type: SolutionContainerManager
    solutions:
@@ -156,7 +156,7 @@
 - type: entity
  id: CP14VialSmallAgaricMushroom
  parent: CP14VialSmall
-  suffix: fly agaric juice
+  suffix: Fly agaric juice
  components:
  - type: SolutionContainerManager
    solutions:
@@ -165,10 +165,22 @@
        - ReagentId: CP14AgaricMushroom
          Quantity: 10

+- type: entity
+  id: CP14VialSmallGroundQuartz
+  parent: CP14VialSmall
+  suffix: Ground Quartz
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      vial:
+        reagents:
+        - ReagentId: CP14GroundQuartz
+          Quantity: 10
+
 - type: entity
  id: CP14VialSmallWildSage
  parent: CP14VialSmall
-  suffix: wild sage sap
+  suffix: Wild sage Sap
  components:
  - type: SolutionContainerManager
    solutions:
@@ -180,7 +192,7 @@
 - type: entity
  id: CP14VialSmallChromiumSlime
  parent: CP14VialTiny
-  suffix: chromium slime
+  suffix: Chromium Slime
  components:
  - type: SolutionContainerManager
    solutions:
@@ -188,3 +200,15 @@
        reagents:
        - ReagentId: CP14ChromiumSlime
          Quantity: 5
+
+- type: entity
+  id: CP14VialSmallLumiMushroom
+  parent: CP14VialTiny
+  suffix: LumiShroom
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      vial:
+        reagents:
+        - ReagentId: CP14LumiMushroom
+          Quantity: 5
--- a/Resources/Prototypes/_CP14/Entities/Structures/Flora/floorWater.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Flora/floorWater.yml
@@ -61,8 +61,6 @@
  - type: RandomSpawner
    prototypes:
    - CP14GatherableChromiumSlime
-    - CP14GatherableChromiumSlime2
-    - CP14GatherableChromiumSlime3
    chance: 0.01
    deleteSpawnerAfterSpawn: false
  - type: Tag
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/barrel.yml
@@ -198,4 +198,16 @@
      barrel:
        reagents:
        - ReagentId: CP14GroundQuartz
+          Quantity: 300
+
+- type: entity
+  id: CP14BarrelLumiMushroom
+  parent: CP14BaseBarrel
+  suffix: LumiShroom
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      barrel:
+        reagents:
+        - ReagentId: CP14LumiMushroom
          Quantity: 300
--- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/herbals.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/herbals.yml
@@ -52,39 +52,21 @@
    snapCardinals: true
    drawdepth: FloorTiles
    sprite: _CP14/Objects/Specific/Alchemy/Herbal/bloodgrass.rsi
-    state: grass1
+    layers:
+      - state: grass1
+        map: ["random"]
+  - type: RandomSprite
+    available:
+    - random:
+        grass1: ""
+        grass2: ""
+        grass3: ""
+        grass4: ""
+        grass5: ""
  - type: Gatherable
    loot:
      All: CP14GatherBloodgrass

- type: entity
-  id: CP14GatherableBloodgrass2
-  parent: CP14GatherableBloodgrass
-  components:
-  - type: Sprite
-    state: grass2
-
- type: entity
-  id: CP14GatherableBloodgrass3
-  parent: CP14GatherableBloodgrass
-  components:
-  - type: Sprite
-    state: grass3
-
- type: entity
-  id: CP14GatherableBloodgrass4
-  parent: CP14GatherableBloodgrass
-  components:
-  - type: Sprite
-    state: grass4
-
- type: entity
-  id: CP14GatherableBloodgrass5
-  parent: CP14GatherableBloodgrass
-  components:
-  - type: Sprite
-    state: grass5
-
 # Fly agaric

 - type: entityLootTable
@@ -105,7 +87,18 @@
    snapCardinals: true
    drawdepth: FloorTiles
    sprite: _CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi
-    state: world1
+    layers:
+      - state: world1
+        map: ["random"]
+  - type: RandomSprite
+    available:
+    - random:
+        world1: ""
+        world2: ""
+        world3: ""
+        world4: ""
+        world5: ""
+        world6: ""
  - type: Gatherable
    toolWhitelist:
      tags:
@@ -115,41 +108,6 @@
    loot:
      All: CP14GatherFlyAgaric

- type: entity
-  id: CP14GatherableFlyAgaric2
-  parent: CP14GatherableFlyAgaric
-  components:
-  - type: Sprite
-    state: world2
-
- type: entity
-  id: CP14GatherableFlyAgaric3
-  parent: CP14GatherableFlyAgaric
-  components:
-  - type: Sprite
-    state: world3
-
- type: entity
-  id: CP14GatherableFlyAgaric4
-  parent: CP14GatherableFlyAgaric
-  components:
-  - type: Sprite
-    state: world4
-
- type: entity
-  id: CP14GatherableFlyAgaric5
-  parent: CP14GatherableFlyAgaric
-  components:
-  - type: Sprite
-    state: world5
-
- type: entity
-  id: CP14GatherableFlyAgaric6
-  parent: CP14GatherableFlyAgaric
-  components:
-  - type: Sprite
-    state: world6
-
 # Chromium slime

 - type: entityLootTable
@@ -170,7 +128,15 @@
    snapCardinals: true
    drawdepth: FloorTiles
    sprite: _CP14/Objects/Specific/Alchemy/Herbal/chromium_slime.rsi
-    state: world1
+    layers:
+      - state: world1
+        map: ["random"]
+  - type: RandomSprite
+    available:
+    - random:
+        world1: ""
+        world2: ""
+        world3: ""
  - type: Gatherable
    toolWhitelist:
      components:
@@ -178,20 +144,6 @@
    loot:
      All: CP14GatherChromiumSlime

- type: entity
-  id: CP14GatherableChromiumSlime2
-  parent: CP14GatherableChromiumSlime
-  components:
-  - type: Sprite
-    state: world2
-
- type: entity
-  id: CP14GatherableChromiumSlime3
-  parent: CP14GatherableChromiumSlime
-  components:
-  - type: Sprite
-    state: world3
-
 # Wild sage

 - type: entityLootTable
@@ -212,21 +164,59 @@
    snapCardinals: true
    drawdepth: FloorTiles
    sprite: _CP14/Objects/Specific/Alchemy/Herbal/wild_sage.rsi
-    state: world1
+    layers:
+      - state: world1
+        map: ["random"]
+  - type: RandomSprite
+    available:
+    - random:
+        world1: ""
+        world2: ""
+        world3: ""
  - type: Gatherable
    loot:
      All: CP14GatherWildSage
+      
+# Wild sage
+
+- type: entityLootTable
+  id: CP14GatherLumiMushroom
+  entries:
+  - id: CP14LumiMushroom
+    amount: 1
+    maxAmount: 1

 - type: entity
-  id: CP14GatherableWildSage2
-  parent: CP14GatherableWildSage
+  id: CP14GatherableLumiMushroom
+  parent: CP14GatherableHerbalBase
+  name: lumishroom
+  description: A faintly luminous mushroom. Often used by alchemists as a means of concentrating solutions.
+  suffix: Gatherable
  components:
  - type: Sprite
-    state: world2
-
- type: entity
-  id: CP14GatherableWildSage3
-  parent: CP14GatherableWildSage
-  components:
-  - type: Sprite
-    state: world3
+    snapCardinals: true
+    drawdepth: FloorTiles
+    sprite: _CP14/Objects/Specific/Alchemy/Herbal/lumishroom.rsi
+    layers:
+      - state: world1
+        map: ["random"]
+  - type: RandomSprite
+    available:
+    - random:
+        world1: ""
+        world2: ""
+        world3: ""
+        world4: ""
+        world5: ""
+        world6: ""
+  - type: PointLight
+    color: "#36c98f"
+    radius: 1.5
+  - type: Gatherable
+    toolWhitelist:
+      tags:
+        - CP14HerbalGathering
+      components:
+        - Hands
+    loot:
+      All: CP14GatherLumiMushroom
--- a/Resources/Prototypes/_CP14/Procedural/biome_template.yml
+++ b/Resources/Prototypes/_CP14/Procedural/biome_template.yml
@@ -70,6 +70,37 @@
        - CP14CrystalDiamondsSmall
        - CP14CrystalDiamondsMedium
        - CP14CrystalDiamondsBig
+    - !type:BiomeEntityLayer # lumishroom sage
+      threshold: 0.6
+      noise:
+        seed: 8
+        noiseType: OpenSimplex2
+        fractalType: Ridged
+        frequency: 0.015
+        octaves: 3
+        lacunarity: 1.8
+        gain: 0.7
+        domainWarpType: OpenSimplex2
+        domainWarpAmp: 120
+      allowedTiles:
+        - CP14FloorBase
+      entities:
+        - CP14GatherableLumiMushroom
+    # Lakes start
+    - !type:BiomeEntityLayer
+      allowedTiles:
+        - CP14FloorBase
+      threshold: 0.8
+      noise:
+        seed: 14
+        noiseType: OpenSimplex2
+        fractalType: FBm
+        frequency: 0.01
+        domainWarpType: OpenSimplex2
+        domainWarpAmp: 150
+      entities:
+        - CP14FloorWater
+    # Lakes end
     #Walls
    - !type:BiomeEntityLayer
      threshold: -0.75
--- a/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml
+++ b/Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml
@@ -117,12 +117,8 @@
        - CP14FloorGrass
      entities:
        - CP14GatherableBloodgrass
-        - CP14GatherableBloodgrass2
-        - CP14GatherableBloodgrass3
-        - CP14GatherableBloodgrass4
-        - CP14GatherableBloodgrass5
    - !type:BiomeEntityLayer # Rare Wild sage
-      threshold: 0.85
+      threshold: 0.8
      noise:
        seed: 8
        noiseType: OpenSimplex2
@@ -137,8 +133,6 @@
        - CP14FloorGrass
      entities:
        - CP14GatherableWildSage
-        - CP14GatherableWildSage2
-        - CP14GatherableWildSage3

 # Подбиомы лугов

--- a/Resources/Prototypes/_CP14/Reagents/biological.yml
+++ b/Resources/Prototypes/_CP14/Reagents/biological.yml
@@ -143,4 +143,31 @@
    Food:
      effects:
      - !type:ChemVomit
-        probability: 0.05
+        probability: 0.05
+
+- type: reagent
+  id: CP14LumiMushroom
+  group: CP14Biological
+  name: cp14-reagent-name-lumi-shroom
+  desc: cp14-reagent-desc-lumi-shroom
+  flavor: CP14Vomit
+  color: "#36c98f"
+  physicalDesc: cp14-reagent-physical-desc-colorless
+  slippery: false
+  metabolisms:
+    Poison:
+      effects:
+      - !type:HealthChange
+        damage:
+          types:
+            Poison: 0.5
+      - !type:ChemVomit
+        probability: 0.04
+    Narcotic:
+      effects:
+      - !type:GenericStatusEffect
+        key: SeeingRainbows
+        component: SeeingRainbows
+        type: Add
+        time: 6
+        refresh: false
--- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/brewing_simple.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/brewing_simple.yml
@@ -45,7 +45,21 @@
    CP14GroundQuartz:
      amount: 1
  products:
-    CP14BasicEffectEmpty: 0.75
+    CP14BasicEffectEmpty: 1
+  effects:
+  - !type:CP14AffectSolutionTemperature
+    addTemperature: -250
+
+- type: reaction
+  id: CP14LumiMushroomBrewing
+  minTemp: 500
+  priority: 2
+  reactants:
+    CP14LumiMushroom:
+      amount: 1
+  products:
+    CP14BasicEffectEmpty: 0.5
+    CP14BasicEffectRainbow: 0.25
    CP14BasicEffectVomit: 0.25
  effects:
  - !type:CP14AffectSolutionTemperature
--- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/chromium_inverse.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/chromium_inverse.yml
@@ -8,6 +8,7 @@

 - type: reaction
  id: CP14ChromiumInverseEffectHealBruteGroup
+  quantized: true
  minTemp: 350
  conserveEnergy: false
  reactants:
@@ -16,14 +17,15 @@
    CP14ChromiumSlime:
      amount: 0.5
  products:
-    CP14BasicEffectDamageBrute: 0.5
-    CP14BasicEffectEmpty: 0.25
+    CP14BasicEffectDamageBrute: 0.25
+    CP14BasicEffectEmpty: 0.75
  effects:
  - !type:CP14AffectSolutionTemperature
    addTemperature: -350

 - type: reaction
  id: CP14ChromiumInverseEffectDamageBruteGroup
+  quantized: true
  minTemp: 350
  conserveEnergy: false
  reactants:
@@ -32,8 +34,8 @@
    CP14ChromiumSlime:
      amount: 0.5
  products:
-    CP14BasicEffectHealBrute: 0.5
-    CP14BasicEffectEmpty: 0.25
+    CP14BasicEffectHealBrute: 0.25
+    CP14BasicEffectEmpty: 0.75
  effects:
  - !type:CP14AffectSolutionTemperature
    addTemperature: -350
@@ -42,6 +44,7 @@

 - type: reaction
  id: CP14ChromiumInverseEffectHealPoison
+  quantized: true
  minTemp: 350
  conserveEnergy: false
  reactants:
@@ -50,14 +53,15 @@
    CP14ChromiumSlime:
      amount: 0.5
  products:
-    CP14BasicEffectDamagePoison: 0.5
-    CP14BasicEffectEmpty: 0.25
+    CP14BasicEffectDamagePoison: 0.25
+    CP14BasicEffectEmpty: 0.75
  effects:
  - !type:CP14AffectSolutionTemperature
    addTemperature: -350

 - type: reaction
  id: CP14ChromiumInverseEffectDamagePoison
+  quantized: true
  minTemp: 350
  conserveEnergy: false
  reactants:
@@ -66,8 +70,8 @@
    CP14ChromiumSlime:
      amount: 0.5
  products:
-    CP14BasicEffectHealPoison: 0.5
-    CP14BasicEffectEmpty: 0.25
+    CP14BasicEffectHealPoison: 0.25
+    CP14BasicEffectEmpty: 0.75
  effects:
  - !type:CP14AffectSolutionTemperature
    addTemperature: -350
@@ -76,6 +80,7 @@

 - type: reaction
  id: CP14ChromiumInverseEffectDamageCold
+  quantized: true
  minTemp: 350
  conserveEnergy: false
  reactants:
@@ -84,14 +89,15 @@
    CP14ChromiumSlime:
      amount: 0.5
  products:
-    CP14BasicEffectHealCold: 0.5
-    CP14BasicEffectEmpty: 0.25
+    CP14BasicEffectHealCold: 0.25
+    CP14BasicEffectEmpty: 0.75
  effects:
  - !type:CP14AffectSolutionTemperature
    addTemperature: -350

 - type: reaction
  id: CP14ChromiumInverseEffectHealCold
+  quantized: true
  minTemp: 350
  conserveEnergy: false
  reactants:
@@ -100,8 +106,8 @@
    CP14ChromiumSlime:
      amount: 0.5
  products:
-    CP14BasicEffectDamageCold: 0.5
-    CP14BasicEffectEmpty: 0.25
+    CP14BasicEffectDamageCold: 0.25
+    CP14BasicEffectEmpty: 0.75
  effects:
  - !type:CP14AffectSolutionTemperature
    addTemperature: -350
--- a/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/mixing_simple.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/mixing_simple.yml
@@ -104,3 +104,15 @@
  products:
    CP14BasicEffectEmoteCough: 0.25
    CP14BasicEffectDamagePoison: 0.25
+
+- type: reaction
+  id: CP14EmptySplitting
+  priority: 3
+  reactants:
+    CP14BasicEffectEmpty:
+      amount: 0.5
+    CP14LumiMushroom:
+      amount: 0.5
+  effects:
+  - !type:CP14AffectSolutionTemperature
+    addTemperature: -250