major fix pack

2025-06-16 00:32:20 +03:00
parent 95244a89c2
commit bc5ed46a9c
56 changed files with 81 additions and 141 deletions
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead_ballade.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead_ballade.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellHealFromDeathBallade
+  parent: CP14ActionSpellBase
  name: Healing from death ballade
  description: Your music is filled with healing magic, fast healing all the creatures around you.
  components:
@@ -20,9 +21,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneDeadHealBallade
  - type: Action
-    itemIconStyle: BigAction
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/necromancy.rsi
      state: dead_heal_ballade
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/resurrection_dead.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/resurrection_dead.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellResurrectionDead
+  parent: CP14ActionSpellBase
  name: Death resurrection
  description: You resurrect the target and cure it from damage.
  components:
@@ -46,15 +47,12 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneResurrection
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/necromancy.rsi
      state: cure_dead
  - type: TargetAction
    range: 10
    interactOnMiss: false
-    itemIconStyle: BigAction
  - type: EntityTargetAction
    whitelist:
      components:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/darkmist.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/darkmist.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellGodLumeraDarkmist
+  parent: CP14ActionSpellBase
  name: Impenetrable darkness
  description: You summon a thick fog that obscures vision and disorients mortals.
  components:
@@ -16,9 +17,6 @@
      spawns:
      - CP14LumeraDarkMist
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/Eldritch/voidblink.ogg
-    itemIconStyle: BigAction
    icon:
      sprite: _CP14/Actions/DemigodSpells/lumera.rsi
      state: mist
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/mind_degrade.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/mind_degrade.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellGodLumeraMindDegrade
+  parent: CP14ActionSpellBase
  name: The Wrath of Lumera
  description: "You unleash your anger on the creature, stunning it, inflicting damage, and burning its mind, removing 0.5 memory points."
  components:
@@ -50,22 +51,19 @@
        sprintSpeedModifier: 0.5
        statusLifetime: 30
  - type: Action
-    itemIconStyle: BigAction
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/DemigodSpells/lumera.rsi
      state: wrath
  - type: TargetAction
    checkCanAccess: false
+    range: 100
+  - type: EntityTargetAction
    blacklist:
      components:
      - CP14ReligionEntity
    whitelist:
      components:
      - CP14SkillStorage
-    range: 100
-  - type: EntityTargetAction
    canTargetSelf: false
    event: !type:CP14DelayedEntityTargetActionEvent
      cooldown: 300
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/mind_upgrade.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/mind_upgrade.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellGodLumeraMindUpgrade
+  parent: CP14ActionSpellBase
  name: Expansion of consciousness
  description: "You expand the boundaries of what is possible for the chosen creature, revealing to it the secrets of the universe. The target gains +0.5 memory points, up to a maximum of 6.5"
  components:
@@ -51,22 +52,19 @@
        sprintSpeedModifier: 0.5
        statusLifetime: 30
  - type: Action
-    itemIconStyle: BigAction
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/DemigodSpells/lumera.rsi
      state: mind_upgrade
  - type: TargetAction
    checkCanAccess: false
+    range: 100
+  - type: EntityTargetAction
    blacklist:
      components:
      - CP14ReligionEntity
    whitelist:
      components:
      - CP14SkillStorage
-    range: 100
-  - type: EntityTargetAction
    canTargetSelf: false
    event: !type:CP14DelayedEntityTargetActionEvent
      cooldown: 300
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/moon_strike.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/moon_strike.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellGodLumeraMoonStrike
+  parent: CP14ActionSpellBase
  name: Lunar strike
  description: You focus the concentrated light of the stars into a single point, blinding and damaging everything that comes within reach of the angry goddess.
  components:
@@ -12,11 +13,10 @@
      spawns:
      - CP14SkyLumeraStrike
  - type: Action
-  - type: TargetAction
-    itemIconStyle: BigAction
    icon:
      sprite: _CP14/Actions/DemigodSpells/lumera.rsi
      state: moon_beam
+  - type: TargetAction
    repeat: true
    checkCanAccess: false
    range: 100
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/renounce.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/renounce.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellGodLumeraRenounce
+  parent: CP14ActionSpellBase
  name: Renunciation of a follower
  description: You are rejecting the chosen follower. They lose the opportunity to become your follower at any time.
  components:
@@ -12,12 +13,9 @@
  - type: ConfirmableAction
    popup: cp-renounce-action-god-popup
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/DemigodSpells/lumera.rsi
      state: renounce
-    itemIconStyle: BigAction
  - type: TargetAction
    repeat: true
    checkCanAccess: false
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/touch.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/touch.yml
@@ -16,12 +16,9 @@
      effects:
      - !type:Jitter
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/DemigodSpells/lumera.rsi
      state: touch
-    itemIconStyle: BigAction
  - type: TargetAction
    repeat: true
    checkCanAccess: false
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/generic.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/generic.yml
@@ -7,6 +7,7 @@
    icon:
      sprite: _CP14/Interface/Alerts/divine_offer.rsi
      state: unoffer
+    itemIconStyle: BigAction
    priority: -8
    checkCanInteract: false
    checkConsciousness: false
@@ -17,6 +18,7 @@

 - type: entity
  id: CP14ActionAppealToGod
+  parent: CP14ActionSpellBase
  name: Appeal to god
  description: You call upon your patron! He will hear your call wherever he may be.
  components:
@@ -29,13 +31,12 @@
      amount: 20
      safe: true
    - !type:CP14SpellSendMessageToGod
-  - type: InstantAction
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
+  - type: Action
    icon:
      sprite: _CP14/Actions/DemigodSpells/generic.rsi
      state: appeal
    priority: -8
+  - type: InstantAction
    event: !type:CP14DelayedInstantActionEvent
      cooldown: 15
      castDelay: 1.5
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_demiplane_infiltration.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_demiplane_infiltration.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellDemiplaneInfiltration
+  parent: CP14ActionSpellBase
  name: Demiplane infiltration
  description: You get inside the demiplane of your choice.
  components:
@@ -21,20 +22,17 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneDemiplaneInfiltration
  - type: Action
-    itemIconStyle: BigAction
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/dimension.rsi
      state: rift_arrow
  - type: TargetAction
+    checkCanAccess: true
+    range: 3
+  - type: EntityTargetAction
    whitelist:
      components:
      - CP14DemiplaneRift
    canTargetSelf: false
-    checkCanAccess: true
-    range: 3
-  - type: EntityTargetAction
    event: !type:CP14DelayedEntityTargetActionEvent
      cooldown: 50
      castDelay: 5
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_monolith_warp.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_monolith_warp.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellMonolithWarp
+  parent: CP14ActionSpellBase
  name: Monolith warp
  description: You open a dimensional rift that transports the creatures around it to the demiplane link crystal
  components:
@@ -23,9 +24,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneDemiplaneInfiltration
  - type: Action
-    itemIconStyle: BigAction
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/dimension.rsi
      state: demi_arrow
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T1_shadow_grab.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T1_shadow_grab.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellShadowGrab
+  parent: CP14ActionSpellBase
  name: Shadow grab
  description: You attract a ghostly hand that draws an object or entity to you
  components:
@@ -24,19 +25,16 @@
      - CP14ImpactEffectShadowStep
  - type: CP14MagicEffectSomaticAspect
  - type: Action
-    itemIconStyle: BigAction
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/dimension.rsi
      state: shadow_grab
  - type: TargetAction
+    range: 10
+  - type: EntityTargetAction
    whitelist:
      components:
      - Item
    canTargetSelf: false
-    range: 10
-  - type: EntityTargetAction
    event: !type:CP14DelayedEntityTargetActionEvent
      cooldown: 5
      castDelay: 0.5
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T1_shadow_swap.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T1_shadow_swap.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellShadowSwap
+  parent: CP14ActionSpellBase
  name: Shadow swap
  description: A warp of space between two living beings
  components:
@@ -25,19 +26,16 @@
  - type: CP14MagicEffectSomaticAspect
  - type: CP14MagicEffectAliveTargetRequired
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/dimension.rsi
      state: shadow_swap
-    itemIconStyle: BigAction
  - type: TargetAction
-    whitelist:
-      components:
-      - MobState
    range: 5
    interactOnMiss: false
  - type: EntityTargetAction
+    whitelist:
+      components:
+      - MobState
    event: !type:CP14DelayedEntityTargetActionEvent
      cooldown: 30
      hidden: true
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T2_shadow_step.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T2_shadow_step.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellShadowStep
+  parent: CP14ActionSpellBase
  name: Shadow step
  description: A step through the gash of reality that allows you to cover a small of distance quickly
  components:
@@ -21,12 +22,9 @@
    proto: CP14ImpactEffectShadowStep
  - type: CP14MagicEffectSomaticAspect
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/dimension.rsi
      state: shadow_step
-    itemIconStyle: BigAction
  - type: TargetAction
    range: 7
  - type: WorldTargetAction
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/MOB_spider_trap.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/MOB_spider_trap.yml
@@ -17,6 +17,7 @@
      spawns:
      - CP14ImpactSpiderTrap
  - type: Action
+    itemIconStyle: BigAction
    useDelay: 20
    sound: !type:SoundPathSpecifier
      path: /Audio/Animals/snake_hiss.ogg
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/T1_earth_wall.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/T1_earth_wall.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellEarthWall
+  parent: CP14ActionSpellBase
  name: Earth wall
  description: Raises a solid wall of earth from the bowels.
  components:
@@ -25,9 +26,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneEarthWall
  - type: Action
-    itemIconStyle: BigAction
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/earth.rsi
      state: earth_wall
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/fireball.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/fireball.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellFireball
+  parent: CP14ActionSpellBase
  name: Fireball
  description: An effective method of destruction - an explosive fireball
  components:
@@ -26,14 +27,11 @@
    proto: CP14RuneFireball
  - type: CP14MagicEffectPacifiedBlock
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/fire.rsi
      state: fireball
  - type: TargetAction
    checkCanAccess: false
-    raiseOnUser: true
    range: 60
  - type: WorldTargetAction
    event: !type:CP14DelayedWorldTargetActionEvent
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/firewave.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/firewave.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellFirewave
+  parent: CP14ActionSpellBase
  name: Firewave
  description: You release a wave of hot fire that strikes multiple targets in an area.
  components:
@@ -24,15 +25,12 @@
    proto: CP14RuneFirebolt
  - type: CP14MagicEffectPacifiedBlock
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/fire.rsi
      state: firewave
  - type: TargetAction
    repeat: true
    checkCanAccess: false
-    raiseOnUser: true
    range: 60
  - type: WorldTargetAction
    event: !type:CP14WorldTargetActionEvent
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/flame_creation.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/flame_creation.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellFlameCreation
+  parent: CP14ActionSpellBase
  name: Flame creation
  description: A artificial flame forms in your hand, illuminating your surroundings. You can throw it to use it as a disposable weapon.
  components:
@@ -24,8 +25,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneFlameCreation
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/fire.rsi
      state: flame_creation
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/heat.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/heat.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellHeat
+  parent: CP14ActionSpellBase
  name: Heat
  description: You start to heat the target up a lot, burning it from the inside.
  components:
@@ -28,8 +29,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneHeat
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/fire.rsi
      state: heat
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/hell_ballade.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/hell_ballade.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellHellBallade
+  parent: CP14ActionSpellBase
  name: Hell ballade
  description: Your music is infused with the power of fire and literally burns you and your enemies up.
  components:
@@ -35,8 +36,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneHellBallade
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/fire.rsi
      state: fire_music
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/tiefling_inner_fire.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/tiefling_inner_fire.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellTieflingInnerFire
+  parent: CP14ActionSpellBase
  name: Inner fire
  description: You unleash your inner fire, setting yourself on fire and temporarily speeding up your movement.
  components:
@@ -29,8 +30,6 @@
        sprintSpeedModifier: 1.2
        statusLifetime: 5
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/fire.rsi
      state: tiefling_revenge
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_heat.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_heat.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellCureBurn
+  parent: CP14ActionSpellBase
  name: Cure burn
  description: You heal skin damage caused by excessive cooling or heating.
  components:
@@ -35,8 +36,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneCureBurn
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/healing.rsi
      state: cure_burn
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_poison.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_poison.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellBloodPurification
+  parent: CP14ActionSpellBase
  name: Blood purification
  description: You cleanse the target's blood of poisons and acids, and restore its volume slightly
  components:
@@ -37,8 +38,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneBloodPurification
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/healing.rsi
      state: cure_poison
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_wounds.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_wounds.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellCureWounds
+  parent: CP14ActionSpellBase
  name: Cure wounds
  description: You heal the target from physical damage
  components:
@@ -37,8 +38,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneCureWounds
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/healing.rsi
      state: cure_wounds
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/heal_ballade.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/heal_ballade.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellHealBallade
+  parent: CP14ActionSpellBase
  name: Healing ballade
  description: Your music is filled with healing magic, slowly healing all the creatures around you.
  components:
@@ -41,9 +42,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneHealBallade
  - type: Action
-    itemIconStyle: BigAction
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/healing.rsi
      state: heal_music
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/magical_acceleration.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/magical_acceleration.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellMagicalAcceleration
+  parent: CP14ActionSpellBase
  name: Magical acceleration
  description: At the cost of magic energy, you significantly accelerate your movement speed
  components:
@@ -17,8 +18,6 @@
      spawns:
      - CP14MagicAccelerationDustEffect
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/misc.rsi
      state: magical_acceleration
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/peace_ballade.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/peace_ballade.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellPeaceBallade
+  parent: CP14ActionSpellBase
  name: Peace ballade
  description: Your music is filled with peaceful magic, forbidding anyone near you to fight.
  components:
@@ -34,8 +35,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RunePeaceBallade
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/healing.rsi
      state: peace_music
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/plant_growth.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/plant_growth.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellPlantGrowth
+  parent: CP14ActionSpellBase
  name: Plant growth
  description: You restore health and internal resources to the selected plant.
  components:
@@ -54,8 +55,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RunePlantGrowth
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/healing.rsi
      state: plant_growth
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/resurrection.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/resurrection.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellResurrection
+  parent: CP14ActionSpellBase
  name: Resurrection
  description: You're trying to put the soul back into the body.
  components:
@@ -43,16 +44,14 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneResurrection
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/necromancy.rsi
      state: resurrection
  - type: TargetAction
    range: 7
    interactOnMiss: false
-    canTargetSelf: false
  - type: EntityTargetAction
+    canTargetSelf: false
    whitelist:
      components:
      - MobState
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/sheep_polymorph.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/sheep_polymorph.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellSheepPolymorph
+  parent: CP14ActionSpellBase
  name: Sheep polymorph
  description: You curse the target, turning it into a silly sheep for a short period of time.
  components:
@@ -31,8 +32,6 @@
    proto: CP14RuneSheepPolymorph
  - type: CP14MagicEffectAliveTargetRequired
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/misc.rsi
      state: polymorph
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/speed_ballade.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/speed_ballade.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellSpeedBallade
+  parent: CP14ActionSpellBase
  name: Speed ballade
  description: Your music is filled with accelerating magic, speeding up the movement of all creatures nearby
  components:
@@ -34,8 +35,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneSpeedBallade
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/healing.rsi
      state: speed_music
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/flash_light.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/flash_light.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellFlashLight
+  parent: CP14ActionSpellBase
  name: Flash Light
  description: Creates a flash of bright, blinding light.
  components:
@@ -24,8 +25,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneFlashLight
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/light.rsi
      state: flash_light
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/search_of_life.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/search_of_life.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellSearchOfLife
+  parent: CP14ActionSpellBase
  name: Search of life
  description: Detects all living things in a large radius around you.
  components:
@@ -24,8 +25,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneSearchOfLife
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/light.rsi
      state: search_of_life
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/sphere_of_light.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/sphere_of_light.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellSphereOfLight
+  parent: CP14ActionSpellBase
  name: Sphere of Light
  description: Materialization of a bright and safe light source.
  components:
@@ -24,8 +25,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneSphereOfLight
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/light.rsi
      state: sphere_of_light
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Fear.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Fear.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellLurkerFear
+  parent: CP14ActionSpellBase
  name: Primal terror
  description: You plunge the target into primal terror, robbing them of the ability to fight and speak.
  components:
@@ -32,16 +33,14 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneLurkerFear
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/lurker.rsi
      state: fear
  - type: TargetAction
    range: 15
-    canTargetSelf: false
    interactOnMiss: false
  - type: EntityTargetAction
+    canTargetSelf: false
    whitelist:
      components:
      - MobState
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Kick.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Kick.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellLurkerKick
+  parent: CP14ActionSpellBase
  name: Crushing attack
  description: You prepare a powerful melee strike that will knock your target back with force and stun them for a long time.
  components:
@@ -40,9 +41,9 @@
      sprite: _CP14/Actions/Spells/lurker.rsi
      state: kick
  - type: TargetAction
-    canTargetSelf: false
    range: 2
  - type: EntityTargetAction
+    canTargetSelf: false
    event: !type:CP14DelayedEntityTargetActionEvent
      cooldown: 20
      castDelay: 2.5
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Step.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Step.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellLurkerStep
+  parent: CP14ActionSpellBase
  name: Shadow step
  description: A step through the gash of reality that allows you to cover a small of distance quickly.
  components:
@@ -20,8 +21,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneLurkerFear
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/lurker.rsi
      state: step
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_ballade.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_ballade.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellMagicBallade
+  parent: CP14ActionSpellBase
  name: Magic ballade
  description: With your music, you infuse the objects around you with mana
  components:
@@ -33,8 +34,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneMagicBallade
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/meta.rsi
      state: magic_music
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_consume.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_consume.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellManaConsume
+  parent: CP14ActionSpellBase
  name: Mana consume
  description: You absorb a small amount of mana from the target.
  components:
@@ -21,8 +22,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneManaConsume
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/meta.rsi
      state: mana_consume
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_gift.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_gift.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellManaGift
+  parent: CP14ActionSpellBase
  name: Mana transfer
  description: You can transfer a small amount of your magical energy to a target entity or magical object.
  components:
@@ -27,8 +28,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneManaGift
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/meta.rsi
      state: mana_gift
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_splitting.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_splitting.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellMagicSplitting
+  parent: CP14ActionSpellBase
  name: Magic splitting
  description: You destroy the very essence of magic, interrupting spell casts, destroying mana and more.
  components:
@@ -28,8 +29,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneMagicSplitting
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/meta.rsi
      state: counter_spell
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_trance.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_trance.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellManaTrance
+  parent: CP14ActionSpellBase
  name: Mana trance
  description: You go into a trance for a while, restoring mana.
  components:
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/kick.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/kick.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellKick
+  parent: CP14ActionSpellBase
  name: Kick
  description: You perform an epic leg kick at your chosen object, pushing it away from you.
  components:
@@ -87,14 +88,17 @@
        damage:
          types:
            Blunt: 10
-  - type: EntityTargetAction
-    itemIconStyle: BigAction
+  - type: Action
    icon:
      sprite: _CP14/Actions/Spells/physical.rsi
      state: kick_skull
+  - type: TargetAction
+    range: 1
+  - type: EntityTargetAction
+    canTargetSelf: false
    event: !type:CP14DelayedEntityTargetActionEvent
      cooldown: 5
-      castDelay: 0.4
+      castDelay: 0.5
      distanceThreshold: 1.5
      breakOnMove: false
      breakOnDamage: false
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/sprint.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/sprint.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellSprint
+  parent: CP14ActionSpellBase
  name: Sprint
  description: At the cost of heavy stamina expenditure, you accelerate significantly in movement.
  components:
@@ -16,8 +17,6 @@
      spawns:
      - CP14DustEffect
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/physical.rsi
      state: sprint
@@ -52,10 +51,8 @@
    speedMultiplier: 1.4
  - type: CP14MagicEffectStaminaCost
    stamina: 2
+  - type: Action
  - type: InstantAction
-    itemIconStyle: BigAction
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/physical.rsi
      state: sprint_skull
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Slime/jump.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Slime/jump.yml
@@ -13,6 +13,7 @@
    - !type:CP14SpellThrowUserTo
      throwPower: 8
  - type: Action
+    itemIconStyle: BigAction
    useDelay: 8
    icon:
      sprite: _CP14/Actions/Spells/slime.rsi
@@ -26,4 +27,3 @@
      breakOnMove: false
      breakOnDamage: false
      castDelay: 1
-    raiseOnUser: true
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/T0_Bite.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/T0_Bite.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionVampireBite
+  parent: CP14ActionSpellBase
  name: Vampire bite
  description: You sink your fangs into your victim, draining them of a lot of blood.
  components:
@@ -27,8 +28,6 @@
      - !type:ModifyBloodLevel
        amount: -15
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/_CP14/Effects/vampire_bite.ogg
    icon:
      sprite: _CP14/Actions/Spells/vampire.rsi
      state: bite
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/T1_Hypnosis.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/T1_Hypnosis.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellVampireHypnosis
+  parent: CP14ActionSpellBase
  name: Hypnosis
  description: You look at the victim with your OWN gaze, shutting down their consciousness and putting them to sleep.
  components:
@@ -28,8 +29,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneVampireHypnosis
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/vampire.rsi
      state: blood_moon
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/T2_Blood_step.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/T2_Blood_step.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellVampireBloodStep
+  parent: CP14ActionSpellBase
  name: Blood step
  description: A step through the gash of reality that allows you to cover a small of distance quickly
  components:
@@ -19,8 +20,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14ImpactEffectBloodStep
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/vampire.rsi
      state: blood_step
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/bloodlust.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/bloodlust.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellBloodlust
+  parent: CP14ActionSpellBase
  name: Bloodlust
  description: you sense all living things in a large radius around you that you want to KILL.
  components:
@@ -21,8 +22,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneVampireHypnosis
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/vampire.rsi
      state: blood_moon
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/beer_creation.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/beer_creation.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellBeerCreation
+  parent: CP14ActionSpellBase
  name: Beer creation
  description: A secret spell that materializes beer from pure mana.
  components:
@@ -24,8 +25,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneBeerCreation
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/water.rsi
      state: beer_creation
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/freeze.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/freeze.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellFreeze
+  parent: CP14ActionSpellBase
  name: Freeze
  description: You begin to severely cool down the target, slowing its movement speed.
  components:
@@ -32,8 +33,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RunePlantFreeze
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/water.rsi
      state: freeze
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_arrow.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_arrow.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellIceArrow
+  parent: CP14ActionSpellBase
  name: Ice arrow
  description: You create a temporary sharp ice arrow that can be used as a disposable bow projectile.
  components:
@@ -24,8 +25,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneWaterCreation
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/water.rsi
      state: ice_arrow
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_dagger.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_dagger.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellIceDagger
+  parent: CP14ActionSpellBase
  name: Ice dagger
  description: You form an icy sharp dagger that will do for temporary use.
  components:
@@ -24,8 +25,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneWaterCreation
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/water.rsi
      state: ice_dagger
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_shards.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_shards.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellIceShards
+  parent: CP14ActionSpellBase
  name: Ice Shards
  description: Fast ice needles, for rapid shooting of targets.
  components:
@@ -24,8 +25,6 @@
    proto: CP14RuneIceShards
  - type: CP14MagicEffectPacifiedBlock
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/water.rsi
      state: ice_shards
--- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/water_creation.yml
+++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/water_creation.yml
@@ -1,5 +1,6 @@
 - type: entity
  id: CP14ActionSpellWaterCreation
+  parent: CP14ActionSpellBase
  name: Water creation
  description: Creating a clot of water that is held in a floating balloon shape for some time
  components:
@@ -21,8 +22,6 @@
  - type: CP14MagicEffectCastingVisual
    proto: CP14RuneWaterCreation
  - type: Action
-    sound: !type:SoundPathSpecifier
-      path: /Audio/Magic/rumble.ogg
    icon:
      sprite: _CP14/Actions/Spells/water.rsi
      state: water_creation