Skip to content

The actual voting percentage limiter #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
N1Ran wants to merge 2 commits into from
Closed

The actual voting percentage limiter #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
617f8a4
Voting updated with reset for admins
N1Ran Feb 2, 2019
93e01e5
This is the percentage limiter for voting system...derp
N1Ran Feb 2, 2019
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Essentials/AutoCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public string VoteDuration
public int Percentage
{
get => _votepercentage;
set => SetValue(ref _votepercentage, Math.Min(value, 100));
set => SetValue(ref _votepercentage, Math.Abs(Math.Min(value, 100)));
}

[Display(Name = "Day of week", GroupName = "Schedule", Description = "Combined with Scheduled Time, will run the command on the given day of the week at the set time.")]
Expand Down
25 changes: 20 additions & 5 deletions Essentials/Commands/VotingModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Sandbox.Engine.Multiplayer;
using Sandbox.Game.World;
using Torch.API.Managers;
using Torch.Commands;
using Torch.Commands.Permissions;
Expand Down Expand Up @@ -183,7 +183,7 @@ public void VoteCount()
StringBuilder sb = new StringBuilder();
sb.AppendLine($"Current vote: {voteInProgress}");
sb.AppendLine($"vote Status: {VoteStatus.ToString()}");
sb.AppendLine($"vote count: {_voteReg.Count} / player count: {MyMultiplayer.Static.MemberCount - 1}");
sb.AppendLine($"vote count: {_voteReg.Count} / player count: {MySession.Static.Players.GetOnlinePlayerCount()}");
sb.AppendLine($"vote percent: {votePercent}");
Context.Respond(sb.ToString());

Expand All @@ -202,7 +202,7 @@ private IEnumerable VoteCountdown(TimeSpan time)
{
Context.Torch.CurrentSession.Managers.GetManager<IChatManagerClient>()
.SendMessageAsSelf($"Vote for {voteInProgress} cancelled");
VoteReset();
VoteClear();
yield break;
}

Expand All @@ -222,7 +222,7 @@ private IEnumerable VoteCountdown(TimeSpan time)
}
else
{
votePercent = (int)Math.Round((double)100 * (_voteReg.Count / (MyMultiplayer.Static.MemberCount - 1)));
votePercent = (int)Math.Round((double)100 * (_voteReg.Count / (MySession.Static.Players.GetOnlinePlayerCount())));

if (votePercent >= command.Percentage)
{
Expand All @@ -235,13 +235,28 @@ private IEnumerable VoteCountdown(TimeSpan time)
Context.Torch.CurrentSession.Managers.GetManager<IChatManagerClient>()
.SendMessageAsSelf($"Vote for {voteInProgress} failed");
}
VoteReset();
VoteClear();
yield break;
}
}
}

[Command("vote reset", "Reset all vote logs")]
[Permission(MyPromoteLevel.Admin)]
public void VoteReset()
{
if (VoteStatus == Status.VoteInProgress)
{
VoteCancel();
}
else
VoteClear();
VoteClear();
votePercent = 0;
_votetimeout.Clear();
}

public void VoteClear()
{
Random rnd = new Random();
_cooldown = rnd.Next(5, 30);
Expand Down