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

Багфиксы (#92)

Browse Source 
* - fix: Fix airlock draw depth.

* - fix: Fix headrev command staff message.

* - fix: Fix gulag bound antags.

* - fix: Double health icon fix.

* - fix: Fix cult start exception.

* - fix: Fix cult pull teleport.

* - fix: Fix another exception.

* - fix: Fix drawdepth again.

* - fix: Clown font fix.
This commit is contained in:
Aviu00
2024-02-18 17:30:52 +09:00
committed by GitHub
parent 9caa5a408b
commit 57d57939f7
11 changed files with 67 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,5 @@
using System.Linq;
using Content.Server._Miracle.Components;
using Content.Server.Actions;
using Content.Server.Chat.Managers;
using Content.Server.GameTicking;
@@ -326,6 +327,11 @@ public sealed class CultRuleSystem : GameRuleSystem<CultRuleComponent>
if (!_jobSystem.CanBeAntag(player))
continue;
// Gulag
if (!_mindSystem.TryGetMind(player, out _, out var mind) ||
mind.OwnedEntity is not { } ownedEntity || HasComp<GulagBoundComponent>(ownedEntity))
continue;
// Latejoin
if (player.AttachedEntity != null && pendingQuery.HasComponent(player.AttachedEntity.Value))
continue;
@@ -349,6 +355,7 @@ public sealed class CultRuleSystem : GameRuleSystem<CultRuleComponent>
{
_sawmill.Info("Insufficient preferred cultists, picking at random.");
prefList = list;
return prefList;
}
if (prefList.Count >= _minimalCultists)
@@ -375,15 +382,16 @@ public sealed class CultRuleSystem : GameRuleSystem<CultRuleComponent>
private List<ICommonSession> PickCultists(List<ICommonSession> prefList)
{
var result = new List<ICommonSession>();
if (prefList.Count == 0)
var minCultists = _cfg.GetCVar(WhiteCVars.CultMinPlayers);
var maxCultists = _cfg.GetCVar(WhiteCVars.CultMaxStartingPlayers);
if (prefList.Count < minCultists)
{
_sawmill.Info("Insufficient ready players to fill up with cultists, stopping the selection.");
return result;
}
var minCultists = _cfg.GetCVar(WhiteCVars.CultMinPlayers);
var maxCultists = _cfg.GetCVar(WhiteCVars.CultMaxStartingPlayers);
var actualCultistCount = prefList.Count > maxCultists ? maxCultists : minCultists;
for (var i = 0; i < actualCultistCount; i++)