Flowers + some love for Alchemy (#427)

* red rose proto and sprite

* 242 changed files guys

* yellow dayflin

* jitter + drunk solution, also refactor alchemy recipes

* dyes entity

* dye crafting, dye using

* add flowers to generation

Resources/Locale/en-US/_CP14/reagents/meta/basic-effect-reagent.ftl

@@ -32,4 +32,10 @@ cp14-reagent-name-basic-damage-cold = Ice solution
 cp14-reagent-desc-basic-damage-cold = Dangerous substance that causes severe frostbite.
 
 cp14-reagent-name-basic-vomit = Vomit solution
-cp14-reagent-desc-basic-vomit = A substance that causes severe vomiting spasms. May help with food poisoning.
+cp14-reagent-desc-basic-vomit = A substance that causes severe vomiting spasms. May help with food poisoning.
+
+cp14-reagent-name-basic-drunk = Booze solution
+cp14-reagent-desc-basic-drunk = A substance that causes dizziness and slurred speech.
+
+cp14-reagent-name-basic-jitter = Jitter solution
+cp14-reagent-desc-basic-jitter = A substance that causes uncontrollable but safe spasms throughout the body.

Resources/Locale/en-US/_CP14/reagents/meta/biological.ftl

@@ -23,4 +23,10 @@ cp14-reagent-name-grounded-quartz = Ground quartz
 cp14-reagent-desc-grounded-quartz = A powder obtained from grinding quartz fragments. It has weak cleaning properties.
 
 cp14-reagent-name-lumi-shroom = Lumishroom sap
-cp14-reagent-desc-lumi-shroom = A faintly shimmering slurry extracted from lumigrib. Often used by alchemists as a means of concentrating solutions.
+cp14-reagent-desc-lumi-shroom = A faintly shimmering slurry extracted from lumigrib. Often used by alchemists as a means of concentrating solutions.
+
+cp14-reagent-name-yellow-red-rose-pulp = Red rose pulp
+cp14-reagent-desc-yellow-red-rose-pulp = Crushed red rose petals
+
+cp14-reagent-name-yellow-dayflin-pulp = Yellow dayfline pulp
+cp14-reagent-desc-yellow-dayflin-pulp = Crushed flowers of sunny dayflines

Resources/Locale/en-US/_CP14/reagents/meta/physical-desc.ftl

@@ -4,3 +4,4 @@ cp14-reagent-physical-desc-colorless = colorless
 cp14-reagent-physical-desc-viscous = viscous
 cp14-reagent-physical-desc-cloudy = cloudy
 cp14-reagent-physical-desc-sparkling = sparkling
+cp14-reagent-physical-desc-pureed = pureed

Resources/Locale/ru-RU/_CP14/_PROTO/entities/entities.ftl

@@ -133,7 +133,7 @@ ent-CP14ClothingDressBlack = черное платье
 ent-CP14ClothingPantsMercenaryTrousers = брюки наемника
     .desc = Разноцветные брюки наемника. Не порвите их.
 
-ent-CP14ClothingPantsSouthernMagician = Платье южного фокусника
+ent-CP14ClothingPantsSouthernMagician = платье южного фокусника
     .desc = Традиционная юбка южного мага, довольно свободная.
 
 ent-CP14ClothingShirtCottonBlue = хлопковая синяя рубаха

Resources/Locale/ru-RU/_CP14/reagents/meta/basic-effect-reagent.ftl

@@ -32,4 +32,10 @@ cp14-reagent-name-basic-damage-cold = Ледяной раствор
 cp14-reagent-desc-basic-damage-cold = Опасное вещество, вызывающее сильные обморожения.
 
 cp14-reagent-name-basic-vomit = Рвотный раствор
-cp14-reagent-desc-basic-vomit = Вещество, вызывающее сильные рвотные спазмы. Может помочь при пищевом отравлении.
+cp14-reagent-desc-basic-vomit = Вещество, вызывающее сильные рвотные спазмы. Может помочь при пищевом отравлении.
+
+cp14-reagent-name-basic-drunk = Пьянящий раствор
+cp14-reagent-desc-basic-drunk = Вещество, вызывающее головокружение и несвязную речь.
+
+cp14-reagent-name-basic-jitter = Раствор трясучки
+cp14-reagent-desc-basic-jitter = Вещество, вызывающее неконтролируемые, но безопасные спазмы во всем теле.

Resources/Locale/ru-RU/_CP14/reagents/meta/biological.ftl

@@ -23,4 +23,10 @@ cp14-reagent-name-grounded-quartz = Размолотый кварц
 cp14-reagent-desc-grounded-quartz = Порошок, получаемый из размалывания осколков кварца. Имеет слабые очищающие свойства.
 
 cp14-reagent-name-lumi-shroom = Сок люмигриба
-cp14-reagent-desc-lumi-shroom = Слабо мерцающая жижа, добытая из люмигриба. Часто используется алхимиками, как средство концентрации растворов.
+cp14-reagent-desc-lumi-shroom = Слабо мерцающая жижа, добытая из люмигриба. Часто используется алхимиками, как средство концентрации растворов.
+
+cp14-reagent-name-red-rose-pulp = Мякоть красных роз
+cp14-reagent-desc-red-rose-pulp = Измельченные лепестки красных роз
+
+cp14-reagent-name-yellow-dayflin-pulp = Мякоть желтых днефлаев
+cp14-reagent-desc-yellow-dayflin-pulp = Измельченные цветы солнечных днефлаев

Resources/Locale/ru-RU/_CP14/reagents/meta/physical-desc.ftl

@@ -4,3 +4,4 @@ cp14-reagent-physical-desc-colorless = бесцветное
 cp14-reagent-physical-desc-viscous = вязкое
 cp14-reagent-physical-desc-cloudy = мутное
 cp14-reagent-physical-desc-sparkling = искрящееся
+cp14-reagent-physical-desc-pureed = пюреобразное

Resources/Maps/_CP14/alchemy_test.yml

@@ -23,7 +23,6 @@ entities:
       name: Map Entity
     - type: Transform
     - type: Map
-      mapPaused: True
     - type: PhysicsMap
     - type: GridTree
     - type: MovedGrids

Resources/Maps/_CP14/alchemy_test_layer2.yml

@@ -15,7 +15,6 @@ entities:
       name: Map Entity
     - type: Transform
     - type: Map
-      mapPaused: True
     - type: PhysicsMap
     - type: GridTree
     - type: MovedGrids

Resources/Maps/_CP14/dev_map.yml

@@ -23,7 +23,6 @@ entities:
     - type: MapLight
       ambientLightColor: '#111111FF'
     - type: Map
-      mapPaused: True
     - type: PhysicsMap
     - type: GridTree
     - type: MovedGrids

Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/herbal_gather.yml

@@ -8,7 +8,7 @@
   - type: Sprite
     layers:
       - state: red
-      - sprite: _CP14/Structures/Specific/Farming/Herbals/agaric.rsi
+      - sprite: _CP14/Structures/Flora/Wild/agaric.rsi
         state: world1
   - type: RandomSpawner
     prototypes:

Resources/Prototypes/_CP14/Entities/Objects/Consumable/Food/produce.yml

@@ -10,7 +10,7 @@
     flavors:
       - cabbage
   - type: Sprite
-    sprite: _CP14/Objects/Specific/Farming/Produce/cabbage.rsi
+    sprite: _CP14/Objects/Flora/Farm/cabbage.rsi
     layers:
       - state: base1
         map: [ "random" ]
@@ -75,7 +75,7 @@
     flavors:
       - pumpkin
   - type: Sprite
-    sprite: _CP14/Objects/Specific/Farming/Produce/pumpkin.rsi
+    sprite: _CP14/Objects/Flora/Farm/pumpkin.rsi
     layers:
       - state: base1
         map: [ "random" ]

Resources/Prototypes/_CP14/Entities/Objects/Flora/farm.yml

@@ -8,7 +8,7 @@
     size: Tiny
   - type: Produce
   - type: Sprite
-    sprite: _CP14/Objects/Specific/Farming/Produce/wheat.rsi
+    sprite: _CP14/Objects/Flora/Farm/wheat.rsi
     layers:
       - state: base1
         map: ["random"]

Resources/Prototypes/_CP14/Entities/Objects/Flora/flowers.yml

@@ -0,0 +1,63 @@
+- type: entity
+  id: CP14FlowersBase
+  parent: FoodProduceBase
+  abstract: true
+  components:
+  - type: Tag
+    tags:
+    - CP14FitInMortar
+  - type: BadFood
+  - type: Item
+    size: Tiny
+  - type: Produce
+  - type: Sprite
+    layers:
+      - state: base1
+        map: ["random"]
+  - type: RandomSprite
+    available:
+    - random:
+        base1: ""
+        base2: ""
+
+- type: entity
+  id: CP14FlowersRed
+  parent: CP14FlowersBase
+  name: red rose
+  description: Beautiful red roses. Can be used to create red dye.
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Flora/Flowers/red_rose.rsi
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: CP14RedRosePulp
+        Quantity: 4
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: CP14RedRosePulp
+          Quantity: 4
+
+- type: entity
+  id: CP14FlowersYellow
+  parent: CP14FlowersBase
+  name: yellow dayflin
+  description: A yellow sun flower that smells like melted milk. Can be processed into a yellow dye.
+  components: 
+  - type: Sprite
+    sprite: _CP14/Objects/Flora/Flowers/yellow_dayflin.rsi
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: CP14YellowDayflinPulp
+        Quantity: 4
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: CP14YellowDayflinPulp
+          Quantity: 4

Resources/Prototypes/_CP14/Entities/Objects/Flora/herbals.yml

@@ -12,7 +12,7 @@
     size: Tiny
   - type: Produce
   - type: Sprite
-    sprite: _CP14/Objects/Specific/Farming/Produce/bloodgrass.rsi
+    sprite: _CP14/Objects/Flora/Wild/bloodgrass.rsi
     layers:
       - state: base1
         map: ["random"]
@@ -35,7 +35,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 20
+        maxVol: 8
         reagents:
         - ReagentId: CP14BloodGrassSap
           Quantity: 5
@@ -54,7 +54,7 @@
     size: Tiny
   - type: Produce
   - type: Sprite
-    sprite: _CP14/Objects/Specific/Farming/Produce/agaric.rsi
+    sprite: _CP14/Objects/Flora/Wild/agaric.rsi
     layers:
       - state: base1
         map: ["random"]
@@ -74,7 +74,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 20
+        maxVol: 5
         reagents:
         - ReagentId: CP14AgaricMushroom
           Quantity: 3
@@ -93,7 +93,7 @@
     size: Tiny
   - type: Produce
   - type: Sprite
-    sprite: _CP14/Objects/Specific/Farming/Produce/chromium_slime.rsi
+    sprite: _CP14/Objects/Flora/Wild/chromium_slime.rsi
     layers:
       - state: base1
         map: ["random"]
@@ -111,7 +111,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 20
+        maxVol: 10
         reagents:
         - ReagentId: CP14ChromiumSlime
           Quantity: 7
@@ -131,7 +131,7 @@
     - 0,0,0,1
   - type: Produce
   - type: Sprite
-    sprite: _CP14/Objects/Specific/Farming/Produce/wild_sage.rsi
+    sprite: _CP14/Objects/Flora/Wild/wild_sage.rsi
     layers:
       - state: base1
         map: ["random"]
@@ -149,7 +149,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 20
+        maxVol: 10
         reagents:
         - ReagentId: CP14WildSageSap
           Quantity: 8
@@ -197,7 +197,7 @@
     size: Tiny
   - type: Produce
   - type: Sprite
-    sprite: _CP14/Objects/Specific/Farming/Produce/lumishroom.rsi
+    sprite: _CP14/Objects/Flora/Wild/lumishroom.rsi
     layers:
       - state: base1
         map: ["random"]
@@ -220,7 +220,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 20
+        maxVol: 5
         reagents:
         - ReagentId: CP14LumiMushroom
-          Quantity: 4
+          Quantity: 4

Resources/Prototypes/_CP14/Entities/Objects/Materials/dye.yml

@@ -0,0 +1,77 @@
+- type: entity
+  id: CP14BaseDye
+  parent: BaseItem
+  abstract: true
+  name: dye
+  description: A bright, colorful dye used to paint various things.
+  components:
+  - type: Item
+    size: Tiny
+  - type: Sprite
+    sprite: _CP14/Objects/Materials/dye.rsi
+
+- type: entity
+  id: CP14DyeRed
+  parent: CP14BaseDye
+  name: red dye
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+    - state: powder
+      color: "#bd2b26"
+
+- type: entity
+  id: CP14DyeYellow
+  parent: CP14BaseDye
+  name: yellow dye
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+    - state: powder
+      color: "#ffe269"
+
+- type: entity
+  id: CP14DyeBlue
+  parent: CP14BaseDye
+  name: blue dye
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+    - state: powder
+      color: "#5eabeb"
+
+- type: entity
+  id: CP14DyeGreen
+  parent: CP14BaseDye
+  name: green dye
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+    - state: powder
+      color: "#85903e"
+
+- type: entity
+  id: CP14DyePurple
+  parent: CP14BaseDye
+  name: purple dye
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+    - state: powder
+      color: "#8241cc"
+
+- type: entity
+  id: CP14DyeBlack
+  parent: CP14BaseDye
+  name: black dye
+  components:
+  - type: Sprite
+    layers:
+    - state: base
+    - state: powder
+      color: "#242329"

Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/crystal.yml

@@ -2,7 +2,7 @@
   id: CP14EnergyCrystalBase
   parent: BaseItem
   abstract: true
-  description: Shards of one of the Khyber dragon, used to bind and control elemental energy.
+  description: A crystal shard capable of storing magical energy.
   components:
   - type: CP14MagicEnergyCrystal
   - type: Item
@@ -15,7 +15,7 @@
 - type: entity
   id: CP14EnergyCrystalSmall
   parent: CP14EnergyCrystalBase
-  name: small Khyber shard
+  name: small energyshard
   suffix: Full
   components:
   - type: Sprite
@@ -46,7 +46,7 @@
 - type: entity
   id: CP14EnergyCrystalMedium
   parent: CP14EnergyCrystalBase
-  name: Khyber shard
+  name: energyshard
   suffix: Full
   components:
   - type: PointLight

Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/cabbage.yml

@@ -5,7 +5,7 @@
   description: OOO # TODO
   components:
   - type: Sprite
-    sprite: _CP14/Structures/Specific/Farming/Herbals/cabbage.rsi
+    sprite: _CP14/Structures/Flora/Farm/cabbage.rsi
     layers:
     - state: grow-1
       map: ["enum.PlantVisualLayers.Base"]
@@ -54,7 +54,7 @@
   parent: CP14GatherableBase
   components:
   - type: Sprite
-    sprite: _CP14/Structures/Specific/Farming/Herbals/cabbage.rsi
+    sprite: _CP14/Structures/Flora/Farm/cabbage.rsi
     state: death
   - type: Gatherable
     toolWhitelist:

Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/pumpkin.yml

@@ -5,7 +5,7 @@
   description: OOO # TODO
   components:
   - type: Sprite
-    sprite: _CP14/Structures/Specific/Farming/Herbals/pumpkin.rsi
+    sprite: _CP14/Structures/Flora/Farm/pumpkin.rsi
     layers:
     - state: grow-1
       map: ["enum.PlantVisualLayers.Base"]
@@ -54,7 +54,7 @@
   parent: CP14GatherableBase
   components:
   - type: Sprite
-    sprite: _CP14/Structures/Specific/Farming/Herbals/pumpkin.rsi
+    sprite: _CP14/Structures/Flora/Farm/pumpkin.rsi
     state: death
   - type: Gatherable
     toolWhitelist:

Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/Farm/wheat.yml

@@ -5,7 +5,7 @@
   description: Most popular crop. Unpretentious, it opens the way to an abundance of flour products.
   components:
   - type: Sprite
-    sprite: _CP14/Structures/Specific/Farming/Herbals/wheat.rsi
+    sprite: _CP14/Structures/Flora/Farm/wheat.rsi
     layers:
     - state: grow-1
       map: ["enum.PlantVisualLayers.Base"]
@@ -55,7 +55,7 @@
   parent: CP14GatherableBase
   components:
   - type: Sprite
-    sprite: _CP14/Structures/Specific/Farming/Herbals/wheat.rsi
+    sprite: _CP14/Structures/Flora/Farm/wheat.rsi
     state: death
   - type: Gatherable
     toolWhitelist:

Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/flowers.yml

@@ -0,0 +1,70 @@
+- type: entity
+  id: CP14GatherableFlowersRed
+  parent: CP14GatherableWildBase
+  name: red rose
+  description: Beautiful red roses. Can be used to create red dye.
+  suffix: Gatherable
+  components:
+  - type: Sprite
+    drawdepth: FloorTiles
+    sprite: _CP14/Structures/Flora/Flowers/red_rose.rsi
+    layers:
+      - state: world1
+        map: ["random"]
+  - type: RandomSprite
+    available:
+    - random:
+        world1: ""
+        world2: ""
+        world3: ""
+  - type: Gatherable
+    loot:
+      All: CP14GatherFlowersRed
+    toolWhitelist:
+      tags:
+        - CP14HerbalGathering
+      components:
+        - Hands
+
+- type: entityLootTable
+  id: CP14GatherFlowersRed
+  entries:
+  - id: CP14FlowersRed
+    amount: 1
+    maxAmount: 2
+
+
+- type: entity
+  id: CP14GatherableFlowersYellow
+  parent: CP14GatherableWildBase
+  name: yellow dayflin
+  description: A yellow sun flower that smells like melted milk. Can be processed into a yellow dye.
+  suffix: Gatherable
+  components:
+  - type: Sprite
+    drawdepth: FloorTiles
+    sprite: _CP14/Structures/Flora/Flowers/yellow_dayflin.rsi
+    layers:
+      - state: world1
+        map: ["random"]
+  - type: RandomSprite
+    available:
+    - random:
+        world1: ""
+        world2: ""
+        world3: ""
+  - type: Gatherable
+    loot:
+      All: CP14GatherFlowersYellow
+    toolWhitelist:
+      tags:
+        - CP14HerbalGathering
+      components:
+        - Hands
+
+- type: entityLootTable
+  id: CP14GatherFlowersYellow
+  entries:
+  - id: CP14FlowersYellow
+    amount: 1
+    maxAmount: 2

Resources/Prototypes/_CP14/Entities/Structures/Flora/Gatherable/wild.yml

@@ -17,7 +17,7 @@
   components:
   - type: Sprite
     drawdepth: FloorTiles
-    sprite: _CP14/Structures/Specific/Farming/Herbals/bloodgrass.rsi
+    sprite: _CP14/Structures/Flora/Wild/bloodgrass.rsi
     layers:
       - state: grass1
         map: ["random"]
@@ -51,7 +51,7 @@
   components:
   - type: Sprite
     drawdepth: FloorTiles
-    sprite: _CP14/Structures/Specific/Farming/Herbals/agaric.rsi
+    sprite: _CP14/Structures/Flora/Wild/agaric.rsi
     layers:
       - state: world1
         map: ["random"]
@@ -65,11 +65,6 @@
         world5: ""
         world6: ""
   - type: Gatherable
-    toolWhitelist:
-      tags:
-        - CP14HerbalGathering
-      components:
-        - Hands
     loot:
       All: CP14GatherFlyAgaric
 
@@ -91,7 +86,7 @@
   components:
   - type: Sprite
     drawdepth: FloorTiles
-    sprite: _CP14/Structures/Specific/Farming/Herbals/chromium_slime.rsi
+    sprite: _CP14/Structures/Flora/Wild/chromium_slime.rsi
     layers:
       - state: world1
         map: ["random"]
@@ -126,7 +121,7 @@
   components:
   - type: Sprite
     drawdepth: FloorTiles
-    sprite: _CP14/Structures/Specific/Farming/Herbals/wild_sage.rsi
+    sprite: _CP14/Structures/Flora/Wild/wild_sage.rsi
     layers:
       - state: world1
         map: ["random"]
@@ -158,7 +153,7 @@
   components:
   - type: Sprite
     drawdepth: FloorTiles
-    sprite: _CP14/Structures/Specific/Farming/Herbals/lumishroom.rsi
+    sprite: _CP14/Structures/Flora/Wild/lumishroom.rsi
     layers:
       - state: world1
         map: ["random"]
@@ -175,10 +170,5 @@
     color: "#36c98f"
     radius: 1.5
   - type: Gatherable
-    toolWhitelist:
-      tags:
-        - CP14HerbalGathering
-      components:
-        - Hands
     loot:
       All: CP14GatherLumiMushroom

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

@@ -10,7 +10,7 @@
   - type: Clickable
   - type: Sprite
     noRot: true
-    sprite: _CP14/Structures/Flora/GrassHighBush.rsi
+    sprite: _CP14/Structures/Flora/high_bush.rsi
     drawdepth: Mobs
     offset: 0,0.3
     layers:
@@ -88,7 +88,7 @@
   - type: Sprite
     layers:
     - state: red
-    - sprite: _CP14/Structures/Flora/GrassHighBush.rsi
+    - sprite: _CP14/Structures/Flora/high_bush.rsi
       state: grass_high_bush1
   - type: RandomSpawner
     prototypes:

Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml

@@ -98,6 +98,42 @@
         - CP14GrassBushes7
         - CP14GrassBushes8
         - CP14GrassBushes9
+    - !type:BiomeEntityLayer # flowers
+      threshold: 0.7
+      noise:
+        seed: 45
+        noiseType: OpenSimplex2
+        fractalType: Ridged
+        frequency: 0.035
+        octaves: 3
+        lacunarity: 1.8
+        gain: 0.7
+        domainWarpType: OpenSimplex2
+        domainWarpAmp: 120
+      allowedTiles:
+        - CP14FloorGrass
+        - CP14FloorGrassLight
+        - CP14FloorGrassTall
+      entities:
+        - CP14GatherableFlowersRed
+    - !type:BiomeEntityLayer # flowers
+      threshold: 0.7
+      noise:
+        seed: 34
+        noiseType: OpenSimplex2
+        fractalType: Ridged
+        frequency: 0.035
+        octaves: 3
+        lacunarity: 1.8
+        gain: 0.7
+        domainWarpType: OpenSimplex2
+        domainWarpAmp: 120
+      allowedTiles:
+        - CP14FloorGrass
+        - CP14FloorGrassLight
+        - CP14FloorGrassTall
+      entities:
+        - CP14GatherableFlowersYellow
     - !type:BiomeEntityLayer # Tall grass!
       threshold: 0.3
       noise:

Resources/Prototypes/_CP14/Reagents/Biological/biological.yml

@@ -1,48 +1,3 @@
-- type: reagent
-  id: CP14Blood
-  group: CP14Biological
-  name: cp14-reagent-name-blood
-  desc: cp14-reagent-desc-blood
-  flavor: CP14Metallic
-  color: "#800000"
-  recognizable: true
-  physicalDesc: cp14-reagent-physical-desc-ferrous
-  slippery: false
-  footstepSound:
-    collection: FootstepBlood
-    params:
-      volume: 6
-      
-- type: reagent
-  id: CP14BloodTiefling
-  group: CP14Biological
-  desc: cp14-reagent-desc-blood-tiefling
-  name: cp14-reagent-name-blood-tiefling
-  flavor: CP14Metallic
-  color: "#803300"
-  recognizable: true
-  physicalDesc: cp14-reagent-physical-desc-ferrous
-  slippery: false
-  footstepSound:
-    collection: FootstepBlood
-    params:
-      volume: 6
-      
-- type: reagent
-  id: CP14BloodElf
-  group: CP14Biological
-  desc: cp14-reagent-desc-blood-elf
-  name: cp14-reagent-name-blood-elf
-  flavor: CP14Metallic
-  color: "#80003e"
-  recognizable: true
-  physicalDesc: cp14-reagent-physical-desc-ferrous
-  slippery: false
-  footstepSound:
-    collection: FootstepBlood
-    params:
-      volume: 6
-
 - type: reagent
   id: CP14BloodGrassSap
   group: CP14Biological
@@ -170,4 +125,4 @@
         component: SeeingRainbows
         type: Add
         time: 6
-        refresh: false
+        refresh: false

Resources/Prototypes/_CP14/Reagents/Biological/blood.yml

@@ -0,0 +1,44 @@
+- type: reagent
+  id: CP14Blood
+  group: CP14Biological
+  name: cp14-reagent-name-blood
+  desc: cp14-reagent-desc-blood
+  flavor: CP14Metallic
+  color: "#800000"
+  recognizable: true
+  physicalDesc: cp14-reagent-physical-desc-ferrous
+  slippery: false
+  footstepSound:
+    collection: FootstepBlood
+    params:
+      volume: 6
+      
+- type: reagent
+  id: CP14BloodTiefling
+  group: CP14Biological
+  desc: cp14-reagent-desc-blood-tiefling
+  name: cp14-reagent-name-blood-tiefling
+  flavor: CP14Metallic
+  color: "#803300"
+  recognizable: true
+  physicalDesc: cp14-reagent-physical-desc-ferrous
+  slippery: false
+  footstepSound:
+    collection: FootstepBlood
+    params:
+      volume: 6
+      
+- type: reagent
+  id: CP14BloodElf
+  group: CP14Biological
+  desc: cp14-reagent-desc-blood-elf
+  name: cp14-reagent-name-blood-elf
+  flavor: CP14Metallic
+  color: "#80003e"
+  recognizable: true
+  physicalDesc: cp14-reagent-physical-desc-ferrous
+  slippery: false
+  footstepSound:
+    collection: FootstepBlood
+    params:
+      volume: 6

Resources/Prototypes/_CP14/Reagents/Biological/flowers.yml

@@ -0,0 +1,19 @@
+- type: reagent
+  id: CP14RedRosePulp
+  group: CP14Biological
+  name: cp14-reagent-name-red-rose-pulp
+  desc: cp14-reagent-desc-red-rose-pulp
+  flavor: CP14Sweetly
+  color: "#d74722"
+  physicalDesc: cp14-reagent-physical-desc-pureed
+  slippery: false
+
+- type: reagent
+  id: CP14YellowDayflinPulp
+  group: CP14Biological
+  name: cp14-reagent-name-yellow-dayflin-pulp
+  desc: cp14-reagent-desc-yellow-dayflin-pulp
+  flavor: CP14Sweetly
+  color: "#ffe269"
+  physicalDesc: cp14-reagent-physical-desc-pureed
+  slippery: false

Resources/Prototypes/_CP14/Reagents/basic-effects.yml

@@ -184,4 +184,31 @@
     Food:
       effects:
       - !type:ChemVomit
-        probability: 0.25
+        probability: 0.25
+
+- type: reagent
+  id: CP14BasicEffectDrunk
+  name: cp14-reagent-name-basic-drunk
+  desc: cp14-reagent-desc-basic-drunk
+  group: CP14BasicEffect
+  flavor: CP14Vomit
+  color: "#ae64c4"
+  physicalDesc: cp14-reagent-physical-desc-colorless
+  metabolisms:
+    Food:
+      effects:
+      - !type:Drunk
+        boozePower: 15
+
+- type: reagent
+  id: CP14BasicEffectJitter
+  name: cp14-reagent-name-basic-jitter
+  desc: cp14-reagent-desc-basic-jitter
+  group: CP14BasicEffect
+  flavor: CP14Vomit
+  color: "#347d70"
+  physicalDesc: cp14-reagent-physical-desc-colorless
+  metabolisms:
+    Food:
+      effects:
+      - !type:Jitter

Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/brewing_bloodgrass.yml

@@ -1,12 +1,6 @@
 # Idea:
 # bloodgrass is a special reagent that can yield different base reagents, depending on the type of blood it is mixed with.
 
-# Rules:
-# 1) all values must be multiples of 0.25
-# 2) 25% products must be occupied by the empty solution
-# 3) bloodgrass should mix with ALL blood variants
-# 4) all reactions should take place at a temperature of 500, and reduce the temperature by 250.
-
 - type: reaction
   id: CP14BloodGrassBrewingBlood
   minTemp: 500
@@ -16,13 +10,12 @@
       amount: 0.5
     CP14BloodGrassSap:
       amount: 0.5
+    CP14GroundQuartz:
+      amount: 0.5
   products:
-    CP14BasicEffectEmpty: 0.25
-    CP14BasicEffectSatiateHunger: 0.25
+    CP14BasicEffectEmpty: 0.75
+    CP14BasicEffectSatiateHunger: 0.5
     CP14BasicEffectHealBrute: 0.25
-  cp14RandomProducts:
-  - CP14BasicEffectSatiateHunger: 0.25
-  - CP14BasicEffectHealBrute: 0.25
   effects:
   - !type:CP14AffectSolutionTemperature
     addTemperature: -250
@@ -36,13 +29,12 @@
       amount: 0.5
     CP14BloodGrassSap:
       amount: 0.5
+    CP14GroundQuartz:
+      amount: 0.5
   products:
-    CP14BasicEffectEmpty: 0.25
-    CP14BasicEffectSatiateHunger: 0.25
+    CP14BasicEffectEmpty: 0.75
+    CP14BasicEffectSatiateHunger: 0.5
     CP14BasicEffectHealCold: 0.25
-  cp14RandomProducts:
-  - CP14BasicEffectSatiateHunger: 0.25
-  - CP14BasicEffectHealCold: 0.25
   effects:
   - !type:CP14AffectSolutionTemperature
     addTemperature: -250
@@ -56,13 +48,12 @@
       amount: 0.5
     CP14BloodGrassSap:
       amount: 0.5
+    CP14GroundQuartz:
+      amount: 0.5
   products:
-    CP14BasicEffectEmpty: 0.25
+    CP14BasicEffectEmpty: 0.75
     CP14BasicEffectSatiateHunger: 0.25
     CP14BasicEffectHealPoison: 0.25
-  cp14RandomProducts:
-  - CP14BasicEffectSatiateHunger: 0.25
-  - CP14BasicEffectHealPoison: 0.25
   effects:
   - !type:CP14AffectSolutionTemperature
     addTemperature: -250

Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/brewing_complex.yml

@@ -1,44 +0,0 @@
-# Idea:
-# A more comprehensive way to get the base effects from several ingredients at once. Can give rarer effects, but at the cost of a large number of different effects in the pile.
-
-# Rules:
-# 1) all values must be multiples of 0.25
-# 2) 25% products must be occupied by the empty solution
-# 3) there should be 3 different effects as a result. One of them is very useful, the second useful, the third useless.
-# 4) all reactions should take place at a temperature of 500, and reduce the temperature by 250.
-# 5) the priority should be higher than that of a simple brewing reaction
-
-- type: reaction
-  id: CP14BloodGrassAndWildSageSapBrewing
-  minTemp: 500
-  priority: 3
-  reactants:
-    CP14BloodGrassSap:
-      amount: 0.5
-    CP14WildSageSap:
-      amount: 0.5
-  products:
-    CP14BasicEffectEmpty: 0.25
-    CP14BasicEffectHealBrute: 0.25
-    CP14BasicEffectEmoteCough: 0.25
-    CP14BasicEffectSatiateHunger: 0.25
-  effects:
-  - !type:CP14AffectSolutionTemperature
-    addTemperature: -250
-
-- type: reaction
-  id: CP14QuartzAndAgaricBrewing
-  minTemp: 500
-  priority: 3
-  reactants:
-    CP14AgaricMushroom:
-      amount: 0.5
-    CP14GroundQuartz:
-      amount: 0.5
-  products:
-    CP14BasicEffectEmpty: 0.25
-    CP14BasicEffectDamagePoison: 0.5
-    CP14BasicEffectVomit: 0.25
-  effects:
-  - !type:CP14AffectSolutionTemperature
-    addTemperature: -250

Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/brewing_simple.yml

@@ -1,11 +1,6 @@
 # Idea:
 # The easiest way to get basic effects from various herbs. Has the highest level of empty solution.
 
-# Rules:
-# 1) all values must be multiples of 0.25
-# 2) 50%+ products must be occupied by the empty solution
-# 3) one result must be useful, the other useless.
-# 4) all reactions should take place at a temperature of 500, and reduce the temperature by 250.
 
 - type: reaction
   id: CP14AgaricShroomBrewing
@@ -14,12 +9,19 @@
   reactants:
     CP14AgaricMushroom:
       amount: 1
+    CP14GroundQuartz:
+      amount: 1
   products:
-    CP14BasicEffectEmpty: 0.5
-    CP14BasicEffectDamagePoison: 0.25
+    CP14BasicEffectEmpty: 0.75
+    CP14BasicEffectDamagePoison: 0.5
+    CP14BasicEffectRainbow: 0.25
   cp14RandomProducts:
   - CP14BasicEffectVomit: 0.25
-  - CP14BasicEffectRainbow: 0.25
+    CP14BasicEffectDamageBrute: 0.25
+  - CP14BasicEffectSatiateHunger: 0.25
+    CP14BasicEffectRainbow: 0.25
+  - CP14BasicEffectSatiateThirst: 0.25
+    CP14BasicEffectVomit: 0.25
   effects:
   - !type:CP14AffectSolutionTemperature
     addTemperature: -250
@@ -31,25 +33,19 @@
   reactants:
     CP14WildSageSap:
       amount: 1
-  products:
-    CP14BasicEffectEmpty: 0.5
-    CP14BasicEffectHealBrute: 0.25
-  cp14RandomProducts:
-  - CP14BasicEffectEmoteCough: 0.25
-  - CP14BasicEffectHealCold: 0.25
-  effects:
-  - !type:CP14AffectSolutionTemperature
-    addTemperature: -250
-
-- type: reaction
-  id: CP14GroundQuartzBrewing
-  minTemp: 500
-  priority: 2
-  reactants:
     CP14GroundQuartz:
       amount: 1
   products:
-    CP14BasicEffectEmpty: 1
+    CP14BasicEffectEmpty: 0.75
+    CP14BasicEffectHealBrute: 0.5
+    CP14BasicEffectEmoteCough: 0.25
+  cp14RandomProducts:
+  - CP14BasicEffectRainbow: 0.25
+    CP14BasicEffectHealCold: 0.25
+  - CP14BasicEffectEmoteCough: 0.25
+    CP14BasicEffectHealPoison: 0.25
+  - CP14BasicEffectEmoteCough: 0.25
+    CP14BasicEffectHealPoison: 0.25
   effects:
   - !type:CP14AffectSolutionTemperature
     addTemperature: -250
@@ -61,12 +57,12 @@
   reactants:
     CP14LumiMushroom:
       amount: 1
+    CP14GroundQuartz:
+      amount: 1
   products:
-    CP14BasicEffectEmpty: 0.5
-    CP14BasicEffectVomit: 0.25
-  cp14RandomProducts:
-  - CP14BasicEffectRainbow: 0.25
-  - CP14BasicEffectEmoteCough: 0.25
+    CP14BasicEffectEmpty: 0.75
+    CP14BasicEffectVomit: 0.5
+    CP14BasicEffectRainbow: 0.5
   effects:
   - !type:CP14AffectSolutionTemperature
     addTemperature: -250

Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/chromium_inverse.yml

@@ -12,10 +12,8 @@
   reactants:
     CP14ChromiumSlime:
       amount: 1
-    CP14BasicEffectEmpty:
-      amount: 1
   products:
-    CP14BasicEffectEmpty: 2
+    CP14BasicEffectEmpty: 1
   effects:
   - !type:CP14InverseEffect
     inversion:

Resources/Prototypes/_CP14/Recipes/Reactions/Alchemy/mixing_simple.yml

@@ -9,113 +9,100 @@
 
 - type: reaction
   id: CP14DamagePoisonSplitting
+  minTemp: 450
   priority: 3
   reactants:
     CP14BasicEffectDamagePoison:
       amount: 0.5
     CP14BloodGrassSap:
-      amount: 0.25
-    CP14BasicEffectEmpty: 
-      amount: 0.25
+      amount: 0.5
   products:
-    CP14BasicEffectDamageBrute: 0.25
+    CP14BasicEffectDamageBrute: 0.5
   cp14RandomProducts:
-  - CP14BasicEffectRainbow: 0.25
-  - CP14BasicEffectDamageBrute: 0.25
+  - CP14BasicEffectRainbow: 0.5
+  - CP14BasicEffectDamageCold: 0.5
+  - CP14BasicEffectDrunk: 0.5
 
 - type: reaction
   id: CP14HealBruteSplitting
+  minTemp: 450
   priority: 3
   reactants:
     CP14BasicEffectHealBrute:
       amount: 0.5
     CP14AgaricMushroom:
-      amount: 0.25
-    CP14BasicEffectEmpty: 
-      amount: 0.25
+      amount: 0.5
   products:
-    CP14BasicEffectSatiateHunger: 0.25
-    CP14BasicEffectSatiateThirst: 0.25
+    CP14BasicEffectSatiateHunger: 0.5
+    CP14BasicEffectSatiateThirst: 0.5
 
 - type: reaction
   id: CP14SatiateHungerSplitting
+  minTemp: 450
   priority: 3
   reactants:
     CP14BasicEffectSatiateHunger:
       amount: 0.5
     CP14WildSageSap:
-      amount: 0.25
-    CP14BasicEffectEmpty: 
-      amount: 0.25
+      amount: 0.5
   products:
-    CP14BasicEffectHealBrute: 0.25
+    CP14BasicEffectHealBrute: 0.5
   cp14RandomProducts:
-  - CP14BasicEffectEmoteCough: 0.25
-  - CP14BasicEffectHealBrute: 0.25
+  - CP14BasicEffectEmoteCough: 0.5
+  - CP14BasicEffectDrunk: 0.5
+  - CP14BasicEffectJitter: 0.5
 
 - type: reaction
   id: CP14SatiateThirstSplitting
+  minTemp: 450
   priority: 3
   reactants:
     CP14BasicEffectSatiateThirst:
       amount: 0.5
     CP14WildSageSap:
-      amount: 0.25
-    CP14BasicEffectEmpty: 
-      amount: 0.25
+      amount: 0.5
   products:
     CP14BasicEffectHealBrute: 0.25
-  cp14RandomProducts:
-  - CP14BasicEffectEmoteCough: 0.25
-  - CP14BasicEffectHealBrute: 0.25
+    CP14BasicEffectEmoteCough: 0.25
 
 - type: reaction
   id: CP14EmoteCoughSplitting
+  minTemp: 450
   priority: 3
   reactants:
     CP14BasicEffectEmoteCough:
       amount: 0.5
-    CP14GroundQuartz:
-      amount: 0.25
-    CP14BasicEffectEmpty: 
-      amount: 0.25
+    CP14BloodElf:
+      amount: 0.5
   products:
     CP14BasicEffectSatiateThirst: 0.25
-  cp14RandomProducts:
-  - CP14BasicEffectSatiateThirst: 0.25
-  - CP14BasicEffectHealBrute: 0.25
+    CP14BasicEffectHealBrute: 0.25
 
 - type: reaction
   id: CP14RainbowSplitting
+  minTemp: 450
   priority: 3
   reactants:
     CP14BasicEffectRainbow:
       amount: 0.5
     CP14BloodTiefling:
-      amount: 0.25
-    CP14BasicEffectEmpty: 
-      amount: 0.25
+      amount: 0.5
   products:
     CP14BasicEffectHealCold: 0.25
-  cp14RandomProducts:
-  - CP14BasicEffectSatiateThirst: 0.25
-  - CP14BasicEffectHealCold: 0.25
+    CP14BasicEffectSatiateThirst: 0.25
 
 - type: reaction
   id: CP14VomitSplitting
+  minTemp: 450
   priority: 3
   reactants:
     CP14BasicEffectVomit:
       amount: 0.5
     CP14BloodTiefling:
-      amount: 0.25
-    CP14BasicEffectEmpty:
-      amount: 0.25
+      amount: 0.5
   products:
     CP14BasicEffectDamagePoison: 0.25
-  cp14RandomProducts:
-  - CP14BasicEffectEmoteCough: 0.25
-  - CP14BasicEffectDamagePoison: 0.25
+    CP14BasicEffectEmoteCough: 0.25
 
 - type: reaction
   id: CP14EmptySplitting

Resources/Prototypes/_CP14/Recipes/Reactions/dye_brewing.yml

@@ -0,0 +1,25 @@
+- type: reaction
+  id: CP14RedRoseBrewing
+  impact: Low
+  quantized: true
+  conserveEnergy: false
+  minTemp: 500
+  reactants:
+    CP14RedRosePulp:
+      amount: 10
+  effects:
+  - !type:CreateEntityReactionEffect
+      entity: CP14DyeRed
+
+- type: reaction
+  id: CP14YellowDayflinBrewing
+  impact: Low
+  quantized: true
+  conserveEnergy: false
+  minTemp: 500
+  reactants:
+    CP14YellowDayflinPulp:
+      amount: 10
+  effects:
+  - !type:CreateEntityReactionEffect
+      entity: CP14DyeYellow

Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml

@@ -3,6 +3,7 @@
   craftTime: 2
   entities:
     CP14String: 1
+    CP14DyeBlue: 1
   stacks:
     CP14Cloth: 2
   result: CP14ClothingShirtCottonBlue
@@ -12,6 +13,7 @@
   craftTime: 2
   entities:
     CP14String: 1
+    CP14DyeBlack: 1
   stacks:
     CP14Cloth: 3
   result: CP14ClothingShirtCottonBlack
@@ -21,6 +23,7 @@
   craftTime: 2
   entities:
     CP14String: 1
+    CP14DyePurple: 1
   stacks:
     CP14Cloth: 3
   result: CP14ClothingShirtCottonPurple
@@ -30,6 +33,7 @@
   craftTime: 2
   entities:
     CP14String: 1
+    CP14DyeRed: 1
   stacks:
     CP14Cloth: 3
   result: CP14ClothingShirtCottonRed
@@ -48,6 +52,7 @@
   craftTime: 2
   entities:
     CP14String: 1
+    CP14DyeYellow: 1
   stacks:
     CP14Cloth: 3
   result: CP14ClothingShirtCottonYellow
@@ -57,6 +62,8 @@
   craftTime: 2
   entities:
     CP14String: 1
+    CP14DyeBlue: 1
+    CP14DyeRed: 1
   stacks:
     CP14Cloth: 3
   result: CP14ClothingShirtMercenary
@@ -66,6 +73,9 @@
   craftTime: 2
   entities:
     CP14String: 1
+    CP14DyeYellow: 1
+    CP14DyeBlue: 1
+    CP14DyeRed: 1
   stacks:
     CP14Cloth: 3
   result: CP14ClothingShirtYellowWizard
@@ -75,6 +85,7 @@
   craftTime: 2
   entities:
     CP14String: 1
+    CP14DyeBlue: 1
   stacks:
     CP14Cloth: 3
   result: CP14ClothingCloakSimpleDarkBlue
@@ -102,6 +113,7 @@
   craftTime: 2
   entities:
     CP14String: 1
+    CP14DyeBlue: 1
   stacks:
     CP14Cloth: 2
   result: CP14ClothingPantsTrouserDarkBlue
@@ -111,6 +123,7 @@
   craftTime: 2
   entities:
     CP14String: 1
+    CP14DyeBlack: 1
   stacks:
     CP14Cloth: 2
   result: CP14ClothingDressBlack
@@ -120,6 +133,7 @@
   craftTime: 2
   entities:
     CP14String: 1
+    CP14DyeYellow: 1
   stacks:
     CP14Cloth: 2
   result: CP14ClothingPantsSouthernMagician
@@ -129,6 +143,8 @@
   craftTime: 2
   entities:
     CP14String: 1
+    CP14DyeBlue: 1
+    CP14DyeRed: 1
   stacks:
     CP14Cloth: 2
   result: CP14ClothingPantsMercenaryTrousers
@@ -138,6 +154,7 @@
   craftTime: 2
   entities:
     CP14String: 1
+    CP14DyeRed: 1
   stacks:
     CP14Cloth: 1
   result: CP14ClothingHeadRedBeret
@@ -147,6 +164,7 @@
   craftTime: 2
   entities:
     CP14String: 1
+    CP14DyePurple: 1
   stacks:
     CP14Cloth: 1
   result: CP14ClothingHeadPurpleBeret
@@ -156,6 +174,7 @@
   craftTime: 2
   entities:
     CP14String: 1
+    CP14DyeYellow: 1
   stacks:
     CP14Cloth: 1
   result: CP14ClothingHeadYellowBeret
@@ -165,6 +184,7 @@
   craftTime: 2
   entities:
     CP14String: 1
+    CP14DyeBlue: 1
   stacks:
     CP14Cloth: 1
   result: CP14ClothingHeadBlueBeret
@@ -174,6 +194,7 @@
   craftTime: 2
   entities:
     CP14String: 1
+    CP14DyeBlack: 1
   stacks:
     CP14Cloth: 1
   result: CP14ClothingHeadBlackBeret
@@ -183,6 +204,7 @@
   craftTime: 2
   entities:
     CP14String: 1
+    CP14DyeYellow: 1
   stacks:
     CP14Cloth: 2
   result: CP14ClothingHeadYellowHat
@@ -192,6 +214,8 @@
   craftTime: 2
   entities:
     CP14String: 1
+    CP14DyeRed: 1
+    CP14DyeBlue: 1
   stacks:
     CP14Cloth: 2
   result: CP14ClothingHeadMercenaryBeret

Resources/Textures/_CP14/Objects/Flora/Flowers/red_rose.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "All rights reserved for the CrystallPunk14 project only",
+  "copyright": "Created by TheShuEd (Github) for CrystallPunk14",
+  "states": [
+    {
+      "name": "base1"
+    },
+    {
+      "name": "base2"
+    }
+  ]
+}

Resources/Textures/_CP14/Objects/Flora/Flowers/yellow_dayflin.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "All rights reserved for the CrystallPunk14 project only",
+  "copyright": "Created by TheShuEd (Github) for CrystallPunk14",
+  "states": [
+    {
+      "name": "base1"
+    },
+    {
+      "name": "base2"
+    }
+  ]
+}

Resources/Textures/_CP14/Objects/Materials/dye.rsi/meta.json

@@ -0,0 +1,17 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "All rights reserved for the CrystallPunk14 project only",
+  "copyright": "Created by TheShuEd (Github) for CrystallPunk14",
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "powder"
+    }
+  ]
+}