Quartz crystal as alchemy reagent (#217)

* added quartz as alchemy reagent

* quartz is not deadend

* added barrels

Resources/Locale/en-US/_CP14/flavors/flavor-profiles.ftl

@@ -9,4 +9,5 @@ cp14-flavor-base-stinging = stinging
 # Complex
 
 cp14-flavor-complex-water = like water
-cp14-flavor-complex-chromium = like something gut-wrenching
+cp14-flavor-complex-vomit = like something gut-wrenching
+cp14-flavor-complex-quartz = squeaks in your teeth

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

@@ -23,4 +23,7 @@ cp14-reagent-name-basic-satiate-thirst = Life-giving moisture
 cp14-reagent-desc-basic-satiate-thirst = A liquid that tastes very much like water. It tastes strange, but it's a good thirst quencher.
 
 cp14-reagent-name-basic-emote-cough =  Coughing solution
-cp14-reagent-desc-basic-emote-cough = Coughs profusely, but harmlessly.
+cp14-reagent-desc-basic-emote-cough = Coughs profusely, but harmlessly.
+
+cp14-reagent-name-basic-vomit = Vomit solution
+cp14-reagent-desc-basic-vomit = A substance that causes severe vomiting spasms. May help with food poisoning.

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

@@ -1,20 +1,23 @@
-cp14-reagent-name-blood = blood
+cp14-reagent-name-blood = Blood
 cp14-reagent-desc-blood = The life energy of a living warm-blooded creatures.
 
-cp14-reagent-name-blood-tiefling = tiefling blood
+cp14-reagent-name-blood-tiefling = Tiefling blood
 cp14-reagent-desc-blood-tiefling = The life energy of a fire-blooded creature.
 
-cp14-reagent-name-blood-elf = elf blood
+cp14-reagent-name-blood-elf = Elf blood
 cp14-reagent-desc-blood-elf = The life energy of a magical creature.
 
-cp14-reagent-name-bloodgrasssap = bloodgrass sap
+cp14-reagent-name-bloodgrasssap = Bloodgrass sap
 cp14-reagent-desc-bloodgrasssap = A squeeze from the ubiquitous blood grass. It has no particular remarkable qualities, but with proper skill can be prepared into a nutritious food.
 
-cp14-reagent-name-agaric-shroom = fly agaric juice
+cp14-reagent-name-agaric-shroom = Fly agaric juice
 cp14-reagent-desc-agaric-shroom = It is this juice that the fly mushrooms owe their poisonousness to. Consumption causes severe ailments and hallucinations, but experienced alchemists can find other uses for these mushrooms.
 
-cp14-reagent-name-chromium-slime = chromium slime
+cp14-reagent-name-chromium-slime = Chromium slime
 cp14-reagent-desc-chromium-slime = A rare substance found in water streams, it has unique properties that allow it to invert the effects of reagents, but can completely ruin a potion if dosed incorrectly.
 
-cp14-reagent-name-wild-sage-sap = wild sage juice
+cp14-reagent-name-wild-sage-sap = Wild sage juice
 cp14-reagent-desc-wild-sage-sap = Juice of a ubiquitous medicinal plant, not bad at healing physical injuries, and inducing coughing.
+
+cp14-reagent-name-grounded-quartz = Ground quartz
+cp14-reagent-desc-grounded-quartz = A powder obtained from grinding quartz fragments. It has weak cleaning properties.

Resources/Locale/ru-RU/_CP14/flavors/flavor-profiles.ftl

@@ -9,4 +9,5 @@ cp14-flavor-base-stinging = жгущее
 # Complex
 
 cp14-flavor-complex-water = как вода
-cp14-flavor-complex-chromium = как что-то выворачивающее наизнанку
+cp14-flavor-complex-vomit = как что-то выворачивающее наизнанку
+cp14-flavor-complex-quartz = скрипит на зубах

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

@@ -29,4 +29,7 @@ cp14-reagent-name-basic-heal-cold = Согревающий раствор
 cp14-reagent-desc-basic-heal-cold = Способен исцелять даже серьезные обморожения.
 
 cp14-reagent-name-basic-damage-cold = Ледяной раствор
-cp14-reagent-desc-basic-damage-cold = Опасное вещество, вызывающее сильные обморожения.
+cp14-reagent-desc-basic-damage-cold = Опасное вещество, вызывающее сильные обморожения.
+
+cp14-reagent-name-basic-vomit = Рвотный раствор
+cp14-reagent-desc-basic-vomit = Вещество, вызывающее сильные рвотные спазмы. Может помочь при пищевом отравлении.

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

@@ -1,20 +1,23 @@
-cp14-reagent-name-blood = кровь
+cp14-reagent-name-blood = Кровь
 cp14-reagent-desc-blood = Жизненная энергия живого теплокровного существа.
 
-cp14-reagent-name-blood-tiefling = кровь тифлинга
+cp14-reagent-name-blood-tiefling = Кровь тифлинга
 cp14-reagent-desc-blood-tiefling = Жизненная энергия огнекровного существа.
 
-cp14-reagent-name-blood-elf = кровь эльфа
+cp14-reagent-name-blood-elf = Кровь эльфа
 cp14-reagent-desc-blood-elf = Жизненная энергия волшебного существа.
 
-cp14-reagent-name-bloodgrasssap = сок кровьтравы
+cp14-reagent-name-bloodgrasssap = Сок кровьтравы
 cp14-reagent-desc-bloodgrasssap = Выжимка из повсеместно растущей кровьтравы. Не имеет особых примечательных качеств, но при должной сноровке может быть приготовлена в питательную пищу.
 
-cp14-reagent-name-agaric-shroom = сок мухомора
+cp14-reagent-name-agaric-shroom = Сок мухомора
 cp14-reagent-desc-agaric-shroom = Именно этому соку мухоморы обязаны своей ядовитостью. Употребление вызывает сильные недомогания и галлюцинации, но опытные алхимики смогут найти этим грибам и другие применения.
 
-cp14-reagent-name-chromium-slime = хромиевая слизь
+cp14-reagent-name-chromium-slime = Хромиевая слизь
 cp14-reagent-desc-chromium-slime = Редкая субстанция, которую можно встретить в водных потоках, имеет уникальные свойства, позволяющие инвертировать эффекты реагентов, но при неправильной дозировке может полностью испортить зелье.
 
-cp14-reagent-name-wild-sage-sap = сок дикого шалфея
+cp14-reagent-name-wild-sage-sap = Сок дикого шалфея
 cp14-reagent-desc-wild-sage-sap = Сок вездерастущего лечебного растения, неплохо заживляющий физические травмы, и вызывающий откашливание.
+
+cp14-reagent-name-grounded-quartz = Размолотый кварц
+cp14-reagent-desc-grounded-quartz = Порошок, получаемый из размалывания осколков кварца. Имеет слабые очищающие свойства.

Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/herbals.yml

@@ -152,4 +152,33 @@
         maxVol: 20
         reagents:
         - ReagentId: CP14WildSageSap
-          Quantity: 8
+          Quantity: 8
+
+- type: entity
+  id: CP14QuartzShard
+  parent: BaseItem
+  name: quartz shard
+  description: a shard of once luminous crystal. Unfortunately, careless handling destroyed much of the potential.
+  components:
+  - type: Tag
+    tags:
+    - CP14FitInMortar
+  - type: Item
+    size: Tiny
+  - type: Sprite
+    sprite: _CP14/Structures/crystal.rsi
+    layers:
+      - state: shard
+        map: ["random"]
+  - type: RandomSprite
+    available:
+    - random:
+        shard: ""
+        shard2: ""
+        shard3: ""
+        shard4: ""
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: CP14GroundQuartz
+        Quantity: 3

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

@@ -5,6 +5,8 @@
   parent: 
   - BaseStructure
   abstract: true
+  name: sparkling quartz
+  description: bioluminescent quartz crystals that can take on any color - a very handy light source in a deep caves. Unfortunately, the luminous properties are very hard to preserve.
   placement:
     mode: SnapgridCenter
   components:
@@ -29,6 +31,11 @@
               collection: GlassBreak
           - !type:DoActsBehavior
             acts: [ "Destruction" ]
+          - !type:SpawnEntitiesBehavior
+            spawn:
+              CP14QuartzShard:
+                min: 0
+                max: 1
   - type: Fixtures
     fixtures:
       fix1:
@@ -54,8 +61,7 @@
 - type: entity
   id: CP14WallmountCrystalRubies
   parent: CP14WallmountCrystalBase
-  name: sparkling rubies
-  description: wawa
+  suffix: Red
   components:
   - type: RandomSprite
     cP14InheritBaseColor: "#ff3d0b"
@@ -65,8 +71,7 @@
 - type: entity
   id: CP14WallmountCrystalTopazes
   parent: CP14WallmountCrystalBase
-  name: sparkling topazes
-  description: wawa
+  suffix: Yellow
   components:
   - type: RandomSprite
     cP14InheritBaseColor: "#ffe269"
@@ -76,8 +81,7 @@
 - type: entity
   id: CP14WallmountCrystalEmeralds
   parent: CP14WallmountCrystalBase
-  name: sparkling emeralds
-  description: wawa
+  suffix: Green
   components:
   - type: RandomSprite
     cP14InheritBaseColor: "#30be81"
@@ -87,8 +91,7 @@
 - type: entity
   id: CP14WallmountCrystalSapphires
   parent: CP14WallmountCrystalBase
-  name: sparkling sapphires
-  description: wawa
+  suffix: Cyan
   components:
   - type: RandomSprite
     cP14InheritBaseColor: "#5eabeb"
@@ -98,8 +101,7 @@
 - type: entity
   id: CP14WallmountCrystalAmethysts
   parent: CP14WallmountCrystalBase
-  name: sparkling amethysts
-  description: wawa
+  suffix: Purple
   components:
   - type: RandomSprite
     cP14InheritBaseColor: "#a878d1"
@@ -109,8 +111,7 @@
 - type: entity
   id: CP14WallmountCrystalDiamonds
   parent: CP14WallmountCrystalBase
-  name: sparkling diamonds
-  description: wawa
+  suffix: White
   components:
   - type: RandomSprite
     cP14InheritBaseColor: "#f8f8f8"
@@ -123,6 +124,8 @@
   id: CP14CrystalBase
   abstract: true
   parent: BaseRock
+  name: sparkling quartz
+  description: bioluminescent quartz crystals that can take on any color - a very handy light source in a deep caves. Unfortunately, the luminous properties are very hard to preserve.
   components:
   - type: Sprite
     drawdepth: Mobs
@@ -157,6 +160,11 @@
               collection: GlassBreak
           - !type:DoActsBehavior
             acts: [ "Destruction" ]
+          - !type:SpawnEntitiesBehavior
+            spawn:
+              CP14QuartzShard:
+                min: 1
+                max: 3
   - type: Fixtures
     fixtures:
       fix1:
@@ -179,9 +187,7 @@
 - type: entity
   id: CP14CrystalRubiesSmall
   parent: CP14CrystalBase
-  name: sparkling rubies
-  suffix: Small
-  description: wawa
+  suffix: Red, Small
   components:
   - type: PointLight
     color: "#ff3d0b"
@@ -196,9 +202,7 @@
 - type: entity
   id: CP14CrystalRubiesMedium
   parent: CP14CrystalBase
-  name: sparkling rubies
-  suffix: Medium
-  description: wawa
+  suffix: Red, Medium
   components:
   - type: PointLight
     color: "#ff3d0b"
@@ -213,9 +217,7 @@
 - type: entity
   id: CP14CrystalRubiesBig
   parent: CP14CrystalBase
-  name: sparkling rubies
-  suffix: Big
-  description: wawa
+  suffix: Red, Big
   components:
   - type: PointLight
     color: "#ff3d0b"
@@ -230,9 +232,7 @@
 - type: entity
   id: CP14CrystalTopazesSmall
   parent: CP14CrystalBase
-  name: sparkling topazes
-  suffix: Small
-  description: wawa
+  suffix: Yellow, Small
   components:
   - type: PointLight
     color: "#ffe269"
@@ -247,9 +247,7 @@
 - type: entity
   id: CP14CrystalTopazesMedium
   parent: CP14CrystalBase
-  name: sparkling topazes
-  suffix: Medium
-  description: wawa
+  suffix: Yellow, Medium
   components:
   - type: PointLight
     color: "#ffe269"
@@ -264,9 +262,7 @@
 - type: entity
   id: CP14CrystalTopazesBig
   parent: CP14CrystalBase
-  name: sparkling topazes
-  description: wawa
-  suffix: Big
+  suffix: Yellow, Big
   components:
   - type: PointLight
     color: "#ffe269"
@@ -281,9 +277,7 @@
 - type: entity
   id: CP14CrystalEmeraldsSmall
   parent: CP14CrystalBase
-  name: sparkling emeralds
-  suffix: Small
-  description: wawa
+  suffix: Green, Small
   components:
   - type: PointLight
     color: "#30be81"
@@ -298,9 +292,7 @@
 - type: entity
   id: CP14CrystalEmeraldsMedium
   parent: CP14CrystalBase
-  name: sparkling emeralds
-  suffix: Medium
-  description: wawa
+  suffix: Green, Medium
   components:
   - type: PointLight
     color: "#30be81"
@@ -315,9 +307,7 @@
 - type: entity
   id: CP14CrystalEmeraldsBig
   parent: CP14CrystalBase
-  name: sparkling emeralds
-  description: wawa
-  suffix: Big
+  suffix: Green, Big
   components:
   - type: PointLight
     color: "#30be81"
@@ -332,9 +322,7 @@
 - type: entity
   id: CP14CrystalSapphiresSmall
   parent: CP14CrystalBase
-  name: sparkling sapphires
-  suffix: Small
-  description: wawa
+  suffix: Cyan, Small
   components:
   - type: PointLight
     color: "#5eabeb"
@@ -349,9 +337,7 @@
 - type: entity
   id: CP14CrystalSapphiresMedium
   parent: CP14CrystalBase
-  name: sparkling sapphires
-  suffix: Medium
-  description: wawa
+  suffix: Cyan, Medium
   components:
   - type: PointLight
     color: "#5eabeb"
@@ -366,9 +352,7 @@
 - type: entity
   id: CP14CrystalSapphiresBig
   parent: CP14CrystalBase
-  name: sparkling sapphires
-  suffix: Big
-  description: wawa
+  suffix: Cyan, Big
   components:
   - type: PointLight
     color: "#5eabeb"
@@ -383,9 +367,7 @@
 - type: entity
   id: CP14CrystalAmethystsSmall
   parent: CP14CrystalBase
-  name: sparkling amethysts
-  suffix: Small
-  description: wawa
+  suffix: Purple, Small
   components:
   - type: PointLight
     color: "#a878d1"
@@ -400,9 +382,7 @@
 - type: entity
   id: CP14CrystalAmethystsMedium
   parent: CP14CrystalBase
-  name: sparkling amethysts
-  suffix: Medium
-  description: wawa
+  suffix: Purple, Medium
   components:
   - type: PointLight
     color: "#a878d1"
@@ -417,9 +397,7 @@
 - type: entity
   id: CP14CrystalAmethystsBig
   parent: CP14CrystalBase
-  name: sparkling amethysts
-  suffix: Big
-  description: wawa
+  suffix: Purple, Big
   components:
   - type: PointLight
     color: "#a878d1"
@@ -434,9 +412,7 @@
 - type: entity
   id: CP14CrystalDiamondsSmall
   parent: CP14CrystalBase
-  name: sparkling diamonds
-  description: wawa
-  suffix: Small
+  suffix: White, Small
   components:
   - type: PointLight
     color: "#f8f8f8"
@@ -451,9 +427,7 @@
 - type: entity
   id: CP14CrystalDiamondsMedium
   parent: CP14CrystalBase
-  name: sparkling diamonds
-  suffix: Medium
-  description: wawa
+  suffix: White, Medium
   components:
   - type: PointLight
     color: "#f8f8f8"
@@ -468,9 +442,7 @@
 - type: entity
   id: CP14CrystalDiamondsBig
   parent: CP14CrystalBase
-  name: sparkling diamonds
-  suffix: Big
-  description: wawa
+  suffix: White, Big
   components:
   - type: PointLight
     color: "#f8f8f8"

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

@@ -114,4 +114,88 @@
       barrel:
         reagents:
         - ReagentId: CP14Blood
+          Quantity: 300
+
+- type: entity
+  id: CP14BarrelBloodTiefling
+  parent: CP14BaseBarrel
+  suffix: Tiefling Blood
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      barrel:
+        reagents:
+        - ReagentId: CP14BloodTiefling
+          Quantity: 300
+
+- type: entity
+  id: CP14BarrelBloodElf
+  parent: CP14BaseBarrel
+  suffix: Elf Blood
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      barrel:
+        reagents:
+        - ReagentId: CP14BloodElf
+          Quantity: 300
+
+- type: entity
+  id: CP14BarrelBloodGrassSap
+  parent: CP14BaseBarrel
+  suffix: Bloodgrass sap
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      barrel:
+        reagents:
+        - ReagentId: CP14BloodGrassSap
+          Quantity: 300
+
+- type: entity
+  id: CP14BarrelAgaricMushroom
+  parent: CP14BaseBarrel
+  suffix: Agaric mushroom
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      barrel:
+        reagents:
+        - ReagentId: CP14AgaricMushroom
+          Quantity: 300
+
+- type: entity
+  id: CP14BarrelChromiumSlime
+  parent: CP14BaseBarrel
+  suffix: Chromium Slime
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      barrel:
+        reagents:
+        - ReagentId: CP14ChromiumSlime
+          Quantity: 300
+
+- type: entity
+  id: CP14BarrelWildSageSap
+  parent: CP14BaseBarrel
+  suffix: Wild Sage sap
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      barrel:
+        reagents:
+        - ReagentId: CP14WildSageSap
+          Quantity: 300
+
+- type: entity
+  id: CP14BarrelGroundQuartz
+  parent: CP14BaseBarrel
+  suffix: Ground Quartz
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      barrel:
+        reagents:
+        - ReagentId: CP14GroundQuartz
           Quantity: 300

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

@@ -49,4 +49,4 @@
     anchored: true
     noRot: true
   - type: Anchorable
-  - type: Pullable
+  - type: Pullable

Resources/Prototypes/_CP14/Flavors/flavor.yml

@@ -33,6 +33,11 @@
   description: cp14-flavor-complex-water
 
 - type: flavor
-  id: CP14Chromium
+  id: CP14Vomit
   flavorType: Complex
-  description: cp14-flavor-complex-chromium
+  description: cp14-flavor-complex-vomit
+
+- type: flavor
+  id: CP14Quartz
+  flavorType: Complex
+  description: cp14-flavor-complex-quartz

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

@@ -170,4 +170,18 @@
       - !type:Emote
         showInChat: true
         emote: Cough
-        probability: 0.3
+        probability: 0.3
+
+- type: reagent
+  id: CP14BasicEffectVomit
+  name: cp14-reagent-name-basic-vomit
+  desc: cp14-reagent-desc-basic-vomit
+  group: CP14BasicEffect
+  flavor: CP14Vomit
+  color: "#87a667"
+  physicalDesc: cp14-reagent-physical-desc-colorless
+  metabolisms:
+    Food:
+      effects:
+      - !type:ChemVomit
+        probability: 0.25

Resources/Prototypes/_CP14/Reagents/biological.yml

@@ -1,4 +1,3 @@
-
 - type: reagent
   id: CP14Blood
   group: CP14Biological
@@ -101,7 +100,7 @@
   group: CP14Biological
   name: cp14-reagent-name-chromium-slime
   desc: cp14-reagent-desc-chromium-slime
-  flavor: CP14Chromium
+  flavor: CP14Vomit
   color: "#3b4872"
   physicalDesc: cp14-reagent-physical-desc-colorless
   slippery: true
@@ -131,3 +130,17 @@
         emote: Cough
         showInChat: true
         probability: 0.15
+
+- type: reagent
+  id: CP14GroundQuartz
+  group: CP14Biological #TODO
+  name: cp14-reagent-name-grounded-quartz
+  desc: cp14-reagent-desc-grounded-quartz
+  flavor: CP14Quartz
+  color: "#9aa6ad"
+  physicalDesc: cp14-reagent-physical-desc-colorless
+  metabolisms:
+    Food:
+      effects:
+      - !type:ChemVomit
+        probability: 0.05

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

@@ -23,5 +23,22 @@
     CP14BasicEffectSatiateHunger: 0.25
     CP14BasicEffectEmoteCough: 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

@@ -3,7 +3,7 @@
 
 # Rules:
 # 1) all values must be multiples of 0.25
-# 2) 50% products must be occupied by the empty solution
+# 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.
 
@@ -34,5 +34,19 @@
     CP14BasicEffectHealBrute: 0.25
     CP14BasicEffectEmoteCough: 0.25
   effects:
+  - !type:CP14AffectSolutionTemperature
+    addTemperature: -250
+
+- type: reaction
+  id: CP14GroundQuartzBrewing
+  minTemp: 500
+  priority: 2
+  reactants:
+    CP14GroundQuartz:
+      amount: 1
+  products:
+    CP14BasicEffectEmpty: 0.75
+    CP14BasicEffectVomit: 0.25
+  effects:
   - !type:CP14AffectSolutionTemperature
     addTemperature: -250

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

@@ -69,7 +69,7 @@
   reactants:
     CP14BasicEffectEmoteCough:
       amount: 0.5
-    CP14BloodElf:
+    CP14GroundQuartz:
       amount: 0.25
     CP14BasicEffectEmpty: 
       amount: 0.25
@@ -89,4 +89,18 @@
       amount: 0.25
   products:
     CP14BasicEffectSatiateThirst: 0.25
-    CP14BasicEffectHealCold: 0.25
+    CP14BasicEffectHealCold: 0.25
+
+- type: reaction
+  id: CP14VomitSplitting
+  priority: 3
+  reactants:
+    CP14BasicEffectVomit:
+      amount: 0.5
+    CP14BloodTiefling:
+      amount: 0.25
+    CP14BasicEffectEmpty:
+      amount: 0.25
+  products:
+    CP14BasicEffectEmoteCough: 0.25
+    CP14BasicEffectDamagePoison: 0.25

Resources/Textures/_CP14/Structures/crystal.rsi/meta.json

@@ -27,6 +27,15 @@
     },
     {
       "name": "shard"
+    },
+    {
+      "name": "shard2"
+    },
+    {
+      "name": "shard3"
+    },
+    {
+      "name": "shard4"
     }
   ]
 }