diff --git a/audio/AAHoldIt.wav b/audio/AAHoldIt.wav index 6a58e20..78b83bd 100644 Binary files a/audio/AAHoldIt.wav and b/audio/AAHoldIt.wav differ diff --git a/audio/AATakeThat.wav b/audio/AATakeThat.wav new file mode 100644 index 0000000..674b64b Binary files /dev/null and b/audio/AATakeThat.wav differ diff --git a/audio/DKOK.wav b/audio/DKOK.wav new file mode 100644 index 0000000..1fe044a Binary files /dev/null and b/audio/DKOK.wav differ diff --git a/audio/HKAdido.wav b/audio/HKAdido.wav new file mode 100644 index 0000000..807a9e3 Binary files /dev/null and b/audio/HKAdido.wav differ diff --git a/audio/HKGrub.wav b/audio/HKGrub.wav new file mode 100644 index 0000000..5755e41 Binary files /dev/null and b/audio/HKGrub.wav differ diff --git a/audio/HKShaw.wav b/audio/HKShaw.wav new file mode 100644 index 0000000..78bf24a Binary files /dev/null and b/audio/HKShaw.wav differ diff --git a/audio/PuffRest.wav b/audio/Jiggluigibat.wav similarity index 100% rename from audio/PuffRest.wav rename to audio/Jiggluigibat.wav diff --git a/audio/KirbyBugzzy.wav b/audio/KirbyBugzzy.wav new file mode 100644 index 0000000..6a41987 Binary files /dev/null and b/audio/KirbyBugzzy.wav differ diff --git a/audio/KirbyKracko.wav b/audio/KirbyKracko.wav new file mode 100644 index 0000000..c51df3d Binary files /dev/null and b/audio/KirbyKracko.wav differ diff --git a/audio/KirbyMic2.wav b/audio/KirbyMic2.wav new file mode 100644 index 0000000..123041d Binary files /dev/null and b/audio/KirbyMic2.wav differ diff --git a/audio/KirbyMic3.wav b/audio/KirbyMic3.wav new file mode 100644 index 0000000..943c01d Binary files /dev/null and b/audio/KirbyMic3.wav differ diff --git a/audio/KirbySquishy.wav b/audio/KirbySquishy.wav new file mode 100644 index 0000000..07c8128 Binary files /dev/null and b/audio/KirbySquishy.wav differ diff --git a/audio/Penguin.wav b/audio/MarioPenguin.wav similarity index 100% rename from audio/Penguin.wav rename to audio/MarioPenguin.wav diff --git a/audio/P3Summon.wav b/audio/P3Summon.wav new file mode 100644 index 0000000..fdf797f Binary files /dev/null and b/audio/P3Summon.wav differ diff --git a/audio/PKMNLvlUp.wav b/audio/PKMNLvlUp.wav new file mode 100644 index 0000000..fafb53a Binary files /dev/null and b/audio/PKMNLvlUp.wav differ diff --git a/audio/PdPSeren.wav b/audio/PdPSeren.wav new file mode 100644 index 0000000..905bf96 Binary files /dev/null and b/audio/PdPSeren.wav differ diff --git a/audio/PikminDeath.wav b/audio/PikminDeath.wav new file mode 100644 index 0000000..509b52c Binary files /dev/null and b/audio/PikminDeath.wav differ diff --git a/audio/SonicOhNo.wav b/audio/SonicOhNo.wav new file mode 100644 index 0000000..d3f2ba2 Binary files /dev/null and b/audio/SonicOhNo.wav differ diff --git a/audio/SplatWoomy.wav b/audio/SplatWoomy.wav new file mode 100644 index 0000000..315cfdb Binary files /dev/null and b/audio/SplatWoomy.wav differ diff --git a/audio/TAFroggy.wav b/audio/TAFroggy.wav new file mode 100644 index 0000000..1a7a4f6 Binary files /dev/null and b/audio/TAFroggy.wav differ diff --git a/images/buzzers/AATakeThat.png b/images/buzzers/AATakeThat.png new file mode 100644 index 0000000..d926b05 Binary files /dev/null and b/images/buzzers/AATakeThat.png differ diff --git a/images/buzzers/DKOK.png b/images/buzzers/DKOK.png new file mode 100644 index 0000000..28d741d Binary files /dev/null and b/images/buzzers/DKOK.png differ diff --git a/images/buzzers/HKAdido.png b/images/buzzers/HKAdido.png new file mode 100644 index 0000000..51fc932 Binary files /dev/null and b/images/buzzers/HKAdido.png differ diff --git a/images/buzzers/HKGrub.png b/images/buzzers/HKGrub.png new file mode 100644 index 0000000..8ade428 Binary files /dev/null and b/images/buzzers/HKGrub.png differ diff --git a/images/buzzers/HKShaw.png b/images/buzzers/HKShaw.png new file mode 100644 index 0000000..e54940d Binary files /dev/null and b/images/buzzers/HKShaw.png differ diff --git a/images/buzzers/Jiggluigibat.png b/images/buzzers/Jiggluigibat.png new file mode 100644 index 0000000..8dff965 Binary files /dev/null and b/images/buzzers/Jiggluigibat.png differ diff --git a/images/buzzers/KirbyBugzzy.png b/images/buzzers/KirbyBugzzy.png new file mode 100644 index 0000000..bcbfe7f Binary files /dev/null and b/images/buzzers/KirbyBugzzy.png differ diff --git a/images/buzzers/KirbyKracko.png b/images/buzzers/KirbyKracko.png new file mode 100644 index 0000000..20efeeb Binary files /dev/null and b/images/buzzers/KirbyKracko.png differ diff --git a/images/buzzers/KirbyMic2.png b/images/buzzers/KirbyMic2.png new file mode 100644 index 0000000..e6e5f39 Binary files /dev/null and b/images/buzzers/KirbyMic2.png differ diff --git a/images/buzzers/KirbyMic3.png b/images/buzzers/KirbyMic3.png new file mode 100644 index 0000000..26acf56 Binary files /dev/null and b/images/buzzers/KirbyMic3.png differ diff --git a/images/buzzers/KirbySquishy.png b/images/buzzers/KirbySquishy.png new file mode 100644 index 0000000..0cb2844 Binary files /dev/null and b/images/buzzers/KirbySquishy.png differ diff --git a/images/buzzers/MarioPenguin.png b/images/buzzers/MarioPenguin.png new file mode 100644 index 0000000..d394041 Binary files /dev/null and b/images/buzzers/MarioPenguin.png differ diff --git a/images/buzzers/P3Summon.png b/images/buzzers/P3Summon.png new file mode 100644 index 0000000..1af0d51 Binary files /dev/null and b/images/buzzers/P3Summon.png differ diff --git a/images/buzzers/PKMNLvlUp.png b/images/buzzers/PKMNLvlUp.png new file mode 100644 index 0000000..9f81a79 Binary files /dev/null and b/images/buzzers/PKMNLvlUp.png differ diff --git a/images/buzzers/PdPSeren.png b/images/buzzers/PdPSeren.png new file mode 100644 index 0000000..fb91d55 Binary files /dev/null and b/images/buzzers/PdPSeren.png differ diff --git a/images/buzzers/PikminDeath.png b/images/buzzers/PikminDeath.png new file mode 100644 index 0000000..203753a Binary files /dev/null and b/images/buzzers/PikminDeath.png differ diff --git a/images/buzzers/SonicOhNo.png b/images/buzzers/SonicOhNo.png new file mode 100644 index 0000000..9b7d6ed Binary files /dev/null and b/images/buzzers/SonicOhNo.png differ diff --git a/images/buzzers/TAFroggy.png b/images/buzzers/TAFroggy.png new file mode 100644 index 0000000..bd3cafa Binary files /dev/null and b/images/buzzers/TAFroggy.png differ diff --git a/pages/home.html b/pages/home.html index 299e9d1..e8c2e91 100644 --- a/pages/home.html +++ b/pages/home.html @@ -1,7 +1,7 @@ - The cooler buzzer website + Now with more buzzers per buzzer! diff --git a/pages/play.html b/pages/play.html index aa6bc5c..092bf11 100644 --- a/pages/play.html +++ b/pages/play.html @@ -1,7 +1,7 @@ - The cooler buzzer website + Now with more buzzers per buzzer! @@ -15,10 +15,14 @@ let userName = queryString.searchParams.get("user"); $("#message").html("hi "+userName+" :]") let teamName = queryString.searchParams.get("team"); - - let buzzerOptions = ["Kirbeep","MPYosh","MPDog","MPCat","EBWow","EBAttack1","Ooh","TheNumberEight","MarioBoing","MarioCoin","SaturnHonk","PuffRest","AAHoldIt","EmergencyMeeting","PikminThrow","MGSAlert","FF9Moogle","Mystery"]; - buzzerOptions.forEach((buzzerId) => { - $("#buzzerOptions").append(""); + let buzzerOptions = [["Kirbeep","KirbyMic2","KirbyMic3","KirbySquishy","KirbyBugzzy","KirbyKracko"],["MarioBoing","MarioPenguin","MarioCoin","MPYosh","MPDog","MPCat"],["EBWow","EBAttack1","SaturnHonk"],["Ooh"],["Jiggluigibat"],["AAHoldIt","AATakeThat"],["EmergencyMeeting"],["TheNumberEight"],["PikminThrow","PikminDeath"],["MGSAlert"],["FF9Moogle"],["P3Summon"],["HKAdido","HKShaw","HKGrub"],["DKOK"],["SonicOhNo"],["PdPSeren","TAFroggy"],["PKMNLvlUp"],["Mystery"]]; + buzzerOptions.forEach((buzzerGroup) => { + const groupFaceId = buzzerGroup[0]; + const buzzerGroupHTML = $("
"+buzzerGroup.length+" "); + buzzerGroup.forEach((buzzerId) => { + buzzerGroupHTML.find(".buzzerGroupItems").append(""); + }); + $("#buzzerOptions").append(buzzerGroupHTML); }); $("#buzzer").attr("src", buzzerOptions[0]+".png" ); $("#buzzer").css("opacity", "0.2"); @@ -75,10 +79,16 @@ } } - $("#buzzerOptions").contents().mousedown(function() { - buzzerId = $(this).attr("id") + $(".buzzerGroup").mousedown(function() { + $(".buzzerGroupItems").hide(); + $(this).find(".buzzerGroupItems").show(); + }); + + $("#buzzerOptions img").mousedown(function() { + buzzerId = $(this).attr("id"); if (buzzerId == "Mystery") { - buzzerId = buzzerOptions[Math.floor(Math.random()*(buzzerOptions.length-1))]; + buzzerOptionsFlat = buzzerOptions.flat(); + buzzerId = buzzerOptionsFlat[Math.floor(Math.random()*(buzzerOptionsFlat.length-1))]; } socket.emit("updateUserInfo", userName, teamName, buzzerId); let buzzerSound = new Audio(buzzerId+".wav"); diff --git a/styles/styleMain.css b/styles/styleMain.css index a4bc164..5430029 100644 --- a/styles/styleMain.css +++ b/styles/styleMain.css @@ -102,6 +102,25 @@ ul { width: 50px; } +#buzzerOptions small { + position: absolute; + bottom: 3px; + left: 3px; + text-shadow: 1px -1px 2px #000000; + font-size: 15px; +} + +.buzzerGroup { + display: inline-block; + position: relative; +} + +.buzzerGroupItems { + bottom: 50px; + position: absolute; + width: max-content; +} + #buzzerOptions { position: absolute; bottom: 10px;