using Content.Shared.Magic;
+using Content.Shared.Magic.Events;
namespace Content.Client.Magic;
-public sealed class MagicSystem : SharedMagicSystem;
+public sealed class MagicSystem : SharedMagicSystem
+{
+}
{
_chat.TrySendInGameICMessage(args.Performer, Loc.GetString(args.Speech), InGameICChatType.Speak, false);
}
+
+ public override void OnVoidApplause(VoidApplauseSpellEvent ev)
+ {
+ base.OnVoidApplause(ev);
+
+ _chat.TryEmoteWithChat(ev.Performer, ev.Emote);
+
+ var perfXForm = Transform(ev.Performer);
+ var targetXForm = Transform(ev.Target);
+
+ Spawn(ev.Effect, perfXForm.Coordinates);
+ Spawn(ev.Effect, targetXForm.Coordinates);
+ }
}
--- /dev/null
+using Content.Shared.Actions;
+using Content.Shared.Chat.Prototypes;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Magic.Events;
+
+public sealed partial class VoidApplauseSpellEvent : EntityTargetActionEvent, ISpeakSpell
+{
+ [DataField]
+ public string? Speech { get; private set; }
+
+ /// <summary>
+ /// Emote to use.
+ /// </summary>
+ [DataField]
+ public ProtoId<EmotePrototype> Emote = "ClapSingle";
+
+ /// <summary>
+ /// Visual effect entity that is spawned at both the user's and the target's location.
+ /// </summary>
+ [DataField]
+ public EntProtoId Effect = "EffectVoidBlink";
+}
SubscribeLocalEvent<ChargeSpellEvent>(OnChargeSpell);
SubscribeLocalEvent<RandomGlobalSpawnSpellEvent>(OnRandomGlobalSpawnSpell);
SubscribeLocalEvent<MindSwapSpellEvent>(OnMindSwapSpell);
+ SubscribeLocalEvent<VoidApplauseSpellEvent>(OnVoidApplause);
// Spell wishlist
// A wishlish of spells that I'd like to implement or planning on implementing in a future PR
return;
var transform = Transform(args.Performer);
-
- if (transform.MapID != args.Target.GetMapId(EntityManager) || !_interaction.InRangeUnobstructed(args.Performer, args.Target, range: 1000F, collisionMask: CollisionGroup.Opaque, popup: true))
+ if (transform.MapID != _transform.GetMapId(args.Target) || !_interaction.InRangeUnobstructed(args.Performer, args.Target, range: 1000F, collisionMask: CollisionGroup.Opaque, popup: true))
return;
_transform.SetCoordinates(args.Performer, args.Target);
Speak(args);
args.Handled = true;
}
+
+ public virtual void OnVoidApplause(VoidApplauseSpellEvent ev)
+ {
+ if (ev.Handled || !PassesSpellPrerequisites(ev.Action, ev.Performer))
+ return;
+
+ ev.Handled = true;
+ Speak(ev);
+
+ _transform.SwapPositions(ev.Performer, ev.Target);
+ }
// End Teleport Spells
#endregion
#region Spell Helpers
license: "CC-BY-SA-3.0"
copyright: "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432"
source: "https://github.com/tgstation/tgstation"
+- files:
+ - clap-single.ogg
+ license: "CC-BY-SA-3.0"
+ copyright: "Taken from Citadel Station at https://github.com/Citadel-Station-13/Citadel-Station-13/commit/e145bdafe83e2cf38d148c39f073da5e7b0cb456"
+ source: "https://github.com/Citadel-Station-13/Citadel-Station-13"
- files:
- snap1.ogg
- snap2.ogg
copyright: '"forcewall.ogg", "knock.ogg", "blink.ogg", "ethereal_enter.ogg", and "ethereal_exit.ogg" by Citadel Station 13'
license: CC-BY-SA-3.0
source: https://github.com/Citadel-Station-13/Citadel-Station-13/commit/35a1723e98a60f375df590ca572cc90f1bb80bd5
+
+- files:
+ - voidblink.ogg
+ copyright: '"voidblink.ogg" by Citadel Station 13'
+ license: CC-BY-SA-3.0
+ source: https://github.com/Citadel-Station-13/Citadel-Station-13/commit/e145bdafe83e2cf38d148c39f073da5e7b0cb456
chat-emote-name-thump = Thump Tail
chat-emote-name-click = Click
chat-emote-name-clap = Clap
+chat-emote-name-clap-single = Single Clap
chat-emote-name-snap = Snap
chat-emote-name-salute = Salute
chat-emote-name-gasp = Gasp
chat-emote-msg-thump = thumps {POSS-ADJ($entity)} tail.
chat-emote-msg-click = clicks.
chat-emote-msg-clap = claps!
+chat-emote-msg-clap-single = claps their hands together.
chat-emote-msg-snap = snaps {POSS-ADJ($entity)} fingers.
chat-emote-msg-salute = salutes.
chat-emote-msg-gasp = gasps.
spellbook-blink-name = Blink
spellbook-blink-desc = Don't blink or you'll miss yourself teleporting away.
+spellbook-voidapplause-name = Void Applause
+spellbook-voidapplause-desc = Swap places with the target, doesn't it make you want to do the boogie?
+
spellbook-force-wall-name = Force Wall
spellbook-force-wall-desc = Make three walls of pure force that you can pass through, but other's can't.
- !type:ListingLimitedStockCondition
stock: 1
+# Taking an Eldritch spell, good proof of concept and a way to celebrate everything magic.
+- type: listing
+ id: SpellbookVoidApplause
+ name: spellbook-voidapplause-name
+ description: spellbook-voidapplause-desc
+ productAction: ActionVoidApplause
+ cost:
+ WizCoin: 1
+ categories:
+ - SpellbookUtility
+ conditions:
+ - !type:ListingLimitedStockCondition
+ stock: 1
+
- type: listing
id: SpellbookCharge
name: spellbook-charge-name
--- /dev/null
+- type: entity
+ id: EffectVoidBlink
+ name: void blink
+ categories: [ HideSpawnMenu ]
+ save: false
+ components:
+ # TODO: PointLight is temp until I can make a shader & overlay for negative light or until this can support it
+ - type: PointLight
+ radius: 3
+ energy: 1
+ softness: 10
+ color: "#301934"
+ - type: Transform
+ noRot: true
+ - type: Sprite
+ sprite: Objects/Magic/Eldritch/eldritch_actions.rsi
+ drawdepth: Effects
+ noRot: true
+ layers:
+ - state: "voidblink"
+ - type: TimedDespawn
+ lifetime: 1
+ - type: Tag
+ tags:
+ - HideContextMenu
sprite: Objects/Magic/magicactions.rsi
state: blink
event: !type:TeleportSpellEvent
+
+# TODO: Second level upgrade sometime that allows swapping with all objects
+- type: entity
+ id: ActionVoidApplause
+ name: Void Applause
+ description: Clap your hands and swap places with the target.
+ components:
+ - type: EntityTargetAction
+ useDelay: 15
+ range: 16
+ sound: !type:SoundPathSpecifier
+ path: /Audio/Magic/Eldritch/voidblink.ogg
+ itemIconStyle: BigAction
+ whitelist:
+ components:
+ - Body
+ canTargetSelf: false
+ interactOnMiss: false
+ checkCanAccess: false
+ repeat: false
+ icon:
+ sprite: Objects/Magic/Eldritch/eldritch_actions.rsi
+ state: voidblink
+ event: !type:VoidApplauseSpellEvent
+ effect: EffectVoidBlink
- /Audio/Effects/Emotes/clap3.ogg
- /Audio/Effects/Emotes/clap4.ogg
+- type: soundCollection
+ id: ClapSingle
+ files:
+ - /Audio/Effects/Emotes/clap-single.ogg
+
- type: soundCollection
id: Snaps
files:
sounds:
Clap:
collection: Claps
+ ClapSingle:
+ collection: ClapSingle
Snap:
collection: Snaps
params:
sounds:
Clap:
path: /Audio/Voice/Diona/diona_clap.ogg
+ # TODO: Replace this with a similar wood themed single clap
+ ClapSingle:
+ collection: ClapSingle
Snap:
path: /Audio/Voice/Diona/diona_snap.ogg
params:
variation: 0.125
Clap:
collection: Claps
+ ClapSingle:
+ collection: ClapSingle
Snap:
collection: Snaps
params:
- BorgChassis
chatMessages: ["chat-emote-msg-clap"]
chatTriggers:
- - clap
- claps
- clapping
- clapped
+- type: emote
+ id: ClapSingle
+ name: chat-emote-name-clap-single
+ category: Hands
+ icon: Interface/Emotes/clap.png #TODO: Needs a sprite that distinguishes it better from clap
+ whitelist:
+ components:
+ - Hands
+ blacklist:
+ components:
+ - BorgChassis
+ chatMessages: [ "chat-emote-msg-clap-single" ]
+ chatTriggers:
+ - clap
+ - claps their hands together
+
- type: emote
id: Snap
name: chat-emote-name-snap
--- /dev/null
+{
+ "version": 1,
+ "license": "CC-BY-NC-SA-3.0",
+ "copyright": "Taken from and modified by kiwedespars on Citadel Station at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/e145bdafe83e2cf38d148c39f073da5e7b0cb456",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "voidblink",
+ "delays": [
+ [
+ 0.1,
+ 0.3,
+ 0.1,
+ 0.3,
+ 0.1,
+ 0.3,
+ 0.1,
+ 0.3,
+ 0.3
+ ]
+ ]
+ }
+ ]
+}
projects / space-station-14.git / commitdiff
