embee/woomy-v2
1
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

changes for eris + new loading UX

Browse source
This commit is contained in:
Emily 2021-07-17 15:55:18 +10:00
parent 9231fcc671
commit 022ec6b999
18 changed files with 84 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

12
bot/commands/Splatoon/salmonrun.js
View file

@ -33,18 +33,18 @@ module.exports = class {
if ((json.details[0].start_time * 1000) > Date.now() === true) {
embeds.push(
new client.RichEmbed()
new client.MessageEmbed()
.setTitle('Upcoming Salmon Run')
.setColour(client.functions.displayHexColour(message.guild))
.setColor(client.functions.embedColor(message.guild))
.setImage('https://splatoon2.ink/assets/splatnet/'+json.details[0].stage.image)
.addField('Map', json.details[0].stage.name, true)
.setFooter(`Starting in ${prettifyMiliseconds(json.details[0].start_time * 1000 - Date.now(), { secondsDecimalDigits: 0 })} | Data provided by splatoon2.ink`)
);
} else {
embeds.push(
new client.RichEmbed()
new client.MessageEmbed()
.setTitle('Current Salmon Run')
.setColour(client.functions.displayHexColour(message.guild))
.setColor(client.functions.embedColor(message.guild))
.setThumbnail('https://splatoon2.ink/assets/splatnet'+timelineJson.coop.reward_gear.gear.image)
.setImage('https://splatoon2.ink/assets/splatnet/'+json.details[0].stage.image)
.addField('Map', json.details[0].stage.name, true)
@ -55,9 +55,9 @@ module.exports = class {
}
embeds.push(
new client.RichEmbed()
new client.MessageEmbed()
.setTitle('Upcoming Salmon Run')
.setColour(client.functions.displayHexColour(message.guild))
.setColor(client.functions.embedColor(message.guild))
.setImage('https://splatoon2.ink/assets/splatnet/'+json.details[1].stage.image)
.addField('Map', json.details[1].stage.name, true)
.addField('Weapons', json.details[1].weapons[1].weapon.name+', '+json.details[1].weapons[1].weapon.name+', '+json.details[1].weapons[2].weapon.name+', '+json.details[1].weapons[3].weapon.name)

4
bot/commands/Splatoon/splatnet.js
View file

@ -28,10 +28,10 @@ module.exports = class {
const embeds = [];
for ( let i = 0; i < json.merchandises.length; i++ ) {
const embed = new client.RichEmbed()
const embed = new client.MessageEmbed()
.setTitle(json.merchandises[i].gear.name)
.setThumbnail('https://splatoon2.ink/assets/splatnet' + json.merchandises[i].gear.image)
.setColour(client.functions.displayHexColour(message.guild))
.setColor(client.functions.embedColor(message.guild))
.addField('Price', (json.merchandises[i].price).toString(), true)
.addField('Brand', json.merchandises[i].gear.brand.name, true)
.addField('Ability Slots', (json.merchandises[i].gear.rarity + 1).toString(), true)

8
bot/commands/Splatoon/splatoonmaps.js
View file

@ -27,9 +27,9 @@ module.exports = class {
.then(json => {
const embeds = [
new client.RichEmbed()
new client.MessageEmbed()
.setTitle('Current Splatoon 2 Maps')
.setColour(client.functions.displayHexColour(message.guild))
.setColor(client.functions.embedColor(message.guild))
.addField('<:turf_war:814651383911153692> Turf War', `${json.regular[0].stage_a.name}\n${json.regular[0].stage_b.name}`, true)
.addField(`<:ranked:814651402479468544> Ranked: ${json.gachi[0].rule.name}`, `${json.gachi[0].stage_a.name}\n${json.gachi[0].stage_b.name}`, true)
.addField(`<:league:814651415409590363> League: ${json.league[0].rule.name}`, `${json.league[0].stage_a.name}\n${json.league[0].stage_b.name}`, true)
@ -37,9 +37,9 @@ module.exports = class {
];
for ( let i = 1; i < json.regular.length; i++ ) {
const embed = new client.RichEmbed()
const embed = new client.MessageEmbed()
.setTitle('Upcoming Splatoon 2 Maps')
.setColour(client.functions.displayHexColour(message.guild))
.setColor(client.functions.embedColor(message.guild))
.addField('<:turf_war:814651383911153692> Turf War', `${json.regular[i].stage_a.name}\n${json.regular[i].stage_b.name}`, true)
.addField(`<:ranked:814651402479468544> Ranked: ${json.gachi[i].rule.name}`, `${json.gachi[i].stage_a.name}\n${json.gachi[i].stage_b.name}`, true)
.addField(`<:league:814651415409590363> League: ${json.league[i].rule.name}`, `${json.league[i].stage_a.name}\n${json.league[i].stage_b.name}`, true)