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

Balance Battle a bit more

Browse Source
This commit is contained in:
Dragon Fire
2020-04-23 21:02:54 -04:00
parent 3055951e8a
commit 0e2cbcf808
3 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
commands/games-mp/battle.js
+14 -11
View File
@@ -48,15 +48,19 @@ module.exports = class BattleCommand extends Command {
battle.attacker.changeGuard(); battle.attacker.changeGuard();
battle.reset(false); battle.reset(false);
} else if (choice === 'special') { } else if (choice === 'special') {
const miss = Math.floor(Math.random() * 3); const miss = Math.floor(Math.random() * 5);
if (miss) { if (miss === 0 || miss === 3) {
await msg.say(`${battle.attacker}'s special attack missed!`); await msg.say(`${battle.attacker}'s special attack missed!`);
} else { } else if (miss === 1 || miss === 5) {
const damage = randomRange(battle.defender.guard ? 50 : 100, battle.defender.guard ? 100 : 150); const damage = randomRange(battle.defender.guard ? 10 : 40, battle.defender.guard ? 40 : 100);
await msg.say(`${battle.attacker} deals **${damage}** damage!`); await msg.say(`${battle.attacker}'s special attack grazed the opponent, dealing **${damage}** damage!`);
battle.defender.dealDamage(damage);
} else if (miss === 2) {
const damage = randomRange(battle.defender.guard ? 20 : 80, battle.defender.guard ? 80 : 200);
await msg.say(`${battle.attacker}'s special attack hit directly, dealing **${damage}** damage!`);
battle.defender.dealDamage(damage); battle.defender.dealDamage(damage);
} }
battle.attacker.useMP(50); battle.attacker.useMP(25);
battle.reset(); battle.reset();
} else if (choice === 'cure') { } else if (choice === 'cure') {
const amount = Math.round(battle.attacker.mp / 2); const amount = Math.round(battle.attacker.mp / 2);
@@ -65,9 +69,9 @@ module.exports = class BattleCommand extends Command {
battle.attacker.useMP(battle.attacker.mp); battle.attacker.useMP(battle.attacker.mp);
battle.reset(); battle.reset();
} else if (choice === 'final') { } else if (choice === 'final') {
await msg.say(`${battle.attacker} uses their final move, dealing **150** damage!`); await msg.say(`${battle.attacker} uses their final move, dealing **100** damage!`);
battle.defender.dealDamage(150); battle.defender.dealDamage(100);
battle.attacker.useMP(100); battle.attacker.useMP(50);
battle.attacker.usedFinal = true; battle.attacker.usedFinal = true;
battle.reset(); battle.reset();
} else if (choice === 'run') { } else if (choice === 'run') {
@@ -80,9 +84,8 @@ module.exports = class BattleCommand extends Command {
await msg.say('I do not understand what you want to do.'); await msg.say('I do not understand what you want to do.');
} }
} }
const { winner } = battle;
this.client.games.delete(msg.channel.id); this.client.games.delete(msg.channel.id);
return msg.say(`The match is over! Congrats, ${winner}!`); return msg.say(`The match is over! Congrats, ${battle.winner}!`);
} catch (err) { } catch (err) {
this.client.games.delete(msg.channel.id); this.client.games.delete(msg.channel.id);
throw err; throw err;
package.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "xiao", "name": "xiao",
"version": "113.15.3", "version": "113.15.4",
"description": "Your personal server companion.", "description": "Your personal server companion.",
"main": "Xiao.js", "main": "Xiao.js",
"scripts": { "scripts": {
structures/battle/Battler.js
+4 -4
View File
@@ -27,7 +27,7 @@ module.exports = class Battler {
**${this.battle.opponent.user.tag}:** ${this.battle.opponent.hp} HP **${this.battle.opponent.user.tag}:** ${this.battle.opponent.hp} HP
`; `;
if (this.battle.turn === 1 || this.battle.turn === 2) { if (this.battle.turn === 1 || this.battle.turn === 2) {
content += '\n\n_Special uses 50 MP whether or not it hits. Cure takes remaining MP and heals half that amount._'; content += '\n\n_Special uses 25 MP whether or not it hits. Cure takes remaining MP and heals half that amount._';
} }
await msg.say(content); await msg.say(content);
const filter = res => { const filter = res => {
@@ -38,7 +38,7 @@ module.exports = class Battler {
return false; return false;
} }
if (choice === 'final' && !this.canFinal) { if (choice === 'final' && !this.canFinal) {
msg.say('You must have under 100 HP and over 100 MP. Final can only be used once!').catch(() => null); msg.say('You must have under 100 HP and over 50 MP. Final can only be used once!').catch(() => null);
return false; return false;
} }
return true; return true;
@@ -83,11 +83,11 @@ module.exports = class Battler {
} }
get canSpecial() { get canSpecial() {
return this.mp >= 50; return this.mp >= 25;
} }
get canFinal() { get canFinal() {
return this.hp < 100 && this.mp >= 100 && !this.usedFinal; return this.hp < 100 && this.mp >= 50 && !this.usedFinal;
} }
toString() { toString() {