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

Add MindPlaySound to role system (#21460)

Browse Source 
Co-authored-by: deltanedas <@deltanedas:kde.org>
This commit is contained in:
deltanedas
2023-11-14 12:52:40 +00:00
committed by GitHub
parent aa704eee81
commit 318d843b80
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
View File

@@ -268,21 +268,16 @@ public sealed class TraitorRuleSystem : GameRuleSystem<TraitorRuleComponent>
_roleSystem.MindAddRole(mindId, new TraitorRoleComponent _roleSystem.MindAddRole(mindId, new TraitorRoleComponent
{ {
PrototypeId = traitorRule.TraitorPrototypeId PrototypeId = traitorRule.TraitorPrototypeId
}); }, mind);
// Assign briefing // Assign briefing and greeting sound
_roleSystem.MindAddRole(mindId, new RoleBriefingComponent _roleSystem.MindAddRole(mindId, new RoleBriefingComponent
{ {
Briefing = briefing Briefing = briefing
}); }, mind);
_roleSystem.MindPlaySound(mindId, traitorRule.GreetSoundNotification, mind);
SendTraitorBriefing(mindId, traitorRule.Codewords, code); SendTraitorBriefing(mindId, traitorRule.Codewords, code);
traitorRule.TraitorMinds.Add(mindId); traitorRule.TraitorMinds.Add(mindId);
if (_mindSystem.TryGetSession(mindId, out var session))
{
// Notificate player about new role assignment
_audioSystem.PlayGlobal(traitorRule.GreetSoundNotification, session);
}
// Change the faction // Change the faction
_npcFaction.RemoveFaction(entity, "NanoTrasen", false); _npcFaction.RemoveFaction(entity, "NanoTrasen", false);
_npcFaction.AddFaction(entity, "Syndicate"); _npcFaction.AddFaction(entity, "Syndicate");

5
Content.Server/Ninja/Systems/SpaceNinjaSystem.cs
View File

@@ -167,6 +167,7 @@ public sealed class SpaceNinjaSystem : SharedSpaceNinjaSystem
PrototypeId = "SpaceNinja" PrototypeId = "SpaceNinja"
}; };
_role.MindAddRole(mindId, role, mind); _role.MindAddRole(mindId, role, mind);
_role.MindPlaySound(mindId, config.GreetingSound, mind);
// choose spider charge detonation point // choose spider charge detonation point
var warps = new List<EntityUid>(); var warps = new List<EntityUid>();
@@ -179,9 +180,7 @@ public sealed class SpaceNinjaSystem : SharedSpaceNinjaSystem
if (warps.Count > 0) if (warps.Count > 0)
role.SpiderChargeTarget = _random.Pick(warps); role.SpiderChargeTarget = _random.Pick(warps);
var session = mind.Session; _chatMan.DispatchServerMessage(mind.Session, Loc.GetString("ninja-role-greeting"));
_audio.PlayGlobal(config.GreetingSound, Filter.Empty().AddPlayer(session), false, AudioParams.Default);
_chatMan.DispatchServerMessage(session, Loc.GetString("ninja-role-greeting"));
} }
// TODO: PowerCellDraw, modify when cloak enabled // TODO: PowerCellDraw, modify when cloak enabled

12
Content.Shared/Roles/SharedRoleSystem.cs
View File

@@ -2,6 +2,7 @@
using Content.Shared.Database; using Content.Shared.Database;
using Content.Shared.Mind; using Content.Shared.Mind;
using Content.Shared.Roles.Jobs; using Content.Shared.Roles.Jobs;
using Robust.Shared.Audio;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
namespace Content.Shared.Roles; namespace Content.Shared.Roles;
@@ -10,6 +11,7 @@ public abstract class SharedRoleSystem : EntitySystem
{ {
[Dependency] private readonly ISharedAdminLogManager _adminLogger = default!; [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
[Dependency] private readonly IPrototypeManager _prototypes = default!; [Dependency] private readonly IPrototypeManager _prototypes = default!;
[Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly SharedMindSystem _minds = default!; [Dependency] private readonly SharedMindSystem _minds = default!;
// TODO please lord make role entities // TODO please lord make role entities
@@ -153,4 +155,14 @@ public abstract class SharedRoleSystem : EntitySystem
{ {
return _antagTypes.Contains(typeof(T)); return _antagTypes.Contains(typeof(T));
} }
/// <summary>
/// Play a sound for the mind, if it has a session attached.
/// Use this for role greeting sounds.
/// </summary>
public void MindPlaySound(EntityUid mindId, SoundSpecifier? sound, MindComponent? mind = null)
{
if (Resolve(mindId, ref mind) && mind.Session != null)
_audio.PlayGlobal(sound, mind.Session);
}
} }