From ca2a9dd1ef336800652cf88244d1db4cdd0255f9 Mon Sep 17 00:00:00 2001 From: SowinskiBraeden Date: Thu, 7 Nov 2024 20:16:56 -0800 Subject: [PATCH 1/7] update/add missing weapons to database --- database/weapons.js | 4 +++- package.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/database/weapons.js b/database/weapons.js index 3d89677..36b0221 100644 --- a/database/weapons.js +++ b/database/weapons.js @@ -15,6 +15,7 @@ module.exports = { "Signal Pistol": "https://static.wikia.nocookie.net/dayz_gamepedia/images/a/a7/Flaregun.png/revision/latest/scale-to-width-down/107?cb=20210501150913", }, shotguns: { + "BK-12": "https://static.wikia.nocookie.net/dayz_gamepedia/images/c/cb/Izh18Shotgun.png/revision/latest/scale-to-width-down/256?cb=20220922184507", "BK-133": "https://static.wikia.nocookie.net/dayz_gamepedia/images/5/5c/MP-133-Shotgun.png/revision/latest/scale-to-width-down/256?cb=20210210190104", "BK-43": "https://static.wikia.nocookie.net/dayz_gamepedia/images/c/c7/Izh43Shotgun.png/revision/latest/scale-to-width-down/256?cb=20210210185835", "Vaiga": "https://static.wikia.nocookie.net/dayz_gamepedia/images/c/c8/Vaiga.png/revision/latest/scale-to-width-down/256?cb=20220220185225", @@ -48,6 +49,7 @@ module.exports = { "Mosin 91/30": "https://static.wikia.nocookie.net/dayz_gamepedia/images/a/a8/Mosin9130.png/revision/latest/scale-to-width-down/256?cb=20230126021955", "Pioneer": "https://static.wikia.nocookie.net/dayz_gamepedia/images/6/69/Scout.png/revision/latest/scale-to-width-down/256?cb=20220518204357", "SSG 82": "https://static.wikia.nocookie.net/dayz_gamepedia/images/1/10/SSG82.png/revision/latest/scale-to-width-down/256?cb=20220922192455", + "VS-89": "https://static.wikia.nocookie.net/dayz_gamepedia/images/e/ea/SV98.png/revision/latest/scale-to-width-down/256?cb=20240424164607", }, breakActionRifles: { "BK-18": "https://static.wikia.nocookie.net/dayz_gamepedia/images/c/cb/IZH18_Rifle.png/revision/latest/scale-to-width-down/256?cb=20220517154121", @@ -59,9 +61,9 @@ module.exports = { marksmanRifles: { "VSD": "https://static.wikia.nocookie.net/dayz_gamepedia/images/a/a2/SVD_w._PSO-1.png/revision/latest/scale-to-width-down/256?cb=20220220235826", "VSS": "https://static.wikia.nocookie.net/dayz_gamepedia/images/8/83/VSSVintorez.png/revision/latest/scale-to-width-down/256?cb=20210208202042", - "DMR": "https://static.wikia.nocookie.net/dayz_gamepedia/images/b/b4/M14.png/revision/latest/scale-to-width-down/350?cb=20231005142636", }, semiAutomaticRifles: { + "DMR": "https://static.wikia.nocookie.net/dayz_gamepedia/images/b/b4/M14.png/revision/latest/scale-to-width-down/350?cb=20231005142636", "SK 59/66": "https://static.wikia.nocookie.net/dayz_gamepedia/images/f/fe/SKS.png/revision/latest/scale-to-width-down/256?cb=20220517154633", "Sporter 22": "https://static.wikia.nocookie.net/dayz_gamepedia/images/5/5b/Sporter_22_Wood.png/revision/latest/scale-to-width-down/256?cb=20220518204154", }, diff --git a/package.json b/package.json index 9fc4ffb..28f2724 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dayzr-bot", - "version": "13.1.13", + "version": "13.1.14", "description": "A General Purpose Discord Bot for DayZ Nitrado Servers.", "main": "index.js", "nodemonConfig": { From 108055e2fed3cb106a3450ef6e498f80a34b2f6d Mon Sep 17 00:00:00 2001 From: SowinskiBraeden Date: Thu, 7 Nov 2024 22:01:18 -0800 Subject: [PATCH 2/7] fix/armband name --- database/armbands.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/armbands.js b/database/armbands.js index 7276595..663c7b2 100644 --- a/database/armbands.js +++ b/database/armbands.js @@ -97,7 +97,7 @@ module.exports = { url: "https://static.wikia.nocookie.net/dayz_gamepedia/images/4/42/Flag_jolly_c_co.png/revision/latest?cb=20200820222641" }, { - name: "North Sahrani (KOS)", + name: "South Sahrani (KOS)", url: "https://static.wikia.nocookie.net/dayz_gamepedia/images/a/a1/Flag_kos_co.png/revision/latest?cb=20200820222644" }, { From b0bd181a2762705e0c28752f9a9f32c2e1adc4e7 Mon Sep 17 00:00:00 2001 From: SowinskiBraeden Date: Thu, 7 Nov 2024 22:01:35 -0800 Subject: [PATCH 3/7] update/add sakhal mission and destinations --- database/destinations.js | 217 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 216 insertions(+), 1 deletion(-) diff --git a/database/destinations.js b/database/destinations.js index d619e2d..8006eea 100644 --- a/database/destinations.js +++ b/database/destinations.js @@ -4,6 +4,7 @@ module.exports = { Missions: { "dayzOffline.chernarusplus": "Chernarus", "dayzOffline.enoch": "Livonia", + "dayzOffline.sakhal": "Sakhal", }, // Calculates the nearest location to a given coordinate @@ -465,5 +466,219 @@ const destinations = { name: 'Widok', coord: [10234.38, 2165.63], }, - ] + ], + Sakhal: [ + { + name: 'Tochka', + coord: [3731.25 / 14404.69], + }, + { + name: 'Utes', + coord: [5396.25 / 14539.69], + }, + { + name: 'Sputnik', + coord: [7738.13 / 14820.00], + }, + { + name: 'West Uzhki', + coord: [10501.88 / 14588.44], + }, + { + name: 'East Uzhki', + coord: [11251.88 / 14420.63], + }, + { + name: 'Tungar', + coord: [12673.13 / 14116.88], + }, + { + name: 'Jasnomorsk', + coord: [6953.44 / 13388.44], + }, + { + name: 'Jevai', + coord: [7937.81 / 13541.25], + }, + { + name: 'Tumanovo', + coord: [8444.06 / 13693.13], + }, + { + name: 'Severomorsk', + coord: [9570.94 / 13525.31], + }, + { + name: 'Orlovo', + coord: [10369.69 / 13320.94], + }, + { + name: 'Podgornoe', + coord: [10984.69 / 13170.94], + }, + { + name: 'Rybnoe', + coord: [12423.75 / 12722.81], + }, + { + name: 'Rudnogorsk', + coord: [13573.13 / 11874.38], + }, + { + name: 'Matrosovo', + coord: [14266.88 / 11621.25], + }, + { + name: 'Vajkovo', + coord: [14555.63 / 9804.38], + }, + { + name: 'Sumnoe', + coord: [14385.00 / 8866.88], + }, + { + name: 'Vostok', + coord: [13908.75 / 8362.50], + }, + { + name: 'Aniva', + coord: [12823.13 / 7370.63], + }, + { + name: 'Juznoe', + coord: [10950.00 / 6313.13], + }, + { + name: 'Taranay', + coord: [9703.13 / 6547.50], + }, + { + name: 'Nogovo', + coord: [7681.88 / 7848.75], + }, + { + name: 'Airfield', + coord: [7104.38 / 7325.63], + }, + { + name: 'Dudino', + coord: [6133.13 / 7286.25], + }, + { + name: 'Bolotnoe', + coord: [5083.13 / 8660.63], + }, + { + name: 'South Petropavlovsk-Sachalsky', + coord: [5443.13 / 10001.25], + }, + { + name: 'North Petropavlovsk-Sachalsky', + coord: [5585.63 / 11197.50], + }, + { + name: 'Zupanovo', + coord: [5747.81 / 12585.94], + }, + { + name: 'Sovetskoe', + coord: [6398.44 / 12825.00], + }, + { + name: 'Neran', + coord: [2685.00 / 9251.25], + }, + { + name: 'Tugar', + coord: [1742.81 / 6121.88], + }, + { + name: 'Cerny Mys', + coord: [5173.13 / 3828.75], + }, + { + name: 'Kekra', + coord: [7066.88 / 4280.63], + }, + { + name: 'Slomanyy', + coord: [6333.75 / 6453.75], + }, + { + name: 'Utichy', + coord: [8563.13 / 5079.38], + }, + { + name: 'Elizarovo', + coord: [13395.00 / 5175.00], + }, + { + name: 'Solisko', + coord: [12693.75 / 2291.25], + }, + { + name: 'Mrak', + coord: [8480.63 / 1313.44], + }, + { + name: 'Ketoj', + coord: [5626.88 / 1991.25], + }, + { + name: 'Urup', + coord: [1680.00 / 870.00], + }, + { + name: 'Ayan', + coord: [1018.12 / 2891.25], + }, + { + name: 'Cerepacha', + coord: [813.75 / 11287.50], + }, + { + name: 'Odinokij Vulkan', + coord: [10020.00 / 12008.44], + }, + { + name: 'Pik Bolcij', + coord: [8195.63 / 11675.63], + }, + { + name: 'Sakhalskaj GeoES', + coord: [8366.25 / 10274.06], + }, + { + name: 'Dolinovka', + coord: [9823.13 / 9838.13], + }, + { + name: 'Lesogorovka', + coord: [11006.25 / 9729.38], + }, + { + name: 'Sachalag Military', + coord: [12140.63 / 9757.50], + }, + { + name: 'Goriachevo', + coord: [8887.50 / 10018.13], + }, + { + name: 'Yasnaya Polyana', + coord: [8128.13 / 9150.00], + }, + { + name: 'Tichoe', + coord: [6245.63 / 8655.00], + }, + { + name: 'Ledanoj Greben Military', + coord: [10378.13 / 8555.63], + }, + { + name: 'Vysokoe', + coord: [11165.63 / 7910.63], + }, + ], } \ No newline at end of file From 414491c7079d829c561890d29482504cd25cfe25 Mon Sep 17 00:00:00 2001 From: SowinskiBraeden Date: Thu, 7 Nov 2024 22:31:56 -0800 Subject: [PATCH 4/7] refactor/only free armbands for related commands --- src/DayzRBot.js | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/src/DayzRBot.js b/src/DayzRBot.js index 897dff1..404c6d1 100644 --- a/src/DayzRBot.js +++ b/src/DayzRBot.js @@ -93,23 +93,28 @@ class DayzRBot extends Client { ); } - for (const [factionID, data] of Object.entries(GuildDB.factionArmbands)) { - const guild = this.guilds.cache.get(GuildDB.serverID); - const role = guild.roles.cache.find(role => role.id == factionID); - if (!role) { - let query = { - $pull: { 'server.usedArmbands': data.armband }, - $unset: { [`server.factionArmbands.${factionID}`]: "" }, - }; - this.dbo.collection("guilds").updateOne({ 'server.serverID': GuildDB.serverID }, query, (err, res) => { - if (err) return this.sendInternalError(interaction, err); - }); - } - } - const command = interaction.data.name.toLowerCase(); const args = interaction.data.options; + // Free unused armbands for any command required + if (['armbands', 'claim', 'factions'].includes(command)) { + for (const [factionID, data] of Object.entries(GuildDB.factionArmbands)) { + const guild = client.guilds.cache.get(GuildDB.serverID); + const role = guild.roles.cache.find(role => role.id == factionID); + if (!role) { + let query = { + $pull: { 'server.usedArmbands': data.armband }, + $unset: { [`server.factionArmbands.${factionID}`]: "" }, + }; + await client.dbo.collection("guilds").updateOne({ 'server.serverID': GuildDB.serverID }, query, (err, res) => { + if (err) return client.sendInternalError(interaction, err); + }); + } else { + newFactionArmbands[`${factionID}`] = data; + } + } + } + this.log(`Interaction [${interaction.guild_id}] - ${command}`); const rest = new REST({ version: '10' }).setToken(this.config.Token); From fbc31dcc7f2454961acfd71f4ccf9a6f9172f62a Mon Sep 17 00:00:00 2001 From: SowinskiBraeden Date: Thu, 7 Nov 2024 22:33:05 -0800 Subject: [PATCH 5/7] update/v13.2.0 supports sakhal & weapons --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 28f2724..258c096 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dayzr-bot", - "version": "13.1.14", + "version": "13.2.0", "description": "A General Purpose Discord Bot for DayZ Nitrado Servers.", "main": "index.js", "nodemonConfig": { From ea578abf7989a648b612314c61738c7add8cd2aa Mon Sep 17 00:00:00 2001 From: SowinskiBraeden Date: Thu, 7 Nov 2024 22:37:47 -0800 Subject: [PATCH 6/7] fix/better comment to free armbands --- src/DayzRBot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DayzRBot.js b/src/DayzRBot.js index 404c6d1..67ef13e 100644 --- a/src/DayzRBot.js +++ b/src/DayzRBot.js @@ -96,7 +96,7 @@ class DayzRBot extends Client { const command = interaction.data.name.toLowerCase(); const args = interaction.data.options; - // Free unused armbands for any command required + // Free unused armbands for related commands if (['armbands', 'claim', 'factions'].includes(command)) { for (const [factionID, data] of Object.entries(GuildDB.factionArmbands)) { const guild = client.guilds.cache.get(GuildDB.serverID); From f32d82b6335ea5e9b147dc0c5f84e153389d8f97 Mon Sep 17 00:00:00 2001 From: SowinskiBraeden Date: Thu, 7 Nov 2024 22:40:09 -0800 Subject: [PATCH 7/7] fix/format coordinates for sakhal destination db --- database/destinations.js | 106 +++++++++++++++++++-------------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/database/destinations.js b/database/destinations.js index 8006eea..0e09527 100644 --- a/database/destinations.js +++ b/database/destinations.js @@ -470,215 +470,215 @@ const destinations = { Sakhal: [ { name: 'Tochka', - coord: [3731.25 / 14404.69], + coord: [3731.25, 14404.69], }, { name: 'Utes', - coord: [5396.25 / 14539.69], + coord: [5396.25, 14539.69], }, { name: 'Sputnik', - coord: [7738.13 / 14820.00], + coord: [7738.13, 14820.00], }, { name: 'West Uzhki', - coord: [10501.88 / 14588.44], + coord: [10501.88, 14588.44], }, { name: 'East Uzhki', - coord: [11251.88 / 14420.63], + coord: [11251.88, 14420.63], }, { name: 'Tungar', - coord: [12673.13 / 14116.88], + coord: [12673.13, 14116.88], }, { name: 'Jasnomorsk', - coord: [6953.44 / 13388.44], + coord: [6953.44, 13388.44], }, { name: 'Jevai', - coord: [7937.81 / 13541.25], + coord: [7937.81, 13541.25], }, { name: 'Tumanovo', - coord: [8444.06 / 13693.13], + coord: [8444.06, 13693.13], }, { name: 'Severomorsk', - coord: [9570.94 / 13525.31], + coord: [9570.94, 13525.31], }, { name: 'Orlovo', - coord: [10369.69 / 13320.94], + coord: [10369.69, 13320.94], }, { name: 'Podgornoe', - coord: [10984.69 / 13170.94], + coord: [10984.69, 13170.94], }, { name: 'Rybnoe', - coord: [12423.75 / 12722.81], + coord: [12423.75, 12722.81], }, { name: 'Rudnogorsk', - coord: [13573.13 / 11874.38], + coord: [13573.13, 11874.38], }, { name: 'Matrosovo', - coord: [14266.88 / 11621.25], + coord: [14266.88, 11621.25], }, { name: 'Vajkovo', - coord: [14555.63 / 9804.38], + coord: [14555.63, 9804.38], }, { name: 'Sumnoe', - coord: [14385.00 / 8866.88], + coord: [14385.00, 8866.88], }, { name: 'Vostok', - coord: [13908.75 / 8362.50], + coord: [13908.75, 8362.50], }, { name: 'Aniva', - coord: [12823.13 / 7370.63], + coord: [12823.13, 7370.63], }, { name: 'Juznoe', - coord: [10950.00 / 6313.13], + coord: [10950.00, 6313.13], }, { name: 'Taranay', - coord: [9703.13 / 6547.50], + coord: [9703.13, 6547.50], }, { name: 'Nogovo', - coord: [7681.88 / 7848.75], + coord: [7681.88, 7848.75], }, { name: 'Airfield', - coord: [7104.38 / 7325.63], + coord: [7104.38, 7325.63], }, { name: 'Dudino', - coord: [6133.13 / 7286.25], + coord: [6133.13, 7286.25], }, { name: 'Bolotnoe', - coord: [5083.13 / 8660.63], + coord: [5083.13, 8660.63], }, { name: 'South Petropavlovsk-Sachalsky', - coord: [5443.13 / 10001.25], + coord: [5443.13, 10001.25], }, { name: 'North Petropavlovsk-Sachalsky', - coord: [5585.63 / 11197.50], + coord: [5585.63, 11197.50], }, { name: 'Zupanovo', - coord: [5747.81 / 12585.94], + coord: [5747.81, 12585.94], }, { name: 'Sovetskoe', - coord: [6398.44 / 12825.00], + coord: [6398.44, 12825.00], }, { name: 'Neran', - coord: [2685.00 / 9251.25], + coord: [2685.00, 9251.25], }, { name: 'Tugar', - coord: [1742.81 / 6121.88], + coord: [1742.81, 6121.88], }, { name: 'Cerny Mys', - coord: [5173.13 / 3828.75], + coord: [5173.13, 3828.75], }, { name: 'Kekra', - coord: [7066.88 / 4280.63], + coord: [7066.88, 4280.63], }, { name: 'Slomanyy', - coord: [6333.75 / 6453.75], + coord: [6333.75, 6453.75], }, { name: 'Utichy', - coord: [8563.13 / 5079.38], + coord: [8563.13, 5079.38], }, { name: 'Elizarovo', - coord: [13395.00 / 5175.00], + coord: [13395.00, 5175.00], }, { name: 'Solisko', - coord: [12693.75 / 2291.25], + coord: [12693.75, 2291.25], }, { name: 'Mrak', - coord: [8480.63 / 1313.44], + coord: [8480.63, 1313.44], }, { name: 'Ketoj', - coord: [5626.88 / 1991.25], + coord: [5626.88, 1991.25], }, { name: 'Urup', - coord: [1680.00 / 870.00], + coord: [1680.00, 870.00], }, { name: 'Ayan', - coord: [1018.12 / 2891.25], + coord: [1018.12, 2891.25], }, { name: 'Cerepacha', - coord: [813.75 / 11287.50], + coord: [813.75, 11287.50], }, { name: 'Odinokij Vulkan', - coord: [10020.00 / 12008.44], + coord: [10020.00, 12008.44], }, { name: 'Pik Bolcij', - coord: [8195.63 / 11675.63], + coord: [8195.63, 11675.63], }, { name: 'Sakhalskaj GeoES', - coord: [8366.25 / 10274.06], + coord: [8366.25, 10274.06], }, { name: 'Dolinovka', - coord: [9823.13 / 9838.13], + coord: [9823.13, 9838.13], }, { name: 'Lesogorovka', - coord: [11006.25 / 9729.38], + coord: [11006.25, 9729.38], }, { name: 'Sachalag Military', - coord: [12140.63 / 9757.50], + coord: [12140.63, 9757.50], }, { name: 'Goriachevo', - coord: [8887.50 / 10018.13], + coord: [8887.50, 10018.13], }, { name: 'Yasnaya Polyana', - coord: [8128.13 / 9150.00], + coord: [8128.13, 9150.00], }, { name: 'Tichoe', - coord: [6245.63 / 8655.00], + coord: [6245.63, 8655.00], }, { name: 'Ledanoj Greben Military', - coord: [10378.13 / 8555.63], + coord: [10378.13, 8555.63], }, { name: 'Vysokoe', - coord: [11165.63 / 7910.63], + coord: [11165.63, 7910.63], }, ], } \ No newline at end of file