Agaric shroom! (#172)

* agaric shrooms!

* add agaric reagents

* add agaric into worldgen

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

@@ -2,6 +2,8 @@
 
 cp14-flavor-base-metallic = metallic
 cp14-flavor-base-invigorating = invigorating
+cp14-flavor-base-bitterly = bitter
+cp14-flavor-base-sweetly = sweet
 
 # Complex
 

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

@@ -1,3 +1,6 @@
+cp14-reagent-name-basic-empty = Empty solution
+cp14-reagent-desc-basic-empty = Natural solvent. Essentially a useless liquid that dilutes useful effects. Getting rid of it will give you much more concentrated solutions.
+
 cp14-reagent-name-basic-heal-blunt = Healing solution for bruises
 cp14-reagent-desc-basic-heal-blunt = Effectively treats bones and bruises.
 
@@ -7,6 +10,15 @@ cp14-reagent-desc-basic-heal-piercing = Effectively heals puncture wounds.
 cp14-reagent-name-basic-heal-slash = Healing solution for cuts.
 cp14-reagent-desc-basic-heal-slash = Effectively heals torn tissue.
 
+cp14-reagent-name-basic-heal-brute = Healing general solution
+cp14-reagent-desc-basic-heal-brute = Less efficacious than specialized solutions, but can heal all types of physical damage.
+
+cp14-reagent-name-basic-damage-poison = Poisonous solution
+cp14-reagent-desc-basic-damage-poison = Capable of causing extreme indigestion, ulcers, intoxication, and in sufficient dosage to cause death.
+
+cp14-reagent-name-see-rainbow = Rainbow solution
+cp14-reagent-desc-see-rainbow = Causes cheerful hallucinations, colors the whole world in rainbow bright colors.
+
 cp14-reagent-name-basic-satiate-hunger = Saturating solution
 cp14-reagent-desc-basic-satiate-hunger = A mixture that effectively restores hunger.
 

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

@@ -1,2 +1,8 @@
 cp14-reagent-name-blood = blood
-cp14-reagent-desc-blood = The life energy of a living warm-blooded creatures.
+cp14-reagent-desc-blood = The life energy of a living warm-blooded creatures.
+
+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-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. 

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

@@ -1,2 +1,4 @@
 cp14-reagent-physical-desc-ferrous = ferrous
-cp14-reagent-physical-desc-scarlet = shimmering scarlet
+cp14-reagent-physical-desc-scarlet = shimmering scarlet
+cp14-reagent-physical-desc-colorless = colorless
+cp14-reagent-physical-desc-viscous = viscous

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

@@ -2,6 +2,8 @@
 
 cp14-flavor-base-metallic = металлически
 cp14-flavor-base-invigorating = живительно
+cp14-flavor-base-bitterly = горько
+cp14-flavor-base-sweetly = сладко
 
 # Complex
 

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

@@ -1,3 +1,6 @@
+cp14-reagent-name-basic-empty = Пустой раствор
+cp14-reagent-desc-basic-empty = Природный растворитель. По сути бесполезная жидкость, разбавляющая полезные эффекты. Избавившись от нее, вы получите куда более концентрированные растворы.
+
 cp14-reagent-name-basic-heal-blunt = Лечебный раствор от ушибов
 cp14-reagent-desc-basic-heal-blunt = Эффективно лечит кости и ушибы.
 
@@ -7,6 +10,15 @@ cp14-reagent-desc-basic-heal-piercing = Эффективно заращивае
 cp14-reagent-name-basic-heal-slash = Лечебный раствор от порезов
 cp14-reagent-desc-basic-heal-slash = Эффективно залечивает разорванные ткани.
 
+cp14-reagent-name-basic-heal-brute = Общий лечебный раствор
+cp14-reagent-desc-basic-heal-brute = Менее эффкетивный, чем специализированные растворы, но способен залечивать все виды физических повреждений.
+
+cp14-reagent-name-basic-damage-poison = Ядовитый раствор
+cp14-reagent-desc-basic-damage-poison = Способен вызвать крайне сильное несварение, язвы, интоксикацию, и при достаточной дозировке привести к смерти.
+
+cp14-reagent-name-see-rainbow = Радужный раствор
+cp14-reagent-desc-see-rainbow = Вызывает веселые галлюцинации, окрашивает весь мир в радужные яркие тона.
+
 cp14-reagent-name-basic-satiate-hunger = Насыщающий раствор
 cp14-reagent-desc-basic-satiate-hunger = Смесь, эффективно восстанавливающая голод.
 

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

@@ -2,4 +2,7 @@ cp14-reagent-name-blood = кровь
 cp14-reagent-desc-blood = Жизненная энергия живого теплокровного существа.
 
 cp14-reagent-name-bloodgrasssap = сок кровьтравы
-cp14-reagent-desc-bloodgrasssap = Выжимка из повсеместно растущей кровьтравы. Не имеет особых примечательных качеств, но при должной сноровке может быть приготовлена в питательную пищу.
+cp14-reagent-desc-bloodgrasssap = Выжимка из повсеместно растущей кровьтравы. Не имеет особых примечательных качеств, но при должной сноровке может быть приготовлена в питательную пищу.
+
+cp14-reagent-name-agaric-shroom = сок мухомора
+cp14-reagent-desc-agaric-shroom = Именно этому соку мухоморы обязаны своей ядовитостью. Употребление вызывает сильные недомогания и галлюцинации, но опытные алхимики смогут найти этим грибам и другие применения.

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

@@ -1,2 +1,4 @@
 cp14-reagent-physical-desc-ferrous = черно-металлическое
-cp14-reagent-physical-desc-scarlet = мерцающе алое
+cp14-reagent-physical-desc-scarlet = мерцающе алое
+cp14-reagent-physical-desc-colorless = бесцветное
+cp14-reagent-physical-desc-viscous = вязкое

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

@@ -0,0 +1,39 @@
+- type: entity
+  id: CP14RandomSpawnerGatherGloodgrass
+  name: bloodgrass spawner
+  parent: MarkerBase
+  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
+  parent: MarkerBase
+  components:
+  - type: Sprite
+    layers:
+      - state: red
+      - sprite: _CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi
+        state: world1
+  - type: RandomSpawner
+    prototypes:
+    - CP14GatherableFlyAgaric
+    - CP14GatherableFlyAgaric2
+    - CP14GatherableFlyAgaric3
+    - CP14GatherableFlyAgaric4
+    - CP14GatherableFlyAgaric5
+    - CP14GatherableFlyAgaric6
+    chance: 0.05
+

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

@@ -34,4 +34,42 @@
         maxVol: 20
         reagents:
         - ReagentId: CP14BloodGrassSap
+          Quantity: 5
+
+- type: entity
+  id: CP14AgaricMushroom
+  parent: FoodProduceBase
+  name: fly agaric
+  description: This poisonous mushroom can often be found near bodies of water or other wet areas. It is not recommended for consumption.
+  components:
+  - type: Item
+    size: Tiny
+  - type: Produce
+  - type: Sprite
+    sprite: _CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi
+    layers:
+      - state: base1
+        map: ["random"]
+  - type: RandomSprite
+    available:
+    - random:
+        base1: ""
+        base2: ""
+        base3: ""
+        base4: ""
+        base5: ""
+  - type: FlavorProfile
+    flavors:
+      - CP14Metallic #TODO
+  - type: Extractable
+    juiceSolution:
+      reagents:
+      - ReagentId: CP14AgaricMushroom
+        Quantity: 5
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20
+        reagents:
+        - ReagentId: CP14AgaricMushroom
           Quantity: 5

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

@@ -45,14 +45,14 @@
       collection: FootstepWater
       params:
         volume: 8
-  #- type: SolutionContainerManager
-  #  solutions:
-  #    pool:
-  #      maxVol: 9999999 #.inf seems to break the whole yaml file, but would definitely be preferable. 
-  #      reagents:
-  #      - ReagentId: CP14Water
-  #        Quantity: 9999999
-  #- type: DrainableSolution
-  #  solution: pool
-  #- type: Drink
-  #  solution: pool
+  - type: SolutionContainerManager
+    solutions:
+      pool:
+        maxVol: 9999999 #.inf seems to break the whole yaml file, but would definitely be preferable. 
+        reagents:
+        - ReagentId: CP14Water
+          Quantity: 9999999
+  - type: DrainableSolution
+    solution: pool
+  - type: Drink
+    solution: pool

Resources/Prototypes/_CP14/Entities/Structures/Specific/herbals.yml

@@ -80,4 +80,69 @@
   parent: CP14GatherableBloodgrass
   components:
   - type: Sprite
-    state: grass5
+    state: grass5
+
+# Fly agaric
+
+- type: entityLootTable
+  id: CP14GatherFlyAgaric
+  entries:
+  - id: CP14AgaricMushroom
+    amount: 1
+    maxAmount: 2
+
+- type: entity
+  id: CP14GatherableFlyAgaric
+  parent: CP14GatherableHerbalBase
+  name: fly agaric
+  description: This poisonous mushroom can often be found near bodies of water or other wet areas. It is not recommended for consumption.
+  suffix: Gatherable
+  components:
+  - type: Sprite
+    snapCardinals: true
+    drawdepth: FloorTiles
+    sprite: _CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi
+    state: world1
+  - type: Gatherable
+    toolWhitelist:
+      tags:
+        - CP14HerbalGathering
+      components:
+        - Hands
+    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

Resources/Prototypes/_CP14/Flavors/flavor.yml

@@ -10,6 +10,16 @@
   flavorType: Base
   description: cp14-flavor-base-invigorating
 
+- type: flavor
+  id: CP14Bitterly
+  flavorType: Base
+  description: cp14-flavor-base-bitterly
+
+- type: flavor
+  id: CP14Sweely
+  flavorType: Base
+  description: cp14-flavor-base-sweetly
+
 # Complex
 
 - type: flavor

Resources/Prototypes/_CP14/Procedural/biomes_template_grasslands.yml

@@ -211,6 +211,21 @@
         gain: 0.12
         fractalType: Ridged
         octaves: 1
+    - !type:BiomeEntityLayer
+      allowedTiles:
+        - CP14FloorDirt
+        - CP14FloorGrass
+      threshold: 0.91
+      noise:
+        seed: 3
+        noiseType: OpenSimplex2
+        frequency: 0.003
+        lacunarity: 1.50
+        gain: 0.12
+        fractalType: Ridged
+        octaves: 1
+      entities:
+        - CP14RandomSpawnerGatherAgaricShroom
     - !type:BiomeEntityLayer
       allowedTiles:
         - CP14FloorDirt

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

@@ -1,9 +1,19 @@
+- type: reagent
+  id: CP14BasicEffectEmpty
+  name: cp14-reagent-name-basic-empty
+  desc: cp14-reagent-desc-basic-empty
+  group: CP14BasicEffect
+  flavor: CP14Bitterly
+  color: "#858585"
+  physicalDesc: cp14-reagent-physical-desc-colorless
+  
+
 - type: reagent
   id: CP14BasicEffectHealBlunt
   name: cp14-reagent-name-basic-heal-blunt
   desc: cp14-reagent-desc-basic-heal-blunt
   group: CP14BasicEffect
-  flavor: medicine
+  flavor: CP14Metallic
   color: "#c71aaa"
   physicalDesc: cp14-reagent-physical-desc-scarlet
   metabolisms:
@@ -12,14 +22,14 @@
       - !type:HealthChange
         damage:
           types:
-            Blunt: -1
+            Blunt: -10
 
 - type: reagent
   id: CP14BasicEffectHealPiercing
   name: cp14-reagent-name-basic-heal-piercing
   desc: cp14-reagent-desc-basic-heal-piercing
   group: CP14BasicEffect
-  flavor: medicine
+  flavor: CP14Metallic
   color: "#e03895"
   physicalDesc: cp14-reagent-physical-desc-scarlet
   metabolisms:
@@ -28,14 +38,14 @@
       - !type:HealthChange
         damage:
           types:
-            Piercing: -1
+            Piercing: -10
 
 - type: reagent
   id: CP14BasicEffectHealSlash
   name: cp14-reagent-name-basic-heal-slash
   desc: cp14-reagent-desc-basic-heal-slash
   group: CP14BasicEffect
-  flavor: medicine
+  flavor: CP14Metallic
   color: "#cf153a"
   physicalDesc: cp14-reagent-physical-desc-scarlet
   metabolisms:
@@ -44,30 +54,82 @@
       - !type:HealthChange
         damage:
           types:
-            Slash: -1
+            Slash: -10
+
+- type: reagent
+  id: CP14BasicEffectHealBruteGroup
+  name: cp14-reagent-name-basic-heal-brute
+  desc: cp14-reagent-desc-basic-heal-brute
+  group: CP14BasicEffect
+  flavor: CP14Metallic
+  color: "#e31010"
+  physicalDesc: cp14-reagent-physical-desc-scarlet
+  metabolisms:
+    Medicine:
+      effects:
+      - !type:HealthChange
+        damage:
+          groups:
+            Brute: -3
+
+- type: reagent
+  id: CP14BasicEffectDamagePoison
+  name: cp14-reagent-name-basic-damage-poison
+  desc: cp14-reagent-desc-basic-damage-poison
+  group: CP14BasicEffect
+  flavor: CP14Bitterly
+  color: "#768551"
+  physicalDesc: cp14-reagent-physical-desc-viscous
+  metabolisms:
+    Poison:
+      effects:
+      - !type:HealthChange
+        damage:
+          types:
+            Poison: 10
+
+- type: reagent
+  id: CP14BasicEffectRainbow
+  name: cp14-reagent-name-see-rainbow
+  desc: cp14-reagent-desc-see-rainbow
+  group: CP14BasicEffect
+  flavor: CP14Bitterly
+  color: "#d442db"
+  physicalDesc: cp14-reagent-physical-desc-colorless
+  metabolisms:
+    Narcotic:
+      effects:
+      - !type:GenericStatusEffect
+        key: SeeingRainbows
+        component: SeeingRainbows
+        type: Add
+        time: 25
+        refresh: false
 
 - type: reagent
   id: CP14BasicEffectSatiateHunger
   name: cp14-reagent-name-basic-satiate-hunger
   desc: cp14-reagent-desc-basic-satiate-hunger
   group: CP14BasicEffect
-  flavor: nutriment
+  flavor: CP14Sweely
   color: "#a35629"
-  physicalDesc: cp14-reagent-physical-desc-scarlet #TODO
+  physicalDesc: cp14-reagent-physical-desc-viscous
   metabolisms:
     Food:
       effects:
       - !type:SatiateHunger
+        factor: 6
 
 - type: reagent
   id: CP14BasicEffectSatiateThirst
   name: cp14-reagent-name-basic-satiate-thirst
   desc: cp14-reagent-desc-basic-satiate-thirst
   group: CP14BasicEffect
-  flavor: nutriment
+  flavor: CP14Water
   color: "#2b7fed"
-  physicalDesc: cp14-reagent-physical-desc-scarlet #TODO
+  physicalDesc: cp14-reagent-physical-desc-colorless
   metabolisms:
     Drink:
       effects:
-      - !type:SatiateThirst
+      - !type:SatiateThirst
+        factor: 6

Resources/Prototypes/_CP14/Reagents/biological.yml

@@ -12,30 +12,6 @@
     collection: FootstepBlood
     params:
       volume: 6
-# metabolisms:
-#   Drink:
-#     effects:
-#     - !type:SatiateThirst
-#       factor: 1.5
-#       conditions:
-#         - !type:OrganType
-#           type: Human
-#           shouldHave: false
-#   Food:
-#     effects:
-#       - !type:AdjustReagent
-#         reagent: UncookedAnimalProteins
-#         amount: 0.5
-#   Medicine:
-#     effects:
-#     - !type:HealthChange
-#       conditions:
-#       - !type:OrganType
-#         type: Bloodsucker
-#       damage:
-#         groups:
-#           Brute: -3
-#           Burn: -1.25
 
 - type: reagent
   id: CP14BloodGrassSap
@@ -54,11 +30,37 @@
     Food:
       effects:
       - !type:SatiateHunger
-        factor: 0.5
-    Medicine:
+        factor: 1.5
+    Poison:
       effects:
       - !type:HealthChange
         damage:
           types:
             Poison: 0.25
-  
+
+- type: reagent
+  id: CP14AgaricMushroom
+  group: CP14Biological
+  name: cp14-reagent-name-agaric-shroom
+  desc: cp14-reagent-desc-agaric-shroom
+  flavor: CP14Bitterly
+  color: "#89a195"
+  physicalDesc: cp14-reagent-physical-desc-colorless
+  slippery: false
+  metabolisms:
+    Poison:
+      effects:
+      - !type:HealthChange
+        damage:
+          types:
+            Poison: 1.5
+      - !type:ChemVomit
+        probability: 0.02
+    Narcotic:
+      effects:
+      - !type:GenericStatusEffect
+        key: SeeingRainbows
+        component: SeeingRainbows
+        type: Add
+        time: 6
+        refresh: false

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

@@ -7,19 +7,18 @@
     CP14BloodGrassSap:
       amount: 2
   products:
-    CP14BasicEffectSatiateHunger: 2
-    CP14BasicEffectHealSlash: 0.5
-    CP14BasicEffectHealPiercing: 0.5
+    CP14BasicEffectEmpty: 2.7
+    CP14BasicEffectSatiateHunger: 0.2
+    CP14BasicEffectHealSlash: 0.05
+    CP14BasicEffectHealPiercing: 0.05
 
-#- type: reaction
-#  id: CP14BloodGrassProcessingFail1
-#  minTemp: 450
-#  reactants:
-#    CP14VitalExtract: 
-#      amount: 1
-#  effects:
-#    - !type:AreaReactionEffect
-#      duration: 20
-#      prototypeId: CP14MistVitalExtract
-#      sound:
-#        path: /Audio/Effects/smoke.ogg
+- type: reaction
+  id: CP14AgaricShroomProcessing1
+  minTemp: 350
+  reactants:
+    CP14AgaricMushroom:
+      amount: 1
+  products:
+    CP14BasicEffectEmpty: 0.7
+    CP14BasicEffectRainbow: 0.1
+    CP14BasicEffectDamagePoison: 0.15

Resources/Textures/_CP14/Objects/Specific/Alchemy/Herbal/agaric.rsi/meta.json

@@ -0,0 +1,44 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by TheShuEd (Github) for CrystallPunk14",
+  "states": [
+    {
+      "name": "base1"
+    },
+    {
+      "name": "base2"
+    },
+    {
+      "name": "base3"
+    },
+    {
+      "name": "base4"
+    },
+    {
+      "name": "base5"
+    },
+    {
+      "name": "world1"
+    },
+    {
+      "name": "world2"
+    },
+    {
+      "name": "world3"
+    },
+    {
+      "name": "world4"
+    },
+    {
+      "name": "world5"
+    },
+    {
+      "name": "world6"
+    }
+  ]
+}