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

stats (#103)

Browse Source 
* OH YES

* хули мне хедкодеру
# Conflicts:
#	Content.Server/Instruments/InstrumentComponent.cs
#	Content.Server/Instruments/InstrumentSystem.cs
#	Content.Shared/Cuffs/SharedCuffableSystem.cs
#	Content.Shared/White/WhiteCVars.cs
#	Resources/Prototypes/tags.yml
This commit is contained in:
rhailrake
2023-05-25 02:13:10 +06:00
committed by Remuchi
parent 10609a2506
commit 484c8a8d9b
24 changed files with 939 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Content.Server/Instruments/InstrumentSystem.cs
View File

@@ -3,6 +3,7 @@ using Content.Server.Interaction;
using Content.Server.Popups;
using Content.Server.Stunnable;
using Content.Shared.Administration;
using Content.Server.White.EndOfRoundStats.InstrumentPlayed;
using Content.Shared.Instruments;
using Content.Shared.Instruments.UI;
using Content.Shared.Physics;
@@ -30,6 +31,7 @@ public sealed partial class InstrumentSystem : SharedInstrumentSystem
[Dependency] private readonly PopupSystem _popup = default!;
[Dependency] private readonly TransformSystem _transform = default!;
[Dependency] private readonly InteractionSystem _interactions = default!;
[Dependency] private readonly IGameTiming _gameTiming = default!;
private const float MaxInstrumentBandRange = 10f;
@@ -113,6 +115,7 @@ public sealed partial class InstrumentSystem : SharedInstrumentSystem
instrument.Playing = true;
Dirty(uid, instrument);
instrument.TimeStartedPlaying = _gameTiming.CurTime;
}
private void OnMidiStop(InstrumentStopMidiEvent msg, EntitySessionEventArgs args)
@@ -235,7 +238,7 @@ public sealed partial class InstrumentSystem : SharedInstrumentSystem
{
var metadataQuery = EntityManager.GetEntityQuery<MetaDataComponent>();
if (Deleted(uid, metadataQuery))
if (Deleted(uid))
return Array.Empty<(NetEntity, string)>();
var list = new ValueList<(NetEntity, string)>();
@@ -291,6 +294,17 @@ public sealed partial class InstrumentSystem : SharedInstrumentSystem
RaiseNetworkEvent(new InstrumentStopMidiEvent(netUid));
}
if (instrument.TimeStartedPlaying != null && instrument.InstrumentPlayer != null)
{
var username = instrument.InstrumentPlayer.Name;
var entity = instrument.InstrumentPlayer.AttachedEntity;
var name = entity != null ? MetaData((EntityUid) entity).EntityName : "Unknown";
RaiseLocalEvent(new InstrumentPlayedStatEvent(name, (TimeSpan) (_gameTiming.CurTime - instrument.TimeStartedPlaying), username));
}
instrument.TimeStartedPlaying = null;
instrument.Playing = false;
instrument.Master = null;
instrument.FilteredChannels.SetAll(false);
@@ -392,7 +406,6 @@ public sealed partial class InstrumentSystem : SharedInstrumentSystem
}
var activeQuery = EntityManager.GetEntityQuery<ActiveInstrumentComponent>();
var metadataQuery = EntityManager.GetEntityQuery<MetaDataComponent>();
var transformQuery = EntityManager.GetEntityQuery<TransformComponent>();
var query = AllEntityQuery<ActiveInstrumentComponent, InstrumentComponent>();
@@ -400,7 +413,7 @@ public sealed partial class InstrumentSystem : SharedInstrumentSystem
{
if (instrument.Master is {} master)
{
if (Deleted(master, metadataQuery))
if (Deleted(master))
{
Clean(uid, instrument);
}