From 1e86bdbbe1691877ad6cbcff61936ef3616a93dc Mon Sep 17 00:00:00 2001 From: Daniel Odendahl Jr Date: Mon, 8 Jan 2018 15:41:33 +0000 Subject: [PATCH] Better balloon pop --- commands/games/balloon-pop.js | 14 +++++++++++--- package.json | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/commands/games/balloon-pop.js b/commands/games/balloon-pop.js index 56a56fbf..58e11e99 100644 --- a/commands/games/balloon-pop.js +++ b/commands/games/balloon-pop.js @@ -36,10 +36,12 @@ module.exports = class BalloonPopCommand extends Command { } let userTurn = false; let winner = null; - let remains = 1000; + let remains = 500; + let turns = 0; while (!winner) { const user = userTurn ? msg.author : opponent; let pump; + ++turns; if (!opponent.bot || (opponent.bot && userTurn)) { await msg.say(`${user}, do you pump the balloon?`); const verification = await verify(msg.channel, user); @@ -49,14 +51,20 @@ module.exports = class BalloonPopCommand extends Command { } if (pump) { await msg.say(`${user} pumps the balloon!`); - remains -= randomRange(25, 75); + remains -= randomRange(50, 100); const popped = Math.floor(Math.random() * remains); - if (popped < 0) { + if (popped <= 0) { await msg.say('The balloon pops!'); winner = userTurn ? opponent : msg.author; + break; + } + if (turns >= 3) { + turns = 0; + userTurn = !userTurn; } } else { await msg.say(`${user} steps back!`); + turns = 0; userTurn = !userTurn; } } diff --git a/package.json b/package.json index 2f9dfc08..6ba7a3bf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiao", - "version": "61.0.0", + "version": "61.0.1", "description": "Your personal server companion.", "main": "Xiao.js", "scripts": {