Skeleton update (#986)

* Literally everything

Как будто я не должен был делать всё в 1 коммит

* фиксы

маленькие изменения по запросу Эда

* fix

HideSpawnMenu

* fix2

fix

* final fix

final fix

* real final fix

* spell fix

* fix

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

@@ -28,29 +28,6 @@
     spells:
     - CP14ActionSpellIceShards
 
-- type: entity
-  id: CP14ClothingRingSkeletonWizard
-  parent: CP14ClothingRingBase
-  name: skeleton wizard conductive ring
-  suffix: Skeleton, Unremoveable
-  description: A mana conuctive ring for the true wizards
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Unremoveable
-  - type: CP14SpellStorageRequireAttune
-  - type: CP14MagicAttuningItem
-  - type: CP14SpellStorageAccessWearing
-  - type: CP14SpellStorage
-    spells:
-    - CP14ActionSpellIceShards
-    - CP14ActionSpellSphereOfLight
-    - CP14ActionSpellCureWounds
-    - CP14ActionSpellFlameCreation
-  - type: Sprite
-    layers:
-    - state: brass_ring
-    - state: berill_stone_small
-
 - type: entity
   id: CP14ClothingRingFireball
   parent: CP14ClothingRingBase

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

@@ -1,3 +1,14 @@
+- type: entity
+  id: CP14MobUndeadSkeletonDemiplane
+  parent: CP14BaseMobSkeleton
+  name: skeleton
+  description: Animated by the dark magic of a fragile skeleton. Skeletons are usually extremely intelligent creatures, controlled by a recently deceased soul.
+  abstract: true
+  components:
+  - type: NpcFactionMember
+    factions:
+    - CP14Monster
+
 - type: entity
   id: CP14MobUndeadSkeletonHalberd
   parent: CP14BaseMobSkeleton
@@ -6,16 +17,16 @@
   categories: [ ForkFiltered ]
   suffix: Halebard
   components:
-  - type: NpcFactionMember
-    factions:
-    - CP14Monster
   - type: Loadout
     prototypes: 
     - CP14MobSkeletonHalberd
+  - type: CP14AutoLearnAction
+    actions:
+    - CP14ActionSpellKick
 
 - type: entity
   id: CP14MobUndeadSkeletonSword
-  parent: CP14MobUndeadSkeletonHalberd
+  parent: CP14MobUndeadSkeletonDemiplane
   name: skeleton
   description: Animated by the dark magic of a fragile skeleton. Skeletons are usually extremely intelligent creatures, controlled by a recently deceased soul.
   categories: [ ForkFiltered ]
@@ -27,7 +38,7 @@
 
 - type: entity
   id: CP14MobUndeadSkeletonDodger
-  parent: CP14MobUndeadSkeletonHalberd
+  parent: CP14MobUndeadSkeletonDemiplane
   name: skeleton
   description: Animated by the dark magic of a fragile skeleton. Skeletons are usually extremely intelligent creatures, controlled by a recently deceased soul.
   categories: [ ForkFiltered ]
@@ -36,10 +47,13 @@
   - type: Loadout
     prototypes: 
     - CP14MobSkeletonDodger
+  - type: CP14AutoLearnAction
+    actions:
+    - CP14ActionSpellSprint
 
 - type: entity
   id: CP14MobUndeadSkeletonArcher
-  parent: CP14MobUndeadSkeletonHalberd
+  parent: CP14MobUndeadSkeletonDemiplane
   name: skeleton
   description: Animated by the dark magic of a fragile skeleton. Skeletons are usually extremely intelligent creatures, controlled by a recently deceased soul.
   categories: [ ForkFiltered ]
@@ -51,7 +65,7 @@
 
 - type: entity
   id: CP14MobUndeadSkeletonWizard
-  parent: CP14MobUndeadSkeletonHalberd
+  parent: CP14MobUndeadSkeletonDemiplane
   name: skeleton
   description: Animated by the dark magic of a fragile skeleton. Skeletons are usually extremely intelligent creatures, controlled by a recently deceased soul.
   categories: [ ForkFiltered ]
@@ -60,6 +74,16 @@
   - type: Loadout
     prototypes: 
     - CP14MobSkeletonWizard
+  - type: CP14MagicEnergyDraw
+    energy: 1
+    delay: 1
+  - type: CP14AutoLearnAction
+    actions:
+    - CP14ActionSpellIceShards
+    - CP14ActionSpellFreeze
+    - CP14ActionSpellFlameCreation
+    - CP14ActionSpellSphereOfLight
+    - CP14ActionSpellCureWounds
 
 - type: entity
   id: SpawnPointGhostDemiplaneSkeleton

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

@@ -35,6 +35,7 @@
     head: CP14ClothingHeadMetalHeadband
   inhand:
     - CP14TorchIgnited
+    - CP14BaseShield
 
 - type: startingGear
   id: CP14MobSkeletonDodger
@@ -54,8 +55,6 @@
     neck: CP14BowCombat
     belt1: CP14ClothingBeltQuiverCopperArrow
     pocket1: CP14SpellScrollSphereOfLight
-  #inhand:
-  #  - CP14SpellScrollSphereOfLight
 
 - type: startingGear
   id: CP14MobSkeletonWizard
@@ -65,7 +64,8 @@
     pants: CP14ClothingPantsBrown
     shoes: CP14LongLeatherBoots
     cloak: CP14ClothingCloakWhite
-    ring2: CP14ClothingRingSkeletonWizard
+  inhand:
+    - CP14ManaOperationGlove
 
 - type: startingGear
   id: CP14MobSkeletonCloset