From fbe901a2497da804f1f5061116b0d4a579bcc85f Mon Sep 17 00:00:00 2001 From: Dragon Fire Date: Sat, 30 Jan 2021 23:48:52 -0500 Subject: [PATCH] forefeit -> forfeit --- commands/games-mp/connect-four.js | 2 +- commands/games-mp/cram.js | 2 +- commands/games-mp/domineering.js | 2 +- commands/games-mp/dots-and-boxes.js | 2 +- commands/games-mp/jenga.js | 2 +- commands/games-mp/nim.js | 4 ++-- commands/games-mp/obstruction.js | 2 +- commands/games-mp/tic-tac-toe.js | 2 +- commands/games-sp/minesweeper.js | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/commands/games-mp/connect-four.js b/commands/games-mp/connect-four.js index cebef330..32bb4cb4 100644 --- a/commands/games-mp/connect-four.js +++ b/commands/games-mp/connect-four.js @@ -117,7 +117,7 @@ module.exports = class ConnectFourCommand extends Command { } else { const emoji = userTurn ? playerOneEmoji : playerTwoEmoji; await msg.say(stripIndents` - ${emoji} ${user}, which column do you pick? Type \`end\` to forefeit. + ${emoji} ${user}, which column do you pick? Type \`end\` to forfeit. Can't think of a move? Use \`play for me\`. ${opponent.bot ? `I placed mine in **${lastMove}**.` : `Previous Move: **${lastMove}**`} diff --git a/commands/games-mp/cram.js b/commands/games-mp/cram.js index 748a29d4..50370fb8 100644 --- a/commands/games-mp/cram.js +++ b/commands/games-mp/cram.js @@ -73,7 +73,7 @@ module.exports = class CramCommand extends Command { while (!winner) { const user = userTurn ? msg.author : opponent; await msg.say(stripIndents` - ${user}, at what coordinates do you want to place your block? Type \`end\` to forefeit. + ${user}, at what coordinates do you want to place your block? Type \`end\` to forfeit. You must also choose a direction. (ex. v1,1 or h3,4). ${this.displayBoard(board, userEmoji, oppoEmoji)} diff --git a/commands/games-mp/domineering.js b/commands/games-mp/domineering.js index 4f11fba5..87bf5d00 100644 --- a/commands/games-mp/domineering.js +++ b/commands/games-mp/domineering.js @@ -73,7 +73,7 @@ module.exports = class DomineeringCommand extends Command { while (!winner) { const user = userTurn ? msg.author : opponent; await msg.say(stripIndents` - ${user}, at what coordinates do you want to place your block (ex. 1,1)? Type \`end\` to forefeit. + ${user}, at what coordinates do you want to place your block (ex. 1,1)? Type \`end\` to forfeit. Your pieces are **${userTurn ? 'vertical' : 'horizontal'}**. ${this.displayBoard(board, userEmoji, oppoEmoji)} diff --git a/commands/games-mp/dots-and-boxes.js b/commands/games-mp/dots-and-boxes.js index a8a08a99..c6293026 100644 --- a/commands/games-mp/dots-and-boxes.js +++ b/commands/games-mp/dots-and-boxes.js @@ -45,7 +45,7 @@ module.exports = class DotsAndBoxesCommand extends Command { while (taken.length < 40) { const user = userTurn ? msg.author : opponent; await msg.say(stripIndents` - ${user}, which connection do you pick? Type \`end\` to forefeit. + ${user}, which connection do you pick? Type \`end\` to forfeit. _Format like \`1-2\` or \`0-5\`. Any two spaces bordering **vertical or horizontal**._ P1: ${msg.author.tag} | P2: ${opponent.tag} diff --git a/commands/games-mp/jenga.js b/commands/games-mp/jenga.js index 5945333e..3786bbd8 100644 --- a/commands/games-mp/jenga.js +++ b/commands/games-mp/jenga.js @@ -53,7 +53,7 @@ module.exports = class JengaCommand extends Command { i = Math.floor(Math.random() * board.length); } else { const text = stripIndents` - ${user}, which block do you want to remove? Type \`end\` to forefeit. + ${user}, which block do you want to remove? Type \`end\` to forfeit. Each block you go lower on the tower, the more likely the tower falls. `; await msg.say(`${text}\n\n${this.displayBoard(board)}`); diff --git a/commands/games-mp/nim.js b/commands/games-mp/nim.js index ea7a48b7..fc069111 100644 --- a/commands/games-mp/nim.js +++ b/commands/games-mp/nim.js @@ -56,7 +56,7 @@ module.exports = class NimCommand extends Command { await msg.say(`For my turn, I remove **${turn[1]}** ${objectEmoji} from **row ${turn[0] + 1}**.`); } else { await msg.say(stripIndents` - ${user}, from which row do you want to remove from? Type \`end\` to forefeit. + ${user}, from which row do you want to remove from? Type \`end\` to forfeit. After this step, you will decide how many ${objectEmoji} to remove from that row. ${this.displayBoard(board, objectEmoji)} @@ -97,7 +97,7 @@ module.exports = class NimCommand extends Command { rowPicked = 1; } else { await msg.say(stripIndents` - ${user}, how many ${objectEmoji} do you want to take from row ${picked}? Type \`end\` to forefeit. + ${user}, how many ${objectEmoji} do you want to take from row ${picked}? Type \`end\` to forfeit. If you want to go back, type \`back\`. ${nums[picked - 1]}${objectEmoji.repeat(row)} diff --git a/commands/games-mp/obstruction.js b/commands/games-mp/obstruction.js index 57f3a6a4..bb285494 100644 --- a/commands/games-mp/obstruction.js +++ b/commands/games-mp/obstruction.js @@ -55,7 +55,7 @@ module.exports = class ObstructionCommand extends Command { while (!winner) { const user = userTurn ? msg.author : opponent; await msg.say(stripIndents` - ${user}, at what coordinates do you want to place your piece (ex. 1,1)? Type \`end\` to forefeit. + ${user}, at what coordinates do you want to place your piece (ex. 1,1)? Type \`end\` to forfeit. Every piece you place will obstruct the 8 pieces around it. ${this.displayBoard(board)} diff --git a/commands/games-mp/tic-tac-toe.js b/commands/games-mp/tic-tac-toe.js index 92e735f0..07d09ba1 100644 --- a/commands/games-mp/tic-tac-toe.js +++ b/commands/games-mp/tic-tac-toe.js @@ -49,7 +49,7 @@ module.exports = class TicTacToeCommand extends Command { choice = tictactoe.bestMove(this.convertBoard(sides), { computer: 'o', opponent: 'x' }); } else { await msg.say(stripIndents` - ${user}, which side do you pick? Type \`end\` to forefeit. + ${user}, which side do you pick? Type \`end\` to forfeit. ${this.displayBoard(sides)} `); diff --git a/commands/games-sp/minesweeper.js b/commands/games-sp/minesweeper.js index d3039d51..e0223e10 100644 --- a/commands/games-sp/minesweeper.js +++ b/commands/games-sp/minesweeper.js @@ -44,7 +44,7 @@ module.exports = class MinesweeperCommand extends Command { while (win === null) { const currentTime = moment.duration(new Date() - startTime).format('mm:ss'); await msg.say(stripIndents` - ${msg.author}, what coordinates do you pick (ex. 4,5)? Type \`end\` to forefeit. + ${msg.author}, what coordinates do you pick (ex. 4,5)? Type \`end\` to forfeit. Type \`flag \` to flag a spot as a bomb. To remove a flag, run it again. ${this.displayBoard(game.board, game.mask, flagged, cheatMode)}