From 26ced4788d61093088eb2b3f3b6152f4f287e299 Mon Sep 17 00:00:00 2001 From: *x1 Date: Mon, 8 Jul 2024 09:52:53 +0200 Subject: [PATCH] Update global --- commands/achats/shop.js | 14 +++++----- commands/jobs/braquage.js | 18 ++++++------ commands/jobs/hack.js | 23 ++++------------ commands/teams admin/twithdraw.js | 2 +- commands/teams/team.js | 46 ++++++++++++++++++++++++++++--- 5 files changed, 65 insertions(+), 38 deletions(-) diff --git a/commands/achats/shop.js b/commands/achats/shop.js index eb2595d..45780fe 100644 --- a/commands/achats/shop.js +++ b/commands/achats/shop.js @@ -19,7 +19,7 @@ module.exports = { .setTitle("🛍️ Shop") .setThumbnail(message.guild.iconURL()) .setDescription( - `Sélectionnez un item à acheter. Voici les items disponibles :\n\n> 🔒 AntiRob - Protège contre les vols pendant 2 heures - Prix : 2000coins\n\n> 🗝️ Clef - Permet d'ouvrir une boite 100%gagante - Prix : 2500coins\n\n\n\n> 💰 25000 Coins - Prix : 1 reputation`, + `Sélectionnez un item à acheter. Voici les items disponibles :\n\n> 🔒 AntiRob - Protège contre les vols pendant 2 heures - Prix : 2000coins\n\n> 🗝️ Clef - Permet d'ouvrir une boite 100%gagante - Prix : 2500coins\n\n\n\n> 💰 7500 Coins - Prix : 1 reputation`, ) .setColor(await embedColor(message.author.id, message.guild.id)) .setTimestamp() @@ -45,9 +45,9 @@ module.exports = { .setEmoji("🗝️") .setDefault(false), new StringSelectMenuOptionBuilder() - .setLabel("💰 25000 Coins") - .setValue("coins") - .setDescription("Vous donne 25K de coins contre 1reputation") + .setLabel("💰 7500 Coins") + .setValue("shop_coins") + .setDescription("Vous donne 7.5K de coins contre 1reputation") .setEmoji("💰") .setDefault(false), ); @@ -144,7 +144,7 @@ module.exports = { embeds: [embed], allowedMentions: { repliedUser: false }, }); - } else if (selected === "coins") { + } else if (selected === "shop_coins") { const user = await new Promise((resolve, reject) => { db.get( `SELECT * FROM users WHERE guildId = ? AND userId = ?`, @@ -165,14 +165,14 @@ module.exports = { } db.run( - `UPDATE users SET pocket = pocket + 25000, reputation = reputation - 1 WHERE guildId = ? AND userId = ?`, + `UPDATE users SET pocket = pocket + 7500, reputation = reputation - 1 WHERE guildId = ? AND userId = ?`, [message.guild.id, message.author.id], ); const embed = new EmbedBuilder() .setTitle("🛍️ Shop") .setDescription( - `Vous avez acheté \`25000\`coins contre une reputation !`, + `Vous avez acheté \`7500\`coins contre une reputation !`, ) .setColor(await embedColor(message.author.id, message.guild.id)) .setTimestamp() diff --git a/commands/jobs/braquage.js b/commands/jobs/braquage.js index 0234bfd..afa3008 100644 --- a/commands/jobs/braquage.js +++ b/commands/jobs/braquage.js @@ -9,7 +9,7 @@ const db = require("../../fonctions/database.js"); module.exports = { aliases: ["braquage"], - description: "Tente un braquage. (cout : 5rep)", + description: "Tente un braquage. (cout : 3rep)", emote: "🏦", utilisation: "<@membre>", permission: 0, @@ -62,12 +62,12 @@ module.exports = { }, ); }); - const usercoinsEnBank = user.bank; - if (usercoinsEnBank < 8) { + const usercoinsEnBank = user.reputation; + if (usercoinsEnBank < 3) { const embed = new EmbedBuilder() .setTitle("Braquage Impossible") .setDescription( - `❌ Vous n'avez pas assez de reputation. Il faut \`8\` reputation mais vous n'avez que \`${usercoinsEnBank}\`reputation`, + `❌ Vous n'avez pas assez de reputation. Il faut \`3\` reputation mais vous n'avez que \`${usercoinsEnBank}\`reputation`, ) .setColor(await embedColor(message.author.id, message.guild.id)) .setTimestamp() @@ -104,7 +104,7 @@ module.exports = { ///////////////////////////////// Payage + MaJ du braquage ///////////////////////////////////////////////////// db.run( - `UPDATE users SET reputation = reputation - 5 WHERE guildId =? AND userId =?`, + `UPDATE users SET reputation = reputation - 3 WHERE guildId =? AND userId =?`, [message.guild.id, message.author.id], (err) => { if (err) { @@ -149,7 +149,7 @@ module.exports = { /////////////////////////////////// Calcule des resultats /////////////////////////////////////////////////////// - const result = Math.floor(Math.random() * 4); + const result = Math.floor(Math.random() * 2); let gain = 0; let coinsEnBank = 0; if (result === 0) { @@ -158,7 +158,7 @@ module.exports = { await new Promise((resolve, reject) => { db.run( - `UPDATE users SET bank = bank - ? WHERE userId = ? AND guildId = ?`, + `UPDATE users SET bank = bank + ? WHERE userId = ? AND guildId = ?`, [coinsEnBank, message.author.id, message.guild.id], (err) => { if (err) { @@ -171,7 +171,7 @@ module.exports = { }); await new Promise((resolve, reject) => { db.run( - `UPDATE users SET bank = bank + ? WHERE userId = ? AND guildId = ?`, + `UPDATE users SET bank = bank - ? WHERE userId = ? AND guildId = ?`, [coinsEnBank, cible.id, message.guild.id], (err) => { if (err) { @@ -187,7 +187,7 @@ module.exports = { coinsEnBank = 0; await new Promise((resolve, reject) => { db.run( - `UPDATE users SET bank = bank - 3 WHERE userId = ? AND guildId = ?`, + `UPDATE users SET reputation = reputation - 3 WHERE userId = ? AND guildId = ?`, [cible.id, message.guild.id], (err) => { if (err) { diff --git a/commands/jobs/hack.js b/commands/jobs/hack.js index 3b24b57..0fbeca3 100644 --- a/commands/jobs/hack.js +++ b/commands/jobs/hack.js @@ -4,7 +4,7 @@ const embedColor = require("../../fonctions/embedColor.js"); module.exports = { aliases: ["hack"], - description: "Supprime un cadenas à une team. (coût : 4reputation)", + description: "Supprime un cadenas à une team. (coût : 2reputation)", emote: "🔓", utilisation: "", permission: 0, @@ -40,11 +40,11 @@ module.exports = { ); }); const userRep = user.reputation; - if (userRep < 4) { + if (userRep < 2) { const embed = new EmbedBuilder() .setTitle("Hack Impossible") .setDescription( - `❌ Vous n'avez pas assez de reputation. Il faut \`4\` reputation mais vous n'avez que \`${userRep}\` reputation`, + `❌ Vous n'avez pas assez de reputation. Il faut \`2\` reputation mais vous n'avez que \`${userRep}\` reputation`, ) .setColor(await embedColor(message.author.id, message.guild.id)) .setTimestamp() @@ -118,7 +118,7 @@ module.exports = { }, ); db.run( - `UPDATE users SET reputation = reputation - 4 WHERE guildId =? AND userId =?`, + `UPDATE users SET reputation = reputation - 2 WHERE guildId =? AND userId =?`, [message.guild.id, message.author.id], (err) => { if (err) { @@ -140,14 +140,7 @@ module.exports = { const embed = new EmbedBuilder() .setTitle("Hack réussi !") - .setDescription( - "Vous avez cassé(e) un cadenas de la team `" + - team.name + - "`, cette team à maintement `" + - team.padlock - - 1 + - "` cadenas !", - ) + .setDescription("Vous avez cassé(e) un cadenas de la team `" + team.name + "`, cette team à maintement `" + (team.padlock - 1) + "` cadenas !") .setColor(await embedColor(message.author.id, message.guild.id)) .setTimestamp() .setImage( @@ -180,11 +173,7 @@ module.exports = { const embed2 = new EmbedBuilder() .setTitle("Vole de la banque !") - .setDescription( - "La team n'a plus de cadenas ! Vous avez donc recupéré tout l'argent de la bank (`" + - team.bank + - "`coins) !", - ) + .setDescription("Vous n'avez pas reussi à casser un cadenas de la team `" + team.name + "`, qui à donc, toujours, `" + team.padlock + "` cadenas.") .setColor(await embedColor(message.author.id, message.guild.id)) .setTimestamp() .setImage("") diff --git a/commands/teams admin/twithdraw.js b/commands/teams admin/twithdraw.js index 9dfca94..0d32d96 100644 --- a/commands/teams admin/twithdraw.js +++ b/commands/teams admin/twithdraw.js @@ -68,7 +68,7 @@ module.exports = { ); }); - if (!teamRole || (teamRole !== "officier" && teamRole !== "owner")) { + if (!teamRole || teamRole == "membre") { const embed = new EmbedBuilder() .setTitle("Retrait Impossible") .setDescription( diff --git a/commands/teams/team.js b/commands/teams/team.js index ebf78f8..f3ae421 100644 --- a/commands/teams/team.js +++ b/commands/teams/team.js @@ -57,10 +57,48 @@ module.exports = { Aname = "aucune alliance"; } + function convert(labelValue) { + + return Math.abs(Number(labelValue)) >= 1.0e+9 + + ? (Math.abs(Number(labelValue)) / 1.0e+9).toFixed(4) + "B" + + : Math.abs(Number(labelValue)) >= 1.0e+6 + + ? (Math.abs(Number(labelValue)) / 1.0e+6).toFixed(3) + "M" + + : Math.abs(Number(labelValue)) >= 1.0e+3 + + ? (Math.abs(Number(labelValue)) / 1.0e+3).toFixed(2) + "K" + + : Math.abs(Number(labelValue)); + + } + + const ownerlist = await new Promise((resolve, reject) => { + db.all( + `SELECT userId, teamRole FROM users WHERE guildId = ? AND teamId = ? AND teamRole = ?`, + [message.guild.id, team.id, "owner"], + (err, rows) => { + if (err) reject(err); + resolve(rows); + }, + ); + }); + const officierlist = await new Promise((resolve, reject) => { + db.all( + `SELECT userId, teamRole FROM users WHERE guildId = ? AND teamId = ? AND teamRole = ?`, + [message.guild.id, team.id, "officer"], + (err, rows) => { + if (err) reject(err); + resolve(rows); + }, + ); + }); const memberlist = await new Promise((resolve, reject) => { db.all( - `SELECT userId, teamRole FROM users WHERE guildId = ? AND teamId = ?`, - [message.guild.id, team.id], + `SELECT userId, teamRole FROM users WHERE guildId = ? AND teamId = ? AND teamRole = ?`, + [message.guild.id, team.id, "membre"], (err, rows) => { if (err) reject(err); resolve(rows); @@ -111,7 +149,7 @@ module.exports = { default: position = `**${i + 1}.**`; } - return `${position} <@${row.userId}> - \`${row.coins}\`coins donné(s)`; + return `${position} <@${row.userId}> - \`${convert(row.coins)}\`coins donné(s)`; }) .join("\n"); //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -119,7 +157,7 @@ module.exports = { const embed = new EmbedBuilder() .setTitle("🛡️ Informations de `" + team.name + "`:") .setDescription( - `**Id:** \`${team.id}\`\n**Description:** \`${team.description}\`\n**Banque:** \`${team.bank}\`coins\n**Niveau:** \`${team.level}\`\n**Reputation:** \`${team.reputation}\`\n\n**Soldats:** \`${team.soldiers}\`\n**Soldats blessés:** \`${team.woundedSoldiers}\`\n**Niveau du camp:** \`${team.campLevel}\`\n**Tourelles:** \`${team.turrets}\`\n**Cadenas:** \`${CadenaS}\`\n\n\nAlliance : ${Aname}\n\n\n**Membres (\`${memberlist.length}\`):**\n${memberlist.map((member) => `**${member.teamRole}:** <@${member.userId}>`).join("\n")}\n`, + `**Id:** \`${team.id}\`\n**Description:** \`${team.description}\`\n**Banque:** \`${convert(team.bank)}\`coins\n**Niveau:** \`${team.level}\`\n**Reputation:** \`${team.reputation}\`\n\n**Soldats:** \`${team.soldiers}\`\n**Soldats blessés:** \`${team.woundedSoldiers}\`\n**Niveau du camp:** \`${team.campLevel}\`\n**Tourelles:** \`${team.turrets}\`\n**Cadenas:** \`${CadenaS}\`\n\n\nAlliance : ${Aname}\n\n\n**Membres (\`${memberlist.length + officierlist.length + 1}\`):**\n${ownerlist.map((member) => `**owner:** <@${member.userId}>`).join("\n")}\n${officierlist.map((member) => `**officier:** <@${member.userId}>`).join("\n")}\n${memberlist.map((member) => `**membre:** <@${member.userId}>`).join("\n")}`, ) .setColor(await embedColor(message.author.id, message.guild.id)) .setTimestamp()