Alchemist content (#718)

* reinforced vials

* glass recipes

* roundstart alchemist potions

Resources/Locale/en-US/_CP14/reagents/labels.ftl

@@ -0,0 +1,2 @@
+cp14-potion-label-health = Health potion
+cp14-potion-label-mana = Mana potion

Resources/Locale/ru-RU/_CP14/reagents/labels.ftl

@@ -0,0 +1,2 @@
+cp14-potion-label-health = Зелье лечения
+cp14-potion-label-mana = Зелье маны

Resources/Prototypes/_CP14/Catalog/Fills/closets.yml

@@ -15,15 +15,25 @@
         amount: 1
       - id: CP14Dropper
         amount: 1
+      - id: CP14VialTinyReinforced
+        amount: 2
       - id: CP14VialTiny
-        amount: 7
+        amount: 4
+      - id: CP14VialSmallReinforced
+        amount: 2
       - id: CP14VialSmall
-        amount: 5
+        amount: 3
       - id: CP14Paper
         amount: 2
       - id: CP14PenFeather
         amount: 1
         #Random start resource
+      - id: CP14VialSmallHealthPotion
+      - id: CP14VialSmallHealthPotion
+      - id: CP14VialSmallHealthPotion
+      - id: CP14VialSmallManaPotion
+      - id: CP14VialSmallManaPotion
+      - id: CP14VialSmallManaPotion
       - id: CP14VialSmallGroundQuartz
       - id: CP14VialSmallGroundQuartz
       - id: CP14VialSmallBloodFlowerSap

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

@@ -92,11 +92,13 @@
       types:
         Blunt: 5
 
+# Vials 
+
 - type: entity
   id: CP14VialTiny
-  parent: CP14BaseVial
+  parent: CP14BaseVialFragile
   name: tiny vial
-  description: A sturdy glass vial to hold a tiny amount of liquid.
+  description: A fragile glass vial to hold a tiny amount of liquid.
   components:
   - type: Sprite
     sprite: _CP14/Objects/Specific/Alchemy/vial_tiny.rsi
@@ -118,6 +120,34 @@
   - type: Injector
     maxTransferAmount: 5
 
+- type: entity
+  id: CP14VialTinyReinforced
+  parent: CP14BaseVial
+  name: reinforced tiny vial
+  description: A reinforced glass vial to hold a tiny amount of liquid.
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Specific/Alchemy/vial_tiny.rsi
+    layers:
+      - state: reinforcement_back
+      - state: vial
+      - state: liq-1
+        map: ["enum.SolutionContainerLayers.Fill"]
+        visible: false
+      - state: reinforcement
+  - type: Item
+    size: Tiny
+    sprite: _CP14/Objects/Specific/Alchemy/vial_tiny.rsi
+  - type: SolutionContainerManager
+    solutions:
+      vial:
+        maxVol: 5
+  - type: SolutionContainerVisuals
+    maxFillLevels: 5
+    fillBaseName: liq-
+  - type: Injector
+    maxTransferAmount: 5
+
 - type: entity
   id: CP14VialSmall
   parent: CP14BaseVialFragile
@@ -142,102 +172,28 @@
     maxFillLevels: 5
     fillBaseName: liq-
 
-# Filled small
-
 - type: entity
-  id: CP14VialSmallBloodFlowerSap
-  parent: CP14VialSmall
-  suffix: Bloodflower sap
+  id: CP14VialSmallReinforced
+  parent: CP14BaseVial
+  name: reinforced small vial
+  description: A reinforced glass vial to hold a small amount of liquid.
   components:
+  - type: Sprite
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    layers:
+      - state: reinforcement_back
+      - state: vial
+      - state: liq-1
+        map: ["enum.SolutionContainerLayers.Fill"]
+        visible: false
+      - state: reinforcement
+  - type: Item
+    size: Tiny
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
   - type: SolutionContainerManager
     solutions:
       vial:
-        reagents:
-        - ReagentId: CP14BloodFlowerSap
-          Quantity: 10
-
-- type: entity
-  id: CP14VialSmallAgaricMushroom
-  parent: CP14VialSmall
-  suffix: Fly agaric juice
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      vial:
-        reagents:
-        - 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
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      vial:
-        reagents:
-        - ReagentId: CP14WildSageSap
-          Quantity: 10
-
-- type: entity
-  id: CP14VialSmallBlueAmanita
-  parent: CP14VialSmall
-  suffix: Blue Amanita
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      vial:
-        reagents:
-        - ReagentId: CP14BlueAmanita
-          Quantity: 10
-
-- type: entity
-  id: CP14VialSmallDayflin
-  parent: CP14VialSmall
-  suffix: Dayflin
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      vial:
-        reagents:
-        - ReagentId: CP14YellowDayflinPulp
-          Quantity: 10
-
-# Filled tiny
-
-- type: entity
-  id: CP14VialTinyChromiumSlime
-  parent: CP14VialTiny
-  suffix: Chromium Slime
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      vial:
-        reagents:
-        - ReagentId: CP14ChromiumSlime
-          Quantity: 5
-
-- type: entity
-  id: CP14VialTinyLumiMushroom
-  parent: CP14VialTiny
-  suffix: LumiShroom
-  components:
-  - type: SolutionContainerManager
-    solutions:
-      vial:
-        reagents:
-        - ReagentId: CP14LumiMushroom
-          Quantity: 5
+        maxVol: 10
+  - type: SolutionContainerVisuals
+    maxFillLevels: 5
+    fillBaseName: liq-

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

@@ -0,0 +1,139 @@
+# Raw materials
+
+- type: entity
+  id: CP14VialSmallBloodFlowerSap
+  parent: CP14VialSmall
+  suffix: Bloodflower sap
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      vial:
+        reagents:
+        - ReagentId: CP14BloodFlowerSap
+          Quantity: 10
+
+- type: entity
+  id: CP14VialSmallAgaricMushroom
+  parent: CP14VialSmall
+  suffix: Fly agaric juice
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      vial:
+        reagents:
+        - 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
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      vial:
+        reagents:
+        - ReagentId: CP14WildSageSap
+          Quantity: 10
+
+- type: entity
+  id: CP14VialSmallBlueAmanita
+  parent: CP14VialSmall
+  suffix: Blue Amanita
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      vial:
+        reagents:
+        - ReagentId: CP14BlueAmanita
+          Quantity: 10
+
+- type: entity
+  id: CP14VialSmallDayflin
+  parent: CP14VialSmall
+  suffix: Dayflin
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      vial:
+        reagents:
+        - ReagentId: CP14YellowDayflinPulp
+          Quantity: 10
+
+- type: entity
+  id: CP14VialTinyChromiumSlime
+  parent: CP14VialTiny
+  suffix: Chromium Slime
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      vial:
+        reagents:
+        - ReagentId: CP14ChromiumSlime
+          Quantity: 5
+
+- type: entity
+  id: CP14VialTinyLumiMushroom
+  parent: CP14VialTiny
+  suffix: LumiShroom
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      vial:
+        reagents:
+        - ReagentId: CP14LumiMushroom
+          Quantity: 5
+
+# Ready potions
+
+- type: entity
+  id: CP14VialSmallHealthPotion
+  parent: CP14VialSmall
+  suffix: Health potion 50%
+  components:
+  - type: Label
+    currentLabel: cp14-potion-label-health
+  - type: SolutionContainerManager
+    solutions:
+      vial:
+        reagents:
+        - ReagentId: CP14BasicEffectHealBrute
+          Quantity: 4
+        - ReagentId: CP14BasicEffectBloodRestore
+          Quantity: 2
+        - ReagentId: CP14BasicEffectEmoteCough
+          Quantity: 1
+        - ReagentId: CP14BasicEffectEmpty
+          Quantity: 3
+
+- type: entity
+  id: CP14VialSmallManaPotion
+  parent: CP14VialSmall
+  suffix: Mana potion 50%
+  components:
+  - type: Label
+    currentLabel: cp14-potion-label-mana
+  - type: SolutionContainerManager
+    solutions:
+      vial:
+        reagents:
+        - ReagentId: CP14BasicEffectHealMana
+          Quantity: 4
+        - ReagentId: CP14BasicEffectSatiateThirst
+          Quantity: 2
+        - ReagentId: CP14BasicEffectDrunk
+          Quantity: 1
+        - ReagentId: CP14BasicEffectEmpty
+          Quantity: 3

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

@@ -37,3 +37,46 @@
   entities:
     CP14QuartzShard: 1
   result: CP14GlassSheet1
+
+- type: CP14Recipe
+  id: CP14GlassSheetShard1
+  tag: CP14RecipeMeltingFurnace
+  craftTime: 2
+  entities:
+    CP14GlassShard: 3
+  result: CP14GlassSheet1
+
+- type: CP14Recipe
+  id: CP14VialTiny
+  tag: CP14RecipeMeltingFurnace
+  craftTime: 3
+  stacks:
+    CP14GlassSheet: 1
+  result: CP14VialTiny
+
+- type: CP14Recipe
+  id: CP14VialTinyReinforced
+  tag: CP14RecipeMeltingFurnace
+  craftTime: 3
+  stacks:
+    CP14CopperBar: 1
+    CP14GlassSheet: 1
+  result: CP14VialTinyReinforced
+
+- type: CP14Recipe
+  id: CP14VialSmall
+  tag: CP14RecipeMeltingFurnace
+  craftTime: 3
+  stacks:
+    CP14GlassSheet: 2
+  result: CP14VialSmall
+
+- type: CP14Recipe
+  id: CP14VialSmallReinforced
+  tag: CP14RecipeMeltingFurnace
+  craftTime: 3
+  stacks:
+    CP14CopperBar: 1
+    CP14GlassSheet: 2
+  result: CP14VialSmallReinforced
+  

Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_small.rsi/meta.json

@@ -24,6 +24,12 @@
     },
     {
       "name": "liq-5"
+    },
+    {
+      "name": "reinforcement"
+    },
+    {
+      "name": "reinforcement_back"
     }
   ]
 }

Resources/Textures/_CP14/Objects/Specific/Alchemy/vial_tiny.rsi/meta.json

@@ -24,6 +24,12 @@
     },
     {
       "name": "liq-5"
+    },
+    {
+      "name": "reinforcement"
+    },
+    {
+      "name": "reinforcement_back"
     }
   ]
 }