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

clean up a bunch of R&D code (#13071)

Browse Source 
* clean up a bunch of R&D code

* don't store components

* brug

* speedrun some sloth review
This commit is contained in:
Nemanja
2022-12-19 16:14:02 -05:00
committed by GitHub
parent f78dca8504
commit 0549b22cbc
12 changed files with 159 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
Content.Server/Research/Systems/ResearchSystem.cs
View File

@@ -1,50 +1,34 @@
using System.Linq;
using Content.Server.Research.Components;
using Content.Shared.Research.Components;
using JetBrains.Annotations;
using Robust.Server.GameObjects;
using Robust.Shared.Prototypes;
using Robust.Shared.Timing;
namespace Content.Server.Research
namespace Content.Server.Research.Systems
{
[UsedImplicitly]
public sealed partial class ResearchSystem : EntitySystem
{
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly UserInterfaceSystem _uiSystem = default!;
private const int ResearchConsoleUIUpdateTime = 5;
private float _timer = ResearchConsoleUIUpdateTime;
private readonly List<ResearchServerComponent> _servers = new();
public IReadOnlyList<ResearchServerComponent> Servers => _servers;
public override void Initialize()
{
base.Initialize();
InitializeClient();
InitializeConsole();
InitializeServer();
InitializeSource();
InitializeTechnology();
}
public bool RegisterServer(ResearchServerComponent server)
{
if (_servers.Contains(server)) return false;
_servers.Add(server);
_servers[^1].Id = _servers.Count - 1;
return true;
}
public void UnregisterServer(ResearchServerComponent server)
{
_servers.Remove(server);
}
public ResearchServerComponent? GetServerById(int id)
{
foreach (var server in Servers)
foreach (var server in EntityQuery<ResearchServerComponent>())
{
if (server.Id == id) return server;
if (server.Id == id)
return server;
}
return null;
@@ -52,11 +36,12 @@ namespace Content.Server.Research
public string[] GetServerNames()
{
var list = new string[Servers.Count];
var allServers = EntityQuery<ResearchServerComponent>(true).ToArray();
var list = new string[allServers.Length];
for (var i = 0; i < Servers.Count; i++)
for (var i = 0; i < allServers.Length; i++)
{
list[i] = Servers[i].ServerName;
list[i] = allServers[i].ServerName;
}
return list;
@@ -64,11 +49,12 @@ namespace Content.Server.Research
public int[] GetServerIds()
{
var list = new int[Servers.Count];
var allServers = EntityQuery<ResearchServerComponent>(true).ToArray();
var list = new int[allServers.Length];
for (var i = 0; i < Servers.Count; i++)
for (var i = 0; i < allServers.Length; i++)
{
list[i] = Servers[i].Id;
list[i] = allServers[i].Id;
}
return list;
@@ -76,22 +62,13 @@ namespace Content.Server.Research
public override void Update(float frameTime)
{
_timer += frameTime;
while (_timer > ResearchConsoleUIUpdateTime)
foreach (var server in EntityQuery<ResearchServerComponent>())
{
foreach (var server in _servers)
{
UpdateServer(server, ResearchConsoleUIUpdateTime);
}
if (server.NextUpdateTime > _timing.CurTime)
continue;
server.NextUpdateTime = _timing.CurTime + server.ResearchConsoleUpdateTime;
foreach (var console in EntityManager.EntityQuery<ResearchConsoleComponent>())
{
if (!_uiSystem.IsUiOpen(console.Owner, ResearchConsoleUiKey.Key)) continue;
UpdateConsoleInterface(console);
}
_timer -= ResearchConsoleUIUpdateTime;
UpdateServer(server, (int) server.ResearchConsoleUpdateTime.TotalSeconds);
}
}
}