tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restart vote is now actually passable (#8194)

Browse Source
This commit is contained in:
metalgearsloth
2022-05-16 13:33:14 +10:00
committed by GitHub
parent 5128dd61ec
commit bb09d0ddc4
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,13 +49,14 @@ namespace Content.Server.Voting.Managers
Title = Loc.GetString("ui-vote-restart-title"),
Options =
{
(Loc.GetString("ui-vote-restart-yes"), true),
(Loc.GetString("ui-vote-restart-no"), false)
(Loc.GetString("ui-vote-restart-yes"), "yes"),
(Loc.GetString("ui-vote-restart-no"), "no"),
(Loc.GetString("ui-vote-restart-abstain"), "abstain")
},
Duration = alone
? TimeSpan.FromSeconds(_cfg.GetCVar(CCVars.VoteTimerAlone))
: TimeSpan.FromSeconds(_cfg.GetCVar(CCVars.VoteTimerRestart)),
InitiatorTimeout = TimeSpan.FromMinutes(3)
InitiatorTimeout = TimeSpan.FromMinutes(5)
};
if (alone)
@@ -67,12 +68,12 @@ namespace Content.Server.Voting.Managers
vote.OnFinished += (_, _) =>
{
var votesYes = vote.VotesPerOption[true];
var votesNo = vote.VotesPerOption[false];
var votesYes = vote.VotesPerOption["yes"];
var votesNo = vote.VotesPerOption["no"];
var total = votesYes + votesNo;
var ratioRequired = _cfg.GetCVar(CCVars.VoteRestartRequiredRatio);
if (votesYes / (float) total >= ratioRequired)
if (total > 0 && votesYes / (float) total >= ratioRequired)
{
_chatManager.DispatchServerAnnouncement(Loc.GetString("ui-vote-restart-succeeded"));
EntitySystem.Get<RoundEndSystem>().EndRound();
@@ -92,10 +93,10 @@ namespace Content.Server.Voting.Managers
foreach (var player in _playerManager.ServerSessions)
{
if (player != initiator && !_afkManager.IsAfk(player))
if (player != initiator)
{
// Everybody else defaults to a no vote.
vote.CastVote(player, 1);
// Everybody else defaults to an abstain vote to say they don't mind.
vote.CastVote(player, 2);
}
}
}

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

@@ -31,7 +31,6 @@ namespace Content.Server.Voting.Managers
[Dependency] private readonly IChatManager _chatManager = default!;
[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!;

4
Content.Shared/CCVar/CCVars.cs
View File

@@ -727,7 +727,7 @@ namespace Content.Shared.CCVar
/// The required ratio of the server that must agree for a restart round vote to go through.
/// </summary>
public static readonly CVarDef<float> VoteRestartRequiredRatio =
CVarDef.Create("vote.restart_required_ratio", 0.8f, CVar.SERVERONLY);
CVarDef.Create("vote.restart_required_ratio", 0.7f, CVar.SERVERONLY);
/// <summary>
/// The delay which two votes of the same type are allowed to be made by separate people, in seconds.
@@ -746,7 +746,7 @@ namespace Content.Shared.CCVar
/// Sets the duration of the restart vote timer.
/// </summary>
public static readonly CVarDef<int>
VoteTimerRestart = CVarDef.Create("vote.timerrestart", 30, CVar.SERVERONLY);
VoteTimerRestart = CVarDef.Create("vote.timerrestart", 60, CVar.SERVERONLY);
/// <summary>
/// Sets the duration of the gamemode/preset vote timer.

1
Resources/Locale/en-US/voting/managers/vote-manager.ftl
View File

@@ -8,6 +8,7 @@ ui-vote-restart-succeeded = Restart vote succeeded.
ui-vote-restart-failed = Restart vote failed (need { TOSTRING($ratio, "P0") }).
ui-vote-restart-yes = Yes
ui-vote-restart-no = No
ui-vote-restart-abstain = Abstain
ui-vote-gamemode-title = Next gamemode
ui-vote-gamemode-tie = Tie for gamemode vote! Picking... { $picked }