Skeleton inteligence (#1447)

* help me ed

* skills

* god defence

* lantern gaze

* mask nerf

* tomer

* move lamp

* oops

* i hate new night vision

* like this?

* meh

* wizard

* atheism

* memory of health

Resources/Prototypes/_CP14/Entities/Clothing/Masks/masks.yml

@@ -106,9 +106,8 @@
     modifiers:
       coefficients:
         Blunt: 0.90
-        Slash: 0.90
-        Piercing: 0.90
-        Heat: 0.90
+        Slash: 0.95
+        Piercing: 0.95
 
 - type: entity
   parent: CP14ClothingMaskBase

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

@@ -54,9 +54,13 @@
   - type: Loadout
     prototypes:
     - CP14MobSkeletonDodgerT1
-  - type: CP14SpellStorage
-    grantAccessToSelf: true
-    spells:
+  - type: CP14SkillStorage
+    skillPoints:
+      Memory:
+        max: 0
+    freeLearnedSkills:
+    - AthleticT1
+    - AthleticT2
     - CP14ActionSpellKick
     - CP14ActionSpellSprint
 
@@ -72,8 +76,15 @@
   - type: CP14SpellStorage
     grantAccessToSelf: true
     spells:
-    - CP14ActionSpellIceArrow
     - CP14ActionSpellSprint
+  - type: CP14SkillStorage
+    skillPoints:
+      Memory:
+        max: 1
+    freeLearnedSkills:
+    - HydrosophistryT1
+    learnedSkills:
+    - CP14ActionSpellIceArrow
 
 - type: entity
   id: CP14SpawnPointGhostDemiplaneSkeletonT1

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

@@ -46,11 +46,17 @@
   - type: Loadout
     prototypes:
     - CP14MobSkeletonDodgerT2
-  - type: CP14SpellStorage
-    grantAccessToSelf: true
-    spells:
+  - type: CP14SkillStorage
+    skillPoints:
+      Memory:
+        max: 0
+    freeLearnedSkills:
+    - AthleticT1
+    - AthleticT2
+    - AthleticT3
     - CP14ActionSpellKick
     - CP14ActionSpellSprint
+    - CP14ActionSpellDash
 
 - type: entity
   id: CP14MobUndeadSkeletonArcherT2
@@ -64,8 +70,15 @@
   - type: CP14SpellStorage
     grantAccessToSelf: true
     spells:
-    - CP14ActionSpellSprint
     - CP14ActionSpellShadowStep
+    - CP14ActionSpellSprint
+  - type: CP14SkillStorage
+    skillPoints:
+      Memory:
+        max: 1
+    freeLearnedSkills:
+    - HydrosophistryT1
+    learnedSkills:
     - CP14ActionSpellIceArrow
 
 - type: entity
@@ -91,7 +104,7 @@
   - type: CP14SkillStorage
     skillPoints:
       Memory:
-        max: 0 
+        max: 4
     freeLearnedSkills:
     - SwordMastery
     - RapierMastery
@@ -100,13 +113,13 @@
     - HydrosophistryT2
     - MetamagicT1
     - MetamagicT2
-    - CP14ActionSpellFreeze
-    - CP14ActionSpellIceShards
+    - PyrokineticT1
+    - CP14ActionSpellManaConsume
+    - CP14ActionSpellManaGift
     - CP14ActionSpellManaConsumeElf
     - CP14ActionSpellManaGiftElf
     - CP14ActionSpellMagicSplitting
     - CP14ActionSpellManaTrance
-
 - type: entity
   id: CP14MobUndeadSkeletonBardT2
   parent: CP14MobUndeadSkeletonDemiplaneT2
@@ -139,7 +152,7 @@
         weight: 40
         children:
         - id: CP14SpawnPointGhostDemiplaneSkeletonWizardT2
-        - id: CP14SpawnPointGhostDemiplaneSkeletonBardT2
+#        - id: CP14SpawnPointGhostDemiplaneSkeletonBardT2
       - !type:GroupSelector
         weight: 60
         children:

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

@@ -53,7 +53,7 @@
   - type: CP14SkillStorage
     skillPoints:
       Memory:
-        max: 0
+        max: 4
     freeLearnedSkills:
     - SwordMastery
     - RapierMastery
@@ -62,8 +62,10 @@
     - MetamagicT2
     - HydrosophistryT1
     - HydrosophistryT2
-    - CP14ActionSpellFreeze
-    - CP14ActionSpellIceShards
+    - PyrokineticT1
+    - PyrokineticT2
+    - CP14ActionSpellManaConsume
+    - CP14ActionSpellManaGift
     - CP14ActionSpellManaConsumeElf
     - CP14ActionSpellManaGiftElf
     - CP14ActionSpellMagicSplitting

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

@@ -71,11 +71,11 @@
   - type: MobThresholds
     thresholds:
       0: Alive
-      50: Dead
+      100: Dead
   - type: SlowOnDamage
     speedModifierThresholds:
-      30: 0.8
-      40: 0.6
+      70: 0.7
+      90: 0.5
   - type: Fixtures
     fixtures:
       fix1:
@@ -97,7 +97,7 @@
     thresholds:
     - trigger:
         !type:DamageTrigger
-        damage: 50
+        damage: 100
       behaviors:
       - !type:GibBehavior
   - type: Vocal

Resources/Prototypes/_CP14/Entities/Structures/Specific/Demiplanes/round_end.yml

@@ -110,4 +110,4 @@
   - type: PointLight
     color: "#9c34e6"
     energy: 2.5
-    radius: 8
+    radius: 8

Resources/Prototypes/_CP14/Entities/Tiles/astral_corrosion.yml

@@ -28,4 +28,3 @@
             basalt3: ""
             basalt4: ""
             basalt5: ""
-

Resources/Prototypes/_CP14/Religion/religions.yml

@@ -2,4 +2,4 @@
   id: Merkas
 
 - type: cp14Religion
-  id: Lumera
+  id: Lumera