Skill progression system [Draft] (#1056)

* fuck all * clean up * remove knowledge books * Update base.yml * cl * fix #991 * fix * Update subgamemodes.yml * manual migration + recipes fix * Update comoss.yml * setup data * setup skills systems * more blacksmithing skills * Update base.yml * Create CP14SkillEffectAction.cs * skill button returns * base graph UI window * skill tree drawing * UI improve * pyro setup * skill trees selection, dragging control * refactor skill system: rename Skills to LearnedSkills, add experience tracking and learning logic * Create available.png * skill description generation setup * auto parsing skill names and descriptions * Hydrosophistry * water light fire and metamagic ported to skill tre * ice dagger spell returns * Update ice_dagger.yml * delete old files * Update modular_garde.yml * ice arrow spell * link graph with parallax * show experience counter * polish * puf * p * pipap * finally ready to merg? * fix * fix 2
2025-03-27 17:20:20 +03:00
parent 6a6350a827
commit 1e36a61339
159 changed files with 2283 additions and 1863 deletions
--- a/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
+++ b/Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
@@ -4,7 +4,6 @@
  name: admin observer
  categories: [ HideSpawnMenu ]
  components:
-  - type: CP14AllKnowing
  - type: ContentEye
    maxZoom: 8.916104, 8.916104
  - type: Tag
--- a/Resources/Prototypes/_CP14/Catalog/Cargo/Store/SpiceStream/buy.yml
+++ b/Resources/Prototypes/_CP14/Catalog/Cargo/Store/SpiceStream/buy.yml
@@ -164,35 +164,6 @@
        amount: 5
      - id: CP14PenFeather
        amount: 3
-
-
- type: storePositionBuy
-  id: CP14BookKnowledgeMetallMelting
-  code: KNOWLEDGE_MELTING
-  price: 100
-  factions:
-  - SpiceStream
-  service: !type:CP14BuyItemsService
-    product: CP14BookKnowledgeMetallMelting
-
- type: storePositionBuy
-  id: CP14BookKnowledgeMetallForging
-  code: KNOWLEDGE_FORGING
-  price: 100
-  factions:
-  - SpiceStream
-  service: !type:CP14BuyItemsService
-    product: CP14BookKnowledgeMetallForging
-
- type: storePositionBuy
-  id: CP14BookKnowledgeGlasswork
-  code: KNOWLEDGE_GLASSWORK
-  price: 100
-  factions:
-  - SpiceStream
-  service: !type:CP14BuyItemsService
-    product: CP14BookKnowledgeGlasswork
-
 
 - type: storePositionBuy
  id: EnergyCrystals
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_beer_creation.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_beer_creation.yml
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T0_freeze.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T0_freeze.yml
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_arrow.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_arrow.yml
@@ -0,0 +1,109 @@
+- type: entity
+  id: CP14ActionSpellIceArrow
+  name: Ice arrow
+  description: You create a temporary sharp ice arrow that can be used as a disposable bow projectile.
+  components:
+  - type: Sprite
+    sprite: _CP14/Actions/Spells/water.rsi
+    state: ice_arrow
+  - type: CP14MagicEffectManaCost
+    manaCost: 20
+  - type: CP14MagicEffect
+    effects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14ImpactEffectWaterCreation
+    - !type:CP14SpellSpawnInHandEntity
+      spawns:
+      - CP14IceArrow
+  - type: CP14MagicEffectVerbalAspect
+    startSpeech: "Sagitta glaciei..."
+    endSpeech: "in manu mea"
+  - type: CP14MagicEffectSomaticAspect
+  - type: CP14MagicEffectCastingVisual
+    proto: CP14RuneWaterCreation
+  - type: InstantAction
+    itemIconStyle: BigAction
+    sound: !type:SoundPathSpecifier
+      path: /Audio/Magic/rumble.ogg
+    icon:
+      sprite: _CP14/Actions/Spells/water.rsi
+      state: ice_arrow
+    event: !type:CP14DelayedInstantActionEvent
+      cooldown: 5
+      breakOnMove: false
+
+- type: entity
+  id: CP14IceArrow
+  parent: BaseItem
+  name: ice arrow
+  description: A sharp ice arrow created with magic. It melts and will soon disappear, but you can shoot it once with your bow.
+  categories: [ ForkFiltered ]
+  components:
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Ranged/Projectiles/ice_arrow.rsi
+    state: icon
+  - type: Item
+    storedRotation: 0
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PhysShapeCircle
+          radius: 0.2
+        density: 5
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
+      projectile:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.1,-0.1,0.1,0.1"
+        hard: false
+        mask:
+        - Impassable
+        - BulletImpassable
+  - type: EmbeddableProjectile
+    sound: /Audio/Weapons/star_hit.ogg
+    embedOnThrow: false
+  - type: ThrowingAngle
+    angle: 0
+  - type: Ammo
+    muzzleFlash: null
+  - type: Tag
+    tags:
+    - CP14Arrow
+  - type: Projectile
+    deleteOnCollide: false
+    onlyCollideWhenShot: true
+    damage:
+      types:
+        Piercing: 17
+        Cold: 5
+  - type: Damageable
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 10
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: TimedDespawn
+    lifetime: 60
+  - type: DamageOnLand
+    damage:
+      types:
+        Blunt: 10
+
+- type: entity
+  parent: CP14BaseSpellScrollWater
+  id: CP14SpellScrollIceArrow
+  name: ice arrow spell scroll
+  components:
+  - type: CP14SpellStorage
+    spells:
+    - CP14ActionSpellIceArrow
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_dagger.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_dagger.yml
@@ -0,0 +1,146 @@
+- type: entity
+  id: CP14ActionSpellIceDagger
+  name: Ice dagger
+  description: You form an icy sharp dagger that will do for temporary use.
+  components:
+  - type: Sprite
+    sprite: _CP14/Actions/Spells/water.rsi
+    state: ice_dagger
+  - type: CP14MagicEffectManaCost
+    manaCost: 15
+  - type: CP14MagicEffect
+    effects:
+    - !type:CP14SpellSpawnEntityOnTarget
+      spawns:
+      - CP14ImpactEffectWaterCreation
+    - !type:CP14SpellSpawnInHandEntity
+      spawns:
+      - CP14IceDagger
+  - type: CP14MagicEffectVerbalAspect
+    startSpeech: "Un pittore sulla..."
+    endSpeech: "soglia della mano"
+  - type: CP14MagicEffectSomaticAspect
+  - type: CP14MagicEffectCastingVisual
+    proto: CP14RuneWaterCreation
+  - type: InstantAction
+    itemIconStyle: BigAction
+    sound: !type:SoundPathSpecifier
+      path: /Audio/Magic/rumble.ogg
+    icon:
+      sprite: _CP14/Actions/Spells/water.rsi
+      state: ice_dagger
+    event: !type:CP14DelayedInstantActionEvent
+      cooldown: 20
+      breakOnMove: false
+
+- type: entity
+  name: ice dagger
+  parent: BaseItem
+  id: CP14IceDagger
+  description: A sharp ice arrow created with magic. It melts and will soon disappear, but you can shoot it once with your bow.
+  categories: [ ForkFiltered ]
+  components:
+  - type: Sharp
+  - type: Sprite
+    sprite: _CP14/Objects/Weapons/Melee/ice_dagger.rsi
+    state: icon
+  - type: MeleeWeapon
+    resetOnHandSelected: false #Fast swap
+    range: 1.0 # 1.5 standart
+    cPAnimationOffset: -0.75 #-1 standart
+    attackRate: 1.5 # 1 standart
+    angle: 45
+    wideAnimationRotation: 135
+    wideAnimation: CP14WeaponArcSlash
+    damage:
+      types:
+        Slash: 2
+        Piercing: 5
+        Cold: 3
+    soundHit:
+      collection: MetalThud
+    cPAnimationLength: 0.25
+  - type: Clothing
+    equipDelay: 0.25
+    unequipDelay: 0.25
+    quickEquip: false
+    breakOnMove: false
+    slots:
+    - belt
+  - type: CP14MeleeParriable
+  - type: Item
+    shape:
+    - 0,0,0,1
+    storedOffset: 0, 5
+    storedRotation: 45
+    size: Normal
+  - type: ExaminableDamage
+    messages: CP14WeaponMessages
+  - type: DisarmMalus
+  - type: ThrowingAngle
+    angle: 135
+  - type: EmbeddableProjectile
+    offset: -0.15,-0.15
+    removalTime: 0.5
+  - type: LandAtCursor
+  - type: DamageOtherOnHit
+    damage:
+      types:
+        Piercing: 10
+        Cold: 5
+  - type: DamageOnLand
+    damage:
+      types:
+        Blunt: 5
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape: !type:PolygonShape
+          vertices:
+            - -0.40,-0.30
+            - -0.30,-0.40
+            - 0.40,0.30
+            - 0.30,0.40
+        density: 10
+        mask:
+        - ItemMask
+        restitution: 0.3
+        friction: 0.2
+  - type: CP14SharpeningStone
+  - type: UseDelay
+  - type: Tool
+    qualities:
+      - Slicing
+    useSound:
+      path: /Audio/Items/Culinary/chop.ogg
+  - type: Utensil
+    types:
+      - Knife
+  - type: CP14WallpaperRemover
+  - type: CP14MeleeSelfDamage
+    damageToSelf:
+      types:
+        Blunt: 1 # 10 hits
+  - type: Damageable
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 10
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: GlassBreak
+      - !type:DoActsBehavior
+        acts: ["Destruction"]
+  - type: TimedDespawn
+    lifetime: 60
+
+- type: entity
+  parent: CP14BaseSpellScrollWater
+  id: CP14SpellScrollIceDagger
+  name: ice dagger spell scroll
+  components:
+  - type: CP14SpellStorage
+    spells:
+    - CP14ActionSpellIceDagger
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_ice_shards.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T1_ice_shards.yml
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T0_water_creation.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/T0_water_creation.yml
--- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/skeleton.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/skeleton.yml
@@ -19,8 +19,9 @@
  - type: Loadout
    prototypes:
    - CP14MobSkeletonHalberd
-  - type: CP14AutoLearnAction
-    actions:
+  - type: CP14SpellStorage
+    grantAccessToSelf: true
+    spells:
    - CP14ActionSpellKick

 - type: entity
@@ -42,8 +43,9 @@
  - type: Loadout
    prototypes:
    - CP14MobSkeletonDodger
-  - type: CP14AutoLearnAction
-    actions:
+  - type: CP14SpellStorage
+    grantAccessToSelf: true
+    spells:
    - CP14ActionSpellSprint

 - type: entity
@@ -68,8 +70,9 @@
  - type: CP14MagicEnergyDraw
    energy: 1
    delay: 1
-  - type: CP14AutoLearnAction
-    actions:
+  - type: CP14SpellStorage
+    grantAccessToSelf: true
+    spells:
    - CP14ActionSpellIceShards
    - CP14ActionSpellFreeze
    - CP14ActionSpellFlameCreation
@@ -84,8 +87,9 @@
  - type: Loadout
    prototypes:
    - CP14MobSkeletonBard
-  - type: CP14AutoLearnAction
-    actions:
+  - type: CP14SpellStorage
+    grantAccessToSelf: true
+    spells:
    - CP14ActionSpellHealBallade
    - CP14ActionSpellMagicBallade
    - CP14ActionSpellSpeedBallade
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/base.yml
@@ -231,6 +231,7 @@
      types:
        Cold: 0.25
        Bloodloss: 0.25
+  - type: CP14SkillStorage


 - type: entity
@@ -309,7 +310,6 @@
        Asphyxiation: -1.0
  - type: FireVisuals
    alternateState: Standing #TODO - custom visuals
-  - type: CP14KnowledgeStorage

 - type: entity
  save: false
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/elf.yml
@@ -31,10 +31,6 @@
  - type: CP14MagicEnergyDraw #Half of standard mana regeneration
    energy: 0.5
    delay: 3
-  - type: CP14SpellStorage
-    grantAccessToSelf: true
-    spells:
-    - CP14ActionSpellManaConsumeElf
  - type: Inventory
    templateId: CP14Human
    displacements:
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/goblin.yml
@@ -115,10 +115,6 @@
  - type: CP14MagicEnergyDraw #Cool x3 mana regen!
    energy: 1.5
    delay: 3
-  - type: CP14SpellStorage
-    grantAccessToSelf: true
-    spells:
-    - CP14ActionSpellSprintGoblin
  - type: Hands
    handDisplacement:
      sizeMaps:
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/silva.yml
@@ -74,10 +74,6 @@
      - id: CP14FoodMeatHuman # Replace it with silva meat, heh.
        amount: 5
  #- type: CP14MagicEnergyPhotosynthesis # Silva special feature #Disabled until sunlight fixed
-  - type: CP14SpellStorage
-    grantAccessToSelf: true
-    spells:
-    - CP14ActionSpellPlantGrowthSilva
  #- type: CP14MagicEnergyDraw #Enabled default mana regen until sunlight fixed
  #  enable: false
  - type: Body
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/skeleton.yml
@@ -114,7 +114,6 @@
  - type: Inventory
    templateId: CP14Human
  - type: TransferMindOnGib
-  - type: CP14KnowledgeStorage
  - type: CP14DemiplaneStabilizer
    enabled: false

--- a/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/Books/base.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/Books/base.yml
@@ -62,14 +62,4 @@
  - type: GuideHelp
    openOnActivation: true
    guides:
-    - SS14
-
- type: entity
-  parent: CP14BookBase
-  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
+    - SS14
--- a/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/Books/knowledge.yml
+++ b/Resources/Prototypes/_CP14/Entities/Objects/Bureaucracy/Books/knowledge.yml
@@ -1,68 +0,0 @@
-# T0
-
- type: entity
-  parent: CP14BookKnowledgeBase
-  id: CP14BookKnowledgeWoodWork
-  suffix: Wood Work
-  components:
-  - type: CP14KnowledgeLearningSource
-    knowledge:
-    - WoodWork
-
- type: entity
-  parent: CP14BookKnowledgeBase
-  id: CP14BookKnowledgeMetallMelting
-  suffix: Metall Melting
-  components:
-  - type: CP14KnowledgeLearningSource
-    knowledge:
-    - MetallMelting
-
- type: entity
-  parent: CP14BookKnowledgeBase
-  id: CP14BookKnowledgeMetallForging
-  suffix: Metall Forging
-  components:
-  - type: CP14KnowledgeLearningSource
-    knowledge:
-    - MetallForging
-
- type: entity
-  parent: CP14BookKnowledgeBase
-  id: CP14BookKnowledgeGlasswork
-  suffix: Glasswork
-  components:
-  - type: CP14KnowledgeLearningSource
-    knowledge:
-    - Glasswork
-
-# T1
-
- type: entity
-  parent: CP14BookKnowledgeBase
-  id: CP14BookKnowledgeClothingSewing
-  suffix: Clothing Sewing
-  components:
-  - type: CP14KnowledgeLearningSource
-    knowledge:
-    - ClothingSewing
-
- type: entity
-  parent: CP14BookKnowledgeBase
-  id: CP14BookKnowledgeWallpaperCraft
-  suffix: Wallpaper Craft
-  components:
-  - type: CP14KnowledgeLearningSource
-    knowledge:
-    - WallpaperCraft
-
-# T2
-
- type: entity
-  parent: CP14BookKnowledgeBase
-  id: CP14BookKnowledgeAdvancedClothingSewing
-  suffix: Advanced Clothing Sewing
-  components:
-  - type: CP14KnowledgeLearningSource
-    knowledge:
-    - AdvancedClothingSewing
--- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bookshelf.yml
+++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/bookshelf.yml
@@ -96,17 +96,6 @@
    - id: CP14BookRandom
      amount: !type:RangeNumberSelector
        range: 0, 15
-    #Random knowledge
-    - !type:GroupSelector
-      prob: 0.15
-      children:
-      - id: CP14BookKnowledgeWoodWork
-      - id: CP14BookKnowledgeMetallMelting
-      - id: CP14BookKnowledgeMetallForging
-      - id: CP14BookKnowledgeGlasswork
-      - id: CP14BookKnowledgeClothingSewing
-      - id: CP14BookKnowledgeWallpaperCraft
-      - id: CP14BookKnowledgeAdvancedClothingSewing

 - type: entity
  id: CP14BookshelfWoodenFilled
--- a/Resources/Prototypes/_CP14/GameRules/subgamemodes.yml
+++ b/Resources/Prototypes/_CP14/GameRules/subgamemodes.yml
@@ -20,8 +20,9 @@
      - CP14MindRoleVampire
      components:
      - type: CP14Vampire
-      - type: CP14AutoLearnAction
-        actions:
+      - type: CP14SpellStorage
+        grantAccessToSelf: true
+        spells:
        - CP14ActionVampireBite
        - CP14ActionSpellVampireHypnosis
        - CP14ActionSpellVampireBloodStep
--- a/Resources/Prototypes/_CP14/Knowledge/knowledges.yml
+++ b/Resources/Prototypes/_CP14/Knowledge/knowledges.yml
@@ -1,42 +0,0 @@
-# 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/Loadouts/antag_loadouts.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/antag_loadouts.yml
@@ -1,4 +0,0 @@
- type: roleLoadout
-  id: CP14VampireSpells
-  groups:
-  - CP14GeneralSpells
--- a/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml
@@ -1,7 +1,7 @@
 - type: roleLoadout
  id: JobCP14Adventurer
  groups:
-  - CP14GeneralSpells
+  - CP14SkillTree
  - CP14GeneralHead
  - CP14GeneralOuterClothing
  - CP14GeneralEyes
@@ -18,7 +18,7 @@
 - type: roleLoadout
  id: JobCP14Apprentice
  groups:
-  - CP14GeneralSpells
+  - CP14SkillTree
  - CP14GeneralHead
  - CP14GeneralOuterClothing
  - CP14GeneralEyes
@@ -33,7 +33,7 @@
 - type: roleLoadout
  id: JobCP14Alchemist
  groups:
-  - CP14GeneralSpells
+  - CP14SkillTree
  - CP14AlchemistHead #
  - CP14GeneralOuterClothing
  - CP14AlchemistEyes #
@@ -49,7 +49,7 @@
 - type: roleLoadout
  id: JobCP14Innkeeper
  groups:
-  - CP14GeneralSpells
+  - CP14SkillTree
  - CP14GeneralHead
  - CP14GeneralOuterClothing
  - CP14GeneralEyes
@@ -64,7 +64,7 @@
 - type: roleLoadout
  id: JobCP14Blacksmith
  groups:
-  - CP14GeneralSpells
+  - CP14SkillTree
  - CP14GeneralHead
  - CP14GeneralOuterClothing
  - CP14GeneralEyes
@@ -79,7 +79,7 @@
 - type: roleLoadout
  id: JobCP14GuardCommander
  groups:
-  - CP14GeneralSpells
+  - CP14SkillTree
  - CP14GuardHead
  - CP14GeneralOuterClothing
  - CP14GeneralEyes
@@ -95,7 +95,7 @@
 - type: roleLoadout
  id: JobCP14Guard
  groups:
-  - CP14GeneralSpells
+  - CP14SkillTree
  - CP14GuardHead
  - CP14GeneralOuterClothing
  - CP14GeneralEyes
@@ -111,7 +111,7 @@
 - type: roleLoadout
  id: JobCP14Commandant
  groups:
-  - CP14GeneralSpells
+  - CP14SkillTree
  - CP14CommandantHead
  - CP14MerchantOuterClothing
  - CP14GeneralEyes
@@ -125,7 +125,7 @@
 - type: roleLoadout
  id: JobCP14Guildmaster
  groups:
-  - CP14GeneralSpells
+  - CP14SkillTree
  - CP14GuildmasterWeapons
  - CP14GuildmasterOuterClothing
  - CP14GeneralEyes
@@ -141,7 +141,7 @@
 - type: roleLoadout
  id: JobCP14Merchant
  groups:
-  - CP14GeneralSpells
+  - CP14SkillTree
  - CP14MerchantHead
  - CP14MerchantOuterClothing
  - CP14GeneralEyes
--- a/Resources/Prototypes/_CP14/Loadouts/skill_tree.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/skill_tree.yml
@@ -0,0 +1,152 @@
+- type: loadoutGroup
+  id: CP14SkillTree
+  name: cp14-loadout-skill-tree
+  minLimit: 0
+  maxLimit: 2
+  loadouts:
+  - CP14SkillTreePyrokinetic
+  - CP14SkillTreeHydrosophistry
+  - CP14SkillTreeMetamagic
+  - CP14SkillTreeIllusion
+  - CP14SkillTreeHealing
+  - CP14SkillTreeAtlethic
+
+
+
+- type: entity
+  id: CP14SkillTreePyrokineticLoadoutDummy
+  name: Pyrokinetic
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: _CP14/Actions/Spells/fire.rsi
+    state: flame_creation
+
+- type: loadout
+  id: CP14SkillTreePyrokinetic
+  dummyEntity: CP14SkillTreePyrokineticLoadoutDummy
+  skillTree:
+    Pyrokinetic: 2
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:TraitsRequirement
+      inverted: true
+      traits:
+      - CP14ManaWasting
+
+
+
+- type: entity
+  id: CP14SkillTreeHydrosophistryLoadoutDummy
+  name: Hydrosophistry
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: _CP14/Actions/Spells/water.rsi
+    state: water_creation
+
+- type: loadout
+  id: CP14SkillTreeHydrosophistry
+  dummyEntity: CP14SkillTreeHydrosophistryLoadoutDummy
+  skillTree:
+    Hydrosophistry: 2
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:TraitsRequirement
+      inverted: true
+      traits:
+      - CP14ManaWasting
+
+
+- type: entity
+  id: CP14SkillTreeIllusionLoadoutDummy
+  name: Illusion
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: _CP14/Actions/Spells/light.rsi
+    state: sphere_of_light
+
+- type: loadout
+  id: CP14SkillTreeIllusion
+  dummyEntity: CP14SkillTreeIllusionLoadoutDummy
+  skillTree:
+    Illusion: 2
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:TraitsRequirement
+      inverted: true
+      traits:
+      - CP14ManaWasting
+
+
+- type: entity
+  id: CP14SkillTreeMetamagicLoadoutDummy
+  name: Metamagic
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: _CP14/Actions/Spells/meta.rsi
+    state: mana
+
+- type: loadout
+  id: CP14SkillTreeMetamagic
+  dummyEntity: CP14SkillTreeMetamagicLoadoutDummy
+  skillTree:
+    Metamagic: 2
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:TraitsRequirement
+      inverted: true
+      traits:
+      - CP14ManaWasting
+
+
+- type: entity
+  id: CP14SkillTreeHealingLoadoutDummy
+  name: Healing
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: _CP14/Actions/Spells/healing.rsi
+    state: plant_growth
+
+- type: loadout
+  id: CP14SkillTreeHealing
+  dummyEntity: CP14SkillTreeHealingLoadoutDummy
+  skillTree:
+    Healing: 2
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:TraitsRequirement
+      inverted: true
+      traits:
+      - CP14ManaWasting
+
+
+- type: entity
+  id: CP14SkillTreeAtlethicLoadoutDummy
+  name: Atlethic
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: _CP14/Actions/Spells/physical.rsi
+    state: kick
+
+- type: loadout
+  id: CP14SkillTreeAtlethic
+  dummyEntity: CP14SkillTreeAtlethicLoadoutDummy
+  skillTree:
+    Atlethic: 2
+  effects:
+  - !type:JobRequirementLoadoutEffect
+    requirement:
+      !type:TraitsRequirement
+      inverted: true
+      traits:
+      - CP14ManaWasting
--- a/Resources/Prototypes/_CP14/Loadouts/spells.yml
+++ b/Resources/Prototypes/_CP14/Loadouts/spells.yml
@@ -1,322 +0,0 @@
-# Spells
-
- type: loadoutGroup
-  id: CP14GeneralSpells
-  name: cp14-loadout-general-spells
-  minLimit: 0
-  maxLimit: 3
-  loadouts:
-  #Dimension
-  - CP14ActionSpellShadowGrab
-  #Earth
-  #Fire
-  - CP14ActionSpellFlameCreation
-  - CP14ActionSpellHellBallade
-  #Healing
-  #- CP14ActionSpellCureWounds
-  #- CP14ActionSpellCureBurn
-  #- CP14ActionSpellBloodPurification
-  - CP14ActionSpellPlantGrowth
-  #- CP14ActionSpellHealBallade
-  - CP14ActionSpellSpeedBallade
-  - CP14ActionSpellPeaceBallade
-  #Light
-  - CP14ActionSpellSphereOfLight
-  #Meta
-  - CP14ActionSpellManaManipulation
-  - CP14ActionSpellMagicSplitting
-  - CP14ActionSpellMagicBallade
-  #Physical
-  - CP14ActionSpellSprint
-  - CP14ActionSpellKick
-  #Water
-  - CP14ActionSpellWaterCreation
-  - CP14ActionSpellIceShards
-  - CP14ActionSpellFreeze
-  - CP14ActionSpellBeerCreation
-
- type: loadout
-  id: CP14ActionSpellBase
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:TraitsRequirement
-      inverted: true
-      traits:
-      - CP14ManaWasting
-
- type: loadout
-  id: CP14ActionSpellFlameCreation
-  dummyEntity: CP14ActionSpellFlameCreation
-  actions:
-  - CP14ActionSpellFlameCreation
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:TraitsRequirement
-      inverted: true
-      traits:
-      - CP14ManaWasting
-
- type: loadout
-  id: CP14ActionSpellCureWounds
-  dummyEntity: CP14ActionSpellCureWounds
-  actions:
-  - CP14ActionSpellCureWounds
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:TraitsRequirement
-      inverted: true
-      traits:
-      - CP14ManaWasting
-
- type: loadout
-  id: CP14ActionSpellCureBurn
-  dummyEntity: CP14ActionSpellCureBurn
-  actions:
-  - CP14ActionSpellCureBurn
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:TraitsRequirement
-      inverted: true
-      traits:
-      - CP14ManaWasting
-
- type: loadout
-  id: CP14ActionSpellBloodPurification
-  dummyEntity: CP14ActionSpellBloodPurification
-  actions:
-  - CP14ActionSpellBloodPurification
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:TraitsRequirement
-      inverted: true
-      traits:
-      - CP14ManaWasting
-
- type: loadout
-  id: CP14ActionSpellPlantGrowth
-  dummyEntity: CP14ActionSpellPlantGrowth
-  actions:
-  - CP14ActionSpellPlantGrowth
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:SpeciesRequirement
-      species:
-      - CP14Silva
-      inverted: true # Silvas cannot take this spell, they have buffed version by default
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:TraitsRequirement
-      inverted: true
-      traits:
-      - CP14ManaWasting
-
- type: loadout
-  id: CP14ActionSpellSphereOfLight
-  dummyEntity: CP14ActionSpellSphereOfLight
-  actions:
-  - CP14ActionSpellSphereOfLight
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:TraitsRequirement
-      inverted: true
-      traits:
-      - CP14ManaWasting
-
- type: loadout
-  id: CP14ActionSpellManaManipulation
-  dummyEntity: CP14DummyActionSpellManaManipulation
-  actions:
-  - CP14ActionSpellManaGift
-  - CP14ActionSpellManaConsume
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:SpeciesRequirement
-      species:
-      - CP14Elf
-      inverted: true # Elves cannot take this spell, they have buffed version by default
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:TraitsRequirement
-      inverted: true
-      traits:
-      - CP14ManaWasting
-
- type: loadout
-  id: CP14ActionSpellMagicSplitting
-  dummyEntity: CP14ActionSpellMagicSplitting
-  actions:
-  - CP14ActionSpellMagicSplitting
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:TraitsRequirement
-      inverted: true
-      traits:
-      - CP14ManaWasting
-
- type: loadout
-  id: CP14ActionSpellShadowGrab
-  dummyEntity: CP14ActionSpellShadowGrab
-  actions:
-  - CP14ActionSpellShadowGrab
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:TraitsRequirement
-      inverted: true
-      traits:
-      - CP14ManaWasting
-
- type: loadout
-  id: CP14ActionSpellIceShards
-  dummyEntity: CP14ActionSpellIceShards
-  actions:
-  - CP14ActionSpellIceShards
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:TraitsRequirement
-      inverted: true
-      traits:
-      - CP14ManaWasting
-
- type: loadout
-  id: CP14ActionSpellWaterCreation
-  dummyEntity: CP14ActionSpellWaterCreation
-  actions:
-  - CP14ActionSpellWaterCreation
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:TraitsRequirement
-      inverted: true
-      traits:
-      - CP14ManaWasting
-
- type: loadout
-  id: CP14ActionSpellFreeze
-  dummyEntity: CP14ActionSpellFreeze
-  actions:
-  - CP14ActionSpellFreeze
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:TraitsRequirement
-      inverted: true
-      traits:
-      - CP14ManaWasting
-
- type: loadout
-  id: CP14ActionSpellBeerCreation
-  dummyEntity: CP14ActionSpellBeerCreation
-  actions:
-  - CP14ActionSpellBeerCreation
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:SpeciesRequirement
-      species:
-      - CP14Dwarf
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:TraitsRequirement
-      inverted: true
-      traits:
-      - CP14ManaWasting
-
- type: loadout
-  id: CP14ActionSpellSprint
-  dummyEntity: CP14ActionSpellSprint
-  actions:
-  - CP14ActionSpellSprint
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:SpeciesRequirement
-      species:
-      - CP14Goblin
-      inverted: true # Goblins cannot take this spell, they have buffed version by default
-
- type: loadout
-  id: CP14ActionSpellKick
-  dummyEntity: CP14ActionSpellKick
-  actions:
-  - CP14ActionSpellKick
-
- type: loadout
-  id: CP14ActionSpellHealBallade
-  dummyEntity: CP14ActionSpellHealBallade
-  actions:
-  - CP14ActionSpellHealBallade
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:TraitsRequirement
-      inverted: true
-      traits:
-      - CP14ManaWasting
-
- type: loadout
-  id: CP14ActionSpellSpeedBallade
-  dummyEntity: CP14ActionSpellSpeedBallade
-  actions:
-  - CP14ActionSpellSpeedBallade
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:TraitsRequirement
-      inverted: true
-      traits:
-      - CP14ManaWasting
-
- type: loadout
-  id: CP14ActionSpellPeaceBallade
-  dummyEntity: CP14ActionSpellPeaceBallade
-  actions:
-  - CP14ActionSpellPeaceBallade
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:TraitsRequirement
-      inverted: true
-      traits:
-      - CP14ManaWasting
-
- type: loadout
-  id: CP14ActionSpellHellBallade
-  dummyEntity: CP14ActionSpellHellBallade
-  actions:
-  - CP14ActionSpellHellBallade
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:TraitsRequirement
-      inverted: true
-      traits:
-      - CP14ManaWasting
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:SpeciesRequirement
-      species:
-      - CP14Tiefling
-
- type: loadout
-  id: CP14ActionSpellMagicBallade
-  dummyEntity: CP14ActionSpellMagicBallade
-  actions:
-  - CP14ActionSpellMagicBallade
-  effects:
-  - !type:JobRequirementLoadoutEffect
-    requirement:
-      !type:TraitsRequirement
-      inverted: true
-      traits:
-      - CP14ManaWasting
--- a/Resources/Prototypes/_CP14/ModularCraft/Tip/arrow.yml
+++ b/Resources/Prototypes/_CP14/ModularCraft/Tip/arrow.yml
@@ -5,7 +5,7 @@
    copyFrom:
    - BaseWeaponRangedChemical
  - !type:EditMeleeWeapon
-    resetOnHandSelected: true # Disable fast swap
+    resetOnHandSelected: true # Disable fast swap #Ed: Wtf? Why arrows have melee buffs??
    attackRateMultiplier: 1.4
    bonusDamage:
      types:
--- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/misc.yml
@@ -9,8 +9,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14BaseShield

 - type: CP14Recipe
@@ -21,8 +19,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14BaseCrowbar

 - type: CP14Recipe
@@ -33,8 +29,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14BaseWrench

 - type: CP14Recipe
@@ -45,8 +39,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14PlatePie

 - type: CP14Recipe
@@ -57,8 +49,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14Nail20

 - type: CP14Recipe
@@ -72,8 +62,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14CrystalLampBlueEmpty

 - type: CP14Recipe
@@ -84,8 +72,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14Scissors

 - type: CP14Recipe
@@ -96,8 +82,6 @@
  - !type:StackResource
    stack: CP14CopperBar
    count: 4
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ClothingOuterClothingCopperArmor

 - type: CP14Recipe
@@ -108,8 +92,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ClothingGlovesGirdles

 - type: CP14Recipe
@@ -120,8 +102,6 @@
  - !type:StackResource
    stack: CP14CopperBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14CrossboltCopper
  resultCount: 3

@@ -133,8 +113,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14CrossboltIron
  resultCount: 3

@@ -146,8 +124,6 @@
  - !type:StackResource
    stack: CP14GoldBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14CrossboltGold
  resultCount: 3

@@ -159,8 +135,6 @@
  - !type:StackResource
    stack: CP14MithrilBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14CrossboltMithril
  resultCount: 3

@@ -172,8 +146,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14BaseLockpick

 - type: CP14Recipe
@@ -184,8 +156,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 3
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ClothingHeadCapellina

 - type: CP14Recipe
@@ -196,8 +166,6 @@
  - !type:StackResource
    stack: CP14IronBar #Add skin as well?
    count: 4
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ClothingHeadBascinet

 - type: CP14Recipe
@@ -214,8 +182,6 @@
  - !type:ProtoIdResource
    protoId: CP14String
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14BaseLightCrossbow

 - type: CP14Recipe
@@ -226,6 +192,4 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ClothingMaskSteelMask
--- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_blade.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_blade.yml
@@ -9,8 +9,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeIronDagger

 - type: CP14Recipe
@@ -21,8 +19,6 @@
  - !type:StackResource
    stack: CP14GoldBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeGoldDagger

 - type: CP14Recipe
@@ -33,8 +29,6 @@
  - !type:StackResource
    stack: CP14CopperBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeCopperDagger

 - type: CP14Recipe
@@ -45,8 +39,6 @@
  - !type:StackResource
    stack: CP14MithrilBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeMithrilDagger

 # Spear
@@ -59,8 +51,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeIronSpear

 - type: CP14Recipe
@@ -71,8 +61,6 @@
  - !type:StackResource
    stack: CP14CopperBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeCopperSpear

 - type: CP14Recipe
@@ -83,8 +71,6 @@
  - !type:StackResource
    stack: CP14GoldBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeGoldSpear

 - type: CP14Recipe
@@ -95,8 +81,6 @@
  - !type:StackResource
    stack: CP14MithrilBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeMithrilSpear

 # Mace
@@ -109,8 +93,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeIronMace

 - type: CP14Recipe
@@ -121,8 +103,6 @@
  - !type:StackResource
    stack: CP14GoldBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeGoldMace

 - type: CP14Recipe
@@ -133,8 +113,6 @@
  - !type:StackResource
    stack: CP14CopperBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeCopperMace

 - type: CP14Recipe
@@ -145,8 +123,6 @@
  - !type:StackResource
    stack: CP14MithrilBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeMithrilMace

 # Sword
@@ -159,8 +135,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeIronSword

 - type: CP14Recipe
@@ -171,8 +145,6 @@
  - !type:StackResource
    stack: CP14GoldBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeGoldSword

 - type: CP14Recipe
@@ -183,8 +155,6 @@
  - !type:StackResource
    stack: CP14CopperBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeCopperSword

 - type: CP14Recipe
@@ -195,8 +165,6 @@
  - !type:StackResource
    stack: CP14MithrilBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeMithrilSword

 # Sickle
@@ -209,8 +177,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeIronSickle

 - type: CP14Recipe
@@ -221,8 +187,6 @@
  - !type:StackResource
    stack: CP14CopperBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeCopperSickle

 - type: CP14Recipe
@@ -233,8 +197,6 @@
  - !type:StackResource
    stack: CP14GoldBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeGoldSickle

 - type: CP14Recipe
@@ -245,8 +207,6 @@
  - !type:StackResource
    stack: CP14MithrilBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeMithrilSickle

 # Shovel
@@ -259,8 +219,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeIronShovel

 - type: CP14Recipe
@@ -271,8 +229,6 @@
  - !type:StackResource
    stack: CP14GoldBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeGoldShovel


@@ -284,8 +240,6 @@
  - !type:StackResource
    stack: CP14CopperBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeCopperShovel

 - type: CP14Recipe
@@ -296,8 +250,6 @@
  - !type:StackResource
    stack: CP14MithrilBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeMithrilShovel

 # Pickaxe
@@ -310,8 +262,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeIronPickaxe

 - type: CP14Recipe
@@ -322,8 +272,6 @@
  - !type:StackResource
    stack: CP14GoldBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeGoldPickaxe

 - type: CP14Recipe
@@ -334,8 +282,6 @@
  - !type:StackResource
    stack: CP14CopperBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeCopperPickaxe

 - type: CP14Recipe
@@ -346,8 +292,6 @@
  - !type:StackResource
    stack: CP14MithrilBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeMithrilPickaxe

 # Grip
@@ -360,8 +304,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularGripIron

 - type: CP14Recipe
@@ -372,8 +314,6 @@
  - !type:StackResource
    stack: CP14CopperBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularGripCopper

 - type: CP14Recipe
@@ -384,8 +324,6 @@
  - !type:StackResource
    stack: CP14GoldBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularGripGolden

 - type: CP14Recipe
@@ -396,8 +334,6 @@
  - !type:StackResource
    stack: CP14MithrilBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularGripMithril

 # Grip long
@@ -410,8 +346,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularGripIronLong

 - type: CP14Recipe
@@ -422,8 +356,6 @@
  - !type:StackResource
    stack: CP14CopperBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularGripCopperLong

 - type: CP14Recipe
@@ -434,8 +366,6 @@
  - !type:StackResource
    stack: CP14GoldBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularGripGoldLong

 - type: CP14Recipe
@@ -446,8 +376,6 @@
  - !type:StackResource
    stack: CP14MithrilBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularGripMithrilLong

 # Rapier
@@ -460,8 +388,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeIronRapier

 - type: CP14Recipe
@@ -472,8 +398,6 @@
  - !type:StackResource
    stack: CP14GoldBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeGoldRapier

 - type: CP14Recipe
@@ -484,8 +408,6 @@
  - !type:StackResource
    stack: CP14CopperBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeCopperRapier

 - type: CP14Recipe
@@ -496,8 +418,6 @@
  - !type:StackResource
    stack: CP14MithrilBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeMithrilRapier

 # Axe
@@ -510,8 +430,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeIronAxe

 - type: CP14Recipe
@@ -522,8 +440,6 @@
  - !type:StackResource
    stack: CP14CopperBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeCopperAxe

 - type: CP14Recipe
@@ -534,8 +450,6 @@
  - !type:StackResource
    stack: CP14GoldBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeGoldAxe

 - type: CP14Recipe
@@ -546,8 +460,6 @@
  - !type:StackResource
    stack: CP14MithrilBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeMithrilAxe

 # Hammer
@@ -560,8 +472,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeIronHammer

 - type: CP14Recipe
@@ -572,8 +482,6 @@
  - !type:StackResource
    stack: CP14CopperBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeCopperHammer

 - type: CP14Recipe
@@ -584,8 +492,6 @@
  - !type:StackResource
    stack: CP14GoldBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeGoldHammer

 - type: CP14Recipe
@@ -596,7 +502,5 @@
  - !type:StackResource
    stack: CP14MithrilBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularBladeMithrilHammer
  
--- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_breastplate.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_breastplate.yml
@@ -9,8 +9,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 5
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ArmorIronCuirass

 - type: CP14Recipe
@@ -21,8 +19,6 @@
  - !type:StackResource
    stack: CP14GoldBar
    count: 5
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ArmorGoldCuirass

 - type: CP14Recipe
@@ -33,8 +29,6 @@
  - !type:StackResource
    stack: CP14CopperBar
    count: 5
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ArmorCopperCuirass

 - type: CP14Recipe
@@ -45,8 +39,6 @@
  - !type:StackResource
    stack: CP14MithrilBar
    count: 5
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ArmorMithrilCuirass

 # Infantry cuirass
@@ -59,8 +51,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 6
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ArmorIronInfantryCuirass

 - type: CP14Recipe
@@ -71,8 +61,6 @@
  - !type:StackResource
    stack: CP14GoldBar
    count: 6
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ArmorGoldInfantryCuirass

 - type: CP14Recipe
@@ -83,8 +71,6 @@
  - !type:StackResource
    stack: CP14CopperBar
    count: 6
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ArmorCopperInfantryCuirass

 - type: CP14Recipe
@@ -95,8 +81,6 @@
  - !type:StackResource
    stack: CP14MithrilBar
    count: 6
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ArmorMithrilInfantryCuirass

 # Chainmail
@@ -109,8 +93,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 4
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ArmorIronChainmail

 - type: CP14Recipe
@@ -121,8 +103,6 @@
  - !type:StackResource
    stack: CP14GoldBar
    count: 4
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ArmorGoldChainmail

 - type: CP14Recipe
@@ -133,8 +113,6 @@
  - !type:StackResource
    stack: CP14CopperBar
    count: 4
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ArmorCopperChainmail

 - type: CP14Recipe
@@ -145,6 +123,4 @@
  - !type:StackResource
    stack: CP14MithrilBar
    count: 4
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ArmorMithrilChainmail
--- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_cuisses.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_cuisses.yml
@@ -9,8 +9,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularCuissesIronPlate

 - type: CP14Recipe
@@ -21,8 +19,6 @@
  - !type:StackResource
    stack: CP14GoldBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularCuissesGoldPlate

 - type: CP14Recipe
@@ -33,8 +29,6 @@
  - !type:StackResource
    stack: CP14CopperBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularCuissesCopperPlate

 - type: CP14Recipe
@@ -45,8 +39,6 @@
  - !type:StackResource
    stack: CP14MithrilBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularCuissesMithrilPlate

 # Chainmail
@@ -59,8 +51,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularCuissesIronChainmail

 - type: CP14Recipe
@@ -71,8 +61,6 @@
  - !type:StackResource
    stack: CP14GoldBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularCuissesGoldChainmail

 - type: CP14Recipe
@@ -83,8 +71,6 @@
  - !type:StackResource
    stack: CP14CopperBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularCuissesCopperChainmail

 - type: CP14Recipe
@@ -95,6 +81,4 @@
  - !type:StackResource
    stack: CP14MithrilBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularCuissesMithrilChainmail
--- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_garde.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_garde.yml
@@ -8,8 +8,6 @@
  - !type:StackResource
    stack: CP14CopperBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularGardeSharpCopper

 - type: CP14Recipe
@@ -20,8 +18,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularGardeSharpIron

 - type: CP14Recipe
@@ -32,8 +28,6 @@
  - !type:StackResource
    stack: CP14GoldBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularGardeSharpGold

 - type: CP14Recipe
@@ -44,8 +38,6 @@
  - !type:StackResource
    stack: CP14MithrilBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularGardeSharpMithril

 # Sturdy garde
@@ -58,8 +50,6 @@
  - !type:StackResource
    stack: CP14CopperBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularGardeSturdyCopper

 - type: CP14Recipe
@@ -70,8 +60,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularGardeSturdyIron

 - type: CP14Recipe
@@ -82,8 +70,6 @@
  - !type:StackResource
    stack: CP14GoldBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularGardeSturdyGold

 - type: CP14Recipe
@@ -94,6 +80,4 @@
  - !type:StackResource
    stack: CP14MithrilBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularGardeSturdyMithril
--- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_greave.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_greave.yml
@@ -9,8 +9,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularGreaveIronPlate

 - type: CP14Recipe
@@ -21,8 +19,6 @@
  - !type:StackResource
    stack: CP14GoldBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularGreaveGoldPlate

 - type: CP14Recipe
@@ -33,8 +29,6 @@
  - !type:StackResource
    stack: CP14CopperBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularGreaveCopperPlate

 - type: CP14Recipe
@@ -45,8 +39,6 @@
  - !type:StackResource
    stack: CP14MithrilBar
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularGreaveMithrilPlate

 # Chainmail
@@ -59,8 +51,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularGreaveIronChainmail

 - type: CP14Recipe
@@ -71,8 +61,6 @@
  - !type:StackResource
    stack: CP14GoldBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularGreaveGoldChainmail

 - type: CP14Recipe
@@ -83,8 +71,6 @@
  - !type:StackResource
    stack: CP14CopperBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularGreaveCopperChainmail

 - type: CP14Recipe
@@ -95,6 +81,4 @@
  - !type:StackResource
    stack: CP14MithrilBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularGreaveMithrilChainmail
--- a/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_tip.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/Anvil/modular_tip.yml
@@ -1,6 +1,17 @@

 # Tip

+- type: CP14Recipe
+  id: CP14ModularTipCopperArrow
+  tag: CP14RecipeAnvil
+  craftTime: 4
+  requirements:
+  - !type:StackResource
+    stack: CP14CopperBar
+    count: 1
+  result: CP14ModularTipCopperArrow
+  resultCount: 4
+
 - type: CP14Recipe
  id: CP14ModularTipIronArrow
  tag: CP14RecipeAnvil
@@ -9,8 +20,6 @@
  - !type:StackResource
    stack: CP14IronBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularTipIronArrow
  resultCount: 4

@@ -22,24 +31,9 @@
  - !type:StackResource
    stack: CP14GoldBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularTipGoldArrow
  resultCount: 4

- type: CP14Recipe
-  id: CP14ModularTipCopperArrow
-  tag: CP14RecipeAnvil
-  craftTime: 4
-  requirements:
-  - !type:StackResource
-    stack: CP14CopperBar
-    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
-  result: CP14ModularTipCopperArrow
-  resultCount: 4
-
 - type: CP14Recipe
  id: CP14ModularTipMithrilArrow
  tag: CP14RecipeAnvil
@@ -48,7 +42,5 @@
  - !type:StackResource
    stack: CP14MithrilBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: MetallForging
  result: CP14ModularTipMithrilArrow
  resultCount: 4
--- a/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/furnace.yml
@@ -6,8 +6,6 @@
  - !type:MaterialResource
    material: CP14Copper
    count: 10
-  - !type:KnowledgeRequired
-    knowledge: MetallMelting
  result: CP14CopperBar1

 - type: CP14Recipe
@@ -18,8 +16,6 @@
  - !type:MaterialResource
    material: CP14Iron
    count: 10
-  - !type:KnowledgeRequired
-    knowledge: MetallMelting
  result: CP14IronBar1

 - type: CP14Recipe
@@ -30,8 +26,6 @@
  - !type:MaterialResource
    material: CP14Gold
    count: 10
-  - !type:KnowledgeRequired
-    knowledge: MetallMelting
  result: CP14GoldBar1

 - type: CP14Recipe
@@ -42,8 +36,6 @@
  - !type:MaterialResource
    material: CP14Mithril
    count: 10
-  - !type:KnowledgeRequired
-    knowledge: MetallMelting
  result: CP14MithrilBar1

 - type: CP14Recipe
@@ -53,8 +45,6 @@
  requirements:
  - !type:ProtoIdResource
    protoId: CP14CrystalShardBase
-  - !type:KnowledgeRequired
-    knowledge: Glasswork
  result: CP14GlassSheet1

 - type: CP14Recipe
@@ -65,8 +55,6 @@
  - !type:ProtoIdResource
    protoId: CP14GlassShard
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: Glasswork
  result: CP14GlassSheet1

 - type: CP14Recipe
@@ -77,8 +65,6 @@
  - !type:StackResource
    stack: CP14GlassSheet
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: Glasswork
  result: CP14VialTiny

 - type: CP14Recipe
@@ -92,8 +78,6 @@
  - !type:StackResource
    stack: CP14GlassSheet
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: Glasswork
  result: CP14VialTinyReinforced

 - type: CP14Recipe
@@ -104,8 +88,6 @@
  - !type:StackResource
    stack: CP14GlassSheet
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: Glasswork
  result: CP14VialSmall

 - type: CP14Recipe
@@ -119,8 +101,6 @@
  - !type:StackResource
    stack: CP14GlassSheet
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: Glasswork
  result: CP14VialSmallReinforced

 - type: CP14Recipe
@@ -131,8 +111,6 @@
  - !type:StackResource
    stack: CP14GlassSheet
    count: 6
-  - !type:KnowledgeRequired
-    knowledge: Glasswork
  result: CP14VialMedium

 - type: CP14Recipe
@@ -146,8 +124,6 @@
  - !type:StackResource
    stack: CP14GlassSheet
    count: 6
-  - !type:KnowledgeRequired
-    knowledge: Glasswork
  result: CP14VialMediumReinforced

 - type: CP14Recipe
@@ -161,10 +137,6 @@
  - !type:StackResource
    stack: CP14GoldBar
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: Glasswork
-  - !type:KnowledgeRequired
-    knowledge: MetallMelting
  result: CP14BaseAlchemyBomb
  resultCount: 3
  
--- a/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml
+++ b/Resources/Prototypes/_CP14/Recipes/Workbench/sewing_table.yml
@@ -10,8 +10,6 @@
  - !type:StackResource
    stack: CP14Cloth
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: ClothingSewing
  result: CP14ClothingShirtCottonBlue

 - type: CP14Recipe
@@ -26,8 +24,6 @@
  - !type:StackResource
    stack: CP14Cloth
    count: 3
-  - !type:KnowledgeRequired
-    knowledge: ClothingSewing
  result: CP14ClothingShirtCottonBlack

 - type: CP14Recipe
@@ -42,8 +38,6 @@
  - !type:StackResource
    stack: CP14Cloth
    count: 3
-  - !type:KnowledgeRequired
-    knowledge: ClothingSewing
  result: CP14ClothingShirtCottonPurple

 - type: CP14Recipe
@@ -58,8 +52,6 @@
  - !type:StackResource
    stack: CP14Cloth
    count: 3
-  - !type:KnowledgeRequired
-    knowledge: ClothingSewing
  result: CP14ClothingShirtCottonRed

 - type: CP14Recipe
@@ -72,8 +64,6 @@
  - !type:StackResource
    stack: CP14Cloth
    count: 3
-  - !type:KnowledgeRequired
-    knowledge: ClothingSewing
  result: CP14ClothingShirtCottonWhite

 - type: CP14Recipe
@@ -88,8 +78,6 @@
  - !type:StackResource
    stack: CP14Cloth
    count: 3
-  - !type:KnowledgeRequired
-    knowledge: ClothingSewing
  result: CP14ClothingShirtCottonYellow

 - type: CP14Recipe
@@ -104,8 +92,6 @@
  - !type:StackResource
    stack: CP14Cloth
    count: 3
-  - !type:KnowledgeRequired
-    knowledge: ClothingSewing
  result: CP14ClothingShirtBlackDress

 - type: CP14Recipe
@@ -118,8 +104,6 @@
  - !type:StackResource
    stack: CP14Cloth
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: ClothingSewing
  result: CP14ClothingPantsTrouserWhite

 - type: CP14Recipe
@@ -134,8 +118,6 @@
  - !type:StackResource
    stack: CP14Cloth
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: ClothingSewing
  result: CP14ClothingPantsTrouserDarkBlue

 - type: CP14Recipe
@@ -150,8 +132,6 @@
  - !type:StackResource
    stack: CP14Cloth
    count: 1
-  - !type:KnowledgeRequired
-    knowledge: ClothingSewing
  result: CP14ClothingHeadHuntersHat

 - type: CP14Recipe
@@ -168,8 +148,6 @@
  - !type:StackResource
    stack: CP14Cloth
    count: 3
-  - !type:KnowledgeRequired
-    knowledge: AdvancedClothingSewing
  result: CP14ClothingShirtMercenary

 - type: CP14Recipe
@@ -188,8 +166,6 @@
  - !type:StackResource
    stack: CP14Cloth
    count: 3
-  - !type:KnowledgeRequired
-    knowledge: AdvancedClothingSewing
  result: CP14ClothingYellowWizardDress

 - type: CP14Recipe
@@ -206,8 +182,6 @@
  - !type:StackResource
    stack: CP14Cloth
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: AdvancedClothingSewing
  result: CP14ClothingHeadBeretMercenary

 - type: CP14Recipe
@@ -224,8 +198,6 @@
  - !type:StackResource
    stack: CP14Cloth
    count: 2
-  - !type:KnowledgeRequired
-    knowledge: AdvancedClothingSewing
  result: CP14ClothingPantsMercenaryTrousers

 # Misc
@@ -240,8 +212,6 @@
  - !type:StackResource
    stack: CP14Cloth
    count: 4
-  - !type:KnowledgeRequired
-    knowledge: ClothingSewing
  result: CP14SackFarming

 # Wallpaper (TODO: Move to separate workbench?)
@@ -256,8 +226,6 @@
    count: 10
  - !type:ProtoIdResource
    protoId: CP14DyeBlack
-  - !type:KnowledgeRequired
-    knowledge: WallpaperCraft
  result: CP14WallpaperBlack

 - type: CP14Recipe
@@ -270,8 +238,6 @@
    count: 10
  - !type:ProtoIdResource
    protoId: CP14DyeGreen
-  - !type:KnowledgeRequired
-    knowledge: WallpaperCraft
  result: CP14WallpaperGreen

 - type: CP14Recipe
@@ -284,8 +250,6 @@
    count: 10
  - !type:ProtoIdResource
    protoId: CP14DyePurple
-  - !type:KnowledgeRequired
-    knowledge: WallpaperCraft
  result: CP14WallpaperPurple

 - type: CP14Recipe
@@ -298,8 +262,6 @@
    count: 10
  - !type:ProtoIdResource
    protoId: CP14DyeRed
-  - !type:KnowledgeRequired
-    knowledge: WallpaperCraft
  result: CP14WallpaperRed

 - type: CP14Recipe
@@ -310,8 +272,6 @@
  - !type:StackResource
    stack: CP14Cloth
    count: 10
-  - !type:KnowledgeRequired
-    knowledge: WallpaperCraft
  result: CP14WallpaperWhite

 - type: CP14Recipe
@@ -322,8 +282,6 @@
  - !type:StackResource
    stack: CP14Cloth
    count: 10
-  - !type:KnowledgeRequired
-    knowledge: WallpaperCraft
  result: CP14WallpaperWhite2

 - type: CP14Recipe
@@ -336,6 +294,4 @@
    count: 10
  - !type:ProtoIdResource
    protoId: CP14DyeYellow
-  - !type:KnowledgeRequired
-    knowledge: WallpaperCraft
  result: CP14WallpaperYellow
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/alchemist.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/alchemist.yml
@@ -6,10 +6,6 @@
  startingGear: CP14AlchemistGear
  icon: "CP14JobIconAlchemist"
  supervisors: cp14-job-supervisors-command
-  special:
-  - !type:CP14AddKnowledgeSpecial
-    knowledge:
-    - WoodWork
  requirements:
    - !type:RoleTimeRequirement
      role: CP14JobApprentice
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/apprentice.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/apprentice.yml
@@ -6,10 +6,6 @@
  startingGear: CP14ApprenticeGear
  icon: "CP14JobIconApprentice"
  supervisors: cp14-job-supervisors-command
-  special:
-  - !type:CP14AddKnowledgeSpecial
-    knowledge:
-    - WoodWork

 - type: startingGear
  id: CP14ApprenticeGear
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/blacksmith.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/blacksmith.yml
@@ -6,13 +6,6 @@
  startingGear: CP14BlacksmithGear
  icon: "CP14JobIconBlacksmith"
  supervisors: cp14-job-supervisors-command
-  special:
-  - !type:CP14AddKnowledgeSpecial
-    knowledge:
-    - WoodWork
-    - MetallMelting
-    - MetallForging
-    - Glasswork
  requirements:
    - !type:RoleTimeRequirement
      role: CP14JobApprentice
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/innkeeper.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Artisan/innkeeper.yml
@@ -6,10 +6,6 @@
  startingGear: CP14InnkeeperGear
  icon: "CP14JobIconInnkeeper"
  supervisors: cp14-job-supervisors-command
-  special:
-  - !type:CP14AddKnowledgeSpecial
-    knowledge:
-    - WoodWork

 - type: startingGear
  id: CP14InnkeeperGear
--- 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:CP14AddKnowledgeSpecial
-    knowledge:
-    - WoodWork

 - 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:CP14AddKnowledgeSpecial
-    knowledge:
-    - WoodWork
  requirements:
    - !type:DepartmentTimeRequirement
      department: CP14Guard
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Mercenary/adventurer.yml
@@ -6,10 +6,6 @@
  startingGear: CP14AdventurerGear
  icon: "CP14JobIconAdventurer"
  supervisors: cp14-job-supervisors-guildmaster
-  special:
-  - !type:CP14AddKnowledgeSpecial
-    knowledge:
-    - WoodWork

 - type: startingGear
  id: CP14AdventurerGear
--- a/Resources/Prototypes/_CP14/Roles/Jobs/Traders/merchant.yml
+++ b/Resources/Prototypes/_CP14/Roles/Jobs/Traders/merchant.yml
@@ -6,10 +6,6 @@
  startingGear: CP14MerchantGear
  icon: "CP14JobIconMerchant"
  supervisors: cp14-job-supervisors-commandant
-  special:
-  - !type:CP14AddKnowledgeSpecial
-    knowledge:
-    - WoodWork
  requirements:
    - !type:OverallPlaytimeRequirement
      time: 3600 # 1 hours
--- a/Resources/Prototypes/_CP14/Skill/atlethic.yml
+++ b/Resources/Prototypes/_CP14/Skill/atlethic.yml
@@ -0,0 +1,19 @@
+- type: cp14Skill
+  id: CP14ActionSpellKick
+  skillUiPosition: 0, 0
+  tree: Atlethic
+  icon:
+    sprite: _CP14/Actions/Spells/physical.rsi
+    state: kick
+  effect: !type:AddAction
+    action: CP14ActionSpellKick
+
+- type: cp14Skill
+  id: CP14ActionSpellSprint
+  skillUiPosition: 0, 2
+  tree: Atlethic
+  icon:
+    sprite: _CP14/Actions/Spells/physical.rsi
+    state: sprint
+  effect: !type:AddAction
+    action: CP14ActionSpellSprint
--- a/Resources/Prototypes/_CP14/Skill/healing.yml
+++ b/Resources/Prototypes/_CP14/Skill/healing.yml
@@ -0,0 +1,73 @@
+- type: cp14Skill
+  id: CP14ActionSpellCureBurn
+  skillUiPosition: 0, 0
+  tree: Healing
+  learnCost: 10 #Temp disable healing
+  icon:
+    sprite: _CP14/Actions/Spells/healing.rsi
+    state: cure_burn
+  effect: !type:AddAction
+    action: CP14ActionSpellCureBurn
+
+- type: cp14Skill
+  id: CP14ActionSpellBloodPurification
+  skillUiPosition: 2, 0
+  learnCost: 10 #Temp disable healing
+  tree: Healing
+  icon:
+    sprite: _CP14/Actions/Spells/healing.rsi
+    state: cure_poison
+  effect: !type:AddAction
+    action: CP14ActionSpellBloodPurification
+
+- type: cp14Skill
+  id: CP14ActionSpellCureWounds
+  skillUiPosition: 4, 0
+  learnCost: 10 #Temp disable healing
+  tree: Healing
+  icon:
+    sprite: _CP14/Actions/Spells/healing.rsi
+    state: cure_wounds
+  effect: !type:AddAction
+    action: CP14ActionSpellCureWounds
+
+- type: cp14Skill
+  id: CP14ActionSpellPlantGrowth
+  skillUiPosition: 0, 2
+  tree: Healing
+  icon:
+    sprite: _CP14/Actions/Spells/healing.rsi
+    state: plant_growth
+  effect: !type:AddAction
+    action: CP14ActionSpellPlantGrowth
+
+- type: cp14Skill
+  id: CP14ActionSpellHealBallade
+  skillUiPosition: 0, 6
+  learnCost: 10 #Temp disable healing
+  tree: Healing
+  icon:
+    sprite: _CP14/Actions/Spells/healing.rsi
+    state: heal_music
+  effect: !type:AddAction
+    action: CP14ActionSpellHealBallade
+
+- type: cp14Skill
+  id: CP14ActionSpellPeaceBallade
+  skillUiPosition: 0, 8
+  tree: Healing
+  icon:
+    sprite: _CP14/Actions/Spells/healing.rsi
+    state: peace_music
+  effect: !type:AddAction
+    action: CP14ActionSpellPeaceBallade
+
+- type: cp14Skill
+  id: CP14ActionSpellSpeedBallade
+  skillUiPosition: 0, 10
+  tree: Healing
+  icon:
+    sprite: _CP14/Actions/Spells/healing.rsi
+    state: speed_music
+  effect: !type:AddAction
+    action: CP14ActionSpellSpeedBallade
--- a/Resources/Prototypes/_CP14/Skill/hydrosophistry.yml
+++ b/Resources/Prototypes/_CP14/Skill/hydrosophistry.yml
@@ -0,0 +1,59 @@
+- type: cp14Skill
+  id: CP14ActionSpellFreeze
+  skillUiPosition: 0, 4
+  tree: Hydrosophistry
+  icon:
+    sprite: _CP14/Actions/Spells/water.rsi
+    state: freeze
+  effect: !type:AddAction
+    action: CP14ActionSpellFreeze
+
+- type: cp14Skill
+  id: CP14ActionSpellWaterCreation
+  skillUiPosition: 0, 0
+  tree: Hydrosophistry
+  icon:
+    sprite: _CP14/Actions/Spells/water.rsi
+    state: water_creation
+  effect: !type:AddAction
+    action: CP14ActionSpellWaterCreation
+
+- type: cp14Skill
+  id: CP14ActionSpellBeerCreation
+  skillUiPosition: 2, 0
+  tree: Hydrosophistry
+  icon:
+    sprite: _CP14/Actions/Spells/water.rsi
+    state: beer_creation
+  effect: !type:AddAction
+    action: CP14ActionSpellBeerCreation
+
+- type: cp14Skill
+  id: CP14ActionSpellIceShards
+  skillUiPosition: 0, 6
+  tree: Hydrosophistry
+  icon:
+    sprite: _CP14/Actions/Spells/water.rsi
+    state: ice_shards
+  effect: !type:AddAction
+    action: CP14ActionSpellIceShards
+
+- type: cp14Skill
+  id: CP14ActionSpellIceDagger
+  skillUiPosition: 0, 8
+  tree: Hydrosophistry
+  icon:
+    sprite: _CP14/Actions/Spells/water.rsi
+    state: ice_dagger
+  effect: !type:AddAction
+    action: CP14ActionSpellIceDagger
+
+- type: cp14Skill
+  id: CP14ActionSpellIceArrow
+  skillUiPosition: 0, 10
+  tree: Hydrosophistry
+  icon:
+    sprite: _CP14/Actions/Spells/water.rsi
+    state: ice_arrow
+  effect: !type:AddAction
+    action: CP14ActionSpellIceArrow
--- a/Resources/Prototypes/_CP14/Skill/illusion.yml
+++ b/Resources/Prototypes/_CP14/Skill/illusion.yml
@@ -0,0 +1,52 @@
+- type: cp14Skill
+  id: CP14ActionSpellSphereOfLight
+  skillUiPosition: 0, 0
+  tree: Illusion
+  icon:
+    sprite: _CP14/Actions/Spells/light.rsi
+    state: sphere_of_light
+  effect: !type:AddAction
+    action: CP14ActionSpellSphereOfLight
+
+- type: cp14Skill
+  id: CP14ActionSpellFlashLight
+  skillUiPosition: 2, 0
+  tree: Illusion
+  icon:
+    sprite: _CP14/Actions/Spells/light.rsi
+    state: flash_light
+  effect: !type:AddAction
+    action: CP14ActionSpellFlashLight
+
+- type: cp14Skill
+  id: CP14ActionSpellSignalLightRed
+  skillUiPosition: 0, 4
+  learnCost: 0.5
+  tree: Illusion
+  icon:
+    sprite: _CP14/Actions/Spells/light.rsi
+    state: signal_light_red
+  effect: !type:AddAction
+    action: CP14ActionSpellSignalLightRed
+
+- type: cp14Skill
+  id: CP14ActionSpellSignalLightYellow
+  skillUiPosition: 0, 6
+  learnCost: 0.5
+  tree: Illusion
+  icon:
+    sprite: _CP14/Actions/Spells/light.rsi
+    state: signal_light_yellow
+  effect: !type:AddAction
+    action: CP14ActionSpellSignalLightYellow
+
+- type: cp14Skill
+  id: CP14ActionSpellSignalLightBlue
+  skillUiPosition: 0, 8
+  learnCost: 0.5
+  tree: Illusion
+  icon:
+    sprite: _CP14/Actions/Spells/light.rsi
+    state: signal_light_blue
+  effect: !type:AddAction
+    action: CP14ActionSpellSignalLightBlue
--- a/Resources/Prototypes/_CP14/Skill/metamagic.yml
+++ b/Resources/Prototypes/_CP14/Skill/metamagic.yml
@@ -0,0 +1,41 @@
+- type: cp14Skill
+  id: CP14ActionSpellMagicSplitting
+  skillUiPosition: 0, 0
+  tree: Metamagic
+  icon:
+    sprite: _CP14/Actions/Spells/meta.rsi
+    state: counter_spell
+  effect: !type:AddAction
+    action: CP14ActionSpellMagicSplitting
+    
+- type: cp14Skill
+  id: CP14ActionSpellManaGift
+  skillUiPosition: 0, 2
+  learnCost: 0.5
+  tree: Metamagic
+  icon:
+    sprite: _CP14/Actions/Spells/meta.rsi
+    state: mana_gift
+  effect: !type:AddAction
+    action: CP14ActionSpellManaGift
+    
+- type: cp14Skill
+  id: CP14ActionSpellManaConsume
+  skillUiPosition: 2, 2
+  learnCost: 0.5
+  tree: Metamagic
+  icon:
+    sprite: _CP14/Actions/Spells/meta.rsi
+    state: mana_consume
+  effect: !type:AddAction
+    action: CP14ActionSpellManaConsume
+    
+- type: cp14Skill
+  id: CP14ActionSpellMagicBallade
+  skillUiPosition: 0, 6
+  tree: Metamagic
+  icon:
+    sprite: _CP14/Actions/Spells/meta.rsi
+    state: magic_music
+  effect: !type:AddAction 
+    action: CP14ActionSpellMagicBallade
--- a/Resources/Prototypes/_CP14/Skill/pyrokinetic.yml
+++ b/Resources/Prototypes/_CP14/Skill/pyrokinetic.yml
@@ -0,0 +1,19 @@
+- type: cp14Skill
+  id: CP14ActionSpellFlameCreation
+  skillUiPosition: 0, 0
+  tree: Pyrokinetic
+  icon:
+    sprite: _CP14/Actions/Spells/fire.rsi
+    state: flame_creation
+  effect: !type:AddAction
+    action: CP14ActionSpellFlameCreation
+
+- type: cp14Skill
+  id: CP14ActionSpellHellBallade
+  skillUiPosition: 0, 10
+  tree: Pyrokinetic
+  icon:
+    sprite: _CP14/Actions/Spells/fire.rsi
+    state: fire_music
+  effect: !type:AddAction
+    action: CP14ActionSpellHellBallade
--- a/Resources/Prototypes/_CP14/Skill/skill_tree.yml
+++ b/Resources/Prototypes/_CP14/Skill/skill_tree.yml
@@ -0,0 +1,35 @@
+- type: cp14SkillTree
+  id: Pyrokinetic
+  name: cp14-skill-tree-pyrokinetic-name
+  desc: cp14-skill-tree-pyrokinetic-desc
+  color: "#b52400"
+
+- type: cp14SkillTree
+  id: Hydrosophistry
+  name: cp14-skill-tree-hydrosophistry-name
+  desc: cp14-skill-tree-hydrosophistry-desc
+  color: "#1554a1"
+
+- type: cp14SkillTree
+  id: Illusion
+  name: cp14-skill-tree-illusion-name
+  desc: cp14-skill-tree-illusion-desc
+  color: "#f55faf"
+
+- type: cp14SkillTree
+  id: Metamagic
+  name: cp14-skill-tree-metamagic-name
+  desc: cp14-skill-tree-metamagic-desc
+  color: "#56e5f5"
+
+- type: cp14SkillTree
+  id: Healing
+  name: cp14-skill-tree-healing-name
+  desc: cp14-skill-tree-healing-desc
+  color: "#51cf72"
+
+- type: cp14SkillTree
+  id: Atlethic
+  name: cp14-skill-tree-atlethic-name
+  desc: cp14-skill-tree-atlethic-desc
+  color: "#b32e37"
--- a/Resources/Prototypes/_CP14/SoundCollections/music.yml
+++ b/Resources/Prototypes/_CP14/SoundCollections/music.yml
@@ -11,4 +11,12 @@
    - /Audio/_CP14/Ambience/Demiplane/intro1.ogg
    - /Audio/_CP14/Ambience/Demiplane/intro2.ogg
    - /Audio/_CP14/Ambience/Demiplane/intro3.ogg
-    - /Audio/_CP14/Ambience/Demiplane/intro4.ogg
+    - /Audio/_CP14/Ambience/Demiplane/intro4.ogg
+
+- type: soundCollection
+  id: CP14LearnSkill
+  files:
+    - /Audio/_CP14/Effects/skill_up1.ogg
+    - /Audio/_CP14/Effects/skill_up2.ogg
+    - /Audio/_CP14/Effects/skill_up3.ogg
+    - /Audio/_CP14/Effects/skill_up4.ogg