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

Ert fix (#317)

Browse Source 
* Hotfix

* Fuck custom server event! Hello gamerule!

* add some shit

* oopsie

* Add CCVAR of loading a ERT map and disable it on dev build
This commit is contained in:
Cinkafox
2023-08-17 23:41:13 +03:00
committed by Aviu00
parent 28bbd8db89
commit 0964ee123a
22 changed files with 347 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Content.Server/White/AuthPanel/AuthPanelSystem.cs
View File

@@ -1,13 +1,13 @@
using Content.Server.Access.Systems;
using Content.Server.GameTicking;
using Content.Server.Popups;
using Content.Server.Station.Systems;
using Content.Server.White.ERTRecruitment;
using Content.Server.White.ServerEvent;
using Content.Shared.Access.Systems;
using Content.Shared.Administration.Logs;
using Content.Shared.Database;
using Content.Shared.GameTicking;
using Content.Shared.White.AuthPanel;
using Content.Shared.White.Cyborg.Components;
using Content.Shared.White.GhostRecruitment;
using Robust.Server.GameObjects;
using Robust.Shared.Random;
using Robust.Shared.Timing;
@@ -20,11 +20,12 @@ public sealed class AuthPanelSystem : EntitySystem
[Dependency] private readonly PopupSystem _popup = default!;
[Dependency] private readonly AccessReaderSystem _access = default!;
[Dependency] private readonly AppearanceSystem _appearance = default!;
[Dependency] private readonly ServerEventSystem _event = default!;
[Dependency] private readonly IGameTiming _timing = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly ERTRecruitmentSystem _ert = default!;
[Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
[Dependency] private readonly ERTRecruitmentRule _ert = default!;
[Dependency] private readonly GameTicker _gameTicker = default!;
[Dependency] private readonly StationSystem _station = default!;
public Dictionary<AuthPanelAction, HashSet<EntityUid>> Counter = new();
public Dictionary<AuthPanelAction, HashSet<int>> CardIndexes = new();
@@ -38,10 +39,16 @@ public sealed class AuthPanelSystem : EntitySystem
{
SubscribeLocalEvent<AuthPanelComponent,AuthPanelButtonPressedMessage>(OnButtonPressed);
SubscribeLocalEvent<AuthPanelComponent,AuthPanelPerformActionEvent>(OnPerformAction);
SubscribeLocalEvent<RecruitedComponent,ERTRecruitedReasonEvent>(OnReason);
SubscribeLocalEvent<RoundRestartCleanupEvent>(OnRestart);
}
private void OnReason(EntityUid uid, RecruitedComponent component, ERTRecruitedReasonEvent args)
{
args.Reason = Reason;
}
private void OnRestart(RoundRestartCleanupEvent ev)
{
Counter.Clear();
@@ -54,15 +61,16 @@ public sealed class AuthPanelSystem : EntitySystem
{
if (args.Action is AuthPanelAction.ERTRecruit)
{
if (_random.Next(0, 10) < 2
&& _event.TryStartEvent(ERTRecruitmentSystem.EventName)
&& _event.TryGetEvent(ERTRecruitmentSystem.EventName,out var eventPrototype))
if (_random.Next(10) < 2)
{
eventPrototype.Description = Reason;
_gameTicker.AddGameRule(ERTRecruitmentRuleComponent.EventName);
}
else
{
_ert.DeclineERT();
var station = _station.GetStationInMap(Transform(uid).MapID);
if (station != null)
_ert.DeclineERT(station.Value);
}
foreach (var entities in Counter.Values)
@@ -81,9 +89,6 @@ public sealed class AuthPanelSystem : EntitySystem
if(args.Session.AttachedEntity == null)
return;
if(HasComp<CyborgComponent>(args.Session.AttachedEntity))
return;
var access = _access.FindAccessTags(args.Session.AttachedEntity.Value);
if (!access.Contains("Command"))
@@ -168,7 +173,7 @@ public sealed class AuthPanelSystem : EntitySystem
var state = new AuthPanelConfirmationActionState(action);
var ui = _ui.GetUi(uid, AuthPanelUiKey.Key);
UserInterfaceSystem.SetUiState(ui, state);
_ui.SetUiState(ui, state);
_appearance.SetData(uid,AuthPanelVisualLayers.Confirm,true);
}
}