Species free innate skill (#1277)

* innate free job skills

* returns species magic buff + unlock all skill

* Update tiefling.yml

* fix

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

@@ -41,6 +41,10 @@
   - type: CP14MagicEnergyDraw #Half of standard mana regeneration
     energy: 0.5
     delay: 3
+  - type: CP14SkillStorage #Innate metamagic
+    freeLearnedSkills:
+    - MetamagicT1
+    - MetamagicT2
   - type: Inventory
     templateId: CP14Human
     displacements:

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

@@ -73,6 +73,10 @@
     spawned:
       - id: CP14FoodMeatHuman # Replace it with silva meat, heh.
         amount: 5
+  - type: CP14SkillStorage #Innate vivification
+    freeLearnedSkills:
+    - HealingT1
+    - HealingT2
   - type: CP14MagicEnergyPhotosynthesis # Silva special feature #Disabled until sunlight fixed
   - type: CP14MagicEnergyDraw #Enabled default mana regen until sunlight fixed
     enable: false

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

@@ -44,14 +44,10 @@
     damage:
       Heat: 1 #Magic regen from fire
       Cold: -1
-  - type: CP14MagicManacostModify
-    globalModifier: 1.2
-    modifiers:
-      Fire: 0.5
-  - type: CP14SpellStorage
-    #grantAccessToSelf: true
-    #spells:
-    #- CP14ActionSpellTieflingInnerFire
+  - type: CP14SkillStorage #Innate pyrokinetic
+    freeLearnedSkills:
+    - PyrokineticT1
+    - PyrokineticT2
   - type: Inventory
     templateId: CP14Human
     femaleDisplacements:

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

@@ -58,17 +58,3 @@
   id: CP14ClothingShirtGuardsChainmailShirtB
   equipment:
     shirt: CP14ClothingShirtGuardsChainmailShirtB
-
-# Spells
-
-- type: loadoutGroup
-  id: CP14GuardSpells
-  name: cp14-loadout-guard-spells
-  loadouts:
-  - CP14ActionSpellFlashLight
-
-- type: loadout
-  id: CP14ActionSpellFlashLight
-  dummyEntity: CP14ActionSpellFlashLight
-  actions:
-  - CP14ActionSpellFlashLight

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

@@ -66,27 +66,4 @@
   id: CP14GuildmasterShoes
   name: cp14-loadout-guildmaster-shoes
   loadouts:
-  - CP14ShoesAristocraticBlack
-
-# Spells
-
-- type: loadoutGroup
-  id: CP14GuildmasterSpells
-  name: cp14-loadout-guildmaster-spells
-  minLimit: 2
-  maxLimit: 2
-  loadouts:
-  - CP14ActionSpellDemiplaneInfiltration
-  - CP14ActionSpellMonolithWarp
-
-- type: loadout
-  id: CP14ActionSpellDemiplaneInfiltration
-  dummyEntity: CP14ActionSpellDemiplaneInfiltration
-  actions:
-  - CP14ActionSpellDemiplaneInfiltration
-
-- type: loadout
-  id: CP14ActionSpellMonolithWarp
-  dummyEntity: CP14ActionSpellMonolithWarp
-  actions:
-  - CP14ActionSpellMonolithWarp
+  - CP14ShoesAristocraticBlack

Resources/Prototypes/_CP14/Loadouts/role_loadouts.yml

@@ -85,7 +85,6 @@
   - CP14GeneralShoes
   - CP14GeneralBack
   - CP14GeneralTrinkets
-  - CP14GuardSpells
 
 - type: roleLoadout
   id: JobCP14Guard
@@ -100,7 +99,6 @@
   - CP14GeneralShoes
   - CP14GeneralBack
   - CP14GeneralTrinkets
-  - CP14GuardSpells
 
 - type: roleLoadout
   id: JobCP14Commandant
@@ -125,7 +123,6 @@
   - CP14GuildmasterShoes
   - CP14GeneralBack
   - CP14GeneralTrinkets
-  - CP14GuildmasterSpells
 
 - type: roleLoadout
   id: JobCP14Merchant

Resources/Prototypes/_CP14/Skill/blacksmithing.yml

@@ -1,69 +1,68 @@
 - type: cp14Skill
   id: CopperMelting
-  skillUiPosition: 0, 0
+  skillUiPosition: 1, 0
   tree: Blacksmithing
   name: cp14-skill-copper-melt-name
-  learnCost: 0
+  learnCost: 0.5
   icon:
     sprite: _CP14/Objects/Materials/copper_ore.rsi
     state: ore3
-  restrictions:
-  - !type:Impossible
   effects:
   - !type:UnlockRecipes
 
 - type: cp14Skill
   id: IronMelting
-  skillUiPosition: 0, 2
+  skillUiPosition: 1, 2
   tree: Blacksmithing
   name: cp14-skill-iron-melt-name
-  learnCost: 0
+  learnCost: 0.5
   icon:
     sprite: _CP14/Objects/Materials/iron_ore.rsi
     state: ore3
-  restrictions:
-  - !type:Impossible
   effects:
   - !type:UnlockRecipes
+  restrictions:
+  - !type:NeedPrerequisite
+    prerequisite: CopperMelting
 
 - type: cp14Skill
   id: GoldMelting
   skillUiPosition: 0, 4
   tree: Blacksmithing
   name: cp14-skill-gold-melt-name
-  learnCost: 0
+  learnCost: 0.5
   icon:
     sprite: _CP14/Objects/Materials/gold_ore.rsi
     state: ore3
-  restrictions:
-  - !type:Impossible
   effects:
   - !type:UnlockRecipes
+  restrictions:
+  - !type:NeedPrerequisite
+    prerequisite: IronMelting
 
 - type: cp14Skill
   id: MithrilMelting
-  skillUiPosition: 0, 6
+  skillUiPosition: 2, 4
   tree: Blacksmithing
   name: cp14-skill-mithril-melt-name
-  learnCost: 0
+  learnCost: 0.5
   icon:
     sprite: _CP14/Objects/Materials/mithril_ore.rsi
     state: ore3
-  restrictions:
-  - !type:Impossible
   effects:
   - !type:UnlockRecipes
+  restrictions:
+  - !type:NeedPrerequisite
+    prerequisite: IronMelting
 
 - type: cp14Skill
   id: GlassMelting
-  skillUiPosition: 2, 0
+  skillUiPosition: 3, 0
   tree: Blacksmithing
   name: cp14-skill-glass-melt-name
-  learnCost: 0
+  learnCost: 0.5
   icon:
     sprite: _CP14/Objects/Materials/glass.rsi
     state: glass_3
-  restrictions:
-  - !type:Impossible
   effects:
   - !type:UnlockRecipes

Resources/Prototypes/_CP14/Skill/hydrosophistry.yml

@@ -12,7 +12,7 @@
 
 - type: cp14Skill
   id: CP14ActionSpellWaterCreation
-  skillUiPosition: 0, 4
+  skillUiPosition: 1, 4
   tree: Hydrosophistry
   icon:
     sprite: _CP14/Actions/Spells/water.rsi
@@ -26,8 +26,9 @@
 
 - type: cp14Skill
   id: CP14ActionSpellBeerCreation
-  skillUiPosition: 2, 4
+  skillUiPosition: 1, 8
   tree: Hydrosophistry
+  learnCost: 0
   icon:
     sprite: _CP14/Actions/Spells/water.rsi
     state: beer_creation
@@ -36,24 +37,10 @@
     action: CP14ActionSpellBeerCreation
   restrictions:
   - !type:NeedPrerequisite
-    prerequisite: HydrosophistryT1
+    prerequisite: CP14ActionSpellWaterCreation
   - !type:SpeciesWhitelist
     species: CP14Dwarf
 
-- type: cp14Skill
-  id: CP14ActionSpellIceShards
-  skillUiPosition: 2, 6
-  tree: Hydrosophistry
-  icon:
-    sprite: _CP14/Actions/Spells/water.rsi
-    state: ice_shards
-  effects: 
-  - !type:AddAction
-    action: CP14ActionSpellIceShards
-  restrictions:
-  - !type:NeedPrerequisite
-    prerequisite: HydrosophistryT1
-
 - type: cp14Skill
   id: CP14ActionSpellIceDagger
   skillUiPosition: 0, 6
@@ -70,7 +57,7 @@
 
 - type: cp14Skill
   id: CP14ActionSpellIceArrow
-  skillUiPosition: 0, 8
+  skillUiPosition: 2, 6
   tree: Hydrosophistry
   icon:
     sprite: _CP14/Actions/Spells/water.rsi
@@ -114,6 +101,20 @@
   - !type:NeedPrerequisite
     prerequisite: HydrosophistryT2
 
+- type: cp14Skill
+  id: CP14ActionSpellIceShards
+  skillUiPosition: 8, 4
+  tree: Hydrosophistry
+  icon:
+    sprite: _CP14/Actions/Spells/water.rsi
+    state: ice_shards
+  effects: 
+  - !type:AddAction
+    action: CP14ActionSpellIceShards
+  restrictions:
+  - !type:NeedPrerequisite
+    prerequisite: HydrosophistryT2
+
 # T3
 
 - type: cp14Skill

Resources/Prototypes/_CP14/Skill/martial_arts.yml

@@ -3,36 +3,30 @@
   skillUiPosition: 0, 0
   name: cp14-skill-sword-mastery-name
   desc: cp14-skill-mastery-desc
-  learnCost: 0
+  learnCost: 0.5
   tree: MartialArts
   icon: 
     sprite: _CP14/Objects/ModularTools/Blade/Sword/metall_sword.rsi
     state: preview
-  restrictions:
-  - !type:Impossible
 
 - type: cp14Skill
   id: RapierMastery
   skillUiPosition: 2, 0
   name: cp14-skill-parier-mastery-name
   desc: cp14-skill-mastery-desc
-  learnCost: 0
+  learnCost: 0.5
   tree: MartialArts
   icon: 
     sprite: _CP14/Objects/ModularTools/Blade/Rapier/metall_rapier.rsi
     state: preview
-  restrictions:
-  - !type:Impossible
 
 - type: cp14Skill
   id: SkimitarMastery
   skillUiPosition: 4, 0
   name: cp14-skill-skimitar-mastery-name
   desc: cp14-skill-mastery-desc
-  learnCost: 0
+  learnCost: 0.5
   tree: MartialArts
   icon: 
     sprite: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi
-    state: preview
-  restrictions:
-  - !type:Impossible
+    state: preview

Resources/Prototypes/_CP14/Skill/thaumaturgy.yml

@@ -4,13 +4,11 @@
   tree: Thaumaturgy
   name: cp14-skill-alchemy-vision-name
   desc: cp14-skill-alchemy-vision-desc
-  learnCost: 0
+  learnCost: 1
   icon:
     sprite: _CP14/Clothing/Eyes/alchemy_glasses.rsi
     state: icon
   effects: 
   - !type:AddComponents
     components:
-    - type: SolutionScanner
-  restrictions:
-  - !type:Impossible
+    - type: SolutionScanner