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

Adds PopupMessage to being hugged [Fix #7644] (#7698)

Browse Source
This commit is contained in:
Júlio César Ueti
2022-04-23 20:43:11 -03:00
committed by GitHub
parent 94bd2b7c94
commit f5eead4ba9
9 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Interaction/Components/InteractionPopupComponent.cs
View File

@@ -51,10 +51,10 @@ namespace Content.Server.Interaction.Components;
public float SuccessChance = 1.0f; // Always succeed, unless specified otherwise on the yaml prototype.
/// <summary>
/// Will the popup message be perceived by entities not involved in the interaction?
/// If set, shows a message to all surrounding players but NOT the current player.
/// </summary>
[DataField("popupPerceivedByOthers")]
public bool PopupPerceivedByOthers = false;
[DataField("messagePerceivedByOthers")]
public string? MessagePerceivedByOthers;
/// <summary>
/// Will the sound effect be perceived by entities not involved in the interaction?

8
Content.Server/Interaction/InteractionPopupSystem.cs
View File

@@ -56,8 +56,12 @@ public sealed class InteractionPopupSystem : EntitySystem
sfx = component.InteractFailureSound.GetSound();
}
if (component.PopupPerceivedByOthers)
_popupSystem.PopupEntity(msg, uid, Filter.Pvs(uid)); //play for everyone in range
if (component.MessagePerceivedByOthers != null)
{
string msgOthers = Loc.GetString(component.MessagePerceivedByOthers,("user", args.User), ("target", uid));
_popupSystem.PopupEntity(msg, uid, Filter.Entities(args.User));
_popupSystem.PopupEntity(msgOthers, uid, Filter.Pvs(uid, 2F, EntityManager).RemoveWhereAttachedEntity(puid => puid == args.User));
}
else
_popupSystem.PopupEntity(msg, uid, Filter.Entities(args.User)); //play only for the initiating entity.