Merge branch 'master' of github.com:cblanc/sws_gathers

This commit is contained in:
Absurdon 2017-06-23 21:33:36 +02:00
commit 2667561abe

View file

@ -106,7 +106,7 @@ StateMachine.create({
}, },
onenterelection: function () { onenterelection: function () {
discordBot.notifyChannel("Gather is starting! Pick your captains! https://gathers.ensl.org"); discordBot.notifyChannel("Gather is starting! Pick your captains at https://gathers.ensl.org");
// Setup timer for elections // Setup timer for elections
this.startElectionCountdown(); this.startElectionCountdown();
}, },
@ -169,7 +169,7 @@ StateMachine.create({
self.modifyGatherer(user, (gatherer) => gatherer.voteRegather(vote)); self.modifyGatherer(user, (gatherer) => gatherer.voteRegather(vote));
if (self.regatherVotes() >= self.REGATHER_THRESHOLD) { if (self.regatherVotes() >= self.REGATHER_THRESHOLD) {
self.resetState(); self.resetState();
discordBot.notifyChannel("@here Gather got reseted! Rejoin to play"); discordBot.notifyChannel("@here Gather was reset! Rejoin to play!");
return true; return true;
} else { } else {
return false; return false;