diff --git a/README.md b/README.md index fafa1bbc..28b54634 100644 --- a/README.md +++ b/README.md @@ -1147,6 +1147,7 @@ here. * eggs-get-laid (Original Anime) * karen (Original Anime) * look-what-karen-have (Original Anime) + * soundboard (Ayaya Sound) - [KissClipart.com](https://www.kissclipart.com/) * hat ([Witch Hat Image](https://www.kissclipart.com/halloween-witch-hat-clipart-witch-hat-clip-art-qfycyt/)) - [Know Your Meme](https://knowyourmeme.com/) @@ -1227,6 +1228,8 @@ here. * just-do-it ([Original Motivational Speech](https://www.youtube.com/watch?v=ZXsQAXx_ao0)) - [muffinlabs - Today in History](http://history.muffinlabs.com/) * today-in-history ([API](http://history.muffinlabs.com/#api)) +- [Myinstants](https://www.myinstants.com/index/us/) + * soundboard ([Various Meme Sounds](https://www.myinstants.com/search/?name=meme)) - [Mythbusters](https://go.discovery.com/tv-shows/mythbusters) * doors (Concept) - [NASA](https://www.nasa.gov/) @@ -1342,8 +1345,6 @@ here. * cat (API) - [RandomFox](https://randomfox.ca/) * fox (API) -- [Re:ZERO -Starting Life in Another World-](http://re-zero-anime.jp/) - * soundboard (Subaru Ringtone Sound) - [Recipe Puppy](http://www.recipepuppy.com/) * recipe ([API](http://www.recipepuppy.com/about/api/)) - [RedBubble - Akbar Mna](https://www.redbubble.com/en/people/akbarmna/shop) @@ -1370,6 +1371,8 @@ here. * right-stuf (API) - [Riot Games](https://www.riotgames.com/en) * league-of-legends ([API](https://developer.riotgames.com/)) +- [Robret Henc](https://www.youtube.com/channel/UCYz0kLfJbdNHU9baJy6u68A) + * soundboard ([Subaru Ringtone Sound](https://www.youtube.com/watch?v=PEyKDgOTQi8)) - [RoboHash](https://robohash.org/) * robohash (API) - [Robotatertot](https://robotatertot.tumblr.com/) diff --git a/assets/json/soundboard.json b/assets/json/soundboard.json index e47a2494..1d090a71 100644 --- a/assets/json/soundboard.json +++ b/assets/json/soundboard.json @@ -1,5 +1,28 @@ [ + "alarm", + "ayaya", + "call-of-the-witch", + "car-crash", + "cat", + "cow", + "dun-dun-dun", + "electric-zoo", + "error", + "fbi-open-up", + "hello-there", + "here-we-go-again", + "laugh-track", + "my-swamp", "nipah", + "noot-noot", + "onee-chan", "pikachu", - "subaru ringtone" + "rooster", + "sad-violin", + "slow-clap", + "steve-hurt", + "subaru-ringtone", + "windows-start-up", + "you-got-mail", + "you-what" ] diff --git a/assets/sounds/soundboard/alarm.mp3 b/assets/sounds/soundboard/alarm.mp3 new file mode 100644 index 00000000..220b938b Binary files /dev/null and b/assets/sounds/soundboard/alarm.mp3 differ diff --git a/assets/sounds/soundboard/ayaya.mp3 b/assets/sounds/soundboard/ayaya.mp3 new file mode 100644 index 00000000..4c866d53 Binary files /dev/null and b/assets/sounds/soundboard/ayaya.mp3 differ diff --git a/assets/sounds/soundboard/call-of-the-witch.mp3 b/assets/sounds/soundboard/call-of-the-witch.mp3 new file mode 100644 index 00000000..bcf14404 Binary files /dev/null and b/assets/sounds/soundboard/call-of-the-witch.mp3 differ diff --git a/assets/sounds/soundboard/car-crash.mp3 b/assets/sounds/soundboard/car-crash.mp3 new file mode 100644 index 00000000..8d05ef42 Binary files /dev/null and b/assets/sounds/soundboard/car-crash.mp3 differ diff --git a/assets/sounds/soundboard/cat.mp3 b/assets/sounds/soundboard/cat.mp3 new file mode 100644 index 00000000..79484ed9 Binary files /dev/null and b/assets/sounds/soundboard/cat.mp3 differ diff --git a/assets/sounds/soundboard/cow.mp3 b/assets/sounds/soundboard/cow.mp3 new file mode 100644 index 00000000..cc47634a Binary files /dev/null and b/assets/sounds/soundboard/cow.mp3 differ diff --git a/assets/sounds/soundboard/dun-dun-dun.mp3 b/assets/sounds/soundboard/dun-dun-dun.mp3 new file mode 100644 index 00000000..c3037f8b Binary files /dev/null and b/assets/sounds/soundboard/dun-dun-dun.mp3 differ diff --git a/assets/sounds/soundboard/electric-zoo.mp3 b/assets/sounds/soundboard/electric-zoo.mp3 new file mode 100644 index 00000000..0e47659f Binary files /dev/null and b/assets/sounds/soundboard/electric-zoo.mp3 differ diff --git a/assets/sounds/soundboard/error.mp3 b/assets/sounds/soundboard/error.mp3 new file mode 100644 index 00000000..e2f8bd11 Binary files /dev/null and b/assets/sounds/soundboard/error.mp3 differ diff --git a/assets/sounds/soundboard/fbi-open-up.mp3 b/assets/sounds/soundboard/fbi-open-up.mp3 new file mode 100644 index 00000000..13678080 Binary files /dev/null and b/assets/sounds/soundboard/fbi-open-up.mp3 differ diff --git a/assets/sounds/soundboard/hello-there.mp3 b/assets/sounds/soundboard/hello-there.mp3 new file mode 100644 index 00000000..6e66fc4e Binary files /dev/null and b/assets/sounds/soundboard/hello-there.mp3 differ diff --git a/assets/sounds/soundboard/here-we-go-again.mp3 b/assets/sounds/soundboard/here-we-go-again.mp3 new file mode 100644 index 00000000..aa766cef Binary files /dev/null and b/assets/sounds/soundboard/here-we-go-again.mp3 differ diff --git a/assets/sounds/soundboard/laugh-track.mp3 b/assets/sounds/soundboard/laugh-track.mp3 new file mode 100644 index 00000000..270fdf3f Binary files /dev/null and b/assets/sounds/soundboard/laugh-track.mp3 differ diff --git a/assets/sounds/soundboard/my-swamp.mp3 b/assets/sounds/soundboard/my-swamp.mp3 new file mode 100644 index 00000000..d235a7cf Binary files /dev/null and b/assets/sounds/soundboard/my-swamp.mp3 differ diff --git a/assets/sounds/soundboard/noot-noot.mp3 b/assets/sounds/soundboard/noot-noot.mp3 new file mode 100644 index 00000000..f28e922f Binary files /dev/null and b/assets/sounds/soundboard/noot-noot.mp3 differ diff --git a/assets/sounds/soundboard/onee-chan.mp3 b/assets/sounds/soundboard/onee-chan.mp3 new file mode 100644 index 00000000..30fddf02 Binary files /dev/null and b/assets/sounds/soundboard/onee-chan.mp3 differ diff --git a/assets/sounds/soundboard/rooster.mp3 b/assets/sounds/soundboard/rooster.mp3 new file mode 100644 index 00000000..b6bca9a5 Binary files /dev/null and b/assets/sounds/soundboard/rooster.mp3 differ diff --git a/assets/sounds/soundboard/sad-violin.mp3 b/assets/sounds/soundboard/sad-violin.mp3 new file mode 100644 index 00000000..4571a9aa Binary files /dev/null and b/assets/sounds/soundboard/sad-violin.mp3 differ diff --git a/assets/sounds/soundboard/slow-clap.mp3 b/assets/sounds/soundboard/slow-clap.mp3 new file mode 100644 index 00000000..2ecc2531 Binary files /dev/null and b/assets/sounds/soundboard/slow-clap.mp3 differ diff --git a/assets/sounds/soundboard/steve-hurt.mp3 b/assets/sounds/soundboard/steve-hurt.mp3 new file mode 100644 index 00000000..38b346bd Binary files /dev/null and b/assets/sounds/soundboard/steve-hurt.mp3 differ diff --git a/assets/sounds/soundboard/subaru ringtone.mp3 b/assets/sounds/soundboard/subaru-ringtone.mp3 similarity index 100% rename from assets/sounds/soundboard/subaru ringtone.mp3 rename to assets/sounds/soundboard/subaru-ringtone.mp3 diff --git a/assets/sounds/soundboard/windows-start-up.mp3 b/assets/sounds/soundboard/windows-start-up.mp3 new file mode 100644 index 00000000..9eb017fa Binary files /dev/null and b/assets/sounds/soundboard/windows-start-up.mp3 differ diff --git a/assets/sounds/soundboard/you-got-mail.mp3 b/assets/sounds/soundboard/you-got-mail.mp3 new file mode 100644 index 00000000..eb7e686c Binary files /dev/null and b/assets/sounds/soundboard/you-got-mail.mp3 differ diff --git a/assets/sounds/soundboard/you-what.mp3 b/assets/sounds/soundboard/you-what.mp3 new file mode 100644 index 00000000..4cdfe771 Binary files /dev/null and b/assets/sounds/soundboard/you-what.mp3 differ diff --git a/commands/voice/soundboard.js b/commands/voice/soundboard.js index 46fd918b..0054e5c6 100644 --- a/commands/voice/soundboard.js +++ b/commands/voice/soundboard.js @@ -29,9 +29,21 @@ module.exports = class SoundboardCommand extends Command { reason: 'Nipah Sound' }, { - name: 'Re:ZERO -Starting Life in Another World-', - url: 'http://re-zero-anime.jp/', - reason: 'Subaru Ringtone Sound' + name: 'KINMOZA!', + url: 'http://www.kinmosa.com/', + reason: 'Ayaya Sound' + }, + { + name: 'Robret Henc', + url: 'https://www.youtube.com/channel/UCYz0kLfJbdNHU9baJy6u68A', + reason: 'Subaru Ringtone Sound', + reasonURL: 'https://www.youtube.com/watch?v=PEyKDgOTQi8' + }, + { + name: 'Myinstants', + url: 'https://www.myinstants.com/index/us/', + reason: 'Various Meme Sounds', + reasonURL: 'https://www.myinstants.com/search/?name=meme' } ], args: [ @@ -39,8 +51,11 @@ module.exports = class SoundboardCommand extends Command { key: 'sound', prompt: `What sound do you want to play? Either ${list(sounds, 'or')}.`, type: 'string', - default: () => `${sounds[Math.floor(Math.random() * sounds.length)]}.mp3`, - oneOf: sounds, + validate: sound => { + const choice = sound.toLowerCase().replace(/ /g, '-'); + if (sounds.includes(choice)) return true; + return `You provided an invalid sound. Please choose either ${list(sounds, 'or')}.`; + }, parse: sound => `${sound.toLowerCase()}.mp3` } ] diff --git a/package.json b/package.json index c2611f92..6a00db0d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiao", - "version": "116.26.0", + "version": "116.27.0", "description": "Your personal server companion.", "main": "Xiao.js", "scripts": {