diff --git a/commands/alarm.js b/commands/alarm.js index 3eea6f9..e93cb23 100644 --- a/commands/alarm.js +++ b/commands/alarm.js @@ -216,6 +216,9 @@ module.exports = { if (args[0].name == 'create') { if (args[0].options[3].value.includes('-') || args[0].options[3].value.includes(' ')) return interaction.send({ embeds: [new EmbedBuilder().setColor(client.config.Colors.Red).setDescription('**Invalid Name:** Alarm Names cannot include hyphens or spaces.')] }) + let exists = undefined == GuildDB.alarms.find(alarm => alarm.name = args[0].options[3].value) ? true : false; + if (exists) return interaction.send({ embeds: [new EmbedBuilder().setColor(client.config.Colors.Yellow).setDescription('**Invalid Name**\nAn alarm already exists with this name.')]}); + let alarm = { origin: [args[0].options[0].value, args[0].options[1].value], radius: args[0].options[2].value, diff --git a/commands/purchase-emp.js b/commands/purchase-emp.js index de73a80..cf7e352 100644 --- a/commands/purchase-emp.js +++ b/commands/purchase-emp.js @@ -29,21 +29,18 @@ module.exports = { userID: interaction.member.user.id, guilds: { [GuildDB.serverID]: { - bankAccount: { - balance: GuildDB.startingBalance, - cash: 0.00, - } + balance: GuildDB.startingBalance, } } } - // Register bank for user + // Register bank for user let newBank = new User(); - newBank.createUser(interaction.member.user.id, GuildDB.serverID, GuildDB.startingBalance, 0); + newBank.createUser(interaction.member.user.id, GuildDB.serverID, GuildDB.startingBalance); newBank.save().catch(err => { if (err) return client.sendInternalError(interaction, err); }); - + } else banking = banking.user; if (!client.exists(banking.guilds[GuildDB.serverID])) { @@ -72,10 +69,10 @@ module.exports = { .setPlaceholder(`Select an Alarm to EMP.`) for (let i = 0; i < GuildDB.alarms.length; i++) { - if (!alarm.empExempt) { + if (!GuildDB.alarms[i].empExempt) { alarms.addOptions({ label: GuildDB.alarms[i].name, - description: `EMP this Alarm for $500,000`, + description: `EMP this Alarm for $${GuildDB.empPrice.toLocaleString(undefined, {minimumFractionDigits: 0, maximumFractionDigits: 0})}}`, value: GuildDB.alarms[i].name }); } diff --git a/commands/purchase-uav.js b/commands/purchase-uav.js index a8a55d3..8c325df 100644 --- a/commands/purchase-uav.js +++ b/commands/purchase-uav.js @@ -47,10 +47,7 @@ module.exports = { userID: interaction.member.user.id, guilds: { [GuildDB.serverID]: { - bankAccount: { - balance: GuildDB.startingBalance, - cash: 0.00, - } + balance: GuildDB.startingBalance, } } } diff --git a/package.json b/package.json index 1a5e306..9dbfce3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dayzr-bot", - "version": "10.4.3", + "version": "10.4.4", "description": "A General Purpose Discord Bot for DayZ Nitrado Servers.", "main": "index.js", "nodemonConfig": { diff --git a/structures/DayzRBot.js b/structures/DayzRBot.js index 3196104..7c6c44c 100644 --- a/structures/DayzRBot.js +++ b/structures/DayzRBot.js @@ -503,6 +503,7 @@ class DayzRBot extends Client { incomeLimiter: guild.server.incomeLimiter, startingBalance: guild.server.startingBalance, uavPrice: guild.server.uavPrice, + empPrice: guild.server.empPrice, memberRole: guild.server.memberRole, adminRole: guild.server.adminRole, combatLogTimer: guild.server.combatLogTimer,