adds new audio files and updates durations

src/sounds.h

@@ -5,22 +5,20 @@
 #define AFTER_MAIN_STATION 2
 
 #define HACKING_STATION_MUHVELLA 3
-#define PICKUP_STATION_MUHVELLA 10
-#define AFTER_MUHVELLA 10 // incorrect
+#define PICKUP_STATION_MUHVELLA 4
+#define AFTER_MUHVELLA 5
 
-#define HACKING_STATION_MAGIE 4
-#define PICKUP_STATION_MAGIE 11
-#define AFTER_MAGIE 11 // incorrect
+#define HACKING_STATION_MAGIE 6
+#define PICKUP_STATION_MAGIE 7
+#define AFTER_MAGIE 8
 
-#define HACKING_STATION_BICOLA 5
-#define PICKUP_STATION_BICOLA 12
-#define AFTER_BICOLA 12 // incorrect
+#define HACKING_STATION_BICOLA 9
+#define PICKUP_STATION_BICOLA 10
+#define AFTER_BICOLA 11
 
-#define HACKING_STATION_TOBIONE 6
+#define HACKING_STATION_TOBIONE 12
 #define PICKUP_STATION_TOBIONE 13
-#define AFTER_TOBIONE 13 // incorrect
+#define AFTER_TOBIONE 14
 
-#define END 8
-#define WRONG_STATION 7
-
-#define STRESS 9
+#define END 15
+#define WRONG_STATION 16

src/states.cpp

@@ -184,22 +184,22 @@ void Hacking::activated(const Context context)
     auto currentStationIndex = context.getStationIndex(this->currentStation);
     if (currentStationIndex == 1)
     {
-        timer = Timer(31000, false);
+        timer = Timer(25000, false);
         context.dfPlayer->play(HACKING_STATION_MUHVELLA);
     }
     if (currentStationIndex == 2)
     {
-        timer = Timer(33000, false);
+        timer = Timer(29000, false);
         context.dfPlayer->play(HACKING_STATION_MAGIE);
     }
     if (currentStationIndex == 3)
     {
-        timer = Timer(36000, false);
+        timer = Timer(29000, false);
         context.dfPlayer->play(HACKING_STATION_BICOLA);
     }
     if (currentStationIndex == 4)
     {
-        timer = Timer(35000, false);
+        timer = Timer(39000, false);
         context.dfPlayer->play(HACKING_STATION_TOBIONE);
     }
     timer.start();
@@ -287,17 +287,23 @@ void WaitingForPickup::activated(Context context)
 //------------------------------------
 
 
-End::End() = default;
+End::End(): timer(Timer(0, false))
+{
+}
 
 State* End::pickedUp(const Context context)
 {
-    // todo what happens when we pick up here?...
-    return this;
+    // todo to be discussed if this is the expected outcome...
+    return new OnTheMove(context.stations + 1); // starting game early 
 }
 
 State* End::update(const Context context)
 {
-    // todo after some time return waiting for game start...
+    bool done = timer.update(context.delta);
+    if (done)
+    {
+        return new WaitingForGameStart();
+    }
     return this;
 }
 
@@ -309,4 +315,5 @@ String End::updateDisplay()
 void End::activated(const Context context)
 {
     context.dfPlayer->play(END);
+    timer = Timer(27000, false);
 }

src/states.h

@@ -97,6 +97,8 @@ public:
 
 class End final : public State
 {
+protected:
+    Timer timer;
 public:
     End();
     State* pickedUp(Context context) override;