tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Predict DestructibleSystem Part 2: First batch of entity effects (#41039)

Browse Source 
* first batch

* fix name

* fix
This commit is contained in:
slarticodefast
2025-10-23 12:33:30 +02:00
committed by GitHub
parent 0abb5f0765
commit 6159801442
11 changed files with 242 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Content.Shared/EntityEffects/Effects/Transform/PopupMessageEntityEffectSystem.cs
View File

@@ -1,6 +1,7 @@
using Content.Shared.Popups;
using Robust.Shared.Network;
using Robust.Shared.Random;
using Robust.Shared.Serialization;
namespace Content.Shared.EntityEffects.Effects.Transform;
@@ -20,15 +21,21 @@ public sealed partial class PopupMessageEntityEffectSystem : EntityEffectSystem<
if (_net.IsClient)
return;
var msg = _random.Pick(args.Effect.Messages);
var msg = Loc.GetString(_random.Pick(args.Effect.Messages), ("entity", entity));
switch (args.Effect.Type)
switch ((args.Effect.Method, args.Effect.Type))
{
case PopupRecipients.Local:
_popup.PopupEntity(Loc.GetString(msg, ("entity", entity)), entity, entity, args.Effect.VisualType);
case (PopupMethod.PopupEntity, PopupRecipients.Local):
_popup.PopupEntity(msg, entity, entity, args.Effect.VisualType);
break;
case PopupRecipients.Pvs:
_popup.PopupEntity(Loc.GetString(msg, ("entity", entity)), entity, args.Effect.VisualType);
case (PopupMethod.PopupEntity, PopupRecipients.Pvs):
_popup.PopupEntity(msg, entity, args.Effect.VisualType);
break;
case (PopupMethod.PopupCoordinates, PopupRecipients.Local):
_popup.PopupCoordinates(msg, Transform(entity).Coordinates, entity, args.Effect.VisualType);
break;
case (PopupMethod.PopupCoordinates, PopupRecipients.Pvs):
_popup.PopupCoordinates(msg, Transform(entity).Coordinates, args.Effect.VisualType);
break;
}
}
@@ -50,6 +57,13 @@ public sealed partial class PopupMessage : EntityEffectBase<PopupMessage>
[DataField]
public PopupRecipients Type = PopupRecipients.Local;
/// <summary>
/// Which popup API method to use.
/// Use PopupCoordinates in case the entity will be deleted while the popup is shown.
/// </summary>
[DataField]
public PopupMethod Method = PopupMethod.PopupEntity;
/// <summary>
/// Size of the popup.
/// </summary>
@@ -57,8 +71,16 @@ public sealed partial class PopupMessage : EntityEffectBase<PopupMessage>
public PopupType VisualType = PopupType.Small;
}
public enum PopupRecipients
[Serializable, NetSerializable]
public enum PopupRecipients : byte
{
Pvs,
Local
Local,
}
[Serializable, NetSerializable]
public enum PopupMethod : byte
{
PopupEntity,
PopupCoordinates,
}