arthur/xiao
1
0
Fork 0
mirror of https://github.com/arthur-pbty/xiao.git synced 2026-06-03 23:36:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix

Browse Source
This commit is contained in:
Dragon Fire
2020-05-07 17:53:52 -04:00
parent 964feb5d83
commit 2a47ed50e1
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commands/games-mp/battle.js
+2 -1
View File
@@ -36,7 +36,7 @@ module.exports = class BattleCommand extends Command {
return msg.say('Looks like they declined...');
}
}
while (battle.winner === null || battle.winner !== 'time') {
while (!battle.winner) {
const choice = await battle.attacker.chooseAction(msg);
if (choice === 'attack') {
const damage = randomRange(battle.defender.guard ? 5 : 20, battle.defender.guard ? 20 : 50);
@@ -81,6 +81,7 @@ module.exports = class BattleCommand extends Command {
await msg.say(`Time's up, ${battle.attacker}!`);
battle.reset();
if (battle.lastTurnTimeout) {
battle.endedDueToInactivity = true;
break;
} else {
battle.lastTurnTimeout = true;
structures/battle/Battle.js
+2 -1
View File
@@ -7,6 +7,7 @@ module.exports = class Battle {
this.userTurn = false;
this.turn = 1;
this.lastTurnTimeout = false;
this.endedDueToInactivity = false;
}
get attacker() {
@@ -26,7 +27,7 @@ module.exports = class Battle {
}
get winner() {
if (this.lastTurnTimeout) return 'time';
if (this.endedDueToInactivity) return 'time';
if (this.user.hp <= 0) return this.opponent;
if (this.opponent.hp <= 0) return this.user;
return null;