Price/squad-js-map-vote
1
0
Fork 0
mirror of https://github.com/AsgardEternal/squad-js-map-vote.git synced 2025-01-23 20:43:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

working reroll option

Browse Source
This commit is contained in:
Fantino Davide 2022-09-16 01:04:04 +02:00
parent d6a2ba9083
commit 75ef808991
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
mapvote.js
View File

@ -291,7 +291,7 @@ export default class MapVote extends BasePlugin {
if (!isNaN(subCommand)) // if this succeeds player is voting for a map if (!isNaN(subCommand)) // if this succeeds player is voting for a map
{ {
const mapNumber = parseInt(subCommand); //try to get a vote number const mapNumber = parseInt(subCommand); //try to get a vote number
if (this.nominations[mapNumber]) { if (this.nominations[ mapNumber ]) {
if (!this.votingEnabled) { if (!this.votingEnabled) {
await this.warn(steamID, "There is no vote running right now"); await this.warn(steamID, "There is no vote running right now");
return; return;
@ -375,7 +375,7 @@ export default class MapVote extends BasePlugin {
this.endVoting() this.endVoting()
this.beginVoting(true) this.beginVoting(true)
} }
}, 5000) }, 2 * 60 * 1000)
} }
} }
} }
@ -452,8 +452,14 @@ export default class MapVote extends BasePlugin {
} }
if (!bypassRaasFilter && rnd_layers.filter((l) => l.gamemode === 'RAAS' && this.options.gamemodeWhitelist.includes("RAAS")).length < 3) this.populateNominations(); if (!bypassRaasFilter && rnd_layers.filter((l) => l.gamemode === 'RAAS' && this.options.gamemodeWhitelist.includes("RAAS")).length < 3) this.populateNominations();
} else { } else {
if (cmdLayers.length == 1 && cmdLayers[ 0 ].split('_')[ 0 ] == "*") for (let i = 0; i < 5; i++) cmdLayers.push(cmdLayers[ 0 ]) const maxOptions = this.options.showRerollOption ? 5 : 6;
if (cmdLayers.length <= 6) let singleGamemodeVote = false;
if (cmdLayers.length == 1 && cmdLayers[ 0 ].split('_')[ 0 ] == "*") {
singleGamemodeVote = true;
for (let i = 0; i < maxOptions; i++) cmdLayers.push(cmdLayers[ 0 ])
}
if (singleGamemodeVote || cmdLayers.length <= maxOptions) {
let i = 1;
for (let cl of cmdLayers) { for (let cl of cmdLayers) {
const cls = cl.split('_'); const cls = cl.split('_');
const fLayers = sanitizedLayers.filter((l) => ((cls[ 0 ] == "*" || l.layerid.toLowerCase().startsWith(cls[ 0 ])) && (l.gamemode.toLowerCase().startsWith(cls[ 1 ]) || (!cls[ 1 ] && [ 'RAAS', 'AAS', 'INVASION' ].includes(l.gamemode.toUpperCase()))) && (!cls[ 2 ] || l.version.toLowerCase().startsWith("v" + cls[ 2 ].replace(/v/gi, ''))))); const fLayers = sanitizedLayers.filter((l) => ((cls[ 0 ] == "*" || l.layerid.toLowerCase().startsWith(cls[ 0 ])) && (l.gamemode.toLowerCase().startsWith(cls[ 1 ]) || (!cls[ 1 ] && [ 'RAAS', 'AAS', 'INVASION' ].includes(l.gamemode.toUpperCase()))) && (!cls[ 2 ] || l.version.toLowerCase().startsWith("v" + cls[ 2 ].replace(/v/gi, '')))));
@ -464,16 +470,23 @@ export default class MapVote extends BasePlugin {
this.nominations[ i ] = l.layerid this.nominations[ i ] = l.layerid
this.tallies[ i ] = 0; this.tallies[ i ] = 0;
this.factionStrings[ i ] = getTranslation(l.teams[ 0 ]) + "-" + getTranslation(l.teams[ 1 ]); this.factionStrings[ i ] = getTranslation(l.teams[ 0 ]) + "-" + getTranslation(l.teams[ 1 ]);
i++;
} }
} }
else if (steamid) this.warn(steamid, "You cannot start a vote with more than 6 options"); return; }
else if (steamid) {
this.warn(steamid, "You cannot start a vote with more than " + maxOptions + " options");
return;
}
} }
if (this.options.showRerollOption) { if (this.options.showRerollOption) {
this.nominations.splice(5, 1); if (this.nominations.length > 5) {
this.tallies.splice(5, 1); this.nominations.splice(5, 1);
this.factionStrings.splice(5, 1); this.tallies.splice(5, 1);
this.nominations[ 0 ] = "Reroll vote list" this.factionStrings.splice(5, 1);
}
this.nominations[ 0 ] = "Reroll vote list with random options"
this.tallies[ 0 ] = 0; this.tallies[ 0 ] = 0;
this.factionStrings[ 0 ] = ""; this.factionStrings[ 0 ] = "";
} }
@ -526,6 +539,8 @@ export default class MapVote extends BasePlugin {
endVoting() { endVoting() {
this.votingEnabled = false; this.votingEnabled = false;
clearInterval(this.broadcastIntervalTask); clearInterval(this.broadcastIntervalTask);
clearTimeout(this.newVoteTimeout);
this.newVoteTimeout = null;
this.broadcastIntervalTask = null; this.broadcastIntervalTask = null;
} }
objArrToValArr(arr, ...key) { objArrToValArr(arr, ...key) {
@ -589,7 +604,7 @@ export default class MapVote extends BasePlugin {
this.tallies[ nominationIndex ] += 1; this.tallies[ nominationIndex ] += 1;
if (previousVote !== undefined) if (previousVote !== undefined)
this.tallies[ previousVote ] -= 1; this.tallies[ previousVote ] -= 1;
await this.warn(steamID, `Registered vote: ${this.nominations[ nominationIndex ].replace(/\_/gi, ' ').replace(/\sv\d{1,2}/gi, '')} ${this.factionStrings[ nominationIndex ]} (${this.tallies[ nominationIndex ]} votes)`); await this.warn(steamID, `Registered vote: ${this.nominations[ nominationIndex ].replace(/\_/gi, ' ').replace(/\sv\d{1,2}/gi, '')} ${this.factionStrings[ nominationIndex ]} ` + (this.options.hideVotesCount ? `` : `(${this.tallies[ nominationIndex ]} votes)`));
// await this.msgDirect(steamID, `Registered vote`);// ${this.nominations[ nominationIndex ]} ${this.factionStrings[ nominationIndex ]} (${this.tallies[ nominationIndex ]} votes)`); // await this.msgDirect(steamID, `Registered vote`);// ${this.nominations[ nominationIndex ]} ${this.factionStrings[ nominationIndex ]} (${this.tallies[ nominationIndex ]} votes)`);
// await this.msgDirect(steamID, `${this.nominations[ nominationIndex ]} (${this.tallies[ nominationIndex ]} votes)`); // await this.msgDirect(steamID, `${this.nominations[ nominationIndex ]} (${this.tallies[ nominationIndex ]} votes)`);
// await this.msgDirect(steamID, `${this.factionStrings[ nominationIndex ]}`); // await this.msgDirect(steamID, `${this.factionStrings[ nominationIndex ]}`);