Alchemist update (#497)

* rebalance alchemy resource

* lockers alternative

* map update

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

@@ -0,0 +1,34 @@
+- type: entity
+  parent: CP14WoodenCloset
+  id: CP14WoodenClosetAlchemyFilled
+  suffix: Alchemist, Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: HandLabeler #TODO custom cp14 labeler
+      - id: CP14Cauldron
+      - id: CP14Pestle
+        amount: 2
+      - id: CP14Mortar
+        amount: 2
+      - id: CP14Dropper
+        amount: 2
+      - id: CP14VialTiny
+        amount: 7
+      - id: CP14VialSmall
+        amount: 5
+        #Random start resource
+      - id: CP14VialSmallGroundQuartz
+        prob: 0.9
+      - id: CP14VialSmallBloodFlowerSap
+        prob: 0.7
+      - id: CP14VialSmallAgaricMushroom
+        prob: 0.7
+      - id: CP14VialSmallWildSage
+        prob: 0.7
+      - id: CP14VialSmallBlueAmanita
+        prob: 0.7
+      - id: CP14VialTinyChromiumSlime
+        prob: 0.3
+      - id: CP14VialTinyLumiMushroom
+        prob: 0.3

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

@@ -0,0 +1,17 @@
+- type: entity
+  parent: CP14WoodenCabinet
+  id: CP14WoodenCabinetAlchemist
+  suffix: Alchemist, Filled
+  components:
+  - type: StorageFill
+    contents:
+      - id: CP14ClothingEyesAlchemyGlasses
+        prob: 0.5
+      - id: CP14ClothingEyesAlchemyMonocle
+        prob: 0.2
+      - id: CP14ClothingCloakAlchemist
+        prob: 0.6
+      - id: CP14ClothingHeadAlchemistBeret
+        prob: 0.6
+      - id: CP14ClothingHeadAlchemistBandana
+        prob: 0.6

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

@@ -34,14 +34,14 @@
     juiceSolution:
       reagents:
       - ReagentId: CP14BloodFlowerSap
-        Quantity: 5
+        Quantity: 12
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 8
+        maxVol: 14
         reagents:
         - ReagentId: CP14BloodFlowerSap
-          Quantity: 5
+          Quantity: 12
 
 - type: entity
   id: CP14AgaricMushroom
@@ -70,7 +70,7 @@
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 5
+        maxVol: 4
         reagents:
         - ReagentId: CP14AgaricMushroom
           Quantity: 3
@@ -99,14 +99,14 @@
     juiceSolution:
       reagents:
       - ReagentId: CP14ChromiumSlime
-        Quantity: 7
+        Quantity: 4
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 10
+        maxVol: 5
         reagents:
         - ReagentId: CP14ChromiumSlime
-          Quantity: 7
+          Quantity: 4
   - type: FoodSequenceElement
     entries:
       CP14Plate: CP14PlateChromiumSlime
@@ -136,14 +136,14 @@
     juiceSolution:
       reagents:
       - ReagentId: CP14WildSageSap
-        Quantity: 8
+        Quantity: 15
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 10
+        maxVol: 17
         reagents:
         - ReagentId: CP14WildSageSap
-          Quantity: 8
+          Quantity: 15
   - type: FoodSequenceElement
     entries:
       CP14Plate: CP14PlateWildSage
@@ -176,7 +176,7 @@
     juiceSolution:
       reagents:
       - ReagentId: CP14GroundQuartz
-        Quantity: 3
+        Quantity: 7
 
 - type: entity
   id: CP14LumiMushroom
@@ -236,12 +236,12 @@
     juiceSolution:
       reagents:
       - ReagentId: CP14BlueAmanita
-        Quantity: 4
+        Quantity: 5
   - type: SolutionContainerManager
     solutions:
       food:
-        maxVol: 5
+        maxVol: 6
         reagents:
         - ReagentId: CP14BlueAmanita
-          Quantity: 4
+          Quantity: 5
   

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

@@ -141,7 +141,7 @@
     fillBaseName: liq-
 
 
-# Filled
+# Filled small
 
 - type: entity
   id: CP14VialSmallBloodFlowerSap
@@ -192,7 +192,21 @@
           Quantity: 10
 
 - type: entity
-  id: CP14VialSmallChromiumSlime
+  id: CP14VialSmallBlueAmanita
+  parent: CP14VialSmall
+  suffix: Blue Amanita
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      vial:
+        reagents:
+        - ReagentId: CP14BlueAmanita
+          Quantity: 10
+
+# Filled tiny
+
+- type: entity
+  id: CP14VialTinyChromiumSlime
   parent: CP14VialTiny
   suffix: Chromium Slime
   components:
@@ -204,7 +218,7 @@
           Quantity: 5
 
 - type: entity
-  id: CP14VialSmallLumiMushroom
+  id: CP14VialTinyLumiMushroom
   parent: CP14VialTiny
   suffix: LumiShroom
   components:

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

@@ -43,63 +43,6 @@
   - type: Rotatable
   - type: Appearance
 
-- type: entity
-  id: CP14ClosetBase
-  parent: BaseStructureDynamic
-  categories: [ ForkFiltered ]
-  name: closet
-  description: Just an ordinary, decrepit closet.
-  abstract: true
-  components:
-  - type: ResistLocker
-  - type: Sprite
-    drawdepth: Mobs
-    layers:
-    - state: base
-      map: ["enum.StorageVisualLayers.Base"]
-    - state: base_door
-      map: ["enum.StorageVisualLayers.Door"]
-  - type: ItemSlots
-  - type: DamageOnHighSpeedImpact
-    damage:
-      types:
-        Blunt: 5
-    soundHit:
-      collection: MetalThud
-  - type: InteractionOutline
-  - type: Physics
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.45,-0.05,0.45,0.45"
-        density: 75
-        mask:
-        - MachineMask
-        layer:
-        - MachineLayer
-  - type: EntityStorage
-    isCollidableWhenOpen: true
-    enteringOffset: 0, -0.4
-    enteringRange: 0.06
-  - type: ContainerContainer
-    containers:
-      entity_storage: !type:Container
-      paper_label: !type:ContainerSlot
-  - type: PlaceableSurface
-    placeCentered: true
-    isPlaceable: false
-  - type: Appearance
-  - type: EntityStorageVisuals
-    stateBaseClosed: base
-    stateDoorOpen: base_open
-    stateDoorClosed: base_door
-  - type: StaticPrice
-    price: 50
-  - type: Anchorable
-  - type: Rotatable
-
 - type: entity
   name: wooden cabinet
   parent:
@@ -158,43 +101,4 @@
   name: money box
   description: An armored vault for storing money for trade with the city. City workers will unload their earnings here, or take them from here when you want to buy something.
   components:
-  - type: CP14CargoMoneyBox
-
-- type: entity
-  name: wooden cupboard
-  parent:
-  - CP14ClosetBase
-  - CP14BaseFlammable
-  id: CP14WoodenCupboard
-  description: It's a regular wooden cabinet.
-  components:
-  - type: Sprite
-    sprite: _CP14/Structures/Storage/Dressers/wood_cupboard.rsi
-    state: icons
-  - type: Damageable
-    damageContainer: Inorganic
-    damageModifierSet: Wood
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 300
-      behaviors:
-        - !type:DoActsBehavior
-          acts: [ "Destruction" ]
-    - trigger:
-        !type:DamageTrigger
-        damage: 150
-      behaviors:
-      - !type:DoActsBehavior
-        acts: ["Destruction"]
-      - !type:PlaySoundBehavior
-        sound:
-          collection: WoodDestroyHeavy
-          params:
-            volume: -6
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          CP14WoodenPlanks1:
-            min: 2
-            max: 5
+  - type: CP14CargoMoneyBox

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

@@ -0,0 +1,95 @@
+- type: entity
+  id: CP14ClosetBase
+  parent: BaseStructureDynamic
+  categories: [ ForkFiltered ]
+  name: closet
+  description: Just an ordinary, decrepit closet.
+  abstract: true
+  components:
+  - type: ResistLocker
+  - type: Sprite
+    drawdepth: Mobs
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: base_door
+      map: ["enum.StorageVisualLayers.Door"]
+  - type: ItemSlots
+  - type: DamageOnHighSpeedImpact
+    damage:
+      types:
+        Blunt: 5
+    soundHit:
+      collection: MetalThud
+  - type: InteractionOutline
+  - type: Physics
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.45,-0.05,0.45,0.45"
+        density: 75
+        mask:
+        - MachineMask
+        layer:
+        - MachineLayer
+  - type: EntityStorage
+    isCollidableWhenOpen: true
+    enteringOffset: 0, -0.4
+    enteringRange: 0.06
+  - type: ContainerContainer
+    containers:
+      entity_storage: !type:Container
+      paper_label: !type:ContainerSlot
+  - type: PlaceableSurface
+    placeCentered: true
+    isPlaceable: false
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: base
+    stateDoorOpen: base_open
+    stateDoorClosed: base_door
+  - type: StaticPrice
+    price: 50
+  - type: Anchorable
+  - type: Rotatable
+
+- type: entity
+  name: wooden closet
+  parent:
+  - CP14ClosetBase
+  - CP14BaseFlammable
+  id: CP14WoodenCloset
+  description: It's a regular wooden closet.
+  components:
+  - type: Sprite
+    sprite: _CP14/Structures/Storage/Dressers/wood_cupboard.rsi
+    state: icons
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Wood
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 300
+      behaviors:
+        - !type:DoActsBehavior
+          acts: [ "Destruction" ]
+    - trigger:
+        !type:DamageTrigger
+        damage: 150
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroyHeavy
+          params:
+            volume: -6
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          CP14WoodenPlanks1:
+            min: 2
+            max: 5

Resources/migration.yml

@@ -111,6 +111,10 @@ CP14WallpaperPurple30: CP14WallpaperPurple
 CP14WallpaperGreen1: CP14WallpaperGreen
 CP14WallpaperGreen30: CP14WallpaperGreen
 
+#2024-10-18
+CP14WoodenCupboard: CP14WoodenCloset
+CP14VialSmallChromiumSlime: CP14VialTinyChromiumSlime
+CP14VialSmallLumiMushroom: CP14VialTinyLumiMushroom
 
 # <---> CrystallPunk migration zone end