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

clean up infinite researchsystem shitcode (#13136)

Browse Source 
* clean up infinite researchsystem shitcode

* fml some more shit

* make syncing work logically

* naming naming naming
This commit is contained in:
Nemanja
2022-12-25 16:22:23 -05:00
committed by GitHub
parent 9afbdf6a17
commit 4eee1ee9b2
23 changed files with 497 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Content.Shared/Research/Systems/SharedResearchSystem.cs
View File

@@ -1,22 +1,35 @@
using Content.Shared.Research.Components;
using Content.Shared.Research.Prototypes;
using Robust.Shared.GameStates;
using Robust.Shared.Prototypes;
namespace Content.Shared.Research.Systems;
public abstract class SharedResearchSystem : EntitySystem
{
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
public override void Initialize()
{
base.Initialize();
SubscribeLocalEvent<ResearchServerComponent, ComponentGetState>(OnServerGetState);
SubscribeLocalEvent<ResearchServerComponent, ComponentHandleState>(OnServerHandleState);
SubscribeLocalEvent<TechnologyDatabaseComponent, ComponentGetState>(OnTechnologyGetState);
SubscribeLocalEvent<TechnologyDatabaseComponent, ComponentHandleState>(OnTechnologyHandleState);
}
private void OnServerGetState(EntityUid uid, ResearchServerComponent component, ref ComponentGetState args)
{
args.State = new ResearchServerState(component.ServerName, component.Points, component.Id);
}
private void OnServerHandleState(EntityUid uid, ResearchServerComponent component, ref ComponentHandleState args)
{
if (args.Current is not ResearchServerState state)
return;
component.ServerName = state.ServerName;
component.Points = state.Points;
component.Id = state.Id;
}
private void OnTechnologyHandleState(EntityUid uid, TechnologyDatabaseComponent component, ref ComponentHandleState args)
{
if (args.Current is not TechnologyDatabaseState state)
@@ -34,40 +47,35 @@ public abstract class SharedResearchSystem : EntitySystem
/// Returns whether a technology is unlocked on this database or not.
/// </summary>
/// <returns>Whether it is unlocked or not</returns>
public bool IsTechnologyUnlocked(EntityUid uid, string technologyId, TechnologyDatabaseComponent? component = null)
public bool IsTechnologyUnlocked(EntityUid uid, TechnologyPrototype technology, TechnologyDatabaseComponent? component = null)
{
return Resolve(uid, ref component) && component.TechnologyIds.Contains(technologyId);
return Resolve(uid, ref component) && IsTechnologyUnlocked(uid, technology.ID, component);
}
/// <summary>
/// Returns whether a technology is unlocked on this database or not.
/// </summary>
/// <returns>Whether it is unlocked or not</returns>
public bool IsTechnologyUnlocked(EntityUid uid, TechnologyPrototype technologyId, TechnologyDatabaseComponent? component = null)
public bool IsTechnologyUnlocked(EntityUid uid, string technologyId, TechnologyDatabaseComponent? component = null)
{
return Resolve(uid, ref component) && IsTechnologyUnlocked(uid, technologyId.ID, component);
return Resolve(uid, ref component, false) && component.TechnologyIds.Contains(technologyId);
}
/// <summary>
/// Returns whether a technology can be unlocked on this database,
/// taking parent technologies into account.
/// Returns whether or not all the prerequisite
/// technologies for a technology are unlocked.
/// </summary>
/// <returns>Whether it could be unlocked or not</returns>
public bool CanUnlockTechnology(EntityUid uid, TechnologyPrototype technology, TechnologyDatabaseComponent? component = null)
/// <param name="uid"></param>
/// <param name="prototype"></param>
/// <param name="component"></param>
/// <returns>Whether or not the prerequesites are present</returns>
public bool ArePrerequesitesUnlocked(EntityUid uid, TechnologyPrototype prototype, TechnologyDatabaseComponent? component = null)
{
if (!Resolve(uid, ref component))
return false;
if (IsTechnologyUnlocked(uid, technology.ID, component))
return false;
foreach (var technologyId in technology.RequiredTechnologies)
foreach (var technologyId in prototype.RequiredTechnologies)
{
_prototypeManager.TryIndex(technologyId, out TechnologyPrototype? requiredTechnology);
if (requiredTechnology == null)
return false;
if (!IsTechnologyUnlocked(uid, requiredTechnology.ID, component))
if (!IsTechnologyUnlocked(uid, technologyId, component))
return false;
}
return true;