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

Revert "Refactor Game Modes" oh god oh fuck go back it was too good to be true (#5855)

Browse Source
This commit is contained in:
Paul Ritter
2021-12-21 19:25:52 +01:00
committed by GitHub
parent 8831d08229
commit 75721c214c
59 changed files with 1715 additions and 1971 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Server/Voting/Managers/VoteManager.DefaultVotes.cs
View File

@@ -2,7 +2,6 @@ using System;
using System.Collections.Generic;
using System.Linq;
using Content.Server.GameTicking;
using Content.Server.GameTicking.Presets;
using Content.Server.Maps;
using Content.Server.RoundEnd;
using Content.Shared.CCVar;
@@ -12,7 +11,6 @@ using Robust.Shared.Configuration;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Prototypes;
using Robust.Shared.Random;
namespace Content.Server.Voting.Managers
@@ -107,15 +105,13 @@ namespace Content.Server.Voting.Managers
private void CreatePresetVote(IPlayerSession? initiator)
{
var presets = new Dictionary<string, string>();
foreach (var preset in _prototypeManager.EnumeratePrototypes<GamePresetPrototype>())
var presets = new Dictionary<string, string>
{
if(!preset.ShowInVote)
continue;
presets[preset.ID] = preset.ModeTitle;
}
["traitor"] = "mode-traitor",
["extended"] = "mode-extended",
["sandbox"] = "mode-sandbox",
["suspicion"] = "mode-suspicion",
};
var alone = _playerManager.PlayerCount == 1 && initiator != null;
var options = new VoteOptions
@@ -154,7 +150,7 @@ namespace Content.Server.Voting.Managers
Loc.GetString("ui-vote-gamemode-win", ("winner", Loc.GetString(presets[picked]))));
}
EntitySystem.Get<GameTicker>().SetGamePreset(picked);
EntitySystem.Get<GameTicker>().SetStartPreset(picked);
};
}

1
Content.Server/Voting/Managers/VoteManager.cs
View File

@@ -36,7 +36,6 @@ namespace Content.Server.Voting.Managers
[Dependency] private readonly IAdminManager _adminMgr = default!;
[Dependency] private readonly IRobustRandom _random = default!;
[Dependency] private readonly IAfkManager _afkManager = default!;
[Dependency] private readonly IPrototypeManager _prototypeManager = default!;
[Dependency] private readonly IGameMapManager _gameMapManager = default!;
private int _nextVoteId = 1;