Update Sounds

commands/games-sp/whos-that-pokemon.js

@@ -25,6 +25,11 @@ module.exports = class WhosThatPokemonCommand extends Command {
 					url: 'https://www.pokemon.com/us/',
 					reason: 'Images, Original Game'
 				},
+				{
+					name: '4Kids',
+					url: 'https://www.4kidsentertainmentinc.com/',
+					reason: '"Who\'s That Pokémon?" Sound'
+				},
 				{
 					name: 'PokéAPI',
 					url: 'https://pokeapi.co/',

commands/voice/soundboard.js

@@ -2,6 +2,7 @@ const Command = require('../../structures/Command');
 const path = require('path');
 const { list, reactIfAble } = require('../../util/Util');
 const sounds = require('../../assets/json/soundboard');
+const soundsChoice = sounds.map(sound => sound[sounds.length - 1].replace(/\.mp3$/, ''));
 
 module.exports = class SoundboardCommand extends Command {
 	constructor(client) {
@@ -18,45 +19,93 @@ module.exports = class SoundboardCommand extends Command {
 			},
 			userPermissions: ['CONNECT', 'SPEAK'],
 			credit: [
-				{
-					name: 'Pokémon',
-					url: 'https://www.pokemon.com/us/',
-					reason: 'Pikachu Sound'
-				},
 				{
 					name: '07th Expansion',
 					url: 'http://07th-expansion.net/',
 					reason: 'Nipah Sound'
 				},
 				{
-					name: 'KINMOZA!',
-					url: 'http://www.kinmosa.com/',
-					reason: 'Ayaya Sound'
+					name: 'UncleKornicob',
+					url: 'http://soundbible.com/',
+					reason: 'Alarm Sound',
+					reasonURL: 'http://soundbible.com/1787-Annoying-Alarm-Clock.html'
 				},
 				{
-					name: 'Robret Henc',
-					url: 'https://www.youtube.com/channel/UCYz0kLfJbdNHU9baJy6u68A',
-					reason: 'Subaru Ringtone Sound',
-					reasonURL: 'https://www.youtube.com/watch?v=PEyKDgOTQi8'
+					name: 'Mike Koenig',
+					url: 'http://soundbible.com/',
+					reason: 'Rooster Sound',
+					reasonURL: 'http://soundbible.com/1218-Rooster-Crow.html'
 				},
 				{
-					name: 'Myinstants',
-					url: 'https://www.myinstants.com/index/us/',
-					reason: 'Various Meme Sounds',
-					reasonURL: 'https://www.myinstants.com/search/?name=meme'
+					name: 'Mike Koenig',
+					url: 'http://soundbible.com/',
+					reason: 'Cow Sound',
+					reasonURL: 'http://soundbible.com/1778-Cow-Moo.html'
+				},
+				{
+					name: 'Cam Martinez',
+					url: 'http://soundbible.com/',
+					reason: 'Car Crash Sound',
+					reasonURL: 'http://soundbible.com/1757-Car-Brake-Crash.html'
+				},
+				{
+					name: 'Orange Free Sounds',
+					url: 'http://www.orangefreesounds.com/',
+					reason: 'Dun Dun Dun Sound',
+					reasonURL: 'http://www.orangefreesounds.com/dun-dun-dun-sound-effect-brass/'
+				},
+				{
+					name: 'Apple',
+					url: 'https://www.apple.com/',
+					reason: 'Cat Sound'
+				},
+				{
+					name: 'GRSites',
+					url: 'http://www.grsites.com/',
+					reason: 'Laugh Track Sound',
+					reasonURL: 'http://www.grsites.com/archive/sounds/category/8/'
+				},
+				{
+					name: 'Jeopardy',
+					url: 'https://www.jeopardy.com/',
+					reason: 'Jeopardy Sound'
+				},
+				{
+					name: '4Kids',
+					url: 'https://www.4kidsentertainmentinc.com/',
+					reason: 'Who\'s That Pokémon Sound'
+				},
+				{
+					name: 'Over the Green Fields',
+					url: 'https://asianwiki.com/Over_the_Green_Fields',
+					reason: 'Sad Violin Sound'
+				},
+				{
+					name: 'Valve',
+					url: 'https://www.valvesoftware.com/en/',
+					reasonURL: 'http://www.thinkwithportals.com/',
+					reason: 'Slow Clap Sound'
+				},
+				{
+					name: 'Microsoft',
+					url: 'https://www.microsoft.com/en-us',
+					reason: 'Windows Start Up Sound'
 				}
 			],
 			args: [
 				{
 					key: 'sound',
-					prompt: `What sound do you want to play? Either ${list(sounds, 'or')}.`,
+					prompt: `What sound do you want to play? Either ${list(soundsChoice, 'or')}.`,
 					type: 'string',
 					validate: sound => {
 						const choice = sound.toLowerCase().replaceAll(' ', '-');
-						if (sounds.includes(choice)) return true;
-						return `You provided an invalid sound. Please choose either ${list(sounds, 'or')}.`;
+						if (soundsChoice.includes(choice)) return true;
+						return `You provided an invalid sound. Please choose either ${list(soundsChoice, 'or')}.`;
 					},
-					parse: sound => `${sound.toLowerCase().replaceAll(' ', '-')}.mp3`
+					parse: sound => {
+						const choice = sound.toLowerCase().replaceAll(' ', '-');
+						return sounds.find(snd => snd.includes(`${choice}.mp3`));
+					}
 				}
 			]
 		});
@@ -68,7 +117,7 @@ module.exports = class SoundboardCommand extends Command {
 			const usage = this.client.registry.commands.get('join').usage();
 			return msg.reply(`I am not in a voice channel. Use ${usage} to fix that!`);
 		}
-		connection.play(path.join(__dirname, '..', '..', 'assets', 'sounds', 'soundboard', sound));
+		connection.play(path.join(__dirname, '..', '..', 'assets', 'sounds', ...sound));
 		await reactIfAble(msg, this.client.user, '🔉');
 		return null;
 	}