Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: project natural language was not all english #88

Merged
merged 3 commits into from
Nov 11, 2023
Merged

chore: project natural language was not all english #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ad66cf
chore: puts all messages names in english
falcao-g Nov 11, 2023
2a7895a
chore: renames vitorias and banco fields
falcao-g Nov 11, 2023
0c87c71
fix: leaderboard getItem crashing
falcao-g Nov 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/bot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,18 +85,18 @@ class Falbot {
interest.lastInterest = Date.now().toString();

var users = await this.userSchema.find({
banco: { $gt: 0 },
bank: { $gt: 0 },
});

for (const user of users) {
var limit = this.levels[user.rank - 1].bankLimit;

if (limit > user.banco) {
user.banco += Math.floor(parseInt(user.banco * 0.1));
if (limit > user.bank) {
user.bank += Math.floor(parseInt(user.bank * 0.1));
}

if (user.banco > limit) {
user.banco = limit;
if (user.bank > limit) {
user.bank = limit;
}

user.save();
Expand Down Expand Up @@ -331,9 +331,9 @@ class Falbot {
}
}

perks += `${this.getMessage(interaction, 'VOTO')}: ${format(rank.vote)} Falcoins\n`;
perks += `${this.getMessage(interaction, 'VOTE')}: ${format(rank.vote)} Falcoins\n`;

perks += `${this.getMessage(interaction, 'TRABALHO')}: ${format(rank.work[0])}-${format(rank.work[1])} Falcoins`;
perks += `${this.getMessage(interaction, 'WORK')}: ${format(rank.work[0])}-${format(rank.work[1])} Falcoins`;

return perks;
}
Expand Down
10 changes: 5 additions & 5 deletions src/commands/economy/balance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ module.exports = {
var user = interaction.options.getUser('user');
}
const target = user ? await guild.members.fetch(user.id) : member;
const { rank, falcoins, vitorias, banco } = await database.player.findOne(target.user.id);
const { rank, falcoins, wins, bank } = await database.player.findOne(target.user.id);

const embed = instance
.createEmbed(target.displayColor)
Expand All @@ -47,13 +47,13 @@ module.exports = {
inline: true,
},
{
name: ':trophy: ' + instance.getMessage(interaction, 'VITORIAS'),
value: `${format(vitorias)}`,
name: ':trophy: ' + instance.getMessage(interaction, 'WINS'),
value: `${format(wins)}`,
inline: true,
},
{
name: ':bank: ' + instance.getMessage(interaction, 'BANCO'),
value: `${format(banco)}`,
name: ':bank: ' + instance.getMessage(interaction, 'BANK'),
value: `${format(bank)}`,
inline: true,
}
);
Expand Down
50 changes: 25 additions & 25 deletions src/commands/economy/bank.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,11 +91,11 @@ module.exports = {

if (subcommand === 'view') {
const embed = instance.createEmbed(member.displayColor).addFields({
name: ':bank: ' + instance.getMessage(interaction, 'BANCO'),
value: `**:coin: ${format(player.banco)} falcoins\n:bank: ${instance.getMessage(
name: ':bank: ' + instance.getMessage(interaction, 'BANK'),
value: `**:coin: ${format(player.bank)} falcoins\n:bank: ${instance.getMessage(
interaction,
'BANK_INTEREST'
)}\n\n:money_with_wings: ${format(limit - player.banco)} ${instance.getMessage(
)}\n\n:money_with_wings: ${format(limit - player.bank)} ${instance.getMessage(
interaction,
'BANK_LIMIT'
)}\n:atm: ${instance.getMessage(interaction, 'BANK_DEPOSIT_LIMIT', {
Expand All @@ -108,94 +108,94 @@ module.exports = {
var quantity = specialArg(falcoins, player.falcoins);
} catch {
await instance.editReply(interaction, {
content: instance.getMessage(interaction, 'VALOR_INVALIDO', {
content: instance.getMessage(interaction, 'BAD_VALUE', {
VALUE: falcoins,
}),
});
return;
}

if (player.falcoins >= quantity) {
if (player.banco >= limit / 2) {
await instance.editReply({
if (player.bank >= limit / 2) {
await instance.editReply(interaction, {
content: instance.getMessage(interaction, 'BANK_OVER_LIMIT'),
});
return;
}

if (quantity + player.banco > limit / 2) {
quantity = limit / 2 - player.banco;
if (quantity + player.bank > limit / 2) {
quantity = limit / 2 - player.bank;
}

player.falcoins -= quantity;
player.banco += quantity;
player.bank += quantity;

const embed = instance
.createEmbed(member.displayColor)
.setTitle(
instance.getMessage(interaction, 'BANCO_DEPOSITOU', {
instance.getMessage(interaction, 'BANK_DEPOSIT', {
VALUE: format(quantity),
})
)
.addFields(
{
name: instance.getMessage(interaction, 'SALDO_ATUAL'),
name: instance.getMessage(interaction, 'BALANCE'),
value: `${format(player.falcoins)} falcoins`,
},
{
name: instance.getMessage(interaction, 'BANCO'),
value: instance.getMessage(interaction, 'BANCO_SALDO', {
VALUE: format(player.banco),
name: instance.getMessage(interaction, 'BANK'),
value: instance.getMessage(interaction, 'BANK_BALANCE', {
VALUE: format(player.bank),
}),
}
);

await instance.editReply(interaction, { embeds: [embed] });
} else {
await instance.editReply(interaction, {
content: instance.getMessage(interaction, 'FALCOINS_INSUFICIENTES'),
content: instance.getMessage(interaction, 'NOT_ENOUGH_FALCOINS'),
});
}
} else if (subcommand === 'withdraw') {
try {
var quantity = specialArg(falcoins, player.banco);
var quantity = specialArg(falcoins, player.bank);
} catch {
await instance.editReply(interaction, {
content: instance.getMessage(interaction, 'VALOR_INVALIDO', {
content: instance.getMessage(interaction, 'BAD_VALUE', {
VALUE: falcoins,
}),
});
return;
}

if (player.banco >= quantity) {
player.banco -= quantity;
if (player.bank >= quantity) {
player.bank -= quantity;
player.falcoins += quantity;

const embed = instance
.createEmbed(member.displayColor)
.setTitle(
instance.getMessage(interaction, 'BANCO_SACOU', {
instance.getMessage(interaction, 'BANK_WITHDRAW', {
VALUE: format(quantity),
})
)
.addFields(
{
name: instance.getMessage(interaction, 'SALDO_ATUAL'),
name: instance.getMessage(interaction, 'BALANCE'),
value: `${format(player.falcoins)} falcoins`,
},
{
name: instance.getMessage(interaction, 'BANCO'),
value: instance.getMessage(interaction, 'BANCO_SALDO', {
VALUE: format(player.banco),
name: instance.getMessage(interaction, 'BANK'),
value: instance.getMessage(interaction, 'BANK_BALANCE', {
VALUE: format(player.bank),
}),
}
);

await instance.editReply(interaction, { embeds: [embed] });
} else {
await instance.editReply(interaction, {
content: instance.getMessage(interaction, 'BANCO_INSUFICIENTE'),
content: instance.getMessage(interaction, 'BANK_INSUFFICIENT'),
});
}
}
Expand Down
20 changes: 10 additions & 10 deletions src/commands/economy/blackjack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ module.exports = {
var bet = await specialArg(falcoins, player.falcoins);
} catch {
await instance.editReply(interaction, {
content: instance.getMessage(interaction, 'VALOR_INVALIDO', {
content: instance.getMessage(interaction, 'BAD_VALUE', {
VALUE: falcoins,
}),
});
Expand Down Expand Up @@ -193,9 +193,9 @@ module.exports = {
FALCOINS: format(results.winnings / 2),
});
} else {
embed.data.fields[0].value = instance.getMessage(interaction, 'YOU_WON', {
FALCOINS: format(Math.floor(results.winnings / 2)),
});
embed.data.fields[0].value = `${instance.getMessage(interaction, 'GANHOS')}: ${format(
Math.floor(results.winnings / 2)
)} falcoins`;
}
embed.setColor(3066993);
player.falcoins += results.bet + Math.floor(results.winnings / 2);
Expand All @@ -205,9 +205,9 @@ module.exports = {
FALCOINS: format(results.losses),
});
} else {
embed.data.fields[0].value = instance.getMessage(interaction, 'YOU_LOST', {
FALCOINS: format(results.losses),
});
embed.data.fields[0].value = `${instance.getMessage(interaction, 'LOSSES')}: ${format(
results.losses
)} falcoins`;
}
embed.setColor(15158332);
} else {
Expand All @@ -217,7 +217,7 @@ module.exports = {
embed.setColor(10038562);
}

embed.data.fields[0].value += `\n${instance.getMessage(interaction, 'SALDO_ATUAL')}: ${format(
embed.data.fields[0].value += `\n${instance.getMessage(interaction, 'BALANCE')}: ${format(
player.falcoins
)} falcoins`;

Expand Down Expand Up @@ -289,7 +289,7 @@ module.exports = {
i.deferUpdate();
} else {
i.reply({
content: instance.getMessage(interaction, 'FALCOINS_INSUFICIENTES'),
content: instance.getMessage(interaction, 'NOT_ENOUGH_FALCOINS'),
ephemeral: true,
});
}
Expand All @@ -303,7 +303,7 @@ module.exports = {
});
} else {
await instance.editReply(interaction, {
content: instance.getMessage(interaction, 'FALCOINS_INSUFICIENTES'),
content: instance.getMessage(interaction, 'NOT_ENOUGH_FALCOINS'),
});
}
player.save();
Expand Down
10 changes: 5 additions & 5 deletions src/commands/economy/contextBalance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ module.exports = {
await interaction.deferReply().catch(() => {});
try {
const target = interaction.targetMember;
const { rank, falcoins, vitorias, banco } = await database.player.findOne(target.user.id);
const { rank, falcoins, wins, bank } = await database.player.findOne(target.user.id);

const embed = instance
.createEmbed(target.displayColor)
Expand All @@ -26,13 +26,13 @@ module.exports = {
inline: true,
},
{
name: ':trophy: ' + instance.getMessage(interaction, 'VITORIAS'),
value: `${format(vitorias)}`,
name: ':trophy: ' + instance.getMessage(interaction, 'WINS'),
value: `${format(wins)}`,
inline: true,
},
{
name: ':bank: ' + instance.getMessage(interaction, 'BANCO'),
value: `${format(banco)}`,
name: ':bank: ' + instance.getMessage(interaction, 'BANK'),
value: `${format(bank)}`,
inline: true,
}
);
Expand Down
9 changes: 5 additions & 4 deletions src/commands/economy/contextProfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ module.exports = {
await interaction.deferReply().catch(() => {});
try {
const target = interaction.targetMember;
const { rank, falcoins, vitorias, banco, inventory, voteStreak, tickets, createdAt } =
await database.player.findOne(target.user.id);
const { rank, falcoins, wins, bank, inventory, voteStreak, tickets, createdAt } = await database.player.findOne(
target.user.id
);
const limit = instance.levels[rank - 1].bankLimit;
const items = instance.items;

Expand Down Expand Up @@ -49,8 +50,8 @@ module.exports = {
name: 'Info',
value: instance.getMessage(interaction, 'PROFILE_INFOS', {
FALCOINS: format(falcoins),
WINS: format(vitorias),
BANK: format(banco),
WINS: format(wins),
BANK: format(bank),
LIMIT: format(limit),
TICKETS: format(tickets),
QUANTITY: format(inventoryQuantity),
Expand Down
18 changes: 9 additions & 9 deletions src/commands/economy/cooldowns.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@ module.exports = {
.setTitle(instance.getMessage(interaction, 'COOLDOWNS'))
.addFields(
{
name: ':ballot_box: ' + instance.getMessage(interaction, 'VOTO'),
name: ':ballot_box: ' + instance.getMessage(interaction, 'VOTE'),
value: `**${
voteCooldown < 43200000
? `:red_circle: ${msToTime(43200000 - voteCooldown)}`
: `:green_circle: ${instance.getMessage(interaction, 'PRONTO')}`
: `:green_circle: ${instance.getMessage(interaction, 'READY')}`
}**`,
inline: true,
},
Expand All @@ -59,16 +59,16 @@ module.exports = {
value: `**${
scratchCooldown > 0
? `:red_circle: ${msToTime(scratchCooldown)}`
: `:green_circle: ${instance.getMessage(interaction, 'PRONTO')}`
: `:green_circle: ${instance.getMessage(interaction, 'READY')}`
}**`,
inline: true,
},
{
name: ':briefcase: ' + instance.getMessage(interaction, 'TRABALHO'),
name: ':briefcase: ' + instance.getMessage(interaction, 'WORK'),
value: `**${
workCooldown > 0
? `:red_circle: ${msToTime(workCooldown)}`
: `:green_circle: ${instance.getMessage(interaction, 'PRONTO')}`
: `:green_circle: ${instance.getMessage(interaction, 'READY')}`
}**`,
inline: true,
},
Expand All @@ -77,7 +77,7 @@ module.exports = {
value: `**${
fishCooldown > 0
? `:red_circle: ${msToTime(fishCooldown)}`
: `:green_circle: ${instance.getMessage(interaction, 'PRONTO')}`
: `:green_circle: ${instance.getMessage(interaction, 'READY')}`
}**`,
inline: true,
},
Expand All @@ -86,7 +86,7 @@ module.exports = {
value: `**${
exploreCooldown > 0
? `:red_circle: ${msToTime(exploreCooldown)}`
: `:green_circle: ${instance.getMessage(interaction, 'PRONTO')}`
: `:green_circle: ${instance.getMessage(interaction, 'READY')}`
}**`,
inline: true,
},
Expand All @@ -95,7 +95,7 @@ module.exports = {
value: `**${
mineCooldown > 0
? `:red_circle: ${msToTime(mineCooldown)}`
: `:green_circle: ${instance.getMessage(interaction, 'PRONTO')}`
: `:green_circle: ${instance.getMessage(interaction, 'READY')}`
}**`,
inline: true,
},
Expand All @@ -104,7 +104,7 @@ module.exports = {
value: `**${
huntCooldown > 0
? `:red_circle: ${msToTime(huntCooldown)}`
: `:green_circle: ${instance.getMessage(interaction, 'PRONTO')}`
: `:green_circle: ${instance.getMessage(interaction, 'READY')}`
}**`,
inline: true,
},
Expand Down
Loading