From 2f7dc45763dc059a81989d9b92206eb61adad03e Mon Sep 17 00:00:00 2001 From: spentcud Date: Wed, 26 Feb 2025 23:44:46 -0500 Subject: [PATCH 1/4] make VNW send all the waves it skips good idea? probably not xd --- src/playerCommands.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/playerCommands.ts b/src/playerCommands.ts index 07adef75..480178ac 100644 --- a/src/playerCommands.ts +++ b/src/playerCommands.ts @@ -626,7 +626,7 @@ Please stop attacking and [lime]build defenses[] first!` handler({allCommands, sender, args:{force = true}}){ if(allCommands.vnw.data.manager.session == null){ if(force == false) fail(`Cannot clear votes for VNW because no vote is currently ongoing.`); - skipWaves(1, false); + skipWaves(1, true); } else { if(force) Call.sendMessage(`VNW: [green]Vote was forced by admin [yellow]${sender.name}[green], skipping wave.`); else Call.sendMessage(`VNW: [red]Votes cleared by admin [yellow]${sender.name}[red].`); @@ -641,7 +641,7 @@ Please stop attacking and [lime]build defenses[] first!` perm: Perm.play, init: () => ({ manager: new VoteManager(1.5 * 60_000) - .on("success", (t) => skipWaves(t.session!.data - 1, false)) + .on("success", (t) => skipWaves(t.session!.data - 1, true)) .on("vote passed", () => Call.sendMessage('VNW: [green]Vote passed, skipping to next wave.')) .on("vote failed", () => Call.sendMessage('VNW: [red]Vote failed.')) .on("player vote change", (t, player) => Call.sendMessage(`VNW: ${player.name} [white] has voted on skipping [accent]${t.session!.data}[white] wave(s). [green]${t.currentVotes()}[white] votes, [green]${t.requiredVotes()}[white] required.`)) From 7e720b3738e68797e845bddaf104c882c5d9315d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Feb 2025 04:46:14 +0000 Subject: [PATCH 2/4] Automated TypeScript compile --- build/scripts/playerCommands.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/scripts/playerCommands.js b/build/scripts/playerCommands.js index b63fa65a..2b587946 100644 --- a/build/scripts/playerCommands.js +++ b/build/scripts/playerCommands.js @@ -682,7 +682,7 @@ exports.commands = (0, commands_1.commandList)(__assign(__assign({ about: { if (allCommands.vnw.data.manager.session == null) { if (force == false) (0, commands_1.fail)("Cannot clear votes for VNW because no vote is currently ongoing."); - (0, utils_1.skipWaves)(1, false); + (0, utils_1.skipWaves)(1, true); } else { if (force) @@ -698,7 +698,7 @@ exports.commands = (0, commands_1.commandList)(__assign(__assign({ about: { perm: commands_1.Perm.play, init: function () { return ({ manager: new votes_1.VoteManager(1.5 * 60000) - .on("success", function (t) { return (0, utils_1.skipWaves)(t.session.data - 1, false); }) + .on("success", function (t) { return (0, utils_1.skipWaves)(t.session.data - 1, true); }) .on("vote passed", function () { return Call.sendMessage('VNW: [green]Vote passed, skipping to next wave.'); }) .on("vote failed", function () { return Call.sendMessage('VNW: [red]Vote failed.'); }) .on("player vote change", function (t, player) { return Call.sendMessage("VNW: ".concat(player.name, " [white] has voted on skipping [accent]").concat(t.session.data, "[white] wave(s). [green]").concat(t.currentVotes(), "[white] votes, [green]").concat(t.requiredVotes(), "[white] required.")); }) From 2bcc647b3ae3bc24eebee30907521f14148eab74 Mon Sep 17 00:00:00 2001 From: spentcud Date: Thu, 27 Feb 2025 12:11:30 -0500 Subject: [PATCH 3/4] remove -1 guh --- src/playerCommands.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/playerCommands.ts b/src/playerCommands.ts index 480178ac..3444393a 100644 --- a/src/playerCommands.ts +++ b/src/playerCommands.ts @@ -641,7 +641,7 @@ Please stop attacking and [lime]build defenses[] first!` perm: Perm.play, init: () => ({ manager: new VoteManager(1.5 * 60_000) - .on("success", (t) => skipWaves(t.session!.data - 1, true)) + .on("success", (t) => skipWaves(t.session!.data, true)) .on("vote passed", () => Call.sendMessage('VNW: [green]Vote passed, skipping to next wave.')) .on("vote failed", () => Call.sendMessage('VNW: [red]Vote failed.')) .on("player vote change", (t, player) => Call.sendMessage(`VNW: ${player.name} [white] has voted on skipping [accent]${t.session!.data}[white] wave(s). [green]${t.currentVotes()}[white] votes, [green]${t.requiredVotes()}[white] required.`)) From 861f63e883ed7ae73d4c8452bbefd38dbce5dc0d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Feb 2025 17:11:53 +0000 Subject: [PATCH 4/4] Automated TypeScript compile --- build/scripts/playerCommands.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/scripts/playerCommands.js b/build/scripts/playerCommands.js index 2b587946..5f79b390 100644 --- a/build/scripts/playerCommands.js +++ b/build/scripts/playerCommands.js @@ -698,7 +698,7 @@ exports.commands = (0, commands_1.commandList)(__assign(__assign({ about: { perm: commands_1.Perm.play, init: function () { return ({ manager: new votes_1.VoteManager(1.5 * 60000) - .on("success", function (t) { return (0, utils_1.skipWaves)(t.session.data - 1, true); }) + .on("success", function (t) { return (0, utils_1.skipWaves)(t.session.data, true); }) .on("vote passed", function () { return Call.sendMessage('VNW: [green]Vote passed, skipping to next wave.'); }) .on("vote failed", function () { return Call.sendMessage('VNW: [red]Vote failed.'); }) .on("player vote change", function (t, player) { return Call.sendMessage("VNW: ".concat(player.name, " [white] has voted on skipping [accent]").concat(t.session.data, "[white] wave(s). [green]").concat(t.currentVotes(), "[white] votes, [green]").concat(t.requiredVotes(), "[white] required.")); })