diff --git a/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.DelayedActions.cs b/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.DelayedActions.cs index d4d2486aac..0f5a434c2d 100644 --- a/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.DelayedActions.cs +++ b/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.DelayedActions.cs @@ -11,7 +11,7 @@ public abstract partial class CP14SharedMagicSystem private void InitializeDelayedActions() { SubscribeLocalEvent(OnInstantAction); - SubscribeLocalEvent(OnEntityWorldTargetAction); + SubscribeLocalEvent(OnWorldTargetAction); SubscribeLocalEvent(OnEntityTargetAction); SubscribeLocalEvent(OnDelayedInstantActionDoAfter); @@ -108,7 +108,7 @@ public abstract partial class CP14SharedMagicSystem /// /// Target action used from hotkey event /// - private void OnEntityWorldTargetAction(CP14DelayedEntityWorldTargetActionEvent args) + private void OnWorldTargetAction(CP14DelayedWorldTargetActionEvent args) { if (args.Handled) return; diff --git a/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.InstantActions.cs b/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.InstantActions.cs index 329d64496e..00631a9c45 100644 --- a/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.InstantActions.cs +++ b/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.InstantActions.cs @@ -9,7 +9,6 @@ public abstract partial class CP14SharedMagicSystem private void InitializeInstantActions() { SubscribeLocalEvent(OnMagicInstantAction); - SubscribeLocalEvent(OnMagicEntityWorldTargetAction); SubscribeLocalEvent(OnMagicWorldTargetAction); SubscribeLocalEvent(OnMagicEntityTargetAction); } @@ -31,23 +30,6 @@ public abstract partial class CP14SharedMagicSystem _action.SetCooldown(args.Action.Owner, args.Cooldown); } - private void OnMagicEntityWorldTargetAction(CP14EntityWorldTargetActionEvent args) - { - if (args.Handled) - return; - - if (!TryComp(args.Action, out var magicEffect)) - return; - - var spellArgs = new CP14SpellEffectBaseArgs(args.Performer, magicEffect.SpellStorage, args.Entity, args.Target); - - if (!CanCastSpell((args.Action, magicEffect), spellArgs)) - return; - - CastSpell((args.Action, magicEffect), spellArgs); - _action.SetCooldown(args.Action.Owner, args.Cooldown); - } - private void OnMagicWorldTargetAction(CP14WorldTargetActionEvent args) { if (args.Handled) diff --git a/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.ToggleableActions.cs b/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.ToggleableActions.cs index 86f75041f7..53e10ab119 100644 --- a/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.ToggleableActions.cs +++ b/Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.ToggleableActions.cs @@ -11,7 +11,7 @@ public abstract partial class CP14SharedMagicSystem private void InitializeToggleableActions() { SubscribeLocalEvent(OnToggleableInstantAction); - SubscribeLocalEvent(OnToggleableEntityWorldTargetAction); + SubscribeLocalEvent(OnToggleableEntityWorldTargetAction); SubscribeLocalEvent(OnToggleableEntityTargetAction); SubscribeLocalEvent(OnToggleableInstantActionDoAfterEvent); @@ -149,7 +149,7 @@ public abstract partial class CP14SharedMagicSystem /// /// Target action used from hotkey event /// - private void OnToggleableEntityWorldTargetAction(CP14ToggleableEntityWorldTargetActionEvent args) + private void OnToggleableEntityWorldTargetAction(CP14ToggleableWorldTargetActionEvent args) { if (args.Handled) return; diff --git a/Content.Shared/_CP14/MagicSpell/Events/CP14ActionsEvents.cs b/Content.Shared/_CP14/MagicSpell/Events/CP14ActionsEvents.cs index dec202c4da..4c4bc5d498 100644 --- a/Content.Shared/_CP14/MagicSpell/Events/CP14ActionsEvents.cs +++ b/Content.Shared/_CP14/MagicSpell/Events/CP14ActionsEvents.cs @@ -7,12 +7,6 @@ public interface ICP14MagicEffect public TimeSpan Cooldown { get; } } -public sealed partial class CP14EntityWorldTargetActionEvent : WorldTargetActionEvent, ICP14MagicEffect -{ - [DataField] - public TimeSpan Cooldown { get; private set; } = TimeSpan.FromSeconds(1f); -} - public sealed partial class CP14WorldTargetActionEvent : WorldTargetActionEvent, ICP14MagicEffect { [DataField] diff --git a/Content.Shared/_CP14/MagicSpell/Events/CP14DelayedActionEvents.cs b/Content.Shared/_CP14/MagicSpell/Events/CP14DelayedActionEvents.cs index c3f11e23b9..76777a89bb 100644 --- a/Content.Shared/_CP14/MagicSpell/Events/CP14DelayedActionEvents.cs +++ b/Content.Shared/_CP14/MagicSpell/Events/CP14DelayedActionEvents.cs @@ -22,7 +22,7 @@ public interface ICP14DelayedMagicEffect public bool RequireCanInteract { get; } } -public sealed partial class CP14DelayedEntityWorldTargetActionEvent : WorldTargetActionEvent, +public sealed partial class CP14DelayedWorldTargetActionEvent : WorldTargetActionEvent, ICP14DelayedMagicEffect { [DataField] diff --git a/Content.Shared/_CP14/MagicSpell/Events/CP14ToggleableActionEvents.cs b/Content.Shared/_CP14/MagicSpell/Events/CP14ToggleableActionEvents.cs index 6af11cec56..eaabf1c8d3 100644 --- a/Content.Shared/_CP14/MagicSpell/Events/CP14ToggleableActionEvents.cs +++ b/Content.Shared/_CP14/MagicSpell/Events/CP14ToggleableActionEvents.cs @@ -46,7 +46,7 @@ public sealed partial class CP14ToggleableInstantActionEvent : InstantActionEven public bool Hidden { get; private set; } = false; } -public sealed partial class CP14ToggleableEntityWorldTargetActionEvent : WorldTargetActionEvent, ICP14ToggleableMagicEffect +public sealed partial class CP14ToggleableWorldTargetActionEvent : WorldTargetActionEvent, ICP14ToggleableMagicEffect { [DataField] public float EffectFrequency { get; private set; } = 1f; diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead_ballade.yml index 742902d664..e7e7f35bba 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead_ballade.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/cure_dead_ballade.yml @@ -19,13 +19,14 @@ - type: CP14MagicEffectRequiredMusicTool - type: CP14MagicEffectCastingVisual proto: CP14RuneDeadHealBallade - - type: InstantAction + - type: Action itemIconStyle: BigAction sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/necromancy.rsi state: dead_heal_ballade + - type: InstantAction event: !type:CP14ToggleableInstantActionEvent effectFrequency: 1 cooldown: 15 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/resurrection_dead.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/resurrection_dead.yml index dca7674f14..03eea58ed4 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/resurrection_dead.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Death/resurrection_dead.yml @@ -45,19 +45,21 @@ endSpeech: "Hominem mortuum" - type: CP14MagicEffectCastingVisual proto: CP14RuneResurrection - - type: EntityTargetAction - whitelist: - components: - - MobState - range: 10 - itemIconStyle: BigAction - interactOnMiss: false - canTargetSelf: false + - 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: + - MobState + canTargetSelf: false event: !type:CP14DelayedEntityTargetActionEvent cooldown: 10 castDelay: 2 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/darkmist.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/darkmist.yml index 8673a34bc7..1894c1691e 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/darkmist.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/darkmist.yml @@ -15,16 +15,18 @@ - !type:CP14SpellSpawnEntityOnTarget spawns: - CP14LumeraDarkMist - - type: WorldTargetAction - repeat: true - checkCanAccess: false - range: 100 - itemIconStyle: BigAction + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/Eldritch/voidblink.ogg + itemIconStyle: BigAction icon: sprite: _CP14/Actions/DemigodSpells/lumera.rsi state: mist + - type: TargetAction + checkCanAccess: false + repeat: true + range: 100 + - type: WorldTargetAction event: !type:CP14WorldTargetActionEvent cooldown: 0.15 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/mind_degrade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/mind_degrade.yml index 2f244a9ecf..8017151f90 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/mind_degrade.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/mind_degrade.yml @@ -49,8 +49,15 @@ walkSpeedModifier: 0.5 sprintSpeedModifier: 0.5 statusLifetime: 30 - - type: EntityTargetAction - canTargetSelf: false + - 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 blacklist: components: - CP14ReligionEntity @@ -58,13 +65,8 @@ components: - CP14SkillStorage range: 100 - itemIconStyle: BigAction - checkCanAccess: false - sound: !type:SoundPathSpecifier - path: /Audio/Magic/rumble.ogg - icon: - sprite: _CP14/Actions/DemigodSpells/lumera.rsi - state: wrath + - type: EntityTargetAction + canTargetSelf: false event: !type:CP14DelayedEntityTargetActionEvent cooldown: 300 castDelay: 16 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/mind_upgrade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/mind_upgrade.yml index ef7efce2de..a677324271 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/mind_upgrade.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/mind_upgrade.yml @@ -50,8 +50,15 @@ walkSpeedModifier: 0.5 sprintSpeedModifier: 0.5 statusLifetime: 30 - - type: EntityTargetAction - canTargetSelf: false + - 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 blacklist: components: - CP14ReligionEntity @@ -59,13 +66,8 @@ components: - CP14SkillStorage range: 100 - itemIconStyle: BigAction - checkCanAccess: false - sound: !type:SoundPathSpecifier - path: /Audio/Magic/rumble.ogg - icon: - sprite: _CP14/Actions/DemigodSpells/lumera.rsi - state: mind_upgrade + - type: EntityTargetAction + canTargetSelf: false event: !type:CP14DelayedEntityTargetActionEvent cooldown: 300 castDelay: 16 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/moon_strike.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/moon_strike.yml index e4de1739c2..4c81cc05f1 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/moon_strike.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/moon_strike.yml @@ -11,14 +11,16 @@ - !type:CP14SpellSpawnEntityOnTarget spawns: - CP14SkyLumeraStrike - - type: WorldTargetAction - repeat: true - checkCanAccess: false - range: 100 + - type: Action + - type: TargetAction itemIconStyle: BigAction icon: sprite: _CP14/Actions/DemigodSpells/lumera.rsi state: moon_beam + repeat: true + checkCanAccess: false + range: 100 + - type: WorldTargetAction event: !type:CP14WorldTargetActionEvent cooldown: 0.5 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/renounce.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/renounce.yml index 1278e09fa6..7f8f1fb593 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/renounce.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/renounce.yml @@ -11,16 +11,18 @@ - !type:CP14SpellGodRenounce - type: ConfirmableAction popup: cp-renounce-action-god-popup - - type: EntityWorldTargetAction - repeat: true - checkCanAccess: false - itemIconStyle: BigAction - range: 100 + - 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 + range: 100 + - type: EntityWorldTargetAction event: !type:CP14EntityWorldTargetActionEvent cooldown: 0.5 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/touch.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/touch.yml index 134c1d0fe0..f025fa634c 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/touch.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/touch.yml @@ -15,16 +15,18 @@ - !type:CP14SpellApplyEntityEffect effects: - !type:Jitter - - type: EntityWorldTargetAction - repeat: true - checkCanAccess: false - itemIconStyle: BigAction - range: 100 + - 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 + range: 100 + - type: EntityWorldTargetAction event: !type:CP14EntityWorldTargetActionEvent cooldown: 0.5 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/warp.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/warp.yml index de354f4db0..e32b3448f6 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/warp.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/Lumera/warp.yml @@ -3,10 +3,11 @@ name: Fast travel description: Allows you to quickly teleport to your altars and followers. components: - - type: InstantAction + - type: Action icon: sprite: _CP14/Actions/DemigodSpells/lumera.rsi state: warp priority: -8 + - type: InstantAction event: !type:ToggleIntrinsicUIEvent key: enum.CP14ReligionEntityUiKey.Key \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/generic.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/generic.yml index 8ca6e6df6e..26df573612 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/generic.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Demigods/generic.yml @@ -3,13 +3,14 @@ name: Renounce patron description: You renounce your patron by severing your connection with him. After that, you can never become his follower again, but you can become a follower of another patron. components: - - type: InstantAction - checkCanInteract: false - checkConsciousness: false + - type: Action icon: sprite: _CP14/Interface/Alerts/divine_offer.rsi state: unoffer priority: -8 + checkCanInteract: false + checkConsciousness: false + - type: InstantAction event: !type:CP14RenounceFromGodEvent - type: ConfirmableAction popup: cp14-renounce-action-popup diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_demiplane_infiltration.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_demiplane_infiltration.yml index ea3622a3a5..8b8f11ec04 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_demiplane_infiltration.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_demiplane_infiltration.yml @@ -20,19 +20,21 @@ endSpeech: "salvabo socios meos" - type: CP14MagicEffectCastingVisual proto: CP14RuneDemiplaneInfiltration - - type: EntityTargetAction - whitelist: - components: - - CP14DemiplaneRift - canTargetSelf: false - checkCanAccess: true - range: 3 + - type: Action itemIconStyle: BigAction sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/dimension.rsi state: rift_arrow + - type: TargetAction + whitelist: + components: + - CP14DemiplaneRift + canTargetSelf: false + checkCanAccess: true + range: 3 + - type: EntityTargetAction event: !type:CP14DelayedEntityTargetActionEvent cooldown: 50 castDelay: 5 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_monolith_warp.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_monolith_warp.yml index ef0bb3852e..28d457f559 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_monolith_warp.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T0_monolith_warp.yml @@ -22,14 +22,16 @@ endSpeech: "vado ad vos" - type: CP14MagicEffectCastingVisual proto: CP14RuneDemiplaneInfiltration - - type: EntityWorldTargetAction - range: 7 + - type: Action itemIconStyle: BigAction sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/dimension.rsi state: demi_arrow + - type: TargetAction + range: 7 + - type: EntityWorldTargetAction event: !type:CP14DelayedEntityWorldTargetActionEvent cooldown: 50 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T1_shadow_grab.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T1_shadow_grab.yml index a835d6d89b..4041d00f5e 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T1_shadow_grab.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T1_shadow_grab.yml @@ -23,18 +23,20 @@ spawns: - CP14ImpactEffectShadowStep - type: CP14MagicEffectSomaticAspect - - type: EntityTargetAction - whitelist: - components: - - Item - canTargetSelf: false - range: 10 + - type: Action itemIconStyle: BigAction sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/dimension.rsi state: shadow_grab + - type: TargetAction + whitelist: + components: + - Item + canTargetSelf: false + range: 10 + - type: EntityTargetAction event: !type:CP14DelayedEntityTargetActionEvent cooldown: 5 castDelay: 0.5 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T1_shadow_swap.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T1_shadow_swap.yml index 59b0c55d2a..9de28c793e 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T1_shadow_swap.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T1_shadow_swap.yml @@ -24,18 +24,20 @@ proto: CP14ImpactEffectShadowStep - type: CP14MagicEffectSomaticAspect - type: CP14MagicEffectAliveTargetRequired - - type: EntityTargetAction - whitelist: - components: - - MobState - range: 5 - itemIconStyle: BigAction - interactOnMiss: false + - 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 event: !type:CP14DelayedEntityTargetActionEvent cooldown: 30 hidden: true diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T2_shadow_step.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T2_shadow_step.yml index 98f26de82c..3a6ca00dff 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T2_shadow_step.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Dimension/T2_shadow_step.yml @@ -20,14 +20,16 @@ - type: CP14MagicEffectCastingVisual proto: CP14ImpactEffectShadowStep - type: CP14MagicEffectSomaticAspect - - type: EntityWorldTargetAction - range: 7 - itemIconStyle: BigAction + - 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: EntityWorldTargetAction event: !type:CP14DelayedEntityWorldTargetActionEvent cooldown: 30 hidden: true diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/MOB_spider_trap.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/MOB_spider_trap.yml index 8f0f13cbcc..0e0ab2d3d2 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/MOB_spider_trap.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/MOB_spider_trap.yml @@ -16,23 +16,23 @@ - !type:CP14SpellSpawnEntityOnTarget spawns: - CP14ImpactSpiderTrap - - type: EntityWorldTargetAction - useDelay: 20 - range: 10 - checkCanAccess: false - itemIconStyle: BigAction + - type: Action + cooldown: 20 sound: !type:SoundPathSpecifier path: /Audio/Animals/snake_hiss.ogg icon: sprite: _CP14/Structures/Dungeon/floor_web.rsi state: full - event: !type:CP14DelayedEntityWorldTargetActionEvent + - type: TargetAction + range: 10 + checkCanAccess: false + - type: WorldTargetAction + event: !type:CP14DelayedWorldTargetActionEvent hidden: true breakOnMove: false breakOnDamage: false cooldown: 20 castDelay: 0.5 - raiseOnUser: true - type: entity id: CP14ImpactSpiderTrap diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/MOB_subterranean_leap.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/MOB_subterranean_leap.yml index 219d6a840e..415f79398a 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/MOB_subterranean_leap.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/MOB_subterranean_leap.yml @@ -20,20 +20,21 @@ - CP14ImpactEffectDigging - type: CP14MagicEffectCastingVisual proto: CP14ImpactEffectDigging - - type: EntityWorldTargetAction - useDelay: 8 - range: 10 - checkCanAccess: false + - type: Action + cooldown: 8 itemIconStyle: BigAction sound: !type:SoundPathSpecifier path: /Audio/Effects/gib3.ogg icon: sprite: _CP14/Actions/Spells/earth.rsi state: subterranean_leap + - type: TargetAction + checkCanAccess: false + range: 10 + - type: WorldTargetAction event: !type:CP14DelayedEntityWorldTargetActionEvent hidden: true breakOnMove: false - raiseOnUser: true - type: entity id: CP14ImpactEffectDigging diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/T1_earth_wall.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/T1_earth_wall.yml index cbf0193d87..f7b8cc7b62 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/T1_earth_wall.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Earth/T1_earth_wall.yml @@ -24,14 +24,16 @@ endSpeech: "de profundis terrae" - type: CP14MagicEffectCastingVisual proto: CP14RuneEarthWall - - type: EntityWorldTargetAction - range: 10 + - type: Action itemIconStyle: BigAction sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/earth.rsi state: earth_wall + - type: TargetAction + range: 10 + - type: EntityWorldTargetAction event: !type:CP14DelayedEntityWorldTargetActionEvent cooldown: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/fireball.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/fireball.yml index de11acb24d..0c3fc5d0ff 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/fireball.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/fireball.yml @@ -25,17 +25,18 @@ - type: CP14MagicEffectCastingVisual proto: CP14RuneFireball - type: CP14MagicEffectPacifiedBlock - - type: EntityWorldTargetAction - checkCanAccess: false - raiseOnUser: true - range: 60 - itemIconStyle: BigAction + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/fire.rsi state: fireball - event: !type:CP14DelayedEntityWorldTargetActionEvent + - type: TargetAction + checkCanAccess: false + raiseOnUser: true + range: 60 + - type: WorldTargetAction + event: !type:CP14DelayedWorldTargetActionEvent cooldown: 25 castDelay: 2.5 breakOnMove: false diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/firewave.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/firewave.yml index efea7753e0..1ec2c111f4 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/firewave.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/firewave.yml @@ -23,18 +23,19 @@ - type: CP14MagicEffectCastingVisual proto: CP14RuneFirebolt - type: CP14MagicEffectPacifiedBlock - - type: EntityWorldTargetAction - repeat: true - checkCanAccess: false - raiseOnUser: true - range: 60 - itemIconStyle: BigAction + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/fire.rsi state: firewave - event: !type:CP14EntityWorldTargetActionEvent + - type: TargetAction + repeat: true + checkCanAccess: false + raiseOnUser: true + range: 60 + - type: WorldTargetAction + event: !type:CP14WorldTargetActionEvent cooldown: 1.0 - type: entity diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/flame_creation.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/flame_creation.yml index 96a8634cb9..b6630a6e02 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/flame_creation.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/flame_creation.yml @@ -23,13 +23,13 @@ - type: CP14MagicEffectSomaticAspect - type: CP14MagicEffectCastingVisual proto: CP14RuneFlameCreation - - type: InstantAction - itemIconStyle: BigAction + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/fire.rsi state: flame_creation + - type: InstantAction event: !type:CP14DelayedInstantActionEvent cooldown: 10 breakOnMove: false diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/heat.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/heat.yml index aed873d34d..49deaf4e05 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/heat.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/heat.yml @@ -27,15 +27,16 @@ startSpeech: "Vos adepto calidum..." - type: CP14MagicEffectCastingVisual proto: CP14RuneHeat - - type: EntityTargetAction - range: 8 - interactOnMiss: false - itemIconStyle: BigAction + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/fire.rsi state: heat + - type: TargetAction + range: 8 + interactOnMiss: false + - type: EntityTargetAction event: !type:CP14ToggleableEntityTargetActionEvent cooldown: 8 castTime: 10 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 07124f226a..abbdd201c8 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/hell_ballade.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/hell_ballade.yml @@ -34,13 +34,13 @@ - type: CP14MagicEffectRequiredMusicTool - type: CP14MagicEffectCastingVisual proto: CP14RuneHellBallade - - type: InstantAction - itemIconStyle: BigAction + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/fire.rsi state: fire_music + - type: InstantAction event: !type:CP14ToggleableInstantActionEvent effectFrequency: 1 cooldown: 15 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/tiefling_inner_fire.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/tiefling_inner_fire.yml index 0b75b50628..12b48482bc 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/tiefling_inner_fire.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Fire/tiefling_inner_fire.yml @@ -28,13 +28,13 @@ walkSpeedModifier: 1.2 sprintSpeedModifier: 1.2 statusLifetime: 5 - - type: InstantAction - itemIconStyle: BigAction + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/fire.rsi state: tiefling_revenge + - type: InstantAction event: !type:CP14DelayedInstantActionEvent cooldown: 10 breakOnMove: false diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_heat.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_heat.yml index b9924f34a3..cdc9431f24 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_heat.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_heat.yml @@ -34,18 +34,19 @@ endSpeech: "non novit" - type: CP14MagicEffectCastingVisual proto: CP14RuneCureBurn - - type: EntityTargetAction - whitelist: - components: - - MobState - range: 7 - itemIconStyle: BigAction - interactOnMiss: false + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/healing.rsi state: cure_burn + - type: TargetAction + range: 7 + interactOnMiss: false + - type: EntityTargetAction + whitelist: + components: + - MobState event: !type:CP14DelayedEntityTargetActionEvent cooldown: 5 castDelay: 1.5 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_poison.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_poison.yml index 28cf0966d6..80d256645a 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_poison.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_poison.yml @@ -36,18 +36,19 @@ endSpeech: "sta il veleno" - type: CP14MagicEffectCastingVisual proto: CP14RuneBloodPurification - - type: EntityTargetAction - whitelist: - components: - - MobState - range: 7 - itemIconStyle: BigAction - interactOnMiss: false + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/healing.rsi state: cure_poison + - type: TargetAction + range: 7 + interactOnMiss: false + - type: EntityTargetAction + whitelist: + components: + - MobState event: !type:CP14DelayedEntityTargetActionEvent cooldown: 5 castDelay: 1.5 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_wounds.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_wounds.yml index 68d437dfc4..199e4a5897 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_wounds.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/cure_wounds.yml @@ -36,18 +36,19 @@ endSpeech: "vulnera tua" - type: CP14MagicEffectCastingVisual proto: CP14RuneCureWounds - - type: EntityTargetAction - whitelist: - components: - - MobState - range: 7 - itemIconStyle: BigAction - interactOnMiss: false + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/healing.rsi state: cure_wounds + - type: TargetAction + range: 7 + interactOnMiss: false + - type: EntityTargetAction + whitelist: + components: + - MobState event: !type:CP14DelayedEntityTargetActionEvent cooldown: 5 castDelay: 1.5 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/heal_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/heal_ballade.yml index 733e2ea291..4f998bcce3 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/heal_ballade.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/heal_ballade.yml @@ -40,13 +40,14 @@ - type: CP14MagicEffectRequiredMusicTool - type: CP14MagicEffectCastingVisual proto: CP14RuneHealBallade - - type: InstantAction + - type: Action itemIconStyle: BigAction sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/healing.rsi state: heal_music + - type: InstantAction event: !type:CP14ToggleableInstantActionEvent effectFrequency: 1 cooldown: 15 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/magical_acceleration.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/magical_acceleration.yml index c4f31d1a3f..32dd2c379e 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/magical_acceleration.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/magical_acceleration.yml @@ -16,13 +16,13 @@ - !type:CP14SpellSpawnEntityOnTarget spawns: - CP14MagicAccelerationDustEffect - - type: InstantAction - itemIconStyle: BigAction + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/misc.rsi state: magical_acceleration + - type: InstantAction event: !type:CP14ToggleableInstantActionEvent effectFrequency: 0.2 cooldown: 2 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/peace_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/peace_ballade.yml index f53689b817..4fc97ea7f0 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/peace_ballade.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/peace_ballade.yml @@ -33,13 +33,13 @@ - type: CP14MagicEffectRequiredMusicTool - type: CP14MagicEffectCastingVisual proto: CP14RunePeaceBallade - - type: InstantAction - itemIconStyle: BigAction + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/healing.rsi state: peace_music + - type: InstantAction event: !type:CP14ToggleableInstantActionEvent effectFrequency: 1 cooldown: 15 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/plant_growth.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/plant_growth.yml index aa805ce71f..3ccfd0a449 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/plant_growth.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/plant_growth.yml @@ -53,19 +53,20 @@ startSpeech: "Plantae durant..." - type: CP14MagicEffectCastingVisual proto: CP14RunePlantGrowth - - type: EntityTargetAction - whitelist: - components: - - CP14Plant - - CP14MagicEnergyPhotosynthesis - range: 2 - itemIconStyle: BigAction - interactOnMiss: false + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/healing.rsi state: plant_growth + - type: TargetAction + range: 2 + interactOnMiss: false + - type: EntityTargetAction + whitelist: + components: + - CP14Plant + - CP14MagicEnergyPhotosynthesis event: !type:CP14ToggleableEntityTargetActionEvent cooldown: 2 castTime: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/resurrection.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/resurrection.yml index b300c1dc5c..9e2cdb938c 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/resurrection.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/resurrection.yml @@ -42,19 +42,20 @@ endSpeech: "Eu rezei por ti" - type: CP14MagicEffectCastingVisual proto: CP14RuneResurrection - - type: EntityTargetAction - whitelist: - components: - - MobState - range: 7 - itemIconStyle: BigAction - interactOnMiss: false - canTargetSelf: false + - 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 + whitelist: + components: + - MobState event: !type:CP14DelayedEntityTargetActionEvent cooldown: 300 castDelay: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/sheep_polymorph.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/sheep_polymorph.yml index 397fc99a76..46c05516c5 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/sheep_polymorph.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/sheep_polymorph.yml @@ -30,18 +30,19 @@ - type: CP14MagicEffectCastingVisual proto: CP14RuneSheepPolymorph - type: CP14MagicEffectAliveTargetRequired - - type: EntityTargetAction - whitelist: - components: - - MobState - range: 3 - itemIconStyle: BigAction - interactOnMiss: false + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/misc.rsi state: polymorph + - type: TargetAction + range: 3 + interactOnMiss: false + - type: EntityTargetAction + whitelist: + components: + - MobState event: !type:CP14DelayedEntityTargetActionEvent cooldown: 30 castDelay: 1.5 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/speed_ballade.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/speed_ballade.yml index a7c1954006..bd2311e627 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/speed_ballade.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Life/speed_ballade.yml @@ -33,13 +33,13 @@ - type: CP14MagicEffectRequiredMusicTool - type: CP14MagicEffectCastingVisual proto: CP14RuneSpeedBallade - - type: InstantAction - itemIconStyle: BigAction + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/healing.rsi state: speed_music + - type: InstantAction event: !type:CP14ToggleableInstantActionEvent effectFrequency: 1 cooldown: 15 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/flash_light.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/flash_light.yml index 80a0122cd1..4df6676734 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/flash_light.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/flash_light.yml @@ -23,14 +23,15 @@ endSpeech: "excaecant inimicos meos" - type: CP14MagicEffectCastingVisual proto: CP14RuneFlashLight - - type: EntityWorldTargetAction - range: 10 - itemIconStyle: BigAction + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/light.rsi state: flash_light + - type: TargetAction + range: 10 + - type: EntityWorldTargetAction event: !type:CP14DelayedEntityWorldTargetActionEvent cooldown: 5 castDelay: 0.5 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/search_of_life.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/search_of_life.yml index 2a3b34c6e2..1e8fb49ff7 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/search_of_life.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/search_of_life.yml @@ -23,13 +23,13 @@ - type: CP14MagicEffectSomaticAspect - type: CP14MagicEffectCastingVisual proto: CP14RuneSearchOfLife - - type: InstantAction - itemIconStyle: BigAction + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/light.rsi state: search_of_life + - type: InstantAction event: !type:CP14DelayedInstantActionEvent cooldown: 30 castDelay: 1.5 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/signal_light.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/signal_light.yml deleted file mode 100644 index 64a285000b..0000000000 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/signal_light.yml +++ /dev/null @@ -1,253 +0,0 @@ -- type: entity - id: CP14ActionSpellSignalLightBase - abstract: true - components: - - type: Sprite - sprite: _CP14/Actions/Spells/light.rsi - - type: CP14MagicEffectManaCost - manaCost: 5 - - type: CP14MagicEffect - magicType: Light - - type: CP14MagicEffectSomaticAspect - - type: InstantAction - itemIconStyle: BigAction - sound: !type:SoundPathSpecifier - path: /Audio/Magic/rumble.ogg - event: !type:CP14DelayedInstantActionEvent - cooldown: 10 - castDelay: 0.5 - breakOnMove: false - -# RED - -- type: entity - id: CP14ActionSpellSignalLightRed - parent: CP14ActionSpellSignalLightBase - name: Red signal Light - description: You launch a hovering ball of light, briefly emitting a bright glow of red. This glow is able to penetrate the real world even from the demiplane. - components: - - type: Sprite - state: signal_light_red - - type: CP14MagicEffect - effects: - - !type:CP14SpellSpawnEntityOnTarget - spawns: - - CP14SignalLightRed - - type: CP14MagicEffectCastingVisual - proto: CP14RuneSignalLightRed - - type: InstantAction - icon: - sprite: _CP14/Actions/Spells/light.rsi - state: signal_light_red - -- type: entity - id: CP14RuneSignalLightRed - parent: CP14BaseMagicRune - categories: [ HideSpawnMenu ] - save: false - components: - - type: PointLight - color: "#db1616" - - type: Sprite - layers: - - state: sun - color: "#db1616" - shader: unshaded - -- type: entity - parent: CP14BaseSpellScrollLight - id: CP14SpellscrollSignalLightRed - name: red signal light spell scroll - components: - - type: CP14SpellStorage - spells: - - CP14ActionSpellSignalLightRed - -# YELLOW - -- type: entity - id: CP14ActionSpellSignalLightYellow - parent: CP14ActionSpellSignalLightBase - name: Yellow signal Light - description: You launch a hovering ball of light, briefly emitting a bright glow of yellow. This glow is able to penetrate the real world even from the demiplane. - components: - - type: Sprite - state: signal_light_yellow - - type: CP14MagicEffect - effects: - - !type:CP14SpellSpawnEntityOnTarget - spawns: - - CP14SignalLightYellow - - type: CP14MagicEffectCastingVisual - proto: CP14RuneSignalLightYellow - - type: InstantAction - icon: - sprite: _CP14/Actions/Spells/light.rsi - state: signal_light_yellow - -- type: entity - id: CP14RuneSignalLightYellow - parent: CP14BaseMagicRune - categories: [ HideSpawnMenu ] - save: false - components: - - type: PointLight - color: "#ebc942" - - type: Sprite - layers: - - state: sun - color: "#ebc942" - shader: unshaded - -- type: entity - parent: CP14BaseSpellScrollLight - id: CP14SpellscrollSignalLightYellow - name: yellow signal light spell scroll - components: - - type: CP14SpellStorage - spells: - - CP14ActionSpellSignalLightYellow - -# BLUE - -- type: entity - id: CP14ActionSpellSignalLightBlue - parent: CP14ActionSpellSignalLightBase - name: Blue signal Light - description: You launch a hovering ball of light, briefly emitting a bright glow of blue. This glow is able to penetrate the real world even from the demiplane. - components: - - type: Sprite - state: signal_light_blue - - type: CP14MagicEffect - effects: - - !type:CP14SpellSpawnEntityOnTarget - spawns: - - CP14SignalLightBlue - - type: CP14MagicEffectCastingVisual - proto: CP14RuneSignalLightBlue - - type: InstantAction - icon: - sprite: _CP14/Actions/Spells/light.rsi - state: signal_light_blue - -- type: entity - id: CP14RuneSignalLightBlue - parent: CP14BaseMagicRune - categories: [ HideSpawnMenu ] - save: false - components: - - type: PointLight - color: "#42aaeb" - - type: Sprite - layers: - - state: sun - color: "#42aaeb" - shader: unshaded - -- type: entity - parent: CP14BaseSpellScrollLight - id: CP14SpellscrollSignalLightBlue - name: blue signal light spell scroll - components: - - type: CP14SpellStorage - spells: - - CP14ActionSpellSignalLightBlue - -# Signals - -- type: entity - id: CP14SignalLightBase - abstract: true - categories: [ ForkFiltered ] - name: signal light - description: A signal of light left by an adventurer possibly in trouble. - components: - - type: TimedDespawn - lifetime: 12 - - type: Sprite - sprite: _CP14/Effects/Magic/sphere_of_light.rsi - noRot: true - layers: - - state: icon - shader: unshaded - - type: PointLight - radius: 20.0 - energy: 1 - netsync: false - mask: /Textures/_CP14/Effects/LightMasks/lighthouse_cone.png - - type: EmitSoundOnSpawn - sound: - path: /Audio/Items/Flare/flare_on.ogg - - type: AmbientSound - enabled: true - volume: -5 - range: 5 - sound: - path: /Audio/Items/Flare/flare_burn.ogg #TODO sound redesign - - type: CP14SpawnOutOfDemiplane - -- type: entity - id: CP14SignalLightRed - parent: CP14SignalLightBase - suffix: Red - components: - - type: Sprite - color: "#db1616" - - type: PointLight - color: "#db1616" - - type: LightBehaviour - behaviours: - - !type:PulseBehaviour - interpolate: Cubic - maxDuration: 2 - minValue: 1.0 - maxValue: 60.0 - property: Energy - isLooped: true - enabled: true - - type: RotatingLight - speed: 80 - -- type: entity - id: CP14SignalLightYellow - parent: CP14SignalLightBase - suffix: Yellow - components: - - type: Sprite - color: "#ebc942" - - type: PointLight - color: "#ebc942" - - type: LightBehaviour - behaviours: - - !type:PulseBehaviour - interpolate: Cubic - maxDuration: 3 - minValue: 1.0 - maxValue: 60.0 - property: Energy - isLooped: true - enabled: true - - type: RotatingLight - speed: 30 - -- type: entity - id: CP14SignalLightBlue - parent: CP14SignalLightBase - suffix: Blue - components: - - type: Sprite - color: "#42aaeb" - - type: PointLight - color: "#42aaeb" - - type: LightBehaviour - behaviours: - - !type:PulseBehaviour - interpolate: Cubic - maxDuration: 4 - minValue: 1.0 - maxValue: 60.0 - property: Energy - isLooped: true - enabled: true - - type: RotatingLight - speed: 50 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/sphere_of_light.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/sphere_of_light.yml index 78943ce80e..75e74f8954 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/sphere_of_light.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Light/sphere_of_light.yml @@ -23,13 +23,13 @@ - type: CP14MagicEffectSomaticAspect - type: CP14MagicEffectCastingVisual proto: CP14RuneSphereOfLight - - type: InstantAction - itemIconStyle: BigAction + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/light.rsi state: sphere_of_light + - type: InstantAction event: !type:CP14DelayedInstantActionEvent cooldown: 30 castDelay: 0.5 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Fear.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Fear.yml index 9e4d986f0e..ed3e489003 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Fear.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Fear.yml @@ -31,19 +31,20 @@ time: 2 - type: CP14MagicEffectCastingVisual proto: CP14RuneLurkerFear - - type: EntityTargetAction - whitelist: - components: - - MobState - range: 15 - itemIconStyle: BigAction - canTargetSelf: false - interactOnMiss: false + - 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 + whitelist: + components: + - MobState event: !type:CP14ToggleableEntityTargetActionEvent cooldown: 30 castTime: 30 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Kick.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Kick.yml index f31068e2e1..5a85f10450 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Kick.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Kick.yml @@ -35,13 +35,14 @@ startEmote: cp14-kick-lurker-start endEmote: cp14-kick-lurker - type: CP14MagicEffectPacifiedBlock - - type: EntityTargetAction - canTargetSelf: false - range: 2 - itemIconStyle: BigAction + - type: Action icon: sprite: _CP14/Actions/Spells/lurker.rsi state: kick + - type: TargetAction + canTargetSelf: false + range: 2 + - type: EntityTargetAction event: !type:CP14DelayedEntityTargetActionEvent cooldown: 20 castDelay: 2.5 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Step.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Step.yml index 07f9217145..71fc059dee 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Step.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Lurker/Step.yml @@ -19,16 +19,17 @@ - CP14LurkerRitualSound - type: CP14MagicEffectCastingVisual proto: CP14RuneLurkerFear - - type: EntityWorldTargetAction - checkCanAccess: false - range: 10 - itemIconStyle: BigAction + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/lurker.rsi state: step - event: !type:CP14DelayedEntityWorldTargetActionEvent + - type: TargetAction + checkCanAccess: false + range: 10 + - type: WorldTargetAction + event: !type:CP14DelayedWorldTargetActionEvent cooldown: 30 hidden: true breakOnMove: false 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 c5a8a1b528..1edefb4bfa 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_ballade.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_ballade.yml @@ -32,13 +32,13 @@ - type: CP14MagicEffectRequiredMusicTool - type: CP14MagicEffectCastingVisual proto: CP14RuneMagicBallade - - type: InstantAction - itemIconStyle: BigAction + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/meta.rsi state: magic_music + - type: InstantAction event: !type:CP14ToggleableInstantActionEvent effectFrequency: 1 cooldown: 15 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_consume.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_consume.yml index 591943480a..9d97a7223f 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_consume.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_consume.yml @@ -20,17 +20,17 @@ - type: CP14MagicEffectSomaticAspect - type: CP14MagicEffectCastingVisual proto: CP14RuneManaConsume - - type: EntityTargetAction - whitelist: - components: - - CP14MagicEnergyContainer - itemIconStyle: BigAction - interactOnMiss: false + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/meta.rsi state: mana_consume + - type: TargetAction + - type: EntityTargetAction + whitelist: + components: + - CP14MagicEnergyContainer event: !type:CP14ToggleableEntityTargetActionEvent cooldown: 5 castTime: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_gift.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_gift.yml index 78ac455cac..3123928705 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_gift.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_gift.yml @@ -26,19 +26,20 @@ - type: CP14MagicEffectSomaticAspect - type: CP14MagicEffectCastingVisual proto: CP14RuneManaGift - - type: EntityTargetAction - whitelist: - components: - - CP14MagicEnergyContainer - - CP14MagicEnergyCrystalSlot - itemIconStyle: BigAction - interactOnMiss: false - canTargetSelf: true + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/meta.rsi state: mana_gift + - type: TargetAction + interactOnMiss: false + - type: EntityTargetAction + whitelist: + components: + - CP14MagicEnergyContainer + - CP14MagicEnergyCrystalSlot + canTargetSelf: true event: !type:CP14ToggleableEntityTargetActionEvent cooldown: 2 castTime: 10 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_splitting.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_splitting.yml index 47436bdf78..57745315fc 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_splitting.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_splitting.yml @@ -27,19 +27,19 @@ safe: true - type: CP14MagicEffectCastingVisual proto: CP14RuneMagicSplitting - - type: EntityTargetAction - whitelist: - components: - - CP14MagicEnergyContainer - - ExaminableSolution - itemIconStyle: BigAction - interactOnMiss: false - range: 60 + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/meta.rsi state: counter_spell + - type: TargetAction + range: 60 + - type: EntityTargetAction + whitelist: + components: + - CP14MagicEnergyContainer + - ExaminableSolution event: !type:CP14DelayedEntityTargetActionEvent cooldown: 15 castDelay: 0.25 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_trance.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_trance.yml index 58b24887d6..f87a7314e2 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_trance.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Meta/mana_trance.yml @@ -22,11 +22,11 @@ CP14ManaDepletion: -0.1 - type: CP14MagicEffectCastingVisual proto: CP14RuneManaTrance - - type: InstantAction - itemIconStyle: BigAction + - type: Action icon: sprite: _CP14/Actions/Spells/meta.rsi state: mana_trance + - type: InstantAction event: !type:CP14ToggleableInstantActionEvent cooldown: 60 castTime: 120 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/kick.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/kick.yml index db9ef6acac..9d138e9f01 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/kick.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/kick.yml @@ -31,13 +31,14 @@ startEmote: cp14-kick-emote-start endEmote: cp14-kick-emote - type: CP14MagicEffectPacifiedBlock - - type: EntityTargetAction - canTargetSelf: false - range: 1 - itemIconStyle: BigAction + - type: Action icon: sprite: _CP14/Actions/Spells/physical.rsi state: kick + - type: TargetAction + range: 1 + - type: EntityTargetAction + canTargetSelf: false event: !type:CP14DelayedEntityTargetActionEvent cooldown: 5 castDelay: 0.5 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/sprint.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/sprint.yml index df8489752f..38326f8bd8 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/sprint.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Physical/sprint.yml @@ -15,13 +15,13 @@ - !type:CP14SpellSpawnEntityOnTarget spawns: - CP14DustEffect - - type: InstantAction - itemIconStyle: BigAction + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/physical.rsi state: sprint + - type: InstantAction event: !type:CP14ToggleableInstantActionEvent effectFrequency: 0.2 cooldown: 2 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Slime/jump.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Slime/jump.yml index 532e5f505e..a38fac82da 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Slime/jump.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Slime/jump.yml @@ -12,14 +12,15 @@ effects: - !type:CP14SpellThrowUserTo throwPower: 8 - - type: EntityWorldTargetAction - useDelay: 8 - range: 10 - checkCanAccess: false - itemIconStyle: BigAction + - type: Action + cooldown: 8 icon: sprite: _CP14/Actions/Spells/slime.rsi state: jump + - type: TargetAction + checkCanAccess: false + range: 10 + - type: WorldTargetAction event: !type:CP14DelayedEntityWorldTargetActionEvent hidden: true breakOnMove: false diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/T0_Bite.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/T0_Bite.yml index daff8b1f73..92f4584e99 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/T0_Bite.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/T0_Bite.yml @@ -26,20 +26,21 @@ - !type:Jitter - !type:ModifyBloodLevel amount: -15 - - type: EntityTargetAction - repeat: true - whitelist: - components: - - MobState - range: 1 - itemIconStyle: BigAction - canTargetSelf: false - interactOnMiss: false + - type: Action sound: !type:SoundPathSpecifier path: /Audio/_CP14/Effects/vampire_bite.ogg icon: sprite: _CP14/Actions/Spells/vampire.rsi state: bite + - type: TargetAction + repeat: true + range: 1 + interactOnMiss: false + - type: EntityTargetAction + canTargetSelf: false + whitelist: + components: + - MobState event: !type:CP14DelayedEntityTargetActionEvent cooldown: 1 castDelay: 1 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/T1_Hypnosis.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/T1_Hypnosis.yml index e2748a7789..7156b3ca27 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/T1_Hypnosis.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/T1_Hypnosis.yml @@ -27,19 +27,20 @@ type: Add - type: CP14MagicEffectCastingVisual proto: CP14RuneVampireHypnosis - - type: EntityTargetAction - whitelist: - components: - - MobState - range: 5 - itemIconStyle: BigAction - canTargetSelf: false - interactOnMiss: false + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/vampire.rsi state: blood_moon + - type: TargetAction + interactOnMiss: false + range: 5 + - type: EntityTargetAction + whitelist: + components: + - MobState + canTargetSelf: false event: !type:CP14DelayedEntityTargetActionEvent cooldown: 30 castDelay: 1.5 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/T2_Blood_step.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/T2_Blood_step.yml index d445e84102..bd4fd2aa44 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/T2_Blood_step.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/T2_Blood_step.yml @@ -18,16 +18,17 @@ needVision: false - type: CP14MagicEffectCastingVisual proto: CP14ImpactEffectBloodStep - - type: EntityWorldTargetAction - checkCanAccess: false - range: 10 - itemIconStyle: BigAction + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/vampire.rsi state: blood_step - event: !type:CP14DelayedEntityWorldTargetActionEvent + - type: TargetAction + checkCanAccess: false + range: 10 + - type: WorldTargetAction + event: !type:CP14DelayedWorldTargetActionEvent cooldown: 40 hidden: true breakOnMove: false diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/bloodlust.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/bloodlust.yml index 11e3add6a1..9046ecd519 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/bloodlust.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Vampire/bloodlust.yml @@ -20,13 +20,13 @@ - type: CP14MagicEffectSomaticAspect - type: CP14MagicEffectCastingVisual proto: CP14RuneVampireHypnosis - - type: InstantAction - itemIconStyle: BigAction + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/vampire.rsi state: blood_moon + - type: InstantAction event: !type:CP14DelayedInstantActionEvent cooldown: 30 castDelay: 1.5 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/beer_creation.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/beer_creation.yml index 51369352a8..67400ffce1 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/beer_creation.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/beer_creation.yml @@ -23,13 +23,13 @@ - type: CP14MagicEffectSomaticAspect - type: CP14MagicEffectCastingVisual proto: CP14RuneBeerCreation - - type: InstantAction - itemIconStyle: BigAction + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/water.rsi state: beer_creation + - type: InstantAction event: !type:CP14DelayedInstantActionEvent cooldown: 30 castDelay: 5 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/freeze.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/freeze.yml index 796547311e..68540710b6 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/freeze.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/freeze.yml @@ -31,15 +31,16 @@ startSpeech: "Vos adepto frigus..." - type: CP14MagicEffectCastingVisual proto: CP14RunePlantFreeze - - type: EntityTargetAction - range: 5 - interactOnMiss: false - itemIconStyle: BigAction + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/water.rsi state: freeze + - type: TargetAction + range: 5 + interactOnMiss: false + - type: EntityTargetAction event: !type:CP14ToggleableEntityTargetActionEvent cooldown: 5 castTime: 3 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_arrow.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_arrow.yml index c205c75ea8..40f70623e4 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_arrow.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_arrow.yml @@ -23,13 +23,13 @@ - type: CP14MagicEffectSomaticAspect - type: CP14MagicEffectCastingVisual proto: CP14RuneWaterCreation - - type: InstantAction - itemIconStyle: BigAction + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/water.rsi state: ice_arrow + - type: InstantAction event: !type:CP14DelayedInstantActionEvent cooldown: 10 breakOnMove: false diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_dagger.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_dagger.yml index 84a94281ff..70037a297f 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_dagger.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_dagger.yml @@ -23,13 +23,13 @@ - type: CP14MagicEffectSomaticAspect - type: CP14MagicEffectCastingVisual proto: CP14RuneWaterCreation - - type: InstantAction - itemIconStyle: BigAction + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/water.rsi state: ice_dagger + - type: InstantAction event: !type:CP14DelayedInstantActionEvent cooldown: 10 breakOnMove: false 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 5ce3592941..ef06658750 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_shards.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/ice_shards.yml @@ -23,18 +23,18 @@ - type: CP14MagicEffectCastingVisual proto: CP14RuneIceShards - type: CP14MagicEffectPacifiedBlock - - type: EntityWorldTargetAction - repeat: true - checkCanAccess: false - raiseOnUser: true - range: 60 - itemIconStyle: BigAction + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/water.rsi state: ice_shards - event: !type:CP14EntityWorldTargetActionEvent + - type: TargetAction + repeat: true + checkCanAccess: false + range: 60 + - type: WorldTargetAction + event: !type:CP14WorldTargetActionEvent cooldown: 0.5 - type: entity diff --git a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/water_creation.yml b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/water_creation.yml index 656f34a201..c395feaf56 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/water_creation.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/Spells/Water/water_creation.yml @@ -20,13 +20,13 @@ - type: CP14MagicEffectSomaticAspect - type: CP14MagicEffectCastingVisual proto: CP14RuneWaterCreation - - type: InstantAction - itemIconStyle: BigAction + - type: Action sound: !type:SoundPathSpecifier path: /Audio/Magic/rumble.ogg icon: sprite: _CP14/Actions/Spells/water.rsi state: water_creation + - type: InstantAction event: !type:CP14DelayedInstantActionEvent cooldown: 10 castDelay: 0.8 diff --git a/Resources/Prototypes/_CP14/Entities/Actions/ghost.yml b/Resources/Prototypes/_CP14/Entities/Actions/ghost.yml index b924870d24..a4aed57606 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/ghost.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/ghost.yml @@ -3,11 +3,12 @@ name: Move up description: Move up one Z-Level components: - - type: InstantAction + - type: Action checkCanInteract: false icon: sprite: _CP14/Actions/zLevel.rsi state: up + - type: InstantAction event: !type:CP14ZLevelActionUp - type: entity @@ -15,11 +16,12 @@ name: Move down description: Move down one Z-Level components: - - type: InstantAction + - type: Action checkCanInteract: false icon: sprite: _CP14/Actions/zLevel.rsi state: down + - type: InstantAction event: !type:CP14ZLevelActionDown - type: entity @@ -27,11 +29,12 @@ name: Toggle roofs description: Show or hide roofs components: - - type: InstantAction + - type: Action clientExclusive: true checkCanInteract: false icon: sprite: _CP14/Actions/zLevel.rsi state: roof + - type: InstantAction event: !type:CP14ToggleRoofVisibilityAction diff --git a/Resources/Prototypes/_CP14/Entities/Actions/nightVision.yml b/Resources/Prototypes/_CP14/Entities/Actions/nightVision.yml index 0cbd4cb407..4da95cd26c 100644 --- a/Resources/Prototypes/_CP14/Entities/Actions/nightVision.yml +++ b/Resources/Prototypes/_CP14/Entities/Actions/nightVision.yml @@ -3,10 +3,11 @@ name: Toggle Night Vision description: You begin to see the world in a special way that allows you to see even in total darkness. components: - - type: InstantAction + - type: Action icon: Interface/VerbIcons/light.svg.192dpi.png clientExclusive: true checkCanInteract: false + - type: InstantAction event: !type:CP14ToggleNightVisionEvent - type: entity