diff --git a/app.js b/app.js index 572c0a6..533b1eb 100644 --- a/app.js +++ b/app.js @@ -1,14 +1,11 @@ const http = require('http'); -// const https = require('https'); const express = require('express'); const app = express(); const fs = require('fs') const { Server } = require("socket.io"); var options = { - // key: fs.readFileSync('key.pem'), - // cert: fs.readFileSync('cert.pem') }; const server = http.createServer(options, app); @@ -77,9 +74,10 @@ io.on("connection", (socket) => { - socket.on("registerUser", (newUserName, newTeamName) => { - userInfo[newUserName] = { - teamName: newTeamName + socket.on("updateUserInfo", (userName, teamName, buzzerId) => { + userInfo[userName] = { + teamName: teamName, + buzzerId: buzzerId } io.emit("userInfoToClient", userInfo); }); @@ -112,7 +110,7 @@ app.get("/browserFunctions.js", (request, response) => { }); //all files in these folders can be accessed with a GET request of the filename -let assetFolders = ["styles","pages","images","audio","fonts"]; +let assetFolders = ["styles","pages","images","images/buzzers","audio","fonts"]; assetFolders.forEach((folderName) => { let folderContents = fs.readdirSync(folderName); folderContents.forEach((fileName) => { diff --git a/audio/AAHoldIt.wav b/audio/AAHoldIt.wav new file mode 100644 index 0000000..6a58e20 Binary files /dev/null and b/audio/AAHoldIt.wav differ diff --git a/audio/AAHoldItLoud.wav b/audio/AAHoldItLoud.wav new file mode 100644 index 0000000..ccde955 Binary files /dev/null and b/audio/AAHoldItLoud.wav differ diff --git a/audio/EBAttack1.wav b/audio/EBAttack1.wav new file mode 100644 index 0000000..a7e1bd5 Binary files /dev/null and b/audio/EBAttack1.wav differ diff --git a/audio/Wow.wav b/audio/EBWow.wav similarity index 100% rename from audio/Wow.wav rename to audio/EBWow.wav diff --git a/audio/EmergencyMeeting.wav b/audio/EmergencyMeeting.wav new file mode 100644 index 0000000..6a5a890 Binary files /dev/null and b/audio/EmergencyMeeting.wav differ diff --git a/audio/PuffRest.wav b/audio/PuffRest.wav new file mode 100644 index 0000000..b600a13 Binary files /dev/null and b/audio/PuffRest.wav differ diff --git a/audio/PuffRestLoud.wav b/audio/PuffRestLoud.wav new file mode 100644 index 0000000..fa1f058 Binary files /dev/null and b/audio/PuffRestLoud.wav differ diff --git a/audio/SaturnHonk.wav b/audio/SaturnHonk.wav new file mode 100644 index 0000000..7988aa6 Binary files /dev/null and b/audio/SaturnHonk.wav differ diff --git a/browserFunctions.js b/browserFunctions.js index 006bbec..2693b25 100644 --- a/browserFunctions.js +++ b/browserFunctions.js @@ -1,18 +1,18 @@ -let buzzerOptions = ["Kirbeep","MPYosh","MPDog","MPCat","Wow","Ooh","MarioBoing","TheNumberEight","Mystery"]; -function setupBuzzerOptions() { + +// function setupBuzzerOptions() { - buzzerOptions.forEach((buzzerName) => { - $("#buzzerOptions").append(""); - }); - return buzzerOptions; -} +// buzzerOptions.forEach((buzzerName) => { +// $("#buzzerOptions").append(""); +// }); +// return buzzerOptions; +// } function userInfoToClient(userInfo) { $("#PlayersList").find("ul").html(""); $("#ChasersList").find("ul").html(""); for (const user in userInfo) { const userId = user.replaceAll(" ","_"); - $("#"+userInfo[user].teamName+"List").find("ul").append("
  • "+user+"
    • "); + $("#"+userInfo[user].teamName+"List").find("ul").append("
  • "+""+user+"
    • "); } } @@ -25,14 +25,16 @@ function gameStateToClient(currentTeam, currentScore) { $("#currentScore").html(currentScore); } -function buzzInfoToClient(buzzInfo, buzzerSound) { +function buzzInfoToClient(buzzInfo) { //play sound for first buzz in if ($("#firstBuzz").html() == "") { - buzzerSound.play(); $("#firstBuzz").html(buzzInfo[0].userName); const userId = buzzInfo[0].userName.replaceAll(" ","_"); - $("#userListPanel").find("#"+userId).css("font-weight", 900); - $("#userListPanel").find("#"+userId).find("var").html(" (BUZZ)") + // $("#userListPanel").find("#"+userId).css("font-weight", 900); + $("#userListPanel").find("#"+userId).find("var").html(" (BUZZ)"); + let buzzerId = $("#userListPanel").find("#"+userId).find("img").attr("data-buzzerId") + let buzzerSound = new Audio(buzzerId+".wav"); + buzzerSound.play(); } for (let i=1; i < buzzInfo.length; i++) { @@ -43,9 +45,9 @@ function buzzInfoToClient(buzzInfo, buzzerSound) { function selectBuzzer(buzzerId) { if (buzzerId == "Mystery") { - buzzerId = buzzerOptions[Math.floor(Math.random()*8)]; + buzzerId = buzzerOptions[Math.floor(Math.random()*(buzzerOptions.length-1))]; } - buzzerSound = new Audio(buzzerId+".wav"); + let buzzerSound = new Audio(buzzerId+".wav"); $("#buzzer").attr("src", buzzerId+".png" ); buzzerSound.play(); return buzzerSound; diff --git a/images/EmergencyMeeting.psd b/images/EmergencyMeeting.psd new file mode 100644 index 0000000..2c1e76d Binary files /dev/null and b/images/EmergencyMeeting.psd differ diff --git a/images/TurnVisual.psd b/images/TurnVisual.psd new file mode 100644 index 0000000..aef4d7f Binary files /dev/null and b/images/TurnVisual.psd differ diff --git a/images/buzzers/AAHoldIt.png b/images/buzzers/AAHoldIt.png new file mode 100644 index 0000000..556c86f Binary files /dev/null and b/images/buzzers/AAHoldIt.png differ diff --git a/images/buzzers/EBAttack1.png b/images/buzzers/EBAttack1.png new file mode 100644 index 0000000..17324cd Binary files /dev/null and b/images/buzzers/EBAttack1.png differ diff --git a/images/Wow.png b/images/buzzers/EBWow.png similarity index 100% rename from images/Wow.png rename to images/buzzers/EBWow.png diff --git a/images/buzzers/EmergencyMeeting.png b/images/buzzers/EmergencyMeeting.png new file mode 100644 index 0000000..baedaf7 Binary files /dev/null and b/images/buzzers/EmergencyMeeting.png differ diff --git a/images/Kirbeep.png b/images/buzzers/Kirbeep.png similarity index 100% rename from images/Kirbeep.png rename to images/buzzers/Kirbeep.png diff --git a/images/MPCat.png b/images/buzzers/MPCat.png similarity index 100% rename from images/MPCat.png rename to images/buzzers/MPCat.png diff --git a/images/MPDog.png b/images/buzzers/MPDog.png similarity index 100% rename from images/MPDog.png rename to images/buzzers/MPDog.png diff --git a/images/MPYosh.png b/images/buzzers/MPYosh.png similarity index 100% rename from images/MPYosh.png rename to images/buzzers/MPYosh.png diff --git a/images/MarioBoing.png b/images/buzzers/MarioBoing.png similarity index 100% rename from images/MarioBoing.png rename to images/buzzers/MarioBoing.png diff --git a/images/Mystery.png b/images/buzzers/Mystery.png similarity index 100% rename from images/Mystery.png rename to images/buzzers/Mystery.png diff --git a/images/Ooh.png b/images/buzzers/Ooh.png similarity index 100% rename from images/Ooh.png rename to images/buzzers/Ooh.png diff --git a/images/buzzers/Puff.png b/images/buzzers/Puff.png new file mode 100644 index 0000000..3d85856 Binary files /dev/null and b/images/buzzers/Puff.png differ diff --git a/images/buzzers/PuffBuzzed.png b/images/buzzers/PuffBuzzed.png new file mode 100644 index 0000000..a7f846f Binary files /dev/null and b/images/buzzers/PuffBuzzed.png differ diff --git a/images/buzzers/SaturnHonk.png b/images/buzzers/SaturnHonk.png new file mode 100644 index 0000000..d09a15c Binary files /dev/null and b/images/buzzers/SaturnHonk.png differ diff --git a/images/TheNumberEight.png b/images/buzzers/TheNumberEight.png similarity index 100% rename from images/TheNumberEight.png rename to images/buzzers/TheNumberEight.png diff --git a/pages/host.html b/pages/host.html index 3d504f1..6441fb7 100644 --- a/pages/host.html +++ b/pages/host.html @@ -10,9 +10,6 @@ @@ -77,7 +70,5 @@ -
    -
    diff --git a/pages/play.html b/pages/play.html index 4e0a61e..6d76683 100644 --- a/pages/play.html +++ b/pages/play.html @@ -11,22 +11,22 @@ @@ -90,7 +97,7 @@ Progress:


    - The buzzer + The buzzer

    diff --git a/styles/styleMain.css b/styles/styleMain.css index 08199ee..7f993c1 100644 --- a/styles/styleMain.css +++ b/styles/styleMain.css @@ -38,7 +38,7 @@ a, a:visited { left: 60px; border: dashed; width: 400px; - min-height: 130px; + min-height: 170px; padding-left: 5px; } @@ -47,17 +47,18 @@ a, a:visited { left: 724px; border: dashed; width: 400px; - min-height: 130px; + min-height: 170px; padding-left: 5px; } ul { - list-style-type: square; + list-style-type: none; margin: 0px; - padding-left: 30px; + padding-left: 0px; } #buzzer { + width: 200px; position: relative; z-index: 1000; } @@ -86,6 +87,13 @@ ul { width: 14px; } +.userListBuzzerSelections { + width: 30px; + position: relative; + top: 5px; + padding-right: 10px; +} + @media (max-width: 600px) { #userListPanel { top: 80px;