Skip to content

N1 fuckery #69

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 9 commits into from
Closed

N1 fuckery #69

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b668ce9
Added admin command for power on/off to grids, player kill, stopall g…
N1Ran Jan 19, 2019
d42effc
little tweaks here and there to refine the code
N1Ran Jan 19, 2019
1331a7d
Vote system fully functional
N1Ran Jan 20, 2019
3f38e66
More tweaks here and there
N1Ran Jan 20, 2019
df0f3cf
much better
N1Ran Jan 20, 2019
acf0282
Rexxar's concerns resolved?
N1Ran Jan 21, 2019
44e94b5
Resolve in progress. Notice the cooldown is broken and sorting that out
N1Ran Jan 21, 2019
d66a361
vote percentage is still not calculating during live sessions
N1Ran Jan 22, 2019
cbe944a
Working now...I think
N1Ran Jan 22, 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
Prev Previous commit
Next Next commit
little tweaks here and there to refine the code
  • Loading branch information
@N1Ran
N1Ran committed Jan 19, 2019
commit d42effce062549c39da4cd0aca051ffc8a6dce90
24 changes: 7 additions & 17 deletions Essentials/Commands/VotingModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,6 @@ public void Vote(string name)
Context.Respond($"{name} is not set for voting.");
return;
}
if (_voteDuration.TotalSeconds == 0)
{
Context.Respond($"{name} has no duration for voting. That's a no go boss");
return;
}
voteInProgress = name;
_voteInProgress = true;
Task.Run(() =>
Expand Down Expand Up @@ -163,6 +158,7 @@ public void VoteYes()
[Permission(MyPromoteLevel.Admin)]
public void VoteCount()
{
Context.Respond($"{voteInProgress} is currently active with");
Context.Respond($"vote count: {_votecount} / Vote percent: {votePercent}");

}
Expand All @@ -178,21 +174,15 @@ private IEnumerable VoteCountdown(TimeSpan time)
{
_voteInProgress = false;
_cancelVote = false;
Context.Torch.CurrentSession.Managers.GetManager<IChatManagerClient>()
.SendMessageAsSelf($"Vote for {voteInProgress} cancelled");
voteInProgress = "";
_votecount = 0;
votePercent = 0;
_voteReg.Clear();
Context.Respond($"vote cancelled");
yield break;
}
votePercent = (_votecount / playerCount) * 100;
if (((_votecount / playerCount) * 100) >= command.Percentage && TimeSpan.Parse(command.VoteDuration).TotalSeconds == 0)
{
Context.Respond($"Vote for {voteInProgress} is successful");
command.RunNow();
_voteInProgress = false;
_cancelVote = false;
}

if (i >= 60 && i % 60 == 0)
{
Expand All @@ -212,7 +202,8 @@ private IEnumerable VoteCountdown(TimeSpan time)
{
if (((_votecount / playerCount) * 100) >= command.Percentage)
{
Context.Respond($"Vote for {voteInProgress} is successful");
Context.Torch.CurrentSession.Managers.GetManager<IChatManagerClient>()
.SendMessageAsSelf($"Vote for {voteInProgress} is successful");
command.RunNow();
_voteInProgress = false;
_cancelVote = false;
Expand All @@ -221,13 +212,12 @@ private IEnumerable VoteCountdown(TimeSpan time)
{
_voteInProgress = false;
_cancelVote = false;
Context.Torch.CurrentSession.Managers.GetManager<IChatManagerClient>()
.SendMessageAsSelf($"Vote for {voteInProgress} failed");
voteInProgress = "";
_votecount = 0;
votePercent = 0;
_voteReg.Clear();
Context.Respond($"vote cancelled");
Context.Respond($"Vote for {voteInProgress} failed");

}
yield break;
}
Expand Down