Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Jabak
2024-06-19 12:59:49 +03:00
parent 675e0b0c04 8f027d5333
commit 94cae056d7
59 changed files with 334 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Server/_White/Wizard/Magic/Other/InstantRecallComponent.cs
View File

@@ -1,7 +1,23 @@
namespace Content.Server._White.Wizard.Magic.Other;
using Robust.Shared.Audio;
namespace Content.Server._White.Wizard.Magic.Other;
[RegisterComponent]
public sealed partial class InstantRecallComponent : Component
{
public EntityUid? Item;
/// <summary>
/// Sound to play on use.
/// </summary>
[DataField]
[ViewVariables]
public SoundSpecifier LinkSound;
/// <summary>
/// Sound to play on use.
/// </summary>
[DataField]
[ViewVariables]
public SoundSpecifier RecallSound;
}

4
Content.Server/_White/Wizard/Magic/WizardSpellsSystem.cs
View File

@@ -217,6 +217,7 @@ public sealed class WizardSpellsSystem : EntitySystem
recallComponent.Item = handsComponent.ActiveHandEntity.Value;
_popupSystem.PopupEntity($"Сопряжено с {MetaData(handsComponent.ActiveHandEntity.Value).EntityName}",
msg.Performer, msg.Performer);
_audio.PlayPvs(recallComponent.LinkSound, msg.Performer);
return;
}
@@ -226,12 +227,13 @@ public sealed class WizardSpellsSystem : EntitySystem
var coordsItem = Transform(recallComponent.Item.Value).Coordinates;
var coordsPerformer = Transform(msg.Performer).Coordinates;
Spawn("EffectEmpPulse", coordsItem);
Spawn("EffectMagicDisappearance", coordsItem);
_transformSystem.SetCoordinates(recallComponent.Item.Value, coordsPerformer);
_transformSystem.AttachToGridOrMap(recallComponent.Item.Value);
_handsSystem.TryForcePickupAnyHand(msg.Performer, recallComponent.Item.Value);
_audio.PlayPvs(recallComponent.RecallSound, msg.Performer);
msg.Handled = true;
Speak(msg);