diff --git a/app.js b/app.js index 2dbe7fb..6e8c968 100644 --- a/app.js +++ b/app.js @@ -39,6 +39,11 @@ io.on("connection", (socket) => { }); socket.on("buzzerPressed", (newUserName, newTimeStamp) => { + if (idkList.includes(newUserName)) { + const userIndex = idkList.indexOf(newUserName); + idkList.splice(userIndex, 1) + } + let firstBuzzTimeStamp = (function() { if (buzzInfo.length == 0) { return newTimeStamp diff --git a/audio/FECrit.wav b/audio/FECrit.wav new file mode 100644 index 0000000..1b2c87a Binary files /dev/null and b/audio/FECrit.wav differ diff --git a/audio/PKMNCherrim.wav b/audio/PKMNCherrim.wav new file mode 100644 index 0000000..d39dccf Binary files /dev/null and b/audio/PKMNCherrim.wav differ diff --git a/audio/RotTEatLead.wav b/audio/RotTEatLead.wav new file mode 100644 index 0000000..826a21b Binary files /dev/null and b/audio/RotTEatLead.wav differ diff --git a/audio/RotTHereCatch.wav b/audio/RotTHereCatch.wav new file mode 100644 index 0000000..7120c7b Binary files /dev/null and b/audio/RotTHereCatch.wav differ diff --git a/audio/UltiFinishZoom.wav b/audio/UltiFinishZoom.wav new file mode 100644 index 0000000..a15d92d Binary files /dev/null and b/audio/UltiFinishZoom.wav differ diff --git a/browserFunctions.js b/browserFunctions.js index 02c3234..2f94aba 100644 --- a/browserFunctions.js +++ b/browserFunctions.js @@ -73,7 +73,7 @@ function passToClient(teamName, soundOn) { let objectionSound = new Audio("AAObjection.wav"); function objectionToClient(userName) { - objectionSound.play(); + // objectionSound.play(); $("#objection").html("
"+userName+" is objecting!
"); } diff --git a/images/buzzers/FECrit.gif b/images/buzzers/FECrit.gif new file mode 100644 index 0000000..b003ead Binary files /dev/null and b/images/buzzers/FECrit.gif differ diff --git a/images/buzzers/FECrit.png b/images/buzzers/FECrit.png new file mode 100644 index 0000000..b565e21 Binary files /dev/null and b/images/buzzers/FECrit.png differ diff --git a/images/buzzers/PKMNCherrim.png b/images/buzzers/PKMNCherrim.png new file mode 100644 index 0000000..7b5bc47 Binary files /dev/null and b/images/buzzers/PKMNCherrim.png differ diff --git a/images/buzzers/RotTEatLead.png b/images/buzzers/RotTEatLead.png new file mode 100644 index 0000000..c56b69b Binary files /dev/null and b/images/buzzers/RotTEatLead.png differ diff --git a/images/buzzers/RotTHereCatch.png b/images/buzzers/RotTHereCatch.png new file mode 100644 index 0000000..c56b69b Binary files /dev/null and b/images/buzzers/RotTHereCatch.png differ diff --git a/images/buzzers/UltiFinishZoom.png b/images/buzzers/UltiFinishZoom.png new file mode 100644 index 0000000..97d2d99 Binary files /dev/null and b/images/buzzers/UltiFinishZoom.png differ diff --git a/pages/home.html b/pages/home.html index f948602..31769dc 100644 --- a/pages/home.html +++ b/pages/home.html @@ -1,7 +1,7 @@ - Submit Kuru Kuru Kururin to the chase ty + No, you do not need to mute this site anymore. diff --git a/pages/play.html b/pages/play.html index d46f20b..13819d3 100644 --- a/pages/play.html +++ b/pages/play.html @@ -1,7 +1,7 @@ - Submit Kuru Kuru Kururin to the chase ty + No, you do not need to mute this site anymore. @@ -15,7 +15,7 @@ let userName = queryString.searchParams.get("user"); $("#message").html("hi "+userName+" :]") let teamName = queryString.searchParams.get("team"); - let clientBuzzer = "Kirbeep";//this is mostly just used as a reference for if they have a special buzzer + let clientBuzzer = "BuzzinLiveBuzzer";//this is mostly just used as a reference for if they have a special buzzer let buzzerSoundsOn = false; let buzzerOptions = [ ["BuzzinLiveBuzzer"], @@ -31,7 +31,7 @@ ["Ooh"], ["Killer7Laugh"], ["TheNumberEight","TheNumberEight","TheNumberEight","TheNumberEight","TheNumberEight","TheNumberEight","TheNumberEight","TheNumberEight"], - ["Jiggluigibat","SaturnHonk","Kirbeep"], + ["Jiggluigibat","SaturnHonk","Kirbeep","UltiFinishZoom"], ["PikminThrow","Pikmin2LouieAMV","Pikmin2Olimar","Pikmin2President","Pikmin2Breadbug"], ["FF9Moogle"], ["MGSAlert"], @@ -40,7 +40,7 @@ ["SonicCheckpoint","SonicOhNo","SonicSusic"], ["EmergencyMeeting"], ["PdPSeren","TAFroggy","TAKamek"], - ["PKMNLvlUp"], + ["PKMNLvlUp","PKMNCherrim"], ["MMShakeShake"], ["AoEWololo"], ["P3Summon"], @@ -56,6 +56,8 @@ ["SourceNotification","SourceMedkit","SourceMeepMerp"], ["KHXBlade"], ["GTMissileArf","GTGhostMode"], + ["FECrit"], + ["RotTHereCatch"], ["Mystery"], ]; let specialBuzzers = { @@ -75,9 +77,10 @@ BubsyUhOh: ["BubsyUhOh","BubsyAwNuts","BubsyByeBye"], BubsyWhatCouldPawsiblyGoWrong: ["BubsyWhatCouldPawsiblyGoWrong","BubsyWhatCouldPawsiblyGoWrong","BubsyWhatCouldPawsiblyGoWrong","BubsyWhatCouldPawsiblyGoWrong","BubsyWhatCouldPawsiblyGoWrong","BubsyWhatCouldPawsiblyGoWrong","BubsyWhatCouldPawsiblyGoWrong","BubsyDoYouBelieveInMiracles"], BubsyCheckOutThatTime: ["BubsyCheckOutThatTime","BubsyGreatScore"], - BubsyMyContract: ["BubsyMyContract","BubsyIsThereAVeterinarian","BubsyIsTheWritersStrikeOver","BubsyIAmATrainedPurrfessional","BubsyAPyramidScheme","BubsyWhoWroteThisStuff","BubsyAreYouStillPlayin"] + BubsyMyContract: ["BubsyMyContract","BubsyIsThereAVeterinarian","BubsyIsTheWritersStrikeOver","BubsyIAmATrainedPurrfessional","BubsyAPyramidScheme","BubsyWhoWroteThisStuff","BubsyAreYouStillPlayin"], + RotTHereCatch: ["RotTHereCatch","RotTEatLead"], } - let animatedBuzzers = ["SF3KenParry","PlokCLEAR"]; + let animatedBuzzers = ["SF3KenParry","PlokCLEAR","FECrit"]; let buzzerOptionsCurrentRow = 0; let buzzerOptionsTotalRows = 4; function displayBuzzerOptions() { @@ -230,6 +233,8 @@ $("#contestAnswer").find("img").mousedown(function() { socket.emit("objectionToServer", userName); + let objectionSound = new Audio("AAObjection.wav"); + objectionSound.play(); }); $("#contestAnswer").find("img").hover( @@ -240,13 +245,13 @@ } ); - socket.on("objectionToClient", (userName) => { - objectionToClient(userName); - }); + // socket.on("objectionToClient", (userName) => { + // objectionToClient(userName); + // }); - socket.on("clearObjectionToClient", () => { - clearObjectionToClient(); - }); + // socket.on("clearObjectionToClient", () => { + // clearObjectionToClient(); + // }); window.secret = function() { console.log("Rrree Neurgh!!! :D") let reeeNeurgh = new Audio("LSRrreeNeurgh.wav"); @@ -284,7 +289,7 @@ You can also do this by pressing the I, D or K key.

-
+