Merge remote-tracking branch 'upstream/master' into leather_and_backpacks

Resources/Prototypes/Entities/Objects/Fun/Instruments/base_instruments.yml

@@ -18,8 +18,8 @@
         type: InstrumentBoundUserInterface
   - type: Item
     size: Normal
-  - type: StaticPrice
-    price: 200
+  #- type: StaticPrice
+  #  price: 200
 
 #These are for instruments that are larger, can't be picked up, or have collision
 - type: entity

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

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

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

@@ -46,6 +46,8 @@
       - id: HandLabeler #TODO custom cp14 labeler
       - id: CP14StampDenied
       - id: CP14StampApproved
+      - id: CP14ManaOperationGlove
+      - id: AppraisalTool
       - id: CP14PaperFolderRed
         amount: 2
       - id: CP14PaperFolderBlue

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

@@ -30,13 +30,13 @@
     - !type:NestedSelector
       tableId: CP14StationCrateLootTools
       rolls: !type:RangeNumberSelector
-        range: 1, 5
+        range: 4, 5
     # Fluff
     - !type:NestedSelector
       tableId: CP14StationCrateLootFluff
-      prob: 0.33
+      prob: 0.5
       rolls: !type:RangeNumberSelector
-        range: 0, 2
+        range: 4, 5
 
 - type: entityTable
   id: CP14StationCrateLootTools
@@ -51,11 +51,17 @@
       - id: CP14Scissors
       - id: CP14Torch
       - id: CP14Lighter
-      - id: CP14ManaOperationGlove
       - id: CP14ModularIronShovel
+      - id: CP14KeyFile
       - id: CP14BaseMop
+      - id: CP14LockCopper
       - id: CP14ModularIronPickaxe
       - id: CP14ModularIronSickle
+      - !type:GroupSelector
+        children:
+        - id: CP14FluteInstrument
+        - id: CP14LyraInstrument
+        - id: CP14LuteInstrument
       - !type:GroupSelector
         children:
         - id: CP14Candle
@@ -88,9 +94,11 @@
   id: CP14StationCrateLootFluff
   table: !type:GroupSelector
     children:
+    - id: CP14PaperFolderBlue
+    - id: CP14PaperFolderRed
+    - id: CP14PenFeather
     - id: CP14FoodPotato
     - id: CP14FoodOnion
-    - id: CP14AgaricMushroom #dont eat
     - id: CP14Cloth10
     - id: CP14CrayonWhite
     - !type:GroupSelector
@@ -112,6 +120,17 @@
       - id: CP14DyePurple
       - id: CP14DyeBlack
       - id: CP14DyeBlue
+    - !type:GroupSelector
+      children:
+      - id: CP14BloodFlower
+      - id: CP14AgaricMushroom
+      - id: CP14ChromiumSlime
+        weight: 0.5
+      - id: CP14WildSage
+      - id: CP14LumiMushroom
+      - id: CP14BlueAmanita
+      - id: CP14Dayflin
+      - id: CP14AirLily
 
 - type: entityTable
   id: CP14RandomVials

Resources/Prototypes/_CP14/Damage/containers.yml

@@ -7,3 +7,12 @@
     - Airloss
     - Genetic
     - CP14Magic
+
+- type: damageContainer
+  id: CP14BiologicalAnaerobic
+  supportedGroups:
+  - Brute
+  - Burn
+  - Toxin
+  - Genetic
+  - CP14Magic

Resources/Prototypes/_CP14/Damage/modifier_sets.yml

@@ -123,6 +123,49 @@
     Heat: 0.2
     Cold: 1.4
 
+# Slimes
+# TODO: upstream a way to get modifier sets to inherit from each other
+
+- type: damageModifierSet
+  id: CP14Slime
+  coefficients:
+    Blunt: 0.6
+    Slash: 1.2
+    Piercing: 1.2
+    Cold: 1.5
+    Poison: 0.8
+
+- type: damageModifierSet
+  id: CP14SlimeElectric
+  coefficients:
+    Blunt: 0.6
+    Slash: 1.2
+    Piercing: 1.2
+    Heat: 1.2
+    Cold: 1.5
+    Shock: 0.0
+    Poison: 0.8
+
+- type: damageModifierSet
+  id: CP14SlimeFire
+  coefficients:
+    Blunt: 0.6
+    Slash: 1.2
+    Piercing: 1.2
+    Heat: 0.0
+    Cold: 2.0
+    Poison: 0.8
+
+- type: damageModifierSet
+  id: CP14SlimeIce
+  coefficients:
+    Blunt: 0.6
+    Slash: 1.2
+    Piercing: 1.2
+    Heat: 2.0
+    Cold: 0.0
+    Poison: 0.8
+
 # Species
 
 - type: damageModifierSet

Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead_ballade.yml

@@ -11,6 +11,7 @@
   - type: CP14MagicEffectManaCost
     manaCost: 1
   - type: CP14MagicEffect
+    magicType: Life
     effects:
     - !type:CP14SpellSpawnEntityOnTarget # TODO заставить работать только на нежить
       spawns:

Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/resurrection_dead.yml

@@ -1,16 +1,19 @@
 - type: entity
-  id: CP14ActionSpellCureFromDeath
-  name: Cure from death
-  description: You heal the target from all kinds of damage.
+  id: CP14ActionSpellResurrectionDead
+  name: Death resurrection
+  description: You resurrect the target and cure it from damage.
   components:
   - type: Sprite
     sprite: _CP14/Actions/Spells/necromancy.rsi
     state: cure_dead
   - type: CP14MagicEffectCastSlowdown
-    speedMultiplier: 0.7
+    speedMultiplier: 0.9
   - type: CP14MagicEffectManaCost
-    manaCost: 4
+    manaCost: 20
+  - type: CP14MagicEffectAliveTargetRequired
+    inverted: true
   - type: CP14MagicEffect
+    magicType: Life
     telegraphyEffects:
     - !type:CP14SpellSpawnEntityOnTarget
       spawns:
@@ -19,27 +22,27 @@
     - !type:CP14SpellSpawnEntityOnTarget
       spawns:
       - CP14ImpactEffectResurrection
-    - !type:CP14SpellResurrectionEffect # TODO заставить работать только на нежить
+    - !type:CP14SpellResurrectionEffect
     - !type:CP14SpellApplyEntityEffect
       effects:
       - !type:HealthChange
         damage:
           types:
-            Asphyxiation: -2
-            Bloodloss: -2
-            Blunt: -2
-            Cellular: -1
-            Caustic: -2
-            Cold: -1
-            Heat: -1
-            Piercing: -2
-            Poison: -2
-            Radiation: -2
-            Shock: -2
-            Slash: -2
-  - type: CP14MagicEffectSomaticAspect
+            Asphyxiation: -500
+            Bloodloss: -100
+            Blunt: -25
+            Caustic: -25
+            Cold: -25
+            Heat: -50
+            Piercing: -25
+            Poison: -25
+            Radiation: -25
+            Shock: -25
+            Slash: -25
+      - !type:Jitter
   - type: CP14MagicEffectVerbalAspect
-    startSpeech: "Surge, hominem mortuum!"
+    startSpeech: "Surge..."
+    endSpeech: "Hominem mortuum"
   - type: CP14MagicEffectCastingVisual
     proto: CP14RuneResurrection
   - type: EntityTargetAction
@@ -49,14 +52,15 @@
     range: 10
     itemIconStyle: BigAction
     interactOnMiss: false
+    canTargetSelf: false
     sound: !type:SoundPathSpecifier
       path: /Audio/Magic/rumble.ogg
     icon:
       sprite: _CP14/Actions/Spells/necromancy.rsi
       state: cure_dead
-    event: !type:CP14ToggleableEntityTargetActionEvent
-      cooldown: 2
-      castTime: 10
+    event: !type:CP14DelayedEntityTargetActionEvent
+      cooldown: 10
+      castDelay: 2
       breakOnMove: false
       breakOnDamage: false
 

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

@@ -13,9 +13,24 @@
   - type: CP14MagicEffect
     magicType: Fire
     effects:
-    - !type:CP14SpellSpawnEntityOnTarget
-      spawns:
-      - CP14AreaEntityEffectHellBallade
+    - !type:CP14SpellArea
+      range: 3
+      maxTargets: 4
+      whitelist:
+        components:
+        - MobState
+      effects:
+      - !type:CP14SpellSpawnEntityOnTarget
+        spawns:
+        - CP14ImpactEffectHellBallade
+      - !type:CP14SpellApplyEntityEffect
+        effects:
+        - !type:Jitter
+        - !type:FlammableReaction
+          multiplier: 0.5
+        - !type:AdjustTemperature
+          amount: 500
+        - !type:Ignite
   - type: CP14MagicEffectRequiredMusicTool
   - type: CP14MagicEffectCastingVisual
     proto: CP14RuneHellBallade
@@ -32,32 +47,6 @@
       castTime: 120
       hidden: true
 
-- type: entity
-  id: CP14AreaEntityEffectHellBallade
-  categories: [ HideSpawnMenu ]
-  save: false
-  components:
-  - type: TimedDespawn
-    lifetime: 1.6
-  - type: CP14AreaEntityEffect
-    range: 3
-    maxTargets: 4
-    whitelist:
-      components:
-      - MobState
-    effects:
-    - !type:CP14SpellSpawnEntityOnTarget
-      spawns:
-      - CP14ImpactEffectHellBallade
-    - !type:CP14SpellApplyEntityEffect
-      effects:
-      - !type:Jitter
-      - !type:FlammableReaction
-        multiplier: 0.5
-      - !type:AdjustTemperature
-        amount: 500
-      - !type:Ignite
-
 - type: entity
   id: CP14ImpactEffectHellBallade
   parent: CP14BaseMagicImpact
@@ -85,4 +74,3 @@
     - state: notes_3
       color: "#eea911"
       shader: unshaded
-

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

@@ -13,9 +13,30 @@
   - type: CP14MagicEffect
     magicType: Life
     effects:
-    - !type:CP14SpellSpawnEntityOnTarget
-      spawns:
-      - CP14AreaEntityEffectHealBallade
+    - !type:CP14SpellArea
+      range: 3
+      maxTargets: 4
+      whitelist:
+        components:
+        - MobState
+      effects:
+      - !type:CP14SpellSpawnEntityOnTarget
+        spawns:
+        - CP14ImpactEffectHealthBallade
+      - !type:CP14SpellApplyEntityEffect
+        effects:
+        - !type:HealthChange
+          damage:
+            types:
+              Slash: -0.70
+              Blunt: -0.70
+              Piercing: -0.70
+              Cold: -0.40
+              Heat: -0.40
+              Shock: -0.40
+              Poison: -0.25
+              Bloodloss: -0.40
+              Caustic: -0.30
   - type: CP14MagicEffectRequiredMusicTool
   - type: CP14MagicEffectCastingVisual
     proto: CP14RuneHealBallade
@@ -32,38 +53,6 @@
       castTime: 120
       hidden: true
 
-- type: entity
-  id: CP14AreaEntityEffectHealBallade
-  categories: [ HideSpawnMenu ]
-  save: false
-  components:
-  - type: TimedDespawn
-    lifetime: 1.6
-  - type: CP14AreaEntityEffect
-    range: 3
-    maxTargets: 4
-    whitelist:
-      components:
-      - MobState
-    effects:
-    - !type:CP14SpellSpawnEntityOnTarget
-      spawns:
-      - CP14ImpactEffectHealthBallade
-    - !type:CP14SpellApplyEntityEffect
-      effects:
-      - !type:HealthChange
-        damage:
-          types:
-            Slash: -0.70
-            Blunt: -0.70
-            Piercing: -0.70
-            Cold: -0.40
-            Heat: -0.40
-            Shock: -0.40
-            Poison: -0.25
-            Bloodloss: -0.40
-            Caustic: -0.30
-
 - type: entity
   id: CP14ImpactEffectHealthBallade
   parent: CP14BaseMagicImpact

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

@@ -13,9 +13,23 @@
   - type: CP14MagicEffect
     magicType: Life
     effects:
-    - !type:CP14SpellSpawnEntityOnTarget
-      spawns:
-      - CP14AreaEntityEffectPeaceBallade
+    - !type:CP14SpellArea
+      range: 4
+      maxTargets: 8
+      whitelist:
+        components:
+        - MobState
+      effects:
+      - !type:CP14SpellSpawnEntityOnTarget
+        spawns:
+        - CP14ImpactEffectPeaceBallade
+      - !type:CP14SpellApplyEntityEffect
+        effects:
+        - !type:GenericStatusEffect
+          key: Pacified
+          component: Pacified
+          type: Add
+          time: 1.8
   - type: CP14MagicEffectRequiredMusicTool
   - type: CP14MagicEffectCastingVisual
     proto: CP14RunePeaceBallade
@@ -32,31 +46,6 @@
       castTime: 120
       hidden: true
 
-- type: entity
-  id: CP14AreaEntityEffectPeaceBallade
-  categories: [ HideSpawnMenu ]
-  save: false
-  components:
-  - type: TimedDespawn
-    lifetime: 1.6
-  - type: CP14AreaEntityEffect
-    range: 3
-    maxTargets: 4
-    whitelist:
-      components:
-      - MobState
-    effects:
-    - !type:CP14SpellSpawnEntityOnTarget
-      spawns:
-      - CP14ImpactEffectPeaceBallade
-    - !type:CP14SpellApplyEntityEffect
-      effects:
-      - !type:GenericStatusEffect
-        key: Pacified
-        component: Pacified
-        type: Add
-        time: 1.8
-
 - type: entity
   id: CP14ImpactEffectPeaceBallade
   parent: CP14BaseMagicImpact

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

@@ -74,3 +74,11 @@
       color: "#db35c8"
       shader: unshaded
 
+- type: entity
+  parent: CP14BaseSpellScrollHealing
+  id: CP14SpellScrollSheepPolymorph
+  name: sheep polymorph spell scroll
+  components:
+  - type: CP14SpellStorage
+    spells:
+    - CP14ActionSpellSheepPolymorph

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

@@ -13,9 +13,23 @@
   - type: CP14MagicEffect
     magicType: Life
     effects:
-    - !type:CP14SpellSpawnEntityOnTarget
-      spawns:
-      - CP14AreaEntityEffectSpeedBallade
+    - !type:CP14SpellArea
+      affectCaster: true
+      range: 5
+      maxTargets: 4
+      whitelist:
+        components:
+        - MobState
+      effects:
+      - !type:CP14SpellSpawnEntityOnTarget
+        spawns:
+        - CP14ImpactEffectSpeedBallade
+      - !type:CP14SpellApplyEntityEffect
+        effects:
+        - !type:MovespeedModifier
+          walkSpeedModifier: 1.2
+          sprintSpeedModifier: 1.2
+          statusLifetime: 1.8
   - type: CP14MagicEffectRequiredMusicTool
   - type: CP14MagicEffectCastingVisual
     proto: CP14RuneSpeedBallade
@@ -32,30 +46,6 @@
       castTime: 120
       hidden: true
 
-- type: entity
-  id: CP14AreaEntityEffectSpeedBallade
-  categories: [ HideSpawnMenu ]
-  save: false
-  components:
-  - type: TimedDespawn
-    lifetime: 1.6
-  - type: CP14AreaEntityEffect
-    range: 3
-    maxTargets: 4
-    whitelist:
-      components:
-      - MobState
-    effects:
-    - !type:CP14SpellSpawnEntityOnTarget
-      spawns:
-      - CP14ImpactEffectSpeedBallade
-    - !type:CP14SpellApplyEntityEffect
-      effects:
-      - !type:MovespeedModifier
-        walkSpeedModifier: 1.15
-        sprintSpeedModifier: 1.15
-        statusLifetime: 1.8
-
 - type: entity
   id: CP14ImpactEffectSpeedBallade
   parent: CP14BaseMagicImpact

Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/search_of_life.yml

@@ -89,3 +89,11 @@
       tags:
       - HideContextMenu
 
+- type: entity
+  parent: CP14BaseSpellScrollLight
+  id: CP14SpellScrollSearchOfLife
+  name: search of life spell scroll
+  components:
+  - type: CP14SpellStorage
+    spells:
+    - CP14ActionSpellSearchOfLife

Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_ballade.yml

@@ -13,9 +13,22 @@
     canModifyManacost: false
   - type: CP14MagicEffect
     effects:
-    - !type:CP14SpellSpawnEntityOnTarget
-      spawns:
-      - CP14AreaEntityEffectMagicBallade
+    - !type:CP14SpellArea
+      range: 5
+      maxTargets: 5
+      whitelist:
+        components:
+        - CP14MagicEnergyContainer
+        - CP14MagicEnergyCrystalSlot
+      effects:
+      - !type:CP14SpellSpawnEntityOnTarget
+        spawns:
+        - CP14ImpactEffectMagicBallade
+      - !type:CP14SpellApplyEntityEffect
+        effects:
+        - !type:CP14ManaChange
+          manaDelta: 1.2
+          safe: true
   - type: CP14MagicEffectRequiredMusicTool
   - type: CP14MagicEffectCastingVisual
     proto: CP14RuneMagicBallade
@@ -32,30 +45,6 @@
       castTime: 120
       hidden: true
 
-- type: entity
-  id: CP14AreaEntityEffectMagicBallade
-  categories: [ HideSpawnMenu ]
-  save: false
-  components:
-  - type: TimedDespawn
-    lifetime: 1.6
-  - type: CP14AreaEntityEffect
-    range: 5
-    maxTargets: 5
-    whitelist:
-      components:
-      - CP14MagicEnergyContainer
-      - CP14MagicEnergyCrystalSlot
-    effects:
-    - !type:CP14SpellSpawnEntityOnTarget
-      spawns:
-      - CP14ImpactEffectMagicBallade
-    - !type:CP14SpellApplyEntityEffect
-      effects:
-      - !type:CP14ManaChange
-        manaDelta: 1.2
-        safe: true
-
 - type: entity
   id: CP14ImpactEffectMagicBallade
   parent: CP14BaseMagicImpact

Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/kick.yml

@@ -94,4 +94,6 @@
     event: !type:CP14DelayedEntityTargetActionEvent
       cooldown: 5
       castDelay: 0.4
-
+      distanceThreshold: 1.5
+      breakOnMove: false
+      breakOnDamage: false

Resources/Prototypes/_CP14/Entities/Actions/Spells/Slime/jump.yml

@@ -0,0 +1,28 @@
+- type: entity
+  id: CP14ActionSpellSlimeJump
+  name: Slime jump
+  description: Jump! JUMP!
+  components:
+  - type: Sprite
+    sprite: _CP14/Actions/Spells/slime.rsi
+    state: jump
+  - type: CP14MagicEffectCastSlowdown
+    speedMultiplier: 0.1
+  - type: CP14MagicEffect
+    effects:
+    - !type:CP14SpellThrowUserTo
+      throwPower: 8
+  - type: EntityWorldTargetAction
+    useDelay: 8
+    range: 10
+    checkCanAccess: false
+    itemIconStyle: BigAction
+    icon:
+      sprite: _CP14/Actions/Spells/slime.rsi
+      state: jump
+    event: !type:CP14DelayedEntityWorldTargetActionEvent
+      hidden: true
+      breakOnMove: false
+      breakOnDamage: false
+      castDelay: 1
+    raiseOnUser: true

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

@@ -88,5 +88,4 @@
   components:
   - type: CP14SpellStorage
     spells:
-    - CP14ActionSpellBeerCreation
-
+    - CP14ActionSpellBeerCreation

Resources/Prototypes/_CP14/Entities/Actions/Spells/scrolls.yml

@@ -63,6 +63,8 @@
     energy: 30
     maxEnergy: 50
   - type: CP14MagicUnsafeDamage
+  - type: StaticPrice
+    price: 5
 
 - type: entity
   abstract: true

Resources/Prototypes/_CP14/Entities/Clothing/Head/head.yml

@@ -4,6 +4,7 @@
   id: CP14ClothingHeadSlimeCrown
   name: slime crown
   description: Earl of Ooze. Grand Duke of Goo. Lord of the Slimes.
+  categories: [ DoNotMap ]
   components:
   - type: Sprite
     sprite: _CP14/Clothing/Head/slime_crown.rsi

Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/base.yml

@@ -52,8 +52,8 @@
       params:
         volume: 3
   - type: Damageable
-    damageContainer: CP14Biological
-    damageModifierSet: Slime
+    damageContainer: CP14BiologicalAnaerobic
+    damageModifierSet: CP14Slime
   - type: MeleeWeapon
     altDisarm: false
     soundHit:
@@ -72,6 +72,8 @@
     speechSounds: Slime
   - type: TypingIndicator
     proto: slime
+  - type: ReplacementAccent
+    accent: slimes
   - type: SolutionContainerManager
     solutions:
       slime:
@@ -91,6 +93,9 @@
         solution: slime
       - !type:DoActsBehavior
         acts: [ "Destruction" ]
+  # TODO: shouldn't be openable by others
+  # TODO: custom sound for opening and closing--shouldn't be a chest
+  # TODO: allow player-controlled slime to open its own storage?
   - type: EntityStorage
     isCollidableWhenOpen: true
     enteringOffset: 0, 0
@@ -98,6 +103,9 @@
     showContents: true
     occludesLight: false
   - type: CP14MagicCasterSlowdown
+  - type: Tag
+    tags:
+    - FootstepSound
   - type: EntityTableContainerFill
     containers:
       entity_storage: !type:GroupSelector
@@ -110,32 +118,3 @@
           - id: CP14ScrapIron
           - id: CP14CopperCoin1
             weight: 3
-
-- type: entity
-  id: CP14ActionSpellSlimeJump
-  name: Slime jump
-  description: Jump! JUMP!
-  components:
-  - type: Sprite
-    sprite: _CP14/Actions/Spells/physical.rsi
-    state: kick #TODO
-  - type: CP14MagicEffectCastSlowdown
-    speedMultiplier: 0.1
-  - type: CP14MagicEffect
-    effects:
-    - !type:CP14SpellThrowUserTo
-      throwPower: 8
-  - type: EntityWorldTargetAction
-    useDelay: 8
-    range: 10
-    checkCanAccess: false
-    itemIconStyle: BigAction
-    icon:
-      sprite: _CP14/Actions/Spells/physical.rsi
-      state: kick #TODO
-    event: !type:CP14DelayedEntityWorldTargetActionEvent
-      hidden: true
-      breakOnMove: false
-      breakOnDamage: false
-      castDelay: 1
-    raiseOnUser: true

Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/electric.yml

@@ -23,26 +23,23 @@
         - ReagentId: CP14EssenceEnergia
           Quantity: 30
   - type: MeleeWeapon
-    altDisarm: false
-    soundHit:
-        path: /Audio/Weapons/punch3.ogg
-    angle: 0
-    animation: WeaponArcPunch
     damage:
       types:
         Blunt: 3
         Shock: 3
   - type: CP14SpellEffectOnHit
-    prob: 0.3
+    prob: 0.15
     effects:
     - !type:CP14SpellApplyEntityEffect
       effects:
       - !type:Electrocute
-        electrocuteTime: 1
+        electrocuteTime: 0.5
         electrocuteDamageScale: 1
     - !type:CP14SpellSpawnEntityOnTarget
       spawns:
       - CP14ElectrifiedEffect
+  - type: Damageable
+    damageModifierSet: CP14SlimeElectric
   - type: Destructible
     thresholds:
     - trigger:
@@ -102,6 +99,5 @@
     - !type:CP14SpellApplyEntityEffect
       effects:
       - !type:Electrocute
-        electrocuteTime: 3.5
+        electrocuteTime: 2
         electrocuteDamageScale: 1
-

Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/fire.yml

@@ -25,15 +25,19 @@
         - ReagentId: CP14BasicEffectDamageHeat
           Quantity: 10
   - type: MeleeWeapon
-    altDisarm: false
-    soundHit:
-        path: /Audio/Weapons/punch3.ogg
-    angle: 0
-    animation: WeaponArcPunch
     damage:
       types:
         Blunt: 3
         Heat: 3
+  - type: Damageable
+    damageModifierSet: CP14SlimeFire
+  - type: Temperature
+    coldDamage:
+      types:
+        Cold: 1
+    heatDamage:
+      types:
+        Heat: 0
   - type: Destructible
     thresholds:
     - trigger:
@@ -100,4 +104,3 @@
       - !type:AdjustTemperature
         amount: 6000
       - !type:Ignite
-

Resources/Prototypes/_CP14/Entities/Mobs/NPC/Slimes/ice.yml

@@ -20,14 +20,9 @@
         reagents:
         - ReagentId: CP14ChromiumSlime
           Quantity: 20
-        - ReagentId: CP14EssenceWater
+        - ReagentId: CP14EssenceFrost
           Quantity: 30
   - type: MeleeWeapon
-    altDisarm: false
-    soundHit:
-        path: /Audio/Weapons/punch3.ogg
-    angle: 0
-    animation: WeaponArcPunch
     damage:
       types:
         Blunt: 3
@@ -49,6 +44,15 @@
       - !type:AdjustTemperature
         amount: -6000
       - !type:ExtinguishReaction
+  - type: Damageable
+    damageModifierSet: CP14SlimeIce
+  - type: Temperature
+    coldDamage:
+      types:
+        Cold: 0
+    heatDamage:
+      types:
+        Heat: 3
   - type: Destructible
     thresholds:
     - trigger:
@@ -114,4 +118,3 @@
       - !type:AdjustTemperature
         amount: -82000
       - !type:ExtinguishReaction
-

Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T1.yml

@@ -8,6 +8,12 @@
   - type: NpcFactionMember
     factions:
     - CP14Monster
+  - type: CP14SkillStorage
+    experienceMaxCap: 0
+    freeLearnedSkills:
+    - SwordMastery
+    - RapierMastery
+    - SkimitarMastery
 
 - type: entity
   id: CP14MobUndeadSkeletonHalberdT1

Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/Skeletons/T2.yml

@@ -1,6 +1,6 @@
 - type: entity
   id: CP14MobUndeadSkeletonDemiplaneT2
-  parent: CP14BaseMobSkeleton
+  parent: CP14MobUndeadSkeletonDemiplaneT1 
   name: skeleton
   abstract: true
   components:
@@ -77,20 +77,38 @@
   - type: Loadout
     prototypes:
     - CP14MobSkeletonWizardT2
-  - type: CP14MagicEnergyDraw
-    energy: 1
-    delay: 1
+  - type: CP14MagicEnergyContainer
+    magicAlert: CP14MagicEnergy
+    maxEnergy: 200
+    energy: 200
+    unsafeSupport: true
+  - type: PassiveDamage
+    allowedStates:
+    - Alive
+    damage:
+      types:
+        CP14ManaDepletion: -0.1
+  - type: CP14SkillStorage
+    experienceMaxCap: 0
+    freeLearnedSkills:
+    - SwordMastery
+    - RapierMastery
+    - SkimitarMastery
+    - HydrosophistryT1
+    - HydrosophistryT2
+    - MetamagicT1
+    - MetamagicT2
+    - CP14ActionSpellFreeze
+    - CP14ActionSpellIceShards
+    - CP14ActionSpellManaConsumeElf
+    - CP14ActionSpellManaGiftElf
+    - CP14ActionSpellMagicSplitting
+    - CP14ActionSpellManaTrance
   - type: CP14SpellStorage
     grantAccessToSelf: true
     spells:
-    - CP14ActionSpellFreeze
-    - CP14ActionSpellIceShards
-    - CP14ActionSpellIceDagger
-    - CP14ActionSpellCureFromDeath
+    - CP14ActionSpellResurrectionDead
     - CP14ActionSpellShadowStep
-    - CP14ActionSpellShadowSwap
-    - CP14ActionSpellShadowGrab
-
 - type: entity
   id: CP14MobUndeadSkeletonBardT2
   parent: CP14MobUndeadSkeletonDemiplaneT2

Resources/Prototypes/_CP14/Entities/Mobs/Player/TownRaids/undead.yml

@@ -39,7 +39,7 @@
     offset: 1
     table: !type:GroupSelector
       rolls: !type:RangeNumberSelector
-        range: 1, 5
+        range: 3, 5
       children:
       - id: CP14MobUndeadZombie
         weight: 2
@@ -50,6 +50,32 @@
     tags:
     - FootstepSound
     - CP14RaidLeader
+  - type: CP14SkillStorage
+    experienceMaxCap: 0
+    freeLearnedSkills:
+    - SwordMastery
+    - RapierMastery
+    - SkimitarMastery
+    - MetamagicT1
+    - MetamagicT2
+    - HydrosophistryT1
+    - HydrosophistryT2
+    - PyrokineticT1
+    - PyrokineticT2
+    - CP14ActionSpellFireball
+    - CP14ActionSpellFreeze
+    - CP14ActionSpellIceShards
+    - CP14ActionSpellManaConsumeElf
+    - CP14ActionSpellManaGiftElf
+    - CP14ActionSpellMagicSplitting
+    - CP14ActionSpellManaTrance
+  - type: CP14SpellStorage
+    grantAccessToSelf: true
+    spells:
+    - CP14ActionSpellResurrectionDead
+  - type: Loadout
+    prototypes:
+    - CP14MobSkeletonWizardTownRaid
 
 - type: entity
   id: CP14SpawnPointTownRaidUndeadEasy

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

@@ -43,7 +43,7 @@
     - map: [ "outerClothing" ]
     - map: [ "cloak" ]
     - map: [ "eyes" ]
-    - map: [ "belt1" ]
+    - map: [ "belt" ]
     - map: [ "belt2" ]
     - map: [ "neck" ]
     - map: [ "back" ]
@@ -210,7 +210,7 @@
     attributes:
       proper: true
   - type: MobPrice
-    price: 1500 # Kidnapping a living person and selling them for cred is a good move.
+    price: 150 # Kidnapping a living person and selling them for cred is a good move.
     deathPenalty: 0.01 # However they really ought to be living and intact, otherwise they're worth 100x less.
   - type: Tag
     tags:
@@ -365,7 +365,7 @@
     - map: [ "outerClothing" ]
     - map: [ "cloak" ]
     - map: [ "eyes" ]
-    - map: [ "belt1" ]
+    - map: [ "belt" ]
     - map: [ "belt2" ]
     - map: [ "neck" ]
     - map: [ "back" ]
@@ -400,6 +400,7 @@
   - BaseMob
   - CP14MobDamageable
   - CP14MobMagical
+  - CP14BaseMobSpecies
   id: CP14BaseMobSpeciesNoLife
   categories: [ ForkFiltered ]
   abstract: true
@@ -438,7 +439,7 @@
     - map: [ "outerClothing" ]
     - map: [ "cloak" ]
     - map: [ "eyes" ]
-    - map: [ "belt1" ]
+    - map: [ "belt" ]
     - map: [ "belt2" ]
     - map: [ "neck" ]
     - map: [ "back" ]

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

@@ -38,7 +38,7 @@
     - map: [ "outerClothing" ]
     - map: [ "cloak" ]
     - map: [ "eyes" ]
-    - map: [ "belt1" ]
+    - map: [ "belt" ]
     - map: [ "belt2" ]
     - map: [ "neck" ]
     - map: [ "back" ]

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

@@ -42,7 +42,7 @@
     - map: [ "outerClothing" ]
     - map: [ "cloak" ]
     - map: [ "eyes" ]
-    - map: [ "belt1" ]
+    - map: [ "belt" ]
     - map: [ "belt2" ]
     - map: [ "neck" ]
     - map: [ "back" ]
@@ -154,7 +154,7 @@
     - map: [ "outerClothing" ]
     - map: [ "cloak" ]
     - map: [ "eyes" ]
-    - map: [ "belt1" ]
+    - map: [ "belt" ]
     - map: [ "belt2" ]
     - map: [ "neck" ]
     - map: [ "back" ]

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

@@ -34,7 +34,7 @@
     - map: [ "outerClothing" ]
     - map: [ "cloak" ]
     - map: [ "eyes" ]
-    - map: [ "belt1" ]
+    - map: [ "belt" ]
     - map: [ "belt2" ]
     - map: [ "neck" ]
     - map: [ "back" ]

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

@@ -36,7 +36,7 @@
     - map: [ "cloak" ]
     - map: [ "outerClothing" ]
     - map: [ "eyes" ]
-    - map: [ "belt1" ]
+    - map: [ "belt" ]
     - map: [ "belt2" ]
     - map: [ "neck" ]
     - map: [ "back" ]

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

@@ -109,7 +109,6 @@
 - type: entity
   parent:
   - CP14MobDamageable
-  - MobRespirator
   - MobAtmosStandard
   - CP14SimpleSpaceMobNoLifeBase
   id: CP14SimpleMobNoLifeBase

Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/Books/books.yml

@@ -18,4 +18,4 @@
     - state: bookmark_short
       map: [ "overlay" ]
   - type: Paper
-    content: cp14-book-text-guild_moral
+    content: cp14-book-text-guild-moral

Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/folder.yml

@@ -35,6 +35,8 @@
   - type: ContainerContainer
     containers:
       storagebase: !type:Container
+  - type: StaticPrice
+    price: 1
 
 - type: entity
   id: CP14PaperFolderBlue

Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/paper.yml

@@ -60,6 +60,8 @@
   - type: Tag
     tags:
     - Document
+  - type: StaticPrice
+    price: 2
 
 - type: entity
   parent: CP14BasePaper

Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/pen.yml

@@ -22,6 +22,11 @@
       collection: PaperScribbles
       params:
         variation: 0.1
+  - type: StaticPrice
+    price: 3
+  - type: PhysicalComposition
+    materialComposition:
+      Steel: 0 #Parenting from vanilla moment
 
 # TODO: Чернильницу нужно доделать. Перо должно быть видно, пока оно внутри чернильницы. Предмет должен быть через ItemSlots, чтобы перо вставлять забирать можно было кликом. Нужно добавить прикольные звуки вставляния, выставляния. И добавить механ, который будет требовать периодически макать перо в чернильницу.
 - type: entity

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

@@ -39,3 +39,36 @@
   - type: CP14TradingContract
     faction: BradPotions
 
+- type: entity
+  parent: CP14TradeContractBase
+  id: CP14TradeContractDwarfMining
+  description: Trading contract with the "Dwarf Steel" mining branch. Allows you to purchase various ore and mining tools.
+  suffix: Dwarf Miners
+  components:
+  - type: Sprite
+    state: dwarf_mining
+  - type: CP14TradingContract
+    faction: DwarfMining
+
+- type: entity
+  parent: CP14TradeContractBase
+  id: CP14TradeContractThaumaturgy
+  description: Trading contract with the "Academy of Thaumaturgy". Allows you to purchase various omagic device, tools and scrolls.
+  suffix: Thaumaturgy
+  components:
+  - type: Sprite
+    state: magic
+  - type: CP14TradingContract
+    faction: Thaumaturgy
+
+- type: entity
+  parent: CP14TradeContractBase
+  id: CP14TradeContractHomeDecor
+  description: Trading contract with the "Cozy House" store. Allows you to buy various decorations and nice things to furnish your home.
+  suffix: Home Decor
+  components:
+  - type: Sprite
+    state: house
+  - type: CP14TradingContract
+    faction: HomeDecor
+

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

@@ -21,6 +21,8 @@
     tags:
     - CP14Wheat
     - CP14FarmFood
+  - type: StaticPrice
+    price: 1
 
 - type: entity
   id: CP14Cotton
@@ -45,3 +47,5 @@
   - type: Tag
     tags:
     - CP14FarmFood
+  - type: StaticPrice
+    price: 1

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

@@ -32,6 +32,19 @@
     materialComposition:
       CP14Mithril: 10
 
+- type: entity
+  parent: CP14BaseLockpick
+  id: CP14LockpickSkeletonArtifact
+  name: lockpick skeleton
+  description: A lockpick made from the bone of an unknown creature, it can open anything... though not immediately.
+  categories: [ DoNotMap ]
+  suffix: Artifact
+  components:
+  - type: CP14Lockpick
+    health: 1000
+  - type: Sprite
+    state: lockpick_skeleton
+
 - type: entity
   parent: BaseItem
   id: CP14KeyFile

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

@@ -10,6 +10,9 @@
   - type: Sprite
     sprite: _CP14/Objects/Materials/string.rsi
     state: icon
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Cloth: 5
 
 - type: entity
   id: CP14Web
@@ -34,6 +37,9 @@
         icon2: ""
         icon3: ""
         icon4: ""
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Cloth: 2
 
 - type: entity
   id: CP14Cloth1

Resources/Prototypes/_CP14/Entities/Objects/Misc/bell.yml

@@ -11,6 +11,8 @@
   - type: Tag
     tags:
       - Payload
+  - type: StaticPrice
+    price: 5
   - type: InteractionPopup
     successChance: 1
     interactSuccessSound:

Resources/Prototypes/_CP14/Entities/Objects/Misc/openclosed_sign.yml

@@ -0,0 +1,84 @@
+- type: entity
+  id: CP14OpenSign
+  name: flip sign "Open"
+  description: A small double-sided sign that can be turned over
+  parent: 
+  - BaseItem
+  - CP14BaseFlammable
+  categories: [ ForkFiltered ]
+  components:
+  - type: Sprite
+    noRot: true
+    sprite: _CP14/Objects/Misc/openclosed_sign.rsi
+    layers:
+      - state: table_sign
+      - state: en_open_sign
+        map: [signState]
+  - type: Item
+    size: Small
+  - type: Flippable
+    mirrorEntity: CP14ClosedSign
+  - type: Appearance
+  - type: InteractionOutline
+  - type: CP14LocalizationVisuals
+    mapStates:
+      signState:
+        ru-RU: ru_open_sign
+        en-US: en_open_sign
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: Wood
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTypeTrigger
+        damageType: Heat
+        damage: 6
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          CP14Ash1:
+            min: 1
+            max: 2
+    - trigger:
+        !type:DamageTrigger
+        damage: 10
+      behaviors:
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          CP14WoodenPlanks1:
+            min: 1
+            max: 1
+
+- type: entity
+  id: CP14ClosedSign
+  name: flip sign "Closed"
+  description: A small double-sided sign that can be turned over
+  parent: 
+  - CP14OpenSign
+  categories: [ ForkFiltered ]
+  components:
+  - type: Sprite
+    noRot: true
+    sprite: _CP14/Objects/Misc/openclosed_sign.rsi
+    layers:
+      - state: table_sign
+      - state: en_close_sign
+        map: [signState]
+  - type: Flippable
+    mirrorEntity: CP14OpenSign
+  - type: CP14LocalizationVisuals
+    mapStates:
+      signState:
+        ru-RU: ru_close_sign
+        en-US: en_close_sign

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

@@ -231,6 +231,8 @@
   - type: SolutionContainerVisuals
     maxFillLevels: 2
     fillBaseName: liq-
+  - type: Item
+    size: Tiny
 
 - type: entity
   id: CP14Syringe

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

@@ -39,4 +39,7 @@
       - state: label
         visible: false
         map: ["enum.PaperLabelVisuals.Layer"]
-
+  - type: PhysicalComposition
+    materialComposition:
+      CP14Glass: 10
+      CP14Gold: 10

Resources/Prototypes/_CP14/Entities/Objects/Specific/Thaumaturgy/crystal.yml

@@ -15,6 +15,8 @@
   - type: Tag
     tags:
     - CP14EnergyCrystal
+  - type: StaticPrice
+    price: 10
 
 - type: entity
   id: CP14EnergyCrystalMedium
@@ -25,7 +27,6 @@
   - type: Sprite
     layers:
       - state: medium
-      - state: medium_connector
   - type: CP14MagicEnergyContainer
     energy: 50
     maxEnergy: 50

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

@@ -57,6 +57,8 @@
       collection: MetalThud
     cPAnimationLength: 0.25
     cPAnimationOffset: -1.3
+  - type: StaticPrice
+    price: 50
   - type: NetworkConfigurator
   - type: ActivatableUI
     key: enum.NetworkConfiguratorUiKey.List

Resources/Prototypes/_CP14/Entities/Objects/Tools/torch.yml

@@ -60,6 +60,10 @@
   - type: Tag
     tags:
     - CP14Torch
+  - type: PhysicalComposition
+    materialComposition:
+      CP14WoodenPlanks: 10
+      CP14Cloth: 10
 
 - type: entity
   parent: CP14Torch

Resources/Prototypes/_CP14/Entities/Objects/Wallpaper/general.yml

@@ -11,6 +11,8 @@
     sprite: _CP14/Structures/Wallpaper/icons.rsi
   - type: Stack
     count: 30
+  - type: StackPrice
+    price: 0.5
 
 - type: entity
   id: CP14WallpaperBlack

Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/daggers.yml

@@ -43,5 +43,4 @@
   - type: CP14ModularCraftAutoAssemble
     details:
     - BladeIronDagger
-    - InlayQuartzElectric
-
+    - InlayQuartzElectric

Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/skimitar.yml

@@ -13,3 +13,49 @@
     details:
     - BladeIronSkimitar
 
+- type: entity
+  id: CP14ModularCopperSkimitar
+  parent: CP14ModularGripWooden
+  name: copper skimitar
+  description: the gold standard of edged weapons. Medium length, comfortable grip. No frills.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - sprite: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi
+      state: icon
+  - type: CP14ModularCraftAutoAssemble
+    details:
+    - BladeCopperSkimitar
+
+- type: entity
+  id: CP14ModularIronSkimitarTundra
+  parent: CP14ModularGripWooden
+  name: Skimitar Tundra
+  description: the gold standard of edged weapons. Medium length, comfortable grip. It has "tundra" engraved on it.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
+      state: icon
+  - type: CP14ModularCraftAutoAssemble
+    details:
+    - BladeIronSkimitar
+    - InlayQuartzWater
+
+- type: entity
+  id: CP14ModularGoldSkimitarAgony
+  parent: CP14ModularGripWooden
+  name: Skimitar Agony
+  description: the gold standard of edged weapons. Medium length, comfortable grip. It has "agony" engraved on it.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
+      state: icon
+  - type: CP14ModularCraftAutoAssemble
+    details:
+    - BladeGoldSkimitar
+    - InlayQuartzElectric

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

@@ -8,7 +8,7 @@
   - type: CP14WaveShader
     speed: 2.5
     dis: 4
-  - type: SpriteFade
+  #- type: SpriteFade #Hard to attack
   - type: Clickable
   - type: Sprite
     noRot: true

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

@@ -1,6 +1,8 @@
 - type: entity
   id: CP14CarpetBase
-  parent: BaseStructure
+  parent:
+  - BaseStructure
+  - CP14BaseFlammableSpreadingStrong
   name: carpet
   description: "Fancy walking surface."
   categories: [ ForkFiltered ]
@@ -57,3 +59,42 @@
   - type: Icon
     sprite: _CP14/Structures/Furniture/Carpets/red_carpet.rsi
 
+- type: entity
+  id: CP14CarpetCyan
+  parent: CP14CarpetBase
+  suffix: Cyan
+  components:
+  - type: Sprite
+    sprite: _CP14/Structures/Furniture/Carpets/cyan_carpet.rsi
+  - type: Icon
+    sprite: _CP14/Structures/Furniture/Carpets/cyan_carpet.rsi
+
+- type: entity
+  id: CP14CarpetGreen
+  parent: CP14CarpetBase
+  suffix: Green
+  components:
+  - type: Sprite
+    sprite: _CP14/Structures/Furniture/Carpets/green_carpet.rsi
+  - type: Icon
+    sprite: _CP14/Structures/Furniture/Carpets/green_carpet.rsi
+
+- type: entity
+  id: CP14CarpetOrange
+  parent: CP14CarpetBase
+  suffix: Orange
+  components:
+  - type: Sprite
+    sprite: _CP14/Structures/Furniture/Carpets/orange_carpet.rsi
+  - type: Icon
+    sprite: _CP14/Structures/Furniture/Carpets/orange_carpet.rsi
+
+- type: entity
+  id: CP14CarpetPink
+  parent: CP14CarpetBase
+  suffix: Pink
+  components:
+  - type: Sprite
+    sprite: _CP14/Structures/Furniture/Carpets/pink_carpet.rsi
+  - type: Icon
+    sprite: _CP14/Structures/Furniture/Carpets/pink_carpet.rsi

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

@@ -23,7 +23,7 @@
     - map: [ "outerClothing" ]
     - map: [ "cloak" ]
     - map: [ "eyes" ]
-    - map: [ "belt1" ]
+    - map: [ "belt" ]
     - map: [ "belt2" ]
     - map: [ "neck" ]
     - map: [ "mask" ]
@@ -90,7 +90,7 @@
         showEnts: False
         occludes: False
         ent: null
-      belt1: !type:ContainerSlot
+      belt: !type:ContainerSlot
         showEnts: False
         occludes: False
         ent: null

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

@@ -49,6 +49,8 @@
       - !type:PlaySoundBehavior
         sound:
           path: /Audio/Effects/plant_rustle.ogg
+  - type: StaticPrice
+    price: 15
 
 - type: entity
   id: CP14PottedPlant1

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

@@ -35,6 +35,7 @@
     radius: 2
     energy: 2
   - type: CP14Workbench
+    workbenchRadius: 0.5
     craftSound:
       collection: CP14Sawing #TODO
     recipeTags:

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

@@ -46,7 +46,5 @@
           bounds: "-0.4,-0.4,0.4,0.4"
         density: 190
         mask:
-        - MachineMask
-        layer:
-          - MachineLayer
+        - TabletopMachineMask
 

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

@@ -15,7 +15,6 @@
     sprite: _CP14/Structures/Specific/Economy/buy_platform.rsi
     state: base
   - type: ActivatableUI
-    singleUser: true
     key: enum.CP14TradingUiKey.Key
   - type: Clickable
   - type: InteractionOutline
@@ -90,7 +89,6 @@
   - type: CP14MagicEnergyDraw
     energy: -1
     delay: 3 # 5m to full restore
-  - type: CP14MagicUnsafeDamage
   - type: CP14MagicEnergyExaminable
 
 - type: entity

Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/base_chest.yml

@@ -52,7 +52,7 @@
       paper_label: !type:ContainerSlot
   - type: ItemSlots
   - type: StaticPrice
-    price: 50
+    price: 5
   - type: CP14Lock #Empty, for installing new locks
   - type: Lock
     locked: false

Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/coffin.yml

@@ -41,3 +41,9 @@
     node: CP14CrateCoffin
     containers:
     - entity_storage
+  - type: PhysicalComposition
+    materialComposition:
+      CP14WoodenPlanks: 30
+      CP14Cloth: 20
+  - type: EntityStorage
+    capacity: 1

Resources/Prototypes/_CP14/Entities/Structures/well.yml

@@ -28,3 +28,47 @@
     solution: pool
   - type: Drink
     solution: pool
+
+- type: entity
+  id: CP14StoneWellBroken
+  parent: CP14StoneWell
+  categories: [ ForkFiltered ]
+  name: broken well
+  description: A barely surviving well that's been through too much, maybe there's still water left.
+  components:
+  - type: Sprite
+    noRot: true
+    offset: 0, 0.3
+    drawdepth: Mobs
+    sprite: _CP14/Structures/Specific/Farming/well.rsi
+    layers:
+    - state: broken
+  - type: SolutionContainerManager
+    solutions:
+      pool:
+        maxVol: 999
+        reagents:
+        - ReagentId: Water
+          Quantity: 200
+
+- type: entity
+  id: CP14StoneWellGrovelling
+  parent: CP14StoneWell
+  categories: [ ForkFiltered ]
+  name: grovelling well
+  description: A well ruined by time, overgrown with moss and grass, perhaps there was at least a couple of buckets of water left there.
+  components:
+  - type: Sprite
+    noRot: true
+    offset: 0, 0.3
+    drawdepth: Mobs
+    sprite: _CP14/Structures/Specific/Farming/well.rsi
+    layers:
+    - state: grovelling
+  - type: SolutionContainerManager
+    solutions:
+      pool:
+        maxVol: 999
+        reagents:
+        - ReagentId: Water
+          Quantity: 50

Resources/Prototypes/_CP14/InventoryTemplates/carcat_inventory_template.yml

@@ -72,7 +72,7 @@
       strippingWindowPos: 2,2
       displayName: Cloak
     # Main hotbar
-    - name: belt1
+    - name: belt
       slotTexture: belt
       slotFlags: BELT
       slotGroup: SecondHotbar

Resources/Prototypes/_CP14/InventoryTemplates/human_inventory_template.yml

@@ -72,7 +72,7 @@
       strippingWindowPos: 2,2
       displayName: Cloak
     # Main hotbar
-    - name: belt1
+    - name: belt
       slotTexture: belt
       slotFlags: BELT
       slotGroup: SecondHotbar

Resources/Prototypes/_CP14/InventoryTemplates/partial_inventory_template.yml

@@ -66,7 +66,7 @@
       strippingWindowPos: 2,2
       displayName: Cloak
     # Main hotbar
-    - name: belt1
+    - name: belt
       slotTexture: belt
       slotFlags: BELT
       slotGroup: SecondHotbar

Resources/Prototypes/_CP14/Loadouts/Misc/skeleton_startinggear.yml

@@ -6,6 +6,18 @@
   equipment:
     pants: CP14ClothingPantsLoincloth
 
+- type: startingGear
+  id: CP14MobSkeletonWizardTownRaid
+  equipment:
+    outerClothing: CP14ClothingOuterClothingBoneArmor
+    cloak: CP14ClothingCloakBoneMage
+    head: CP14ClothingHeadTriangularHatGolden
+    shirt: CP14ClothingShirtCottonBlack
+    pants: CP14ClothingPantsBrown
+    shoes: CP14LongLeatherBoots
+    belt: CP14ModularSkeletonSwordUpgrade
+    neck: CP14ModularIronPickaxe
+
 # TIER 1
 
 - type: startingGear
@@ -24,7 +36,7 @@
     outerClothing: CP14ClothingOuterClothingBoneArmor
     cloak: CP14ClothingCloakBone
     pants: CP14ClothingPantsLoincloth
-    belt1: CP14ModularSkeletonSword
+    belt: CP14ModularSkeletonSword
     shoes: CP14ClothingShoesSandals
     head: CP14ClothingHeadMetalHeadband
   inhand:
@@ -35,7 +47,7 @@
   equipment:
     mask: CP14ClothingMaskSinner
     pants: CP14ClothingPantsLoincloth
-    belt1: CP14ModularIronDagger
+    belt: CP14ModularIronDagger
     belt2: CP14ModularIronDagger
 
 - type: startingGear
@@ -44,7 +56,7 @@
     shirt: CP14ClothingWarriorsGarbDress
     pants: CP14ClothingPantsLoincloth
     neck: CP14BowCombat
-    belt1: CP14ClothingBeltQuiverCopperArrow
+    belt: CP14ClothingBeltQuiverCopperArrow
 
 # TIER 2
 
@@ -66,7 +78,7 @@
     cloak: CP14ClothingCloakBone
     mask: CP14ClothingMaskSteelMask
     pants: CP14ClothingPantsLoincloth
-    belt1: CP14ModularSkeletonSwordUpgrade
+    belt: CP14ModularSkeletonSwordUpgrade
     shoes: CP14ClothingShoesSandals
   inhand:
     - CP14BaseShield
@@ -77,7 +89,7 @@
     outerClothing: CP14ClothingOuterClothingBoneArmor
     mask: CP14ClothingMaskBoneHornedMask
     pants: CP14ClothingPantsLoincloth
-    belt1: CP14ModularIronDaggerTundra
+    belt: CP14ModularIronDaggerTundra
     belt2: CP14ModularIronDaggerAgony
     shoes: CP14ClothingShoesSandals
 
@@ -89,7 +101,7 @@
     shirt: CP14ClothingShirtCottonBlack
     pants: CP14ClothingPantsBrown
     neck: CP14BowCombat
-    belt1: CP14ClothingBeltQuiverIronArrow
+    belt: CP14ClothingBeltQuiverIronArrow
     belt2: CP14ModularSkeletonSword
     shoes: CP14LongLeatherBoots
 
@@ -103,9 +115,7 @@
     pants: CP14ClothingPantsBrown
     shoes: CP14LongLeatherBoots
     ring2: CP14ClothingCloakAmuletMana
-    belt1: CP14ModularSkeletonSword
-  inhand:
-    - CP14ManaOperationGlove
+    belt: CP14ModularSkeletonSword
 
 - type: startingGear
   id: CP14MobSkeletonBardT2

Resources/Prototypes/_CP14/Maps/comoss.yml

@@ -21,7 +21,7 @@
             CP14Alchemist: [ 2, 2 ]
             CP14Blacksmith: [ 2, 2 ]
             CP14Innkeeper: [ 3, 4 ]
-            #CP14Merchant: [2, 2]
+            CP14Merchant: [2, 2]
             #Guard
             CP14Guard: [8, 8]
             CP14GuardCommander: [1, 1]

Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml

@@ -32,7 +32,6 @@
     storedOffsetBonus: 0, 5
   - !type:EditModularSlots
     addSlots:
-    - Garde
     - BladeInlay
 
 - type: modularPart

Resources/Prototypes/_CP14/Reagents/target_effects.yml

@@ -25,10 +25,9 @@
       effects:
       - !type:ModifyBleedAmount
         amount: -2
-      - !type:HealthChange
+      - !type:EvenHealthChange
         damage:
-          groups:
-            Brute: -6
+          Brute: -6
   pricePerUnit: 2
 
 - type: reagent

Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Storage/coffins.yml

@@ -11,7 +11,7 @@
             - !type:SnapToGrid
           steps:
             - material: CP14WoodenPlanks
-              amount: 2
+              amount: 3
               doAfter: 2
             - material: CP14Cloth
               amount: 2
@@ -26,7 +26,7 @@
           completed:
             - !type:SpawnPrototype
               prototype: CP14WoodenPlanks1
-              amount: 2
+              amount: 3
             - !type:SpawnPrototype
               prototype: CP14Cloth1
               amount: 2

Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/agaric.yml

@@ -10,9 +10,7 @@
       amount: 1
   products:
     CP14EssencePoison: 0.5
-  cp14RandomProducts:
-  - CP14EssenceWater: 0.5
-  - CP14EssenceEarth: 0.5
+    CP14EssenceEarth: 0.5
 
 # Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions.
 

Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/air_lily.yml

@@ -10,9 +10,7 @@
       amount: 1
   products:
     CP14EssenceAir: 0.5
-  cp14RandomProducts:
-  - CP14EssenceWater: 0.5
-  - CP14EssenceLife: 0.5
+    CP14EssenceWater: 0.5
 
 # Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions.
 

Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/blue_amanita.yml

@@ -10,9 +10,7 @@
       amount: 1
   products:
     CP14EssenceMagic: 0.5
-  cp14RandomProducts:
-  - CP14EssenceWater: 0.5
-  - CP14EssenceLife: 0.5
+    CP14EssenceWater: 0.5
 
 # Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions.
 

Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/dayflin.yml

@@ -10,9 +10,7 @@
       amount: 1
   products:
     CP14EssenceFire: 0.5
-  cp14RandomProducts:
-  - CP14EssenceLife: 0.5
-  - CP14EssenceMotion: 0.5
+    CP14EssenceMotion: 0.5
 
 # Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions.
 

Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/ground_quartz.yml

@@ -10,9 +10,7 @@
       amount: 1
   products:
     CP14EssenceCrystal: 0.5
-  cp14RandomProducts:
-  - CP14EssenceOrder: 0.5
-  - CP14EssenceChaos: 0.5
+    CP14EssenceOrder: 0.5
 
 # Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions.
 

Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/lumishroom.yml

@@ -10,41 +10,38 @@
       amount: 1
   products:
     CP14EssenceLight: 0.5
-  cp14RandomProducts:
-  - CP14EssenceWater: 0.5
-  - CP14EssenceEarth: 0.5
+    CP14EssenceEarth: 0.5
 
 # Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions.
 
 # Idea: Full randomness
 
-- type: reaction
-  id: CP14LumiMushroomAdmixture
-  minTemp: 500
-  reactants:
-    CP14LumiMushroom:
-      amount: 1
-    CP14BasicEffectEmpty:
-      amount: 1
-  cp14RandomProducts:
-  - CP14BasicEffectHealBrute: 2
-  - CP14BasicEffectDamageBrute: 2
-  - CP14BasicEffectHealHeat: 2
-  - CP14BasicEffectDamageHeat: 2
-  - CP14BasicEffectHealCold: 2
-  - CP14BasicEffectDamageCold: 2
-  - CP14BasicEffectHealPoison: 2
-  - CP14BasicEffectDamagePoison: 2
-  - CP14BasicEffectHealAirloss: 2
-  - CP14BasicEffectDamageAirloss: 2
-  - CP14BasicEffectBloodRestore: 2
-  - CP14BasicEffectBloodAbsorption: 2
-  - CP14BasicEffectSatiateHunger: 2
-  - CP14BasicEffectSatiateThirst: 2
-  - CP14BasicEffectHealMana: 2
-  - CP14BasicEffectDamageMana: 2
-  - CP14BasicEffectSpeedUp: 2
-  - CP14BasicEffectSpeedDown: 2
-  - CP14BasicEffectSleep: 2
-  - CP14BasicEffectUnsleep: 2
-
+#- type: reaction
+#  id: CP14LumiMushroomAdmixture
+#  minTemp: 500
+#  reactants:
+#    CP14LumiMushroom:
+#      amount: 1
+#    CP14BasicEffectEmpty:
+#      amount: 1
+#  cp14RandomProducts:
+#  - CP14BasicEffectHealBrute: 2
+#  - CP14BasicEffectDamageBrute: 2
+#  - CP14BasicEffectHealHeat: 2
+#  - CP14BasicEffectDamageHeat: 2
+#  - CP14BasicEffectHealCold: 2
+#  - CP14BasicEffectDamageCold: 2
+#  - CP14BasicEffectHealPoison: 2
+#  - CP14BasicEffectDamagePoison: 2
+#  - CP14BasicEffectHealAirloss: 2
+#  - CP14BasicEffectDamageAirloss: 2
+#  - CP14BasicEffectBloodRestore: 2
+#  - CP14BasicEffectBloodAbsorption: 2
+#  - CP14BasicEffectSatiateHunger: 2
+#  - CP14BasicEffectSatiateThirst: 2
+#  - CP14BasicEffectHealMana: 2
+#  - CP14BasicEffectDamageMana: 2
+#  - CP14BasicEffectSpeedUp: 2
+#  - CP14BasicEffectSpeedDown: 2
+#  - CP14BasicEffectSleep: 2
+#  - CP14BasicEffectUnsleep: 2

Resources/Prototypes/_CP14/Recipes/Reactions/Thaumaturgy/Precursor/wild_sage.yml

@@ -10,9 +10,7 @@
       amount: 1
   products:
     CP14EssenceEarth: 0.5
-  cp14RandomProducts:
-  - CP14EssenceOrder: 0.5
-  - CP14EssenceChaos: 0.5
+    CP14EssenceOrder: 0.5
 
 # Admixture: By adding raw precursor to a potion with target solutions, we can reduce the amount of empty solution by modifying the target solutions.
 

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

@@ -264,3 +264,14 @@
     protoId: CP14String
     count: 1
   result: CP14LuteInstrument
+
+- type: CP14Recipe
+  id: CP14OpenSign
+  tag: CP14RecipeWorkbench
+  craftTime: 2
+  requirements:
+  - !type:StackGroupResource
+    group: WoodenPlanks
+    count: 2
+  result: CP14OpenSign
+

Resources/Prototypes/_CP14/Roles/Jobs/Artisan/alchemist.yml

@@ -26,7 +26,7 @@
     - CP14EnergyCrystalMedium
     - CP14EnergyCrystalMedium
   equipment:
-    belt1: CP14WalletFilledTest
+    belt: CP14WalletFilledTest
     keys: CP14KeyRingAlchemist
     neck: CP14MagicHealingStaff
 

Resources/Prototypes/_CP14/Roles/Jobs/Artisan/apprentice.yml

@@ -20,5 +20,4 @@
     - CP14EnergyCrystalMedium
   equipment:
     keys: CP14BaseKeyRing
-    belt1: CP14WalletFilledTest
-
+    belt: CP14WalletFilledTest

Resources/Prototypes/_CP14/Roles/Jobs/Artisan/blacksmith.yml

@@ -26,6 +26,5 @@
     - CP14EnergyCrystalMedium
     - CP14EnergyCrystalMedium
   equipment:
-    belt1: CP14WalletFilledTest
+    belt: CP14WalletFilledTest
     keys: CP14KeyRingBlacksmith
-

Resources/Prototypes/_CP14/Roles/Jobs/Artisan/innkeeper.yml

@@ -13,6 +13,5 @@
     back:
     - CP14EnergyCrystalMedium
   equipment:
-    belt1: CP14WalletFilledTest
+    belt: CP14WalletFilledTest
     keys: CP14KeyRingInnkeeper
-

Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard.yml

@@ -15,5 +15,5 @@
   id: CP14GuardGear
   equipment:
     keys: CP14KeyRingGuard
-    belt1: CP14WalletFilledTest
+    belt: CP14WalletFilledTest
 

Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard_commander.yml

@@ -24,5 +24,4 @@
   id: CP14GuardCommanderGear
   equipment:
     keys: CP14KeyRingGuardCommander
-    belt1: CP14WalletFilledTest
-
+    belt: CP14WalletFilledTest

Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml

@@ -15,5 +15,4 @@
     - CP14EnergyCrystalMedium
   equipment:
     keys: CP14BaseKeyRing
-    belt1: CP14WalletFilledTest
-
+    belt: CP14WalletFilledTest

Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/guildmaster.yml

@@ -32,7 +32,7 @@
     back:
     - CP14EnergyCrystalMedium
   equipment:
-    belt1: CP14WalletFilledTest
+    belt: CP14WalletFilledTest
     keys: CP14KeyRingGuildmaster
     belt2: CP14ModularGuildmasterRapier
 

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

@@ -10,6 +10,8 @@
   requirements:
     - !type:OverallPlaytimeRequirement
       time: 3600 # 1 hours
+  special:
+    - !type:CP14AddGlobalReputationSpecial
 
 - type: startingGear
   id: CP14MerchantGear
@@ -18,6 +20,6 @@
     - CP14EnergyCrystalMedium
     - CP14EnergyCrystalMedium
   equipment:
-    belt1: CP14WalletFilledMerchant
+    belt: CP14WalletFilledTest
     keys: CP14KeyRingMerchant
 

Resources/Prototypes/_CP14/Trading/brad_potions.yml

@@ -1,77 +1,21 @@
+
+# Rep 0
+
 - type: cp14TradingPosition
   id: CP14VialSmallHealingBrute
   faction: BradPotions
-  uiPosition: 0, 0
+  uiPosition: 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
+  reputationLevel: 0
+  uiPosition: 1
   icon:
     sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
     state: vial
@@ -79,12 +23,10 @@
     product: CP14VialSmallHealingMana
 
 
-
-
 - type: cp14TradingPosition
   id: CP14VialTiny
   faction: BradPotions
-  uiPosition: 3, 0
+  uiPosition: 3
   icon:
     sprite: _CP14/Objects/Specific/Alchemy/vial_tiny.rsi
     state: vial
@@ -93,83 +35,21 @@
 
 - type: cp14TradingPosition
   id: CP14VialTinyReinforced
-  prerequisite: CP14VialTiny
   priceMarkup: 1
   faction: BradPotions
-  uiPosition: 3, 1
+  uiPosition: 4
   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
+  uiPosition: 6
   icon:
     sprite: _CP14/Objects/Specific/Alchemy/mortar_pestle.rsi
     state: pestle
@@ -180,18 +60,67 @@
   id: CP14Mortar
   priceMarkup: 2
   faction: BradPotions
-  uiPosition: 9, 0
+  uiPosition: 7
   icon:
     sprite: _CP14/Objects/Specific/Alchemy/mortar_pestle.rsi
     state: mortar_base
   service: !type:CP14BuyItemsService
     product: CP14Mortar
 
+# Rep 1
+
+- type: cp14TradingPosition
+  id: CP14VialSmallHealingBlood
+  faction: BradPotions
+  reputationLevel: 1
+  uiPosition: 0
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallHealingBlood
+
+- type: cp14TradingPosition
+  id: CP14VialSmallHealingManaDepletion
+  faction: BradPotions
+  reputationLevel: 1
+  uiPosition: 1
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallHealingManaDepletion
+
+- type: cp14TradingPosition
+  id: CP14VialSmall
+  reputationLevel: 1
+  priceMarkup: 1
+  faction: BradPotions
+  uiPosition: 3
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmall
+
+- type: cp14TradingPosition
+  id: CP14VialSmallReinforced
+  reputationLevel: 1
+  priceMarkup: 2
+  faction: BradPotions
+  uiPosition: 4
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallReinforced
+
 - type: cp14TradingPosition
   id: CP14Dropper
   priceMarkup: 1
+  reputationLevel: 1
   faction: BradPotions
-  uiPosition: 7, 1
+  uiPosition: 6
   icon:
     sprite: _CP14/Objects/Specific/Alchemy/dropper.rsi
     state: dropper
@@ -201,12 +130,107 @@
 - type: cp14TradingPosition
   id: CP14Syringe
   priceMarkup: 2
+  reputationLevel: 1
   faction: BradPotions
-  uiPosition: 8, 1
+  uiPosition: 7
   icon:
     sprite: _CP14/Objects/Specific/Alchemy/syringe.rsi
     state: base
   service: !type:CP14BuyItemsService
     product: CP14Syringe
 
+# Rep 2
 
+- type: cp14TradingPosition
+  id: CP14VialSmallHealingPoison
+  faction: BradPotions
+  reputationLevel: 2
+  uiPosition: 0
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallHealingPoison
+
+- type: cp14TradingPosition
+  id: CP14VialSmallHealingAirloss
+  faction: BradPotions
+  reputationLevel: 2
+  uiPosition: 1
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallHealingAirloss
+
+
+- type: cp14TradingPosition
+  id: CP14VialMedium
+  reputationLevel: 2
+  priceMarkup: 2
+  faction: BradPotions
+  uiPosition: 3
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_medium.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialMedium
+
+- type: cp14TradingPosition
+  id: CP14VialMediumReinforced
+  reputationLevel: 2
+  priceMarkup: 3
+  faction: BradPotions
+  uiPosition: 4
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_medium.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialMediumReinforced
+
+- type: cp14TradingPosition
+  id: CP14Cauldron
+  priceMarkup: 5
+  faction: BradPotions
+  reputationLevel: 2
+  uiPosition: 6
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/cauldron.rsi
+    state: icon
+  service: !type:CP14BuyItemsService
+    product: CP14Cauldron
+
+- type: cp14TradingPosition
+  id: CP14BaseAlchemyBomb
+  faction: BradPotions
+  reputationLevel: 2
+  uiPosition: 7
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14BaseAlchemyBomb
+
+# Rep 3
+
+- type: cp14TradingPosition
+  id: CP14VialSmallSpeedUp
+  faction: BradPotions
+  reputationLevel: 3
+  uiPosition: 0
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallSpeedUp
+
+- type: cp14TradingPosition
+  id: CP14VialSmallRainbow
+  faction: BradPotions
+  reputationLevel: 3
+  uiPosition: 1
+  icon:
+    sprite: _CP14/Objects/Specific/Alchemy/vial_small.rsi
+    state: vial
+  service: !type:CP14BuyItemsService
+    product: CP14VialSmallRainbow

Resources/Prototypes/_CP14/Trading/contracts.yml

@@ -1,8 +1,7 @@
 - type: cp14TradingPosition
   id: CP14TradeContractVictoriaGardens
   faction: ContractGuild
-  uiPosition: 0, 0
-  unlockReputationCost: 1
+  uiPosition: 0
   icon:
     sprite: _CP14/Objects/Specific/Economy/trade_contracts.rsi
     state: victoria_garden
@@ -13,8 +12,7 @@
 - type: cp14TradingPosition
   id: CP14TradeContractBradPotions
   faction: ContractGuild
-  uiPosition: 0, 1
-  unlockReputationCost: 1
+  uiPosition: 1
   icon:
     sprite: _CP14/Objects/Specific/Economy/trade_contracts.rsi
     state: brad_potions
@@ -22,3 +20,35 @@
     product: CP14TradeContractBradPotions
     count: 1
 
+- type: cp14TradingPosition
+  id: CP14TradeContractDwarfMining
+  faction: ContractGuild
+  uiPosition: 2
+  icon:
+    sprite: _CP14/Objects/Specific/Economy/trade_contracts.rsi
+    state: dwarf_mining
+  service: !type:CP14BuyItemsService
+    product: CP14TradeContractDwarfMining
+    count: 1
+
+- type: cp14TradingPosition
+  id: CP14TradeContractThaumaturgy
+  faction: ContractGuild
+  uiPosition: 3
+  icon:
+    sprite: _CP14/Objects/Specific/Economy/trade_contracts.rsi
+    state: magic
+  service: !type:CP14BuyItemsService
+    product: CP14TradeContractThaumaturgy
+    count: 1
+
+- type: cp14TradingPosition
+  id: CP14TradeContractHomeDecor
+  faction: ContractGuild
+  uiPosition: 4
+  icon:
+    sprite: _CP14/Objects/Specific/Economy/trade_contracts.rsi
+    state: house
+  service: !type:CP14BuyItemsService
+    product: CP14TradeContractHomeDecor
+    count: 1

Resources/Prototypes/_CP14/Trading/cozy_house.yml

@@ -0,0 +1,287 @@
+
+# Rep 0
+
+- type: cp14TradingPosition
+  id: CP14Candle
+  faction: HomeDecor
+  uiPosition: 0
+  icon:
+    sprite: Objects/Misc/candles.rsi
+    state: candle-big
+  service: !type:CP14BuyItemsService
+    product: CP14Candle
+
+- type: cp14TradingPosition
+  id: CP14Bell
+  faction: HomeDecor
+  uiPosition: 1
+  icon:
+    sprite: _CP14/Objects/Misc/bell.rsi
+    state: icon
+  service: !type:CP14BuyItemsService
+    product: CP14Bell
+
+- type: cp14TradingPosition
+  id: CP14KeyCopperBlank
+  faction: HomeDecor
+  uiPosition: 3
+  icon:
+    sprite: _CP14/Objects/keys.rsi
+    state: key_copper
+  service: !type:CP14BuyItemsService
+    product: CP14KeyCopperBlank
+
+- type: cp14TradingPosition
+  id: CP14LockCopper
+  faction: HomeDecor
+  uiPosition: 4
+  icon:
+    sprite: _CP14/Objects/keys.rsi
+    state: lock_copper
+  service: !type:CP14BuyItemsService
+    product: CP14LockCopper
+
+
+
+- type: cp14TradingPosition
+  id: CP14WallpaperBlack
+  faction: HomeDecor
+  reputationLevel: 0
+  uiPosition: 6
+  icon:
+    sprite: _CP14/Structures/Wallpaper/icons.rsi
+    state: black
+  service: !type:CP14BuyItemsService
+    product: CP14WallpaperBlack
+
+- type: cp14TradingPosition
+  id: CP14WallpaperGreen
+  faction: HomeDecor
+  reputationLevel: 0
+  uiPosition: 7
+  icon:
+    sprite: _CP14/Structures/Wallpaper/icons.rsi
+    state: green
+  service: !type:CP14BuyItemsService
+    product: CP14WallpaperGreen
+
+- type: cp14TradingPosition
+  id: CP14WallpaperPurple
+  faction: HomeDecor
+  reputationLevel: 0
+  uiPosition: 8
+  icon:
+    sprite: _CP14/Structures/Wallpaper/icons.rsi
+    state: purple
+  service: !type:CP14BuyItemsService
+    product: CP14WallpaperPurple
+
+- type: cp14TradingPosition
+  id: CP14WallpaperRed
+  faction: HomeDecor
+  reputationLevel: 0
+  uiPosition: 9
+  icon:
+    sprite: _CP14/Structures/Wallpaper/icons.rsi
+    state: red
+  service: !type:CP14BuyItemsService
+    product: CP14WallpaperRed
+
+- type: cp14TradingPosition
+  id: CP14WallpaperWhite
+  faction: HomeDecor
+  reputationLevel: 0
+  uiPosition: 10
+  icon:
+    sprite: _CP14/Structures/Wallpaper/icons.rsi
+    state: white
+  service: !type:CP14BuyItemsService
+    product: CP14WallpaperWhite
+
+- type: cp14TradingPosition
+  id: CP14WallpaperWhite2
+  faction: HomeDecor
+  reputationLevel: 0
+  uiPosition: 11
+  icon:
+    sprite: _CP14/Structures/Wallpaper/icons.rsi
+    state: white2
+  service: !type:CP14BuyItemsService
+    product: CP14WallpaperWhite2
+
+- type: cp14TradingPosition
+  id: CP14WallpaperYellow
+  faction: HomeDecor
+  reputationLevel: 0
+  uiPosition: 12
+  icon:
+    sprite: _CP14/Structures/Wallpaper/icons.rsi
+    state: yellow
+  service: !type:CP14BuyItemsService
+    product: CP14WallpaperYellow
+
+- type: cp14TradingPosition
+  id: CP14PottedPlant1
+  faction: HomeDecor
+  reputationLevel: 0
+  uiPosition: 14
+  icon:
+    sprite: _CP14/Structures/Furniture/flowerpots.rsi
+    state: plant1
+  service: !type:CP14BuyItemsService
+    product: CP14PottedPlant1
+
+- type: cp14TradingPosition
+  id: CP14PottedPlant3
+  faction: HomeDecor
+  reputationLevel: 0
+  uiPosition: 15
+  icon:
+    sprite: _CP14/Structures/Furniture/flowerpots.rsi
+    state: plant3
+  service: !type:CP14BuyItemsService
+    product: CP14PottedPlant3
+
+# Rep 1
+
+- type: cp14TradingPosition
+  id: CP14CandleRed
+  faction: HomeDecor
+  reputationLevel: 1
+  uiPosition: 0
+  icon:
+    sprite: Objects/Misc/candles.rsi
+    state: candle-big
+  service: !type:CP14BuyItemsService
+    product: CP14CandleRed
+
+- type: cp14TradingPosition
+  id: CP14CandleBlack
+  faction: HomeDecor
+  reputationLevel: 1
+  uiPosition: 1
+  icon:
+    sprite: Objects/Misc/candles.rsi
+    state: candle-big
+  service: !type:CP14BuyItemsService
+    product: CP14CandleBlack
+
+- type: cp14TradingPosition
+  id: CP14KeyIronBlank
+  faction: HomeDecor
+  reputationLevel: 1
+  uiPosition: 3
+  icon:
+    sprite: _CP14/Objects/keys.rsi
+    state: key_iron
+  service: !type:CP14BuyItemsService
+    product: CP14KeyIronBlank
+
+- type: cp14TradingPosition
+  id: CP14LockIron
+  faction: HomeDecor
+  reputationLevel: 1
+  uiPosition: 4
+  icon:
+    sprite: _CP14/Objects/keys.rsi
+    state: lock_iron
+  service: !type:CP14BuyItemsService
+    product: CP14LockIron
+
+
+
+- type: cp14TradingPosition
+  id: CP14WallpaperBank
+  faction: HomeDecor
+  priceMarkup: 5
+  reputationLevel: 1
+  uiPosition: 6
+  icon:
+    sprite: _CP14/Structures/Wallpaper/icons.rsi
+    state: bank
+  service: !type:CP14BuyItemsService
+    product: CP14WallpaperBank
+
+- type: cp14TradingPosition
+  id: CP14WallpaperBank2
+  faction: HomeDecor
+  priceMarkup: 5
+  reputationLevel: 1
+  uiPosition: 7
+  icon:
+    sprite: _CP14/Structures/Wallpaper/icons.rsi
+    state: bank2
+  service: !type:CP14BuyItemsService
+    product: CP14WallpaperBank2
+
+
+
+- type: cp14TradingPosition
+  id: CP14PottedPlant2
+  faction: HomeDecor
+  reputationLevel: 1
+  uiPosition: 14
+  icon:
+    sprite: _CP14/Structures/Furniture/flowerpots.rsi
+    state: plant2
+  service: !type:CP14BuyItemsService
+    product: CP14PottedPlant2
+
+- type: cp14TradingPosition
+  id: CP14PottedPlant4
+  faction: HomeDecor
+  reputationLevel: 1
+  uiPosition: 15
+  icon:
+    sprite: _CP14/Structures/Furniture/flowerpots.rsi
+    state: plant4
+  service: !type:CP14BuyItemsService
+    product: CP14PottedPlant4
+
+# Rep 2
+
+- type: cp14TradingPosition
+  id: CP14KeyGoldBlank
+  faction: HomeDecor
+  reputationLevel: 2
+  uiPosition: 3
+  icon:
+    sprite: _CP14/Objects/keys.rsi
+    state: key_gold
+  service: !type:CP14BuyItemsService
+    product: CP14KeyGoldBlank
+
+- type: cp14TradingPosition
+  id: CP14LockGold
+  faction: HomeDecor
+  reputationLevel: 2
+  uiPosition: 4
+  icon:
+    sprite: _CP14/Objects/keys.rsi
+    state: lock_gold
+  service: !type:CP14BuyItemsService
+    product: CP14LockGold
+
+# Rep 3
+
+- type: cp14TradingPosition
+  id: CP14KeyMithrilBlank
+  faction: HomeDecor
+  reputationLevel: 3
+  uiPosition: 3
+  icon:
+    sprite: _CP14/Objects/keys.rsi
+    state: key_mithril
+  service: !type:CP14BuyItemsService
+    product: CP14KeyMithrilBlank
+
+- type: cp14TradingPosition
+  id: CP14LockMithril
+  faction: HomeDecor
+  reputationLevel: 3
+  uiPosition: 4
+  icon:
+    sprite: _CP14/Objects/keys.rsi
+    state: lock_mithril
+  service: !type:CP14BuyItemsService
+    product: CP14LockMithril

Resources/Prototypes/_CP14/Trading/dwarf_mining.yml

@@ -0,0 +1,138 @@
+
+# Rep 0
+
+- type: cp14TradingPosition
+  id: CP14OreCopper5
+  faction: DwarfMining
+  uiPosition: 0
+  icon:
+    sprite: _CP14/Objects/Materials/copper_ore.rsi
+    state: ore2
+  service: !type:CP14BuyItemsService
+    product: CP14OreCopper5
+
+- type: cp14TradingPosition
+  id: CP14CopperBar5
+  faction: DwarfMining
+  priceMarkup: 5
+  uiPosition: 4
+  icon:
+    sprite: _CP14/Objects/Materials/copper_bar.rsi
+    state: bar_2
+  service: !type:CP14BuyItemsService
+    product: CP14CopperBar5
+
+- type: cp14TradingPosition
+  id: CP14GlassSheet5
+  faction: DwarfMining
+  uiPosition: 5
+  icon:
+    sprite: _CP14/Objects/Materials/glass.rsi
+    state: glass_2
+  service: !type:CP14BuyItemsService
+    product: CP14GlassSheet5
+
+- type: cp14TradingPosition
+  id: CP14Torch
+  faction: DwarfMining
+  uiPosition: 7
+  icon:
+    sprite: _CP14/Objects/Tools/torch.rsi
+    state: torch-unlit
+  service: !type:CP14BuyItemsService
+    product: CP14Torch
+
+- type: cp14TradingPosition
+  id: CP14ModularIronPickaxe
+  faction: DwarfMining
+  priceMarkup: 15
+  uiPosition: 8
+  icon:
+    sprite: _CP14/Objects/ModularTools/Blade/Pickaxe/metall_pickaxe.rsi
+    state: tool
+  service: !type:CP14BuyItemsService
+    product: CP14ModularIronPickaxe
+
+- type: cp14TradingPosition
+  id: CP14ModularIronShovel
+  faction: DwarfMining
+  priceMarkup: 10
+  uiPosition: 9
+  icon:
+    sprite: _CP14/Objects/ModularTools/Blade/Shovel/metall_shovel.rsi
+    state: tool
+  service: !type:CP14BuyItemsService
+    product: CP14ModularIronShovel
+
+# Rep 1
+
+- type: cp14TradingPosition
+  id: CP14OreIron5
+  faction: DwarfMining
+  reputationLevel: 1
+  uiPosition: 0
+  icon:
+    sprite: _CP14/Objects/Materials/iron_ore.rsi
+    state: ore2
+  service: !type:CP14BuyItemsService
+    product: CP14OreIron5
+
+- type: cp14TradingPosition
+  id: CP14IronBar5
+  faction: DwarfMining
+  reputationLevel: 1
+  priceMarkup: 5
+  uiPosition: 4
+  icon:
+    sprite: _CP14/Objects/Materials/iron_bar.rsi
+    state: bar_2
+  service: !type:CP14BuyItemsService
+    product: CP14IronBar5
+
+# Rep 2
+
+- type: cp14TradingPosition
+  id: CP14OreGold5
+  faction: DwarfMining
+  reputationLevel: 2
+  uiPosition: 0
+  icon:
+    sprite: _CP14/Objects/Materials/gold_ore.rsi
+    state: ore2
+  service: !type:CP14BuyItemsService
+    product: CP14OreGold5
+
+- type: cp14TradingPosition
+  id: CP14OreMithril5
+  faction: DwarfMining
+  reputationLevel: 2
+  uiPosition: 1
+  icon:
+    sprite: _CP14/Objects/Materials/mithril_ore.rsi
+    state: ore2
+  service: !type:CP14BuyItemsService
+    product: CP14OreMithril5
+
+- type: cp14TradingPosition
+  id: CP14GoldBar5
+  faction: DwarfMining
+  reputationLevel: 2
+  priceMarkup: 5
+  uiPosition: 4
+  icon:
+    sprite: _CP14/Objects/Materials/gold_bar.rsi
+    state: bar_2
+  service: !type:CP14BuyItemsService
+    product: CP14GoldBar5
+
+- type: cp14TradingPosition
+  id: CP14MithrilBar5
+  faction: DwarfMining
+  reputationLevel: 2
+  priceMarkup: 5
+  uiPosition: 5
+  icon:
+    sprite: _CP14/Objects/Materials/mithril_bar.rsi
+    state: bar_2
+  service: !type:CP14BuyItemsService
+    product: CP14MithrilBar5

Resources/Prototypes/_CP14/Trading/factions.yml

@@ -5,9 +5,25 @@
 
 - type: cp14TradingFaction
   id: VictoriaGardens
+  color: "#67db67"
   name: cp14-trade-faction-victoria-gardens
 
 - type: cp14TradingFaction
   id: BradPotions
+  color: "#ad67db"
   name: cp14-trade-faction-brad-potions
 
+- type: cp14TradingFaction
+  id: DwarfMining
+  color: "#b05a3e"
+  name: cp14-trade-faction-dwarf-mining
+
+- type: cp14TradingFaction
+  id: Thaumaturgy
+  color: "#a43ae0"
+  name: cp14-trade-faction-thaumaturgy
+
+- type: cp14TradingFaction
+  id: HomeDecor
+  color: "#95f542"
+  name: cp14-trade-faction-home-decor

Resources/Prototypes/_CP14/Trading/thaumaturgy.yml

@@ -0,0 +1,258 @@
+
+# Rep 0
+
+- type: cp14TradingPosition
+  id: CP14EnergyCrystalMediumEmpty
+  faction: Thaumaturgy
+  uiPosition: 0
+  icon:
+    sprite: _CP14/Objects/Specific/Thaumaturgy/crystal.rsi
+    state: medium
+  service: !type:CP14BuyItemsService
+    product: CP14EnergyCrystalMediumEmpty
+
+- type: cp14TradingPosition
+  id: CP14Paper
+  faction: Thaumaturgy
+  reputationLevel: 0
+  uiPosition: 2
+  icon:
+    sprite: _CP14/Objects/Bureaucracy/paper.rsi
+    state: paper
+  service: !type:CP14BuyItemsService
+    product: CP14Paper
+
+- type: cp14TradingPosition
+  id: CP14PenFeather
+  faction: Thaumaturgy
+  reputationLevel: 0
+  uiPosition: 3
+  icon:
+    sprite: _CP14/Objects/Bureaucracy/pens.rsi
+    state: feather
+  service: !type:CP14BuyItemsService
+    product: CP14PenFeather
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollShadowGrab
+  faction: Thaumaturgy
+  priceMarkup: 5
+  reputationLevel: 0
+  uiPosition: 6
+  icon:
+    sprite: _CP14/Actions/Spells/dimension.rsi
+    state: shadow_grab
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollShadowGrab
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollFlameCreation
+  faction: Thaumaturgy
+  reputationLevel: 0
+  uiPosition: 8
+  icon:
+    sprite: _CP14/Actions/Spells/fire.rsi
+    state: flame_creation
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollFlameCreation
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollBloodPurification
+  faction: Thaumaturgy
+  reputationLevel: 0
+  uiPosition: 9
+  icon:
+    sprite: _CP14/Actions/Spells/healing.rsi
+    state: cure_poison
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollBloodPurification
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollSheepPolymorph
+  faction: Thaumaturgy
+  reputationLevel: 0
+  uiPosition: 10
+  icon:
+    sprite: _CP14/Actions/Spells/misc.rsi
+    state: polymorph
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollSheepPolymorph
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollSearchOfLife
+  faction: Thaumaturgy
+  reputationLevel: 0
+  uiPosition: 11
+  icon:
+    sprite: _CP14/Actions/Spells/light.rsi
+    state: search_of_life
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollSearchOfLife
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollSphereOfLight
+  faction: Thaumaturgy
+  reputationLevel: 0
+  uiPosition: 12
+  icon:
+    sprite: _CP14/Actions/Spells/light.rsi
+    state: sphere_of_light
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollSphereOfLight
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollWaterCreation
+  faction: Thaumaturgy
+  reputationLevel: 0
+  uiPosition: 14
+  icon:
+    sprite: _CP14/Actions/Spells/water.rsi
+    state: water_creation
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollWaterCreation
+
+# Rep 1
+
+- type: cp14TradingPosition
+  id: CP14ManaOperationGlove
+  faction: Thaumaturgy
+  reputationLevel: 1
+  uiPosition: 0
+  icon:
+    sprite: _CP14/Objects/Specific/Thaumaturgy/powerline_gauntlet.rsi
+    state: icon
+  service: !type:CP14BuyItemsService
+    product: CP14ManaOperationGlove
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollDemiplaneInfiltration
+  priceMarkup: 5 #Unique trade spells
+  faction: Thaumaturgy
+  reputationLevel: 1
+  uiPosition: 6
+  icon:
+    sprite: _CP14/Actions/Spells/dimension.rsi
+    state: rift_arrow
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollDemiplaneInfiltration
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollEarthWall
+  faction: Thaumaturgy
+  priceMarkup: 2
+  reputationLevel: 1
+  uiPosition: 7
+  icon:
+    sprite: _CP14/Actions/Spells/earth.rsi
+    state: earth_wall
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollEarthWall
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollCureBurn
+  faction: Thaumaturgy
+  reputationLevel: 1
+  uiPosition: 9
+  icon:
+    sprite: _CP14/Actions/Spells/healing.rsi
+    state: cure_burn
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollCureBurn
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollCureWounds
+  faction: Thaumaturgy
+  reputationLevel: 1
+  uiPosition: 10
+  icon:
+    sprite: _CP14/Actions/Spells/healing.rsi
+    state: cure_wounds
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollCureWounds
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollFlashLight
+  faction: Thaumaturgy
+  reputationLevel: 1
+  uiPosition: 11
+  icon:
+    sprite: _CP14/Actions/Spells/light.rsi
+    state: flash_light
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollFlashLight
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollMagicSplitting
+  faction: Thaumaturgy
+  reputationLevel: 1
+  uiPosition: 13
+  icon:
+    sprite: _CP14/Actions/Spells/meta.rsi
+    state: counter_spell
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollMagicSplitting
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollIceShards
+  faction: Thaumaturgy
+  reputationLevel: 1
+  uiPosition: 14
+  icon:
+    sprite: _CP14/Actions/Spells/water.rsi
+    state: ice_shards
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollIceShards
+
+# Rep 2
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollFireball
+  faction: Thaumaturgy
+  reputationLevel: 2
+  priceMarkup: 5
+  uiPosition: 8
+  icon:
+    sprite: _CP14/Actions/Spells/fire.rsi
+    state: fireball
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollFireball
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollBeerCreation
+  faction: Thaumaturgy
+  priceMarkup: 5
+  reputationLevel: 2
+  uiPosition: 14
+  icon:
+    sprite: _CP14/Actions/Spells/water.rsi
+    state: beer_creation
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollBeerCreation
+
+# Rep 3
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollResurrection
+  faction: Thaumaturgy
+  reputationLevel: 3
+  priceMarkup: 5
+  uiPosition: 9
+  icon:
+    sprite: _CP14/Actions/Spells/necromancy.rsi
+    state: resurrection
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollResurrection
+
+# Rep 4
+
+- type: cp14TradingPosition
+  id: CP14SpellScrollShadowStep
+  priceMarkup: 15 #Unique trade spells
+  faction: Thaumaturgy
+  reputationLevel: 4
+  uiPosition: 6
+  icon:
+    sprite: _CP14/Actions/Spells/dimension.rsi
+    state: shadow_step
+  service: !type:CP14BuyItemsService
+    product: CP14SpellScrollShadowStep

Resources/Prototypes/_CP14/Trading/victoria_gardens.yml

@@ -1,7 +1,9 @@
+# Rep 0
+
 - type: cp14TradingPosition
   id: CP14FoodCabbage
   faction: VictoriaGardens
-  uiPosition: 0, 0
+  uiPosition: 0
   icon:
     sprite: _CP14/Objects/Flora/Farm/cabbage.rsi
     state: base1
@@ -9,21 +11,10 @@
     product: CP14FoodCabbage
     count: 3
 
-- type: cp14TradingPosition
-  id: CP14FoodPumpkin
-  faction: VictoriaGardens
-  uiPosition: 0, 1
-  icon:
-    sprite: _CP14/Objects/Flora/Farm/pumpkin.rsi
-    state: base1
-  service: !type:CP14BuyItemsService
-    product: CP14FoodPumpkin
-    count: 3
-
 - type: cp14TradingPosition
   id: CP14FoodPotato
   faction: VictoriaGardens
-  uiPosition: 0, 2
+  uiPosition: 1
   icon:
     sprite: _CP14/Objects/Flora/Farm/potato.rsi
     state: base1
@@ -34,7 +25,7 @@
 - type: cp14TradingPosition
   id: CP14FoodCucumber
   faction: VictoriaGardens
-  uiPosition: 0, 3
+  uiPosition: 2
   icon:
     sprite: _CP14/Objects/Flora/Farm/cucumber.rsi
     state: base1
@@ -45,7 +36,7 @@
 - type: cp14TradingPosition
   id: CP14FoodTomatoes
   faction: VictoriaGardens
-  uiPosition: 1, 0
+  uiPosition: 3
   icon:
     sprite: _CP14/Objects/Flora/Farm/tomatoes.rsi
     state: base1
@@ -53,21 +44,10 @@
     product: CP14FoodTomatoes
     count: 3
 
-- type: cp14TradingPosition
-  id: CP14FoodApple
-  faction: VictoriaGardens
-  uiPosition: 1, 1
-  icon:
-    sprite: _CP14/Objects/Flora/Farm/apple.rsi
-    state: base1
-  service: !type:CP14BuyItemsService
-    product: CP14FoodApple
-    count: 3
-
 - type: cp14TradingPosition
   id: CP14FoodPepper
   faction: VictoriaGardens
-  uiPosition: 1, 2
+  uiPosition: 4
   icon:
     sprite: _CP14/Objects/Flora/Farm/pepper.rsi
     state: base1
@@ -78,7 +58,7 @@
 - type: cp14TradingPosition
   id: CP14FoodOnion
   faction: VictoriaGardens
-  uiPosition: 1, 3
+  uiPosition: 5
   icon:
     sprite: _CP14/Objects/Flora/Farm/onion.rsi
     state: base1
@@ -86,3 +66,28 @@
     product: CP14FoodOnion
     count: 3
 
+# Rep 1
+
+- type: cp14TradingPosition
+  id: CP14FoodApple
+  faction: VictoriaGardens
+  reputationLevel: 1
+  uiPosition: 0
+  icon:
+    sprite: _CP14/Objects/Flora/Farm/apple.rsi
+    state: base1
+  service: !type:CP14BuyItemsService
+    product: CP14FoodApple
+    count: 3
+
+- type: cp14TradingPosition
+  id: CP14FoodPumpkin
+  faction: VictoriaGardens
+  reputationLevel: 1
+  uiPosition: 1
+  icon:
+    sprite: _CP14/Objects/Flora/Farm/pumpkin.rsi
+    state: base1
+  service: !type:CP14BuyItemsService
+    product: CP14FoodPumpkin
+    count: 3

Resources/Prototypes/_CP14/UniqueLoot/demiplane_loot.yml

@@ -49,3 +49,8 @@
   tags:
   - CP14UniqueSpawnDemiplanetLoot
 
+- type: uniqueSpawn
+  id: CP14LockpickSkeletonArtifact
+  entity: CP14LockpickSkeletonArtifact
+  tags:
+  - CP14UniqueSpawnDemiplanetLoot