diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/speed_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/speed_ballade.yml index 6b3531950b..587ca5678e 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/speed_ballade.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Electric/speed_ballade.yml @@ -41,6 +41,7 @@ cooldown: 15 castTime: 120 hidden: true + breakOnDamage: false - type: entity id: CP14ImpactEffectSpeedBallade diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/firewave.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/firewave.yml index 9d28e82431..96128e2d41 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/firewave.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/firewave.yml @@ -33,8 +33,11 @@ checkCanAccess: false range: 60 - type: WorldTargetAction - event: !type:CP14WorldTargetActionEvent + event: !type:CP14DelayedWorldTargetActionEvent cooldown: 1.0 + castDelay: 0.5 + breakOnMove: false + breakOnDamage: false - type: entity id: CP14RuneFirebolt @@ -95,8 +98,7 @@ layers: - state: small shader: unshaded - - type: ChangeTemperatureOnCollide - heat: 10000 + - type: entity parent: CP14BaseSpellScrollFire diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/heat.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/heat.yml index ced40d9e30..89c1dec786 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/heat.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/heat.yml @@ -28,6 +28,7 @@ startSpeech: "Vos adepto calidum..." - type: CP14MagicEffectCastingVisual proto: CP14RuneHeat + - type: CP14MagicEffectPacifiedBlock - type: Action icon: sprite: _CP14/Actions/Spells/fire.rsi diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/hell_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/hell_ballade.yml index 093e63255c..904e12b3e2 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/hell_ballade.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/hell_ballade.yml @@ -8,9 +8,9 @@ sprite: _CP14/Actions/Spells/fire.rsi state: fire_music - type: CP14MagicEffectCastSlowdown - speedMultiplier: 0.8 + speedMultiplier: 0.5 - type: CP14MagicEffectManaCost - manaCost: 1 + manaCost: 8 - type: CP14MagicEffect magicType: Fire effects: @@ -35,6 +35,7 @@ - type: CP14MagicEffectRequiredMusicTool - type: CP14MagicEffectCastingVisual proto: CP14RuneHellBallade + - type: CP14MagicEffectPacifiedBlock - type: Action icon: sprite: _CP14/Actions/Spells/fire.rsi @@ -45,6 +46,7 @@ cooldown: 15 castTime: 120 hidden: true + breakOnDamage: false - type: entity id: CP14ImpactEffectHellBallade diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_ballade.yml index 7925ec6b2b..9d1ae031cc 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_ballade.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_ballade.yml @@ -43,6 +43,7 @@ cooldown: 15 castTime: 120 hidden: true + breakOnDamage: false - type: entity id: CP14ImpactEffectMagicBallade diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/freeze.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/freeze.yml index 3e756d245b..1f2868e243 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/freeze.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/freeze.yml @@ -32,6 +32,7 @@ startSpeech: "Vos adepto frigus..." - type: CP14MagicEffectCastingVisual proto: CP14RunePlantFreeze + - type: CP14MagicEffectPacifiedBlock - type: Action icon: sprite: _CP14/Actions/Spells/water.rsi diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_shards.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_shards.yml index 08893e581d..135dcdb394 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_shards.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_shards.yml @@ -64,8 +64,8 @@ - type: Projectile damage: types: - Cold: 6 - Piercing: 2 + Cold: 5 + Piercing: 2.5 - type: Sprite sprite: _CP14/Effects/Magic/ice_shard.rsi layers: