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

- fix: Gulagged objective fix. (#130)

Browse Source
This commit is contained in:
Aviu00
2024-02-27 20:59:43 +09:00
committed by GitHub
parent 6b8dd3ce41
commit 292743ae3e
5 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Changeling/ChangelingRuleSystem.cs
View File

@@ -1,4 +1,5 @@
using System.Linq;
using Content.Server._Miracle.GulagSystem;
using Content.Server.Antag;
using Content.Server.Chat.Managers;
using Content.Server.GameTicking;
@@ -31,6 +32,7 @@ public sealed class ChangelingRuleSystem : GameRuleSystem<ChangelingRuleComponen
[Dependency] private readonly SharedRoleSystem _roleSystem = default!;
[Dependency] private readonly ObjectivesSystem _objectives = default!;
[Dependency] private readonly ChangelingNameGenerator _nameGenerator = default!;
[Dependency] private readonly GulagSystem _gulag = default!;
private const int PlayersPerChangeling = 15;
private const int MaxChangelings = 4;
@@ -230,6 +232,9 @@ public sealed class ChangelingRuleSystem : GameRuleSystem<ChangelingRuleComponen
if (changeling.TotalChangelings >= MaxChangelings)
continue;
if (_gulag.IsUserGulaged(ev.Player.UserId, out _))
continue;
if (!ev.LateJoin)
continue;

2
Content.Server/Changeling/Objectives/ChangelingConditionsSystem.cs
View File

@@ -1,4 +1,5 @@
using System.Linq;
using Content.Server._Miracle.Components;
using Content.Server.Changeling.Objectives.Components;
using Content.Server.Forensics;
using Content.Server.Mind;
@@ -184,6 +185,7 @@ public sealed class ChangelingConditionsSystem : EntitySystem
return;
var allHumans = _mind.GetAliveHumansExcept(args.MindId);
allHumans = allHumans.Where(x => !HasComp<GulagBoundComponent>(x)).ToList();
if (allHumans.Count == 0)
{
args.Cancelled = true;

5
Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
View File

@@ -1,4 +1,5 @@
using System.Linq;
using Content.Server._Miracle.GulagSystem;
using Content.Server.Antag;
using Content.Server.Chat.Managers;
using Content.Server.GameTicking.Rules.Components;
@@ -50,6 +51,7 @@ public sealed class TraitorRuleSystem : GameRuleSystem<TraitorRuleComponent>
[Dependency] private readonly ObjectivesSystem _objectives = default!;
//WD EDIT
[Dependency] private readonly GameTicker _gameTicker = default!;
[Dependency] private readonly GulagSystem _gulag = default!;
private ISawmill _sawmill = default!;
@@ -308,6 +310,9 @@ public sealed class TraitorRuleSystem : GameRuleSystem<TraitorRuleComponent>
if (!GameTicker.IsGameRuleAdded(uid, gameRule))
continue;
if (_gulag.IsUserGulaged(ev.Player.UserId, out _)) // WD
continue;
if (traitor.TotalTraitors >= MaxTraitors)
continue;
if (!ev.LateJoin)

3
Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
View File

@@ -1,4 +1,5 @@
using System.Linq;
using Content.Server._Miracle.Components;
using Content.Server._White.Cult.GameRule;
using Content.Server.Objectives.Components;
using Content.Server.Shuttles.Systems;
@@ -59,6 +60,7 @@ public sealed class KillPersonConditionSystem : EntitySystem
// no other humans to kill
var allHumans = _mind.GetAliveHumansExcept(args.MindId);
allHumans = allHumans.Where(x => !HasComp<GulagBoundComponent>(x)).ToList(); // WD
if (allHumans.Count == 0)
{
args.Cancelled = true;
@@ -83,6 +85,7 @@ public sealed class KillPersonConditionSystem : EntitySystem
// no other humans to kill
var allHumans = _mind.GetAliveHumansExcept(args.MindId);
allHumans = allHumans.Where(x => !HasComp<GulagBoundComponent>(x)).ToList(); // WD
if (allHumans.Count == 0)
{
args.Cancelled = true;

3
Content.Server/_White/Cult/GameRule/CultRuleSystem.cs
View File

@@ -307,6 +307,9 @@ public sealed class CultRuleSystem : GameRuleSystem<CultRuleComponent>
if (entity == default)
continue;
if (_gulag.IsUserGulaged(actor.PlayerSession.UserId, out _))
continue;
if (exclude?.Contains(actor.PlayerSession) is true)
{
continue;