finish fixing timer, update audio.js with final files

rbozek · Jan 4, 2024 · 4e22f12 · 4e22f12
1 parent e409550
commit 4e22f12
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/assets/audio/pianowrong.wav b/assets/audio/pianowrong.wav
diff --git a/css/style.css b/css/style.css
@@ -1,6 +1,7 @@
 body {
   background-image: url('../assets/images/tile-orange.jpg');
   background-size: cover;
+  /* background-repeat: no-repeat; */
   background-color:  rgb(251, 122, 0);
   font-family: sans-serif;
   display: flex;

diff --git a/js/app.js b/js/app.js
@@ -71,7 +71,6 @@ function renderQuestionCat1() {
     answers.appendChild(renderedAnswer)
   })
 }
-
 function renderQuestionCat2() {
   rulesBtnDiv.style.display = 'none'
   currentCategory = 2
@@ -151,18 +150,20 @@ function playerChooseAnswer(evt){
 function roundOver(){
   // console.log('testing gameover state');
   stopTimer()
-  if (playerScore >= 3) {
-    playerScoreContainer.innerHTML = `Your score is:<br> ${ playerScore } <br> Perfect. You are an evolved human.`
-  } else if (playerScore < 3 && playerScore > 1) {
-    playerScoreContainer.innerHTML = `Your score is:<br> ${ playerScore } <br> Nice work. Keep practicing (at life).`  
+  countdown.textContent = ``
+  if (playerScore >= 5) {
+    playerScoreContainer.innerHTML = `Your score is:<br> ${ playerScore }<br>Perfect. You are an evolved human.`
+  } else if (playerScore < 5 && playerScore > 1) {
+    playerScoreContainer.innerHTML = `Your score is:<br> ${ playerScore }<br>Nice work. Keep practicing (at life).`  
   } else {
-    playerScoreContainer.innerHTML = `Your score is:<br> ${ playerScore } <br> No offense but you might be a bad person.`  
+    playerScoreContainer.innerHTML = `Your score is:<br> ${ playerScore }<br>No offense but you might be a bad person.`  
   }
 }
 
 function resetGame(){
   rulesBtnDiv.style.display = ''
   playerScoreContainer.innerHTML = initialScoreState;
+  countdown.textContent = ``
   question.textContent = '' // this line isnt needed?
   answers.innerHTML = ''
   currentQuesIdx = 0

diff --git a/js/audio.js b/js/audio.js
@@ -1,6 +1,7 @@
 let click = new Audio('../assets/audio/click.wav')
 let ding = new Audio('../assets/audio/ding.wav')
 let sadTrombone = new Audio('../assets/audio/sadtrombone.wav')
+let pianoWrong = new Audio('../assets/audio/pianowrong.wav')
 let levelSuccess = new Audio('../assets/audio/levelsuccesstrimmed.mp3')
 let levelFail = new Audio('../assets/audio/levelfailtrimmed.mp3')
 
@@ -16,6 +17,10 @@ function playTrombone() {
  sadTrombone.volume = 0.15
  sadTrombone.play()
 }
+function playPianoWrong() {
+ pianoWrong.volume = 0.15
+ pianoWrong.play()
+}
 function playLevelSucceed() {
  levelSuccess.volume = 0.15
  levelSuccess.play()
@@ -29,6 +34,7 @@ export {
  playClick,
  playDing,
  playTrombone,
+ playPianoWrong,
  playLevelSucceed,
  playLevelFail
-}
+}
diff --git a/js/pseudocode.js b/js/pseudocode.js
@@ -31,9 +31,9 @@
 // //   -line 99! I think ChatGPT came up with a gurd idear! (saved bookmark)
 // // PROBLEM - FIXED!--I have "rulesBtnDiv.innerHTML" inside function ONLY FOR CATEGORY 1 - but for some reason it activates even if i'm using category 2 - im calling cat1() inside playerAnswer too! DAMMIT! how can i get that global? - FIXED!!! conditional 
 
--Check playerScore!! might be a little wonky
+// // -Check playerScore!! might be a little wonky
 
-// timer for entire category, not each question
+// // timer for entire category, not each question
 // ** sounds: sound for button clicks, add sound for playerScore, and diff sound for perfect score  ->  button to turn off sounds??
 // ** images: favicon to page DONE, monk image for top of page before game starts
 // color scheme: warm colors