diff --git a/assets/0015End.mp3 b/assets/0015End.mp3 index 9754bce..9b424f2 100644 --- a/assets/0015End.mp3 +++ b/assets/0015End.mp3 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ee259ea16340622bd563297bc4dd3672cdcc9d3818612d5549d9f6d52c42de99 -size 911520 +oid sha256:bc911b69fcf5e7a8d865263f3b7a764988af92d0047dddcb352dbf535a333ec1 +size 761760 diff --git a/src/main.cpp b/src/main.cpp index 02de43d..7af61cc 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -182,5 +182,5 @@ void setup(void) } } - dfPlayer.volume(15); + dfPlayer.volume(20); } diff --git a/src/states.cpp b/src/states.cpp index 7ba3e29..18284ce 100644 --- a/src/states.cpp +++ b/src/states.cpp @@ -99,7 +99,7 @@ String StartInstructions::updateDisplay(const Context& context) void StartInstructions::activated(const Context context) { context.dfPlayer->play(START_INSTRUCTIONS); - timer = Timer(10000, false); // todo set correct time + timer = Timer(39000, false); // todo set correct time timer.start(); } @@ -235,7 +235,6 @@ State* Hacking::pickedUp(const Context context) State* Hacking::update(const Context context) { - Serial.println(String(context.delta)); const bool done = timer.update(context.delta); if (done) @@ -276,22 +275,22 @@ void Hacking::activated(const Context context) auto currentStationIndex = context.getStationIndex(this->currentStation); if (currentStationIndex == 1) { - timer = Timer(5000, false); + timer = Timer(25000, false); context.dfPlayer->play(HACKING_STATION_MUHVELLA); } if (currentStationIndex == 2) { - timer = Timer(5000, false); + timer = Timer(29000, false); context.dfPlayer->play(HACKING_STATION_MAGIE); } if (currentStationIndex == 3) { - timer = Timer(5000, false); + timer = Timer(30000, false); context.dfPlayer->play(HACKING_STATION_BICOLA); } if (currentStationIndex == 4) { - timer = Timer(5000, false); + timer = Timer(37000, false); context.dfPlayer->play(HACKING_STATION_TOBIONE); } timer.start(); @@ -431,7 +430,7 @@ String End::updateDisplay(const Context& context) void End::activated(const Context context) { context.dfPlayer->play(END); - timer = Timer(38000, false); + timer = Timer(45000, false); timer.start(); } @@ -463,10 +462,8 @@ String Restarting::updateDisplay(const Context& context) String animLine = ""; const String full = ".-`-._.-`-._. :)"; const float percent = static_cast(timer.getCurrentTime()) / static_cast(timer.getDuration()); - Serial.println(String("updating display ") + percent); for (int i = 0; i < full.length() * percent; i++) { - Serial.println(String("i: ") + i + "len " + (full.length() * percent)); animLine = animLine + full[i]; } return "RESTARTING " + animLine;