Merge branch 'master' into ed-27-05-2025-upstream-sync

Resources/Prototypes/Reagents/Consumable/Food/food.yml

@@ -20,7 +20,7 @@
     amount: 1.5
   - !type:PlantAdjustHealth
     amount: 0.75
-  pricePerUnit: 2
+  pricePerUnit: 0.2
 
 - type: reagent
   id: Vitamin #Anything "healthy"
@@ -53,7 +53,7 @@
     amount: 0.5
   - !type:PlantAdjustHealth
     amount: 1.5
-  pricePerUnit: 2.5
+  pricePerUnit: 0.25
 
 - type: reagent
   id: Protein #Meat and beans
@@ -78,7 +78,7 @@
         - !type:OrganType
           type: CP14Vampire
           shouldHave: false
-  pricePerUnit: 3
+  pricePerUnit: 0.3
 
 - type: reagent
   id: Sugar #Candy and grains

Resources/Prototypes/_CP14/Catalog/Cargo/Store/BradFamily/buy.yml

@@ -1,275 +0,0 @@
-- type: storePositionBuy
-  id: AlchemyVials
-  code: VIALS
-  price: 40
-  iconOverride: 
-    sprite: _CP14/Objects/Specific/Alchemy/vial_medium.rsi
-    state: vial
-  factions:
-  - BradFamily
-  service: !type:CP14BuyItemsService
-    product: CP14WoodenChestFilledAlchemy
-
-- type: entity
-  parent: CP14WoodenChest
-  id: CP14WoodenChestFilledAlchemy
-  name: alchemical vials chest
-  components:
-  - type: StorageFill
-    contents:
-      - id: CP14VialTiny
-        amount: 5
-      - id: CP14VialSmall
-        amount: 5
-      - id: CP14VialMedium
-        amount: 5
-      - id: CP14GlassShard #Lol. Something broken
-        prob: 0.2
-
-
-- type: storePositionBuy
-  id: CP14VialSmallHealingBrute
-  code: HEAL_BRUTE
-  price: 50
-  iconOverride: 
-    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
-    state: vial
-  factions:
-  - BradFamily
-  service: !type:CP14BuyItemsService
-    product: CP14WoodenChestFilledSmallHealingBrute
-
-- type: entity
-  parent: CP14WoodenChest
-  id: CP14WoodenChestFilledSmallHealingBrute
-  name: healing potions chest
-  components:
-  - type: StorageFill
-    contents:
-      - id: CP14VialSmallHealingBrute
-        amount: 5
-
-
-- type: storePositionBuy
-  id: CP14VialSmallHealingPoison
-  code: HEAL_POISON
-  price: 50
-  iconOverride: 
-    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
-    state: vial
-  factions:
-  - BradFamily
-  service: !type:CP14BuyItemsService
-    product: CP14WoodenChestFilledSmallHealingPoison
-
-- type: entity
-  parent: CP14WoodenChest
-  id: CP14WoodenChestFilledSmallHealingPoison
-  name: antidote potions chest
-  components:
-  - type: StorageFill
-    contents:
-      - id: CP14VialSmallHealingPoison
-        amount: 5
-
-
-- type: storePositionBuy
-  id: CP14VialSmallHealingAirloss
-  code: HEAL_AIRLOSS
-  price: 50
-  iconOverride: 
-    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
-    state: vial
-  factions:
-  - BradFamily
-  service: !type:CP14BuyItemsService
-    product: CP14WoodenChestFilledSmallHealingAirloss
-
-- type: entity
-  parent: CP14WoodenChest
-  id: CP14WoodenChestFilledSmallHealingAirloss
-  name: airloss healing potions chest
-  components:
-  - type: StorageFill
-    contents:
-      - id: CP14VialSmallHealingAirloss
-        amount: 5
-
-
-- type: storePositionBuy
-  id: CP14VialSmallHealingBlood
-  code: HEAL_BLOOD
-  price: 50
-  iconOverride: 
-    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
-    state: vial
-  factions:
-  - BradFamily
-  service: !type:CP14BuyItemsService
-    product: CP14WoodenChestFilledSmallHealingBlood
-
-- type: entity
-  parent: CP14WoodenChest
-  id: CP14WoodenChestFilledSmallHealingBlood
-  name: blood restoration potions chest
-  components:
-  - type: StorageFill
-    contents:
-      - id: CP14VialSmallHealingBlood
-        amount: 5
-
-
-- type: storePositionBuy
-  id: CP14VialSmallHealingMana
-  code: HEAL_MANA
-  price: 70
-  iconOverride: 
-    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
-    state: vial
-  factions:
-  - BradFamily
-  service: !type:CP14BuyItemsService
-    product: CP14WoodenChestFilledSmallHealingMana
-
-- type: entity
-  parent: CP14WoodenChest
-  id: CP14WoodenChestFilledSmallHealingMana
-  name: mana potions chest
-  components:
-  - type: StorageFill
-    contents:
-      - id: CP14VialSmallHealingMana
-        amount: 5
-
-- type: storePositionBuy
-  id: CP14VialSmallHealingManaDepletion
-  code: HEAL_MANA_DEPLETION
-  price: 70
-  iconOverride: 
-    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
-    state: vial
-  factions:
-  - BradFamily
-  service: !type:CP14BuyItemsService
-    product: CP14WoodenChestFilledSmallHealingManaDepletion
-
-- type: entity
-  parent: CP14WoodenChest
-  id: CP14WoodenChestFilledSmallHealingManaDepletion
-  name: mana-depletion potions chest
-  components:
-  - type: StorageFill
-    contents:
-      - id: CP14VialSmallHealingManaDepletion
-        amount: 5
-
-
-- type: storePositionBuy
-  id: CP14VialSmallSpeedUp
-  code: SPEED_UP
-  price: 70
-  iconOverride: 
-    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
-    state: vial
-  factions:
-  - BradFamily
-  service: !type:CP14BuyItemsService
-    product: CP14WoodenChestFilledSmallSpeedUp
-
-- type: entity
-  parent: CP14WoodenChest
-  id: CP14WoodenChestFilledSmallSpeedUp
-  name: accseleration potions chest
-  components:
-  - type: StorageFill
-    contents:
-      - id: CP14VialSmallSpeedUp
-        amount: 5
-
-
-- type: storePositionBuy
-  id: CP14VialSmallRainbow
-  code: FUNNY_POTION
-  price: 100
-  iconOverride: 
-    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
-    state: vial
-  factions:
-  - BradFamily
-  service: !type:CP14BuyItemsService
-    product: CP14WoodenChestFilledSmallRainbow
-
-- type: entity
-  parent: CP14WoodenChest
-  id: CP14WoodenChestFilledSmallRainbow
-  name: funny potions chest
-  components:
-  - type: StorageFill
-    contents:
-      - id: CP14VialSmallRainbow
-        amount: 5
-
-
-- type: storePositionBuy
-  id: Candles
-  code: CANDLES
-  price: 100
-  iconOverride: 
-    sprite: Objects/Misc/candles.rsi
-    state: loadout
-  factions:
-  - BradFamily
-  service: !type:CP14BuyItemsService
-    product: CP14WoodenChestFilledCandles
-
-- type: entity
-  parent: CP14WoodenChest
-  id: CP14WoodenChestFilledCandles
-  name: candles chest
-  components:
-  - type: StorageFill
-    contents:
-      - id: CP14CandleRed
-        amount: 2
-      - id: CP14CandleBlue
-        amount: 2
-      - id: CP14CandleBlack
-        amount: 2
-      - id: CP14CandleGreen
-        amount: 2
-      - id: CP14CandlePurple
-        amount: 2
-      - id: CP14CandleRedSmall
-        amount: 2
-      - id: CP14CandleBlueSmall
-        amount: 2
-      - id: CP14CandleBlackSmall
-        amount: 2
-      - id: CP14CandleGreenSmall
-        amount: 2
-      - id: CP14CandlePurpleSmall
-        amount: 2
-
-- type: storePositionBuy
-  id: SmokePowder
-  code: TOBACCO
-  price: 80
-  iconOverride: 
-    sprite: _CP14/Objects/Misc/reagent_fillings.rsi
-    state: tobacco_small
-  factions:
-  - BradFamily
-  service: !type:CP14BuyItemsService
-    product: CP14WoodenChestFilledSmokePowder
-
-- type: entity
-  parent: CP14WoodenChest
-  id: CP14WoodenChestFilledSmokePowder
-  name: smoking powder chest
-  components:
-  - type: StorageFill
-    contents:
-      - id: CP14GroundTobacco
-        amount: 10
-      - id: CP14GroundSage
-        amount: 5

Resources/Prototypes/_CP14/Catalog/Cargo/Store/BradFamily/sell.yml

@@ -1,14 +0,0 @@
-- type: storePositionSell
-  id: CP14AlchemicalHerbals
-  price: 50
-  factions:
-  - BradFamily
-  service: !type:CP14SellWhitelistService
-    whitelist:
-      tags:
-      - CP14AlchemicalHerbals
-    count: 10
-    name: cp14-entity-group-alchemical-herbals
-    sprite:
-      sprite: _CP14/Objects/Flora/Wild/store_position.rsi
-      state: sell

Resources/Prototypes/_CP14/Catalog/Cargo/Store/BradFamily/sell_special.yml

@@ -1,89 +0,0 @@
-- type: storePositionSell
-  id: CP14BloodFlower
-  special: true
-  price: 200
-  factions:
-  - BradFamily
-  service: !type:CP14SellPrototypeService
-    proto: CP14BloodFlower
-    count: 20
-
-- type: storePositionSell
-  id: CP14AgaricMushroom
-  special: true
-  price: 200
-  factions:
-  - BradFamily
-  service: !type:CP14SellPrototypeService
-    proto: CP14AgaricMushroom
-    count: 20
-
-- type: storePositionSell
-  id: CP14ChromiumSlime
-  special: true
-  price: 600
-  factions:
-  - BradFamily
-  service: !type:CP14SellPrototypeService
-    proto: CP14ChromiumSlime
-    count: 20
-
-- type: storePositionSell
-  id: CP14WildSage
-  special: true
-  price: 200
-  factions:
-  - BradFamily
-  service: !type:CP14SellPrototypeService
-    proto: CP14WildSage
-    count: 20
-
-- type: storePositionSell
-  id: CP14LumiMushroom
-  special: true
-  price: 400
-  factions:
-  - BradFamily
-  service: !type:CP14SellPrototypeService
-    proto: CP14LumiMushroom
-    count: 20
-
-- type: storePositionSell
-  id: CP14BlueAmanita
-  special: true
-  price: 200
-  factions:
-  - BradFamily
-  service: !type:CP14SellPrototypeService
-    proto: CP14BlueAmanita
-    count: 20
-
-- type: storePositionSell
-  id: CP14Dayflin
-  special: true
-  price: 200
-  factions:
-  - BradFamily
-  service: !type:CP14SellPrototypeService
-    proto: CP14Dayflin
-    count: 20
-
-- type: storePositionSell
-  id: CP14AirLily
-  special: true
-  price: 300
-  factions:
-  - BradFamily
-  service: !type:CP14SellPrototypeService
-    proto: CP14AirLily
-    count: 20
-
-- type: storePositionSell
-  id: CP14BaseAlchemyBomb
-  special: true
-  price: 250
-  factions:
-  - BradFamily
-  service: !type:CP14SellPrototypeService
-    proto: CP14BaseAlchemyBomb
-    count: 3

Resources/Prototypes/_CP14/Catalog/Cargo/Store/General/buy.yml

@@ -1,21 +0,0 @@
-- type: storePositionBuy
-  id: RerollSell
-  code: REROLL_SELL
-  price: 20
-  nameOverride: cp14-buy-position-reroll-sell
-  iconOverride: 
-    sprite: _CP14/Interface/Misc/reroll.rsi
-    state: reroll
-  service: !type:CP14RerollSpecialPositionsService
-    rerollSell: 5
-
-#- type: storePositionBuy #Неактуально, т.к. позиций таких нет
-#  id: RerollBuy
-#  code: REROLL_BUY
-#  price: 20
-#  nameOverride: cp14-buy-position-reroll-buy
-#  iconOverride: 
-#    sprite: _CP14/Interface/Misc/reroll.rsi
-#    state: reroll
-#  service: !type:CP14RerollSpecialPositionsService
-#    rerollBuy: 5

Resources/Prototypes/_CP14/Catalog/Cargo/Store/HelmirWeapon/buy.yml

@@ -1,99 +0,0 @@
-- type: storePositionBuy
-  id: CP14ModularIronArrow
-  code: ARROW
-  price: 100
-  factions:
-  - HelmirWeapon
-  service: !type:CP14BuyItemsService
-    product: CP14ModularIronArrow
-    count: 6
-
-- type: storePositionBuy
-  id: CP14ModularIronAxe
-  code: AXE
-  price: 150
-  factions:
-  - HelmirWeapon
-  service: !type:CP14BuyItemsService
-    product: CP14ModularIronAxe
-    count: 3
-
-- type: storePositionBuy
-  id: CP14ModularIronDagger
-  code: DAGGER
-  price: 150
-  factions:
-  - HelmirWeapon
-  service: !type:CP14BuyItemsService
-    product: CP14ModularIronDagger
-    count: 7
-
-- type: storePositionBuy
-  id: CP14ModularIronHammer
-  code: HAMMER
-  price: 150
-  factions:
-  - HelmirWeapon
-  service: !type:CP14BuyItemsService
-    product: CP14ModularIronHammer
-    count: 5
-
-- type: storePositionBuy
-  id: CP14ModularIronMace
-  code: MACE
-  price: 150
-  factions:
-  - HelmirWeapon
-  service: !type:CP14BuyItemsService
-    product: CP14ModularIronMace
-    count: 5
-
-- type: storePositionBuy
-  id: CP14ModularIronPickaxe
-  code: PICKAXE
-  price: 150
-  factions:
-  - HelmirWeapon
-  service: !type:CP14BuyItemsService
-    product: CP14ModularIronPickaxe
-    count: 5
-
-- type: storePositionBuy
-  id: CP14ModularIronShovel
-  code: SHOVEL
-  price: 150
-  factions:
-  - HelmirWeapon
-  service: !type:CP14BuyItemsService
-    product: CP14ModularIronShovel
-    count: 5
-
-- type: storePositionBuy
-  id: CP14ModularIronSickle
-  code: SICKLE
-  price: 150
-  factions:
-  - HelmirWeapon
-  service: !type:CP14BuyItemsService
-    product: CP14ModularIronSickle
-    count: 7
-
-- type: storePositionBuy
-  id: CP14ModularIronSpear
-  code: SPEAR
-  price: 150
-  factions:
-  - HelmirWeapon
-  service: !type:CP14BuyItemsService
-    product: CP14ModularIronSpear
-    count: 5
-
-- type: storePositionBuy
-  id: CP14ModularIronSword
-  code: SWORD
-  price: 150
-  factions:
-  - HelmirWeapon
-  service: !type:CP14BuyItemsService
-    product: CP14ModularIronSword
-    count: 5

Resources/Prototypes/_CP14/Catalog/Cargo/Store/SpiceStream/buy.yml

@@ -1,169 +0,0 @@
-- type: storePositionBuy
-  id: FarmSeeds
-  code: SEEDS
-  iconOverride: 
-    sprite: _CP14/Objects/Specific/Farming/seeds.rsi
-    state: seeds
-  price: 70
-  factions:
-  - SpiceStream
-  service: !type:CP14BuyItemsService
-    product: CP14WoodenChestFilledFarmSeeds
-
-- type: entity
-  parent: CP14WoodenChest
-  id: CP14WoodenChestFilledFarmSeeds
-  name: farm seeds chest
-  components:
-  - type: StorageFill
-    contents:
-      - id: CP14SeedWheat
-        amount: 3
-      - id: CP14SeedPumpkin
-        amount: 3
-      - id: CP14SeedCabbage
-        amount: 3
-      - id: CP14SeedCucumber
-        amount: 3
-      - id: CP14SeedTomato
-        amount: 3
-      - id: CP14SeedPepper
-        amount: 3
-      - id: CP14SeedCotton
-        amount: 3
-
-
-- type: storePositionBuy
-  id: Cheese
-  code: CHEESE
-  iconOverride: 
-    sprite: _CP14/Objects/Consumable/Food/cheese.rsi
-    state: cheese_wheel
-  price: 100
-  factions:
-  - SpiceStream
-  service: !type:CP14BuyItemsService
-    product: CP14WoodenChestFilledCheese
-
-- type: entity
-  parent: CP14WoodenChest
-  id: CP14WoodenChestFilledCheese
-  name: cheese chest
-  components:
-  - type: StorageFill
-    contents:
-      - id: CP14FoodCheeseWheel
-        amount: 5
-
-
-- type: storePositionBuy
-  id: Wood
-  code: WOOD
-  price: 50
-  factions:
-  - SpiceStream
-  service: !type:CP14BuyItemsService
-    product: CP14WoodenPlanks10
-    count: 5
-
-
-- type: storePositionBuy
-  id: Fabric
-  code: FABRIC
-  price: 30
-  factions:
-  - SpiceStream
-  service: !type:CP14BuyItemsService
-    product: CP14Cloth10
-    count: 3
-
-- type: storePositionBuy
-  id: CP14String
-  code: STRINGS
-  price: 30
-  factions:
-  - SpiceStream
-  service: !type:CP14BuyItemsService
-    product: CP14String
-    count: 5
-
-- type: storePositionBuy
-  id: CopperBar
-  code: COPPER
-  price: 250
-  factions:
-  - SpiceStream
-  service: !type:CP14BuyItemsService
-    product: CP14CopperBar10
-
-
-- type: storePositionBuy
-  id: IronBar
-  code: IRON
-  price: 500
-  factions:
-  - SpiceStream
-  service: !type:CP14BuyItemsService
-    product: CP14IronBar10
-
-
-- type: storePositionBuy
-  id: GoldBar
-  code: GOLD
-  price: 2000
-  factions:
-  - SpiceStream
-  service: !type:CP14BuyItemsService
-    product: CP14GoldBar10
-
-- type: storePositionBuy
-  id: Bureaucracy
-  code: PAPER
-  iconOverride: 
-    sprite: _CP14/Objects/Bureaucracy/paper.rsi
-    state: folder_red
-  price: 100
-  factions:
-  - SpiceStream
-  service: !type:CP14BuyItemsService
-    product: CP14WoodenChestFilledBureaucracy
-
-- type: entity
-  parent: CP14WoodenChest
-  id: CP14WoodenChestFilledBureaucracy
-  name: bureaucracy chest
-  components:
-  - type: StorageFill
-    contents:
-      - id: CP14PaperFolderBlue
-        amount: 5
-      - id: CP14PaperFolderRed
-        amount: 5
-      - id: CP14Paper
-        amount: 5
-      - id: CP14PenFeather
-        amount: 3
- 
-- type: storePositionBuy
-  id: EnergyCrystals
-  code: ENERGY
-  iconOverride: 
-    sprite: _CP14/Objects/Specific/Thaumaturgy/powerline_gauntlet.rsi 
-    state: icon
-  price: 150
-  factions:
-  - SpiceStream
-  service: !type:CP14BuyItemsService
-    product: CP14WoodenChestFilledEnergyCrystals
-
-- type: entity
-  parent: CP14WoodenChest
-  id: CP14WoodenChestFilledEnergyCrystals
-  name: energy crystals chest
-  components:
-  - type: StorageFill
-    contents:
-      - id: CP14EnergyCrystalMediumEmpty
-        amount: 5
-      - id: CP14ManaOperationGlove
-        amount: 2

Resources/Prototypes/_CP14/Catalog/Cargo/Store/SpiceStream/buy_special.yml

@@ -1,45 +0,0 @@
-# ANCHORABLE PROBLEMS
-
-#- type: storePositionBuy
-#  id: DwarfBeer
-#  code: BEER_DWARF
-#  special: true
-#  nameOverride: cp14-reagent-name-dwarfbeer
-#  price: 150
-#  factions:
-#  - SpiceStream
-#  service: !type:CP14BuyItemsService
-#    product: CP14CraneBarrelDwarfBeer
-#
-#- type: storePositionBuy
-#  id: BeerGerbil
-#  code: BEER_BREEZE
-#  special: true
-#  nameOverride: cp14-reagent-name-breeze
-#  price: 70
-#  factions:
-#  - SpiceStream
-#  service: !type:CP14BuyItemsService
-#    product: CP14CraneBarrelSmallBeerBreeze
-#
-#- type: storePositionBuy
-#  id: AleBottomless
-#  code: BEER_BOTTOMLESS
-#  special: true
-#  nameOverride: cp14-reagent-name-bottomless
-#  price: 70
-#  factions:
-#  - SpiceStream
-#  service: !type:CP14BuyItemsService
-#    product: CP14CraneBarrelSmallAleBottomless
-#
-#- type: storePositionBuy
-#  id: WineZellasian
-#  code: WINE_ZELLASIAN
-#  special: true
-#  nameOverride: cp14-reagent-name-zellasian-pleasure
-#  price: 150
-#  factions:
-#  - SpiceStream
-#  service: !type:CP14BuyItemsService
-#    product: CP14CraneBarrelWineZellasianPleasure

Resources/Prototypes/_CP14/Catalog/Cargo/Store/SpiceStream/sell.yml

@@ -1,94 +0,0 @@
-- type: storePositionSell
-  id: CopperBars
-  price: 150
-  factions:
-  - SpiceStream
-  - HelmirWeapon
-  service: !type:CP14SellStackService
-    stackId: CP14CopperBar
-    count: 10
-
-- type: storePositionSell
-  id: CopperOre
-  price: 20
-  factions:
-  - SpiceStream
-  service: !type:CP14SellStackService
-    stackId: CP14OreCopper
-    count: 10
-
-- type: storePositionSell
-  id: IronBars
-  price: 300
-  factions:
-  - SpiceStream
-  - HelmirWeapon
-  service: !type:CP14SellStackService
-    stackId: CP14IronBar
-    count: 10
-
-- type: storePositionSell
-  id: IronOre
-  price: 30
-  factions:
-  - SpiceStream
-  service: !type:CP14SellStackService
-    stackId: CP14OreIron
-    count: 10
-
-- type: storePositionSell
-  id: GoldBars
-  price: 1200
-  factions:
-  - SpiceStream
-  - HelmirWeapon
-  service: !type:CP14SellStackService
-    stackId: CP14GoldBar
-    count: 10
-
-- type: storePositionSell
-  id: GoldOre
-  price: 120
-  factions:
-  - SpiceStream
-  service: !type:CP14SellStackService
-    stackId: CP14OreGold
-    count: 10
-
-- type: storePositionSell
-  id: MithrilBars
-  price: 2500
-  factions:
-  - SpiceStream
-  - HelmirWeapon
-  service: !type:CP14SellStackService
-    stackId: CP14MithrilBar
-    count: 10
-
-- type: storePositionSell
-  id: MithrilOre
-  price: 250
-  factions:
-  - SpiceStream
-  service: !type:CP14SellStackService
-    stackId: CP14OreMithril
-    count: 10
-
-- type: storePositionSell
-  id: Wood
-  price: 5
-  factions:
-  - SpiceStream
-  - HelmirWeapon
-  service: !type:CP14SellStackService
-    stackId: CP14WoodenPlanks
-    count: 30
-
-- type: storePositionSell
-  id: Glass
-  price: 100
-  factions:
-  - SpiceStream
-  service: !type:CP14SellStackService
-    stackId: CP14GlassSheet
-    count: 10

Resources/Prototypes/_CP14/Catalog/Cargo/Store/SpiceStream/sell_special.yml

@@ -1,129 +0,0 @@
-- type: storePositionSell
-  id: CP14DyeRed
-  special: true
-  price: 75
-  factions:
-  - SpiceStream
-  service: !type:CP14SellPrototypeService
-    proto: CP14DyeRed
-    count: 5
-
-- type: storePositionSell
-  id: CP14DyeYellow
-  special: true
-  price: 75
-  factions:
-  - SpiceStream
-  service: !type:CP14SellPrototypeService
-    proto: CP14DyeYellow
-    count: 5
-
-- type: storePositionSell
-  id: CP14DyeBlue
-  special: true
-  price: 75
-  factions:
-  - SpiceStream
-  service: !type:CP14SellPrototypeService
-    proto: CP14DyeBlue
-    count: 5
-
-- type: storePositionSell
-  id: CP14FoodPieMeat
-  special: true
-  price: 100
-  factions:
-  - SpiceStream
-  service: !type:CP14SellPrototypeService
-    proto: CP14FoodPieMeat
-    count: 1
-
-- type: storePositionSell
-  id: CP14FoodPiePumpkin
-  special: true
-  price: 100
-  factions:
-  - SpiceStream
-  service: !type:CP14SellPrototypeService
-    proto: CP14FoodPiePumpkin
-    count: 1
-
-- type: storePositionSell
-  id: CP14FoodBreadBun
-  special: true
-  price: 20
-  factions:
-  - SpiceStream
-  service: !type:CP14SellPrototypeService
-    proto: CP14FoodBreadBun
-    count: 3
-
-- type: storePositionSell
-  id: CP14FoodCabbage
-  special: true
-  price: 80
-  factions:
-  - SpiceStream
-  service: !type:CP14SellPrototypeService
-    proto: CP14FoodCabbage
-    count: 10
-
-- type: storePositionSell
-  id: CP14FoodPumpkin
-  special: true
-  price: 80
-  factions:
-  - SpiceStream
-  service: !type:CP14SellPrototypeService
-    proto: CP14FoodPumpkin
-    count: 10
-
-- type: storePositionSell
-  id: CP14FoodPotato
-  special: true
-  price: 80
-  factions:
-  - SpiceStream
-  service: !type:CP14SellPrototypeService
-    proto: CP14FoodPotato
-    count: 10
-
-- type: storePositionSell
-  id: CP14FoodCucumber
-  special: true
-  price: 80
-  factions:
-  - SpiceStream
-  service: !type:CP14SellPrototypeService
-    proto: CP14FoodCucumber
-    count: 10
-
-- type: storePositionSell
-  id: CP14FoodTomatoes
-  special: true
-  price: 80
-  factions:
-  - SpiceStream
-  service: !type:CP14SellPrototypeService
-    proto: CP14FoodTomatoes
-    count: 10
-
-- type: storePositionSell
-  id: CP14FoodPepper
-  special: true
-  price: 80
-  factions:
-  - SpiceStream
-  service: !type:CP14SellPrototypeService
-    proto: CP14FoodPepper
-    count: 10
-
-- type: storePositionSell
-  id: CP14FoodOnion
-  special: true
-  price: 80
-  factions:
-  - SpiceStream
-  service: !type:CP14SellPrototypeService
-    proto: CP14FoodOnion
-    count: 10

Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sylphoria/buy.yml

@@ -1,68 +0,0 @@
-- type: storePositionBuy
-  id: CP14SpellScrollResurrection
-  code: SCROLL_RESURRECTION
-  price: 100
-  factions:
-  - Sylphoria
-  service: !type:CP14BuyItemsService
-    product: CP14SpellScrollResurrection
-
-- type: storePositionBuy
-  id: CP14SpellScrollCureWounds
-  code: CURE_WOUNDS
-  price: 100
-  factions:
-  - Sylphoria
-  service: !type:CP14BuyItemsService
-    product: CP14SpellScrollCureWounds
-    count: 5
-
-- type: storePositionBuy
-  id: CP14SpellScrollCureBurn
-  code: CURE_BURN
-  price: 100
-  factions:
-  - Sylphoria
-  service: !type:CP14BuyItemsService
-    product: CP14SpellScrollCureBurn
-    count: 5
-
-- type: storePositionBuy
-  id: CP14SpellScrollBloodPurification
-  code: BLOOD_PURE
-  price: 100
-  factions:
-  - Sylphoria
-  service: !type:CP14BuyItemsService
-    product: CP14SpellScrollBloodPurification
-    count: 5
-
-- type: storePositionBuy
-  id: CP14SpellscrollSignalLightBlue
-  code: SIGNAL_BLUE
-  price: 50
-  factions:
-  - Sylphoria
-  service: !type:CP14BuyItemsService
-    product: CP14SpellscrollSignalLightBlue
-    count: 5
-
-- type: storePositionBuy
-  id: CP14SpellscrollSignalLightYellow
-  code: SIGNAL_YELLOW
-  price: 50
-  factions:
-  - Sylphoria
-  service: !type:CP14BuyItemsService
-    product: CP14SpellscrollSignalLightYellow
-    count: 5
-
-- type: storePositionBuy
-  id: CP14SpellscrollSignalLightRed
-  code: SIGNAL_RED
-  price: 50
-  factions:
-  - Sylphoria
-  service: !type:CP14BuyItemsService
-    product: CP14SpellscrollSignalLightRed
-    count: 5

Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sylphoria/sell.yml

@@ -1,32 +0,0 @@
-- type: storePositionSell
-  id: CP14LucenPlanks
-  price: 100
-  factions:
-  - Sylphoria
-  service: !type:CP14SellStackService
-    stackId: CP14LucensWoodenPlanks
-    count: 10
-
-- type: storePositionSell
-  id: CP14SpellScroll
-  price: 50
-  factions:
-  - Sylphoria
-  service: !type:CP14SellWhitelistService
-    whitelist:
-      tags:
-      - CP14SpellScroll
-    count: 5
-    name: cp14-entity-group-spell-scrolls
-    sprite:
-      sprite: _CP14/Objects/Bureaucracy/paper.rsi
-      state: scrolls
-
-- type: storePositionSell
-  id: CP14ClothingCloakAmuletGold
-  price: 80
-  factions:
-  - Sylphoria
-  service: !type:CP14SellPrototypeService
-    proto: CP14ClothingCloakAmuletGold
-    count: 1

Resources/Prototypes/_CP14/Catalog/Cargo/Store/Sylphoria/sell_special.yml

@@ -1,139 +0,0 @@
-- type: storePositionSell
-  id: BountyTorch
-  special: true
-  price: 20
-  factions:
-  - Sylphoria
-  service: !type:CP14SellPrototypeService
-    proto: CP14Torch
-    count: 5
-
-- type: storePositionSell
-  id: BountyLucenPlanks
-  special: true
-  price: 200
-  factions:
-  - Sylphoria
-  service: !type:CP14SellStackService
-    stackId: CP14LucensWoodenPlanks
-    count: 20
-
-- type: storePositionSell
-  id: CP14SpellScrollShadowStep
-  special: true
-  price: 80
-  factions:
-  - Sylphoria
-  service: !type:CP14SellPrototypeService
-    proto: CP14SpellScrollShadowStep
-    count: 1
-
-- type: storePositionSell
-  id: CP14SpellScrollFireball
-  special: true
-  price: 80
-  factions:
-  - Sylphoria
-  service: !type:CP14SellPrototypeService
-    proto: CP14SpellScrollFireball
-    count: 1
-
-- type: storePositionSell
-  id: CP14SpellScrollBeerCreation
-  special: true
-  price: 400
-  factions:
-  - Sylphoria
-  service: !type:CP14SellPrototypeService
-    proto: CP14SpellScrollBeerCreation
-    count: 1
-
-- type: storePositionSell
-  id: CP14ClothingRingIceShards
-  special: true
-  price: 150
-  factions:
-  - Sylphoria
-  service: !type:CP14SellPrototypeService
-    proto: CP14ClothingRingIceShards
-    count: 1
-
-- type: storePositionSell
-  id: CP14ClothingRingFlashLight
-  special: true
-  price: 150
-  factions:
-  - Sylphoria
-  service: !type:CP14SellPrototypeService
-    proto: CP14ClothingRingFlashLight
-    count: 1
-
-- type: storePositionSell
-  id: CP14BaseLockpick
-  special: true
-  price: 100
-  factions:
-  - Sylphoria
-  service: !type:CP14SellPrototypeService
-    proto: CP14BaseLockpick
-    count: 10
-
-- type: storePositionSell
-  id: CP14MobRabbit
-  special: true
-  price: 50
-  factions:
-  - Sylphoria
-  service: !type:CP14SellPrototypeService
-    proto: CP14MobRabbit
-    count: 5
-
-- type: storePositionSell
-  id: CP14MobPig
-  special: true
-  price: 130
-  factions:
-  - Sylphoria
-  service: !type:CP14SellPrototypeService
-    proto: CP14MobPig
-    count: 5
-
-- type: storePositionSell
-  id: CP14MobBoar
-  special: true
-  price: 170
-  factions:
-  - Sylphoria
-  service: !type:CP14SellPrototypeService
-    proto: CP14MobBoar
-    count: 5
-
-- type: storePositionSell
-  id: CP14MobFrog
-  special: true
-  price: 10
-  factions:
-  - Sylphoria
-  service: !type:CP14SellPrototypeService
-    proto: CP14MobFrog
-    count: 5
-
-- type: storePositionSell
-  id: CP14MobMonsterMole
-  special: true
-  price: 50
-  factions:
-  - Sylphoria
-  service: !type:CP14SellPrototypeService
-    proto: CP14MobMonsterMole
-    count: 1
-
-- type: storePositionSell
-  id: CP14PartsMonsterGlands
-  special: true
-  price: 100
-  factions:
-  - Sylphoria
-  service: !type:CP14SellPrototypeService
-    proto: CP14PartsMonsterGlands
-    count: 1

Resources/Prototypes/_CP14/Catalog/Cargo/Store/factions.yml

@@ -1,19 +0,0 @@
-- type: storeFaction
-  id: HelmirWeapon
-  name: cp14-faction-name-helmir
-  desc: cp14-faction-desc-helmir
-
-- type: storeFaction
-  id: Sylphoria
-  name: cp14-faction-name-sylphoria
-  desc: cp14-faction-desc-sylphoria
-
-- type: storeFaction
-  id: SpiceStream
-  name: cp14-faction-name-spice-stream
-  desc: cp14-faction-desc-spice-stream
-
-- type: storeFaction
-  id: BradFamily
-  name: cp14-faction-name-brad-family
-  desc: cp14-faction-desc-brad-family

Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/heat.yml

@@ -16,6 +16,8 @@
     - !type:CP14SpellSpawnEntityOnTarget
       spawns:
       - CP14ImpactEffectHeat
+    - !type:CP14AdjustAllSolutionThermalEnergy
+      delta: 3600 # One full use heats 100u from ~300k to ~650k
     - !type:CP14SpellApplyEntityEffect
       effects:
       - !type:AdjustTemperature

Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_heat.yml

@@ -9,7 +9,7 @@
   - type: CP14MagicEffectCastSlowdown
     speedMultiplier: 0.5
   - type: CP14MagicEffectManaCost
-    manaCost: 10
+    manaCost: 12
   - type: CP14MagicEffect
     magicType: Life
     telegraphyEffects:
@@ -87,4 +87,4 @@
   components:
   - type: CP14SpellStorage
     spells:
-    - CP14ActionSpellCureBurn
+    - CP14ActionSpellCureBurn

Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_poison.yml

@@ -9,7 +9,7 @@
   - type: CP14MagicEffectCastSlowdown
     speedMultiplier: 0.5
   - type: CP14MagicEffectManaCost
-    manaCost: 10
+    manaCost: 12
   - type: CP14MagicEffect
     magicType: Life
     telegraphyEffects:
@@ -29,9 +29,8 @@
             Bloodloss: -10
             Caustic: -10
       - !type:Jitter
-      - !type:ModifyBleedAmount
       - !type:ModifyBloodLevel
-        amount: 10
+        amount: 25
   - type: CP14MagicEffectVerbalAspect
     startSpeech: "Nella coda..."
     endSpeech: "sta il veleno"
@@ -90,4 +89,4 @@
   components:
   - type: CP14SpellStorage
     spells:
-    - CP14ActionSpellBloodPurification
+    - CP14ActionSpellBloodPurification

Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_wounds.yml

@@ -9,7 +9,7 @@
   - type: CP14MagicEffectCastSlowdown
     speedMultiplier: 0.5
   - type: CP14MagicEffectManaCost
-    manaCost: 10
+    manaCost: 12
   - type: CP14MagicEffect
     magicType: Life
     telegraphyEffects:
@@ -29,6 +29,8 @@
             Blunt: -10
             Piercing: -10
       - !type:Jitter
+      - !type:ModifyBleedAmount
+        amount: -5
   - type: CP14MagicEffectVerbalAspect
     startSpeech: "Et curabuntur..."
     endSpeech: "vulnera tua"
@@ -84,4 +86,4 @@
   components:
   - type: CP14SpellStorage
     spells:
-    - CP14ActionSpellCureWounds
+    - CP14ActionSpellCureWounds

Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/sheep_polymorph.yml

@@ -29,6 +29,7 @@
     endSpeech: "pecora tua"
   - type: CP14MagicEffectCastingVisual
     proto: CP14RuneSheepPolymorph
+  - type: CP14MagicEffectAliveTargetRequired
   - type: EntityTargetAction
     whitelist:
       components:

Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/freeze.yml

@@ -16,6 +16,8 @@
     - !type:CP14SpellSpawnEntityOnTarget
       spawns:
       - CP14ImpactEffectFreeze
+    - !type:CP14AdjustAllSolutionThermalEnergy
+      delta: -1200 # One full use cools 100u from ~300k to ~250k
     - !type:CP14SpellApplyEntityEffect
       effects:
       - !type:MovespeedModifier
@@ -77,4 +79,4 @@
   components:
   - type: CP14SpellStorage
     spells:
-    - CP14ActionSpellFreeze
+    - CP14ActionSpellFreeze

Resources/Prototypes/_CP14/Entities/Clothing/Eyes/eyes.yml

@@ -104,3 +104,21 @@
     sprite: _CP14/Clothing/Eyes/thaumaturgy_glasses.rsi
   - type: CP14MagicEssenceScanner
   - type: VisionCorrection
+
+- type: entity
+  parent: CP14ClothingEyesBase
+  id: CP14ClothingEyesEyePatch
+  name: eye patch
+  description: Hides the mutilation of the eyes. 
+  components:
+  - type: Foldable
+    canFoldInsideContainer: true
+    unfoldVerbText: fold-flip-verb
+    foldVerbText: fold-flip-verb
+  - type: FoldableClothing
+    foldedEquippedPrefix: flipped
+    foldedHeldPrefix: flipped
+  - type: Sprite
+    sprite: _CP14/Clothing/Eyes/eye_patch.rsi
+  - type: Clothing
+    sprite: _CP14/Clothing/Eyes/eye_patch.rsi

Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Aventail/chainmail.yml

@@ -23,8 +23,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - AventailIronChainmail
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 10
 
 - type: entity
@@ -41,8 +41,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - AventailGoldChainmail
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 10
 
 - type: entity
@@ -59,8 +59,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - AventailCopperChainmail
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 10
 
 - type: entity
@@ -77,6 +77,6 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - AventailMithrilChainmail
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Aventail/plate.yml

@@ -11,8 +11,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - AventailIronPlate
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 10
 
 - type: entity
@@ -29,8 +29,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - AventailGoldPlate
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 10
 
 - type: entity
@@ -47,8 +47,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - AventailCopperPlate
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 10
 
 - type: entity
@@ -65,6 +65,6 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - AventailMithrilPlate
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Helmet/capellina.yml

@@ -36,8 +36,8 @@
     startProtoPart: CP14HelmetIronCapellina
   - type: CP14MagicManacostModify
     globalModifier: 1.05
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 20
 
 - type: entity
@@ -70,8 +70,8 @@
     startProtoPart: CP14HelmetGoldCapellina
   - type: CP14MagicManacostModify
     globalModifier: 1.01
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 20
 
 - type: entity
@@ -104,8 +104,8 @@
     startProtoPart: CP14HelmetCopperCapellina
   - type: CP14MagicManacostModify
     globalModifier: 1.03
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 20
 
 - type: entity
@@ -138,6 +138,6 @@
     startProtoPart: CP14HelmetMithrilCapellina
   - type: CP14MagicManacostModify
     globalModifier: 0.98
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 20

Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Helmet/palm_helmet.yml

@@ -22,8 +22,8 @@
     startProtoPart: CP14HelmetIronCapellina
   - type: CP14MagicManacostModify
     globalModifier: 1.05
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 20
 
 - type: entity
@@ -56,8 +56,8 @@
     startProtoPart: CP14HelmetGoldPalmHelmet
   - type: CP14MagicManacostModify
     globalModifier: 1.01
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 20
 
 - type: entity
@@ -90,8 +90,8 @@
     startProtoPart: CP14HelmetCopperPalmHelmet
   - type: CP14MagicManacostModify
     globalModifier: 1.03
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 20
 
 - type: entity
@@ -125,6 +125,6 @@
     startProtoPart: CP14HelmetMithrilPalmHelmet
   - type: CP14MagicManacostModify
     globalModifier: 0.98
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 20

Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Visor/chainmail.yml

@@ -23,8 +23,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - VisorIronChainmail
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 10
 
 - type: entity
@@ -41,8 +41,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - VisorGoldChainmail
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 10
 
 - type: entity
@@ -59,8 +59,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - VisorCopperChainmail
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 10
 
 - type: entity
@@ -77,6 +77,6 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - VisorMithrilChainmail
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Clothing/Head/ModularArmor/Visor/plate.yml

@@ -11,8 +11,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - VisorIronPlate
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 10
 
 - type: entity
@@ -29,8 +29,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - VisorGoldPlate
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 10
 
 - type: entity
@@ -47,8 +47,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - VisorCopperPlate
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 10
 
 - type: entity
@@ -65,6 +65,6 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - VisorMithrilPlate
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Breastplate/chainmail.yml

@@ -21,8 +21,8 @@
     startProtoPart: CP14ArmorIronChainmail
   - type: CP14MagicManacostModify
     globalModifier: 1.15
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 40
 
 - type: entity
@@ -64,8 +64,8 @@
     startProtoPart: CP14ArmorGoldChainmail
   - type: CP14MagicManacostModify
     globalModifier: 1.05
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 40
 
 - type: entity
@@ -104,8 +104,8 @@
     startProtoPart: CP14ArmorCopperChainmail
   - type: CP14MagicManacostModify
     globalModifier: 1.1
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 40
 
 - type: entity
@@ -147,6 +147,6 @@
     startProtoPart: CP14ArmorMithrilChainmail
   - type: CP14MagicManacostModify
     globalModifier: 0.96
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 40

Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Breastplate/cuirass.yml

@@ -37,8 +37,8 @@
     startProtoPart: CP14ArmorIronCuirass
   - type: CP14MagicManacostModify
     globalModifier: 1.2
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 50
 
 - type: entity
@@ -81,8 +81,8 @@
     startProtoPart: CP14ArmorGoldCuirass
   - type: CP14MagicManacostModify
     globalModifier: 1.1
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 50
 
 - type: entity
@@ -125,8 +125,8 @@
     startProtoPart: CP14ArmorCopperCuirass
   - type: CP14MagicManacostModify
     globalModifier: 1.15
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 50
 
 - type: entity
@@ -169,6 +169,6 @@
     startProtoPart: CP14ArmorMithrilCuirass
   - type: CP14MagicManacostModify
     globalModifier: 0.95
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 50

Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Breastplate/infantry_cuirass.yml

@@ -22,8 +22,8 @@
     startProtoPart: CP14ArmorIronInfantryCuirass
   - type: CP14MagicManacostModify
     globalModifier: 1.24
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 60
 
 - type: entity
@@ -66,8 +66,8 @@
     startProtoPart: CP14ArmorGoldInfantryCuirass
   - type: CP14MagicManacostModify
     globalModifier: 1.14
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 60
 
 - type: entity
@@ -110,8 +110,8 @@
     startProtoPart: CP14ArmorCopperInfantryCuirass
   - type: CP14MagicManacostModify
     globalModifier: 1.18
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 60
 
 - type: entity
@@ -154,6 +154,6 @@
     startProtoPart: CP14ArmorMithrilInfantryCuirass
   - type: CP14MagicManacostModify
     globalModifier: 0.92
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 60

Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Cuisses/chainmail.yml

@@ -11,8 +11,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - CuissesIronChainmail
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 10
 
 - type: entity
@@ -29,8 +29,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - CuissesGoldChainmail
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 10
 
 - type: entity
@@ -47,8 +47,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - CuissesCopperChainmail
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 10
 
 - type: entity
@@ -65,6 +65,6 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - CuissesMithrilChainmail
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Cuisses/plate.yml

@@ -26,8 +26,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - CuissesIronPlate
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 20
 
 - type: entity
@@ -44,8 +44,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - CuissesGoldPlate
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 20
 
 - type: entity
@@ -62,8 +62,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - CuissesCopperPlate
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 20
 
 - type: entity
@@ -80,6 +80,6 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - CuissesMithrilPlate
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 20

Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Greave/chainmail.yml

@@ -11,8 +11,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - GreaveIronChainmail
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 10
 
 - type: entity
@@ -29,8 +29,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - GreaveGoldChainmail
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 10
 
 - type: entity
@@ -47,8 +47,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - GreaveCopperChainmail
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 10
 
 - type: entity
@@ -65,6 +65,6 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - GreaveMithrilChainmail
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Clothing/OuterClothing/ModularArmor/Greave/plate.yml

@@ -23,8 +23,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - GreaveIronPlate
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 20
 
 - type: entity
@@ -41,8 +41,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - GreaveGoldPlate
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 20
 
 - type: entity
@@ -59,8 +59,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - GreaveCopperPlate
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 20
 
 - type: entity
@@ -77,6 +77,6 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - GreaveMithrilPlate
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 20

Resources/Prototypes/_CP14/Entities/Clothing/Rings/amulet.yml

@@ -22,9 +22,9 @@
     - state: icon
   - type: Clothing
     sprite: _CP14/Clothing/Rings/Amulet/amulet.rsi
-  - type: CP14Material
-    materials:
-      CP14Gold: 5
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Gold: 2
 
 - type: entity
   parent: CP14ClothingJewelleryBase

Resources/Prototypes/_CP14/Entities/Markers/Spawners/unique_loot.yml

@@ -17,18 +17,4 @@
     - sprite: Markers/cross.rsi
       state: green
     - sprite: _CP14/Clothing/Shoes/flightboots.rsi
-      state: icon
-
-- type: entity
-  name: random tradepost spawner
-  id: CP14SpawnUniqueTradepost
-  parent: CP14SpawnUniqueBase
-  components:
-  - type: CP14UniqueLootSpawner
-    tag: CP14UniqueSpawnTradepost
-  - type: Sprite
-    layers:
-    - sprite: Markers/cross.rsi
-      state: green
-    - sprite: _CP14/Structures/Specific/Economy/trade_portal.rsi
       state: icon

Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml

@@ -232,6 +232,7 @@
         Cold: 0.25
         Bloodloss: 0.25
   - type: CP14SkillStorage
+  - type: CP14TradingReputation
 
 
 - type: entity

Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml

@@ -80,6 +80,8 @@
       Male: CP14UnisexGoblin
       Female: CP14UnisexGoblin
       Unsexed: CP14UnisexGoblin
+  - type: Speech
+    speechSounds: CP14Goblin
   - type: Thirst
   - type: Butcherable
     butcheringType: Spike
@@ -262,4 +264,4 @@
         sizeMaps:
           32:
             sprite: _CP14/Mobs/Species/Goblin/displacement.rsi
-            state: shoes
+            state: shoes

Resources/Prototypes/_CP14/Entities/Objects/Economy/coins.yml

@@ -24,9 +24,9 @@
     - coin9
     - coin10
   - type: Appearance
-  - type: CP14Currency
-    currency: 1
-    category: Currency
+  - type: StaticPrice
+    price: 0
+  - type: CP14CurrencyExaminable
   - type: EmitSoundOnLand
     sound:
       path: /Audio/_CP14/Items/coins_fall.ogg  
@@ -54,8 +54,8 @@
   - type: Stack
     stackType: CP14CopperCoin
     count: 10
-  - type: CP14Currency
-    currency: 1
+  - type: StackPrice
+    price: 1
 
 - type: entity
   id: CP14CopperCoin5
@@ -94,8 +94,8 @@
   - type: Stack
     stackType: CP14SilverCoin
     count: 10
-  - type: CP14Currency
-    currency: 10
+  - type: StackPrice
+    price: 10
 
 - type: entity
   id: CP14SilverCoin5
@@ -134,8 +134,8 @@
   - type: Stack
     stackType: CP14GoldCoin
     count: 10
-  - type: CP14Currency
-    currency: 100
+  - type: StackPrice
+    price: 100
 
 - type: entity
   id: CP14GoldCoin5
@@ -174,8 +174,8 @@
   - type: Stack
     stackType: CP14PlatinumCoin
     count: 10
-  - type: CP14Currency
-    currency: 1000
+  - type: StackPrice
+    price: 1000
 
 - type: entity
   id: CP14PlatinumCoin5

Resources/Prototypes/_CP14/Entities/Objects/Economy/jewelry.yml

@@ -11,19 +11,15 @@
     sprite: /Textures/_CP14/Objects/Economy/jewelry.rsi
   - type: Item
     size: Tiny
-  - type: CP14Currency
-    currency: 1
-    category: Currency
+  - type: StaticPrice
+    price: 150
 
 - type: entity
   parent: CP14BaseJewelry
   id: CP14JewelryRuby
   name: ruby
   description: A beautiful ruby stone that's worth a lot of money.
-  suffix: 25gp
   components:
-  - type: CP14Currency
-    currency: 2500
   - type: Sprite
     layers:
       - state: ruby1
@@ -40,10 +36,7 @@
   id: CP14JewelryEmerald
   name: emerald
   description: A beautiful emerald stone that's worth a lot of money.
-  suffix: 40gp
   components:
-  - type: CP14Currency
-    currency: 4000
   - type: Sprite
     layers:
       - state: emerald1
@@ -61,10 +54,7 @@
   id: CP14JewelrySapphire
   name: sapphire
   description: A beautiful sapphire stone that's worth a lot of money.
-  suffix: 30gp
   components:
-  - type: CP14Currency
-    currency: 3000
   - type: Sprite
     layers:
       - state: sapphire1
@@ -81,10 +71,7 @@
   id: CP14JewelryTopaz
   name: topaz
   description: A beautiful topaz stone that's worth a lot of money.
-  suffix: 10gp
   components:
-  - type: CP14Currency
-    currency: 1000
   - type: Sprite
     layers:
       - state: topaz1

Resources/Prototypes/_CP14/Entities/Objects/Economy/trade_contracts.yml

@@ -0,0 +1,40 @@
+- type: entity
+  parent: BaseItem
+  id: CP14TradeContractBase
+  abstract: true
+  categories: [ ForkFiltered ]
+  name: trade contract
+  components:
+  - type: Item
+    size: Tiny
+  - type: Tag
+    tags:
+    - Document
+  - type: Sprite
+    sprite: _CP14/Objects/Specific/Economy/trade_contracts.rsi
+    state: blank
+  - type: StaticPrice
+    price: 10
+  - type: CP14TradingContract
+
+- type: entity
+  parent: CP14TradeContractBase
+  id: CP14TradeContractVictoriaGardens
+  description: Trading contract with the "Victoria Gardens" shop. Allows you to purchase various natural products on the trading platform.
+  suffix: Victoria Gardens
+  components:
+  - type: Sprite
+    state: victoria_garden
+  - type: CP14TradingContract 
+    faction: VictoriaGardens
+
+- type: entity
+  parent: CP14TradeContractBase
+  id: CP14TradeContractBradPotions
+  description: Trading contract with the "Brad's marvelous potions" ahop. Allows you to purchase various potions and alchemy equipment.
+  suffix: Brad Potions
+  components:
+  - type: Sprite
+    state: brad_potions
+  - type: CP14TradingContract 
+    faction: BradPotions

Resources/Prototypes/_CP14/Entities/Objects/Economy/wallet.yml

@@ -52,4 +52,19 @@
     - id: CP14SilverCoin1
     - id: CP14CopperCoin
     - id: CP14CopperCoin
+    - id: CP14CopperCoin
+
+- type: entity
+  id: CP14WalletFilledMerchant
+  parent: CP14Wallet
+  suffix: Merchant
+  components:
+  - type: StorageFill
+    contents:
+    - id: CP14GoldCoin1
+    - id: CP14SilverCoin5
+    - id: CP14SilverCoin1
+    - id: CP14SilverCoin1
+    - id: CP14CopperCoin
+    - id: CP14CopperCoin
     - id: CP14CopperCoin

Resources/Prototypes/_CP14/Entities/Objects/Keys/key.yml

@@ -31,6 +31,9 @@
     - 2
     - 2
     - 2
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Copper: 10
 
 - type: entity
   parent: CP14BaseKey
@@ -45,6 +48,9 @@
     - 2
     - 2
     - 2
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Iron: 10
 
 - type: entity
   parent: CP14BaseKey
@@ -60,6 +66,9 @@
     - 2
     - 2
     - 2
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Gold: 10
 
 - type: entity
   parent: CP14BaseKey
@@ -75,4 +84,7 @@
     - 2
     - 2
     - 2
-    - 2
+    - 2
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Objects/Keys/keyrings.yml

@@ -42,6 +42,9 @@
     slots:
     - keys
     - belt
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Iron: 5
 
 - type: entity
   parent: CP14BaseKeyRing

Resources/Prototypes/_CP14/Entities/Objects/Keys/locks.yml

@@ -29,6 +29,9 @@
     - 2
     - 2
     - 2
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Copper: 10
 
 - type: entity
   parent: CP14BaseLock
@@ -43,6 +46,9 @@
     - 2
     - 2
     - 2
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Iron: 10
 
 - type: entity
   parent: CP14BaseLock
@@ -58,6 +64,9 @@
     - 2
     - 2
     - 2
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Gold: 10
 
 - type: entity
   parent: CP14BaseLock
@@ -73,4 +82,7 @@
     - 2
     - 2
     - 2
-    - 2
+    - 2
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Objects/Keys/tools.yml

@@ -15,6 +15,9 @@
   - type: Tag
     tags:
     - CP14Lockpick
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Iron: 10
 
 - type: entity
   parent: CP14BaseLockpick
@@ -25,6 +28,9 @@
     health: 50
   - type: Sprite
     state: lockpick_mithril
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Mithril: 10
 
 - type: entity
   parent: BaseItem
@@ -41,3 +47,6 @@
   - type: CP14KeyFile
   - type: UseDelay
     delay: 1.0
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Iron: 10

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

@@ -1,50 +0,0 @@
-- type: entity
-  parent: BaseItem
-  id: CP14Ash1
-  name: ash #Возможный реагент в будущем
-  description: It used to be something that could be interesting and useful, now it's not.
-  suffix: 1
-  categories: [ ForkFiltered ]
-  components:
-  - type: Item
-    size: Tiny
-  - type: Sprite
-    sprite: _CP14/Objects/Materials/ash.rsi
-    layers:
-      - state: ash_1
-        map: ["base"]
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 50
-        reagents:
-        - ReagentId: Ash
-          Quantity: 10
-  - type: SolutionSpiker
-    sourceSolution: food
-    ignoreEmpty: true
-  - type: ScoopableSolution
-    solution: food
-  - type: Extractable
-    grindableSolutionName: food
-  - type: Appearance
-  - type: Stack
-    stackType: CP14Ash
-    count: 1
-    baseLayer: base
-    layerStates:
-    - ash_1
-    - ash_2
-    - ash_3
-  - type: Material
-  - type: PhysicalComposition # точно ли это нужно?
-    materialComposition:
-      CP14Ash: 100
-
-- type: entity
-  id: CP14Ash3
-  parent: CP14Ash1
-  suffix: 3
-  components:
-  - type: Stack
-    count: 3

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

@@ -23,9 +23,9 @@
     - bar_2
     - bar_3
   - type: Material
-  #- type: CP14Material
-  #  materials:
-  #    CP14Copper: 10
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Copper: 10
 
 - type: entity
   id: CP14CopperBar5
@@ -70,9 +70,9 @@
     - bar_2
     - bar_3
   - type: Material
-  #- type: CP14Material
-  #  materials:
-  #    CP14Iron: 10
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Iron: 10
 
 - type: entity
   id: CP14IronBar5
@@ -116,9 +116,9 @@
     - bar_2
     - bar_3
   - type: Material
-  #- type: CP14Material
-  #  materials:
-  #    CP14Gold: 10
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Gold: 10
 
 - type: entity
   id: CP14GoldBar5
@@ -161,6 +161,9 @@
     - glass_2
     - glass_3
   - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Glass: 10
 
 - type: entity
   id: CP14GlassSheet5
@@ -202,9 +205,9 @@
     - bar_2
     - bar_3
   - type: Material
-  #- type: CP14Material
-  #  materials:
-  #    CP14Mithril: 10
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Mithril: 10
 
 - type: entity
   id: CP14MithrilBar5

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

@@ -23,6 +23,9 @@
       - state: grass_material1
         map: ["base"]
   - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      CP14FloraMaterial: 10
 
 - type: entity
   id: CP14FloraMaterial10

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

@@ -1,3 +1,55 @@
+- type: entity
+  parent: BaseItem
+  id: CP14Ash1
+  name: ash #Возможный реагент в будущем
+  description: It used to be something that could be interesting and useful, now it's not.
+  suffix: 1
+  categories: [ ForkFiltered ]
+  components:
+  - type: Item
+    size: Tiny
+  - type: Sprite
+    sprite: _CP14/Objects/Materials/ash.rsi
+    layers:
+      - state: ash_1
+        map: ["base"]
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 50
+        reagents:
+        - ReagentId: Ash
+          Quantity: 10
+  - type: SolutionSpiker
+    sourceSolution: food
+    ignoreEmpty: true
+  - type: ScoopableSolution
+    solution: food
+  - type: Extractable
+    grindableSolutionName: food
+  - type: Appearance
+  - type: Stack
+    stackType: CP14Ash
+    count: 1
+    baseLayer: base
+    layerStates:
+    - ash_1
+    - ash_2
+    - ash_3
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Ash: 10
+
+- type: entity
+  id: CP14Ash3
+  parent: CP14Ash1
+  suffix: 3
+  components:
+  - type: Stack
+    count: 3
+
+
 - type: entity
   parent: BaseItem
   id: CP14CrystalShardQuartz
@@ -27,6 +79,9 @@
       reagents:
       - ReagentId: CP14GroundQuartz
         Quantity: 7
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Glass: 10
 
 - type: entity
   parent: BaseItem

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

@@ -21,8 +21,9 @@
     - ore1
     - ore2
     - ore3
-  - type: CP14Material
-    materials:
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 2
 
 - type: entity
@@ -66,8 +67,9 @@
     - ore1
     - ore2
     - ore3
-  - type: CP14Material
-    materials:
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 2
 
 - type: entity
@@ -111,8 +113,9 @@
     - ore1
     - ore2
     - ore3
-  - type: CP14Material
-    materials:
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 2
 
 - type: entity
@@ -156,8 +159,9 @@
     - ore1
     - ore2
     - ore3
-  - type: CP14Material
-    materials:
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 2
 
 - type: entity

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

@@ -31,9 +31,9 @@
     - dirt_2
     - dirt_3
   - type: Material
-  - type: PhysicalComposition # точно ли это нужно?
+  - type: PhysicalComposition
     materialComposition:
-      CP14Dirt: 100
+      CP14Dirt: 10
   - type: CP14MagicEssenceContainer
     essences:
       Earth: 1
@@ -71,9 +71,9 @@
     - stone_2
     - stone_3
   - type: Material
-  - type: PhysicalComposition # точно ли это нужно?
+  - type: PhysicalComposition
     materialComposition:
-      CP14Stone: 100
+      CP14Stone: 10
   - type: CP14MagicEssenceContainer
     essences:
       Earth: 1
@@ -119,9 +119,9 @@
     - stone_2
     - stone_3
   - type: Material
-  - type: PhysicalComposition # точно ли это нужно?
+  - type: PhysicalComposition
     materialComposition:
-      CP14MarbleStone: 100
+      CP14MarbleStone: 10
 
 - type: entity
   id: CP14MarbleBlock10

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

@@ -24,9 +24,9 @@
     layers:
       - state: scrap
         map: ["random"]
-  - type: CP14Material
-    materials:
-      CP14Copper: 5
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Copper: 10
 
 - type: entity
   id: CP14ScrapIron
@@ -39,9 +39,9 @@
     layers:
       - state: scrap
         map: ["random"]
-  - type: CP14Material
-    materials:
-      CP14Iron: 5
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Iron: 10
 
 - type: entity
   id: CP14ScrapGold
@@ -54,9 +54,9 @@
     layers:
       - state: scrap
         map: ["random"]
-  - type: CP14Material
-    materials:
-      CP14Gold: 5
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Gold: 10
 
 - type: entity
   id: CP14ScrapMithril
@@ -69,6 +69,6 @@
     layers:
       - state: scrap
         map: ["random"]
-  - type: CP14Material
-    materials:
-      CP14Mithril: 5
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Mithril: 10

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

@@ -48,9 +48,9 @@
     - cloth_2
     - cloth_3
   - type: Material
-  - type: PhysicalComposition # точно ли это нужно?
+  - type: PhysicalComposition
     materialComposition:
-      CP14Cloth: 100
+      CP14Cloth: 10
 
 - type: entity
   id: CP14Cloth10
@@ -75,6 +75,9 @@
       - enum.DamageStateVisualLayers.Base:
           shard1: ""
           shard2: ""
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Glass: 5
 
 - type: entity
   id: CP14Snowball

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

@@ -51,6 +51,9 @@
           collection: WoodDestroy
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+  - type: PhysicalComposition
+    materialComposition:
+      CP14WoodenPlanks: 30
 
 - type: entity
   id: CP14WoodenPlanks1
@@ -90,9 +93,9 @@
     - planks_2
     - planks_3
   - type: Material
-  - type: PhysicalComposition # точно ли это нужно?
+  - type: PhysicalComposition
     materialComposition:
-      CP14WoodenPlanks: 100
+      CP14WoodenPlanks: 10
   - type: Damageable
     damageContainer: Inorganic
     damageModifierSet: Wood
@@ -145,6 +148,9 @@
   - type: Log
     spawnedPrototype: CP14LucensWoodenPlanks1
     spawnCount: 3
+  - type: PhysicalComposition
+    materialComposition:
+      CP14LucensWoodenPlanks: 30
 
 - type: entity
   id: CP14LucensWoodenPlanks1
@@ -165,6 +171,9 @@
     - planks
     - planks_2
     - planks_3
+  - type: PhysicalComposition
+    materialComposition:
+      CP14LucensWoodenPlanks: 10
 
 - type: entity
   id: CP14LucensWoodenPlanks10

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/axe.yml

@@ -23,8 +23,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeIronAxe
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 10
 
 - type: entity
@@ -40,8 +40,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeGoldAxe
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 10
 
 - type: entity
@@ -57,8 +57,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeCopperAxe
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 10
 
 - type: entity
@@ -74,6 +74,6 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeMithrilAxe
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/dagger.yml

@@ -23,8 +23,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeIronDagger
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 10
 
 - type: entity
@@ -40,8 +40,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeGoldDagger
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 10
 
 - type: entity
@@ -57,8 +57,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeCopperDagger
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 10
 
 - type: entity
@@ -74,6 +74,6 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeMithrilDagger
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/hammer.yml

@@ -23,8 +23,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeIronHammer
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 10
 
 - type: entity
@@ -40,8 +40,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeGoldHammer
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 10
 
 - type: entity
@@ -57,8 +57,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeCopperHammer
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 10
 
 - type: entity
@@ -74,6 +74,6 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeMithrilHammer
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/hoe.yml

@@ -23,8 +23,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeIronHoe
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 10
 
 - type: entity
@@ -40,8 +40,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeCopperHoe
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 10
 
 - type: entity
@@ -57,8 +57,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeGoldHoe
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 10
 
 - type: entity
@@ -74,6 +74,6 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeMithrilHoe
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/mace.yml

@@ -23,8 +23,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeIronMace
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 10
 
 - type: entity
@@ -40,8 +40,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeGoldMace
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 10
 
 - type: entity
@@ -57,8 +57,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeCopperMace
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 10
 
 - type: entity
@@ -74,6 +74,6 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeMithrilMace
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/pickaxe.yml

@@ -23,8 +23,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeIronPickaxe
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 10
 
 - type: entity
@@ -40,8 +40,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeGoldPickaxe
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 10
 
 - type: entity
@@ -57,8 +57,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeCopperPickaxe
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 10
 
 - type: entity
@@ -74,6 +74,6 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeMithrilPickaxe
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/rapier.yml

@@ -23,8 +23,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeIronRapier
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 10
 
 - type: entity
@@ -40,8 +40,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeGoldRapier
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 10
 
 - type: entity
@@ -57,8 +57,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeCopperRapier
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 10
 
 - type: entity
@@ -74,6 +74,6 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeMithrilRapier
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/shovel.yml

@@ -23,8 +23,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeIronShovel
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 10
 
 - type: entity
@@ -40,8 +40,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeGoldShovel
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 10
 
 - type: entity
@@ -57,8 +57,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeCopperShovel
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 10
 
 - type: entity
@@ -74,6 +74,6 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeMithrilShovel
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/sickle.yml

@@ -23,8 +23,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeIronSickle
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 10
 
 - type: entity
@@ -40,8 +40,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeCopperSickle
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 10
 
 - type: entity
@@ -57,8 +57,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeGoldSickle
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 10
 
 - type: entity
@@ -74,6 +74,6 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeMithrilSickle
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/skimitar.yml

@@ -22,8 +22,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeIronSkimitar
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 10
 
 - type: entity
@@ -39,8 +39,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeGoldSkimitar
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 10
 
 - type: entity
@@ -56,8 +56,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeCopperSkimitar
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 10
 
 - type: entity
@@ -73,6 +73,6 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeMithrilSkimitar
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/spear.yml

@@ -24,8 +24,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeIronSpear
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 10
 
 - type: entity
@@ -42,8 +42,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeGoldSpear
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 10
 
 - type: entity
@@ -60,8 +60,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeCopperSpear
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 10
 
 - type: entity
@@ -78,6 +78,6 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeMithrilSpear
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Blade/sword.yml

@@ -22,8 +22,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeIronSword
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 10
 
 - type: entity
@@ -39,8 +39,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeGoldSword
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 10
 
 - type: entity
@@ -56,8 +56,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeCopperSword
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 10
 
 - type: entity
@@ -73,8 +73,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - BladeMithrilSword
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 10
 
 - type: entity

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/guildmaster.yml

@@ -10,4 +10,7 @@
     - state: icon
   - type: CP14ModularCraftPart
     possibleParts:
-    - GardeGuildmaster
+    - GardeGuildmaster
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Gold: 15

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/sharp.yml

@@ -11,8 +11,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - GardeSharpIron
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 10
 
 - type: entity
@@ -29,8 +29,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - GardeSharpGold
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 10
 
 - type: entity
@@ -47,8 +47,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - GardeSharpCopper
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 10
 
 - type: entity
@@ -65,6 +65,6 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - GardeSharpMithril
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Garde/sturdy.yml

@@ -11,8 +11,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - GardeSturdyIron
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 10
 
 - type: entity
@@ -29,8 +29,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - GardeSturdyGold
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 10
 
 - type: entity
@@ -47,8 +47,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - GardeSturdyCopper
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 10
 
 - type: entity
@@ -65,6 +65,6 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - GardeSturdyMithril
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 10

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Inlay/quartz.yml

@@ -5,6 +5,8 @@
   components:
   - type: Sprite
     sprite: _CP14/Objects/ModularTools/Inlay/quartz.rsi
+  - type: StaticPrice
+    price: 50
 
 - type: entity
   parent: CP14ModularInlayQuartzBase
@@ -50,6 +52,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - InlayQuartzFire
+  - type: StaticPrice
+    price: 70
 
 - type: entity
   parent: CP14ModularInlayQuartzBase

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/Tip/arrows.yml

@@ -21,8 +21,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - TipIronArrow
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 2
 
 - type: entity
@@ -38,8 +38,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - TipGoldArrow
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 2
 
 - type: entity
@@ -55,8 +55,8 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - TipCopperArrow
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 2
 
 - type: entity
@@ -72,6 +72,6 @@
   - type: CP14ModularCraftPart
     possibleParts:
     - TipMithrilArrow
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 2

Resources/Prototypes/_CP14/Entities/Objects/ModularTools/grips.yml

@@ -105,6 +105,9 @@
       - !type:CP14ModularDisassembleBehavior
       - !type:DoActsBehavior
         acts: ["Destruction"]
+  - type: PhysicalComposition
+    materialComposition:
+      CP14WoodenPlanks: 10
 
 - type: entity
   parent: CP14ModularGripShort
@@ -131,6 +134,9 @@
       - !type:CP14ModularDisassembleBehavior
       - !type:DoActsBehavior
         acts: ["Destruction"]
+  - type: PhysicalComposition
+    materialComposition:
+      CP14LucensWoodenPlanks: 10
 
 - type: entity
   parent: CP14ModularGripShort
@@ -155,6 +161,9 @@
       - !type:CP14ModularDisassembleBehavior
       - !type:DoActsBehavior
         acts: ["Destruction"]
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Iron: 10
 
 - type: entity
   parent: CP14ModularGripShort
@@ -180,6 +189,9 @@
       - !type:CP14ModularDisassembleBehavior
       - !type:DoActsBehavior
         acts: ["Destruction"]
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Gold: 10
 
 - type: entity
   parent: CP14ModularGripShort
@@ -205,6 +217,9 @@
       - !type:CP14ModularDisassembleBehavior
       - !type:DoActsBehavior
         acts: ["Destruction"]
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Copper: 10
 
 - type: entity
   parent: CP14ModularGripShort
@@ -230,6 +245,9 @@
       - !type:CP14ModularDisassembleBehavior
       - !type:DoActsBehavior
         acts: ["Destruction"]
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Mithril: 10
 
 - type: entity
   parent: CP14ModularGripShort
@@ -254,6 +272,10 @@
       - !type:CP14ModularDisassembleBehavior
       - !type:DoActsBehavior
         acts: ["Destruction"]
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Mithril: 10
+      CP14Gold: 10
 
 # Long
 - type: entity
@@ -278,6 +300,9 @@
       - !type:CP14ModularDisassembleBehavior
       - !type:DoActsBehavior
         acts: ["Destruction"]
+  - type: PhysicalComposition
+    materialComposition:
+      CP14WoodenPlanks: 20
 
 - type: entity
   parent: CP14ModularGripLong
@@ -303,6 +328,9 @@
       - !type:CP14ModularDisassembleBehavior
       - !type:DoActsBehavior
         acts: ["Destruction"]
+  - type: PhysicalComposition
+    materialComposition:
+      CP14LucensWoodenPlanks: 20
 
 - type: entity
   parent: CP14ModularGripLong
@@ -326,6 +354,9 @@
       - !type:CP14ModularDisassembleBehavior
       - !type:DoActsBehavior
         acts: ["Destruction"]
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Iron: 20
 
 - type: entity
   parent: CP14ModularGripIronLong
@@ -336,6 +367,8 @@
     state: icon
   - type: CP14ModularCraftStartPoint
     startProtoPart: CP14ModularGripIronLongGuard
+  - type: StaticPrice
+    price: 10
 
 - type: entity
   parent: CP14ModularGripLong
@@ -361,6 +394,9 @@
       - !type:CP14ModularDisassembleBehavior
       - !type:DoActsBehavior
         acts: ["Destruction"]
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Gold: 20
 
 - type: entity
   parent: CP14ModularGripLong
@@ -386,6 +422,9 @@
       - !type:CP14ModularDisassembleBehavior
       - !type:DoActsBehavior
         acts: ["Destruction"]
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Copper: 20
 
 
 - type: entity
@@ -412,3 +451,6 @@
       - !type:CP14ModularDisassembleBehavior
       - !type:DoActsBehavior
         acts: ["Destruction"]
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Mithril: 20

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

@@ -70,6 +70,9 @@
     damage:
       types:
         Blunt: 5
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Iron: 30
 
 - type: entity
   id: CP14Pestle
@@ -91,6 +94,9 @@
     guides:
     - CP14_RU_Alchemy
     - CP14_EN_Alchemy
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Stone: 5
 
 - type: entity
   id: CP14Mortar
@@ -169,6 +175,9 @@
     guides:
     - CP14_RU_Alchemy
     - CP14_EN_Alchemy
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Stone: 10
 
 - type: entity
   parent: BaseItem
@@ -264,4 +273,8 @@
     fillBaseName: syringe
   - type: Tag
     tags:
-    - Syringe
+    - Syringe
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Glass: 10
+      CP14Iron: 10

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

@@ -147,6 +147,9 @@
     fillBaseName: liq-
   - type: Injector
     maxTransferAmount: 5
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Glass: 10
 
 - type: entity
   id: CP14VialTinyReinforced
@@ -178,6 +181,10 @@
     fillBaseName: liq-
   - type: Injector
     maxTransferAmount: 5
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Glass: 10
+      CP14Copper: 10
 
 - type: entity
   id: CP14VialSmall
@@ -205,6 +212,9 @@
   - type: SolutionContainerVisuals
     maxFillLevels: 5
     fillBaseName: liq-
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Glass: 20
 
 - type: entity
   id: CP14VialSmallReinforced
@@ -234,6 +244,10 @@
   - type: SolutionContainerVisuals
     maxFillLevels: 5
     fillBaseName: liq-
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Glass: 20
+      CP14Copper: 10
 
 - type: entity
   id: CP14VialMedium
@@ -262,7 +276,10 @@
         maxVol: 50
   - type: SolutionContainerVisuals
     maxFillLevels: 5
-    fillBaseName: liq- 
+    fillBaseName: liq-
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Glass: 40
 
 - type: entity
   id: CP14VialMediumReinforced
@@ -294,4 +311,8 @@
     maxFillLevels: 5
     fillBaseName: liq-
   - type: Injector
-    transferAmount: 10
+    transferAmount: 10
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Glass: 40
+      CP14Copper: 10

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/Ammunition/crossbowBolts.yml

@@ -31,8 +31,8 @@
     - state: solution1
       map: ["enum.SolutionContainerLayers.Fill"]
       visible: false
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Iron: 3
 
 - type: entity
@@ -55,8 +55,8 @@
     - state: solution1
       map: ["enum.SolutionContainerLayers.Fill"]
       visible: false
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Gold: 3
 
 - type: entity
@@ -79,8 +79,8 @@
     - state: solution1
       map: ["enum.SolutionContainerLayers.Fill"]
       visible: false
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Copper: 3
 
 - type: entity
@@ -103,6 +103,6 @@
     - state: solution1
       map: ["enum.SolutionContainerLayers.Fill"]
       visible: false
-  - type: CP14Material
-    materials:
+  - type: PhysicalComposition
+    materialComposition:
       CP14Mithril: 3

Resources/Prototypes/_CP14/Entities/Objects/Weapons/Ranged/lightCrossbow.yml

@@ -52,6 +52,4 @@
       unwielded-arrow:
         whitelist:
           tags:
-            - CP14CrossbowBolt
-  - type: CP14Currency
-    currency: 2500
+            - CP14CrossbowBolt

Resources/Prototypes/_CP14/Entities/Stations/base.yml

@@ -9,6 +9,7 @@
   - BaseStationRecords # Required for lobby manifest + cryo leave
   - CP14BaseStationCommonObjectives
   - CP14BaseStationDemiplaneMap
+  - CP14BaseStationEconomy
 
 - type: entity
   id: CP14BaseStationCommonObjectives
@@ -28,3 +29,9 @@
   abstract: true
   components:
     - type: CP14StationDemiplaneMap
+
+- type: entity
+  id: CP14BaseStationEconomy
+  abstract: true
+  components:
+    - type: CP14StationEconomy

Resources/Prototypes/_CP14/Entities/Structures/Specific/Blacksmith/sharpening_stone.yml

@@ -18,7 +18,8 @@
       fix1:
         shape:
           !type:PhysShapeAabb
-          bounds: "-0.08,-0.35,0.15,0.25"
+          bounds: "-0.45,-0.45,0.45,0.45"
+        density: 55
         mask:
         - TabletopMachineMask
         layer:
@@ -26,6 +27,15 @@
         - MidImpassable
         - LowImpassable
         hard: false
+      fix2:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.45,-0.45,0.45,0.45"
+        density: 55
+        mask:
+        - TableMask
+        layer:
+        - TableLayer
   - type: Damageable
     damageContainer: Inorganic
   - type: Destructible

Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/trade_board.yml

@@ -1,27 +0,0 @@
-- type: entity
-  parent: BaseStructure
-  id: CP14TradingBoardBase
-  name: trading information board
-  description: Allows you to track what is selling and buying right now. 
-  categories: [ ForkFiltered ]
-  components:
-  - type: Sprite
-    snapCardinals: true
-    sprite: _CP14/Structures/Furniture/workbench.rsi
-    state: filler
-  - type: Icon
-    sprite: _CP14/Structures/Furniture/workbench.rsi
-    state: filler
-  - type: ActivatableUI
-    key: enum.CP14StoreUiKey.Key
-  - type: Clickable
-  - type: InteractionOutline
-  - type: CP14TradingInfoBoard
-  - type: UserInterface
-    interfaces:
-      enum.CP14StoreUiKey.Key:
-        type: CP14StoreBoundUserInterface
-  - type: GuideHelp
-    guides:
-    - CP14_RU_Trading
-    - CP14_EN_Trading

Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/trade_platform.yml

@@ -0,0 +1,121 @@
+- type: entity
+  parent: BaseStructure
+  id: CP14TradingPlatform
+  name: buying dimensional platform
+  description: Allows you to trade with the outside world, through retail trade transactions.
+  categories: [ ForkFiltered ]
+  components:
+  - type: Sprite
+    snapCardinals: true
+    sprite: _CP14/Structures/Specific/Economy/buy_platform.rsi
+    layers:
+    - state: base
+    - state: buy
+  - type: Icon
+    sprite: _CP14/Structures/Specific/Economy/buy_platform.rsi
+    state: base
+  - type: ActivatableUI
+    singleUser: true
+    key: enum.CP14TradingUiKey.Key
+  - type: Clickable
+  - type: InteractionOutline
+  - type: CP14TradingPlatform
+  - type: UserInterface
+    interfaces:
+      enum.CP14TradingUiKey.Key:
+        type: CP14TradingPlatformBoundUserInterface
+  - type: PlaceableSurface
+  - type: ItemPlacer
+    maxEntities: 0
+    whitelist:
+      tags:
+      - CP14Coin
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.4,-0.4,0.4,0.4"
+        mask:
+        - TabletopMachineMask
+        layer:
+        - Impassable
+        - MidImpassable
+        - LowImpassable
+        hard: false
+  #- type: GuideHelp
+  #  guides:
+  #  - CP14_RU_Trading
+  #  - CP14_EN_Trading
+
+- type: entity
+  parent: BaseStructure
+  id: CP14TradingSellingPlatform
+  name: selling dimensional platform
+  description: Allows you to sell any items and structures to the outside world. Fill the platform completely with mana to sell whatever you place on it.
+  categories: [ ForkFiltered ]
+  components:
+  - type: Sprite
+    snapCardinals: true
+    sprite: _CP14/Structures/Specific/Economy/buy_platform.rsi
+    layers:
+    - state: base
+    - state: sell
+  - type: Icon
+    sprite: _CP14/Structures/Specific/Economy/buy_platform.rsi
+    state: base
+  - type: Clickable
+  - type: InteractionOutline
+  - type: CP14SellingPlatform
+  - type: PlaceableSurface
+  - type: ItemPlacer
+    maxEntities: 0
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.4,-0.4,0.4,0.4"
+        mask:
+        - TabletopMachineMask
+        layer:
+        - Impassable
+        - MidImpassable
+        - LowImpassable
+        hard: false
+  - type: CP14MagicEnergyContainer
+    maxEnergy: 30
+    energy: 0
+    unsafeSupport: true
+  - type: CP14MagicEnergyDraw
+    energy: -1
+    delay: 3 # 5m to full restore
+  - type: CP14MagicUnsafeDamage
+  - type: CP14MagicEnergyExaminable
+
+- type: entity
+  id: CP14CashImpact
+  categories: [ HideSpawnMenu ]
+  save: false
+  components:
+  - type: Sprite
+    snapCardinals: true
+    sprite: _CP14/Structures/Specific/Economy/buy_platform.rsi
+    layers:
+    - state: impact
+      shader: unshaded
+      color: "#8f42ff"
+    drawdepth: Effects
+  - type: TimedDespawn
+    lifetime: 2
+  - type: Tag
+    tags:
+      - HideContextMenu
+  - type: PointLight
+    color: "#8f42ff"
+    enabled: true
+    radius: 8
+    energy: 8
+    netsync: false
+  - type: LightFade
+    duration: 2

Resources/Prototypes/_CP14/Entities/Structures/Specific/Economy/trade_portal.yml

@@ -1,120 +0,0 @@
-- type: entity
-  parent: BaseStructure
-  id: CP14TradingPortalBase
-  abstract: true
-  name: trade cabinet
-  description: A dimensional closet connected to a similar closet elsewhere. Not capable of moving living creatures, but great for trading at a distance.
-  categories: [ ForkFiltered ]
-  components:
-  - type: Icon
-    sprite: _CP14/Structures/Specific/Economy/trade_portal.rsi
-    state: base
-  - type: Sprite
-    drawdepth: Mobs
-    sprite: _CP14/Structures/Specific/Economy/trade_portal.rsi
-  - type: Clickable
-  - type: InteractionOutline
-  - type: CP14TradingPortal
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.4,-0.4,0.4,0.29"
-        density: 50
-        mask:
-        - SmallMobMask #this is so they can go under plastic flaps
-        layer:
-        - MachineLayer
-  - type: ResistLocker
-  - type: Appearance
-  - type: ContainerContainer
-    containers:
-      entity_storage: !type:Container
-  - type: EntityStorage
-    open: true
-    isCollidableWhenOpen: true
-    closeSound:
-      path: /Audio/Effects/woodenclosetclose.ogg
-    openSound:
-      path: /Audio/Effects/woodenclosetopen.ogg
-    enteringOffset: 0, -0.4
-    enteringRange: 0.20
-  - type: PlaceableSurface
-    isPlaceable: false # defaults to closed.
-  - type: EntityStorageVisuals
-    stateBaseClosed: base
-    stateDoorOpen: base_open
-    stateDoorClosed: base_door
-  - type: GuideHelp
-    guides:
-    - CP14_RU_Trading
-    - CP14_EN_Trading
-
-- type: entity
-  parent: CP14TradingPortalBase
-  id: CP14TradingPortalSylphoria
-  suffix: Sylphoria
-  components:
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.StorageVisualLayers.Base"]
-    - state: base_door
-      map: ["enum.StorageVisualLayers.Door"]
-      shader: unshaded
-    - state: flag_sylphoria
-  - type: CP14TradingPortal
-    faction: Sylphoria
-    specialSellPositionCount: 5
-
-- type: entity
-  parent: CP14TradingPortalBase
-  id: CP14TradingPortalHelmirWeapon
-  suffix: HelmirWeapon
-  components:
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.StorageVisualLayers.Base"]
-    - state: base_door
-      map: ["enum.StorageVisualLayers.Door"]
-      shader: unshaded
-    - state: flag_helmir
-  - type: CP14TradingPortal
-    faction: HelmirWeapon
-    specialSellPositionCount: 5
-
-- type: entity
-  parent: CP14TradingPortalBase
-  id: CP14TradingPortalBradFamily
-  suffix: BradFamily
-  components:
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.StorageVisualLayers.Base"]
-    - state: base_door
-      map: ["enum.StorageVisualLayers.Door"]
-      shader: unshaded
-    - state: flag_bard
-  - type: CP14TradingPortal
-    faction: BradFamily
-    specialSellPositionCount: 5
-
-- type: entity
-  parent: CP14TradingPortalBase
-  id: CP14TradingPortalSpiceStream
-  suffix: SpiceStream
-  components:
-  - type: Sprite
-    layers:
-    - state: base
-      map: ["enum.StorageVisualLayers.Base"]
-    - state: base_door
-      map: ["enum.StorageVisualLayers.Door"]
-      shader: unshaded
-    - state: flag_spice
-  - type: CP14TradingPortal
-    faction: SpiceStream
-    specialSellPositionCount: 5

Resources/Prototypes/_CP14/Guidebook/Eng/jobs.yml

@@ -6,7 +6,6 @@
   children:
   - CP14_EN_JobAdventurer
   - CP14_EN_JobAlchemist
-  - CP14_EN_JobMerchant
   filterEnabled: True
 
 
@@ -27,13 +26,4 @@
   text: "/ServerInfo/_CP14/Guidebook_EN/JobsTabs/Alchemist.xml"
   children:
   - CP14_EN_Alchemy
-  filterEnabled: True
-
-- type: guideEntry
-  crystallPunkAllowed: true
-  id: CP14_EN_JobMerchant
-  name: Merchant
-  text: "/ServerInfo/_CP14/Guidebook_EN/JobsTabs/Merchant.xml"
-  children:
-  - CP14_EN_Trading
   filterEnabled: True

Resources/Prototypes/_CP14/Guidebook/Eng/misc.yml

@@ -14,9 +14,11 @@
 
 - type: guideEntry
   crystallPunkAllowed: true
-  id: CP14_EN_Trading
-  name: External trade
-  text: "/ServerInfo/_CP14/Guidebook_EN/JobsTabs/MerchantTabs/Trading.xml"
+  id: CP14_EN_Locks_and_Keys
+  name: Locks and Keys
+  text: "/ServerInfo/_CP14/Guidebook_EN/LocksKeys.xml"
+  children:
+  - CP14_EN_Lockpicking
   filterEnabled: True
 
 - type: guideEntry
@@ -24,13 +26,4 @@
   id: CP14_EN_Lockpicking
   name: Lockpicking
   text: "/ServerInfo/_CP14/Guidebook_EN/Lockpicking.xml"
-  filterEnabled: True
-
-- type: guideEntry
-  crystallPunkAllowed: true
-  id: CP14_EN_Locks_and_Keys
-  name: Locks and Keys
-  text: "/ServerInfo/_CP14/Guidebook_EN/LocksKeys.xml"
-  children:
-  - CP14_EN_Lockpicking
-  filterEnabled: True
+  filterEnabled: True

Resources/Prototypes/_CP14/Guidebook/Ru/jobs.yml

@@ -6,7 +6,6 @@
   children:
   - CP14_RU_JobAdventurer
   - CP14_RU_JobAlchemist
-  - CP14_RU_JobMerchant
   filterEnabled: True
 
 
@@ -27,13 +26,4 @@
   text: "/ServerInfo/_CP14/Guidebook_RU/JobsTabs/Alchemist.xml"
   children:
   - CP14_RU_Alchemy
-  filterEnabled: True
-
-- type: guideEntry
-  crystallPunkAllowed: true
-  id: CP14_RU_JobMerchant
-  name: Торговец
-  text: "/ServerInfo/_CP14/Guidebook_RU/JobsTabs/Merchant.xml"
-  children:
-  - CP14_RU_Trading
   filterEnabled: True

Resources/Prototypes/_CP14/Guidebook/Ru/misc.yml

@@ -14,9 +14,11 @@
 
 - type: guideEntry
   crystallPunkAllowed: true
-  id: CP14_RU_Trading
-  name: Внешняя торговля
-  text: "/ServerInfo/_CP14/Guidebook_RU/JobsTabs/MerchantTabs/Trading.xml"
+  id: CP14_RU_Locks_and_Keys
+  name: Замки и ключи
+  text: "/ServerInfo/_CP14/Guidebook_RU/LocksKeys.xml"
+  children:
+  - CP14_RU_Lockpicking
   filterEnabled: True
 
 - type: guideEntry
@@ -24,13 +26,4 @@
   id: CP14_RU_Lockpicking
   name: Взлом замков
   text: "/ServerInfo/_CP14/Guidebook_RU/Lockpicking.xml"
-  filterEnabled: True
-
-- type: guideEntry
-  crystallPunkAllowed: true
-  id: CP14_RU_Locks_and_Keys
-  name: Замки и ключи
-  text: "/ServerInfo/_CP14/Guidebook_RU/LocksKeys.xml"
-  children:
-  - CP14_RU_Lockpicking
-  filterEnabled: True
+  filterEnabled: True

Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml

@@ -155,7 +155,7 @@
   loadouts:
   - CP14ClothingEyesMonocle
   - CP14ClothingEyesGlasses
-
+  - CP14ClothingEyesEyePatch
 - type: loadout
   id: CP14ClothingEyesMonocle
   equipment:
@@ -164,7 +164,12 @@
 - type: loadout
   id: CP14ClothingEyesGlasses
   equipment:
-    eyes: CP14ClothingEyesGlasses
+    eyes: CP14ClothingEyesGlasses 
+  
+- type: loadout
+  id: CP14ClothingEyesEyePatch
+  equipment:
+    eyes: CP14ClothingEyesEyePatch
 
 # Gloves
 

Resources/Prototypes/_CP14/Materials/simple.yml

@@ -5,7 +5,16 @@
   unit: materials-unit-plank
   icon: { sprite: _CP14/Objects/Materials/wood.rsi, state: planks_2 }
   color: "#874d3a"
-  price: 0
+  price: 0.1
+
+- type: material
+  id: CP14LucensWoodenPlanks
+  stackEntity: CP14LucensWoodenPlanks1
+  name: cp14-material-lucens-planks
+  unit: materials-unit-bar
+  icon: { sprite: _CP14/Objects/Materials/wood_lucens.rsi, state: planks_2 }
+  color: "#1a1e22"
+  price: 1
 
 - type: material
   id: CP14Dirt
@@ -23,7 +32,15 @@
   unit: materials-unit-chunk
   icon: { sprite: _CP14/Objects/Materials/stone_block.rsi, state: stone_2 }
   color: "#555963"
-  price: 0
+  price: 0.02
+
+- type: material
+  id: CP14Glass
+  stackEntity: CP14GlassSheet1
+  name: materials-glass
+  icon: { sprite: _CP14/Objects/Materials/glass.rsi, state: glass_2 }
+  color: "#555963"
+  price: 0.15
 
 - type: material
   id: CP14MarbleStone
@@ -32,7 +49,7 @@
   unit: materials-unit-chunk
   icon: { sprite: _CP14/Objects/Materials/marble_block.rsi, state: stone_2 }
   color: "#555963"
-  price: 0
+  price: 0.15
 
 - type: material
   id: CP14Cloth
@@ -41,7 +58,7 @@
   unit: materials-unit-roll
   icon: { sprite: _CP14/Objects/Materials/cloth.rsi, state: cloth_3 }
   color: "#d8e3e2"
-  price: 0
+  price: 0.3
 
 - type: material
   id: CP14Copper
@@ -50,7 +67,7 @@
   unit: materials-unit-bar
   icon: { sprite: _CP14/Objects/Materials/copper_scrap.rsi, state: scrap }
   color: "#9a5e22"
-  price: 0
+  price: 1
 
 - type: material
   id: CP14Iron
@@ -59,7 +76,7 @@
   unit: materials-unit-bar
   icon: { sprite: _CP14/Objects/Materials/iron_scrap.rsi, state: scrap_2 }
   color: "#9093a1"
-  price: 0
+  price: 2
 
 - type: material
   id: CP14Gold
@@ -68,7 +85,7 @@
   unit: materials-unit-bar
   icon: { sprite: _CP14/Objects/Materials/gold_scrap.rsi, state: scrap_3 }
   color: "#FFD700"
-  price: 0
+  price: 5
 
 - type: material
   id: CP14Mithril
@@ -77,16 +94,7 @@
   unit: materials-unit-bar
   icon: { sprite: _CP14/Objects/Materials/mithril_scrap.rsi, state: scrap }
   color: "#006c83"
-  price: 0
-
-- type: material
-  id: CP14LucensWoodenPlanks
-  stackEntity: CP14LucensWoodenPlanks1
-  name: cp14-material-lucens-planks
-  unit: materials-unit-bar
-  icon: { sprite: _CP14/Objects/Materials/wood_lucens.rsi, state: planks_2 }
-  color: "#1a1e22"
-  price: 0
+  price: 5
 
 - type: material
   id: CP14FloraMaterial
@@ -95,7 +103,7 @@
   unit: materials-unit-bunch
   icon: { sprite: _CP14/Objects/Materials/flora.rsi, state: grass_material1 }
   color: "#85903e"
-  price: 0
+  price: 0.01
 
 - type: material
   id: CP14Ash

Resources/Prototypes/_CP14/Objectives/empire_orders.yml

@@ -5,52 +5,4 @@
   components:
   - type: Objective
     issuer: cp14-objective-issuer-town
-    difficulty: 1
-
-
-# Send group
-- type: entity
-  abstract: true
-  parent: CP14BaseTownObjective
-  id: CP14BaseTownSendObjective
-  components:
-  - type: CP14TownSendCondition
-    minCollectionSize: 5
-    maxCollectionSize: 10
-    objectiveText: cp14-objective-town-send-title
-    objectiveDescription: cp14-objective-town-send-desc
-  - type: Objective
-
-- type: entity
-  parent: CP14BaseTownSendObjective
-  id: CP14TownSendDinoObjective
-  components:
-  - type: CP14TownSendCondition
-    collectGroup: CP14Dino
-    minCollectionSize: 10
-    maxCollectionSize: 20
-
-- type: entity
-  parent: CP14BaseTownSendObjective
-  id: CP14TownSendMoleObjective
-  components:
-  - type: CP14TownSendCondition
-    collectGroup: CP14Mole
-    minCollectionSize: 10
-    maxCollectionSize: 20
-
-- type: entity
-  parent: CP14BaseTownSendObjective
-  id: CP14TownSendBoarObjective
-  components:
-  - type: CP14TownSendCondition
-    collectGroup: CP14Boar
-    minCollectionSize: 15
-    maxCollectionSize: 20
-
-- type: weightedRandom
-  id: CP14TownSendObjectiveGroup
-  weights:
-    CP14TownSendDinoObjective: 1
-    CP14TownSendMoleObjective: 1
-    CP14TownSendBoarObjective: 1
+    difficulty: 1

Resources/Prototypes/_CP14/Procedural/caves.yml

@@ -43,18 +43,18 @@
         - CP14FloorBase
       entities:
         - CP14WallStone
-    # Lakes
+    #Rivers
     - !type:BiomeEntityLayer
+      threshold: 0.60
+      noise:
+        seed: 3
+        noiseType: OpenSimplex2
+        frequency: 0.05
+        lacunarity: 1.50
+        fractalType: Ridged
+        octaves: 1
       allowedTiles:
         - CP14FloorBase
-      threshold: 0.8
-      noise:
-        seed: 14
-        noiseType: OpenSimplex2
-        fractalType: FBm
-        frequency: 0.01
-        domainWarpType: OpenSimplex2
-        domainWarpAmp: 150
       entities:
         - CP14FloorWater
 

Resources/Prototypes/_CP14/Reagents/Consumable/Drink/alcohol.yml

@@ -56,6 +56,7 @@
       - !type:Drunk
         boozePower: 2
   fizziness: 0.8
+  pricePerUnit: 2
 
 - type: reagent
   id: CP14Beer
@@ -74,6 +75,7 @@
       - !type:Emote
         emote: Laugh
         probability: 0.05
+  pricePerUnit: 1
 
 - type: reagent
   id: CP14BeerGerbil
@@ -91,6 +93,7 @@
       - !type:AdjustReagent
         reagent: CP14Beer
         amount: 0.2
+  pricePerUnit: 1.33
 
 - type: reagent
   id: CP14BeerBreeze
@@ -108,6 +111,7 @@
       - !type:AdjustReagent
         reagent: CP14Beer
         amount: 0.2
+  pricePerUnit: 0.44
 
 - type: reagent
   id: CP14BeerBlowLaw
@@ -125,6 +129,7 @@
       - !type:AdjustReagent
         reagent: CP14Beer
         amount: 0.3
+  pricePerUnit: 1.67
 
 - type: reagent
   id: CP14Wine
@@ -140,6 +145,7 @@
       effects:
       - !type:ModifyBloodLevel
         amount: 0.4
+  pricePerUnit: 1.98
 
 - type: reagent
   id: CP14WineZellasianPleasure
@@ -158,6 +164,7 @@
       - !type:AdjustReagent
         reagent: CP14Wine
         amount: 0.3
+  pricePerUnit: 1.12
 
 - type: reagent
   id: CP14WineLeeks
@@ -175,6 +182,7 @@
       - !type:AdjustReagent
         reagent: CP14Wine
         amount: 0.2
+  pricePerUnit: 1
 
 - type: reagent
   id: CP14WineDurandate
@@ -193,6 +201,7 @@
       - !type:AdjustReagent
         reagent: CP14Wine
         amount: 0.1
+  pricePerUnit: 1
 
 - type: reagent
   id: CP14Ale
@@ -211,6 +220,7 @@
       - !type:Emote
         emote: Laugh
         probability: 0.05
+  pricePerUnit: 0.5
 
 - type: reagent
   id: CP14AleBloodyTear
@@ -228,6 +238,7 @@
       - !type:AdjustReagent
         reagent: CP14Ale
         amount: 0.2
+  pricePerUnit: 1
 
 - type: reagent
   id: CP14AleBottomless
@@ -246,3 +257,4 @@
       - !type:AdjustReagent
         reagent: CP14Ale
         amount: 0.2
+  pricePerUnit: 2

Resources/Prototypes/_CP14/Reagents/magic_essence.yml

@@ -9,6 +9,7 @@
       effects:
       - !type:ChemVomit
         probability: 0.25
+  pricePerUnit: 0.05
 
 # Basic 6 
 
@@ -82,6 +83,12 @@
 
 - type: reagent
   parent: CP14EssenceBase
+  id: CP14EssenceBaseT1
+  abstract: true
+  pricePerUnit: 0.1
+
+- type: reagent
+  parent: CP14EssenceBaseT1
   id: CP14EssenceFrost
   name: cp14-reagent-name-essence-frost
   desc: cp14-reagent-desc-essence-frost
@@ -92,7 +99,7 @@
     entity: CP14EssenceFrost
 
 - type: reagent
-  parent: CP14EssenceBase
+  parent: CP14EssenceBaseT1
   id: CP14EssenceLight
   name: cp14-reagent-name-essence-light
   desc: cp14-reagent-desc-essence-light
@@ -103,7 +110,7 @@
     entity: CP14EssenceLight
 
 - type: reagent
-  parent: CP14EssenceBase
+  parent: CP14EssenceBaseT1
   id: CP14EssenceMotion
   name: cp14-reagent-name-essence-motion
   desc: cp14-reagent-desc-essence-motion
@@ -114,7 +121,7 @@
     entity: CP14EssenceMotion
 
 - type: reagent
-  parent: CP14EssenceBase
+  parent: CP14EssenceBaseT1
   id: CP14EssenceCycle
   name: cp14-reagent-name-essence-cycle
   desc: cp14-reagent-desc-essence-cycle
@@ -125,7 +132,7 @@
     entity: CP14EssenceCycle
 
 - type: reagent
-  parent: CP14EssenceBase
+  parent: CP14EssenceBaseT1
   id: CP14EssenceEnergia
   name: cp14-reagent-name-essence-energia
   desc: cp14-reagent-desc-essence-energia
@@ -136,7 +143,7 @@
     entity: CP14EssenceEnergia
 
 - type: reagent
-  parent: CP14EssenceBase
+  parent: CP14EssenceBaseT1
   id: CP14EssenceVoid
   name: cp14-reagent-name-essence-void
   desc: cp14-reagent-desc-essence-void
@@ -147,7 +154,7 @@
     entity: CP14EssenceVoid
 
 - type: reagent
-  parent: CP14EssenceBase
+  parent: CP14EssenceBaseT1
   id: CP14EssencePoison
   name: cp14-reagent-name-essence-poison
   desc: cp14-reagent-desc-essence-poison
@@ -158,7 +165,7 @@
     entity: CP14EssencePoison
 
 - type: reagent
-  parent: CP14EssenceBase
+  parent: CP14EssenceBaseT1
   id: CP14EssenceLife
   name: cp14-reagent-name-essence-life
   desc: cp14-reagent-desc-essence-life
@@ -169,7 +176,7 @@
     entity: CP14EssenceLife
 
 - type: reagent
-  parent: CP14EssenceBase
+  parent: CP14EssenceBaseT1
   id: CP14EssenceCrystal
   name: cp14-reagent-name-essence-crystal
   desc: cp14-reagent-desc-essence-crystal
@@ -183,6 +190,12 @@
 
 - type: reagent
   parent: CP14EssenceBase
+  id: CP14EssenceBaseT2
+  abstract: true
+  pricePerUnit: 0.2
+
+- type: reagent
+  parent: CP14EssenceBaseT2
   id: CP14EssenceMagic
   name: cp14-reagent-name-essence-magic
   desc: cp14-reagent-desc-essence-magic

Resources/Prototypes/_CP14/Reagents/precurser.yml

@@ -14,6 +14,7 @@
     collection: FootstepBlood
     params:
       volume: 6
+  pricePerUnit: 0.1
 
 - type: reagent
   id: CP14YellowDayflinPulp
@@ -23,6 +24,7 @@
   flavor: CP14Sweetly
   color: "#ffe269"
   physicalDesc: cp14-reagent-physical-desc-pureed
+  pricePerUnit: 0.1
 
 - type: reagent
   id: CP14AirLily
@@ -49,6 +51,7 @@
         showInChat: false
         emote: Cough
         probability: 0.3
+  pricePerUnit: 0.2
 
 - type: reagent
   id: CP14WildSageSap
@@ -71,6 +74,7 @@
         type: Add
         time: 3
         refresh: false
+  pricePerUnit: 0.15
 
 # Fungus based
 
@@ -99,6 +103,7 @@
         type: Add
         time: 6
         refresh: false
+  pricePerUnit: 0.2
 
 - type: reagent
   id: CP14LumiMushroom
@@ -125,6 +130,7 @@
         type: Add
         time: 6
         refresh: false
+  pricePerUnit: 0.2
 
 - type: reagent
   id: CP14BlueAmanita
@@ -149,6 +155,7 @@
         damage:
           types:
             Poison: 0.1
+  pricePerUnit: 0.2
 
 # Slime based
 
@@ -168,6 +175,7 @@
       - !type:SatiateThirst
       - !type:ChemVomit
         probability: 0.05
+  pricePerUnit: 0.7
 
 # Inorganic
 
@@ -208,4 +216,5 @@
         key: ForcedSleep
         component: ForcedSleeping
         refresh: false
-        type: Add
+        type: Add
+  pricePerUnit: 1.2

Resources/Prototypes/_CP14/Reagents/target_effects.yml

@@ -29,6 +29,7 @@
         damage:
           groups:
             Brute: -6
+  pricePerUnit: 2
 
 - type: reagent
   id: CP14BasicEffectDamageBrute
@@ -47,6 +48,7 @@
         damage:
           groups:
             Brute: 3
+  pricePerUnit: 2
 
 - type: reagent
   id: CP14BasicEffectHealHeat
@@ -65,6 +67,7 @@
         damage:
           types:
             Heat: -10
+  pricePerUnit: 2
 
 - type: reagent
   id: CP14BasicEffectDamageHeat
@@ -87,6 +90,7 @@
       - !type:AdjustTemperature
         amount: 2000
       - !type:Ignite
+  pricePerUnit: 2
 
 - type: reagent
   id: CP14BasicEffectHealCold
@@ -105,6 +109,7 @@
         damage:
           types:
             Cold: -10
+  pricePerUnit: 2
 
 - type: reagent
   id: CP14BasicEffectDamageCold
@@ -123,6 +128,7 @@
         damage:
           types:
             Cold: 3
+  pricePerUnit: 2
 
 - type: reagent
   id: CP14BasicEffectHealPoison
@@ -141,6 +147,7 @@
         damage:
           types:
             Poison: -10
+  pricePerUnit: 2
 
 - type: reagent
   id: CP14BasicEffectDamagePoison
@@ -159,6 +166,7 @@
         damage:
           types:
             Poison: 3
+  pricePerUnit: 2
 
 - type: reagent
   id: CP14BasicEffectHealAirloss
@@ -177,6 +185,7 @@
         damage:
           types:
             Asphyxiation: -10
+  pricePerUnit: 3
 
 - type: reagent
   id: CP14BasicEffectDamageAirloss
@@ -195,6 +204,7 @@
         damage:
           types:
             Asphyxiation: 3
+  pricePerUnit: 3
 
 - type: reagent
   id: CP14BasicEffectHealManaDepletion
@@ -213,6 +223,7 @@
         damage:
           types:
             CP14ManaDepletion: -10
+  pricePerUnit: 2
 
 - type: reagent
   id: CP14BasicEffectDamageManaDepletion
@@ -231,6 +242,7 @@
         damage:
           types:
             CP14ManaDepletion: 3
+  pricePerUnit: 2
 
 - type: reagent
   id: CP14BasicEffectBloodRestore
@@ -247,6 +259,7 @@
       effects:
       - !type:ModifyBloodLevel
         amount: 20
+  pricePerUnit: 2
 
 - type: reagent
   id: CP14BasicEffectBloodAbsorption
@@ -263,6 +276,7 @@
       effects:
       - !type:ModifyBloodLevel
         amount: -10
+  pricePerUnit: 2
 
 - type: reagent
   id: CP14BasicEffectSatiateHunger
@@ -282,6 +296,7 @@
         - !type:OrganType
           type: CP14Vampire
           shouldHave: false
+  pricePerUnit: 1
 
 - type: reagent
   id: CP14BasicEffectSatiateThirst
@@ -297,6 +312,7 @@
       effects:
       - !type:SatiateThirst
         factor: 15
+  pricePerUnit: 1
 
 - type: reagent
   id: CP14BasicEffectHealMana
@@ -313,6 +329,7 @@
       - !type:CP14ManaChange
         manaDelta: 1.5
         safe: true
+  pricePerUnit: 3
 
 - type: reagent
   id: CP14BasicEffectDamageMana
@@ -329,6 +346,7 @@
       - !type:CP14ManaChange
         manaDelta: -1.5
         safe: false
+  pricePerUnit: 3
 
 - type: reagent
   id: CP14BasicEffectSpeedUp
@@ -349,6 +367,7 @@
       - !type:GenericStatusEffect
         key: Stutter
         component: StutteringAccent
+  pricePerUnit: 2
 
 - type: reagent
   id: CP14BasicEffectSpeedDown
@@ -369,6 +388,7 @@
       - !type:GenericStatusEffect
         key: Stutter
         component: StutteringAccent
+  pricePerUnit: 2
 
 - type: reagent
   id: CP14BasicEffectSleep
@@ -390,6 +410,7 @@
         key: ForcedSleep
         component: ForcedSleeping
         type: Add
+  pricePerUnit: 3
 
 - type: reagent
   id: CP14BasicEffectUnsleep
@@ -423,6 +444,7 @@
           min: 1
         reagent: CP14BasicEffectSleep
         amount: -10
+  pricePerUnit: 1
 
 # Gimmick solutions, otherwise doesn't give a mechanical benefit
 
@@ -444,6 +466,7 @@
         type: Add
         time: 25
         refresh: false
+  pricePerUnit: 1
 
 - type: reagent
   id: CP14BasicEffectEmoteCough
@@ -491,6 +514,7 @@
       effects:
       - !type:Drunk
         boozePower: 15
+  pricePerUnit: 0.5
 
 - type: reagent
   id: CP14BasicEffectJitter

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

@@ -144,7 +144,7 @@
     - GlassMelting
   - !type:StackResource
     stack: CP14GlassSheet
-    count: 6
+    count: 4
   result: CP14VialMedium
 
 - type: CP14Recipe
@@ -160,7 +160,7 @@
     count: 1
   - !type:StackResource
     stack: CP14GlassSheet
-    count: 6
+    count: 4
   result: CP14VialMediumReinforced
 
 - type: CP14Recipe

Resources/Prototypes/_CP14/Roles/Jobs/Traders/merchant.yml

@@ -1,6 +1,6 @@
 - type: job
   id: CP14Merchant
-  setPreference: false
+  setPreference: true
   name: cp14-job-name-merchant
   description: cp14-job-desc-merchant
   playTimeTracker: CP14JobMerchant
@@ -18,5 +18,5 @@
     - CP14EnergyCrystalMedium
     - CP14EnergyCrystalMedium
   equipment:
-    belt1: CP14WalletFilledTest
+    belt1: CP14WalletFilledMerchant
     keys: CP14KeyRingMerchant

Resources/Prototypes/_CP14/Skill/healing.yml

@@ -38,6 +38,20 @@
   - !type:NeedPrerequisite
     prerequisite: HealingT1
 
+- type: cp14Skill
+  id: CP14ActionSpellSheepPolymorph
+  skillUiPosition: 0, 4
+  tree: Healing
+  icon:
+    sprite: _CP14/Actions/Spells/misc.rsi
+    state: polymorph
+  effects: 
+  - !type:AddAction
+    action: CP14ActionSpellSheepPolymorph
+  restrictions:
+  - !type:NeedPrerequisite
+    prerequisite: HealingT1
+
 - type: cp14Skill
   id: CP14ActionSpellSpeedBallade
   skillUiPosition: 0, 6
@@ -142,4 +156,4 @@
     action: CP14ActionSpellResurrection
   restrictions:
   - !type:NeedPrerequisite
-    prerequisite: HealingT3
+    prerequisite: HealingT3

Resources/Prototypes/_CP14/SoundCollections/misc.yml

@@ -34,3 +34,10 @@
     - /Audio/_CP14/Effects/Lurker/ritual1.ogg
     - /Audio/_CP14/Effects/Lurker/ritual2.ogg
     - /Audio/_CP14/Effects/Lurker/ritual3.ogg
+
+- type: soundCollection
+  id: CP14CoinImpact
+  files:
+    - /Audio/_CP14/Effects/coin_impact1.ogg
+    - /Audio/_CP14/Effects/coin_impact2.ogg
+    - /Audio/_CP14/Effects/coin_impact3.ogg

Resources/Prototypes/_CP14/Trading/brad_potions.yml

@@ -0,0 +1,212 @@
+- type: cp14TradingPosition
+  id: CP14VialSmallHealingBrute
+  faction: BradPotions
+  uiPosition: 0, 0
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallHealingBrute
+
+- type: cp14TradingPosition
+  id: CP14VialSmallHealingPoison
+  faction: BradPotions
+  uiPosition: 0, 1
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallHealingPoison
+
+- type: cp14TradingPosition
+  id: CP14VialSmallHealingAirloss
+  faction: BradPotions
+  uiPosition: 0, 2
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallHealingAirloss
+
+- type: cp14TradingPosition
+  id: CP14VialSmallHealingBlood
+  faction: BradPotions
+  uiPosition: 0, 3
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallHealingBlood
+
+- type: cp14TradingPosition
+  id: CP14VialSmallSpeedUp
+  faction: BradPotions
+  uiPosition: 1, 0
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallSpeedUp
+
+- type: cp14TradingPosition
+  id: CP14VialSmallRainbow
+  faction: BradPotions
+  uiPosition: 1, 1
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallRainbow
+
+- type: cp14TradingPosition
+  id: CP14VialSmallHealingManaDepletion
+  faction: BradPotions
+  uiPosition: 1, 2
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallHealingManaDepletion
+
+- type: cp14TradingPosition
+  id: CP14VialSmallHealingMana
+  faction: BradPotions
+  uiPosition: 1, 3
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallHealingMana
+
+
+
+
+- type: cp14TradingPosition
+  id: CP14VialTiny
+  faction: BradPotions
+  uiPosition: 3, 0
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_tiny.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialTiny
+
+- type: cp14TradingPosition
+  id: CP14VialTinyReinforced
+  prerequisite: CP14VialTiny
+  priceMarkup: 1
+  faction: BradPotions
+  uiPosition: 3, 1
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_tiny.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialTinyReinforced
+
+- type: cp14TradingPosition
+  id: CP14VialSmall
+  prerequisite: CP14VialTiny
+  priceMarkup: 1
+  faction: BradPotions
+  uiPosition: 4, 0
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmall
+
+- type: cp14TradingPosition
+  id: CP14VialSmallReinforced
+  prerequisite: CP14VialSmall
+  priceMarkup: 2
+  faction: BradPotions
+  uiPosition: 4, 1
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallReinforced
+
+- type: cp14TradingPosition
+  id: CP14VialMedium
+  prerequisite: CP14VialSmall
+  priceMarkup: 2
+  faction: BradPotions
+  uiPosition: 5, 0
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_medium.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialMedium
+
+- type: cp14TradingPosition
+  id: CP14VialMediumReinforced
+  prerequisite: CP14VialMedium
+  priceMarkup: 3
+  faction: BradPotions
+  uiPosition: 5, 1
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_medium.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialMediumReinforced
+
+
+
+
+- type: cp14TradingPosition
+  id: CP14Cauldron
+  priceMarkup: 5
+  faction: BradPotions
+  uiPosition: 7, 0
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/cauldron.rsi
+    state: icon
+  service: !type:CP14BuyItemsService
+    product: CP14Cauldron
+
+- type: cp14TradingPosition
+  id: CP14Pestle
+  priceMarkup: 2
+  faction: BradPotions
+  uiPosition: 8, 0
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/mortar_pestle.rsi
+    state: pestle
+  service: !type:CP14BuyItemsService
+    product: CP14Pestle
+
+- type: cp14TradingPosition
+  id: CP14Mortar
+  priceMarkup: 2
+  faction: BradPotions
+  uiPosition: 9, 0
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/mortar_pestle.rsi
+    state: mortar_base
+  service: !type:CP14BuyItemsService
+    product: CP14Mortar
+
+- type: cp14TradingPosition
+  id: CP14Dropper
+  priceMarkup: 1
+  faction: BradPotions
+  uiPosition: 7, 1
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/dropper.rsi
+    state: dropper
+  service: !type:CP14BuyItemsService
+    product: CP14Dropper
+
+- type: cp14TradingPosition
+  id: CP14Syringe
+  priceMarkup: 2
+  faction: BradPotions
+  uiPosition: 8, 1
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/syringe.rsi
+    state: base
+  service: !type:CP14BuyItemsService
+    product: CP14Syringe
+
+