skelemake (#1276)

* skelemake

* sharded

* mastery

* Not so slow cast

* ok no demi deipletion

* skillstorage and Species

* ressurection dead

* fixed

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>

Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead_ballade.yml

@@ -11,6 +11,7 @@
   - type: CP14MagicEffectManaCost
     manaCost: 1
   - type: CP14MagicEffect
+    magicType: Life
     effects:
     - !type:CP14SpellSpawnEntityOnTarget # TODO заставить работать только на нежить
       spawns:

Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/resurrection_dead.yml

@@ -1,16 +1,19 @@
 - type: entity
-  id: CP14ActionSpellCureFromDeath
-  name: Cure from death
-  description: You heal the target from all kinds of damage.
+  id: CP14ActionSpellResurrectionDead
+  name: Death resurrection
+  description: You resurrect the target and cure it from damage.
   components:
   - type: Sprite
     sprite: _CP14/Actions/Spells/necromancy.rsi
     state: cure_dead
   - type: CP14MagicEffectCastSlowdown
-    speedMultiplier: 0.7
+    speedMultiplier: 0.9
   - type: CP14MagicEffectManaCost
-    manaCost: 4
+    manaCost: 20
+  - type: CP14MagicEffectAliveTargetRequired
+    inverted: true
   - type: CP14MagicEffect
+    magicType: Life
     telegraphyEffects:
     - !type:CP14SpellSpawnEntityOnTarget
       spawns:
@@ -19,27 +22,27 @@
     - !type:CP14SpellSpawnEntityOnTarget
       spawns:
       - CP14ImpactEffectResurrection
-    - !type:CP14SpellResurrectionEffect # TODO заставить работать только на нежить
+    - !type:CP14SpellResurrectionEffect
     - !type:CP14SpellApplyEntityEffect
       effects:
       - !type:HealthChange
         damage:
           types:
-            Asphyxiation: -2
-            Bloodloss: -2
-            Blunt: -2
-            Cellular: -1
-            Caustic: -2
-            Cold: -1
-            Heat: -1
-            Piercing: -2
-            Poison: -2
-            Radiation: -2
-            Shock: -2
-            Slash: -2
-  - type: CP14MagicEffectSomaticAspect
+            Asphyxiation: -500
+            Bloodloss: -100
+            Blunt: -25
+            Caustic: -25
+            Cold: -25
+            Heat: -50
+            Piercing: -25
+            Poison: -25
+            Radiation: -25
+            Shock: -25
+            Slash: -25
+      - !type:Jitter
   - type: CP14MagicEffectVerbalAspect
-    startSpeech: "Surge, hominem mortuum!"
+    startSpeech: "Surge..."
+    endSpeech: "Hominem mortuum"
   - type: CP14MagicEffectCastingVisual
     proto: CP14RuneResurrection
   - type: EntityTargetAction
@@ -49,14 +52,15 @@
     range: 10
     itemIconStyle: BigAction
     interactOnMiss: false
+    canTargetSelf: false
     sound: !type:SoundPathSpecifier
       path: /Audio/Magic/rumble.ogg
     icon:
       sprite: _CP14/Actions/Spells/necromancy.rsi
       state: cure_dead
-    event: !type:CP14ToggleableEntityTargetActionEvent
-      cooldown: 2
-      castTime: 10
+    event: !type:CP14DelayedEntityTargetActionEvent
+      cooldown: 10
+      castDelay: 2
       breakOnMove: false
       breakOnDamage: false
 

Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/kick.yml

@@ -94,4 +94,6 @@
     event: !type:CP14DelayedEntityTargetActionEvent
       cooldown: 5
       castDelay: 0.4
-
+      distanceThreshold: 1.5
+      breakOnMove: false
+      breakOnDamage: false

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

@@ -8,6 +8,12 @@
   - type: NpcFactionMember
     factions:
     - CP14Monster
+  - type: CP14SkillStorage
+    experienceMaxCap: 0
+    freeLearnedSkills:
+    - SwordMastery
+    - RapierMastery
+    - SkimitarMastery
 
 - type: entity
   id: CP14MobUndeadSkeletonHalberdT1

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

@@ -1,6 +1,6 @@
 - type: entity
   id: CP14MobUndeadSkeletonDemiplaneT2
-  parent: CP14BaseMobSkeleton
+  parent: CP14MobUndeadSkeletonDemiplaneT1 
   name: skeleton
   abstract: true
   components:
@@ -77,20 +77,38 @@
   - type: Loadout
     prototypes:
     - CP14MobSkeletonWizardT2
-  - type: CP14MagicEnergyDraw
-    energy: 1
-    delay: 1
+  - type: CP14MagicEnergyContainer
+    magicAlert: CP14MagicEnergy
+    maxEnergy: 200
+    energy: 200
+    unsafeSupport: true
+  - type: PassiveDamage
+    allowedStates:
+    - Alive
+    damage:
+      types:
+        CP14ManaDepletion: -0.1
+  - type: CP14SkillStorage
+    experienceMaxCap: 0
+    freeLearnedSkills:
+    - SwordMastery
+    - RapierMastery
+    - SkimitarMastery
+    - HydrosophistryT1
+    - HydrosophistryT2
+    - MetamagicT1
+    - MetamagicT2
+    - CP14ActionSpellFreeze
+    - CP14ActionSpellIceShards
+    - CP14ActionSpellManaConsumeElf
+    - CP14ActionSpellManaGiftElf
+    - CP14ActionSpellMagicSplitting
+    - CP14ActionSpellManaTrance
   - type: CP14SpellStorage
     grantAccessToSelf: true
     spells:
-    - CP14ActionSpellFreeze
-    - CP14ActionSpellIceShards
-    - CP14ActionSpellIceDagger
-    - CP14ActionSpellCureFromDeath
+    - CP14ActionSpellResurrectionDead
     - CP14ActionSpellShadowStep
-    - CP14ActionSpellShadowSwap
-    - CP14ActionSpellShadowGrab
-
 - type: entity
   id: CP14MobUndeadSkeletonBardT2
   parent: CP14MobUndeadSkeletonDemiplaneT2

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

@@ -39,7 +39,7 @@
     offset: 1
     table: !type:GroupSelector
       rolls: !type:RangeNumberSelector
-        range: 1, 5
+        range: 3, 5
       children:
       - id: CP14MobUndeadZombie
         weight: 2
@@ -50,6 +50,32 @@
     tags:
     - FootstepSound
     - CP14RaidLeader
+  - type: CP14SkillStorage
+    experienceMaxCap: 0
+    freeLearnedSkills:
+    - SwordMastery
+    - RapierMastery
+    - SkimitarMastery
+    - MetamagicT1
+    - MetamagicT2
+    - HydrosophistryT1
+    - HydrosophistryT2
+    - PyrokineticT1
+    - PyrokineticT2
+    - CP14ActionSpellFireball
+    - CP14ActionSpellFreeze
+    - CP14ActionSpellIceShards
+    - CP14ActionSpellManaConsumeElf
+    - CP14ActionSpellManaGiftElf
+    - CP14ActionSpellMagicSplitting
+    - CP14ActionSpellManaTrance
+  - type: CP14SpellStorage
+    grantAccessToSelf: true
+    spells:
+    - CP14ActionSpellResurrectionDead
+  - type: Loadout
+    prototypes:
+    - CP14MobSkeletonWizardTownRaid
 
 - type: entity
   id: CP14SpawnPointTownRaidUndeadEasy

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

@@ -400,6 +400,7 @@
   - BaseMob
   - CP14MobDamageable
   - CP14MobMagical
+  - CP14BaseMobSpecies
   id: CP14BaseMobSpeciesNoLife
   categories: [ ForkFiltered ]
   abstract: true

Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/daggers.yml

@@ -43,5 +43,4 @@
   - type: CP14ModularCraftAutoAssemble
     details:
     - BladeIronDagger
-    - InlayQuartzElectric
-
+    - InlayQuartzElectric

Resources/Prototypes/_CP14/Entities/Objects/Weapons/ModularPresets/skimitar.yml

@@ -13,3 +13,49 @@
     details:
     - BladeIronSkimitar
 
+- type: entity
+  id: CP14ModularCopperSkimitar
+  parent: CP14ModularGripWooden
+  name: copper skimitar
+  description: the gold standard of edged weapons. Medium length, comfortable grip. No frills.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - sprite: _CP14/Objects/ModularTools/Blade/Skimitar/metall_skimitar.rsi
+      state: icon
+  - type: CP14ModularCraftAutoAssemble
+    details:
+    - BladeCopperSkimitar
+
+- type: entity
+  id: CP14ModularIronSkimitarTundra
+  parent: CP14ModularGripWooden
+  name: Skimitar Tundra
+  description: the gold standard of edged weapons. Medium length, comfortable grip. It has "tundra" engraved on it.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
+      state: icon
+  - type: CP14ModularCraftAutoAssemble
+    details:
+    - BladeIronSkimitar
+    - InlayQuartzWater
+
+- type: entity
+  id: CP14ModularGoldSkimitarAgony
+  parent: CP14ModularGripWooden
+  name: Skimitar Agony
+  description: the gold standard of edged weapons. Medium length, comfortable grip. It has "agony" engraved on it.
+  components:
+  - type: Sprite
+    layers:
+    - state: icon
+    - sprite: _CP14/Objects/ModularTools/Blade/Dagger/metall_dagger.rsi
+      state: icon
+  - type: CP14ModularCraftAutoAssemble
+    details:
+    - BladeGoldSkimitar
+    - InlayQuartzElectric

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

@@ -6,6 +6,18 @@
   equipment:
     pants: CP14ClothingPantsLoincloth
 
+- type: startingGear
+  id: CP14MobSkeletonWizardTownRaid
+  equipment:
+    outerClothing: CP14ClothingOuterClothingBoneArmor
+    cloak: CP14ClothingCloakBoneMage
+    head: CP14ClothingHeadTriangularHatGolden
+    shirt: CP14ClothingShirtCottonBlack
+    pants: CP14ClothingPantsBrown
+    shoes: CP14LongLeatherBoots
+    belt1: CP14ModularSkeletonSwordUpgrade
+    neck: CP14ModularIronPickaxe
+
 # TIER 1
 
 - type: startingGear
@@ -35,7 +47,7 @@
   equipment:
     mask: CP14ClothingMaskSinner
     pants: CP14ClothingPantsLoincloth
-    belt1: CP14ModularIronDagger
+    belt1: CP14ModularCopperSkimitar
     belt2: CP14ModularIronDagger
 
 - type: startingGear
@@ -77,8 +89,8 @@
     outerClothing: CP14ClothingOuterClothingBoneArmor
     mask: CP14ClothingMaskBoneHornedMask
     pants: CP14ClothingPantsLoincloth
-    belt1: CP14ModularIronDaggerTundra
-    belt2: CP14ModularIronDaggerAgony
+    belt1: CP14ModularIronSkimitarTundra
+    belt2: CP14ModularGoldSkimitarAgony
     shoes: CP14ClothingShoesSandals
 
 - type: startingGear
@@ -104,8 +116,6 @@
     shoes: CP14LongLeatherBoots
     ring2: CP14ClothingCloakAmuletMana
     belt1: CP14ModularSkeletonSword
-  inhand:
-    - CP14ManaOperationGlove
 
 - type: startingGear
   id: CP14MobSkeletonBardT2