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

Some fixes

Browse Source
This commit is contained in:
Aviu00
2024-01-25 08:49:08 +03:00
parent e16685a7fe
commit 3e18800d2f
4 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/Antag/AntagSelectionSystem.cs
View File

@@ -135,7 +135,11 @@ public sealed class AntagSelectionSystem : GameRuleSystem<GameRuleComponent>
} }
else else
{ {
chosenPlayer = _random.PickAndTake(prefList); //chosenPlayer = _random.PickAndTake(prefList);
// WD EDIT START
chosenPlayer = _reputationManager.PickPlayerBasedOnReputation(prefList);
prefList.Remove(chosenPlayer);
// WD EDIT END
playerList.Remove(chosenPlayer); playerList.Remove(chosenPlayer);
} }

2
Content.Server/Body/Systems/RespiratorSystem.cs
View File

@@ -346,7 +346,7 @@ namespace Content.Server.Body.Systems
else else
{ {
component.CPRPerformedBy = null; component.CPRPerformedBy = null;
component.CPRPlayingStream?.Stop(); _audio.Stop(component.CPRPlayingStream);
} }
RaiseLocalEvent(args.User, new MoodEffectEvent("SavedLife")); RaiseLocalEvent(args.User, new MoodEffectEvent("SavedLife"));

40
Content.Server/White/Reputation/ReputationSystem.cs
View File

@@ -1,11 +1,15 @@
using System.Linq; using System.Linq;
using Content.Server.Administration; using Content.Server.Administration;
using Content.Server.GameTicking; using Content.Server.GameTicking;
using Content.Server.Mind.Components; using Content.Server.Objectives;
using Content.Server.Roles;
using Content.Server.UtkaIntegration; using Content.Server.UtkaIntegration;
using Content.Server.White.AspectsSystem.Base; using Content.Server.White.AspectsSystem.Base;
using Content.Shared.Mind;
using Content.Shared.Mind.Components;
using Content.Shared.Mobs; using Content.Shared.Mobs;
using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Components;
using Content.Shared.Objectives.Components;
using Content.Shared.White; using Content.Shared.White;
using Robust.Server.Player; using Robust.Server.Player;
using Robust.Shared.Configuration; using Robust.Shared.Configuration;
@@ -21,6 +25,8 @@ public sealed class ReputationSystem : EntitySystem
[Dependency] private readonly GameTicker _gameTicker = default!; [Dependency] private readonly GameTicker _gameTicker = default!;
[Dependency] private readonly IPlayerLocator _locator = default!; [Dependency] private readonly IPlayerLocator _locator = default!;
[Dependency] private readonly IConfigurationManager _cfg = default!; [Dependency] private readonly IConfigurationManager _cfg = default!;
[Dependency] private readonly RoleSystem _roles = default!;
[Dependency] private readonly ObjectivesSystem _objectives = default!;
private const int MinPlayers = 15; private const int MinPlayers = 15;
private const int MinRoundLength = 25; private const int MinRoundLength = 25;
@@ -109,34 +115,34 @@ public sealed class ReputationSystem : EntitySystem
if (TryComp<MindContainerComponent>(entity, out var mind) if (TryComp<MindContainerComponent>(entity, out var mind)
&& mind.Mind != null && mind.Mind != null
&& mind.Mind.AllRoles.Any(role => role.Antagonist)) && _roles.MindIsAntagonist(mind.Mind)
&& TryComp(mind.Mind, out MindComponent? mindComp))
{ {
var condCompleted = 0; var objCompleted = 0;
var totalCond = 0; var totalObj = 0;
foreach (var obj in mind.Mind.AllObjectives) foreach (var obj in mindComp.Objectives)
{ {
foreach (var condition in obj.Conditions) totalObj++;
{
totalCond++;
if (condition.Progress > 0.99f) var info = _objectives.GetInfo(obj, mind.Mind.Value, mindComp);
condCompleted++;
} if (info is {Progress: > 0.99f})
objCompleted++;
} }
if (aspect) if (aspect)
{ {
if (condCompleted == totalCond) if (objCompleted == totalObj)
deltaValue += 1f + condCompleted; deltaValue += 1f + objCompleted;
else else
deltaValue += 1f + condCompleted * 0.5f; deltaValue += 1f + objCompleted * 0.5f;
} }
else else
{ {
if (condCompleted == totalCond) if (objCompleted == totalObj)
deltaValue += 2f + condCompleted * 0.5f; deltaValue += 2f + objCompleted * 0.5f;
else else
deltaValue += condCompleted * 0.5f; deltaValue += objCompleted * 0.5f;
} }
} }

3
Content.Shared/White/Reputation/ReputationNetMsg.cs
View File

@@ -22,7 +22,8 @@ public sealed class ReputationNetMsg : NetMessage
return; return;
var length = buffer.ReadVariableInt32(); var length = buffer.ReadVariableInt32();
using var stream = buffer.ReadAlignedMemory(length); using var stream = new MemoryStream();
buffer.ReadAlignedMemory(stream, length);
serializer.DeserializeDirect(stream, out Info); serializer.DeserializeDirect(stream, out Info);
} }