Wendigo renamed to Lurker (#1213)

* Добавлены изменения для создания пулл реквеста

* Update Step.yml

* rename!

* fix

* interrupting toggleable spells

Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.cs

@@ -68,9 +68,24 @@ public abstract partial class CP14SharedMagicSystem : EntitySystem
 
     private void OnEndCast(Entity<CP14MagicEffectComponent> ent, ref CP14EndCastMagicEffectEvent args)
     {
-        if (TryComp<CP14MagicCasterComponent>(args.Performer, out var caster))
+        if (!TryComp<CP14MagicCasterComponent>(args.Performer, out var caster))
+            return;
+
+        caster.CastedSpells.Remove(ent);
+
+        //Break all casts
+        List<EntityUid> castedSpells = new();
+        foreach (var casted in caster.CastedSpells)
         {
-            caster.CastedSpells.Remove(ent);
+            castedSpells.Add(casted);
+        }
+
+        foreach (var casted in castedSpells)
+        {
+            if (!_magicEffectQuery.TryComp(casted, out var castedComp))
+                continue;
+
+            _doAfter.Cancel(castedComp.ActiveDoAfter);
         }
     }
 

Resources/Locale/en-US/_CP14/ghostRoles/roles.ftl

@@ -1,8 +1,8 @@
 cp14-ghost-role-information-name-skeleton = Undead skeleton
 cp14-ghost-role-information-description-skeleton = The spawn of necromancy, putting a living soul into dead bones. Often such souls are controlled by the necromancer, doing his bidding.
 
-cp14-ghost-role-information-name-wendigo = Wendigo
-cp14-ghost-role-information-description-wendigo = A spirit of night and hunger that preys on loners separated from their companions.
+cp14-ghost-role-information-name-lurker = Lurker
+cp14-ghost-role-information-description-lurker = A spirit of night and hunger that preys on loners separated from their companions.
 
 cp14-ghost-role-information-name-raid-undead = Undead raid
 cp14-ghost-role-information-description-raid-undead = Lead the attack on the city by the forces of the dead. Destroy the demiplane communication crystal at any cost.

Resources/Locale/en-US/_CP14/magicEnergy/spell-speech.ftl

@@ -1,5 +1,5 @@
 cp14-kick-emote-start = kicks in...
 cp14-kick-emote = makes a strong kick
 
-cp14-kick-wendigo-start = makes a huge fist...
-cp14-kick-wendigo = delivers a stunning blow
+cp14-kick-lurker-start = makes a huge fist...
+cp14-kick-lurker = delivers a stunning blow

Resources/Locale/ru-RU/_CP14/ghostRoles/roles.ftl

@@ -1,8 +1,8 @@
 cp14-ghost-role-information-name-skeleton = Оживленный скелет
 cp14-ghost-role-information-description-skeleton = Порождение некромантии, вселившее живую душу в мертвые кости. Часто такие души контролируются некромантом, исполняя его волю.
 
-cp14-ghost-role-information-name-wendigo = Вендиго
-cp14-ghost-role-information-description-wendigo = Дух ночи и голода, охотящийся за одиночками, отделившихся от своих товарищей.
+cp14-ghost-role-information-name-lurker = Таящийся
+cp14-ghost-role-information-description-lurker = Дух ночи и голода, охотящийся за одиночками, отделившихся от своих товарищей.
 
 cp14-ghost-role-information-name-raid-undead = Рейд нежити
 cp14-ghost-role-information-description-raid-undead = Возглавьте атаку на город силами мертвых. Уничтожьте кристалл связи с демипланами любой ценой.

Resources/Locale/ru-RU/_CP14/magicEnergy/spell-speech.ftl

@@ -1,5 +1,5 @@
 cp14-kick-emote-start = заносит ногу...
 cp14-kick-emote = совершает сильный пинок
 
-cp14-kick-wendigo-start = заносит огромный кулак...
-cp14-kick-wendigo = обрушивает оглушающий удар
+cp14-kick-lurker-start = заносит огромный кулак...
+cp14-kick-lurker = обрушивает оглушающий удар

Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Fear.yml

@@ -1,10 +1,10 @@
 - type: entity
-  id: CP14ActionSpellWendigoFear
+  id: CP14ActionSpellLurkerFear
   name: Primal terror
   description: You plunge the target into primal terror, robbing them of the ability to fight and speak. 
   components:
   - type: Sprite
-    sprite: _CP14/Actions/Spells/wendigo.rsi
+    sprite: _CP14/Actions/Spells/lurker.rsi
     state: fear
   - type: CP14MagicEffectCastSlowdown
     speedMultiplier: 0.4
@@ -12,10 +12,10 @@
     effects:
     - !type:CP14SpellSpawnEntityOnUser
       spawns:
-      - CP14RuneWendigoFearImpact
+      - CP14RuneLurkerFearImpact
     - !type:CP14SpellSpawnEntityOnTarget
       spawns:
-      - CP14ImpactEffectWendigoFear
+      - CP14ImpactEffectLurkerFear
     - !type:CP14SpellRevealStealthUser
     - !type:CP14SpellApplyEntityEffect
       effects:
@@ -30,7 +30,7 @@
         type: Add
         time: 2
   - type: CP14MagicEffectCastingVisual
-    proto: CP14RuneWendigoFear
+    proto: CP14RuneLurkerFear
   - type: EntityTargetAction
     whitelist:
       components:
@@ -42,7 +42,7 @@
     sound: !type:SoundPathSpecifier
       path: /Audio/Magic/rumble.ogg
     icon:
-      sprite: _CP14/Actions/Spells/wendigo.rsi
+      sprite: _CP14/Actions/Spells/lurker.rsi
       state: fear
     event: !type:CP14ToggleableEntityTargetActionEvent
       cooldown: 30
@@ -51,7 +51,7 @@
       hidden: true
 
 - type: entity
-  id: CP14ImpactEffectWendigoFear
+  id: CP14ImpactEffectLurkerFear
   parent: CP14BaseMagicImpact
   categories: [ HideSpawnMenu ]
   save: false
@@ -64,7 +64,7 @@
       shader: unshaded
  
 - type: entity
-  id: CP14RuneWendigoFear
+  id: CP14RuneLurkerFear
   parent: CP14BaseMagicRune
   categories: [ HideSpawnMenu ]
   components:
@@ -77,7 +77,7 @@
       shader: unshaded
  
 - type: entity
-  id: CP14RuneWendigoFearImpact
+  id: CP14RuneLurkerFearImpact
   parent: CP14BaseMagicImpact
   categories: [ HideSpawnMenu ]
   components:

Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Kick.yml

@@ -1,10 +1,10 @@
 - type: entity
-  id: CP14ActionSpellWendigoKick
+  id: CP14ActionSpellLurkerKick
   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:
   - type: Sprite
-    sprite: _CP14/Actions/Spells/wendigo.rsi
+    sprite: _CP14/Actions/Spells/lurker.rsi
     state: kick
   - type: CP14MagicEffectStaminaCost
     stamina: 20
@@ -13,7 +13,7 @@
     - !type:CP14SpellRevealStealthUser
     - !type:CP14SpellSpawnEntityOnTarget
       spawns:
-      - CP14WendigoRitualSound
+      - CP14LurkerRitualSound
     effects:
     - !type:CP14SpellRevealStealthUser
     - !type:CP14SpellApplyEntityEffect
@@ -32,15 +32,15 @@
           types:
             Blunt: 5
   - type: CP14MagicEffectEmoting
-    startEmote: cp14-kick-wendigo-start
-    endEmote: cp14-kick-wendigo
+    startEmote: cp14-kick-lurker-start
+    endEmote: cp14-kick-lurker
   - type: CP14MagicEffectPacifiedBlock
   - type: EntityTargetAction
     canTargetSelf: false
     range: 2
     itemIconStyle: BigAction
     icon:
-      sprite: _CP14/Actions/Spells/wendigo.rsi
+      sprite: _CP14/Actions/Spells/lurker.rsi
       state: kick
     event: !type:CP14DelayedEntityTargetActionEvent
       cooldown: 20

Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Step.yml

@@ -1,24 +1,24 @@
 - type: entity
-  id: CP14ActionSpellWendigoWarp
+  id: CP14ActionSpellLurkerStep
   name: Shadow step
   description: A step through the gash of reality that allows you to cover a small of distance quickly.
   components:
   - type: Sprite
-    sprite: _CP14/Actions/Spells/wendigo.rsi
+    sprite: _CP14/Actions/Spells/lurker.rsi
     state: step
   - type: CP14MagicEffect
     telegraphyEffects:
     - !type:CP14SpellSpawnEntityOnTarget
       spawns:
-      - CP14ImpactEffectWendigoStep
+      - CP14ImpactEffectLurkerStep
     effects:
     - !type:CP14SpellCasterTeleport
       needVision: false
     - !type:CP14SpellSpawnEntityOnTarget
       spawns:
-      - CP14WendigoRitualSound
+      - CP14LurkerRitualSound
   - type: CP14MagicEffectCastingVisual
-    proto: CP14RuneWendigoFear
+    proto: CP14RuneLurkerFear
   - type: EntityWorldTargetAction
     checkCanAccess: false
     range: 10
@@ -26,7 +26,7 @@
     sound: !type:SoundPathSpecifier
       path: /Audio/Magic/rumble.ogg
     icon:
-      sprite: _CP14/Actions/Spells/wendigo.rsi
+      sprite: _CP14/Actions/Spells/lurker.rsi
       state: step
     event: !type:CP14DelayedEntityWorldTargetActionEvent
       cooldown: 30
@@ -34,7 +34,7 @@
       breakOnMove: false
 
 - type: entity
-  id: CP14ImpactEffectWendigoStep
+  id: CP14ImpactEffectLurkerStep
   parent: CP14BaseMagicImpact
   categories: [ HideSpawnMenu ]
   save: false
@@ -42,4 +42,4 @@
   - type: Sprite
     layers:
     - state: wave_up
-      color: "#2b2c32"
+      color: "#2b2c32"

Resources/Prototypes/_CP14/Entities/Effects/sky_lightning.yml

@@ -56,42 +56,4 @@
     farSound:
       collection: CP14LightningFar
       params:
-        variation: 0.2
-
-#- type: entity
-#  parent: CP14SkyLightning
-#  id: CP14SkyLightningWendigoRitual
-#  name: wendigo lightning
-#  suffix: 1000 Blunt damage
-#  components:
-#  - type: Sprite
-#    color: "#ed1367"
-#  - type: PointLight
-#    color: "#ed1367"
-#  - type: CP14AreaEntityEffect
-#    whitelist:
-#      components:
-#      - MobState
-#    range: 1
-#    effects:
-#    - !type:CP14SpellApplyEntityEffect
-#      effects:
-#      - !type:HealthChange
-#        damage:
-#          types:
-#            Blunt: 1000
-#  - type: CP14FarSound
-#    closeSound:
-#      path: /Audio/_CP14/Ambience/Lightning/lightning_close1.ogg
-#      params:
-#        variation: 0.2
-#        maxDistance: 20
-#        volume: -3
-#    farSound:
-#      collection: CP14LightningFar
-#      params:
-#        variation: 0.2
-#        volume: -3
-#  - type: ConditionalSpawner
-#    prototypes:
-#    - CP14WendigoRitualSound
+        variation: 0.2

Resources/Prototypes/_CP14/Entities/Mobs/Player/DemiplaneAntag/lurker.yml

@@ -1,7 +1,7 @@
 - type: entity
-  id: CP14MobWendigo
+  id: CP14MobLurker
   parent: CP14SimpleMobBase
-  name: wendigo
+  name: lurker
   description: The spirit of hunger and night. Hunting lonely wanderers lost in the dark forest.
   categories: [ HideSpawnMenu ]
   components:
@@ -12,7 +12,7 @@
     drawdepth: Mobs
     layers:
     - map: ["enum.DamageStateVisualLayers.Base"]
-      sprite: _CP14/Mobs/Monster/wendigo.rsi
+      sprite: _CP14/Mobs/Monster/lurker.rsi
       state: live
   - type: ReplacementAccent
     accent: xeno
@@ -34,6 +34,7 @@
     tags:
       - FootstepSound
       - HideContextMenu
+      - CP14AmbientLurker
   - type: DamageStateVisuals
     states:
       Alive:
@@ -95,18 +96,9 @@
   - type: CP14SpellStorage
     grantAccessToSelf: true
     spells:
-    - CP14ActionSpellWendigoFear
-    - CP14ActionSpellWendigoKick
-    - CP14ActionSpellWendigoWarp
-  - type: SpamEmitSound
-    minInterval: 20
-    maxInterval: 80
-    sound:
-      path: /Audio/_CP14/Effects/Wendigo/ambient.ogg
-      params:
-        volume: -8
-        variation: 0.125
-  - type: SoundWhileAlive
+    - CP14ActionSpellLurkerFear
+    - CP14ActionSpellLurkerKick
+    - CP14ActionSpellLurkerStep
   - type: Stealth
     enabledOnDeath: false
     maxVisibility: 1.2
@@ -115,51 +107,51 @@
     movementVisibilityRate: 0.55
   - type: ConditionalSpawner
     prototypes:
-    - CP14WendigoRitualSound
+    - CP14LurkerRitualSound
 
 - type: entity
-  id: CP14WendigoRitualSound
-  name: wendigo ritual far sound
+  id: CP14LurkerRitualSound
+  name: lurker ritual far sound
   categories: [ ForkFiltered ]
   components:
   - type: CP14PvsOverride
   - type: TriggerOnSpawn
   - type: CP14FarSound
     closeSound:
-      collection: CP14WendigoRitual
+      collection: CP14LurkerRitual
       params:
         variation: 0.2
         maxDistance: 20
         volume: 50
     farSound:
-      collection: CP14WendigoRitual
+      collection: CP14LurkerRitual
       params:
         variation: 0.2
   - type: TimedDespawn
     lifetime: 2
 
 - type: entity
-  id: SpawnPointGhostDemiplaneWendigo
+  id: SpawnPointGhostDemiplaneLurker
   name: ghost role spawn point
-  description: A ghost role for a wendigo
-  suffix: Wendigo
+  description: A ghost role for a lurker
+  suffix: Lurker
   categories: [ ForkFiltered ]
   parent: MarkerBase
   components:
   - type: GhostRole
-    name: cp14-ghost-role-information-name-wendigo
+    name: cp14-ghost-role-information-name-lurker
     allowMovement: true
-    description: cp14-ghost-role-information-description-wendigo
+    description: cp14-ghost-role-information-description-lurker
     rules: cp14-ghost-role-information-rules-demiplane
     mindRoles:
     - CP14MindRoleDemiplaneAntag
     raffle:
       settings: default
   - type: GhostRoleMobSpawner
-    prototype: CP14MobWendigo
+    prototype: CP14MobLurker
   - type: Sprite
     sprite: Markers/jobs.rsi
     layers:
       - state: green
-      - sprite: _CP14/Mobs/Monster/wendigo.rsi
+      - sprite: _CP14/Mobs/Monster/lurker.rsi
         state: live

Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/Danger/mobs.yml

@@ -90,7 +90,7 @@
       maxGroupSize: 3
 
 - type: cp14DemiplaneModifier
-  id: EnemyWendigo
+  id: EnemyLurker
   levels:
     min: 3
     max: 10
@@ -100,7 +100,7 @@
     GhostRoleDanger: 1
   layers:
     - !type:OreDunGen
-      entity: SpawnPointGhostDemiplaneWendigo
+      entity: SpawnPointGhostDemiplaneLurker
       count: 1
       minGroupSize: 1
       maxGroupSize: 1

Resources/Prototypes/_CP14/SoundCollections/misc.yml

@@ -29,8 +29,8 @@
     - /Audio/_CP14/Ambience/Lightning/lightning_far3.ogg
 
 - type: soundCollection
-  id: CP14WendigoRitual
+  id: CP14LurkerRitual
   files:
-    - /Audio/_CP14/Effects/Wendigo/ritual1.ogg
-    - /Audio/_CP14/Effects/Wendigo/ritual2.ogg
-    - /Audio/_CP14/Effects/Wendigo/ritual3.ogg
+    - /Audio/_CP14/Effects/Lurker/ritual1.ogg
+    - /Audio/_CP14/Effects/Lurker/ritual2.ogg
+    - /Audio/_CP14/Effects/Lurker/ritual3.ogg

Resources/Prototypes/_CP14/audio_loops.yml

@@ -15,6 +15,14 @@
     collection: CP14LoopWater
   rules: NearWater
 
+- type: ambientLoop
+  id: Lurker
+  sound:
+    params:
+      volume: -12
+    path: /Audio/_CP14/Effects/Lurker/ambient.ogg
+  rules: NearLurker
+
 - type: ambientLoop
   id: Cave
   sound:
@@ -72,4 +80,14 @@
       whitelist:
         tags:
           - CP14AmbientWater
-      range: 4
+      range: 4
+
+- type: rules
+  id: NearLurker
+  rules:
+    - !type:NearbyEntitiesRule
+      count: 1
+      whitelist:
+        tags:
+          - CP14AmbientLurker
+      range: 6

Resources/Prototypes/_CP14/tags.yml

@@ -28,6 +28,9 @@
 - type: Tag
   id: CP14AmbientWater
 
+- type: Tag
+  id: CP14AmbientLurker
+
 - type: Tag
   id: CP14InkwellFittable