From cb4b92a5f7a3135298552320d3b339d32c640b6d Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Fri, 15 Nov 2024 18:45:22 +0300 Subject: [PATCH] cure trace --- .../MagicSpell/CP14ClientMagicVisionSystem.cs | 2 -- .../_CP14/MagicSpell/CP14SharedMagicSystem.cs | 1 - .../Actions/Spells/Healing/T1_cure_wounds.yml | 17 +++++++++++++++-- .../_CP14/Entities/Actions/Spells/base.yml | 13 ++++++++++++- Resources/Prototypes/_CP14/Entities/TEST.yml | 14 -------------- 5 files changed, 27 insertions(+), 20 deletions(-) delete mode 100644 Resources/Prototypes/_CP14/Entities/TEST.yml diff --git a/Content.Client/_CP14/MagicSpell/CP14ClientMagicVisionSystem.cs b/Content.Client/_CP14/MagicSpell/CP14ClientMagicVisionSystem.cs index b68e9d3d7f..40ef72e5c8 100644 --- a/Content.Client/_CP14/MagicSpell/CP14ClientMagicVisionSystem.cs +++ b/Content.Client/_CP14/MagicSpell/CP14ClientMagicVisionSystem.cs @@ -51,8 +51,6 @@ public sealed class CP14ClientMagicVisionSystem : CP14SharedMagicVisionSystem { sprite.Visible = MagicVisible; - - if (MagicVisible == false) return; diff --git a/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.cs b/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.cs index b20fb431dc..db6b4101ae 100644 --- a/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.cs +++ b/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.cs @@ -4,7 +4,6 @@ using Content.Shared._CP14.MagicEnergy.Components; using Content.Shared._CP14.MagicSpell.Components; using Content.Shared._CP14.MagicSpell.Events; using Content.Shared._CP14.MagicSpell.Spells; -using Content.Shared._CP14.MagicSpellStorage; using Content.Shared.Actions; using Content.Shared.DoAfter; using Content.Shared.FixedPoint; diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T1_cure_wounds.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T1_cure_wounds.yml index 77ddb91e6a..7eecaef6f9 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T1_cure_wounds.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Healing/T1_cure_wounds.yml @@ -16,6 +16,7 @@ - !type:CP14SpellSpawnEntityOnTarget spawns: - CP14ImpactEffectCureWounds + - CP14MagicTraceCureWounds - !type:CP14SpellApplyEntityEffect effects: - !type:HealthChange @@ -48,13 +49,25 @@ sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: - sprite: _CP14/Effects/Magic/spells_icons.rsi + sprite: _CP14/Effects/Magic/spells_icons.rsi state: cure_wounds event: !type:CP14DelayedEntityTargetActionEvent cooldown: 10 castDelay: 3 breakOnMove: false - + +- type: entity + id: CP14MagicTraceCureWounds + parent: CP14BaseMagicTrace + categories: [ HideSpawnMenu ] + components: + - type: Sprite + layers: + - state: cure_wounds + shader: unshaded + - type: CP14MagicVisionMarker + visibilityTime: 20 + - type: entity id: CP14RuneCureWounds parent: CP14BaseMagicRune diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/base.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/base.yml index 4b80f39d08..0f9b0b5c18 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/base.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/base.yml @@ -34,4 +34,15 @@ - type: Sprite drawdepth: Effects sprite: _CP14/Effects/Magic/cast_impact.rsi - noRot: true \ No newline at end of file + noRot: true + +- type: entity + id: CP14BaseMagicTrace + abstract: true + components: + - type: Sprite + sprite: _CP14/Effects/Magic/spells_icons.rsi + drawdepth: Effects + - type: Clickable + - type: CP14MagicVisionMarker + visibilityTime: 30 \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/TEST.yml b/Resources/Prototypes/_CP14/Entities/TEST.yml deleted file mode 100644 index 879ba6d95b..0000000000 --- a/Resources/Prototypes/_CP14/Entities/TEST.yml +++ /dev/null @@ -1,14 +0,0 @@ -- type: entity - id: CP14MagicTrace - categories: [ ForkFiltered ] - components: - - type: Sprite - drawdepth: Effects - snapCardinals: true - sprite: _CP14/Effects/fire.rsi - layers: - - state: full - shader: unshaded - - type: Clickable - - type: CP14MagicVisionMarker - visibilityTime: 30 \ No newline at end of file