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

uplink ringtone code + minor cleanup (#15277)

Browse Source 
* uplink ringtone code + minor cleanup

* show uplink code in character menu

* no log

* rgbee

* no red

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
This commit is contained in:
deltanedas
2023-04-23 21:00:42 +00:00
committed by GitHub
parent 8adff42250
commit 597c398545
7 changed files with 85 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
Content.Server/PDA/PDASystem.cs
View File

@@ -5,8 +5,6 @@ using Content.Server.Light.Components;
using Content.Server.Light.EntitySystems;
using Content.Server.Light.Events;
using Content.Server.PDA.Ringer;
using Content.Server.Store.Components;
using Content.Server.Store.Systems;
using Content.Server.Station.Systems;
using Content.Server.UserInterface;
using Content.Shared.PDA;
@@ -26,16 +24,12 @@ namespace Content.Server.PDA
[Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
[Dependency] private readonly StationSystem _stationSystem = default!;
[Dependency] private readonly CartridgeLoaderSystem _cartridgeLoaderSystem = default!;
[Dependency] private readonly StoreSystem _storeSystem = default!;
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<PDAComponent, LightToggleEvent>(OnLightToggle);
SubscribeLocalEvent<PDAComponent, AfterActivatableUIOpenEvent>(AfterUIOpen);
SubscribeLocalEvent<PDAComponent, StoreAddedEvent>(OnUplinkInit);
SubscribeLocalEvent<PDAComponent, StoreRemovedEvent>(OnUplinkRemoved);
SubscribeLocalEvent<PDAComponent, GridModifiedEvent>(OnGridChanged);
}
@@ -76,16 +70,6 @@ namespace Content.Server.PDA
UpdatePDAUserInterface(pda);
}
private void OnUplinkInit(EntityUid uid, PDAComponent pda, ref StoreAddedEvent args)
{
UpdatePDAUserInterface(pda);
}
private void OnUplinkRemoved(EntityUid uid, PDAComponent pda, ref StoreRemovedEvent args)
{
UpdatePDAUserInterface(pda);
}
private void OnGridChanged(EntityUid uid, PDAComponent pda, GridModifiedEvent args)
{
UpdateStationName(pda);
@@ -109,25 +93,6 @@ namespace Content.Server.PDA
var state = new PDAUpdateState(pda.FlashlightOn, pda.PenSlot.HasItem, ownerInfo, pda.StationName, false, hasInstrument, address);
_cartridgeLoaderSystem?.UpdateUiState(pda.Owner, state);
// TODO UPLINK RINGTONES/SECRETS This is just a janky placeholder way of hiding uplinks from non syndicate
// players. This should really use a sort of key-code entry system that selects an account which is not directly tied to
// a player entity.
if (!TryComp<StoreComponent>(pda.Owner, out var storeComponent))
return;
var uplinkState = new PDAUpdateState(pda.FlashlightOn, pda.PenSlot.HasItem, ownerInfo, pda.StationName, true, hasInstrument, address);
foreach (var session in ui.SubscribedSessions)
{
if (session.AttachedEntity is not { Valid: true } user)
continue;
if (storeComponent.AccountOwner == user || (TryComp<MindComponent>(session.AttachedEntity, out var mindcomp) && mindcomp.Mind != null &&
mindcomp.Mind.HasRole<TraitorRole>()))
_cartridgeLoaderSystem?.UpdateUiState(pda.Owner, uplinkState, session);
}
}
private void OnUIMessage(PDAComponent pda, ServerBoundUserInterfaceMessage msg)
@@ -145,14 +110,6 @@ namespace Content.Server.PDA
_unpoweredFlashlight.ToggleLight(pdaEnt, flashlight);
break;
}
case PDAShowUplinkMessage _:
{
if (msg.Session.AttachedEntity != null &&
TryComp<StoreComponent>(pdaEnt, out var store))
_storeSystem.ToggleUi(msg.Session.AttachedEntity.Value, pdaEnt, store);
break;
}
case PDAShowRingtoneMessage _:
{
if (EntityManager.TryGetComponent(pdaEnt, out RingerComponent? ringer))
@@ -174,32 +131,6 @@ namespace Content.Server.PDA
pda.StationName = station is null ? null : Name(station.Value);
}
private void AfterUIOpen(EntityUid uid, PDAComponent pda, AfterActivatableUIOpenEvent args)
{
//TODO: this is awful
// A new user opened the UI --> Check if they are a traitor and should get a user specific UI state override.
if (!TryComp<StoreComponent>(pda.Owner, out var storeComp))
return;
if (storeComp.AccountOwner != args.User &&
!(TryComp<MindComponent>(args.User, out var mindcomp) && mindcomp.Mind != null && mindcomp.Mind.HasRole<TraitorRole>()))
return;
if (!_uiSystem.TryGetUi(pda.Owner, PDAUiKey.Key, out var ui))
return;
var ownerInfo = new PDAIdInfoText
{
ActualOwnerName = pda.OwnerName,
IdOwner = pda.ContainedID?.FullName,
JobTitle = pda.ContainedID?.JobTitle
};
var state = new PDAUpdateState(pda.FlashlightOn, pda.PenSlot.HasItem, ownerInfo, pda.StationName, true, HasComp<InstrumentComponent>(pda.Owner), GetDeviceNetAddress(pda.Owner));
_cartridgeLoaderSystem?.UpdateUiState(uid, state, args.Session);
}
private string? GetDeviceNetAddress(EntityUid uid)
{
string? address = null;

43
Content.Server/PDA/Ringer/RingerSystem.cs
View File

@@ -1,17 +1,21 @@
using Content.Server.Store.Components;
using Content.Server.Store.Systems;
using Content.Server.UserInterface;
using Content.Shared.PDA.Ringer;
using Robust.Shared.Audio;
using Robust.Server.Player;
using Robust.Shared.Player;
using Content.Shared.PDA;
using Content.Shared.PDA.Ringer;
using Robust.Server.Player;
using Robust.Shared.Audio;
using Robust.Shared.Player;
using Robust.Shared.Random;
using Robust.Shared.Utility;
using System.Linq;
namespace Content.Server.PDA.Ringer
{
public sealed class RingerSystem : SharedRingerSystem
{
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly StoreSystem _store = default!;
public override void Initialize()
{
@@ -19,10 +23,13 @@ namespace Content.Server.PDA.Ringer
// General Event Subscriptions
SubscribeLocalEvent<RingerComponent, MapInitEvent>(RandomizeRingtone);
SubscribeLocalEvent<RingerUplinkComponent, ComponentInit>(RandomizeUplinkCode);
// RingerBoundUserInterface Subscriptions
SubscribeLocalEvent<RingerComponent, RingerSetRingtoneMessage>(OnSetRingtone);
SubscribeLocalEvent<RingerUplinkComponent, RingerSetRingtoneMessage>(OnSetUplinkRingtone);
SubscribeLocalEvent<RingerComponent, RingerPlayRingtoneMessage>(RingerPlayRingtone);
SubscribeLocalEvent<RingerComponent, RingerRequestUpdateInterfaceMessage>(UpdateRingerUserInterfaceDriver);
}
//Event Functions
@@ -46,7 +53,30 @@ namespace Content.Server.PDA.Ringer
UpdateRingerRingtone(ringer, args.Ringtone);
}
private void OnSetUplinkRingtone(EntityUid uid, RingerUplinkComponent uplink, RingerSetRingtoneMessage args)
{
if (uplink.Code.SequenceEqual(args.Ringtone) &&
args.Session.AttachedEntity != null &&
TryComp<StoreComponent>(uid, out var store))
{
var user = args.Session.AttachedEntity.Value;
_store.ToggleUi(args.Session.AttachedEntity.Value, uid, store);
}
}
public void RandomizeRingtone(EntityUid uid, RingerComponent ringer, MapInitEvent args)
{
UpdateRingerRingtone(ringer, GenerateRingtone());
}
public void RandomizeUplinkCode(EntityUid uid, RingerUplinkComponent uplink, ComponentInit args)
{
uplink.Code = GenerateRingtone();
}
//Non Event Functions
private Note[] GenerateRingtone()
{
// Default to using C pentatonic so it at least sounds not terrible.
var notes = new[]
@@ -65,12 +95,9 @@ namespace Content.Server.PDA.Ringer
ringtone[i] = _random.Pick(notes);
}
UpdateRingerRingtone(ringer, ringtone);
return ringtone;
}
//Non Event Functions
private bool UpdateRingerRingtone(RingerComponent ringer, Note[] ringtone)
{
// Assume validation has already happened.

18
Content.Server/PDA/Ringer/RingerUplinkComponent.cs Normal file
View File

@@ -0,0 +1,18 @@
using Content.Shared.PDA;
namespace Content.Server.PDA.Ringer;
/// <summary>
/// Opens the store ui when the ringstone is set to the secret code.
/// Traitors are told the code when greeted.
/// </summary>
[RegisterComponent, Access(typeof(RingerSystem))]
public sealed class RingerUplinkComponent : Component
{
/// <summary>
/// Notes to set ringtone to in order to open the uplink.
/// Automatically initialized to random notes.
/// </summary>
[DataField("code")]
public Note[] Code = new Note[RingerSystem.RingtoneLength];
}