This commit is contained in:
JonnyBro 2021-12-29 22:45:20 +05:00
parent b8826f0788
commit 41d85520ab
11 changed files with 59 additions and 33 deletions

View file

@ -64,7 +64,6 @@ class Profile extends Command {
name: "achievements.png" name: "achievements.png"
}]) }])
.setImage("attachment://achievements.png") .setImage("attachment://achievements.png")
// .setDescription(userData.bio ? userData.bio : message.translate("economy/profile:NO_BIO"))
.addField(message.translate("economy/profile:BIO"), userData.bio ? userData.bio : message.translate("economy/profile:NO_BIO")) .addField(message.translate("economy/profile:BIO"), userData.bio ? userData.bio : message.translate("economy/profile:NO_BIO"))
.addField(message.translate("economy/profile:CASH"), message.translate("economy/profile:MONEY", { .addField(message.translate("economy/profile:CASH"), message.translate("economy/profile:MONEY", {
money: memberData.money money: memberData.money

View file

@ -19,10 +19,10 @@ class Eightball extends Command {
async run(message, args) { async run(message, args) {
if (!args[0] || !message.content.endsWith("?")) return message.error("fun/8ball:ERR_QUESTION"); if (!args[0] || !message.content.endsWith("?")) return message.error("fun/8ball:ERR_QUESTION");
const answerNO = parseInt(Math.floor(Math.random() * 10), 10); const answerN = this.client.functions.randomNum(1, 20);
const answer = message.translate(`fun/8ball:RESPONSE_${answerNO + 1}`); const answer = message.translate(`fun/8ball:RESPONSE_${answerN + 1}`);
message.channel.send(`<@${message.author.id}>, ${answer}`); message.channel.send(answer);
} }
}; };

View file

@ -100,7 +100,7 @@ class FindWords extends Command {
winner: user.username, winner: user.username,
duration: time, duration: time,
participantCount: participants.length, participantCount: participants.length,
participantList: participants.map((p) => `<@${p}>`).join("\n") participants: participants.map((p) => `<@${p}>`).join(", ")
}); });
if (participants.length > 1 && data.guild.disabledCategories && !data.guild.disabledCategories.includes("Economy")) { if (participants.length > 1 && data.guild.disabledCategories && !data.guild.disabledCategories.includes("Economy")) {
message.sendT("fun/findwords:CREDITS", { message.sendT("fun/findwords:CREDITS", {
@ -110,7 +110,7 @@ class FindWords extends Command {
id: user.id, id: user.id,
guildID: message.guild.id guildID: message.guild.id
}); });
userdata.money = userdata.money + 15; userdata.money = userdata.money + 150;
userdata.save(); userdata.save();
}; };
}; };

View file

@ -49,7 +49,7 @@ class Number extends Command {
number, number,
time, time,
participantCount: participants.length, participantCount: participants.length,
participants: participants.map(p => `<@${p}>`).join("\n") participants: participants.map(p => `<@${p}>`).join(", ")
}); });
message.sendT("fun/number:WON", { message.sendT("fun/number:WON", {
winner: msg.author.toString() winner: msg.author.toString()
@ -58,7 +58,7 @@ class Number extends Command {
id: msg.author.id, id: msg.author.id,
guildID: message.guild.id guildID: message.guild.id
}); });
userdata.money = userdata.money + 10; userdata.money = userdata.money + 100;
userdata.save(); userdata.save();
collector.stop(msg.author.username); collector.stop(msg.author.username);
}; };

View file

@ -63,7 +63,7 @@ class Userinfo extends Command {
if (displayPresence) { if (displayPresence) {
embed.addField(this.client.customEmojis.games + " " + message.translate("common:GAME"), (user.presence.activity ? user.presence.activity.name : message.translate("general/userinfo:NO_GAME")), true) embed.addField(this.client.customEmojis.games + " " + message.translate("common:GAME"), (user.presence.activity ? user.presence.activity.name : message.translate("general/userinfo:NO_GAME")), true)
embed.addField(this.client.customEmojis.status.online + " " + message.translate("common:STATUS"), message.translate("common:STATUS_" + (user.presence.status.toUpperCase())), true); embed.addField(`${this.client.customEmojis.status}.${user.presence.status}` + " " + message.translate("common:STATUS"), message.translate("common:STATUS_" + (user.presence.status.toUpperCase())), true);
}; };
if (member) { if (member) {
@ -71,7 +71,7 @@ class Userinfo extends Command {
embed.addField(this.client.customEmojis.calendar2 + " " + message.translate("common:JOIN"), message.printDate(member.joinedAt), true) embed.addField(this.client.customEmojis.calendar2 + " " + message.translate("common:JOIN"), message.printDate(member.joinedAt), true)
embed.addField(this.client.customEmojis.color + " " + message.translate("common:COLOR"), member.displayHexColor, true) embed.addField(this.client.customEmojis.color + " " + message.translate("common:COLOR"), member.displayHexColor, true)
embed.addField(this.client.customEmojis.pencil + " " + message.translate("common:NICKNAME"), (member.nickname ? member.nickname : message.translate("general/userinfo:NO_NICKNAME")), true) embed.addField(this.client.customEmojis.pencil + " " + message.translate("common:NICKNAME"), (member.nickname ? member.nickname : message.translate("general/userinfo:NO_NICKNAME")), true)
embed.addField(this.client.customEmojis.roles + " " + message.translate("common:ROLES"), (member.roles.size > 10 ? member.roles.cache.map((r) => r).slice(0, 9).join(", ") + " " + message.translate("general/userinfo:MORE_ROLES", { embed.addField(this.client.customEmojis.roles + " " + message.translate("common:ROLES"), (member.roles.size > 10 ? member.roles.cache.map((r) => r.name !== "@everyone").slice(0, 9).join(", ") + " " + message.translate("general/userinfo:MORE_ROLES", {
count: member.roles.cache.size - 10 count: member.roles.cache.size - 10
}) : (member.roles.cache.size < 1) ? message.translate("general/userinfo:NO_ROLE") : member.roles.cache.map((r) => r).join(", "))); }) : (member.roles.cache.size < 1) ? message.translate("general/userinfo:NO_ROLE") : member.roles.cache.map((r) => r).join(", ")));
}; };

View file

@ -193,6 +193,13 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<pre class="brush: html"> <pre class="brush: html">
-----------------------------------------------------------------------------------------
JaBa v3.0.8
-----------------------------------------------------------------------------------------
Изменения
- 8ball теперь имеет 20 возможных ответов.
- Награды за победу в findwords и number повышены до 150 и 100 соответственно.
----------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------
JaBa v3.0.7 JaBa v3.0.7
----------------------------------------------------------------------------------------- -----------------------------------------------------------------------------------------

View file

@ -232,7 +232,7 @@ async function updateXp(msg, data) {
xpCooldown[msg.author.id] = toWait; xpCooldown[msg.author.id] = toWait;
// Gets a random number between 10 and 5 // Gets a random number between 10 and 5
const won = Math.floor(Math.random() * (Math.floor(10) - Math.ceil(5))) + Math.ceil(5); const won = this.client.functions.randomNum(5, 10);
const newXp = parseInt(points + won, 10); const newXp = parseInt(points + won, 10);

View file

@ -3,14 +3,24 @@
"USAGE": "{{prefix}}8ball [question]", "USAGE": "{{prefix}}8ball [question]",
"EXAMPLES": "{{prefix}}8ball Is JaBa the best Discord bot?", "EXAMPLES": "{{prefix}}8ball Is JaBa the best Discord bot?",
"ERR_QUESTION": "You must enter a question!", "ERR_QUESTION": "You must enter a question!",
"RESPONSE_1": "I'm sure of it.", "RESPONSE_1": "It is certain",
"RESPONSE_2": "it's definitely safe.", "RESPONSE_2": "It is decidedly so",
"RESPONSE_3": "yes, definitely.", "RESPONSE_3": "Without a doubt",
"RESPONSE_4": "better not tell you now.", "RESPONSE_4": "Yes — definitely",
"RESPONSE_5": "ask again later.", "RESPONSE_5": "You may rely on it",
"RESPONSE_6": "don't count on it.", "RESPONSE_6": "As I see it, yes",
"RESPONSE_7": "I don't think.", "RESPONSE_7": "Most likely",
"RESPONSE_8": "my sources say no.", "RESPONSE_8": "Outlook good",
"RESPONSE_9": "no.", "RESPONSE_9": "Signs point to yes",
"RESPONSE_10": "outlook not so good." "RESPONSE_10": "Yes",
"RESPONSE_11": "Reply hazy, try again",
"RESPONSE_12": "Ask again later",
"RESPONSE_13": "Better not tell you now",
"RESPONSE_14": "Cannot predict now",
"RESPONSE_15": "Concentrate and ask again",
"RESPONSE_16": "Don't count on it",
"RESPONSE_17": "My reply is no",
"RESPONSE_18": "My sources say no",
"RESPONSE_19": "Outlook not so good",
"RESPONSE_20": "Very doubtful"
} }

View file

@ -3,14 +3,24 @@
"USAGE": "{{prefix}}8ball [вопрос?]", "USAGE": "{{prefix}}8ball [вопрос?]",
"EXAMPLES": "{{prefix}}8ball JaBa крутой?", "EXAMPLES": "{{prefix}}8ball JaBa крутой?",
"ERR_QUESTION": "Введите вопрос!", "ERR_QUESTION": "Введите вопрос!",
"RESPONSE_1": "я уверен в этом.", "RESPONSE_1": "Бесспорно.",
"RESPONSE_2": "это определённо безопасно.", "RESPONSE_2": "Предрешено.",
"RESPONSE_3": "да, определённо.", "RESPONSE_3": "Никаких сомнений.",
"RESPONSE_4": "я лучше не буду этого тебе говорить.", "RESPONSE_4": "Определённо да.",
"RESPONSE_5": "я не могу ответить, спроси позже.", "RESPONSE_5": "Можешь быть уверен в этом.",
"RESPONSE_6": "не рассчитывай на это.", "RESPONSE_6": "Мне кажется — \"да\".",
"RESPONSE_7": "я так не думаю.", "RESPONSE_7": "Вероятнее всего.",
"RESPONSE_8": "мои источники говорят нет.", "RESPONSE_8": "Хорошие перспективы.",
"RESPONSE_9": "нет.", "RESPONSE_9": "Знаки говорят — \"да\".",
"RESPONSE_10": "выглядит не так хорошо." "RESPONSE_10": "Да.",
"RESPONSE_11": "Пока не ясно, попробуй снова.",
"RESPONSE_12": "Спроси позже.",
"RESPONSE_13": "Лучше не рассказывать.",
"RESPONSE_14": "Сейчас нельзя предсказать.",
"RESPONSE_15": "Сконцентрируйся и спроси опять.",
"RESPONSE_16": "Даже не думай.",
"RESPONSE_17": "Мой ответ — \"нет\".",
"RESPONSE_18": "По моим данным — \"нет\".",
"RESPONSE_19": "Перспективы не очень хорошие.",
"RESPONSE_20": "Весьма сомнительно."
} }

View file

@ -6,7 +6,7 @@
"GAME_STARTING": ":timer: | Игра начнётся через 10 секунд!", "GAME_STARTING": ":timer: | Игра начнётся через 10 секунд!",
"FIND_WORD": "20 секунд чтобы найти слово, в котором есть \"__**{{word}}**__\"!", "FIND_WORD": "20 секунд чтобы найти слово, в котором есть \"__**{{word}}**__\"!",
"WORD_FOUND": "Молодец, {{winner}}! Вы быстрее всех нашли слово!", "WORD_FOUND": "Молодец, {{winner}}! Вы быстрее всех нашли слово!",
"GAME_STATS": "🎉 | {{winner}} победил!\n\n**Статистика:**\n*-* __**Длительность**__: {{time}}\n*-* __**Участники**__: {{participants}} ({{participantCount}})**Статистика игры: **\n__**Длительность**__: {{duration}}\n__**Кол-во участников**__ : {{participantCount}}\n__**Участники**__ : \n{{participantList}}", "GAME_STATS": "🎉 | {{winner}} победил!\n\n**Статистика:**\n*-* __**Участники**__: {{participants}} ({{participantCount}})\n**Статистика игры: **\n__**Длительность**__: {{duration}}\n__**Кол-во участников**__ : {{participantCount}}\n__**Участники**__ : \n{{participantList}}",
"CREDITS": "{{winner}} выиграл 15 кредитов! 🎉", "CREDITS": "{{winner}} выиграл 15 кредитов! 🎉",
"NO_WINNER_ALL": "Слова не найдены, игра окончена!", "NO_WINNER_ALL": "Слова не найдены, игра окончена!",
"NO_WINNER": "Слова не найдены, игра окончена!" "NO_WINNER": "Слова не найдены, игра окончена!"

View file

@ -1,6 +1,6 @@
{ {
"name": "jaba", "name": "jaba",
"version": "3.0.7", "version": "3.0.8",
"description": "A very complete Discord bot (more than 100 commands) that uses the Discord.js", "description": "A very complete Discord bot (more than 100 commands) that uses the Discord.js",
"main": "index.js", "main": "index.js",
"private": true, "private": true,