Knowledge system (#770)

* remove all requirements * clean up and renaming to knowledge * update code * add admin knowledge verbs * move shoes under pants * knowledge based recipes * clean up * sewing knowledges * knowledge dependencies * knowledge learning objects * more knowledge * metallforging skill * knowledge books * start knowledges, T1 and T2 books in demiplanes * remove coins from demiplanes * roundstart knowledge
2025-01-17 00:08:13 +03:00
parent 5af56d4655
commit 0783eb1380
59 changed files with 1002 additions and 685 deletions
--- a/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/demiplane.yml
+++ b/Resources/Prototypes/_CP14/Entities/Markers/Spawners/Random/Loot/demiplane.yml
@@ -24,16 +24,6 @@
    - !type:GroupSelector
      weight: 75
      children:
-      - !type:GroupSelector
-        children:
-        - id: CP14SilverCoin1
-          weight: 0.1
-        - id: CP14CopperCoin
-          weight: 0.1
-        - id: CP14CopperCoin5
-          weight: 0.5
-        - id: CP14CopperCoin1
-          weight: 1
      - !type:GroupSelector
        children:
        - id: CP14SpellScrollIceShards
@@ -69,6 +59,10 @@
        - id: CP14VialSmallBlueAmanita
        - id: CP14VialTinyChromiumSlime
        - id: CP14VialTinyLumiMushroom
+      - !type:GroupSelector
+        children:
+        - id: CP14BookKnowledgeClothingSewing
+        - id: CP14BookKnowledgeWallpaperCraft
      - id: CP14SilverCoin5
      - id: CP14BaseLockpick
      - id: CP14EnergyCrystalMediumEmpty
@@ -109,21 +103,15 @@
      - !type:NestedSelector
        tableId: CP14TableDemiplaneLootT1
        weight: 0.25
-      # Coins
-      - !type:GroupSelector
-        children:
-        - id: CP14SilverCoin5
-          weight: 0.1
-        - id: CP14SilverCoin1
-          weight: 0.3
-        - id: CP14CopperCoin5
-          weight: 0.5
      - !type:GroupSelector
        children:
        - id: CP14SpellScrollShadowStep
        - id: CP14SpellScrollFireball
        - id: CP14SpellScrollBeerCreation
          weight: 0.2
+      - !type:GroupSelector
+        children:
+        - id: CP14BookKnowledgeAdvancedClothingSewing
      - id: CP14EnergyCrystalMediumEmpty
    # Rare
    - !type:GroupSelector
--- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/skeleton.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/skeleton.yml
@@ -11,10 +11,6 @@
  - type: Loadout
    prototypes: 
    - CP14MobSkeleton
-  - type: CP14SkillsStorage
-  - type: CP14AutoAddSkill
-    skills:
-    - Warcraft

 - type: entity
  id: CP14MobUndeadSkeletonCloset
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml
@@ -26,6 +26,7 @@
      sprite: Mobs/Customization/masking_helpers.rsi
      state: unisex_full
      visible: false
+    - map: [ "shoes" ]
    - map: [ "shirt" ]
    - map: [ "pants" ]
    - map: [ "enum.HumanoidVisualLayers.LFoot" ]
@@ -33,7 +34,6 @@
    - map: [ "enum.HumanoidVisualLayers.LHand" ]
    - map: [ "enum.HumanoidVisualLayers.RHand" ]
    - map: [ "gloves" ]
-    - map: [ "shoes" ]
    - map: [ "ears" ]
    - map: [ "cloak" ]
    - map: [ "eyes" ]
@@ -311,7 +311,7 @@
        Asphyxiation: -1.0
  - type: FireVisuals
    alternateState: Standing #TODO - custom visuals
-  - type: CP14SkillsStorage
+  - type: CP14KnowledgeStorage

 - type: entity
  save: false
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml
@@ -24,6 +24,7 @@
      sprite: Mobs/Customization/masking_helpers.rsi
      state: unisex_full
      visible: false
+    - map: [ "shoes" ]
    - map: [ "shirt" ]
    - map: [ "pants" ]
    - map: [ "enum.HumanoidVisualLayers.LFoot" ]
@@ -33,7 +34,6 @@
    - map: [ "enum.HumanoidVisualLayers.HeadSide" ] # Bark Before clothing
    - map: [ "enum.HumanoidVisualLayers.HeadTop" ] # Bark Before clothing
    - map: [ "gloves" ]
-    - map: [ "shoes" ]
    - map: [ "ears" ]
    - map: [ "cloak" ]
    - map: [ "eyes" ]
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml
@@ -18,6 +18,7 @@
    - map: [ "enum.HumanoidVisualLayers.LArm" ]
    - map: [ "enum.HumanoidVisualLayers.RLeg" ]
    - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+    - map: [ "shoes" ]
    - map: [ "shirt" ]
    - map: [ "pants" ]
    - map: [ "enum.HumanoidVisualLayers.LFoot" ]
@@ -25,7 +26,6 @@
    - map: [ "enum.HumanoidVisualLayers.LHand" ]
    - map: [ "enum.HumanoidVisualLayers.RHand" ]
    - map: [ "gloves" ]
-    - map: [ "shoes" ]
    - map: [ "ears" ]
    - map: [ "cloak" ]
    - map: [ "eyes" ]
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/zombie.yml
@@ -19,6 +19,7 @@
    - map: [ "enum.HumanoidVisualLayers.LArm" ]
    - map: [ "enum.HumanoidVisualLayers.RLeg" ]
    - map: [ "enum.HumanoidVisualLayers.LLeg" ]
+    - map: [ "shoes" ]
    - map: [ "shirt" ]
    - map: [ "pants" ]
    - map: [ "enum.HumanoidVisualLayers.LFoot" ]
@@ -26,7 +27,6 @@
    - map: [ "enum.HumanoidVisualLayers.LHand" ]
    - map: [ "enum.HumanoidVisualLayers.RHand" ]
    - map: [ "gloves" ]
-    - map: [ "shoes" ]
    - map: [ "ears" ]
    - map: [ "cloak" ]
    - map: [ "eyes" ]
--- a/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/knowledge_books.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/knowledge_books.yml
@@ -0,0 +1,81 @@
+- type: entity
+  parent: BookRandom
+  id: CP14BookKnowledgeBase
+  abstract: true
+  categories: [ ForkFiltered ]
+  name: knowledge book 
+  description: This book holds valuable knowledge that you can learn... if you're ready for it. 
+  components:
+  - type: CP14KnowledgePaperText
+
+#TODO: Уникальный визуал каждой книжке
+
+# T0
+
+- type: entity
+  parent: CP14BookKnowledgeBase
+  id: CP14BookKnowledgeWoodWork
+  suffix: Wood Work
+  components:
+  - type: CP14KnowledgeLearningSource
+    knowledges:
+    - WoodWork
+
+- type: entity
+  parent: CP14BookKnowledgeBase
+  id: CP14BookKnowledgeMetallMelting
+  suffix: Metall Melting
+  components:
+  - type: CP14KnowledgeLearningSource
+    knowledges:
+    - MetallMelting
+
+- type: entity
+  parent: CP14BookKnowledgeBase
+  id: CP14BookKnowledgeMetallForging
+  suffix: Metall Forging
+  components:
+  - type: CP14KnowledgeLearningSource
+    knowledges:
+    - MetallForging
+
+- type: entity
+  parent: CP14BookKnowledgeBase
+  id: CP14BookKnowledgeGlasswork
+  suffix: Glasswork
+  components:
+  - type: CP14KnowledgeLearningSource
+    knowledges:
+    - Glasswork
+
+# T1
+
+- type: entity
+  parent: CP14BookKnowledgeBase
+  id: CP14BookKnowledgeClothingSewing
+  suffix: Clothing Sewing
+  components:
+  - type: CP14KnowledgeLearningSource
+    knowledges:
+    - ClothingSewing
+
+- type: entity
+  parent: CP14BookKnowledgeBase
+  id: CP14BookKnowledgeWallpaperCraft
+  suffix: Wallpaper Craft
+  components:
+  - type: CP14KnowledgeLearningSource
+    knowledges:
+    - WallpaperCraft
+
+# T2
+
+- type: entity
+  parent: CP14BookKnowledgeBase
+  id: CP14BookKnowledgeAdvancedClothingSewing
+  suffix: Advanced Clothing Sewing
+  components:
+  - type: CP14KnowledgeLearningSource
+    knowledges:
+    - AdvancedClothingSewing
+ 
--- a/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/tools.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Specific/Alchemy/tools.yml
@@ -87,10 +87,6 @@
    sprite: _CP14/Objects/Specific/Alchemy/mortar_pestle.rsi
    state: pestle
  - type: CP14Pestle
-  - type: CP14SkillRequirement
-    fuckupChance: 0.05
-    requiredSkills:
-    - Alchemy
  - type: GuideHelp
    guides:
    - CP14_RU_Alchemy
--- a/Resources/Prototypes/_CP14/Entities/Objects/Tools/sharpening_stone.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Tools/sharpening_stone.yml
@@ -25,9 +25,4 @@
      - !type:DoActsBehavior
        acts: ["Destruction"]
  - type: CP14SharpeningStone
-    sharpnessHeal: 0.1
-  - type: CP14SkillRequirement
-    fuckupChance: 0.6
-    requiredSkills:
-    - Warcraft
-    - Blacksmith
+    sharpnessHeal: 0.1
--- a/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleHammer.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Weapons/Melee/battleHammer.yml
@@ -49,10 +49,6 @@
  - type: MeleeThrowOnHit
    lifetime: 0.05
    speed: 5
-  - type: CP14SkillRequirement
-    fuckupChance: 0.5
-    requiredSkills:
-    - Warcraft
  - type: Tool
    qualities:
      - CP14Hammering
--- a/Resources/Prototypes/_CP14/Entities/Structures/Specific/Blacksmith/sharpening_stone.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Specific/Blacksmith/sharpening_stone.yml
@@ -43,9 +43,4 @@
    sharpnessHeal: 0.1
    targetDamage:
      types:
-        blunt: 0.5
-  - type: CP14SkillRequirement
-    fuckupChance: 0.5
-    requiredSkills:
-    - Warcraft
-    - Blacksmith
+        blunt: 0.5
--- a/Resources/Prototypes/_CP14/Knowledge/knowledges.yml
+++ b/Resources/Prototypes/_CP14/Knowledge/knowledges.yml
@@ -0,0 +1,42 @@
+# T0
+
+- type: CP14Knowledge
+  id: WoodWork
+  name: cp14-knowledge-woodwork-name
+  desc: cp14-knowledge-woodwork-desc
+
+- type: CP14Knowledge
+  id: MetallMelting
+  name: cp14-knowledge-metall-melting-name
+  desc: cp14-knowledge-metall-melting-desc
+
+- type: CP14Knowledge
+  id: MetallForging
+  name: cp14-knowledge-metall-forging-name
+  desc: cp14-knowledge-metall-forging-desc
+
+- type: CP14Knowledge
+  id: Glasswork
+  name: cp14-knowledge-glasswork-name
+  desc: cp14-knowledge-glasswork-desc
+
+# T1
+
+- type: CP14Knowledge
+  id: ClothingSewing
+  name: cp14-knowledge-sewing-name
+  desc: cp14-knowledge-sewing-desc
+
+- type: CP14Knowledge
+  id: WallpaperCraft
+  name: cp14-knowledge-wallpaper-name
+  desc: cp14-knowledge-wallpaper-desc
+
+# T2
+
+- type: CP14Knowledge
+  id: AdvancedClothingSewing
+  name: cp14-knowledge-sewing2-name
+  desc: cp14-knowledge-sewing2-desc
+  dependencies:
+  - ClothingSewing
--- a/Resources/Prototypes/_CP14/ModularCraft/Blade/rapier.yml
+++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/rapier.yml
@@ -12,10 +12,6 @@
    - BaseWeaponSharp
  - !type:AddComponents
    components:
-    - type: CP14SkillRequirement
-      fuckupChance: 0.5
-      requiredSkills:
-      - Warcraft
  - !type:EditMeleeWeapon
    newWideAnimation: CP14WeaponArcThrust
    resetOnHandSelected: true # Disable fast swap
--- a/Resources/Prototypes/_CP14/ModularCraft/Blade/sword.yml
+++ b/Resources/Prototypes/_CP14/ModularCraft/Blade/sword.yml
@@ -12,10 +12,6 @@
    - BaseWeaponSharp
  - !type:AddComponents
    components:
-    - type: CP14SkillRequirement
-      fuckupChance: 0.3
-      requiredSkills:
-      - Warcraft
  - !type:EditMeleeWeapon
    resetOnHandSelected: true # Disable fast swap
    bonusRange: 0.2
--- a/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/anvil.yml
@@ -6,6 +6,7 @@
    CP14WoodenPlanks: 2
    CP14IronBar: 2
  result: CP14BaseShield
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14BaseCrowbar
@@ -14,6 +15,7 @@
  stacks:
    CP14IronBar: 2
  result: CP14BaseCrowbar
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14BaseWrench
@@ -22,6 +24,7 @@
  stacks:
    CP14IronBar: 2
  result: CP14BaseWrench
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ClothingCloakCuirass
@@ -30,6 +33,7 @@
  stacks:
    CP14IronBar: 5
  result: CP14ClothingCloakCuirass
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ClothingCloakInfantryCuirass
@@ -38,6 +42,7 @@
  stacks:
    CP14IronBar: 6
  result: CP14ClothingCloakInfantryCuirass
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ClothingCloakCuirassLoincloth
@@ -46,6 +51,7 @@
  stacks:
    CP14IronBar: 6
  result: CP14ClothingCloakCuirassLoincloth
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ClothingCloakCuirassLeg
@@ -54,6 +60,7 @@
  stacks:
    CP14IronBar: 7
  result: CP14ClothingCloakCuirassLeg
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14Nail10
@@ -62,6 +69,7 @@
  stacks:
    CP14IronBar: 2
  result: CP14Nail10
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14CrystalLampBlueEmpty
@@ -71,6 +79,7 @@
    CP14CopperBar: 2
    CP14IronBar: 1
  result: CP14CrystalLampBlueEmpty
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14CrystalLampOrangeEmpty
@@ -80,6 +89,7 @@
    CP14CopperBar: 2
    CP14IronBar: 1
  result: CP14CrystalLampOrangeEmpty
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14Scissors
@@ -88,6 +98,7 @@
  stacks:
    CP14IronBar: 1
  result: CP14Scissors
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ClothingCloakBrassArmor
@@ -96,6 +107,7 @@
  stacks:
    CP14CopperBar: 6
  result: CP14ClothingCloakBrassArmor
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14Crossbolt
@@ -104,6 +116,7 @@
  stacks:
    CP14CopperBar: 1
  result: CP14Crossbolt
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14BaseLockpick
@@ -112,6 +125,7 @@
  stacks:
    CP14IronBar: 1
  result: CP14BaseLockpick
+  knowledgeRequired: MetallForging

 # Dagger

@@ -122,6 +136,7 @@
  stacks:
    CP14IronBar: 1
  result: CP14ModularBladeIronDagger
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularBladeGoldDagger
@@ -130,6 +145,7 @@
  stacks:
    CP14GoldBar: 1
  result: CP14ModularBladeGoldDagger
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularBladeCopperDagger
@@ -138,6 +154,7 @@
  stacks:
    CP14CopperBar: 1
  result: CP14ModularBladeCopperDagger
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularBladeMithrilDagger
@@ -146,6 +163,7 @@
  stacks:
    CP14MithrilBar: 1
  result: CP14ModularBladeMithrilDagger
+  knowledgeRequired: MetallForging

 # Spear

@@ -156,6 +174,7 @@
  stacks:
    CP14IronBar: 1
  result: CP14ModularBladeIronSpear
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularBladeCopperSpear
@@ -164,6 +183,7 @@
  stacks:
    CP14CopperBar: 1
  result: CP14ModularBladeCopperSpear
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularBladeGoldSpear
@@ -172,6 +192,7 @@
  stacks:
    CP14GoldBar: 1
  result: CP14ModularBladeGoldSpear
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularBladeMithrilSpear
@@ -180,6 +201,7 @@
  stacks:
    CP14MithrilBar: 1
  result: CP14ModularBladeMithrilSpear
+  knowledgeRequired: MetallForging

 # Mace

@@ -190,6 +212,7 @@
  stacks:
    CP14IronBar: 1
  result: CP14ModularBladeIronMace
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularBladeGoldMace
@@ -198,6 +221,7 @@
  stacks:
    CP14GoldBar: 1
  result: CP14ModularBladeGoldMace
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularBladeCopperMace
@@ -206,6 +230,7 @@
  stacks:
    CP14CopperBar: 1
  result: CP14ModularBladeCopperMace
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularBladeMithrilMace
@@ -214,6 +239,7 @@
  stacks:
    CP14MithrilBar: 1
  result: CP14ModularBladeMithrilMace
+  knowledgeRequired: MetallForging

 # Sword

@@ -224,6 +250,7 @@
  stacks:
    CP14IronBar: 2
  result: CP14ModularBladeIronSword
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularBladeGoldSword
@@ -232,6 +259,7 @@
  stacks:
    CP14GoldBar: 2
  result: CP14ModularBladeGoldSword
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularBladeCopperSword
@@ -240,6 +268,7 @@
  stacks:
    CP14CopperBar: 2
  result: CP14ModularBladeCopperSword
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularBladeMithrilSword
@@ -248,6 +277,7 @@
  stacks:
    CP14MithrilBar: 2
  result: CP14ModularBladeMithrilSword
+  knowledgeRequired: MetallForging

 # Sickle

@@ -258,6 +288,7 @@
  stacks:
    CP14IronBar: 1
  result: CP14ModularBladeIronSickle
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularBladeCopperSickle
@@ -266,6 +297,7 @@
  stacks:
    CP14CopperBar: 1
  result: CP14ModularBladeCopperSickle
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularBladeGoldSickle
@@ -274,6 +306,7 @@
  stacks:
    CP14GoldBar: 1
  result: CP14ModularBladeGoldSickle
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularBladeMithrilSickle
@@ -282,6 +315,7 @@
  stacks:
    CP14MithrilBar: 1
  result: CP14ModularBladeMithrilSickle
+  knowledgeRequired: MetallForging

 # Shovel

@@ -292,6 +326,7 @@
  stacks:
    CP14IronBar: 1
  result: CP14ModularBladeIronShovel
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularBladeGoldShovel
@@ -300,6 +335,7 @@
  stacks:
    CP14GoldBar: 1
  result: CP14ModularBladeGoldShovel
+  knowledgeRequired: MetallForging


 - type: CP14Recipe
@@ -309,6 +345,7 @@
  stacks:
    CP14CopperBar: 1
  result: CP14ModularBladeCopperShovel
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularBladeMithrilShovel
@@ -317,6 +354,7 @@
  stacks:
    CP14MithrilBar: 1
  result: CP14ModularBladeMithrilShovel
+  knowledgeRequired: MetallForging

 # Pickaxe

@@ -327,6 +365,7 @@
  stacks:
    CP14IronBar: 1
  result: CP14ModularBladeIronPickaxe
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularBladeGoldPickaxe
@@ -335,6 +374,7 @@
  stacks:
    CP14GoldBar: 2
  result: CP14ModularBladeGoldPickaxe
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularBladeCopperPickaxe
@@ -343,6 +383,7 @@
  stacks:
    CP14CopperBar: 2
  result: CP14ModularBladeCopperPickaxe
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularBladeMithrilPickaxe
@@ -351,6 +392,7 @@
  stacks:
    CP14MithrilBar: 1
  result: CP14ModularBladeMithrilPickaxe
+  knowledgeRequired: MetallForging

 # Grip

@@ -361,6 +403,7 @@
  stacks:
    CP14IronBar: 1
  result: CP14ModularGripIron
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularGripCopper
@@ -369,6 +412,7 @@
  stacks:
    CP14CopperBar: 1
  result: CP14ModularGripCopper
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularGripGolden
@@ -377,6 +421,7 @@
  stacks:
    CP14GoldBar: 1
  result: CP14ModularGripGolden
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularGripMithril
@@ -385,6 +430,7 @@
  stacks:
    CP14MithrilBar: 1
  result: CP14ModularGripMithril
+  knowledgeRequired: MetallForging

 # Grip long

@@ -395,6 +441,7 @@
  stacks:
    CP14IronBar: 2
  result: CP14ModularGripIronLong
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularGripCopperLong
@@ -403,6 +450,7 @@
  stacks:
    CP14CopperBar: 2
  result: CP14ModularGripCopperLong
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularGripGoldLong
@@ -411,6 +459,7 @@
  stacks:
    CP14GoldBar: 2
  result: CP14ModularGripGoldLong
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularGripMithrilLong
@@ -419,6 +468,7 @@
  stacks:
    CP14MithrilBar: 2
  result: CP14ModularGripMithrilLong
+  knowledgeRequired: MetallForging

 # Rapier

@@ -429,6 +479,7 @@
  stacks:
    CP14IronBar: 1
  result: CP14ModularBladeIronRapier
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularBladeGoldRapier
@@ -437,6 +488,7 @@
  stacks:
    CP14GoldBar: 1
  result: CP14ModularBladeGoldRapier
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularBladeCopperRapier
@@ -445,6 +497,7 @@
  stacks:
    CP14CopperBar: 1
  result: CP14ModularBladeCopperRapier
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularBladeMithrilRapier
@@ -453,6 +506,7 @@
  stacks:
    CP14MithrilBar: 1
  result: CP14ModularBladeMithrilRapier
+  knowledgeRequired: MetallForging

 # Axe

@@ -463,6 +517,7 @@
  stacks:
    CP14IronBar: 2
  result: CP14ModularBladeIronAxe
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularBladeCopperAxe
@@ -471,6 +526,7 @@
  stacks:
    CP14CopperBar: 2
  result: CP14ModularBladeCopperAxe
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularBladeGoldAxe
@@ -479,6 +535,7 @@
  stacks:
    CP14GoldBar: 2
  result: CP14ModularBladeGoldAxe
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularBladeMithrilAxe
@@ -487,6 +544,7 @@
  stacks:
    CP14MithrilBar: 2
  result: CP14ModularBladeMithrilAxe
+  knowledgeRequired: MetallForging

 # Sharp garde

@@ -497,6 +555,7 @@
  stacks:
    CP14CopperBar: 1
  result: CP14ModularGardeSharpCopper
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularGardeSharpIron
@@ -505,6 +564,7 @@
  stacks:
    CP14IronBar: 1
  result: CP14ModularGardeSharpIron
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularGardeSharpGold
@@ -513,6 +573,7 @@
  stacks:
    CP14GoldBar: 1
  result: CP14ModularGardeSharpGold
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularGardeSharpMithril
@@ -521,6 +582,7 @@
  stacks:
    CP14MithrilBar: 1
  result: CP14ModularGardeSharpMithril
+  knowledgeRequired: MetallForging

 # Sturdy garde

@@ -531,6 +593,7 @@
  stacks:
    CP14CopperBar: 1
  result: CP14ModularGardeSturdyCopper
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularGardeSturdyIron
@@ -539,6 +602,7 @@
  stacks:
    CP14IronBar: 1
  result: CP14ModularGardeSturdyIron
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularGardeSturdyGold
@@ -547,6 +611,7 @@
  stacks:
    CP14GoldBar: 1
  result: CP14ModularGardeSturdyGold
+  knowledgeRequired: MetallForging

 - type: CP14Recipe
  id: CP14ModularGardeSturdyMithril
@@ -554,4 +619,5 @@
  craftTime: 4
  stacks:
    CP14MithrilBar: 1
-  result: CP14ModularGardeSturdyMithril
+  result: CP14ModularGardeSturdyMithril
+  knowledgeRequired: MetallForging
--- a/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml
@@ -5,6 +5,7 @@
  entities:
    CP14OreCopper: 4
  result: CP14CopperBar1
+  knowledgeRequired: MetallMelting

 - type: CP14Recipe
  id: CP14IronBar1
@@ -13,6 +14,7 @@
  entities:
    CP14OreIron: 4
  result: CP14IronBar1
+  knowledgeRequired: MetallMelting

 - type: CP14Recipe
  id: CP14GoldBar1
@@ -21,6 +23,7 @@
  entities:
    CP14OreGold: 4
  result: CP14GoldBar1
+  knowledgeRequired: MetallMelting

 - type: CP14Recipe
  id: CP14MithrilBar1
@@ -29,6 +32,7 @@
  entities:
    CP14OreMithril: 4
  result: CP14MithrilBar1
+  knowledgeRequired: MetallMelting

 - type: CP14Recipe
  id: CP14GlassSheet1
@@ -37,6 +41,7 @@
  entities:
    CP14QuartzShard: 1
  result: CP14GlassSheet1
+  knowledgeRequired: Glasswork

 - type: CP14Recipe
  id: CP14GlassSheetShard1
@@ -45,6 +50,7 @@
  entities:
    CP14GlassShard: 3
  result: CP14GlassSheet1
+  knowledgeRequired: Glasswork

 - type: CP14Recipe
  id: CP14VialTiny
@@ -53,6 +59,7 @@
  stacks:
    CP14GlassSheet: 1
  result: CP14VialTiny
+  knowledgeRequired: Glasswork

 - type: CP14Recipe
  id: CP14VialTinyReinforced
@@ -62,6 +69,7 @@
    CP14CopperBar: 1
    CP14GlassSheet: 1
  result: CP14VialTinyReinforced
+  knowledgeRequired: Glasswork

 - type: CP14Recipe
  id: CP14VialSmall
@@ -70,6 +78,7 @@
  stacks:
    CP14GlassSheet: 2
  result: CP14VialSmall
+  knowledgeRequired: Glasswork

 - type: CP14Recipe
  id: CP14VialSmallReinforced
@@ -79,4 +88,5 @@
    CP14CopperBar: 1
    CP14GlassSheet: 2
  result: CP14VialSmallReinforced
+  knowledgeRequired: Glasswork
  
--- a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml
@@ -8,6 +8,7 @@
  stacks:
    CP14Cloth: 2
  result: CP14ClothingShirtCottonBlue
+  knowledgeRequired: ClothingSewing

 - type: CP14Recipe
  id: CP14ClothingShirtCottonBlack
@@ -19,6 +20,7 @@
  stacks:
    CP14Cloth: 3
  result: CP14ClothingShirtCottonBlack
+  knowledgeRequired: ClothingSewing

 - type: CP14Recipe
  id: CP14ClothingShirtCottonPurple
@@ -30,6 +32,7 @@
  stacks:
    CP14Cloth: 3
  result: CP14ClothingShirtCottonPurple
+  knowledgeRequired: ClothingSewing

 - type: CP14Recipe
  id: CP14ClothingShirtCottonRed
@@ -41,6 +44,7 @@
  stacks:
    CP14Cloth: 3
  result: CP14ClothingShirtCottonRed
+  knowledgeRequired: ClothingSewing

 - type: CP14Recipe
  id: CP14ClothingShirtCottonWhite
@@ -51,6 +55,7 @@
  stacks:
    CP14Cloth: 3
  result: CP14ClothingShirtCottonWhite
+  knowledgeRequired: ClothingSewing

 - type: CP14Recipe
  id: CP14ClothingShirtCottonYellow
@@ -62,6 +67,147 @@
  stacks:
    CP14Cloth: 3
  result: CP14ClothingShirtCottonYellow
+  knowledgeRequired: ClothingSewing
+
+- type: CP14Recipe
+  id: CP14ClothingPantsTrouserWhite
+  tag: CP14RecipeSewing
+  craftTime: 2
+  entities:
+    CP14String: 1
+  stacks:
+    CP14Cloth: 2
+  result: CP14ClothingPantsTrouserWhite
+  knowledgeRequired: ClothingSewing
+
+- type: CP14Recipe
+  id: CP14ClothingPantsTrouserDarkBlue
+  tag: CP14RecipeSewing
+  craftTime: 2
+  entities:
+    CP14String: 1
+    CP14DyeBlue: 1
+  stacks:
+    CP14Cloth: 2
+  result: CP14ClothingPantsTrouserDarkBlue
+  knowledgeRequired: ClothingSewing
+
+- type: CP14Recipe
+  id: CP14ClothingPantsDressBlack
+  tag: CP14RecipeSewing
+  craftTime: 2
+  entities:
+    CP14String: 1
+    CP14DyeBlack: 1
+  stacks:
+    CP14Cloth: 2
+  result: CP14ClothingPantsDressBlack
+  knowledgeRequired: ClothingSewing
+
+- type: CP14Recipe
+  id: CP14ClothingPantsSouthernMagician
+  tag: CP14RecipeSewing
+  craftTime: 2
+  entities:
+    CP14String: 1
+    CP14DyeYellow: 1
+  stacks:
+    CP14Cloth: 2
+  result: CP14ClothingPantsSouthernMagician
+  knowledgeRequired: ClothingSewing
+
+- type: CP14Recipe
+  id: CP14ClothingHeadBeretRed
+  tag: CP14RecipeSewing
+  craftTime: 2
+  entities:
+    CP14String: 1
+    CP14DyeRed: 1
+  stacks:
+    CP14Cloth: 1
+  result: CP14ClothingHeadBeretRed
+  knowledgeRequired: ClothingSewing
+
+- type: CP14Recipe
+  id: CP14ClothingHeadBeretPurple
+  tag: CP14RecipeSewing
+  craftTime: 2
+  entities:
+    CP14String: 1
+    CP14DyePurple: 1
+  stacks:
+    CP14Cloth: 1
+  result: CP14ClothingHeadBeretPurple
+  knowledgeRequired: ClothingSewing
+
+- type: CP14Recipe
+  id: CP14ClothingHeadBeretYellow
+  tag: CP14RecipeSewing
+  craftTime: 2
+  entities:
+    CP14String: 1
+    CP14DyeYellow: 1
+  stacks:
+    CP14Cloth: 1
+  result: CP14ClothingHeadBeretYellow
+  knowledgeRequired: ClothingSewing
+
+- type: CP14Recipe
+  id: CP14ClothingHeadBeretBlue
+  tag: CP14RecipeSewing
+  craftTime: 2
+  entities:
+    CP14String: 1
+    CP14DyeBlue: 1
+  stacks:
+    CP14Cloth: 1
+  result: CP14ClothingHeadBeretBlue
+  knowledgeRequired: ClothingSewing
+
+- type: CP14Recipe
+  id: CP14ClothingHeadBeretBlack
+  tag: CP14RecipeSewing
+  craftTime: 2
+  entities:
+    CP14String: 1
+    CP14DyeBlack: 1
+  stacks:
+    CP14Cloth: 1
+  result: CP14ClothingHeadBeretBlack
+  knowledgeRequired: ClothingSewing
+
+- type: CP14Recipe
+  id: CP14ClothingHeadBandanaWhite
+  tag: CP14RecipeSewing
+  craftTime: 2
+  entities:
+    CP14String: 1
+  stacks:
+    CP14Cloth: 2
+  result: CP14ClothingHeadBandanaWhite
+  knowledgeRequired: ClothingSewing
+
+- type: CP14Recipe
+  id: CP14ClothingHeadBandanaYellow
+  tag: CP14RecipeSewing
+  craftTime: 2
+  entities:
+    CP14String: 1
+    CP14DyeYellow: 1
+  stacks:
+    CP14Cloth: 2
+  result: CP14ClothingHeadBandanaYellow
+  knowledgeRequired: ClothingSewing
+
+- type: CP14Recipe
+  id: CP14ClothingHeadWreath
+  tag: CP14RecipeSewing
+  craftTime: 2
+  entities:
+    CP14BloodFlower: 2
+    CP14Dayflin: 2
+  result: CP14ClothingHeadWreath
+  knowledgeRequired: ClothingSewing

 - type: CP14Recipe
  id: CP14ClothingShirtMercenary
@@ -74,6 +220,7 @@
  stacks:
    CP14Cloth: 3
  result: CP14ClothingShirtMercenary
+  knowledgeRequired: AdvancedClothingSewing

 - type: CP14Recipe
  id: CP14ClothingShirtYellowWizard
@@ -87,137 +234,7 @@
  stacks:
    CP14Cloth: 3
  result: CP14ClothingShirtYellowWizard
-
- type: CP14Recipe
-  id: CP14ClothingPantsTrouserWhite
-  tag: CP14RecipeSewing
-  craftTime: 2
-  entities:
-    CP14String: 1
-  stacks:
-    CP14Cloth: 2
-  result: CP14ClothingPantsTrouserWhite
-
- type: CP14Recipe
-  id: CP14ClothingPantsTrouserDarkBlue
-  tag: CP14RecipeSewing
-  craftTime: 2
-  entities:
-    CP14String: 1
-    CP14DyeBlue: 1
-  stacks:
-    CP14Cloth: 2
-  result: CP14ClothingPantsTrouserDarkBlue
-
- type: CP14Recipe
-  id: CP14ClothingPantsDressBlack
-  tag: CP14RecipeSewing
-  craftTime: 2
-  entities:
-    CP14String: 1
-    CP14DyeBlack: 1
-  stacks:
-    CP14Cloth: 2
-  result: CP14ClothingPantsDressBlack
-
- type: CP14Recipe
-  id: CP14ClothingPantsSouthernMagician
-  tag: CP14RecipeSewing
-  craftTime: 2
-  entities:
-    CP14String: 1
-    CP14DyeYellow: 1
-  stacks:
-    CP14Cloth: 2
-  result: CP14ClothingPantsSouthernMagician
-
- type: CP14Recipe
-  id: CP14ClothingPantsMercenaryTrousers
-  tag: CP14RecipeSewing
-  craftTime: 2
-  entities:
-    CP14String: 1
-    CP14DyeBlue: 1
-    CP14DyeRed: 1
-  stacks:
-    CP14Cloth: 2
-  result: CP14ClothingPantsMercenaryTrousers
-
- type: CP14Recipe
-  id: CP14ClothingHeadBeretRed
-  tag: CP14RecipeSewing
-  craftTime: 2
-  entities:
-    CP14String: 1
-    CP14DyeRed: 1
-  stacks:
-    CP14Cloth: 1
-  result: CP14ClothingHeadBeretRed
-
- type: CP14Recipe
-  id: CP14ClothingHeadBeretPurple
-  tag: CP14RecipeSewing
-  craftTime: 2
-  entities:
-    CP14String: 1
-    CP14DyePurple: 1
-  stacks:
-    CP14Cloth: 1
-  result: CP14ClothingHeadBeretPurple
-
- type: CP14Recipe
-  id: CP14ClothingHeadBeretYellow
-  tag: CP14RecipeSewing
-  craftTime: 2
-  entities:
-    CP14String: 1
-    CP14DyeYellow: 1
-  stacks:
-    CP14Cloth: 1
-  result: CP14ClothingHeadBeretYellow
-
- type: CP14Recipe
-  id: CP14ClothingHeadBeretBlue
-  tag: CP14RecipeSewing
-  craftTime: 2
-  entities:
-    CP14String: 1
-    CP14DyeBlue: 1
-  stacks:
-    CP14Cloth: 1
-  result: CP14ClothingHeadBeretBlue
-
- type: CP14Recipe
-  id: CP14ClothingHeadBeretBlack
-  tag: CP14RecipeSewing
-  craftTime: 2
-  entities:
-    CP14String: 1
-    CP14DyeBlack: 1
-  stacks:
-    CP14Cloth: 1
-  result: CP14ClothingHeadBeretBlack
-
- type: CP14Recipe
-  id: CP14ClothingHeadBandanaWhite
-  tag: CP14RecipeSewing
-  craftTime: 2
-  entities:
-    CP14String: 1
-  stacks:
-    CP14Cloth: 2
-  result: CP14ClothingHeadBandanaWhite
-
- type: CP14Recipe
-  id: CP14ClothingHeadBandanaYellow
-  tag: CP14RecipeSewing
-  craftTime: 2
-  entities:
-    CP14String: 1
-    CP14DyeYellow: 1
-  stacks:
-    CP14Cloth: 2
-  result: CP14ClothingHeadBandanaYellow
+  knowledgeRequired: AdvancedClothingSewing

 - type: CP14Recipe
  id: CP14ClothingHeadBeretMercenary
@@ -230,15 +247,20 @@
  stacks:
    CP14Cloth: 2
  result: CP14ClothingHeadBeretMercenary
+  knowledgeRequired: AdvancedClothingSewing

 - type: CP14Recipe
-  id: CP14ClothingHeadWreath
+  id: CP14ClothingPantsMercenaryTrousers
  tag: CP14RecipeSewing
  craftTime: 2
  entities:
-    CP14BloodFlower: 2
-    CP14Dayflin: 2
-  result: CP14ClothingHeadWreath
+    CP14String: 1
+    CP14DyeBlue: 1
+    CP14DyeRed: 1
+  stacks:
+    CP14Cloth: 2
+  result: CP14ClothingPantsMercenaryTrousers
+  knowledgeRequired: AdvancedClothingSewing

 # Wallpaper (TODO: Move to separate workbench?)

@@ -251,6 +273,7 @@
  entities:
    CP14DyeBlack: 1
  result: CP14WallpaperBlack
+  knowledgeRequired: WallpaperCraft

 - type: CP14Recipe
  id: CP14WallpaperGreen
@@ -261,6 +284,7 @@
  entities:
    CP14DyeGreen: 1
  result: CP14WallpaperGreen
+  knowledgeRequired: WallpaperCraft

 - type: CP14Recipe
  id: CP14WallpaperPurple
@@ -271,6 +295,7 @@
  entities:
    CP14DyePurple: 1
  result: CP14WallpaperPurple
+  knowledgeRequired: WallpaperCraft

 - type: CP14Recipe
  id: CP14WallpaperRed
@@ -281,6 +306,7 @@
  entities:
    CP14DyeRed: 1
  result: CP14WallpaperRed
+  knowledgeRequired: WallpaperCraft

 - type: CP14Recipe
  id: CP14WallpaperWhite
@@ -289,6 +315,7 @@
  stacks:
    CP14Cloth: 10
  result: CP14WallpaperWhite
+  knowledgeRequired: WallpaperCraft

 - type: CP14Recipe
  id: CP14WallpaperWhite2
@@ -297,6 +324,7 @@
  stacks:
    CP14Cloth: 10
  result: CP14WallpaperWhite2
+  knowledgeRequired: WallpaperCraft

 - type: CP14Recipe
  id: CP14WallpaperYellow
@@ -307,6 +335,7 @@
  entities:
    CP14DyeYellow: 1
  result: CP14WallpaperYellow
+  knowledgeRequired: WallpaperCraft

 - type: CP14Recipe
  id: CP14CrayonBlack
@@ -360,4 +389,4 @@
  entities:
    CP14CrayonWhite: 1
    CP14DyePurple: 1
-  result: CP14CrayonPurple
+  result: CP14CrayonPurple
--- a/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/workbench.yml
@@ -7,6 +7,7 @@
  stacks:
    CP14WoodenPlanks: 3
  result: CP14Bucket
+  knowledgeRequired: WoodWork

 - type: CP14Recipe
  id: CP14WoodenBeerMug
@@ -16,6 +17,7 @@
    CP14WoodenPlanks: 2
    CP14Nail: 1
  result: CP14WoodenBeerMug
+  knowledgeRequired: WoodWork

 - type: CP14Recipe
  id: CP14PlateWooden
@@ -24,6 +26,7 @@
  stacks:
    CP14WoodenPlanks: 2
  result: CP14PlateWooden
+  knowledgeRequired: WoodWork

 - type: CP14Recipe
  id: CP14BaseMop
@@ -33,6 +36,7 @@
    CP14WoodenPlanks: 2
    CP14Cloth: 1
  result: CP14BaseMop
+  knowledgeRequired: WoodWork

 - type: CP14Recipe
  id: CP14Torch
@@ -59,6 +63,7 @@
  stacks:
    CP14WoodenPlanks: 1
  result: CP14ModularGripWooden
+  knowledgeRequired: WoodWork

 - type: CP14Recipe
  id: CP14ModularGripWoodenLong
@@ -67,6 +72,7 @@
  stacks:
    CP14WoodenPlanks: 2
  result: CP14ModularGripWoodenLong
+  knowledgeRequired: WoodWork

 - type: CP14Recipe
  id: CP14ModularGripLucens
@@ -75,6 +81,7 @@
  stacks:
    CP14LucensWoodenPlanks: 1
  result: CP14ModularGripLucens
+  knowledgeRequired: WoodWork

 - type: CP14Recipe
  id: CP14ModularGripLucensLong
@@ -83,3 +90,4 @@
  stacks:
    CP14LucensWoodenPlanks: 2
  result: CP14ModularGripLucensLong
+  knowledgeRequired: WoodWork
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard.yml
@@ -6,10 +6,6 @@
  startingGear: CP14GuardGear
  icon: "CP14JobIconGuard"
  supervisors: cp14-job-supervisors-guard-commander
-  special:
-  - !type:CP14AddSkillSpecial
-    skills:
-    - Warcraft

 - type: startingGear
  id: CP14GuardGear
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard_commander.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Guard/guard_commander.yml
@@ -11,10 +11,6 @@
  supervisors: cp14-job-supervisors-command
  weight: 2
  setPreference: true
-  special:
-  - !type:CP14AddSkillSpecial
-    skills:
-    - Warcraft

 - type: startingGear
  id: CP14GuardCommanderGear
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml
@@ -7,9 +7,9 @@
  icon: "CP14JobIconAdventurer"
  supervisors: cp14-job-supervisors-command
  special:
-  - !type:CP14AddSkillSpecial
-    skills:
-    - Warcraft
+  - !type:CP14AddKnowledgeSpecial
+    knowledge:
+    - WoodWork

 - type: startingGear
  id: CP14AdventurerGear
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/alchemist.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/alchemist.yml
@@ -7,9 +7,9 @@
  icon: "CP14JobIconAlchemist"
  supervisors: cp14-job-supervisors-command
  special:
-  - !type:CP14AddSkillSpecial
-    skills:
-    - Alchemy
+  - !type:CP14AddKnowledgeSpecial
+    knowledge:
+    - WoodWork

 - type: startingGear
  id: CP14AlchemistGear
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/apprentice.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/apprentice.yml
@@ -6,6 +6,10 @@
  startingGear: CP14ApprenticeGear
  icon: "CP14JobIconApprentice"
  supervisors: cp14-job-supervisors-command
+  special:
+  - !type:CP14AddKnowledgeSpecial
+    knowledge:
+    - WoodWork

 - type: startingGear
  id: CP14ApprenticeGear
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/blacksmith.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/blacksmith.yml
@@ -7,9 +7,12 @@
  icon: "CP14JobIconBlacksmith"
  supervisors: cp14-job-supervisors-command
  special:
-  - !type:CP14AddSkillSpecial
-    skills:
-    - Blacksmith
+  - !type:CP14AddKnowledgeSpecial
+    knowledge:
+    - WoodWork
+    - MetallMelting
+    - MetallForging
+    - Glasswork

 - type: startingGear
  id: CP14BlacksmithGear
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/innkeeper.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/innkeeper.yml
@@ -6,6 +6,10 @@
  startingGear: CP14InnkeeperGear
  icon: "CP14JobIconInnkeeper"
  supervisors: cp14-job-supervisors-command
+  special:
+  - !type:CP14AddKnowledgeSpecial
+    knowledge:
+    - WoodWork

 - type: startingGear
  id: CP14InnkeeperGear
--- a/Resources/Prototypes/_CP14/Skills/skills.yml
+++ b/Resources/Prototypes/_CP14/Skills/skills.yml
@@ -1,19 +0,0 @@
- type: CP14Skill
-  id: Alchemy
-  name: cp14-skill-name-alchemy
-  desc: cp14-skill-desc-alchemy
-
- type: CP14Skill
-  id: Blacksmith
-  name: cp14-skill-name-blacksmith
-  desc: cp14-skill-desc-blacksmith
-
- type: CP14Skill
-  id: Warcraft
-  name: cp14-skill-name-warcraft
-  desc: cp14-skill-desc-warcraft
-
- type: CP14Skill
-  id: Firearms
-  name: cp14-skill-name-firearms
-  desc: cp14-skill-desc-firearms