diff --git a/audio/BMYoSun.wav b/audio/BMYoSun.wav index 9240dc4..05a369e 100644 Binary files a/audio/BMYoSun.wav and b/audio/BMYoSun.wav differ diff --git a/audio/DeltaruneChaosChaos.wav b/audio/DeltaruneChaosChaos.wav new file mode 100644 index 0000000..18577d9 Binary files /dev/null and b/audio/DeltaruneChaosChaos.wav differ diff --git a/audio/DeltaruneICanDoAnything.wav b/audio/DeltaruneICanDoAnything.wav new file mode 100644 index 0000000..5c1264f Binary files /dev/null and b/audio/DeltaruneICanDoAnything.wav differ diff --git a/audio/SF3KenParry.wav b/audio/SF3KenParry.wav new file mode 100644 index 0000000..e672c3b Binary files /dev/null and b/audio/SF3KenParry.wav differ diff --git a/audio/SFBrazil.wav b/audio/SFBrazil.wav new file mode 100644 index 0000000..1c481f9 Binary files /dev/null and b/audio/SFBrazil.wav differ diff --git a/browserFunctions.js b/browserFunctions.js index a25cf23..4c3411c 100644 --- a/browserFunctions.js +++ b/browserFunctions.js @@ -1,7 +1,6 @@ function userInfoToClient(userInfo) { for (const user in userInfo) { const userId = user.replaceAll(" ","_"); - console.log($("#userListPanel").find("#"+userId)); if ($("#userListPanel").find("#"+userId).length >= 1) { //update buzzer icon of existing user $("#userListPanel").find("#"+userId).find("img").attr("data-buzzerId",userInfo[user].buzzerId); diff --git a/images/buzzers/DeltaruneChaosChaos.png b/images/buzzers/DeltaruneChaosChaos.png new file mode 100644 index 0000000..f51d4ca Binary files /dev/null and b/images/buzzers/DeltaruneChaosChaos.png differ diff --git a/images/buzzers/DeltaruneICanDoAnything.png b/images/buzzers/DeltaruneICanDoAnything.png new file mode 100644 index 0000000..cf080f6 Binary files /dev/null and b/images/buzzers/DeltaruneICanDoAnything.png differ diff --git a/images/buzzers/SF3KenParry.gif b/images/buzzers/SF3KenParry.gif new file mode 100644 index 0000000..34966ad Binary files /dev/null and b/images/buzzers/SF3KenParry.gif differ diff --git a/images/buzzers/SF3KenParry.png b/images/buzzers/SF3KenParry.png new file mode 100644 index 0000000..513eb04 Binary files /dev/null and b/images/buzzers/SF3KenParry.png differ diff --git a/images/buzzers/SFBrazil.png b/images/buzzers/SFBrazil.png new file mode 100644 index 0000000..48c29c1 Binary files /dev/null and b/images/buzzers/SFBrazil.png differ diff --git a/pages/home.html b/pages/home.html index 711778d..98597e1 100644 --- a/pages/home.html +++ b/pages/home.html @@ -1,7 +1,7 @@ - Pledge Monolith! + Thanks for pledging monolith! :) diff --git a/pages/play.html b/pages/play.html index a7f702b..49fa3d7 100644 --- a/pages/play.html +++ b/pages/play.html @@ -1,7 +1,7 @@ - Pledge Monolith! (please) + Thanks for pledging monolith! :) @@ -21,8 +21,8 @@ ["MarioBoing","MarioPenguin","MarioCoin","MPYosh","MPDogF","MPCatF","MarioPlum","WLHelloThere"], ["PizzaTowerTaunt1"], ["EBWow","EBAttack1","SaturnHonk"], - ["Ooh"], ["AAHoldIt","AATakeThat"], + ["Ooh"], ["Killer7Laugh"], ["TheNumberEight","TheNumberEight","TheNumberEight","TheNumberEight","TheNumberEight","TheNumberEight","TheNumberEight","TheNumberEight"], ["Jiggluigibat","SaturnHonk","Kirbeep"], @@ -43,6 +43,7 @@ ["TWEWYCrunch","TWEWYNoLimits","TWEWYSummon","TWEWYTime","TWEWYVerywell","TWEWYZettaslow"], ["BMYoSun","BMOuch","BMBoing"], ["EWJPain"], + ["SF3KenParry","SFBrazil"], ["BuzzinLiveBuzzer"], ["Mystery"] ]; @@ -53,8 +54,10 @@ KirbyMic2: ["KirbyMic1","KirbyMic2","KirbyMic3"], HKAdido: ["HKAdido","HKShaw"], MPDogF: ["MPDogA","MPDogB","MPDogC","MPDogD","MPDogE","MPDogF","MPDogG"], - MPCatF: ["MPCatA","MPCatB","MPCatC","MPCatD","MPCatE","MPCatF","MPCatG"] + MPCatF: ["MPCatA","MPCatB","MPCatC","MPCatD","MPCatE","MPCatF","MPCatG"], + DeltaruneICanDoAnything: ["DeltaruneICanDoAnything","DeltaruneChaosChaos"] } + let animatedBuzzers = ["SF3KenParry"]; let buzzerOptionsCurrentRow = 0; let buzzerOptionsTotalRows = 3; function displayBuzzerOptions() { @@ -79,7 +82,7 @@ }); $("#buzzerOptions img").mousedown(function() { - buzzerId = $(this).attr("id"); + let buzzerId = $(this).attr("id"); clientBuzzer = buzzerId; if (specialBuzzers[buzzerId] != null) { buzzerId = specialBuzzers[buzzerId][Math.floor(Math.random()*(specialBuzzers[buzzerId].length))]; @@ -90,7 +93,13 @@ } socket.emit("updateUserInfo", userName, teamName, buzzerId); let buzzerSound = new Audio(buzzerId+".wav"); - $("#buzzer").attr("src", buzzerId+".png" ); + if (animatedBuzzers.includes(buzzerId)) { + $("#buzzer").attr("src", buzzerId+".gif" ); + } + else { + $("#buzzer").attr("src", buzzerId+".png" ); + } + buzzerSound.play(); }); @@ -107,13 +116,12 @@ } displayBuzzerOptions(); - $("#buzzer").attr("src", buzzerOptions[0]+".png" ); + $("#buzzer").attr("src", buzzerOptions[0][0]+".png" ); $("#buzzer").css("opacity", "0.2"); $("#buzzer").css("cursor", "not-allowed"); let buzzable = false; socket.emit("updateUserInfo", userName, teamName, clientBuzzer);//initial user registration - $("#buzzer").attr("src", "Kirbeep.png" ); socket.on("userInfoToClient", (userInfo) => { userInfoToClient(userInfo); @@ -177,7 +185,10 @@ $("#buzzer").attr("src", buzzerId+".png" ); socket.emit("updateUserInfo", userName, teamName, buzzerId); } - + else if (animatedBuzzers.includes(clientBuzzer)) { + $("#buzzer").attr("src", clientBuzzer+".gif" ); + socket.emit("updateUserInfo", userName, teamName, clientBuzzer); + } socket.emit("buzzerPressed", userName, buzzInTime); socket.emit("pingServer", new Date().getTime()); }