diff --git a/conf/funfacts b/conf/funfacts index 0e0bd93..b21fd5b 100755 --- a/conf/funfacts +++ b/conf/funfacts @@ -12,7 +12,6 @@ Peanuts are one of the ingredients of dynamite. The average chocolate bar has 8 insects' legs in it. In York, it is perfectly legal to shoot a Scotsman with a bow and arrow (except on Sundays). No piece of square dry paper can be folded in half more than 7 times -The average human eats 8 spiders in their lifetime at night. "Stewardesses" is the longest word typed with only the left hand. An average human loses about 200 head hairs per day. Mexico City sinks about 10 inches a year. @@ -961,7 +960,7 @@ In the 1980's American migraines increased by 60%. Poland is the "stolen car capital of the world". Jefferson invented the dumbwaiter, the monetary system, and the folding attic ladder. The S in Harry S. Truman did not stand for anything. -In Miconesia, coins are 12 feet across. +In Micronesia, coins are 12 feet across. A horse can look forward with one eye and back with the other. Shakespeare is quoted 33,150 times in the Oxford English dictionary. The word Pennsylvania is misspelled on the Liberty Bell. diff --git a/conf/ghbot.abcomg b/conf/ghbot.abcomg index f27ba7d..38596ee 100755 --- a/conf/ghbot.abcomg +++ b/conf/ghbot.abcomg @@ -1 +1 @@ -[{"Command":"!flavor","Permission":"Everyone","Info":"","Response":"All braise be to our Lord and Savior, Flavor!","CD":1,"Enabled":true,"Count":0,"UCD":1,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!stopit","Permission":"Everyone","Info":"","Response":"https://youtu.be/Ow0lr63y4Mw?t=6","CD":1,"Enabled":true,"Count":0,"UCD":1,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!nevergiveup","Permission":"Everyone","Info":"","Response":"https://www.youtube.com/watch?v=KxGRhd_iWuE","CD":1,"Enabled":true,"Count":0,"UCD":1,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!rip","Permission":"Everyone","Info":"","Response":"https://youtu.be/F-glHAzXi_M","CD":1,"Enabled":true,"Count":0,"UCD":1,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!ff4battle","Permission":"Everyone","Info":"","Response":"https://www.youtube.com/watch?v=__-NKgcRM2c","CD":1,"Enabled":true,"Count":0,"UCD":1,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!castlegiant","Permission":"Everyone","Info":"","Response":"https://www.twitch.tv/videos/61654438?t=06m20s","CD":0,"Enabled":true,"Count":0,"UCD":0,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!dash","Permission":"Everyone","Info":"","Response":"DASH!!! https://www.twitch.tv/videos/46709456","CD":0,"Enabled":true,"Count":0,"UCD":0,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!imdabes","Permission":"Everyone","Info":"","Response":"IM DA BES: https://www.youtube.com/watch?v=ZVUyyHYkBHk","CD":0,"Enabled":true,"Count":0,"UCD":0,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!dancebetch","Permission":"Everyone","Info":"","Response":"https://clips.twitch.tv/EsteemedIncredulousBaguetteTBTacoRight","CD":0,"Enabled":true,"Count":0,"UCD":0,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!rollindeep","Permission":"Everyone","Info":"","Response":"dear gods, that \"rollin' deep\" sounds like someone trying to be hip and failing worse than a dad joke mixed with an adult trying to be hip and \"with it\" to their high school aged children.","CD":1,"Enabled":true,"Count":0,"UCD":1,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!discord","Permission":"Everyone","Info":"","Response":"The Curing Chamber Discord: https://discord.gg/tDtyBss","CD":1,"Enabled":true,"Count":0,"UCD":1,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!twitter","Permission":"Everyone","Info":"","Response":"https://twitter.com/greenhamSRL","CD":1,"Enabled":true,"Count":0,"UCD":1,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!youtube","Permission":"Everyone","Info":"","Response":"https://www.youtube.com/channel/UC83WD1NtGDC54c7210BsuBQ","CD":1,"Enabled":true,"Count":0,"UCD":1,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!undressme","Permission":"Everyone","Info":"","Response":"https://clips.twitch.tv/LitigiousCooperativeKeyboardBloodTrail","CD":1,"Enabled":true,"Count":0,"UCD":1,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!donger","Permission":"Everyone","Info":"","Response":"ヽ༼ຈل͜ຈ༽ﾉ","CD":1,"Enabled":true,"Count":0,"UCD":0,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!cleveland","Permission":"Everyone","Info":"","Response":"https://www.youtube.com/watch?v=ysmLA5TqbIY","CD":0,"Enabled":true,"Count":0,"UCD":0,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!nrg","Permission":"Everyone","Info":"","Response":"༼ つ ◕_◕ ༽つ STRIMMER TAKE MY ENERGY ༼ つ ◕_◕ ༽つ","CD":0,"Enabled":true,"Count":0,"UCD":0,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!late","Permission":"Everyone","Info":"","Response":"https://www.youtube.com/watch?v=wBqM2ytqHY4","CD":0,"Enabled":true,"Count":0,"UCD":0,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!store","Permission":"Everyone","Info":"","Response":"https://www.youtube.com/watch?v=iRZ2Sh5-XuM","CD":0,"Enabled":true,"Count":0,"UCD":0,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!slut","Permission":"Everyone","Info":"","Response":"@i_smoke_meth_daily69 HeyGuys","CD":0,"Enabled":true,"Count":0,"UCD":0,"Usage":"TC","Group":"DEFAULT","Cost":0},{"Command":"!antipb","Permission":"Everyone","Info":"","Response":"https://www.twitch.tv/videos/49126397","CD":1,"Enabled":true,"Count":0,"UCD":1,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!rboroutes","Permission":"Everyone","Info":"","Response":"Testing New Route w/New PW: https://docs.google.com/spreadsheets/d/1sPr5b_1vlrg65txCtiFiyDSmtbjBsjotJ5cbtJ3iQP0/edit?usp=sharing","CD":0,"Enabled":true,"Count":0,"UCD":0,"Usage":"TC","Group":"DEFAULT","Cost":0},{"Command":"!100mgroute","Permission":"Everyone","Info":"","Response":"https://docs.google.com/spreadsheets/d/1SD3Nzjc5tIes3Kw5uFnzke89gDxJeq02tvOSKfykd10/edit?usp=sharing","CD":0,"Enabled":true,"Count":0,"UCD":0,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!celeryman","Permission":"Everyone","Info":"","Response":"https://www.youtube.com/watch?v=maAFcEU6atk","CD":0,"Enabled":true,"Count":0,"UCD":0,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!muttwalksin","Permission":"Everyone","Info":"","Response":"https://clips.twitch.tv/PhilanthropicClearCourgetteSoonerLater","CD":0,"Enabled":true,"Count":0,"UCD":0,"Usage":"TC","Group":"DEFAULT","Cost":0}] \ No newline at end of file +[{"Command":"!flavor","Permission":"Everyone","Info":"","Response":"All braise be to our Lord and Savior, Flavor!","CD":1,"Enabled":true,"Count":0,"UCD":1,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!stopit","Permission":"Everyone","Info":"","Response":"https://youtu.be/Ow0lr63y4Mw?t=6","CD":1,"Enabled":true,"Count":0,"UCD":1,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!nevergiveup","Permission":"Everyone","Info":"","Response":"https://www.youtube.com/watch?v=KxGRhd_iWuE","CD":1,"Enabled":true,"Count":0,"UCD":1,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!rip","Permission":"Everyone","Info":"","Response":"https://youtu.be/F-glHAzXi_M","CD":1,"Enabled":true,"Count":0,"UCD":1,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!ff4battle","Permission":"Everyone","Info":"","Response":"https://www.youtube.com/watch?v=__-NKgcRM2c","CD":1,"Enabled":true,"Count":0,"UCD":1,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!castlegiant","Permission":"Everyone","Info":"","Response":"https://youtu.be/VV1kd7Fx8Uk?t=1431","CD":0,"Enabled":true,"Count":0,"UCD":0,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!dash","Permission":"Everyone","Info":"","Response":"DASH!!! https://www.twitch.tv/videos/46709456","CD":0,"Enabled":true,"Count":0,"UCD":0,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!imdabes","Permission":"Everyone","Info":"","Response":"IM DA BES: https://www.youtube.com/watch?v=ZVUyyHYkBHk","CD":0,"Enabled":true,"Count":0,"UCD":0,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!dancebetch","Permission":"Everyone","Info":"","Response":"https://clips.twitch.tv/EsteemedIncredulousBaguetteTBTacoRight","CD":0,"Enabled":true,"Count":0,"UCD":0,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!rollindeep","Permission":"Everyone","Info":"","Response":"dear gods, that \"rollin' deep\" sounds like someone trying to be hip and failing worse than a dad joke mixed with an adult trying to be hip and \"with it\" to their high school aged children.","CD":1,"Enabled":true,"Count":0,"UCD":1,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!discord","Permission":"Everyone","Info":"","Response":"The Curing Chamber Discord: https://discord.gg/tDtyBss","CD":1,"Enabled":true,"Count":0,"UCD":1,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!twitter","Permission":"Everyone","Info":"","Response":"https://twitter.com/greenhamSRL","CD":1,"Enabled":true,"Count":0,"UCD":1,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!youtube","Permission":"Everyone","Info":"","Response":"https://www.youtube.com/channel/UC83WD1NtGDC54c7210BsuBQ","CD":1,"Enabled":true,"Count":0,"UCD":1,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!undressme","Permission":"Everyone","Info":"","Response":"https://clips.twitch.tv/LitigiousCooperativeKeyboardBloodTrail","CD":1,"Enabled":true,"Count":0,"UCD":1,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!donger","Permission":"Everyone","Info":"","Response":"ヽ༼ຈل͜ຈ༽ﾉ","CD":1,"Enabled":true,"Count":0,"UCD":0,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!cleveland","Permission":"Everyone","Info":"","Response":"https://www.youtube.com/watch?v=ysmLA5TqbIY","CD":0,"Enabled":true,"Count":0,"UCD":0,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!nrg","Permission":"Everyone","Info":"","Response":"༼ つ ◕_◕ ༽つ STRIMMER TAKE MY ENERGY ༼ つ ◕_◕ ༽つ","CD":0,"Enabled":true,"Count":0,"UCD":0,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!late","Permission":"Everyone","Info":"","Response":"https://www.youtube.com/watch?v=wBqM2ytqHY4","CD":0,"Enabled":true,"Count":0,"UCD":0,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!store","Permission":"Everyone","Info":"","Response":"https://www.youtube.com/watch?v=iRZ2Sh5-XuM","CD":0,"Enabled":true,"Count":0,"UCD":0,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!slut","Permission":"Everyone","Info":"","Response":"@i_smoke_meth_daily69 HeyGuys","CD":0,"Enabled":true,"Count":0,"UCD":0,"Usage":"TC","Group":"DEFAULT","Cost":0},{"Command":"!antipb","Permission":"Everyone","Info":"","Response":"https://www.twitch.tv/videos/49126397","CD":1,"Enabled":true,"Count":0,"UCD":1,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!rboroutes","Permission":"Everyone","Info":"","Response":"Testing New Route w/New PW: https://docs.google.com/spreadsheets/d/1sPr5b_1vlrg65txCtiFiyDSmtbjBsjotJ5cbtJ3iQP0/edit?usp=sharing","CD":0,"Enabled":true,"Count":0,"UCD":0,"Usage":"TC","Group":"DEFAULT","Cost":0},{"Command":"!100mgroute","Permission":"Everyone","Info":"","Response":"https://docs.google.com/spreadsheets/d/1SD3Nzjc5tIes3Kw5uFnzke89gDxJeq02tvOSKfykd10/edit?usp=sharing","CD":0,"Enabled":true,"Count":0,"UCD":0,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!celeryman","Permission":"Everyone","Info":"","Response":"https://www.youtube.com/watch?v=maAFcEU6atk","CD":0,"Enabled":true,"Count":0,"UCD":0,"Usage":"A","Group":"DEFAULT","Cost":0},{"Command":"!muttwalksin","Permission":"Everyone","Info":"","Response":"https://clips.twitch.tv/PhilanthropicClearCourgetteSoonerLater","CD":0,"Enabled":true,"Count":0,"UCD":0,"Usage":"TC","Group":"DEFAULT","Cost":0}] \ No newline at end of file diff --git a/conf/hamfacts b/conf/hamfacts index 63faab2..89ef9a4 100755 --- a/conf/hamfacts +++ b/conf/hamfacts @@ -7,4 +7,5 @@ The Hormel Company of Austin, Minnesota sold the first canned ham in 1926. Chicago artist Dwight Kalb made a statue of Madonna from 180 pounds of ham. A ham is the rear leg of a hog, usually preserved by salting, smoking or drying, or a combination of these methods. Fresh hams are also available. In the U.S. pork shoulders are frequently processed into hams and marketed as picnic hams, shoulder hams, etc. Ham is one of the oldest meats of civilized man, although Larousse Gastronomique claims that the salting and smoking of pork to produce ham is a French invention. -Mainz ham is a German ham that is brined, soaked in brandy or wine lees (or a mixture of both) and then smoked for a long period. \ No newline at end of file +Mainz ham is a German ham that is brined, soaked in brandy or wine lees (or a mixture of both) and then smoked for a long period. +tbham is the most arrogant fucking slimeball on twitch (fact not confirmed, source: Muttski) \ No newline at end of file diff --git a/conf/text_commands b/conf/text_commands index 3debe68..dbaa6ec 100755 --- a/conf/text_commands +++ b/conf/text_commands @@ -1 +1,4 @@ -f|is for :frog: \ No newline at end of file +f|is for :frog: +ladeda|https://www.youtube.com/watch?v=V0HCZ4YGqbw +fine,ez,steve|https://www.youtube.com/watch?v=_c1NJQ0UP_Q +popsicle,popsicles|https://clips.twitch.tv/FrigidTardyNoodleKappaRoss \ No newline at end of file diff --git a/main.js b/main.js index abcb096..c90613b 100755 --- a/main.js +++ b/main.js @@ -147,7 +147,7 @@ client.on('ready', () => { if (!msg.content.startsWith(config.prefix)) return; // And that it's not on cooldown - let cooldownKey = msg.content + msg.channel.id; + let cooldownKey = config.botName + msg.content + msg.channel.id; cooldowns.get(cooldownKey, config.textCmdCooldown) .then(onCooldown => { if (onCooldown === false) { diff --git a/sfx/byeb.mp3 b/sfx/byeb.mp3 new file mode 100755 index 0000000..c6e1c1f Binary files /dev/null and b/sfx/byeb.mp3 differ diff --git a/sfx/deebslaugh.mp3 b/sfx/deebslaugh.mp3 new file mode 100755 index 0000000..c8d2bd6 Binary files /dev/null and b/sfx/deebslaugh.mp3 differ diff --git a/sfx/diaper.mp3 b/sfx/diaper.mp3 new file mode 100755 index 0000000..f65f3de Binary files /dev/null and b/sfx/diaper.mp3 differ diff --git a/sfx/ffob.mp3 b/sfx/ffob.mp3 old mode 100644 new mode 100755 index b5466b6..a076330 Binary files a/sfx/ffob.mp3 and b/sfx/ffob.mp3 differ diff --git a/sfx/hamlaugh.mp3 b/sfx/hamlaugh.mp3 new file mode 100755 index 0000000..fd5ccc9 Binary files /dev/null and b/sfx/hamlaugh.mp3 differ diff --git a/sfx/hellway.mp3 b/sfx/hellway.mp3 old mode 100644 new mode 100755 index 20d1fc7..e8b9f37 Binary files a/sfx/hellway.mp3 and b/sfx/hellway.mp3 differ diff --git a/sfx/joshgoat.mp3 b/sfx/joshgoat.mp3 new file mode 100755 index 0000000..c4eaa73 Binary files /dev/null and b/sfx/joshgoat.mp3 differ diff --git a/sfx/joshlaugh3.mp3 b/sfx/joshlaugh3.mp3 new file mode 100755 index 0000000..94442c2 Binary files /dev/null and b/sfx/joshlaugh3.mp3 differ diff --git a/sfx/joshwhinny.mp3 b/sfx/joshwhinny.mp3 index 254dbc1..6f5918a 100755 Binary files a/sfx/joshwhinny.mp3 and b/sfx/joshwhinny.mp3 differ diff --git a/sfx/laugh2.mp3 b/sfx/laugh2.mp3 index dc38388..5e1c480 100755 Binary files a/sfx/laugh2.mp3 and b/sfx/laugh2.mp3 differ diff --git a/sfx/mcgasm.mp3 b/sfx/mcgasm.mp3 old mode 100644 new mode 100755 index f8c9def..e8d790c Binary files a/sfx/mcgasm.mp3 and b/sfx/mcgasm.mp3 differ diff --git a/sfx/meme.mp3 b/sfx/meme.mp3 new file mode 100755 index 0000000..5b58a56 Binary files /dev/null and b/sfx/meme.mp3 differ diff --git a/sfx/muttlaugh.mp3 b/sfx/muttlaugh.mp3 index e7fae81..b300eb0 100755 Binary files a/sfx/muttlaugh.mp3 and b/sfx/muttlaugh.mp3 differ diff --git a/sfx/nerd.mp3 b/sfx/nerd.mp3 new file mode 100755 index 0000000..6c72e3e Binary files /dev/null and b/sfx/nerd.mp3 differ diff --git a/sfx/rake.mp3 b/sfx/rake.mp3 new file mode 100755 index 0000000..a1c902f Binary files /dev/null and b/sfx/rake.mp3 differ diff --git a/sfx/stahp.mp3 b/sfx/stahp.mp3 new file mode 100755 index 0000000..68d4e5c Binary files /dev/null and b/sfx/stahp.mp3 differ diff --git a/sfx/tootski.mp3 b/sfx/tootski.mp3 new file mode 100755 index 0000000..f808776 Binary files /dev/null and b/sfx/tootski.mp3 differ