diff --git a/commands/games-sp/hunger-games.js b/commands/games-sp/hunger-games.js index b558c0d1..7cef5862 100644 --- a/commands/games-sp/hunger-games.js +++ b/commands/games-sp/hunger-games.js @@ -2,7 +2,7 @@ const Command = require('../../framework/Command'); const { ActionRowBuilder, ButtonBuilder, ButtonStyle } = require('discord.js'); const { Collection } = require('@discordjs/collection'); const { stripIndents } = require('common-tags'); -const { removeDuplicates, removeFromArray, shuffle } = require('../../util/Util'); +const { removeDuplicates, removeAllFromArray, shuffle } = require('../../util/Util'); const events = require('../../assets/json/hunger-games'); module.exports = class HungerGamesCommand extends Command { @@ -118,7 +118,7 @@ module.exports = class HungerGamesCommand extends Command { const tribute = tributes.get(tributeKey); if (!turn.has(tribute.name)) continue; let types = this.decideTypes(tribute); - if (turn.size === 1) types = removeFromArray(types, 'kill'); + if (turn.size === 1) types = removeAllFromArray(types, 'kill'); const type = types[Math.floor(Math.random() * types.length)]; const useWeapon = Math.floor(Math.random() * 3); const valid = eventsArr.filter(event => { diff --git a/util/Util.js b/util/Util.js index 8d0c3c01..97b1b263 100644 --- a/util/Util.js +++ b/util/Util.js @@ -61,6 +61,12 @@ module.exports = class Util { } static removeFromArray(arr, value) { + const index = arr.indexOf(value); + if (index > -1) return arr.splice(index, 1); + return arr; + } + + static removeAllFromArray(arr, value) { return arr.filter(i => i !== value); }