Diff: main.cpp

Revision:

28:a6726a3f8e6d

Parent:

27:4bcdfb212467

Child:

29:75a05e9f0e8d

--- a/main.cpp	Mon May 06 01:28:50 2019 +0000
+++ b/main.cpp	Mon May 06 02:42:34 2019 +0000
@@ -198,12 +198,15 @@
                                 else if(i == 1) {term_two();}
                                 else{term_three();}
                                 int j = 0;
+                                game_3.init_para();
                                 while(j < 5){
                                     // Game loop for 5 rounds
+                                    // Set the ratio between messages vs books
                                     game_3.init(pad, game_3_set);
                                     game_3.render(lcd, game_3_set);
+                                    // Parameter to set the reaction time frame for varying difficulty
+                                    wait(game_3_time);
                                     game_3.read_input(pad);
-                                    wait(game_3_time);
                                     game_3.update(pad, game_3_set);
                                     j = game_3.get_count();
                                 }
@@ -327,7 +330,7 @@
                             // End the thread
                             
                             // Check for number of correct answerws to determine if proceed to next year or not
-                            if(pass >= 2){
+                            if(pass > 2){
                                 passed();
                                 music.win(pad);
                                 wait(0.5);
@@ -660,14 +663,14 @@
 // function for setting year one game parameters
 void year_one_set()
 {
-    game_1_speed = 7;
+    game_1_speed = 12;
     game_1_cha = 1;
     game_1_r = 5;
     game_2_speed = 1;
     game_2_cha = 1;
     game_2_r = 6;
     game_3_set = 1;
-    game_3_time = 1.0;
+    game_3_time = 0.5;
 }
 
 // function for drawing year two title screen
@@ -717,14 +720,14 @@
 // function for setting year two game parameters
 void year_two_set()
 {
-    game_1_speed = 12;
+    game_1_speed = 14;
     game_1_cha = 2;
     game_1_r = 3;
     game_2_speed = 2;
     game_2_cha = 2;
     game_2_r = 5;
     game_3_set = 2;
-    game_3_time = 0.8;
+    game_3_time = 0.4;
 }
 
 // function for drawing year three title screen
@@ -781,7 +784,7 @@
     game_2_cha = 3;
     game_2_r = 3;
     game_3_set = 3;
-    game_3_time = 0.6;
+    game_3_time = 0.3;
 }
 
 // function for displaying the game information