дописал код решения ДЗ

jeckvorobey · Dec 3, 2018 · 8afd661 · 8afd661
1 parent b17a68d
commit 8afd661
Showing 1 changed file with 9 additions and 20 deletions.
diff --git a/game/gameCode.js b/game/gameCode.js
@@ -105,12 +105,11 @@ switch (event) {
     default:
         alert('Ошибка');
 }
-alert('Спасибо за игру');
 
 var ans = +prompt('введите номер вопроса');
 
-if (ans < 1 || ans > 4) {
-    alert('вопроса под таким номером небыло')
+if (ans < 1 || ans > 3) {
+    alert('вопроса под таким номером небыло');
 } else {
     switch (ans) {
         case 1:
@@ -119,30 +118,20 @@ if (ans < 1 || ans > 4) {
             } else {
                 alert(works.a00 + works.a2);
             }
-            break;
+            bre
         case 2:
-            if (answer[0] == 1 || answer[1] == 1) {
+            if (answer[0] == 1 & answer[1] == 1) {
                 alert(works.b00 + works.b1);
-            }
-            else if (answer[0] == 2 ||  answer[1] == 1) {
+            } else if (answer[0] == 2 & answer[1] == 1) {
                 alert(works.c00 + works.c1);
-            } 
-            else if (answer[0] == 2 || answer[1] == 2) {
+            } else if (answer[0] == 2 & answer[1] == 2) {
                 alert(works.c00 + works.c2);
-            }
-            else {
+            } else {
                 alert(works.b00 + works.b2);
             }
             break;
         case 3:
-            if (answer[1] == 1 || answer[2] == 1) {
-                alert(works.c00 + works.c1);
-            } else {
-                alert(works.c00 + works.c2);
-            }
-            break;
-        case 4:
-            if (answer[3] == 1) {
+            if (answer[2] == 1) {
                 alert(works.d00 + works.d1);
             } else {
                 alert(works.d00 + works.d2);
@@ -154,7 +143,7 @@ if (ans < 1 || ans > 4) {
             }
     }
 }
-console.log(answer);
+alert('Спасибо за игру');
 
 //------------------------------------------
 function isAnswer(q, event) {