update/destination presentation

This commit is contained in:
SowinskiBraeden committed 2023-10-07 13:50:57 -07:00
1 parent fa335f9327
commit 80534aa05d
5 files changed
+12 -12

No files matched your search

+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "dayzr-bot", "name": "dayzr-bot",
"version": "10.3.3", "version": "10.3.4",
"description": "A General Purpose Discord Bot for DayZ Nitrado Servers.", "description": "A General Purpose Discord Bot for DayZ Nitrado Servers.",
"main": "index.js", "main": "index.js",
"nodemonConfig": { "nodemonConfig": {
+2 -2
View File
@@ -62,11 +62,11 @@ module.exports = {
destination_dir = dir; destination_dir = dir;
} }
} }
const destination = lastDist > 500 ? `${destination_dir} of ${tempDest}` : tempDest; const destination = lastDist > 500 ? `${destination_dir} of ${tempDest}` : `Near ${tempDest}`;
let combatLog = new EmbedBuilder() let combatLog = new EmbedBuilder()
.setColor(client.config.Colors.Red) .setColor(client.config.Colors.Red)
.setDescription(`**NOTICE:**\n**${data.player}** has combat logged at <t:${unixTime}> when fighting **${data.lastHitBy}\nLocation [${data.pos[0]}, ${data.pos[1]}](https://www.izurvive.com/chernarusplussatmap/#location=${data.pos[0]};${data.pos[1]})**\nNear ${destination}`); .setDescription(`**NOTICE:**\n**${data.player}** has combat logged at <t:${unixTime}> when fighting **${data.lastHitBy}\nLocation [${data.pos[0]}, ${data.pos[1]}](https://www.izurvive.com/chernarusplussatmap/#location=${data.pos[0]};${data.pos[1]})**\n${destination}`);
if (client.exists(guild.adminRole)) channel.send({ content: `<@&${guild.adminRole}>` }); if (client.exists(guild.adminRole)) channel.send({ content: `<@&${guild.adminRole}>` });
+4 -4
View File
@@ -36,11 +36,11 @@ const HandlePlayerTrackEvent = async (client, guild, e) => {
destination_dir = dir; destination_dir = dir;
} }
} }
const destination = lastDist > 500 ? `${destination_dir} of ${tempDest}` : tempDest; const destination = lastDist > 500 ? `${destination_dir} of ${tempDest}` : `Near ${tempDest}`;
const trackEvent = new EmbedBuilder() const trackEvent = new EmbedBuilder()
.setColor(client.config.Colors.Default) .setColor(client.config.Colors.Default)
.setDescription(`**${e.name} Event**\n${e.gamertag} was located at **[${player.pos[0]}, ${player.pos[1]}](https://www.izurvive.com/chernarusplussatmap/#location=${player.pos[0]};${player.pos[1]})** at <t:${unixTime}>\nNear ${destination}`); .setDescription(`**${e.name} Event**\n${e.gamertag} was located at **[${player.pos[0]}, ${player.pos[1]}](https://www.izurvive.com/chernarusplussatmap/#location=${player.pos[0]};${player.pos[1]})** at <t:${unixTime}>\n${destination}`);
if (!client.exists(e.channel)) return ExpireEvent(client, guild, e); // Expire event since it has invalid channel. if (!client.exists(e.channel)) return ExpireEvent(client, guild, e); // Expire event since it has invalid channel.
const channel = client.GetChannel(e.channel); const channel = client.GetChannel(e.channel);
@@ -123,11 +123,11 @@ module.exports = {
destination_dir = dir; destination_dir = dir;
} }
} }
const destination = lastDist > 500 ? `${destination_dir} of ${tempDest}` : tempDest; const destination = lastDist > 500 ? `${destination_dir} of ${tempDest}` : `Near ${tempDest}`;
let uavEmbed = new EmbedBuilder() let uavEmbed = new EmbedBuilder()
.setColor(client.config.Colors.Default) .setColor(client.config.Colors.Default)
.setDescription(`**UAV Detection - <t:${unixTime}>**\n**${data.player}** was spotted in the UAV zone at **[${data.pos[0]}, ${data.pos[1]}](https://www.izurvive.com/chernarusplussatmap/#location=${data.pos[0]};${data.pos[1]})\nNear ${destination}**`) .setDescription(`**UAV Detection - <t:${unixTime}>**\n**${data.player}** was spotted in the UAV zone at **[${data.pos[0]}, ${data.pos[1]}](https://www.izurvive.com/chernarusplussatmap/#location=${data.pos[0]};${data.pos[1]})\n${destination}**`)
client.users.fetch(uav.owner, false).then((user) => { client.users.fetch(uav.owner, false).then((user) => {
user.send({ embeds: [uavEmbed] }); user.send({ embeds: [uavEmbed] });
+3 -3
View File
@@ -90,11 +90,11 @@ module.exports = {
} }
} }
const destination = lastDist > 500 ? `${destination_dir} of ${tempDest}` : tempDest; const destination = lastDist > 500 ? `${destination_dir} of ${tempDest}` : `Near ${tempDest}`;
if (killedBy == Templates.LandMine || killedBy == Templates.Explosion || killedBy == Templates.Vehicle) { if (killedBy == Templates.LandMine || killedBy == Templates.Explosion || killedBy == Templates.Vehicle) {
const cod = killedBy == Templates.LandMine ? `Land Mine Trap` : info.causeOfDeath; const cod = killedBy == Templates.LandMine ? `Land Mine Trap` : info.causeOfDeath;
const coord = showCoords ? `\n***Location [${info.victimPOS[0]}, ${info.victimPOS[1]}](https://www.izurvive.com/chernarusplussatmap/#location=${info.victimPOS[0]};${info.victimPOS[1]})***\nNear ${destination}` : ''; const coord = showCoords ? `\n***Location [${info.victimPOS[0]}, ${info.victimPOS[1]}](https://www.izurvive.com/chernarusplussatmap/#location=${info.victimPOS[0]};${info.victimPOS[1]})***\n${destination}` : '';
const killMessage = killedBy == Templates.Vehicle ? 'run over by' : 'blew up from'; const killMessage = killedBy == Templates.Vehicle ? 'run over by' : 'blew up from';
const killEvent = new EmbedBuilder() const killEvent = new EmbedBuilder()
@@ -184,7 +184,7 @@ module.exports = {
if (victimStatIndex == -1) stats.push(victimStat); if (victimStatIndex == -1) stats.push(victimStat);
else stats[victimStatIndex] = victimStat; else stats[victimStatIndex] = victimStat;
const coord = showCoords ? `\n***Location [${info.victimPOS[0]}, ${info.victimPOS[1]}](https://www.izurvive.com/chernarusplussatmap/#location=${info.victimPOS[0]};${info.victimPOS[1]})***\nNear ${destination}` : ''; const coord = showCoords ? `\n***Location [${info.victimPOS[0]}, ${info.victimPOS[1]}](https://www.izurvive.com/chernarusplussatmap/#location=${info.victimPOS[0]};${info.victimPOS[1]})***\n${destination}` : '';
const killEvent = new EmbedBuilder() const killEvent = new EmbedBuilder()
.setColor(client.config.Colors.Default) .setColor(client.config.Colors.Default)
+2 -2
View File
@@ -4,8 +4,8 @@ module.exports = {
let distance = parseFloat(Math.sqrt(Math.pow(delta[0], 2) + Math.pow(delta[1], 2)).toFixed(0)); let distance = parseFloat(Math.sqrt(Math.pow(delta[0], 2) + Math.pow(delta[1], 2)).toFixed(0));
let thetat = Math.round(Math.atan2(delta[0], delta[1]) / Math.PI * 180); let thetat = Math.round(Math.atan2(delta[0], delta[1]) / Math.PI * 180);
let theta = (thetat < 0) ? (360 + thetat) : thetat; let theta = (thetat < 0) ? (360 + thetat) : thetat;
let compass = ["S", "S.SW", "SW", "W.SW", "W", "W.NW", "NW", "N.NW", "N", "N.NE", "NE", "E.NE", "E", "E.SE", "SE", "S.SE", "S"]; let compass = ["S", "SW", "W", "NW", "N", "N by NE", "NE", "E", "SE", "S"];
let dir = compass[Math.round(theta / 22.5)]; let dir = compass[Math.round(theta / 45)];
return {distance, theta, dir} return {distance, theta, dir}
} }